svn commit: r444324 - in head: . Mk Mk/Uses astro/marble audio/csound6 audio/fluidsynth audio/libgme cad/kicad cad/opencascade cad/openvsp chinese/fcitx chinese/ibus-chewing comms/uhd comms/usrp da...

Tobias C. Berner tcberner at FreeBSD.org
Sun Jun 25 21:08:07 UTC 2017 

Author: tcberner
Date: Sun Jun 25 21:07:58 2017
New Revision: 444324
URL: https://svnweb.freebsd.org/changeset/ports/444324

Log:
  Make ninja opt-out in cmake.mk
  
  Using ninja instead of make (1) can lead to significant speed ups while building.
  Therefore switch from having the ninja generator opt-in to having it opt-out.
  
  Previously cmake-ports that wanted to use ninja could set
      CMAKE_NINJA=yes
  now, ports that do not work with ninja can set
      cmake:<existing args>,noninja
  Note, that needing this should be an exception and most often points to a broken
  cmake of the port.
  
  The ports using cmake were modified
  * removed USES=gmake, if ninja is used
  * removed MAKE_ARGS, if ninja is used
  * added the cmake-argument noninja if necessary
  
  PR:		219629
  PR:		213331
  Exp-run by:	antoine
  Reviewed by:	rakuco
  Differential Revision:	https://reviews.freebsd.org/D10748

Added:
  head/devel/xxhash/files/
  head/devel/xxhash/files/patch-git_5ab73ee   (contents, props changed)
  head/graphics/ilmbase/files/patch-git_8eed7012   (contents, props changed)
Modified:
  head/CHANGES
  head/Mk/Uses/cmake.mk
  head/Mk/bsd.sanity.mk
  head/astro/marble/Makefile
  head/audio/csound6/Makefile
  head/audio/fluidsynth/Makefile
  head/audio/libgme/Makefile
  head/cad/kicad/Makefile
  head/cad/opencascade/Makefile
  head/cad/openvsp/Makefile
  head/chinese/fcitx/Makefile
  head/chinese/ibus-chewing/Makefile
  head/comms/uhd/Makefile
  head/comms/usrp/Makefile
  head/databases/cppdb/Makefile
  head/databases/evolution-data-server/Makefile
  head/databases/mariadb100-server/Makefile
  head/databases/mariadb55-server/Makefile
  head/databases/mysql55-server/Makefile
  head/databases/mysql56-server/Makefile
  head/databases/mysql57-server/Makefile
  head/databases/mysql80-server/Makefile
  head/databases/mysqlwsrep56-server/Makefile
  head/databases/percona55-server/Makefile
  head/databases/percona56-server/Makefile
  head/databases/percona57-server/Makefile
  head/databases/tarantool/Makefile
  head/databases/xtrabackup/Makefile
  head/deskutils/kdeconnect/Makefile
  head/deskutils/kdepim4/Makefile
  head/deskutils/owncloudclient/Makefile
  head/devel/bullet/Makefile
  head/devel/compiler-rt/Makefile
  head/devel/doxygen/Makefile
  head/devel/flang-clang/Makefile
  head/devel/flang/Makefile
  head/devel/kapptemplate/Makefile
  head/devel/kdevelop-kde4/Makefile
  head/devel/kdevelop-php/Makefile
  head/devel/libzrtpcpp/Makefile
  head/devel/llvm-cheri/Makefile
  head/devel/llvm-devel/Makefile
  head/devel/llvm38/Makefile
  head/devel/llvm39/Makefile
  head/devel/llvm40/Makefile
  head/devel/mongo-c-driver/Makefile
  head/devel/rapidjson/Makefile
  head/devel/tesla/Makefile
  head/editors/codelite/Makefile
  head/editors/jucipp/Makefile
  head/editors/kate-plugin-pate/Makefile
  head/editors/neovim/Makefile
  head/games/hedgewars/Makefile
  head/games/openclonk/Makefile
  head/games/openmw/Makefile
  head/games/palomino/Makefile
  head/games/solarus/Makefile
  head/games/vavoom/Makefile
  head/graphics/aseprite/Makefile
  head/graphics/darktable/Makefile
  head/graphics/digikam-kde4/Makefile.common
  head/graphics/inkscape/Makefile
  head/graphics/luxrender/Makefile
  head/graphics/mitsuba/Makefile
  head/graphics/opensubdiv/Makefile
  head/graphics/osg-devel/Makefile
  head/graphics/osgearth/Makefile
  head/graphics/rawtherapee/Makefile
  head/graphics/tulip/Makefile
  head/graphics/waffle/Makefile
  head/graphics/xcftools/Makefile
  head/irc/weechat/Makefile
  head/lang/beignet/Makefile
  head/lang/io/Makefile
  head/lang/sagittarius-scheme/Makefile
  head/mail/evolution-ews/Makefile
  head/mail/evolution/Makefile
  head/mail/libcmime/Makefile
  head/mail/libvmime/Makefile
  head/mail/spmfilter-clamav/Makefile
  head/mail/spmfilter/Makefile
  head/math/metis/Makefile
  head/math/parmetis/Makefile
  head/math/stp/Makefile
  head/multimedia/avidemux/Makefile.common
  head/multimedia/gstreamer-qt4/Makefile
  head/multimedia/plexhometheater/Makefile
  head/multimedia/zoneminder-h264/Makefile
  head/multimedia/zoneminder/Makefile
  head/net-im/licq/Makefile
  head/net-im/ring-gnome/Makefile
  head/net-im/ring-libclient/Makefile
  head/net/ceph-devel/Makefile
  head/net/tigervnc/Makefile
  head/science/paraview/Makefile
  head/security/kwalletmanager/Makefile
  head/security/libzrtpcppcore/Makefile
  head/sysutils/baloo/Makefile
  head/sysutils/conky/Makefile
  head/sysutils/fluent-bit/Makefile
  head/sysutils/kcm-polkit-kde/Makefile
  head/sysutils/osquery/Makefile
  head/textproc/clucene/Makefile
  head/textproc/zxing-cpp/Makefile
  head/www/h2o/Makefile
  head/www/webkit2-gtk3/Makefile
  head/x11-themes/kde4-style-bespin/Makefile
  head/x11-themes/kde4-windeco-crystal/Makefile
  head/x11-wm/pawm/Makefile
  head/x11/kde4-runtime/Makefile
  head/x11/kde4-workspace/Makefile
  head/x11/virtualgl/Makefile

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/CHANGES	Sun Jun 25 21:07:58 2017	(r444324)
@@ -10,6 +10,20 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
+20170625:
+AUTHOR: kde at FreeBSD.org
+
+  The default generator for USES=cmake ports has been switched to ninja.
+
+  Previously it was possible to opt-in to using ninja instead of make(1)
+  by setting CMAKE_NINJA, now ports need to opt-out.
+
+  Ports that do not build with ninja must switch from
+      USES=cmake:<args>
+  to
+      USES=cmake:<args>,noninja
+
+
 20170417:
 AUTHOR:	kwm at FreeBSD.org
 

