D10748.diff
No OneTemporary
Actions

Size

57 KB

Referenced Files

None

Subscribers

None

D10748.diff
View Options

	Index: head/CHANGES
	===================================================================
	--- head/CHANGES
	+++ head/CHANGES
	@@ -10,6 +10,20 @@

	All ports committers are allowed to commit to this file.

	+20170625:
	+AUTHOR: kde@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@FreeBSD.org

	Index: head/Mk/Uses/cmake.mk
	===================================================================
	--- head/Mk/Uses/cmake.mk
	+++ head/Mk/Uses/cmake.mk
	@@ -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_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 @@
	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)
	Index: head/Mk/bsd.sanity.mk
	===================================================================
	--- head/Mk/bsd.sanity.mk
	+++ head/Mk/bsd.sanity.mk
	@@ -181,7 +181,7 @@
	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 @@
	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
	Index: head/astro/marble/Makefile
	===================================================================
	--- head/astro/marble/Makefile
	+++ head/astro/marble/Makefile
	@@ -10,7 +10,7 @@

	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 \
	Index: head/audio/csound6/Makefile
	===================================================================
	--- head/audio/csound6/Makefile
	+++ head/audio/csound6/Makefile
	@@ -23,7 +23,7 @@
	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 \
	Index: head/audio/fluidsynth/Makefile
	===================================================================
	--- head/audio/fluidsynth/Makefile
	+++ head/audio/fluidsynth/Makefile
	@@ -18,7 +18,7 @@
	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
	Index: head/audio/libgme/Makefile
	===================================================================
	--- head/audio/libgme/Makefile
	+++ head/audio/libgme/Makefile
	@@ -11,7 +11,7 @@

	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
	Index: head/cad/kicad/Makefile
	===================================================================
	--- head/cad/kicad/Makefile
	+++ head/cad/kicad/Makefile
	@@ -19,7 +19,7 @@

	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
	Index: head/cad/opencascade/Makefile
	===================================================================
	--- head/cad/opencascade/Makefile
	+++ head/cad/opencascade/Makefile
	@@ -21,7 +21,7 @@

	# 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/*
	Index: head/cad/openvsp/Makefile
	===================================================================
	--- head/cad/openvsp/Makefile
	+++ head/cad/openvsp/Makefile
	@@ -32,7 +32,7 @@

	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 \
	Index: head/chinese/fcitx/Makefile
	===================================================================
	--- head/chinese/fcitx/Makefile
	+++ head/chinese/fcitx/Makefile
	@@ -39,7 +39,7 @@
	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
	Index: head/chinese/ibus-chewing/Makefile
	===================================================================
	--- head/chinese/ibus-chewing/Makefile
	+++ head/chinese/ibus-chewing/Makefile
	@@ -20,7 +20,7 @@
	-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

	Index: head/comms/uhd/Makefile
	===================================================================
	--- head/comms/uhd/Makefile
	+++ head/comms/uhd/Makefile
	@@ -26,7 +26,7 @@

	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
	Index: head/comms/usrp/Makefile
	===================================================================
	--- head/comms/usrp/Makefile
	+++ head/comms/usrp/Makefile
	@@ -17,7 +17,7 @@
	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
	Index: head/databases/cppdb/Makefile
	===================================================================
	--- head/databases/cppdb/Makefile
	+++ head/databases/cppdb/Makefile
	@@ -41,7 +41,7 @@
	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>

	Index: head/databases/evolution-data-server/Makefile
	===================================================================
	--- head/databases/evolution-data-server/Makefile
	+++ head/databases/evolution-data-server/Makefile
	@@ -30,7 +30,7 @@
	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
	Index: head/databases/mariadb100-server/Makefile
	===================================================================
	--- head/databases/mariadb100-server/Makefile
	+++ head/databases/mariadb100-server/Makefile
	@@ -29,7 +29,7 @@
	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
	Index: head/databases/mariadb55-server/Makefile
	===================================================================
	--- head/databases/mariadb55-server/Makefile
	+++ head/databases/mariadb55-server/Makefile
	@@ -24,7 +24,7 @@
	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]

	Index: head/databases/mysql55-server/Makefile
	===================================================================
	--- head/databases/mysql55-server/Makefile
	+++ head/databases/mysql55-server/Makefile
	@@ -14,7 +14,7 @@
	LICENSE= GPLv2

	SLAVEDIRS= databases/mysql55-client
	-USES= cmake readline shebangfix
	+USES= cmake:noninja readline shebangfix
	CXXFLAGS+= ${CPPFLAGS}
	NO_OPTIONS_SORT=yes

	Index: head/databases/mysql56-server/Makefile
	===================================================================
	--- head/databases/mysql56-server/Makefile
	+++ head/databases/mysql56-server/Makefile
	@@ -13,7 +13,7 @@
	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
	Index: head/databases/mysql57-server/Makefile
	===================================================================
	--- head/databases/mysql57-server/Makefile
	+++ head/databases/mysql57-server/Makefile
	@@ -16,7 +16,7 @@
	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
	Index: head/databases/mysql80-server/Makefile
	===================================================================
	--- head/databases/mysql80-server/Makefile
	+++ head/databases/mysql80-server/Makefile
	@@ -18,7 +18,7 @@
	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
	Index: head/databases/mysqlwsrep56-server/Makefile
	===================================================================
	--- head/databases/mysqlwsrep56-server/Makefile
	+++ head/databases/mysqlwsrep56-server/Makefile
	@@ -22,7 +22,7 @@
	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

	Index: head/databases/percona55-server/Makefile
	===================================================================
	--- head/databases/percona55-server/Makefile
	+++ head/databases/percona55-server/Makefile
	@@ -12,7 +12,7 @@
	COMMENT?= Multithreaded SQL database (server)

	SLAVEDIRS= databases/percona55-client
	-USES= bison cmake readline shebangfix
	+USES= bison cmake:noninja readline shebangfix

	CXXFLAGS+= ${CPPFLAGS}

	Index: head/databases/percona56-server/Makefile
	===================================================================
	--- head/databases/percona56-server/Makefile
	+++ head/databases/percona56-server/Makefile
	@@ -17,7 +17,7 @@

	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
	Index: head/databases/percona57-server/Makefile
	===================================================================
	--- head/databases/percona57-server/Makefile
	+++ head/databases/percona57-server/Makefile
	@@ -24,7 +24,7 @@

	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
	Index: head/databases/tarantool/Makefile
	===================================================================
	--- head/databases/tarantool/Makefile
	+++ head/databases/tarantool/Makefile
	@@ -15,7 +15,7 @@
	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
	Index: head/databases/xtrabackup/Makefile
	===================================================================
	--- head/databases/xtrabackup/Makefile
	+++ head/databases/xtrabackup/Makefile
	@@ -29,7 +29,7 @@
	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

	Index: head/deskutils/kdeconnect/Makefile
	===================================================================
	--- head/deskutils/kdeconnect/Makefile
	+++ head/deskutils/kdeconnect/Makefile
	@@ -9,7 +9,7 @@
	MAINTAINER= yurkis@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
	Index: head/deskutils/kdepim4/Makefile
	===================================================================
	--- head/deskutils/kdepim4/Makefile
	+++ head/deskutils/kdepim4/Makefile
	@@ -24,7 +24,7 @@
	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
	Index: head/deskutils/owncloudclient/Makefile
	===================================================================
	--- head/deskutils/owncloudclient/Makefile
	+++ head/deskutils/owncloudclient/Makefile
	@@ -14,7 +14,7 @@
	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
	Index: head/devel/bullet/Makefile
	===================================================================
	--- head/devel/bullet/Makefile
	+++ head/devel/bullet/Makefile
	@@ -22,6 +22,7 @@
	USE_XORG= x11

	CMAKE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON \
	+ -DINSTALL_LIBS:BOOL=ON \
	-DBUILD_BULLET2_DEMOS:BOOL=OFF

	PORTDOCS= *
	Index: head/devel/compiler-rt/Makefile
	===================================================================
	--- head/devel/compiler-rt/Makefile
	+++ head/devel/compiler-rt/Makefile
	@@ -21,7 +21,6 @@

	USES= cmake tar:bzip2
	USE_LDCONFIG= yes
	-MAKE_ARGS= VERBOSE=1

	LLVM_SVN= http://llvm.org/svn/llvm-project

	Index: head/devel/doxygen/Makefile
	===================================================================
	--- head/devel/doxygen/Makefile
	+++ head/devel/doxygen/Makefile
	@@ -15,7 +15,7 @@
	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
	Index: head/devel/flang-clang/Makefile
	===================================================================
	--- head/devel/flang-clang/Makefile
	+++ head/devel/flang-clang/Makefile
	@@ -19,7 +19,7 @@
	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
	Index: head/devel/flang/Makefile
	===================================================================
	--- head/devel/flang/Makefile
	+++ head/devel/flang/Makefile
	@@ -26,7 +26,7 @@
	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}
	Index: head/devel/kapptemplate/Makefile
	===================================================================
	--- head/devel/kapptemplate/Makefile
	+++ head/devel/kapptemplate/Makefile
	@@ -8,7 +8,7 @@
	MAINTAINER= kde@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
	Index: head/devel/kdevelop-kde4/Makefile
	===================================================================
	--- head/devel/kdevelop-kde4/Makefile
	+++ head/devel/kdevelop-kde4/Makefile
	@@ -14,7 +14,7 @@
	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 \
	Index: head/devel/kdevelop-php/Makefile
	===================================================================
	--- head/devel/kdevelop-php/Makefile
	+++ head/devel/kdevelop-php/Makefile
	@@ -13,7 +13,7 @@
	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
	Index: head/devel/libzrtpcpp/Makefile
	===================================================================
	--- head/devel/libzrtpcpp/Makefile
	+++ head/devel/libzrtpcpp/Makefile
	@@ -13,7 +13,7 @@
	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}" \
	Index: head/devel/llvm-cheri/Makefile
	===================================================================
	--- head/devel/llvm-cheri/Makefile
	+++ head/devel/llvm-cheri/Makefile
	@@ -17,7 +17,7 @@
	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 \
	Index: head/devel/llvm-devel/Makefile
	===================================================================
	--- head/devel/llvm-devel/Makefile
	+++ head/devel/llvm-devel/Makefile
	@@ -16,7 +16,7 @@
	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
	Index: head/devel/llvm38/Makefile
	===================================================================
	--- head/devel/llvm38/Makefile
	+++ head/devel/llvm38/Makefile
	@@ -24,7 +24,7 @@
	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 \
	Index: head/devel/llvm39/Makefile
	===================================================================
	--- head/devel/llvm39/Makefile
	+++ head/devel/llvm39/Makefile
	@@ -27,7 +27,7 @@
	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}
	Index: head/devel/llvm40/Makefile
	===================================================================
	--- head/devel/llvm40/Makefile
	+++ head/devel/llvm40/Makefile
	@@ -27,7 +27,7 @@
	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}
	Index: head/devel/mongo-c-driver/Makefile
	===================================================================
	--- head/devel/mongo-c-driver/Makefile
	+++ head/devel/mongo-c-driver/Makefile
	@@ -17,7 +17,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= mongodb

	-USES= cmake pkgconfig
	+USES= cmake:noninja pkgconfig
	USE_LDCONFIG= yes
	LDFLAGS+= -pthread

	Index: head/devel/rapidjson/Makefile
	===================================================================
	--- head/devel/rapidjson/Makefile
	+++ head/devel/rapidjson/Makefile
	@@ -36,7 +36,6 @@
	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
	Index: head/devel/tesla/Makefile
	===================================================================
	--- head/devel/tesla/Makefile
	+++ head/devel/tesla/Makefile
	@@ -16,7 +16,7 @@

	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
	Index: head/devel/xxhash/files/patch-git_5ab73ee
	===================================================================
	--- head/devel/xxhash/files/patch-git_5ab73ee
	+++ head/devel/xxhash/files/patch-git_5ab73ee
	@@ -0,0 +1,46 @@
	+From 5ab73ee82245b586f69762411edc7824d778ee2a Mon Sep 17 00:00:00 2001
	+From: Chris Kitching <chriskitching@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
	Index: head/editors/codelite/Makefile
	===================================================================
	--- head/editors/codelite/Makefile
	+++ head/editors/codelite/Makefile
	@@ -19,7 +19,7 @@
	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
	Index: head/editors/jucipp/Makefile
	===================================================================
	--- head/editors/jucipp/Makefile
	+++ head/editors/jucipp/Makefile
	@@ -18,7 +18,7 @@
	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
	Index: head/editors/kate-plugin-pate/Makefile
	===================================================================
	--- head/editors/kate-plugin-pate/Makefile
	+++ head/editors/kate-plugin-pate/Makefile
	@@ -9,7 +9,7 @@
	MAINTAINER= kde@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 \
	Index: head/editors/neovim/Makefile
	===================================================================
	--- head/editors/neovim/Makefile
	+++ head/editors/neovim/Makefile
	@@ -21,7 +21,7 @@
	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
	Index: head/games/hedgewars/Makefile
	===================================================================
	--- head/games/hedgewars/Makefile
	+++ head/games/hedgewars/Makefile
	@@ -17,7 +17,7 @@

	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 \
	Index: head/games/openclonk/Makefile
	===================================================================
	--- head/games/openclonk/Makefile
	+++ head/games/openclonk/Makefile
	@@ -23,7 +23,7 @@

	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
	Index: head/games/openmw/Makefile
	===================================================================
	--- head/games/openmw/Makefile
	+++ head/games/openmw/Makefile
	@@ -23,7 +23,7 @@
	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
	Index: head/games/palomino/Makefile
	===================================================================
	--- head/games/palomino/Makefile
	+++ head/games/palomino/Makefile
	@@ -20,7 +20,7 @@

	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
	Index: head/games/solarus/Makefile
	===================================================================
	--- head/games/solarus/Makefile
	+++ head/games/solarus/Makefile
	@@ -23,7 +23,7 @@
	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>
	Index: head/games/vavoom/Makefile
	===================================================================
	--- head/games/vavoom/Makefile
	+++ head/games/vavoom/Makefile
	@@ -14,7 +14,7 @@

	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
	Index: head/graphics/aseprite/Makefile
	===================================================================
	--- head/graphics/aseprite/Makefile
	+++ head/graphics/aseprite/Makefile
	@@ -45,7 +45,7 @@
	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

	Index: head/graphics/darktable/Makefile
	===================================================================
	--- head/graphics/darktable/Makefile
	+++ head/graphics/darktable/Makefile
	@@ -27,7 +27,7 @@
	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
	Index: head/graphics/digikam-kde4/Makefile.common
	===================================================================
	--- head/graphics/digikam-kde4/Makefile.common
	+++ head/graphics/digikam-kde4/Makefile.common
	@@ -118,7 +118,7 @@
	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

	Index: head/graphics/ilmbase/files/patch-git_8eed7012
	===================================================================
	--- head/graphics/ilmbase/files/patch-git_8eed7012
	+++ head/graphics/ilmbase/files/patch-git_8eed7012
	@@ -0,0 +1,59 @@
	+From 8eed7012c10f1a835385d750fd55f228d1d35df9 Mon Sep 17 00:00:00 2001
	+From: Ralph Potter <r.potter@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@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)
	Index: head/graphics/inkscape/Makefile
	===================================================================
	--- head/graphics/inkscape/Makefile
	+++ head/graphics/inkscape/Makefile
	@@ -32,7 +32,7 @@

	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
	Index: head/graphics/luxrender/Makefile
	===================================================================
	--- head/graphics/luxrender/Makefile
	+++ head/graphics/luxrender/Makefile
	@@ -28,7 +28,7 @@
	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}
	Index: head/graphics/mitsuba/Makefile
	===================================================================
	--- head/graphics/mitsuba/Makefile
	+++ head/graphics/mitsuba/Makefile
	@@ -48,7 +48,6 @@

	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>
	Index: head/graphics/opensubdiv/Makefile
	===================================================================
	--- head/graphics/opensubdiv/Makefile
	+++ head/graphics/opensubdiv/Makefile
	@@ -20,7 +20,7 @@

	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 \
	Index: head/graphics/osg-devel/Makefile
	===================================================================
	--- head/graphics/osg-devel/Makefile
	+++ head/graphics/osg-devel/Makefile
	@@ -132,12 +132,6 @@

	.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=""
	Index: head/graphics/osgearth/Makefile
	===================================================================
	--- head/graphics/osgearth/Makefile
	+++ head/graphics/osgearth/Makefile
	@@ -21,7 +21,7 @@
	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 \
	Index: head/graphics/rawtherapee/Makefile
	===================================================================
	--- head/graphics/rawtherapee/Makefile
	+++ head/graphics/rawtherapee/Makefile
	@@ -48,7 +48,6 @@
	# 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

	Index: head/graphics/tulip/Makefile
	===================================================================
	--- head/graphics/tulip/Makefile
	+++ head/graphics/tulip/Makefile
	@@ -22,7 +22,7 @@

	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
	Index: head/graphics/waffle/Makefile
	===================================================================
	--- head/graphics/waffle/Makefile
	+++ head/graphics/waffle/Makefile
	@@ -12,7 +12,7 @@

	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
	Index: head/graphics/xcftools/Makefile
	===================================================================
	--- head/graphics/xcftools/Makefile
	+++ head/graphics/xcftools/Makefile
	@@ -18,7 +18,7 @@
	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
	Index: head/irc/weechat/Makefile
	===================================================================
	--- head/irc/weechat/Makefile
	+++ head/irc/weechat/Makefile
	@@ -16,7 +16,7 @@
	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 \
	Index: head/lang/beignet/Makefile
	===================================================================
	--- head/lang/beignet/Makefile
	+++ head/lang/beignet/Makefile
	@@ -23,7 +23,7 @@

	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}
	Index: head/lang/io/Makefile
	===================================================================
	--- head/lang/io/Makefile
	+++ head/lang/io/Makefile
	@@ -17,7 +17,7 @@
	GH_ACCOUNT= stevedekorte
	GH_TAGNAME= 23afbcc

	-USES= cmake:outsource compiler:c11
	+USES= cmake:outsource,noninja compiler:c11
	MAKE_JOBS_UNSAFE=yes
	USE_LDCONFIG= yes

	Index: head/lang/sagittarius-scheme/Makefile
	===================================================================
	--- head/lang/sagittarius-scheme/Makefile
	+++ head/lang/sagittarius-scheme/Makefile
	@@ -20,7 +20,7 @@
	libgc-threaded.so:devel/boehm-gc-threaded

	USE_LDCONFIG= yes
	-USES= cmake gmake pkgconfig
	+USES= cmake pkgconfig
	ONLY_FOR_ARCHS= amd64 i386
	MAKE_JOBS_UNSAFE= yes

	Index: head/mail/evolution-ews/Makefile
	===================================================================
	--- head/mail/evolution-ews/Makefile
	+++ head/mail/evolution-ews/Makefile
	@@ -23,7 +23,7 @@

	PORTSCOUT= limitw:1,even

	-USES= bdb:5 cmake ninja gettext gnome localbase pathfix \
	+USES= bdb:5 cmake gettext gnome localbase pathfix \
	pkgconfig sqlite tar:xz
	USE_GNOME= cairo gdkpixbuf2 evolutiondataserver3 intltool

	Index: head/mail/evolution/Makefile
	===================================================================
	--- head/mail/evolution/Makefile
	+++ head/mail/evolution/Makefile
	@@ -41,7 +41,7 @@
	PORTSCOUT= limitw:1,even

	USES= desktop-file-utils cmake gettext gnome iconv:wchar_t \
	- sqlite libarchive ninja localbase pathfix pkgconfig tar:xz
	+ sqlite libarchive localbase pathfix pkgconfig tar:xz
	USE_GNOME= cairo evolutiondataserver3 gnomedesktop3 intltool
	GNU_CONFIGURE= yes
	USE_XORG= x11
	Index: head/mail/libcmime/Makefile
	===================================================================
	--- head/mail/libcmime/Makefile
	+++ head/mail/libcmime/Makefile
	@@ -12,7 +12,7 @@

	LICENSE= MIT

	-USES= bison cmake pkgconfig
	+USES= bison cmake:noninja pkgconfig
	USE_LDCONFIG= yes
	CMAKE_ARGS= --no-warn-unused-cli

	Index: head/mail/libvmime/Makefile
	===================================================================
	--- head/mail/libvmime/Makefile
	+++ head/mail/libvmime/Makefile
	@@ -20,7 +20,7 @@
	GH_ACCOUNT= kisli
	GH_PROJECT= vmime

	-USES= cmake:outsource compiler:c++11-lib iconv pkgconfig
	+USES= cmake:outsource,noninja compiler:c++11-lib iconv pkgconfig
	USE_LDCONFIG= yes

	CMAKE_ARGS= -DLIB_SUFFIX:STRING="" \
	Index: head/mail/spmfilter-clamav/Makefile
	===================================================================
	--- head/mail/spmfilter-clamav/Makefile
	+++ head/mail/spmfilter-clamav/Makefile
	@@ -12,7 +12,7 @@
	BUILD_DEPENDS= spmfilter>=0.6:mail/spmfilter
	RUN_DEPENDS= spmfilter>=0.6:mail/spmfilter

	-USES= cmake pkgconfig
	+USES= cmake:noninja pkgconfig
	CMAKE_ARGS+= --no-warn-unused-cli \
	-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
	-DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib"
	Index: head/mail/spmfilter/Makefile
	===================================================================
	--- head/mail/spmfilter/Makefile
	+++ head/mail/spmfilter/Makefile
	@@ -20,7 +20,7 @@
	SMFGROUP?= mail
	SMFDIR?= /var/spool/spmfilter

	-USES= cmake pkgconfig
	+USES= cmake:noninja pkgconfig
	CMAKE_ARGS+= --no-warn-unused-cli \
	-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
	-DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib"
	Index: head/math/metis/Makefile
	===================================================================
	--- head/math/metis/Makefile
	+++ head/math/metis/Makefile
	@@ -14,7 +14,7 @@

	CONFLICTS= metis4-4* metis-edf-[0-9]*

	-USES= cmake
	+USES= cmake:noninja

	OPTIONS_DEFINE= OPENMP SHARED STATIC DOCS

	Index: head/math/parmetis/Makefile
	===================================================================
	--- head/math/parmetis/Makefile
	+++ head/math/parmetis/Makefile
	@@ -20,7 +20,7 @@
	OPTIONS_DEFINE= OPENMPI DOCS
	OPENMPI_DESC= Use openmpi instead of mpich2

	-USES= cmake gmake
	+USES= cmake:noninja gmake

	PLIST_FILES= include/parmetis/metis.h \
	include/parmetis/parmetis.h \
	Index: head/math/stp/Makefile
	===================================================================
	--- head/math/stp/Makefile
	+++ head/math/stp/Makefile
	@@ -15,7 +15,7 @@
	LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \
	libboost_system.so:devel/boost-libs

	-USES= bison:build cmake perl5 tar:xz
	+USES= bison:build cmake:noninja perl5 tar:xz
	USE_PERL5= build
	CMAKE_ARGS= -DFL_LIBRARY=/usr/lib/libfl.a

	Index: head/multimedia/avidemux/Makefile.common
	===================================================================
	--- head/multimedia/avidemux/Makefile.common
	+++ head/multimedia/avidemux/Makefile.common
	@@ -19,7 +19,7 @@

	OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options

	-USES= cmake:outsource pkgconfig iconv gmake compiler:features sqlite
	+USES= cmake:outsource,noninja pkgconfig iconv gmake compiler:features sqlite
	USES+= dos2unix execinfo
	DOS2UNIX_FILES= cmake/admCheckMiscLibs.cmake \
	avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoCodec6_export.h \
	Index: head/multimedia/gstreamer-qt4/Makefile
	===================================================================
	--- head/multimedia/gstreamer-qt4/Makefile
	+++ head/multimedia/gstreamer-qt4/Makefile
	@@ -17,7 +17,7 @@

	LIB_DEPENDS= libboost_thread.so:devel/boost-libs

	-USES= bison cmake gmake kde:4 pathfix pkgconfig tar:bzip2
	+USES= bison cmake:noninja gmake kde:4 pathfix pkgconfig tar:bzip2
	USE_LDCONFIG= yes
	USE_GSTREAMER= yes
	USE_GNOME= glib20
	Index: head/multimedia/plexhometheater/Makefile
	===================================================================
	--- head/multimedia/plexhometheater/Makefile
	+++ head/multimedia/plexhometheater/Makefile
	@@ -67,7 +67,7 @@
	GH_PROJECT= plex-home-theater-public
	BUNDLE_LIBS= yes

	-USES= cmake:outsource execinfo gmake iconv:wchar_t jpeg pkgconfig python:2
	+USES= cmake:outsource execinfo iconv:wchar_t jpeg pkgconfig python:2
	CMAKE_ARGS+= -DENABLE_AUTOUPDATE:BOOL=false
	CMAKE_ARGS+= -DENABLE_DUMP_SYMBOLS:BOOL=false
	CMAKE_ARGS+= -DENABLE_PYTHON:BOOL=false
	Index: head/multimedia/zoneminder-h264/Makefile
	===================================================================
	--- head/multimedia/zoneminder-h264/Makefile
	+++ head/multimedia/zoneminder-h264/Makefile
	@@ -40,7 +40,7 @@
	GH_TUPLE= zoneminder:ZoneMinder:e723b6d \
	FriendsOfCake:crud:c3976f1:crud

	-USES= cmake jpeg mysql perl5 php shebangfix ssl
	+USES= cmake:noninja jpeg mysql perl5 php shebangfix ssl
	USE_RC_SUBR= zoneminder
	USE_PHP= json pdo_mysql session gd sockets ctype

	Index: head/multimedia/zoneminder/Makefile
	===================================================================
	--- head/multimedia/zoneminder/Makefile
	+++ head/multimedia/zoneminder/Makefile
	@@ -34,7 +34,7 @@
	GH_PROJECT= ZoneMinder
	GH_TUPLE= FriendsOfCake:crud:c3976f1:crud

	-USES= cmake jpeg mysql perl5 php shebangfix ssl
	+USES= cmake:noninja jpeg mysql perl5 php shebangfix ssl
	USE_RC_SUBR= zoneminder
	USE_PHP= json pdo_mysql session gd sockets ctype opcache

	Index: head/net-im/licq/Makefile
	===================================================================
	--- head/net-im/licq/Makefile
	+++ head/net-im/licq/Makefile
	@@ -16,7 +16,7 @@

	BROKEN_sparc64= Does not build: fails to link

	-USES= cmake iconv ssl
	+USES= cmake:noninja iconv ssl
	WRKSRC= ${WRKDIR}/${DISTNAME}
	LICQ_PORT?= net-im/licq

	Index: head/net-im/ring-gnome/Makefile
	===================================================================
	--- head/net-im/ring-gnome/Makefile
	+++ head/net-im/ring-gnome/Makefile
	@@ -30,7 +30,7 @@

	SUB_FILES= pkg-message

	-USES= cmake compiler:c++14-lang gettext gmake pkgconfig shebangfix sqlite
	+USES= cmake compiler:c++14-lang gettext pkgconfig shebangfix sqlite
	USE_GNOME= evolutiondataserver3 glib20 gtk20 cairo gdkpixbuf2 libxml2 gtk30
	USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr xscrnsaver
	USE_GL= gl egl
	Index: head/net-im/ring-libclient/Makefile
	===================================================================
	--- head/net-im/ring-libclient/Makefile
	+++ head/net-im/ring-libclient/Makefile
	@@ -18,7 +18,7 @@
	#GH_TUPLE+= savoirfairelinux:ring-lrc:9eaac77
	GH_TUPLE+= savoirfairelinux:ring-lrc:cb5ee04

	-USES= cmake compiler:c++14-lang gmake
	+USES= cmake compiler:c++14-lang
	USE_GNOME= glib20 gtk20 cairo gdkpixbuf2
	USE_XORG= x11 xscrnsaver
	USE_GL= gl
	Index: head/net/ceph-devel/Makefile
	===================================================================
	--- head/net/ceph-devel/Makefile
	+++ head/net/ceph-devel/Makefile
	@@ -74,7 +74,7 @@
	-D WITH_CEPHFS:BOOL=OFF \
	-D WITH_EMBEDDED:BOOL=OFF

	-USES= gmake cmake:outsource python:2.7 fuse gettext-runtime shebangfix
	+USES= gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix
	SHEBANG_FILES=src/rbdmap src/ceph-post-file.in src/rbd-replay-many \
	src/brag/client/ceph-brag src/ceph-rest-api \
	src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \
	Index: head/net/tigervnc/Makefile
	===================================================================
	--- head/net/tigervnc/Makefile
	+++ head/net/tigervnc/Makefile
	@@ -28,7 +28,7 @@
	tightvnc-[0-9]* \
	tridiavnc-[0-9]*

	-USES= autoreconf:build cmake cpe iconv jpeg libtool pkgconfig \
	+USES= autoreconf:build cmake:noninja cpe iconv jpeg libtool pkgconfig \
	python ssl
	USE_GL= gl
	USE_LDCONFIG= yes
	Index: head/science/paraview/Makefile
	===================================================================
	--- head/science/paraview/Makefile
	+++ head/science/paraview/Makefile
	@@ -42,7 +42,7 @@
	USE_XORG= x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm
	USE_LDCONFIG= yes
	USE_GSTREAMER= yes
	-USES= alias desktop-file-utils cmake:outsource execinfo gmake jpeg python shebangfix
	+USES= alias desktop-file-utils cmake:outsource execinfo jpeg python shebangfix
	INSTALLS_ICONS= yes

	CMAKE_ARGS+= -DBUILD_SHARED_LIBS="ON" \
	Index: head/security/kwalletmanager/Makefile
	===================================================================
	--- head/security/kwalletmanager/Makefile
	+++ head/security/kwalletmanager/Makefile
	@@ -9,7 +9,7 @@
	MAINTAINER= kde@FreeBSD.org
	COMMENT= Password manager for KDE

	-USES= cmake:outsource gmake kde:4 tar:xz
	+USES= cmake:outsource kde:4 tar:xz
	USE_KDE= automoc4 kdelibs
	USE_QT4= qmake_build moc_build rcc_build uic_build

	Index: head/security/libzrtpcppcore/Makefile
	===================================================================
	--- head/security/libzrtpcppcore/Makefile
	+++ head/security/libzrtpcppcore/Makefile
	@@ -16,7 +16,7 @@
	GH_ACCOUNT= wernerd
	GH_PROJECT= ZRTPCPP

	-USES= cmake:outsource compiler:c++11-lib
	+USES= cmake:outsource,noninja compiler:c++11-lib
	USE_CXXSTD= c++11
	CMAKE_ARGS= -DCORE_LIB:BOOL=ON
	USE_LDCONFIG= yes
	Index: head/sysutils/baloo/Makefile
	===================================================================
	--- head/sysutils/baloo/Makefile
	+++ head/sysutils/baloo/Makefile
	@@ -14,7 +14,7 @@
	LIB_DEPENDS= libxapian.so:databases/xapian-core \
	libqjson.so:devel/qjson

	-USES= cmake:outsource gmake kde:4 tar:xz
	+USES= cmake:outsource kde:4 tar:xz
	USE_KDE= akonadi automoc4 kdelibs kfilemetadata \
	pimlibs
	USE_QT4= corelib qmake_build moc_build rcc_build uic_build
	Index: head/sysutils/conky/Makefile
	===================================================================
	--- head/sysutils/conky/Makefile
	+++ head/sysutils/conky/Makefile
	@@ -19,7 +19,7 @@
	CONFLICTS?= conky-awesome-[0-9]*
	SLAVEDIRS= sysutils/conky-awesome

	-USES= cpe cmake compiler:c++11-lib gettext-runtime iconv \
	+USES= cpe cmake:noninja compiler:c++11-lib gettext-runtime iconv \
	localbase lua:51 pkgconfig tar:bzip2
	CMAKE_ARGS+= -DBUILD_PORT_MONITORS:BOOL=false \
	-DBUILD_IBM:BOOL=false \
	Index: head/sysutils/fluent-bit/Makefile
	===================================================================
	--- head/sysutils/fluent-bit/Makefile
	+++ head/sysutils/fluent-bit/Makefile
	@@ -17,7 +17,7 @@
	BROKEN_mips64= fails to build: conflicting types for 'restrict'
	BROKEN_powerpc64= fails to build: cast from pointer to integer of different size

	-USES= cmake
	+USES= cmake:noninja

	USE_RC_SUBR= ${PORTNAME}

	Index: head/sysutils/kcm-polkit-kde/Makefile
	===================================================================
	--- head/sysutils/kcm-polkit-kde/Makefile
	+++ head/sysutils/kcm-polkit-kde/Makefile
	@@ -14,7 +14,7 @@
	LIB_DEPENDS= libpolkit-qt-agent-1.so:sysutils/polkit-qt
	RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde

	-USES= cmake gmake kde:4 pkgconfig tar:bzip2
	+USES= cmake kde:4 pkgconfig tar:bzip2
	USE_KDE= kdelibs automoc4
	USE_QT4= dbus xml moc_build qmake_build rcc_build uic_build
	USE_LDCONFIG= yes
	Index: head/sysutils/osquery/Makefile
	===================================================================
	--- head/sysutils/osquery/Makefile
	+++ head/sysutils/osquery/Makefile
	@@ -29,7 +29,7 @@
	libzstd.so:archivers/zstd
	RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss

	-USES= cmake:outsource gmake libtool python:build compiler:c++11-lib \
	+USES= cmake:outsource libtool python:build compiler:c++11-lib \
	libarchive ssl
	USE_GNOME= libxml2
	CONFIGURE_ENV+= OSQUERY_BUILD_VERSION="${PORTVERSION}" HOME="${WRKDIR}" \
	Index: head/textproc/clucene/Makefile
	===================================================================
	--- head/textproc/clucene/Makefile
	+++ head/textproc/clucene/Makefile
	@@ -16,7 +16,7 @@

	BUILD_DEPENDS= ${LOCALBASE}/lib/libboost_regex.a:devel/boost-libs

	-USES= cmake ninja
	+USES= cmake
	USE_LDCONFIG= yes

	CMAKE_ARGS= -DBUILD_CONTRIBS_LIB=ON
	Index: head/textproc/zxing-cpp/Makefile
	===================================================================
	--- head/textproc/zxing-cpp/Makefile
	+++ head/textproc/zxing-cpp/Makefile
	@@ -16,6 +16,6 @@
	GH_ACCOUNT= glassechidna
	GH_TAGNAME= 97e9c5c

	-USES= cmake:outsource gmake iconv
	+USES= cmake:outsource iconv

	.include <bsd.port.mk>
	Index: head/www/h2o/Makefile
	===================================================================
	--- head/www/h2o/Makefile
	+++ head/www/h2o/Makefile
	@@ -13,7 +13,7 @@

	USE_GITHUB= yes

	-USES= cmake compiler:c11 cpe perl5 shebangfix ssl
	+USES= cmake:noninja compiler:c11 cpe perl5 shebangfix ssl
	CPE_VENDOR= h2o_project
	USE_PERL5= run
	SHEBANG_FILES= share/h2o/start_server
	Index: head/www/webkit2-gtk3/Makefile
	===================================================================
	--- head/www/webkit2-gtk3/Makefile
	+++ head/www/webkit2-gtk3/Makefile
	@@ -34,7 +34,7 @@
	USE_GSTREAMER1= bad gl
	USE_XORG= x11 xcomposite xdamage xext xrender xt ice
	USES= bison cmake compiler:c++14-lang gettext gnome gperf \
	- jpeg ninja perl5 pkgconfig python:2.7,build sqlite tar:xz
	+ jpeg perl5 pkgconfig python:2.7,build sqlite tar:xz
	USE_RUBY= yes
	RUBY_NO_RUN_DEPENDS=yes
	USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
	Index: head/x11-themes/kde4-style-bespin/Makefile
	===================================================================
	--- head/x11-themes/kde4-style-bespin/Makefile
	+++ head/x11-themes/kde4-style-bespin/Makefile
	@@ -16,7 +16,7 @@

	WRKSRC= ${WRKDIR}/cloudcity

	-USES= cmake kde:4
	+USES= cmake:noninja kde:4
	USE_KDE= kdelibs automoc4 workspace
	USE_QT4= corelib qmake_build moc_build rcc_build uic_build

	Index: head/x11-themes/kde4-windeco-crystal/Makefile
	===================================================================
	--- head/x11-themes/kde4-windeco-crystal/Makefile
	+++ head/x11-themes/kde4-windeco-crystal/Makefile
	@@ -14,7 +14,7 @@

	LICENSE= GPLv2

	-USES= cmake:outsource kde:4 tar:bzip2
	+USES= cmake:outsource,noninja kde:4 tar:bzip2
	USE_KDE= kdelibs automoc4 workspace
	USE_QT4= qmake_build moc_build rcc_build uic_build \
	corelib gui qt3support
	Index: head/x11-wm/pawm/Makefile
	===================================================================
	--- head/x11-wm/pawm/Makefile
	+++ head/x11-wm/pawm/Makefile
	@@ -14,7 +14,7 @@
	LICENSE_FILE= ${WRKSRC}/GPL

	USE_XORG= x11 xft xrandr xrender xpm
	-USES= cmake pkgconfig ninja tar:bzip2
	+USES= cmake pkgconfig tar:bzip2
	CMAKE_ARGS= -DCMAKE_CONFIG_PREFIX:STRING="${PREFIX}/etc" \
	-DX11_LIBRARY_DIRS:STRING="${LOCALBASE}/lib"
	LDFLAGS+= -L${LOCALBASE}/lib -lXext -lXrender
	Index: head/x11/kde4-runtime/Makefile
	===================================================================
	--- head/x11/kde4-runtime/Makefile
	+++ head/x11/kde4-runtime/Makefile
	@@ -24,7 +24,7 @@
	BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:security/libssh
	RUN_DEPENDS= cagibid:net/cagibi

	-USES= cmake:outsource gettext gmake jpeg kde:4 samba:lib shared-mime-info \
	+USES= cmake:outsource gettext jpeg kde:4 samba:lib shared-mime-info \
	shebangfix tar:xz
	USE_KDE= kactivities kdelibs oxygen-icons5 \
	attica automoc4 pimlibs soprano strigi nepomuk-core
	Index: head/x11/kde4-workspace/Makefile
	===================================================================
	--- head/x11/kde4-workspace/Makefile
	+++ head/x11/kde4-workspace/Makefile
	@@ -40,7 +40,7 @@
	${LOCALBASE}/etc/pam.d/kde:security/pam_kde \
	${KDE_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:x11-themes/kde4-base-artwork

	-USES= cmake:outsource compiler:c++11-lib gettext gmake jpeg kde:4 \
	+USES= cmake:outsource,noninja compiler:c++11-lib gettext gmake jpeg kde:4 \
	pkgconfig shebangfix tar:xz
	USE_GL= gl glu
	USE_GNOME= glib20 libxml2
	Index: head/x11/virtualgl/Makefile
	===================================================================
	--- head/x11/virtualgl/Makefile
	+++ head/x11/virtualgl/Makefile
	@@ -20,7 +20,7 @@
	CMAKE_INSTALL_PREFIX= ${LOCALBASE}/VirtualGL
	DOCSDIR= ${LOCALBASE}/VirtualGL/doc

	-USES= cmake compiler:c++11-lang
	+USES= cmake:noninja compiler:c++11-lang
	USE_GL= gl glu
	USE_XORG= x11 xcb xext
	CMAKE_ARGS= -DTJPEG_INCLUDE_DIR=${LOCALBASE}/include\

File Metadata

Mime Type: text/plain
Expires: Thu, Oct 23, 2:40 AM (5 h, 56 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 24079208
Default Alt Text: D10748.diff (57 KB)

D10748.diffNo OneTemporaryActions

D10748.diffView Options

File Metadata

Event Timeline

D10748.diff
No OneTemporary
Actions

D10748.diff
View Options