diff options
114 files changed, 250 insertions, 121 deletions
@@ -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@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 diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk index e880100d9d08..80bf800561f4 100644 --- a/Mk/Uses/cmake.mk +++ b/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_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} @@ -106,6 +110,20 @@ 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) do-configure: @${ECHO_MSG} ${_CMAKE_MSG} diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index b22ee91e360b..185314f0e114 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -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 diff --git a/astro/marble/Makefile b/astro/marble/Makefile index 28762f1f4af9..42c9be58da24 100644 --- a/astro/marble/Makefile +++ b/astro/marble/Makefile @@ -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 \ diff --git a/audio/csound6/Makefile b/audio/csound6/Makefile index 7975916ae21e..0aa21380ccf9 100644 --- a/audio/csound6/Makefile +++ b/audio/csound6/Makefile @@ -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 \ diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile index 961335ca7ec3..4e7d5a616a3e 100644 --- a/audio/fluidsynth/Makefile +++ b/audio/fluidsynth/Makefile @@ -18,7 +18,7 @@ OPTIONS_DEFINE= JACK ALSA DBUS LADSPA LASH PORTAUDIO PULSEAUDIO READLINE \ 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 diff --git a/audio/libgme/Makefile b/audio/libgme/Makefile index fe1bdb7f2b6b..3039db11e8c9 100644 --- a/audio/libgme/Makefile +++ b/audio/libgme/Makefile @@ -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 diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index ff0aca5f42d4..d06d1a29c293 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -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 diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index b715090cc6e0..20d3d23bf7b0 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -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/* diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile index e5b2ff66c3cb..ca4ad55c44e2 100644 --- a/cad/openvsp/Makefile +++ b/cad/openvsp/Makefile @@ -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 \ diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile index fc1c6c4d2c5d..c23744f75f30 100644 --- a/chinese/fcitx/Makefile +++ b/chinese/fcitx/Makefile @@ -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 diff --git a/chinese/ibus-chewing/Makefile b/chinese/ibus-chewing/Makefile index 91e914f0edf5..207c153cc2af 100644 --- a/chinese/ibus-chewing/Makefile +++ b/chinese/ibus-chewing/Makefile @@ -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 diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile index 2e2f4c9b3757..eb32cfdcc59b 100644 --- a/comms/uhd/Makefile +++ b/comms/uhd/Makefile @@ -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 diff --git a/comms/usrp/Makefile b/comms/usrp/Makefile index c82ef1eb09bf..e1f0b3311872 100644 --- a/comms/usrp/Makefile +++ b/comms/usrp/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs \ 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 diff --git a/databases/cppdb/Makefile b/databases/cppdb/Makefile index e94e27c3bc20..0a6abbf4a660 100644 --- a/databases/cppdb/Makefile +++ b/databases/cppdb/Makefile @@ -41,7 +41,7 @@ SQLITE3_INTERNAL_DESC= Link SQLite 3 backend into CppDB 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> diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 0270146787d6..328676545037 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -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 diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile index 1a6734be87fa..6f72d893fc78 100644 --- a/databases/mariadb100-server/Makefile +++ b/databases/mariadb100-server/Makefile @@ -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 diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile index 78c7e5a9fe3c..e4a20c849031 100644 --- a/databases/mariadb55-server/Makefile +++ b/databases/mariadb55-server/Makefile @@ -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]* diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index f8ced7135c45..ff396d5b00ec 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -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 diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index c0f814289e0c..875aca26eb42 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -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 diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index f7b58be324f3..3f2466a5d0d5 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -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 diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index d31550cd03b3..8a131b3ab81d 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -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 diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile index 4909d5aafd92..6fc7cdf36cd7 100644 --- a/databases/mysqlwsrep56-server/Makefile +++ b/databases/mysqlwsrep56-server/Makefile @@ -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 diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index f0d0861b58da..50c28e8c1545 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -12,7 +12,7 @@ MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/percona55-client -USES= bison cmake readline shebangfix +USES= bison cmake:noninja readline shebangfix CXXFLAGS+= ${CPPFLAGS} diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index a0df827b0a4d..0e532f9fc872 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -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 diff --git a/databases/percona57-server/Makefile b/databases/percona57-server/Makefile index c4ab19025fd4..31ab44835982 100644 --- a/databases/percona57-server/Makefile +++ b/databases/percona57-server/Makefile @@ -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 diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile index f09ad003a7c3..37e5e422abeb 100644 --- a/databases/tarantool/Makefile +++ b/databases/tarantool/Makefile @@ -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 diff --git a/databases/xtrabackup/Makefile b/databases/xtrabackup/Makefile index 4f0278477e07..e74790b1fdcf 100644 --- a/databases/xtrabackup/Makefile +++ b/databases/xtrabackup/Makefile @@ -29,7 +29,7 @@ BROKEN_mips64= fails to compile: 'fpsetmask' was not declared in this scope 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 diff --git a/deskutils/kdeconnect/Makefile b/deskutils/kdeconnect/Makefile index e88828fcebe0..59e13050e6dc 100644 --- a/deskutils/kdeconnect/Makefile +++ b/deskutils/kdeconnect/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= KDE/unstable/kdeconnect/${PORTVERSION}/src/ 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 diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index 1a1330bc654e..5d0f75566ba1 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -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 diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile index f601483aff42..b2ef38db8842 100644 --- a/deskutils/owncloudclient/Makefile +++ b/deskutils/owncloudclient/Makefile @@ -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 diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile index 21e924f1ca13..9a79646dd3c4 100644 --- a/devel/bullet/Makefile +++ b/devel/bullet/Makefile @@ -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= * diff --git a/devel/compiler-rt/Makefile b/devel/compiler-rt/Makefile index d606b2ecf52e..bb7b482d933e 100644 --- a/devel/compiler-rt/Makefile +++ b/devel/compiler-rt/Makefile @@ -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 diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 55158b648341..da0ac85274d6 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -15,7 +15,7 @@ COMMENT= Documentation system for C, C++, and other languages 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 diff --git a/devel/flang-clang/Makefile b/devel/flang-clang/Makefile index 7480d0b34a86..523c6b3f6450 100644 --- a/devel/flang-clang/Makefile +++ b/devel/flang-clang/Makefile @@ -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 diff --git a/devel/flang/Makefile b/devel/flang/Makefile index fe0801cc9c38..a7a153873588 100644 --- a/devel/flang/Makefile +++ b/devel/flang/Makefile @@ -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} diff --git a/devel/kapptemplate/Makefile b/devel/kapptemplate/Makefile index 810f1c91965f..77999afd7bc1 100644 --- a/devel/kapptemplate/Makefile +++ b/devel/kapptemplate/Makefile @@ -8,7 +8,7 @@ CATEGORIES= devel kde kde-kde4 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 diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile index 2a8943fe781c..1a1bfc63dbf7 100644 --- a/devel/kdevelop-kde4/Makefile +++ b/devel/kdevelop-kde4/Makefile @@ -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 \ diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile index c7fa4ce0f91b..ef4fe53b89b5 100644 --- a/devel/kdevelop-php/Makefile +++ b/devel/kdevelop-php/Makefile @@ -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 diff --git a/devel/libzrtpcpp/Makefile b/devel/libzrtpcpp/Makefile index 0ef1ed6de370..69049ae9e563 100644 --- a/devel/libzrtpcpp/Makefile +++ b/devel/libzrtpcpp/Makefile @@ -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}" \ diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index 4f938d9814c6..b4764a88998c 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -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 \ diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 39520d23766a..047dc9045edc 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -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 diff --git a/devel/llvm38/Makefile b/devel/llvm38/Makefile index df984db339ee..b68de3d1649b 100644 --- a/devel/llvm38/Makefile +++ b/devel/llvm38/Makefile @@ -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 \ diff --git a/devel/llvm39/Makefile b/devel/llvm39/Makefile index 58f6534c18fc..a4a07ecd8de1 100644 --- a/devel/llvm39/Makefile +++ b/devel/llvm39/Makefile @@ -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} diff --git a/devel/llvm40/Makefile b/devel/llvm40/Makefile index f4e2f8ad4bde..3ff0e3182152 100644 --- a/devel/llvm40/Makefile +++ b/devel/llvm40/Makefile @@ -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} diff --git a/devel/mongo-c-driver/Makefile b/devel/mongo-c-driver/Makefile index 181f4928b012..d56677977996 100644 --- a/devel/mongo-c-driver/Makefile +++ b/devel/mongo-c-driver/Makefile @@ -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 diff --git a/devel/rapidjson/Makefile b/devel/rapidjson/Makefile index 21e443f93cda..a6ddea7b9467 100644 --- a/devel/rapidjson/Makefile +++ b/devel/rapidjson/Makefile @@ -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 diff --git a/devel/tesla/Makefile b/devel/tesla/Makefile index 0d516da83d8f..05ba5ba314d4 100644 --- a/devel/tesla/Makefile +++ b/devel/tesla/Makefile @@ -16,7 +16,7 @@ BROKEN_armv6= fails to link: cmTC_8106f uses VFP register arguments, testCCompi 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 diff --git a/devel/xxhash/files/patch-git_5ab73ee b/devel/xxhash/files/patch-git_5ab73ee new file mode 100644 index 000000000000..7b74f3a9c953 --- /dev/null +++ b/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 diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile index 91441ab118c9..413b9a02cf53 100644 --- a/editors/codelite/Makefile +++ b/editors/codelite/Makefile @@ -19,7 +19,7 @@ BROKEN_armv6= fails to configure: has leading or trailing whitespace. This is 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 diff --git a/editors/jucipp/Makefile b/editors/jucipp/Makefile index 6012cfef971a..11bd95d6af64 100644 --- a/editors/jucipp/Makefile +++ b/editors/jucipp/Makefile @@ -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 diff --git a/editors/kate-plugin-pate/Makefile b/editors/kate-plugin-pate/Makefile index 3f270846cfa6..e3d78b3923a0 100644 --- a/editors/kate-plugin-pate/Makefile +++ b/editors/kate-plugin-pate/Makefile @@ -9,7 +9,7 @@ DISTNAME= kate-${PORTVERSION} 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 \ diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile index 65cf89152725..62aa61841277 100644 --- a/editors/neovim/Makefile +++ b/editors/neovim/Makefile @@ -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 diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile index c2f80e9cb738..9fa785e6ae86 100644 --- a/games/hedgewars/Makefile +++ b/games/hedgewars/Makefile @@ -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 \ diff --git a/games/openclonk/Makefile b/games/openclonk/Makefile index f10f60b8e662..80bab738d3dd 100644 --- a/games/openclonk/Makefile +++ b/games/openclonk/Makefile @@ -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 diff --git a/games/openmw/Makefile b/games/openmw/Makefile index 172b7e799d01..e0c21bea3eea 100644 --- a/games/openmw/Makefile +++ b/games/openmw/Makefile @@ -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 diff --git a/games/palomino/Makefile b/games/palomino/Makefile index 9becd51e039c..6bd2b189dd39 100644 --- a/games/palomino/Makefile +++ b/games/palomino/Makefile @@ -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 diff --git a/games/solarus/Makefile b/games/solarus/Makefile index ce4c6b1f7f3a..407fc99c80e0 100644 --- a/games/solarus/Makefile +++ b/games/solarus/Makefile @@ -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> diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile index 593a867e2c68..1ab26d290533 100644 --- a/games/vavoom/Makefile +++ b/games/vavoom/Makefile @@ -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 diff --git a/graphics/aseprite/Makefile b/graphics/aseprite/Makefile index b7ddd01495de..1f3db8dff0bf 100644 --- a/graphics/aseprite/Makefile +++ b/graphics/aseprite/Makefile @@ -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 diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 0578333f8cac..b859b56a6dac 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -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 diff --git a/graphics/digikam-kde4/Makefile.common b/graphics/digikam-kde4/Makefile.common index a2b2d0d40136..555ae6d685ca 100644 --- a/graphics/digikam-kde4/Makefile.common +++ b/graphics/digikam-kde4/Makefile.common @@ -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 diff --git a/graphics/ilmbase/files/patch-git_8eed7012 b/graphics/ilmbase/files/patch-git_8eed7012 new file mode 100644 index 000000000000..dbbcd85ec4a0 --- /dev/null +++ b/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) diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index c1d3d6d78184..fed7ea051457 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -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 diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile index dcb86e4a5e62..84e0967d4e6a 100644 --- a/graphics/luxrender/Makefile +++ b/graphics/luxrender/Makefile @@ -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} diff --git a/graphics/mitsuba/Makefile b/graphics/mitsuba/Makefile index 8a5cda9c39ae..ed7504dc529c 100644 --- a/graphics/mitsuba/Makefile +++ b/graphics/mitsuba/Makefile @@ -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> diff --git a/graphics/opensubdiv/Makefile b/graphics/opensubdiv/Makefile index c959e3033f91..ea55b0a4e934 100644 --- a/graphics/opensubdiv/Makefile +++ b/graphics/opensubdiv/Makefile @@ -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 \ diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile index b0c277f06a64..e35ee3f3e9c9 100644 --- a/graphics/osg-devel/Makefile +++ b/graphics/osg-devel/Makefile @@ -132,12 +132,6 @@ FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweight .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="" diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile index 71115d9bf232..3ca5f74836f6 100644 --- a/graphics/osgearth/Makefile +++ b/graphics/osgearth/Makefile @@ -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 \ diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index 9af1e786581b..4cdcd0227e4f 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -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 diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile index 42c879d9f57c..842af168689e 100644 --- a/graphics/tulip/Makefile +++ b/graphics/tulip/Makefile @@ -22,7 +22,7 @@ BROKEN_powerpc64= fails to link: libOGDF.so: undefined reference to CoinPackedVe 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 diff --git a/graphics/waffle/Makefile b/graphics/waffle/Makefile index 5f1890ca75c9..53faa759d2e5 100644 --- a/graphics/waffle/Makefile +++ b/graphics/waffle/Makefile @@ -12,7 +12,7 @@ COMMENT= Library that allows to defer selection of an OpenGL API until runtime 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 diff --git a/graphics/xcftools/Makefile b/graphics/xcftools/Makefile index 4ff156aba260..3ecc6fda755c 100644 --- a/graphics/xcftools/Makefile +++ b/graphics/xcftools/Makefile @@ -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 diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile index 04815593a0af..6622148de730 100644 --- a/irc/weechat/Makefile +++ b/irc/weechat/Makefile @@ -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 \ diff --git a/lang/beignet/Makefile b/lang/beignet/Makefile index ddd2d84b31d2..bcc119b0fbff 100644 --- a/lang/beignet/Makefile +++ b/lang/beignet/Makefile @@ -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} diff --git a/lang/io/Makefile b/lang/io/Makefile index ee728d697f3c..342fa74f05e5 100644 --- a/lang/io/Makefile +++ b/lang/io/Makefile @@ -17,7 +17,7 @@ USE_GITHUB= yes GH_ACCOUNT= stevedekorte GH_TAGNAME= 23afbcc -USES= cmake:outsource compiler:c11 +USES= cmake:outsource,noninja compiler:c11 MAKE_JOBS_UNSAFE=yes USE_LDCONFIG= yes diff --git a/lang/sagittarius-scheme/Makefile b/lang/sagittarius-scheme/Makefile index f1bd75ccb2b2..c43f9b8b4594 100644 --- a/lang/sagittarius-scheme/Makefile +++ b/lang/sagittarius-scheme/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= libffi.so:devel/libffi \ 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 diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile index 397c0bc16d93..264305e099de 100644 --- a/mail/evolution-ews/Makefile +++ b/mail/evolution-ews/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= evolution>=3.0.0:mail/evolution 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 diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 5173e0908e40..9fdf17c9b62b 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -41,7 +41,7 @@ RUN_DEPENDS= highlight:textproc/highlight \ 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 diff --git a/mail/libcmime/Makefile b/mail/libcmime/Makefile index 0f6907b007cc..7880768ff866 100644 --- a/mail/libcmime/Makefile +++ b/mail/libcmime/Makefile @@ -12,7 +12,7 @@ COMMENT= Lightweight C mime library LICENSE= MIT -USES= bison cmake pkgconfig +USES= bison cmake:noninja pkgconfig USE_LDCONFIG= yes CMAKE_ARGS= --no-warn-unused-cli diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile index a029b1b5f3dc..a19e34f3f1b7 100644 --- a/mail/libvmime/Makefile +++ b/mail/libvmime/Makefile @@ -20,7 +20,7 @@ USE_GITHUB= yes 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="" \ diff --git a/mail/spmfilter-clamav/Makefile b/mail/spmfilter-clamav/Makefile index 8479515b255a..409fe463e407 100644 --- a/mail/spmfilter-clamav/Makefile +++ b/mail/spmfilter-clamav/Makefile @@ -12,7 +12,7 @@ COMMENT= ClamAV plugin for spmfilter 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" diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile index 7a24a53a9e01..5f3a15355077 100644 --- a/mail/spmfilter/Makefile +++ b/mail/spmfilter/Makefile @@ -20,7 +20,7 @@ SMFUSER?= nobody 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" diff --git a/math/metis/Makefile b/math/metis/Makefile index 72ee2373ae3f..f747d4ab68cc 100644 --- a/math/metis/Makefile +++ b/math/metis/Makefile @@ -14,7 +14,7 @@ LICENSE= APACHE20 CONFLICTS= metis4-4* metis-edf-[0-9]* -USES= cmake +USES= cmake:noninja OPTIONS_DEFINE= OPENMP SHARED STATIC DOCS diff --git a/math/parmetis/Makefile b/math/parmetis/Makefile index 0ddf4c758e20..a1580bac1b57 100644 --- a/math/parmetis/Makefile +++ b/math/parmetis/Makefile @@ -20,7 +20,7 @@ LICENSE_PERMS= auto-accept 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 \ diff --git a/math/stp/Makefile b/math/stp/Makefile index e02eb83f7728..99b58e90f8f0 100644 --- a/math/stp/Makefile +++ b/math/stp/Makefile @@ -15,7 +15,7 @@ LICENSE= MIT 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 diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common index 16d0c8065624..aaaafef13673 100644 --- a/multimedia/avidemux/Makefile.common +++ b/multimedia/avidemux/Makefile.common @@ -19,7 +19,7 @@ USE_QT4= # empty 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 \ diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile index 419335333484..cecaac157033 100644 --- a/multimedia/gstreamer-qt4/Makefile +++ b/multimedia/gstreamer-qt4/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING 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 diff --git a/multimedia/plexhometheater/Makefile b/multimedia/plexhometheater/Makefile index af35b2385bbb..b064a59306e0 100644 --- a/multimedia/plexhometheater/Makefile +++ b/multimedia/plexhometheater/Makefile @@ -67,7 +67,7 @@ GH_ACCOUNT= plexinc 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 diff --git a/multimedia/zoneminder-h264/Makefile b/multimedia/zoneminder-h264/Makefile index 88d80d02b291..b0c4baf4af76 100644 --- a/multimedia/zoneminder-h264/Makefile +++ b/multimedia/zoneminder-h264/Makefile @@ -40,7 +40,7 @@ USE_GITHUB= yes 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 diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile index c19ee4de6cb2..cfce739764f2 100644 --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -34,7 +34,7 @@ USE_GITHUB= yes 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 diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile index f7d626d0e406..bb5c814bd7a2 100644 --- a/net-im/licq/Makefile +++ b/net-im/licq/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libboost_regex.so:devel/boost-libs 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 diff --git a/net-im/ring-gnome/Makefile b/net-im/ring-gnome/Makefile index b7d310cb60ed..e8fbc8cf6151 100644 --- a/net-im/ring-gnome/Makefile +++ b/net-im/ring-gnome/Makefile @@ -30,7 +30,7 @@ GH_TUPLE+= savoirfairelinux:ring-client-gnome:07107e9 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 diff --git a/net-im/ring-libclient/Makefile b/net-im/ring-libclient/Makefile index 8f804e0a25aa..f22b2cf0de7f 100644 --- a/net-im/ring-libclient/Makefile +++ b/net-im/ring-libclient/Makefile @@ -18,7 +18,7 @@ USE_GITHUB= yes #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 diff --git a/net/ceph-devel/Makefile b/net/ceph-devel/Makefile index 819e52958408..216ee5adc04a 100644 --- a/net/ceph-devel/Makefile +++ b/net/ceph-devel/Makefile @@ -74,7 +74,7 @@ CMAKE_ARGS= \ -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 \ diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile index 45fdcbe996f8..15021a7f77d2 100644 --- a/net/tigervnc/Makefile +++ b/net/tigervnc/Makefile @@ -28,7 +28,7 @@ CONFLICTS= tigervnc-devel-[0-9]* \ 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 diff --git a/science/paraview/Makefile b/science/paraview/Makefile index 29072cbf33c9..24c6e59f8817 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -42,7 +42,7 @@ USE_GL= gl 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" \ diff --git a/security/kwalletmanager/Makefile b/security/kwalletmanager/Makefile index 3df1ba7cc68c..bda948b934f9 100644 --- a/security/kwalletmanager/Makefile +++ b/security/kwalletmanager/Makefile @@ -9,7 +9,7 @@ CATEGORIES= security kde kde-kde4 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 diff --git a/security/libzrtpcppcore/Makefile b/security/libzrtpcppcore/Makefile index f5a9d4f1b382..40cf58c17065 100644 --- a/security/libzrtpcppcore/Makefile +++ b/security/libzrtpcppcore/Makefile @@ -16,7 +16,7 @@ USE_GITHUB= yes 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 diff --git a/sysutils/baloo/Makefile b/sysutils/baloo/Makefile index 081273dcd431..4d3b4ce3d9ae 100644 --- a/sysutils/baloo/Makefile +++ b/sysutils/baloo/Makefile @@ -14,7 +14,7 @@ CONFLICTS_INSTALL= kde-runtime-4.12.* \ 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 diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 9b107a0087d4..47dc203ce48b 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= db2x_xsltproc:textproc/docbook2X \ 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 \ diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile index 9b99ea9b6bfb..e4fb7dcc30e4 100644 --- a/sysutils/fluent-bit/Makefile +++ b/sysutils/fluent-bit/Makefile @@ -17,7 +17,7 @@ BROKEN_mips= fails to build: conflicting types for 'restrict' 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} diff --git a/sysutils/kcm-polkit-kde/Makefile b/sysutils/kcm-polkit-kde/Makefile index 1dae28b54cb0..b65cce24bd30 100644 --- a/sysutils/kcm-polkit-kde/Makefile +++ b/sysutils/kcm-polkit-kde/Makefile @@ -14,7 +14,7 @@ COMMENT= Polkit-KDE configuration module 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 diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile index e29294f33451..f47671a13823 100644 --- a/sysutils/osquery/Makefile +++ b/sysutils/osquery/Makefile @@ -29,7 +29,7 @@ LIB_DEPENDS= libaugeas.so:textproc/augeas \ 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}" \ diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile index 7474e553a31c..bcab28b2796f 100644 --- a/textproc/clucene/Makefile +++ b/textproc/clucene/Makefile @@ -16,7 +16,7 @@ LICENSE_COMB= dual BUILD_DEPENDS= ${LOCALBASE}/lib/libboost_regex.a:devel/boost-libs -USES= cmake ninja +USES= cmake USE_LDCONFIG= yes CMAKE_ARGS= -DBUILD_CONTRIBS_LIB=ON diff --git a/textproc/zxing-cpp/Makefile b/textproc/zxing-cpp/Makefile index bb15a44a31d0..48bb54ad45da 100644 --- a/textproc/zxing-cpp/Makefile +++ b/textproc/zxing-cpp/Makefile @@ -16,6 +16,6 @@ USE_GITHUB= yes GH_ACCOUNT= glassechidna GH_TAGNAME= 97e9c5c -USES= cmake:outsource gmake iconv +USES= cmake:outsource iconv .include <bsd.port.mk> diff --git a/www/h2o/Makefile b/www/h2o/Makefile index 11ce10a56e63..e62b464a87c0 100644 --- a/www/h2o/Makefile +++ b/www/h2o/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT 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 diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile index 2e49d465f893..d80c5cd766ac 100644 --- a/www/webkit2-gtk3/Makefile +++ b/www/webkit2-gtk3/Makefile @@ -34,7 +34,7 @@ PORTSCOUT= limitw:1,even 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 diff --git a/x11-themes/kde4-style-bespin/Makefile b/x11-themes/kde4-style-bespin/Makefile index c2f588fb0fdc..a11d40ec971b 100644 --- a/x11-themes/kde4-style-bespin/Makefile +++ b/x11-themes/kde4-style-bespin/Makefile @@ -16,7 +16,7 @@ LICENSE= LGPL21 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 diff --git a/x11-themes/kde4-windeco-crystal/Makefile b/x11-themes/kde4-windeco-crystal/Makefile index cf0696a679c9..a71ebc9a4e43 100644 --- a/x11-themes/kde4-windeco-crystal/Makefile +++ b/x11-themes/kde4-windeco-crystal/Makefile @@ -14,7 +14,7 @@ COMMENT= Transparent KDE window decoration 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 diff --git a/x11-wm/pawm/Makefile b/x11-wm/pawm/Makefile index ba754fffe29a..32f07893cb60 100644 --- a/x11-wm/pawm/Makefile +++ b/x11-wm/pawm/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 # only 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 diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index ea221a75fda7..217d125c6e5b 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \ 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 diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index a9e247a9d95b..373b299804e7 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -40,7 +40,7 @@ RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:misc/kde4-xdg-env \ ${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 diff --git a/x11/virtualgl/Makefile b/x11/virtualgl/Makefile index f467fd6df7dc..309ce5b04c58 100644 --- a/x11/virtualgl/Makefile +++ b/x11/virtualgl/Makefile @@ -20,7 +20,7 @@ ONLY_FOR_ARCHS= amd64 i386 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\ |