Modified: head/Mk/Uses/cmake.mk
==============================================================================
--- head/Mk/Uses/cmake.mk	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/Mk/Uses/cmake.mk	Sun Jun 25 21:07:58 2017	(r444324)
@@ -4,9 +4,18 @@
 #
 # Feature:		cmake
 # Usage:		USES=cmake or USES=cmake:ARGS
-# Valid ARGS:		outsource
+# Valid ARGS:		outsource, run, noninja
 # ARGS description:
 # outsource		perform an out-of-source build
+# noninja		don't use ninja instead of make
+#			Setting this should be an exception, and hints to an issue
+#			inside the ports build system.
+#			A few corner cases never use ninja, and are handled, to reduce
+#			the usage of 'noninja'.:
+#				1) fortran ports
+#				2) ports that set BUILD_- or INSTALL_WRKSRC to
+#				   something different than CONFIGURE_WRKSRC
+# run			add a runtime dependency on cmake
 #
 #
 # Additional variables that affect cmake behaviour:
@@ -14,7 +23,6 @@
 # User defined variables:
 # CMAKE_NOCOLOR		- Disable colour build output
 #			Default: not set, unless BATCH or PACKAGE_BUILDING is defined
-# CMAKE_NINJA		- Use ninja instead of make(1)
 #
 # Variables for ports:
 # CMAKE_ARGS		- Arguments passed to cmake
@@ -36,7 +44,7 @@
 .if !defined(_INCLUDE_USES_CMAKE_MK)
 _INCLUDE_USES_CMAKE_MK=	yes
 
-_valid_ARGS=		outsource run
+_valid_ARGS=		outsource run noninja
 
 # Sanity check
 .for arg in ${cmake_ARGS}
@@ -91,10 +99,6 @@ CMAKE_NOCOLOR=		yes
 CMAKE_ARGS+=		-DCMAKE_COLOR_MAKEFILE:BOOL=OFF
 .endif
 
-.if defined(CMAKE_NINJA)
-.include "${USESDIR}/ninja.mk"
-.endif
-
 _CMAKE_MSG=		"===>  Performing in-source build"
 CMAKE_SOURCE_PATH?=	${WRKSRC}
 
@@ -104,6 +108,20 @@ CONFIGURE_WRKSRC=	${WRKDIR}/.build
 BUILD_WRKSRC?=		${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC?=	${CONFIGURE_WRKSRC}
 TEST_WRKSRC?=		${CONFIGURE_WRKSRC}
+.endif
+
+# By default we use the ninja generator.
+#  Except, if cmake:run is set (cmake not wanted as generator)
+#             fortran is used, as the ninja-generator does not handle it.
+#             or if CONFIGURE_WRKSRC does not match  BUILD_WRKSRC or INSTALL_WRKSRC
+#             as the build.ninja file won't be where ninja expects it.
+.if empty(cmake_ARGS:Mnoninja) && empty(cmake_ARGS:Mrun) && empty(USES:Mfortran)
+.  if "${CONFIGURE_WRKSRC}" == "${BUILD_WRKSRC}" && "${CONFIGURE_WRKSRC}" == "${INSTALL_WRKSRC}"
+.    if ! empty(USES:Mgmake)
+BROKEN=		USES=gmake is incompatible with cmake's ninja-generator
+.    endif
+.      include "${USESDIR}/ninja.mk"
+.  endif
 .endif
 
 .if !target(do-configure)

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/Mk/bsd.sanity.mk	Sun Jun 25 21:07:58 2017	(r444324)
@@ -181,7 +181,7 @@ SANITY_DEPRECATED=	PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS 
 			USE_MYSQL WANT_MYSQL_VER \
 			USE_PHPIZE WANT_PHP_CLI WANT_PHP_CGI WANT_PHP_MOD \
 			WANT_PHP_WEB WANT_PHP_EMB
-SANITY_NOTNEEDED=	WX_UNICODE
+SANITY_NOTNEEDED=	CMAKE_NINJA WX_UNICODE
 
 USE_AUTOTOOLS_ALT=	USES=autoreconf and GNU_CONFIGURE=yes
 USE_OPENAL_ALT=		USES=openal
@@ -217,6 +217,7 @@ PYTHON_PKGNAMESUFFIX_ALT=	PYTHON_PKGNAMEPREFIX
 NO_INSTALL_MANPAGES_ALT=	USES=imake:noman
 UNIQUENAME_ALT=		PKGBASE
 LATEST_LINK_ALT=	PKGBASE
+CMAKE_NINJA_REASON=	Now the ninja generator is the default
 WX_UNICODE_REASON=	Now no-op as only unicode is supported now
 PLIST_DIRSTRY_ALT=	PLIST_DIRS
 USE_SQLITE_ALT=		USES=sqlite

Modified: head/astro/marble/Makefile
==============================================================================
--- head/astro/marble/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/astro/marble/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -10,7 +10,7 @@ COMMENT=	Virtual globe and world atlas for KDE
 
 LIB_DEPENDS=	libquazip.so:archivers/quazip
 
-USES=		cmake:outsource gmake kde:4 shared-mime-info tar:xz
+USES=		cmake:outsource kde:4 shared-mime-info tar:xz
 USE_KDE=	kdelibs automoc4
 USE_QT4=	corelib dbus declarative designer_build gui network phonon \
 		qtestlib script sql svg webkit xml \

Modified: head/audio/csound6/Makefile
==============================================================================
--- head/audio/csound6/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/audio/csound6/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile
 
-USES=		alias bison cmake:outsource localbase python:2
+USES=		alias bison cmake:outsource,noninja localbase python:2
 # math/gmm++ requires c++11
 USE_CXXSTD=	c++11
 CMAKE_ARGS=	-DBUILD_CSOUNDVST:BOOL=OFF \

Modified: head/audio/fluidsynth/Makefile
==============================================================================
--- head/audio/fluidsynth/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/audio/fluidsynth/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -18,7 +18,7 @@ OPTIONS_DEFINE=	JACK ALSA DBUS LADSPA LASH PORTAUDIO P
 OPTIONS_DEFAULT=	JACK READLINE
 
 USE_GNOME=	glib20
-USES=		cmake pkgconfig ninja tar:bzip2
+USES=		cmake pkgconfig tar:bzip2
 CMAKE_ARGS=	-Denable-ladcca:BOOL=FALSE \
 		-Denable-midishare:BOOL=FALSE
 USE_LDCONFIG=	yes

Modified: head/audio/libgme/Makefile
==============================================================================
--- head/audio/libgme/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/audio/libgme/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -11,7 +11,7 @@ COMMENT=	Collection of video game music emulators
 
 LICENSE=	LGPL21+
 
-USES=		cmake dos2unix ninja tar:bzip2
+USES=		cmake dos2unix tar:bzip2
 USE_LDCONFIG=	yes
 
 PORTDOCS=	changes.txt design.txt gme.txt readme.txt

Modified: head/cad/kicad/Makefile
==============================================================================
--- head/cad/kicad/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/cad/kicad/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -19,7 +19,7 @@ RUN_DEPENDS=	xpdf:graphics/xpdf
 
 CONFLICTS=	kicad-devel*
 
-USES=		cmake compiler:gcc-c++11-lib desktop-file-utils dos2unix \
+USES=		cmake:noninja compiler:gcc-c++11-lib desktop-file-utils dos2unix \
 		shared-mime-info tar:xz
 
 DOS2UNIX_GLOB=	*.cmake sch_bus_entry.h sch_line.h sch_no_connect.h

Modified: head/cad/opencascade/Makefile
==============================================================================
--- head/cad/opencascade/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/cad/opencascade/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -21,7 +21,7 @@ RUN_DEPENDS=	bash:shells/bash
 
 # Check ${WRKSRC}/dox/overview/Overview.md
 # and ${WRKSRC}/dox/dev_guides/building
-USES=		alias:10 bison cmake compiler:c++11-lib dos2unix gmake \
+USES=		alias:10 bison cmake compiler:c++11-lib dos2unix \
 		shebangfix tk tar:tgz
 USE_XORG=	xmu
 DOS2UNIX_FILES=	adm/templates/*

Modified: head/cad/openvsp/Makefile
==============================================================================
--- head/cad/openvsp/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/cad/openvsp/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -32,7 +32,7 @@ GH_ACCOUNT=	${GH_PROJECT}
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/SuperProject
 CMAKE_INSTALL_PREFIX=	${STAGEDIR}${PREFIX}
-USES=		cmake:outsource compiler:gcc-c++11-lib jpeg
+USES=		cmake:outsource,noninja compiler:gcc-c++11-lib jpeg
 
 CMAKE_ARGS=	-DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \

Modified: head/chinese/fcitx/Makefile
==============================================================================
--- head/chinese/fcitx/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/chinese/fcitx/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -39,7 +39,7 @@ USE_GNOME=	pango intltool libxml2 introspection
 USE_KDE=	ecm
 USE_XORG=	x11 xext xkbfile sm ice
 USE_LDCONFIG=	yes
-USES=		tar:xz cmake desktop-file-utils execinfo \
+USES=		tar:xz cmake:noninja desktop-file-utils execinfo \
 		gettext-tools:build,run gettext-runtime iconv:wchar_t \
 		kde:5 pkgconfig shared-mime-info
 INSTALLS_ICONS=	yes

Modified: head/chinese/ibus-chewing/Makefile
==============================================================================
--- head/chinese/ibus-chewing/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/chinese/ibus-chewing/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -20,7 +20,7 @@ CMAKE_ARGS=	-DSYSCONF_INSTALL_DIR=${PREFIX}/etc \
 		-DLIB_DIR=${PREFIX}/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
 GLIB_SCHEMAS=	org.freedesktop.IBus.Chewing.gschema.xml
-USES=		cmake gettext pkgconfig
+USES=		cmake:noninja gettext pkgconfig
 USE_GNOME=	gtk20
 USE_XORG=	xtst
 

Modified: head/comms/uhd/Makefile
==============================================================================
--- head/comms/uhd/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/comms/uhd/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -26,7 +26,7 @@ CONFLICTS=	usrp-[0-9]*
 
 BROKEN_powerpc64=	fails to link: undefined reference to boost function
 
-USES=		compiler:c++0x cmake:outsource gmake ncurses pkgconfig \
+USES=		compiler:c++0x cmake:outsource ncurses pkgconfig \
 		dos2unix python:2.7 shebangfix
 USE_LDCONFIG=		yes
 CMAKE_SOURCE_PATH=	${WRKSRC}/host

Modified: head/comms/usrp/Makefile
==============================================================================
--- head/comms/usrp/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/comms/usrp/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/tuple/tuple.
 		orcc:devel/orc \
 		sdcc:lang/sdcc
 
-USES=			compiler:c++0x cmake:outsource gmake pkgconfig python:run \
+USES=			compiler:c++0x cmake:outsource,noninja gmake pkgconfig python:run \
 			dos2unix shebangfix
 COMPILER_FEATURES=	libc++
 USE_LDCONFIG=		yes

Modified: head/databases/cppdb/Makefile
==============================================================================
--- head/databases/cppdb/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/databases/cppdb/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -41,7 +41,7 @@ SQLITE3_INTERNAL_DESC=	Link SQLite 3 backend into CppD
 SQLITE3_MODULE_DESC=	Build SQLite 3 backend as a CppDB module
 
 USE_LDCONFIG=	yes
-USES=		cmake:outsource ninja tar:bzip2
+USES=		cmake:outsource tar:bzip2
 
 .include <bsd.port.options.mk>
 

Modified: head/databases/evolution-data-server/Makefile
==============================================================================
--- head/databases/evolution-data-server/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/databases/evolution-data-server/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -30,7 +30,7 @@ LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 PORTSCOUT=	limitw:1,even
 
 USES=		bdb:5 cmake compiler:c++11-lib gettext gnome gperf \
-		iconv localbase ninja pathfix pkgconfig python:3.3+,build\
+		iconv localbase pathfix pkgconfig python:3.3+,build\
 		sqlite tar:xz
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2
 USE_LDCONFIG=	yes

Modified: head/databases/mariadb100-server/Makefile
==============================================================================
--- head/databases/mariadb100-server/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/databases/mariadb100-server/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -29,7 +29,7 @@ SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 SLAVEDIRS=	databases/mariadb100-client
-USES=		bison:build cmake compiler:c++11-lib cpe execinfo \
+USES=		bison:build cmake:noninja compiler:c++11-lib cpe execinfo \
 		ncurses shebangfix ssl
 USE_LDCONFIG=	${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin
 SHEBANG_FILES=	scripts/*.sh

Modified: head/databases/mariadb55-server/Makefile
==============================================================================
--- head/databases/mariadb55-server/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/databases/mariadb55-server/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -24,7 +24,7 @@ SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 SLAVEDIRS=	databases/mariadb55-client
-USES=		cmake execinfo shebangfix ssl
+USES=		cmake:noninja execinfo shebangfix ssl
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 SHEBANG_FILES=	scripts/*.sh sql-bench/[a-km-z]*
 

Modified: head/databases/mysql55-server/Makefile
==============================================================================
--- head/databases/mysql55-server/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/databases/mysql55-server/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -14,7 +14,7 @@ COMMENT?=	Multithreaded SQL database (server)
 LICENSE=	GPLv2
 
 SLAVEDIRS=	databases/mysql55-client
-USES=		cmake readline shebangfix
+USES=		cmake:noninja readline shebangfix
 CXXFLAGS+=	${CPPFLAGS}
 NO_OPTIONS_SORT=yes
 

Modified: head/databases/mysql56-server/Makefile
==============================================================================
--- head/databases/mysql56-server/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/databases/mysql56-server/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -13,7 +13,7 @@ COMMENT?=	Multithreaded SQL database (server)
 LICENSE=	GPLv2
 
 SLAVEDIRS=	databases/mysql56-client
-USES=		bison:build cmake:outsource compiler:c11 compiler:c++11-lib \
+USES=		bison:build cmake:outsource,noninja compiler:c11 compiler:c++11-lib \
 		cpe libedit localbase perl5 shebangfix ssl
 
 USE_PERL5=	run

Modified: head/databases/mysql57-server/Makefile
==============================================================================
--- head/databases/mysql57-server/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/databases/mysql57-server/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 SLAVEDIRS=	databases/mysql57-client
-USES=		bison:build cmake:outsource compiler:c11 compiler:c++11-lib \
+USES=		bison:build cmake:outsource,noninja compiler:c11 compiler:c++11-lib \
 		cpe libedit localbase perl5 shebangfix ssl
 
 USE_PERL5=	run

Modified: head/databases/mysql80-server/Makefile
==============================================================================
--- head/databases/mysql80-server/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/databases/mysql80-server/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -18,7 +18,7 @@ LICENSE=		GPLv2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
 
 SLAVEDIRS=	databases/mysql80-client
-USES=		bison:build cmake:outsource compiler:c11 compiler:c++11-lib \
+USES=		bison:build cmake:outsource,noninja compiler:c11 compiler:c++11-lib \
 		cpe libedit localbase perl5 shebangfix ssl
 
 USE_PERL5=	run

Modified: head/databases/mysqlwsrep56-server/Makefile
==============================================================================
--- head/databases/mysqlwsrep56-server/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/databases/mysqlwsrep56-server/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -22,7 +22,7 @@ DATADIR=	${PREFIX}/share/mysql
 NOT_FOR_ARCHS=		aarch64 armv6 powerpc64
 NOT_FOR_ARCHS_REASON=	error: Unsupported platform
 
-USES=		cmake:outsource libedit shebangfix perl5
+USES=		cmake:outsource,noninja libedit shebangfix perl5
 USE_PERL5=	run
 USE_LDCONFIG=	yes
 

Modified: head/databases/percona55-server/Makefile
==============================================================================
--- head/databases/percona55-server/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/databases/percona55-server/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -12,7 +12,7 @@ MAINTAINER=	flo at FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/percona55-client
-USES=		bison cmake readline shebangfix
+USES=		bison cmake:noninja readline shebangfix
 
 CXXFLAGS+=	${CPPFLAGS}
 

Modified: head/databases/percona56-server/Makefile
==============================================================================
--- head/databases/percona56-server/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/databases/percona56-server/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -17,7 +17,7 @@ NOT_FOR_ARCHS_REASON=	unsupported platform
 
 SLAVEDIRS=	databases/percona56-client \
 		databases/percona-pam-for-mysql
-USES=		bison cmake perl5 shebangfix
+USES=		bison cmake:noninja perl5 shebangfix
 
 OPTIONS_DEFINE=	OPENSSL FASTMTX INNODBMEMCACHED TOKUDB
 OPTIONS_DEFAULT=	OPENSSL INNODBMEMCACHED

Modified: head/databases/percona57-server/Makefile
==============================================================================
--- head/databases/percona57-server/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/databases/percona57-server/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -24,7 +24,7 @@ BROKEN_powerpc64=	Does not build
 
 SLAVEDIRS=	databases/percona57-client \
 		databases/percona57-pam-for-mysql
-USES=		bison:build cmake compiler:c11 compiler:c++11-lib \
+USES=		bison:build cmake:noninja compiler:c11 compiler:c++11-lib \
 		cpe libedit localbase perl5 shebangfix
 
 MY_DBDIR=	/var/db/mysql

Modified: head/databases/tarantool/Makefile
==============================================================================
--- head/databases/tarantool/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/databases/tarantool/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -15,7 +15,7 @@ NOT_FOR_ARCHS=		armv6 powerpc64 sparc64
 NOT_FOR_ARCHS_REASON=	fails to build: Unsupported architecture
 
 MAKE_JOBS_UNSAFE=yes
-USES=		cmake compiler:c++11-lang gettext gmake perl5 readline
+USES=		cmake:noninja compiler:c++11-lang gettext gmake perl5 readline
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message

Modified: head/databases/xtrabackup/Makefile
==============================================================================
--- head/databases/xtrabackup/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/databases/xtrabackup/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -29,7 +29,7 @@ BROKEN_mips64=		fails to compile: 'fpsetmask' was not 
 BROKEN_powerpc64=	fails to link: ld: final link failed: Bad value
 
 # autotool is in use for 5.1 builds
-USES=		alias autoreconf:build cpe gettext cmake libtool perl5 shebangfix
+USES=		alias autoreconf:build cpe gettext cmake:noninja libtool perl5 shebangfix
 CPE_VENDOR=	percona
 SHEBANG_FILES=	storage/innobase/xtrabackup/xbcloud_osenv.sh
 

Modified: head/deskutils/kdeconnect/Makefile
==============================================================================
--- head/deskutils/kdeconnect/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/deskutils/kdeconnect/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -9,7 +9,7 @@ MASTER_SITES=	KDE/unstable/kdeconnect/${PORTVERSION}/s
 MAINTAINER=	yurkis at gmail.com
 COMMENT=	Support for KDE to interface between your phone and your computer
 
-USES=		cmake compiler:c++0x gettext kde:4 tar:xz
+USES=		cmake:noninja compiler:c++0x gettext kde:4 tar:xz
 USE_KDE=	kdelibs automoc4 workspace runtime
 USE_QT4=	corelib gui moc_build qmake_build uic_build rcc_build
 USE_LDCONFIG=	yes

Modified: head/deskutils/kdepim4/Makefile
==============================================================================
--- head/deskutils/kdepim4/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/deskutils/kdepim4/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -24,7 +24,7 @@ CONFLICTS_INSTALL=	kdepim44-4.*
 USE_GNOME=	libxml2 libxslt:build
 USE_KDE=	kdelibs pimlibs kactivities \
 		akonadi automoc4 soprano nepomuk-widgets baloo
-USES=		cmake:outsource gmake grantlee:4 iconv kde:4 shebangfix tar:xz
+USES=		cmake:outsource grantlee:4 iconv kde:4 shebangfix tar:xz
 SHEBANG_FILES=	agents/mailfilteragent/kconf_update/migrate-kmail-filters.pl \
 		kalarm/*.pl kmail/kconf_update/*.pl \
 		libkpgp/kconf_update/kpgp-3.1-upgrade-address-data.pl

Modified: head/deskutils/owncloudclient/Makefile
==============================================================================
--- head/deskutils/owncloudclient/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/deskutils/owncloudclient/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libinotify.so:devel/libinotify \
 		libqt5keychain.so:security/qtkeychain-qt5
 
-USES=		cmake:outsource compiler:c++11-lib gmake iconv \
+USES=		cmake:outsource,noninja compiler:c++11-lib gmake iconv \
 		localbase:ldflags pkgconfig sqlite ssl
 USE_QT5=	buildtools_build concurrent core dbus gui linguist_build network \
 		qmake_build sql webkit widgets xml

Modified: head/devel/bullet/Makefile
==============================================================================
--- head/devel/bullet/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/bullet/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -22,6 +22,7 @@ USE_LDCONFIG=	yes
 USE_XORG=	x11
 
 CMAKE_ARGS=	-DBUILD_SHARED_LIBS:BOOL=ON \
+		-DINSTALL_LIBS:BOOL=ON \
 		-DBUILD_BULLET2_DEMOS:BOOL=OFF
 
 PORTDOCS=	*

Modified: head/devel/compiler-rt/Makefile
==============================================================================
--- head/devel/compiler-rt/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/compiler-rt/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -21,7 +21,6 @@ CMAKE_SOURCE_PATH=	${WRKSRC}
 
 USES=		cmake tar:bzip2
 USE_LDCONFIG=	yes
-MAKE_ARGS=	VERBOSE=1
 
 LLVM_SVN=	http://llvm.org/svn/llvm-project
 

Modified: head/devel/doxygen/Makefile
==============================================================================
--- head/devel/doxygen/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/doxygen/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -15,7 +15,7 @@ COMMENT=	Documentation system for C, C++, and other la
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		bison cmake:outsource iconv python:2 shebangfix
+USES=		bison cmake:outsource,noninja iconv python:2 shebangfix
 ALL_TARGET=	all
 CMAKE_ARGS+=	-DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}
 # Parallel jobs breaks when the DOCS option is on

Modified: head/devel/flang-clang/Makefile
==============================================================================
--- head/devel/flang-clang/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/flang-clang/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -19,7 +19,7 @@ RUN_DEPENDS=	llvm39>=0:devel/llvm39 \
 		openmp>=0:devel/openmp
 
 USE_LDCONFIG=	${PREFIX}/flang/lib
-USES=		cmake:outsource compiler:c++11-lib libedit ninja tar:xz perl5 \
+USES=		cmake:outsource compiler:c++11-lib libedit tar:xz perl5 \
 		python shebangfix
 
 USE_GNOME+=	libxml2

Modified: head/devel/flang/Makefile
==============================================================================
--- head/devel/flang/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/flang/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	TESTS
 TESTS_DESC=	build unit tests for flang
 
 USE_LDCONFIG=	${PREFIX}/flang/lib
-USES=		cmake:outsource compiler:c++11-lib libedit perl5 tar:xz \
+USES=		cmake:outsource,noninja compiler:c++11-lib libedit perl5 tar:xz \
 		shebangfix
 _USES_PYTHON?=	python:build
 USES+=		${_USES_PYTHON}

Modified: head/devel/kapptemplate/Makefile
==============================================================================
--- head/devel/kapptemplate/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/kapptemplate/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -8,7 +8,7 @@ CATEGORIES=	devel kde kde-kde4
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	KDE template generator
 
-USES=		cmake:outsource gmake kde:4 tar:xz
+USES=		cmake:outsource kde:4 tar:xz
 USE_KDE=	kdelibs automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build \
 		corelib dbus declarative

Modified: head/devel/kdevelop-kde4/Makefile
==============================================================================
--- head/devel/kdevelop-kde4/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/kdevelop-kde4/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -14,7 +14,7 @@ COMMENT=	Plugin extensible IDE for KDE
 LIB_DEPENDS=	libkdevplatforminterfaces.so:devel/kdevplatform
 RUN_DEPENDS=	gmake:devel/gmake
 
-USES=		cmake:outsource compiler:c++11-lib gmake kde:4 \
+USES=		cmake:outsource compiler:c++11-lib kde:4 \
 		shared-mime-info tar:xz
 USE_KDE=	kdelibs workspace automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build \

Modified: head/devel/kdevelop-php/Makefile
==============================================================================
--- head/devel/kdevelop-php/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/kdevelop-php/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -13,7 +13,7 @@ COMMENT=	PHP support for KDevelop
 LIB_DEPENDS=	libkdevplatforminterfaces.so:devel/kdevplatform
 BUILD_DEPENDS=	${KDE_PREFIX}/bin/kdev-pg-qt:devel/kdevelop-pg-qt
 
-USES=		cmake:outsource compiler:c++11-lib gmake kde:4 tar:xz
+USES=		cmake:outsource compiler:c++11-lib kde:4 tar:xz
 USE_KDE=	kdelibs automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 MAKE_JOBS_UNSAFE=	yes

Modified: head/devel/libzrtpcpp/Makefile
==============================================================================
--- head/devel/libzrtpcpp/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/libzrtpcpp/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -13,7 +13,7 @@ COMMENT=	ZRTP extension for GNU ccRTP
 LIB_DEPENDS=	libccrtp.so:devel/ccrtp \
 		libgcrypt.so:security/libgcrypt
 
-USES=		cmake pkgconfig ssl
+USES=		cmake:noninja pkgconfig ssl
 
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON \
 		-DOPENSSL_INCLUDE_DIRS="${OPENSSLINC}" \

Modified: head/devel/llvm-cheri/Makefile
==============================================================================
--- head/devel/llvm-cheri/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/llvm-cheri/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -17,7 +17,7 @@ COMMAND_SUFFIX=	${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 
-USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5 \
+USES=		cmake:outsource compiler:c++11-lib libedit perl5 \
 		shebangfix
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
 SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \

Modified: head/devel/llvm-devel/Makefile
==============================================================================
--- head/devel/llvm-devel/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/llvm-devel/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -16,7 +16,7 @@ LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 
-USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5 \
+USES=		cmake:outsource compiler:c++11-lib libedit perl5 \
 		shebangfix
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
 _USES_PYTHON?=	python:build

Modified: head/devel/llvm38/Makefile
==============================================================================
--- head/devel/llvm38/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/llvm38/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -24,7 +24,7 @@ LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 
-USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5 tar:xz \
+USES=		cmake:outsource compiler:c++11-lib libedit perl5 tar:xz \
 		shebangfix
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
 SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \

Modified: head/devel/llvm39/Makefile
==============================================================================
--- head/devel/llvm39/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/llvm39/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -27,7 +27,7 @@ LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 
-USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5 tar:xz \
+USES=		cmake:outsource compiler:c++11-lib libedit perl5 tar:xz \
 		shebangfix
 _USES_PYTHON?=	python:build
 USES+=		${_USES_PYTHON}

Modified: head/devel/llvm40/Makefile
==============================================================================
--- head/devel/llvm40/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/llvm40/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -27,7 +27,7 @@ LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 
-USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5 tar:xz \
+USES=		cmake:outsource compiler:c++11-lib libedit perl5 tar:xz \
 		shebangfix
 _USES_PYTHON?=	python:build
 USES+=		${_USES_PYTHON}

Modified: head/devel/mongo-c-driver/Makefile
==============================================================================
--- head/devel/mongo-c-driver/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/mongo-c-driver/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb
 
-USES=		cmake pkgconfig
+USES=		cmake:noninja pkgconfig
 USE_LDCONFIG=	yes
 LDFLAGS+=	-pthread
 

Modified: head/devel/rapidjson/Makefile
==============================================================================
--- head/devel/rapidjson/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/rapidjson/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -36,7 +36,6 @@ EXAMPLES_CMAKE_ON=	-DRAPIDJSON_BUILD_EXAMPLES:BOOL=ON
 EXAMPLES_CMAKE_OFF=	-DRAPIDJSON_BUILD_EXAMPLES:BOOL=OFF
 
 CXXFLAGS+=	-Wno-c++98-compat # for EXAMPLES option, due to this bug: https://github.com/miloyip/rapidjson/issues/761
-MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
 CMAKE_ARGS=	-DRAPIDJSON_BUILD_TESTS:BOOL=OFF
 
 DATADIR=	${PREFIX}/share/doc/RapidJSON

Modified: head/devel/tesla/Makefile
==============================================================================
--- head/devel/tesla/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/devel/tesla/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -16,7 +16,7 @@ BROKEN_armv6=		fails to link: cmTC_8106f uses VFP regi
 
 SHEBANG_FILES=	scripts/highlight-transitions
 
-USES=		cmake:outsource execinfo ninja python:run shebangfix
+USES=		cmake:outsource execinfo python:run shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CTSRD-TESLA

Added: head/devel/xxhash/files/patch-git_5ab73ee
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/xxhash/files/patch-git_5ab73ee	Sun Jun 25 21:07:58 2017	(r444324)
@@ -0,0 +1,46 @@
+From 5ab73ee82245b586f69762411edc7824d778ee2a Mon Sep 17 00:00:00 2001
+From: Chris Kitching <chriskitching at linux.com>
+Date: Tue, 15 Nov 2016 10:15:48 +0000
+Subject: [PATCH] Rely on BUILD_SHARED_LIBS instead of custom options
+
+Instead of having your own option for choosing between static
+and shared versions of the library, use cmake's built-in option
+for this:
+https://cmake.org/cmake/help/v3.0/variable/BUILD_SHARED_LIBS.html
+
+Set -DBUILD_SHARED_LIBS=ON to get a shared library, and omit it
+or set it to OFF to get a static one.
+Can add one extra line to the cmake file to make the default be
+shared. Makes most of the cmake crap go away.
+--- cmake_unofficial/CMakeLists.txt.orig	2016-08-11 18:18:57 UTC
++++ cmake_unofficial/CMakeLists.txt
+@@ -6,26 +6,14 @@ project(xxhash)
+ set(XXHASH_LIB_VERSION "0.42.0")
+ set(XXHASH_LIB_SOVERSION "0")
+ 
+-set(BUILD_SHARED_LIBS ON CACHE BOOL "Set to ON to build shared libraries")
+-if(BUILD_SHARED_LIBS)
+-  add_library(xxhash SHARED ../xxhash.c)
+-  set_target_properties(xxhash PROPERTIES COMPILE_DEFINITIONS "XXHASH_EXPORT"
++add_library(xxhash SHARED ../xxhash.c)
++set_target_properties(xxhash PROPERTIES COMPILE_DEFINITIONS "XXHASH_EXPORT"
+                          VERSION "${XXHASH_LIB_VERSION}"
+                          SOVERSION "${XXHASH_LIB_SOVERSION}")
+-  LIST(APPEND install_libs xxhash)
+-endif(BUILD_SHARED_LIBS)
+ 
+-set(BUILD_STATIC_LIBS ON CACHE BOOL "Set to ON to build static libraries")
+-if(BUILD_STATIC_LIBS)
+-  add_library(xxhashstatic ../xxhash.c)
+-  set_target_properties(xxhashstatic PROPERTIES OUTPUT_NAME xxhash)
+-  LIST(APPEND install_libs xxhashstatic)
+-endif(BUILD_STATIC_LIBS)
+-
+-
+ INSTALL(FILES ../xxhash.h DESTINATION include)
+ INSTALL(
+-    TARGETS ${install_libs}
++    TARGETS xxhash 
+     RUNTIME DESTINATION bin
+     ARCHIVE DESTINATION lib
+     LIBRARY DESTINATION lib

Modified: head/editors/codelite/Makefile
==============================================================================
--- head/editors/codelite/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/editors/codelite/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -19,7 +19,7 @@ BROKEN_armv6=		fails to configure: has leading or trai
 USE_GITHUB=	yes
 GH_ACCOUNT=	eranif
 
-USES=		cmake:outsource compiler:c++11-lib dos2unix execinfo gettext \
+USES=		cmake:outsource,noninja compiler:c++11-lib dos2unix execinfo gettext \
 		pathfix shebangfix sqlite
 USE_GNOME+=	cairo gtk20
 DOS2UNIX_GLOB=	*.cpp *.txt

Modified: head/editors/jucipp/Makefile
==============================================================================
--- head/editors/jucipp/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/editors/jucipp/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libaspell.so:textproc/aspell \
 		libclang.so:devel/llvm40
 
 USE_GNOME=	gdkpixbuf2 gtkmm30 gtksourceviewmm3
-USES=		cmake:outsource desktop-file-utils ninja pkgconfig
+USES=		cmake:outsource desktop-file-utils pkgconfig
 INSTALLS_ICONS=	yes
 
 USE_GITHUB=	yes

Modified: head/editors/kate-plugin-pate/Makefile
==============================================================================
--- head/editors/kate-plugin-pate/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/editors/kate-plugin-pate/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -9,7 +9,7 @@ DISTNAME=	kate-${PORTVERSION}
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Support for Python plugins in Kate
 
-USES=		cmake:outsource kde:4 python tar:xz
+USES=		cmake:outsource,noninja kde:4 python tar:xz
 USE_KDE=	kdelibs automoc4 kate \
 		pykde4_build pykde4_run
 USE_QT4=	gui webkit \

Modified: head/editors/neovim/Makefile
==============================================================================
--- head/editors/neovim/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/editors/neovim/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libunibilium.so:devel/unibilium \
 		libuv.so:devel/libuv \
 		libmsgpackc.so:devel/msgpack
 
-USES=		cmake:outsource gettext iconv ninja lua:build pathfix pkgconfig
+USES=		cmake:outsource gettext iconv lua:build pathfix pkgconfig
 USE_GITHUB=	yes
 GH_TUPLE=	libmpack:libmpack:1.0.5:libmpack \
 		libmpack:libmpack-lua:1.0.6:libmpack_lua

Modified: head/games/hedgewars/Makefile
==============================================================================
--- head/games/hedgewars/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/games/hedgewars/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -17,7 +17,7 @@ LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libphysfs.so:devel/physfs
 
-USES=		cmake desktop-file-utils lua:51 tar:bzip2
+USES=		cmake:noninja desktop-file-utils lua:51 tar:bzip2
 USE_SDL=	sdl mixer image ttf net
 USE_FPC=	opengl libpng rtl-objpas
 USE_QT4=	corelib gui moc_build network \

Modified: head/games/openclonk/Makefile
==============================================================================
--- head/games/openclonk/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/games/openclonk/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 
 BROKEN_powerpc64=	fails to compile: C4Texture.cpp:260:13: error: 'stoul' is not a member of 'std'
 
-USES=		compiler:c++14-lang cmake desktop-file-utils jpeg pkgconfig tar:bzip2
+USES=		compiler:c++14-lang cmake:noninja desktop-file-utils jpeg pkgconfig tar:bzip2
 USE_GL=		glew
 USE_GNOME=	gtk30
 USE_SDL=	sdl mixer

Modified: head/games/openmw/Makefile
==============================================================================
--- head/games/openmw/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/games/openmw/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenMW
 
-USES=		cmake:outsource compiler:c++14-lang ninja openal pkgconfig
+USES=		cmake:outsource compiler:c++14-lang openal pkgconfig
 USE_GL=		gl
 USE_QT5=	qmake_build buildtools_build core gui network opengl \
 		printsupport widgets

Modified: head/games/palomino/Makefile
==============================================================================
--- head/games/palomino/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/games/palomino/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -20,7 +20,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE_GNU_GPL_2.txt
 
 LIB_DEPENDS=	libosg.so:graphics/osg
 
-USES=		alias cmake lua:51 tar:xz
+USES=		alias cmake:noninja lua:51 tar:xz
 USE_GL=		gl
 
 MISC_VER=	20091027

Modified: head/games/solarus/Makefile
==============================================================================
--- head/games/solarus/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/games/solarus/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -23,7 +23,7 @@ MAKE_ARGS+=	DESTDIR=${STAGEDIR}
 USE_QT5=	buildtools_build core gui linguisttools_build widgets
 USE_SDL=	sdl2 ttf2 image2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES=		cmake qmake compiler:c++11-lib openal
+USES=		cmake:noninja qmake compiler:c++11-lib openal
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>

Modified: head/games/vavoom/Makefile
==============================================================================
--- head/games/vavoom/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/games/vavoom/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		cmake dos2unix jpeg tar:bzip2
+USES=		cmake:noninja dos2unix jpeg tar:bzip2
 DOS2UNIX_REGEX=	((.*\.(c|cpp|h|s|asm|inc|vc|ls|acs|cfg|txt|vs|mak|mgw"))$$|\/(makefile\..*|makefile|Makefile)$$)
 
 OPTIONS_DEFINE=	FLAC LAUNCHER MAD MIKMOD OPENAL OPTIMIZED_CFLAGS VORBIS SDL DOCS

Modified: head/graphics/aseprite/Makefile
==============================================================================
--- head/graphics/aseprite/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/graphics/aseprite/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -45,7 +45,7 @@ GH_TUPLE+=		aseprite:laf:e6d79aa:laf/laf
 GH_TUPLE+=		aseprite:stringencoders:f963507:stringencoders/laf/third_party/stringencoders
 GH_TUPLE+=		dacap:observable:27fa7f6:observable/src/observable
 
-USES=			cmake:outsource compiler:c++11-lib jpeg ninja pkgconfig
+USES=			cmake:outsource compiler:c++11-lib jpeg pkgconfig
 USE_XORG=		x11 xcursor xext xpm ice pixman sm xxf86dga xxf86vm
 USE_LDCONFIG=		yes
 

Modified: head/graphics/darktable/Makefile
==============================================================================
--- head/graphics/darktable/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/graphics/darktable/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -27,7 +27,7 @@ ONLY_FOR_ARCHS=		amd64 arm64
 ONLY_FOR_ARCHS_REASON=	uses SSE instructions and 64-bit address space
 
 USES=		cmake:outsource compiler:c++11-lib desktop-file-utils	\
-		jpeg ninja pkgconfig sqlite tar:xz
+		jpeg pkgconfig sqlite tar:xz
 USE_GL=		glu
 USE_GNOME=	cairo gtk30 intltool librsvg2 libxml2
 USE_XORG=	ice sm x11 xext xrandr

Modified: head/graphics/digikam-kde4/Makefile.common
==============================================================================
--- head/graphics/digikam-kde4/Makefile.common	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/graphics/digikam-kde4/Makefile.common	Sun Jun 25 21:07:58 2017	(r444324)
@@ -118,7 +118,7 @@ LICENSE?=	GPLv2
 USES+=		tar:bzip2
 
 .if !defined(NO_BUILD)
-USES+=		cmake kde:4
+USES+=		cmake:noninja kde:4
 USE_KDE+=	automoc4 kdelibs
 USE_QT4+=	qmake_build moc_build rcc_build uic_build
 

Added: head/graphics/ilmbase/files/patch-git_8eed7012
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ilmbase/files/patch-git_8eed7012	Sun Jun 25 21:07:58 2017	(r444324)
@@ -0,0 +1,59 @@
+From 8eed7012c10f1a835385d750fd55f228d1d35df9 Mon Sep 17 00:00:00 2001
+From: Ralph Potter <r.potter at bath.ac.uk>
+Date: Wed, 5 Nov 2014 16:16:55 +0000
+Subject: [PATCH] Resolve dependency issue building eLut.h/toFloat.h with
+ CMake/Ninja.
+
+---
+ IlmBase/Half/CMakeLists.txt | 23 +++++++++++------------
+ 1 file changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/IlmBase/Half/CMakeLists.txt b/IlmBase/Half/CMakeLists.txt
+index 6f9714d..958d1b0 100644
+--- Half/CMakeLists.txt
++++ Half/CMakeLists.txt
+@@ -1,23 +1,24 @@
+ # yue.nicholas at gmail.com
+ 
+ ADD_EXECUTABLE ( eLut eLut.cpp )
+-
+-ADD_CUSTOM_COMMAND (
+-  TARGET eLut POST_BUILD
+-  COMMAND eLut > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
++ADD_CUSTOM_COMMAND(
++  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
++  COMMAND eLut ARGS > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
++  DEPENDS eLut
+   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-)
++  )
+ SET_SOURCE_FILES_PROPERTIES(
+   ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
+   PROPERTIES HEADER_FILE_ONLY TRUE
+   )
+ 
+ ADD_EXECUTABLE ( toFloat toFloat.cpp )
+-ADD_CUSTOM_COMMAND (
+-  TARGET toFloat POST_BUILD
+-  COMMAND toFloat > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
++ADD_CUSTOM_COMMAND(
++  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
++  COMMAND toFloat ARGS > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
++  DEPENDS toFloat
+   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-)
++  )
+ SET_SOURCE_FILES_PROPERTIES(
+   ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
+   PROPERTIES HEADER_FILE_ONLY TRUE
+@@ -27,9 +28,7 @@ SET_SOURCE_FILES_PROPERTIES(
+   half.cpp
+   PROPERTIES
+   OBJECT_DEPENDS
+-  ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
+-  OBJECT_DEPENDS
+-  ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
++  "${CMAKE_CURRENT_BINARY_DIR}/eLut.h;${CMAKE_CURRENT_BINARY_DIR}/toFloat.h"
+   )
+ 
+ IF(BUILD_SHARED_LIBS)

Modified: head/graphics/inkscape/Makefile
==============================================================================
--- head/graphics/inkscape/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/graphics/inkscape/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -32,7 +32,7 @@ LIB_DEPENDS=	libpopt.so:devel/popt \
 
 USE_GNOME=	gtkmm24 libxml2 libxslt
 USES=		compiler:c++11-lib cmake cpe desktop-file-utils gnome \
-		iconv:wchar_t ninja jpeg pathfix pkgconfig python:2,build \
+		iconv:wchar_t jpeg pathfix pkgconfig python:2,build \
 		shebangfix tar:bzip2
 USE_XORG=	x11
 INSTALLS_ICONS=	yes

Modified: head/graphics/luxrender/Makefile
==============================================================================
--- head/graphics/luxrender/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/graphics/luxrender/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -28,7 +28,7 @@ CONFLICTS_INSTALL?=	${PORTNAME}14-1.4*
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	uses SSE instructions
 
-USES+=		bison cmake python:build tar:bzip2
+USES+=		bison cmake:noninja python:build tar:bzip2
 USE_GL=		glu
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-lux-${LUX_REV}

Modified: head/graphics/mitsuba/Makefile
==============================================================================
--- head/graphics/mitsuba/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/graphics/mitsuba/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -48,7 +48,6 @@ post-patch:
 
 post-install:
 # XXX: palliative; better fix installation routine not to pollute ${STAGEDIR}
-	@${RMDIR} ${STAGEDIR}${PREFIX}/share/mitsuba/data/ior/CMakeFiles/ior_database.dir
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/mitsuba/data/ior/CMakeFiles
 
 .include <bsd.port.mk>

Modified: head/graphics/opensubdiv/Makefile
==============================================================================
--- head/graphics/opensubdiv/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/graphics/opensubdiv/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -20,7 +20,7 @@ GH_PROJECT=	OpenSubdiv
 
 USE_LDCONFIG=	yes
 USE_GL=		glew
-USES=		cmake:outsource compiler pkgconfig
+USES=		cmake:outsource,noninja compiler pkgconfig
 USE_XORG=	x11 xi xcursor xrandr xxf86vm xinerama
 
 CMAKE_ARGS+=	-DNO_TUTORIALS:BOOL=ON -DNO_EXAMPLES:BOOL=ON \

Modified: head/graphics/osg-devel/Makefile
==============================================================================
--- head/graphics/osg-devel/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/graphics/osg-devel/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -132,12 +132,6 @@ FORCE_REQUIRE=	Threads OpenGL X11 JPEG PNG TIFF ZLIB		
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 && ${OSVERSION} < 1100000
-# workaround for make (?) problem leading to cflags
-# lost in osgjs
-USES+=			gmake
-.endif
-
 .if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MQT5}
 CMAKE_ARGS+=		-DOSG_USE_QT:BOOL=ON
 PLIST_SUB+=		QT=""

Modified: head/graphics/osgearth/Makefile
==============================================================================
--- head/graphics/osgearth/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/graphics/osgearth/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -21,7 +21,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	gwaldron
 
 USE_LDCONFIG=	yes
-USES=		cmake gmake pkgconfig sqlite
+USES=		cmake pkgconfig sqlite
 PLIST_SUB=	OSGVERSION=3.4.0
 
 CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH:PATH=${LOCALBASE}/include \

Modified: head/graphics/rawtherapee/Makefile
==============================================================================
--- head/graphics/rawtherapee/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/graphics/rawtherapee/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -48,7 +48,6 @@ CMAKE_ARGS+=	-DDOCDIR="${DOCSDIR}" \
 # any more. The CMP0056 policy must be explicitly set to NEW to ensure
 # linker flags are passed. Else -lomp is not found with clang.
 # See: https://cmake.org/cmake/help/v3.4/policy/CMP0056.html
-CMAKE_NINJA=	yes
 
 INSTALLS_ICONS=	yes
 

Modified: head/graphics/tulip/Makefile
==============================================================================
--- head/graphics/tulip/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/graphics/tulip/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -22,7 +22,7 @@ BROKEN_powerpc64=	fails to link: libOGDF.so: undefined
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		cmake:outsource compiler:c++11-lib dos2unix execinfo jpeg python \
+USES=		cmake:outsource,noninja compiler:c++11-lib dos2unix execinfo jpeg python \
 		shebangfix
 SHEBANG_FILES=	tulip-config.in
 DOS2UNIX_FILES=	software/tulip/src/main.cpp

Modified: head/graphics/waffle/Makefile
==============================================================================
--- head/graphics/waffle/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/graphics/waffle/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -12,7 +12,7 @@ COMMENT=	Library that allows to defer selection of an 
 
 LICENSE=	BSD2CLAUSE
 
-USES=		cmake:outsource compiler:c11 localbase ninja pathfix pkgconfig tar:xz
+USES=		cmake:outsource compiler:c11 localbase pathfix pkgconfig tar:xz
 USE_GL=		egl gl
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xcb

Modified: head/graphics/xcftools/Makefile
==============================================================================
--- head/graphics/xcftools/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/graphics/xcftools/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -18,7 +18,7 @@ GH_ACCOUNT=	j-jorge
 GH_TAGNAME=	d72ba82
 
 # option NLS (for gettext) is wrong as this port allways needs NLS:
-USES=	libtool cmake gmake iconv pkgconfig perl5 gettext
+USES=	libtool cmake:noninja gmake iconv pkgconfig perl5 gettext
 USE_PERL5=	build run
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

Modified: head/irc/weechat/Makefile
==============================================================================
--- head/irc/weechat/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/irc/weechat/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -16,7 +16,7 @@ LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error
 
-USES=		cmake:outsource ncurses tar:xz
+USES=		cmake:outsource,noninja ncurses tar:xz
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DENABLE_GUILE=no \

Modified: head/lang/beignet/Makefile
==============================================================================
--- head/lang/beignet/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/lang/beignet/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -23,7 +23,7 @@ RUN_DEPENDS=	opencl>=0:devel/opencl \
 
 WRKSRC=		${WRKDIR}/Beignet-${PORTVERSION}-Source
 
-USES=		cmake gmake ncurses pkgconfig shebangfix
+USES=		cmake ncurses pkgconfig shebangfix
 USE_XORG=	sm ice x11 xext xfixes
 USE_GL=		gl egl
 USE_LDCONFIG=	${LOCALBASE}/lib/${PORTNAME}

Modified: head/lang/io/Makefile
==============================================================================
--- head/lang/io/Makefile	Sun Jun 25 20:40:05 2017	(r444323)
+++ head/lang/io/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
@@ -17,7 +17,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	stevedekorte
 GH_TAGNAME=	23afbcc
 
-USES=		cmake:outsource compiler:c11

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list