FreeBSD Bugzilla – Attachment 183029 Details for
Bug 219629
[exp-run] Make ninja opt out in cmake.mk
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
make ninja default
cmake_ninja.v1.diff (text/plain), 45.32 KB, created by
Tobias C. Berner
on 2017-05-29 09:11:57 UTC
(
hide
)
Description:
make ninja default
Filename:
MIME Type:
Creator:
Tobias C. Berner
Created:
2017-05-29 09:11:57 UTC
Size:
45.32 KB
patch
obsolete
>Index: Mk/Uses/cmake.mk >=================================================================== >--- Mk/Uses/cmake.mk (revision 441977) >+++ Mk/Uses/cmake.mk (working copy) >@@ -4,9 +4,11 @@ > # > # 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 >+# run add a runtime dependency on cmake > # > # > # Additional variables that affect cmake behaviour: >@@ -14,7 +16,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 +37,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,7 +92,10 @@ > CMAKE_ARGS+= -DCMAKE_COLOR_MAKEFILE:BOOL=OFF > .endif > >-.if defined(CMAKE_NINJA) >+# 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. >+.if empty(cmake_ARGS:Mnoninja) && empty(cmake_ARGS:Mrun) && empty(USES:Mfortran) > .include "${USESDIR}/ninja.mk" > .endif > >Index: astro/marble/Makefile >=================================================================== >--- astro/marble/Makefile (revision 441977) >+++ astro/marble/Makefile (working copy) >@@ -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: audio/csound6/Makefile >=================================================================== >--- audio/csound6/Makefile (revision 441977) >+++ audio/csound6/Makefile (working copy) >@@ -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: cad/kicad/Makefile >=================================================================== >--- cad/kicad/Makefile (revision 441977) >+++ cad/kicad/Makefile (working copy) >@@ -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: cad/opencascade/Makefile >=================================================================== >--- cad/opencascade/Makefile (revision 441977) >+++ cad/opencascade/Makefile (working copy) >@@ -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: cad/openvsp/Makefile >=================================================================== >--- cad/openvsp/Makefile (revision 441977) >+++ cad/openvsp/Makefile (working copy) >@@ -35,7 +35,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: chinese/fcitx/Makefile >=================================================================== >--- chinese/fcitx/Makefile (revision 441977) >+++ chinese/fcitx/Makefile (working copy) >@@ -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: chinese/ibus-chewing/Makefile >=================================================================== >--- chinese/ibus-chewing/Makefile (revision 441977) >+++ chinese/ibus-chewing/Makefile (working copy) >@@ -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: comms/uhd/Makefile >=================================================================== >--- comms/uhd/Makefile (revision 441977) >+++ comms/uhd/Makefile (working copy) >@@ -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,noninja gmake ncurses pkgconfig \ > dos2unix python:2.7 shebangfix > USE_LDCONFIG= yes > CMAKE_SOURCE_PATH= ${WRKSRC}/host >Index: comms/usrp/Makefile >=================================================================== >--- comms/usrp/Makefile (revision 441977) >+++ comms/usrp/Makefile (working copy) >@@ -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: databases/clickhouse/Makefile >=================================================================== >--- databases/clickhouse/Makefile (revision 441977) >+++ databases/clickhouse/Makefile (working copy) >@@ -34,7 +34,7 @@ > > BROKEN_FreeBSD_10= Builds but does not work > >-USES= compiler:c++14-lang cmake iconv mysql ssl readline >+USES= compiler:c++14-lang cmake:noninja iconv mysql ssl readline > USE_LDCONFIG= yes > # Bug 218841: use bundled boost 1.62 to avoid 1.64 bustage > CMAKE_ARGS= -DUNBUNDLED=1 \ >Index: databases/mariadb100-server/Makefile >=================================================================== >--- databases/mariadb100-server/Makefile (revision 441977) >+++ databases/mariadb100-server/Makefile (working copy) >@@ -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: databases/mariadb55-server/Makefile >=================================================================== >--- databases/mariadb55-server/Makefile (revision 441977) >+++ databases/mariadb55-server/Makefile (working copy) >@@ -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: databases/mysql55-server/Makefile >=================================================================== >--- databases/mysql55-server/Makefile (revision 441977) >+++ databases/mysql55-server/Makefile (working copy) >@@ -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: databases/mysql56-server/Makefile >=================================================================== >--- databases/mysql56-server/Makefile (revision 441977) >+++ databases/mysql56-server/Makefile (working copy) >@@ -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: databases/mysqlwsrep56-server/Makefile >=================================================================== >--- databases/mysqlwsrep56-server/Makefile (revision 441977) >+++ databases/mysqlwsrep56-server/Makefile (working copy) >@@ -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: databases/percona55-server/Makefile >=================================================================== >--- databases/percona55-server/Makefile (revision 441977) >+++ databases/percona55-server/Makefile (working copy) >@@ -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: databases/percona56-server/Makefile >=================================================================== >--- databases/percona56-server/Makefile (revision 441977) >+++ databases/percona56-server/Makefile (working copy) >@@ -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: databases/percona57-server/Makefile >=================================================================== >--- databases/percona57-server/Makefile (revision 441977) >+++ databases/percona57-server/Makefile (working copy) >@@ -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: databases/soci/Makefile >=================================================================== >--- databases/soci/Makefile (revision 441977) >+++ databases/soci/Makefile (working copy) >@@ -13,7 +13,7 @@ > LICENSE= BSL > LICENSE_FILE= ${WRKSRC}/LICENSE_1_0.txt > >-USES= cmake zip >+USES= cmake:noninja zip > CMAKE_ARGS+= -DWITH_ORACLE:BOOL=OFF > USE_LDCONFIG= yes > >Index: databases/tarantool/Makefile >=================================================================== >--- databases/tarantool/Makefile (revision 441977) >+++ databases/tarantool/Makefile (working copy) >@@ -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: databases/xtrabackup/Makefile >=================================================================== >--- databases/xtrabackup/Makefile (revision 441977) >+++ databases/xtrabackup/Makefile (working copy) >@@ -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: deskutils/kdeconnect/Makefile >=================================================================== >--- deskutils/kdeconnect/Makefile (revision 441977) >+++ deskutils/kdeconnect/Makefile (working copy) >@@ -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: deskutils/kdepim4/Makefile >=================================================================== >--- deskutils/kdepim4/Makefile (revision 441977) >+++ deskutils/kdepim4/Makefile (working copy) >@@ -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: deskutils/owncloudclient/Makefile >=================================================================== >--- deskutils/owncloudclient/Makefile (revision 441977) >+++ deskutils/owncloudclient/Makefile (working copy) >@@ -15,7 +15,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: devel/bullet/Makefile >=================================================================== >--- devel/bullet/Makefile (revision 441977) >+++ devel/bullet/Makefile (working copy) >@@ -16,7 +16,7 @@ > GH_ACCOUNT= bulletphysics > GH_PROJECT= bullet3 > >-USES= cmake compiler:c++11-lang >+USES= cmake:noninja compiler:c++11-lang > USE_GL= gl glu glut > USE_LDCONFIG= yes > USE_XORG= x11 >Index: devel/compiler-rt/Makefile >=================================================================== >--- devel/compiler-rt/Makefile (revision 441977) >+++ devel/compiler-rt/Makefile (working copy) >@@ -19,7 +19,7 @@ > > CMAKE_SOURCE_PATH= ${WRKSRC} > >-USES= cmake tar:bzip2 >+USES= cmake:noninja tar:bzip2 > USE_LDCONFIG= yes > MAKE_ARGS= VERBOSE=1 > >Index: devel/kapptemplate/Makefile >=================================================================== >--- devel/kapptemplate/Makefile (revision 441977) >+++ devel/kapptemplate/Makefile (working copy) >@@ -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: devel/kdevelop-kde4/Makefile >=================================================================== >--- devel/kdevelop-kde4/Makefile (revision 441977) >+++ devel/kdevelop-kde4/Makefile (working copy) >@@ -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: devel/kdevelop-php/Makefile >=================================================================== >--- devel/kdevelop-php/Makefile (revision 441977) >+++ devel/kdevelop-php/Makefile (working copy) >@@ -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: devel/libzrtpcpp/Makefile >=================================================================== >--- devel/libzrtpcpp/Makefile (revision 441977) >+++ devel/libzrtpcpp/Makefile (working copy) >@@ -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: devel/mongo-c-driver/Makefile >=================================================================== >--- devel/mongo-c-driver/Makefile (revision 441977) >+++ devel/mongo-c-driver/Makefile (working copy) >@@ -17,7 +17,7 @@ > USE_GITHUB= yes > GH_ACCOUNT= mongodb > >-USES= cmake pkgconfig >+USES= cmake:noninja pkgconfig > USE_LDCONFIG= yes > LDFLAGS+= -pthread > >Index: devel/rapidjson/Makefile >=================================================================== >--- devel/rapidjson/Makefile (revision 441977) >+++ devel/rapidjson/Makefile (working copy) >@@ -23,7 +23,7 @@ > USE_GITHUB= yes > GH_ACCOUNT= miloyip > >-USES= cmake compiler:c++11-lang pathfix >+USES= cmake:noninja compiler:c++11-lang pathfix > > OPTIONS_DEFINE= DOXYGEN EXAMPLES > OPTIONS_DEFAULT=${OPTIONS_DEFINE} >Index: devel/xxhash/Makefile >=================================================================== >--- devel/xxhash/Makefile (revision 441977) >+++ devel/xxhash/Makefile (working copy) >@@ -15,7 +15,7 @@ > GH_ACCOUNT= Cyan4973 > GH_PROJECT= xxHash > >-USES= cmake:outsource >+USES= cmake:outsource,noninja > USE_LDCONFIG= yes > CMAKE_SOURCE_PATH= ${WRKSRC}/cmake_unofficial > >Index: editors/codelite/Makefile >=================================================================== >--- editors/codelite/Makefile (revision 441977) >+++ editors/codelite/Makefile (working copy) >@@ -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: editors/kate-plugin-pate/Makefile >=================================================================== >--- editors/kate-plugin-pate/Makefile (revision 441977) >+++ editors/kate-plugin-pate/Makefile (working copy) >@@ -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: games/hedgewars/Makefile >=================================================================== >--- games/hedgewars/Makefile (revision 441977) >+++ games/hedgewars/Makefile (working copy) >@@ -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: games/openclonk/Makefile >=================================================================== >--- games/openclonk/Makefile (revision 441977) >+++ games/openclonk/Makefile (working copy) >@@ -21,7 +21,7 @@ > libpng.so:graphics/png \ > libvorbis.so:audio/libvorbis > >-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: games/palomino/Makefile >=================================================================== >--- games/palomino/Makefile (revision 441977) >+++ games/palomino/Makefile (working copy) >@@ -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: games/solarus/Makefile >=================================================================== >--- games/solarus/Makefile (revision 441977) >+++ games/solarus/Makefile (working copy) >@@ -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: games/spring/Makefile >=================================================================== >--- games/spring/Makefile (revision 441977) >+++ games/spring/Makefile (working copy) >@@ -32,7 +32,7 @@ > USE_LDCONFIG= yes > DOS2UNIX_GLOB= *.h *.hpp *.cpp > >-USES= execinfo cmake compiler:c++11-lib dos2unix openal:al tar:lzma >+USES= execinfo cmake:noninja compiler:c++11-lib dos2unix openal:al tar:lzma > USES+= desktop-file-utils shared-mime-info > CMAKE_ARGS= -DDATADIR:STRING="share/${PORTNAME}" \ > -DAI_TYPES:STRING="NATIVE" \ >Index: graphics/cuneiform/Makefile >=================================================================== >--- graphics/cuneiform/Makefile (revision 441977) >+++ graphics/cuneiform/Makefile (working copy) >@@ -16,7 +16,7 @@ > > ONLY_FOR_ARCHS= i386 amd64 > >-USES= cmake:outsource tar:bzip2 >+USES= cmake:outsource,noninja tar:bzip2 > USE_LDCONFIG= yes > > CPPFLAGS+= -I${LOCALBASE}/include >Index: graphics/digikam-kde4/Makefile.common >=================================================================== >--- graphics/digikam-kde4/Makefile.common (revision 441977) >+++ graphics/digikam-kde4/Makefile.common (working copy) >@@ -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: graphics/ilmbase/files/patch-git_8eed7012 >=================================================================== >--- graphics/ilmbase/files/patch-git_8eed7012 (nonexistent) >+++ graphics/ilmbase/files/patch-git_8eed7012 (working copy) >@@ -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) > >Property changes on: graphics/ilmbase/files/patch-git_8eed7012 >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: graphics/inkscape/Makefile >=================================================================== >--- graphics/inkscape/Makefile (revision 441977) >+++ graphics/inkscape/Makefile (working copy) >@@ -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: graphics/luxrender/Makefile >=================================================================== >--- graphics/luxrender/Makefile (revision 441977) >+++ graphics/luxrender/Makefile (working copy) >@@ -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: graphics/mitsuba/Makefile >=================================================================== >--- graphics/mitsuba/Makefile (revision 441977) >+++ graphics/mitsuba/Makefile (working copy) >@@ -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: graphics/opencv/Makefile >=================================================================== >--- graphics/opencv/Makefile (revision 441977) >+++ graphics/opencv/Makefile (working copy) >@@ -14,7 +14,7 @@ > > USE_GITHUB= yes > >-USES= cmake pkgconfig >+USES= cmake:noninja pkgconfig > USE_LDCONFIG= yes > > NOT_FOR_ARCHS= sparc64 >Index: graphics/opensubdiv/Makefile >=================================================================== >--- graphics/opensubdiv/Makefile (revision 441977) >+++ graphics/opensubdiv/Makefile (working copy) >@@ -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: graphics/osgearth/Makefile >=================================================================== >--- graphics/osgearth/Makefile (revision 441977) >+++ graphics/osgearth/Makefile (working copy) >@@ -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: graphics/partio/Makefile >=================================================================== >--- graphics/partio/Makefile (revision 441977) >+++ graphics/partio/Makefile (working copy) >@@ -10,7 +10,7 @@ > > LICENSE= BSD3CLAUSE > >-USES= cmake:outsource >+USES= cmake:outsource,noninja > USE_XORG= xmu > USE_GL= gl glut > >Index: graphics/xcftools/Makefile >=================================================================== >--- graphics/xcftools/Makefile (revision 441977) >+++ graphics/xcftools/Makefile (working copy) >@@ -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: irc/weechat/Makefile >=================================================================== >--- irc/weechat/Makefile (revision 441977) >+++ irc/weechat/Makefile (working copy) >@@ -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: lang/beignet/Makefile >=================================================================== >--- lang/beignet/Makefile (revision 441977) >+++ lang/beignet/Makefile (working copy) >@@ -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: lang/io/Makefile >=================================================================== >--- lang/io/Makefile (revision 441977) >+++ lang/io/Makefile (working copy) >@@ -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: lang/sagittarius-scheme/Makefile >=================================================================== >--- lang/sagittarius-scheme/Makefile (revision 441977) >+++ lang/sagittarius-scheme/Makefile (working copy) >@@ -20,7 +20,7 @@ > libgc-threaded.so:devel/boehm-gc-threaded > > USE_LDCONFIG= yes >-USES= cmake gmake pkgconfig >+USES= cmake:noninja gmake pkgconfig > ONLY_FOR_ARCHS= amd64 i386 > MAKE_JOBS_UNSAFE= yes > >Index: mail/libcmime/Makefile >=================================================================== >--- mail/libcmime/Makefile (revision 441977) >+++ mail/libcmime/Makefile (working copy) >@@ -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: mail/libvmime/Makefile >=================================================================== >--- mail/libvmime/Makefile (revision 441977) >+++ mail/libvmime/Makefile (working copy) >@@ -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: mail/spmfilter/Makefile >=================================================================== >--- mail/spmfilter/Makefile (revision 441977) >+++ mail/spmfilter/Makefile (working copy) >@@ -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: mail/spmfilter-clamav/Makefile >=================================================================== >--- mail/spmfilter-clamav/Makefile (revision 441977) >+++ mail/spmfilter-clamav/Makefile (working copy) >@@ -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: math/metis/Makefile >=================================================================== >--- math/metis/Makefile (revision 441977) >+++ math/metis/Makefile (working copy) >@@ -14,7 +14,7 @@ > > CONFLICTS= metis4-4* metis-edf-[0-9]* > >-USES= cmake >+USES= cmake:noninja > > OPTIONS_DEFINE= OPENMP SHARED STATIC DOCS > >Index: math/parmetis/Makefile >=================================================================== >--- math/parmetis/Makefile (revision 441977) >+++ math/parmetis/Makefile (working copy) >@@ -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: multimedia/avidemux/Makefile.common >=================================================================== >--- multimedia/avidemux/Makefile.common (revision 441977) >+++ multimedia/avidemux/Makefile.common (working copy) >@@ -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: multimedia/gstreamer-qt4/Makefile >=================================================================== >--- multimedia/gstreamer-qt4/Makefile (revision 441977) >+++ multimedia/gstreamer-qt4/Makefile (working copy) >@@ -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: multimedia/phonon-designerplugin/Makefile >=================================================================== >--- multimedia/phonon-designerplugin/Makefile (revision 441977) >+++ multimedia/phonon-designerplugin/Makefile (working copy) >@@ -14,7 +14,7 @@ > > USE_QT4= corelib designer gui phonon \ > qmake_build moc_build rcc_build uic_build >-USES= cmake tar:xz >+USES= cmake:noninja tar:xz > CMAKE_ARGS= -DPHONON_QT_PLUGIN_INSTALL_DIR=${PREFIX}/${QT_PLUGINDIR_REL}/designer > > BUILD_WRKSRC= ${WRKSRC}/designer >Index: multimedia/qt5-phonon4-designerplugin/Makefile >=================================================================== >--- multimedia/qt5-phonon4-designerplugin/Makefile (revision 441977) >+++ multimedia/qt5-phonon4-designerplugin/Makefile (working copy) >@@ -14,7 +14,7 @@ > > LICENSE= LGPL21 > >-USES= cmake:outsource kde:5 tar:xz >+USES= cmake:outsource,noninja kde:5 tar:xz > USE_KDE= ecm > USE_QT5= core designer gui phonon4 widgets xml \ > buildtools_build qmake_build >Index: multimedia/zoneminder/Makefile >=================================================================== >--- multimedia/zoneminder/Makefile (revision 441977) >+++ multimedia/zoneminder/Makefile (working copy) >@@ -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 > >Index: multimedia/zoneminder-h264/Makefile >=================================================================== >--- multimedia/zoneminder-h264/Makefile (revision 441977) >+++ multimedia/zoneminder-h264/Makefile (working copy) >@@ -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: net/ceph-devel/Makefile >=================================================================== >--- net/ceph-devel/Makefile (revision 441977) >+++ net/ceph-devel/Makefile (working copy) >@@ -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: net/libproxy/Makefile >=================================================================== >--- net/libproxy/Makefile (revision 441977) >+++ net/libproxy/Makefile (working copy) >@@ -13,7 +13,7 @@ > CPE_VENDOR= libproxy_project > PATHFIX_CMAKELISTSTXT= devfiles.cmk > USE_GITHUB= yes >-USES+= cmake:outsource cpe pathfix >+USES+= cmake:outsource,noninja cpe pathfix > > PLIST_SUB+= VERSION=${PORTVERSION} > >Index: net/tigervnc/Makefile >=================================================================== >--- net/tigervnc/Makefile (revision 441977) >+++ net/tigervnc/Makefile (working copy) >@@ -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: net-im/licq/Makefile >=================================================================== >--- net-im/licq/Makefile (revision 441977) >+++ net-im/licq/Makefile (working copy) >@@ -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: net-im/ring-gnome/Makefile >=================================================================== >--- net-im/ring-gnome/Makefile (revision 441977) >+++ net-im/ring-gnome/Makefile (working copy) >@@ -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: net-im/ring-libclient/Makefile >=================================================================== >--- net-im/ring-libclient/Makefile (revision 441977) >+++ net-im/ring-libclient/Makefile (working copy) >@@ -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: net-p2p/eiskaltdcpp-daemon/Makefile >=================================================================== >--- net-p2p/eiskaltdcpp-daemon/Makefile (revision 441977) >+++ net-p2p/eiskaltdcpp-daemon/Makefile (working copy) >@@ -15,7 +15,7 @@ > > MASTERDIR= ${.CURDIR}/../eiskaltdcpp-lib > >-USES= cmake gettext compiler:c++11-lib ssl >+USES= cmake:noninja gettext compiler:c++11-lib ssl > > OPTIONS_SINGLE= UI > OPTIONS_SINGLE_UI= NOUI XMLRPC JSONRPC >Index: net-p2p/eiskaltdcpp-qt/Makefile >=================================================================== >--- net-p2p/eiskaltdcpp-qt/Makefile (revision 441977) >+++ net-p2p/eiskaltdcpp-qt/Makefile (working copy) >@@ -16,7 +16,7 @@ > > MASTERDIR= ${.CURDIR}/../eiskaltdcpp-lib > >-USES= cmake gettext compiler:c++11-lib desktop-file-utils ssl >+USES= cmake:noninja gettext compiler:c++11-lib desktop-file-utils ssl > USE_QT4= gui xml network qmake_build uic_build \ > moc_build rcc_build linguisttools_build > >Index: science/paraview/Makefile >=================================================================== >--- science/paraview/Makefile (revision 441977) >+++ science/paraview/Makefile (working copy) >@@ -41,7 +41,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: security/kwalletmanager/Makefile >=================================================================== >--- security/kwalletmanager/Makefile (revision 441977) >+++ security/kwalletmanager/Makefile (working copy) >@@ -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: security/libzrtpcppcore/Makefile >=================================================================== >--- security/libzrtpcppcore/Makefile (revision 441977) >+++ security/libzrtpcppcore/Makefile (working copy) >@@ -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: sysutils/baloo/Makefile >=================================================================== >--- sysutils/baloo/Makefile (revision 441977) >+++ sysutils/baloo/Makefile (working copy) >@@ -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: sysutils/fluent-bit/Makefile >=================================================================== >--- sysutils/fluent-bit/Makefile (revision 441977) >+++ sysutils/fluent-bit/Makefile (working copy) >@@ -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: sysutils/kcm-polkit-kde/Makefile >=================================================================== >--- sysutils/kcm-polkit-kde/Makefile (revision 441977) >+++ sysutils/kcm-polkit-kde/Makefile (working copy) >@@ -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: sysutils/osquery/Makefile >=================================================================== >--- sysutils/osquery/Makefile (revision 441977) >+++ sysutils/osquery/Makefile (working copy) >@@ -28,7 +28,7 @@ > libcppnetlib-uri.so:devel/cpp-netlib > 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: textproc/zxing-cpp/Makefile >=================================================================== >--- textproc/zxing-cpp/Makefile (revision 441977) >+++ textproc/zxing-cpp/Makefile (working copy) >@@ -16,6 +16,6 @@ > GH_ACCOUNT= glassechidna > GH_TAGNAME= 97e9c5c > >-USES= cmake:outsource gmake iconv >+USES= cmake:outsource iconv > > .include <bsd.port.mk> >Index: www/h2o/Makefile >=================================================================== >--- www/h2o/Makefile (revision 441977) >+++ www/h2o/Makefile (working copy) >@@ -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: www/wt/Makefile >=================================================================== >--- www/wt/Makefile (revision 441977) >+++ www/wt/Makefile (working copy) >@@ -22,7 +22,7 @@ > GH_ACCOUNT= kdeforche > USE_LDCONFIG= yes > USE_XORG+=x11 >-USES= cmake:outsource pkgconfig ssl >+USES= cmake:outsource,noninja pkgconfig ssl > CMAKE_ARGS+= -DCONFIGDIR:STRING=${LOCALBASE}/etc/wt \ > -DGM_PREFIX:STRING=${LOCALBASE} \ > -DPNG_PREFIX:STRING=${LOCALBASE} \ >Index: x11/kde4-runtime/Makefile >=================================================================== >--- x11/kde4-runtime/Makefile (revision 441977) >+++ x11/kde4-runtime/Makefile (working copy) >@@ -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: x11/kde4-workspace/Makefile >=================================================================== >--- x11/kde4-workspace/Makefile (revision 441977) >+++ x11/kde4-workspace/Makefile (working copy) >@@ -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 compiler:c++11-lib gettext jpeg kde:4 \ > pkgconfig shebangfix tar:xz > USE_GL= gl glu > USE_GNOME= glib20 libxml2 >Index: x11/libkonq/Makefile >=================================================================== >--- x11/libkonq/Makefile (revision 441977) >+++ x11/libkonq/Makefile (working copy) >@@ -11,7 +11,7 @@ > > LIB_DEPENDS= libphonon.so:multimedia/phonon > >-USES= cmake:outsource kde:4 tar:xz >+USES= cmake:outsource,noninja kde:4 tar:xz > USE_KDE= kdelibs automoc4 soprano > USE_QT4= corelib dbus gui network svg xml \ > moc_build qmake_build rcc_build uic_build >Index: x11/virtualgl/Makefile >=================================================================== >--- x11/virtualgl/Makefile (revision 441977) >+++ x11/virtualgl/Makefile (working copy) >@@ -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\ >Index: x11-themes/kde4-windeco-crystal/Makefile >=================================================================== >--- x11-themes/kde4-windeco-crystal/Makefile (revision 441977) >+++ x11-themes/kde4-windeco-crystal/Makefile (working copy) >@@ -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: x11-themes/qtcurve/Makefile >=================================================================== >--- x11-themes/qtcurve/Makefile (revision 441977) >+++ x11-themes/qtcurve/Makefile (working copy) >@@ -28,7 +28,7 @@ > USE_GITHUB= yes > GH_ACCOUNT= QtCurve > >-USES= compiler:c++11-lib cmake execinfo pkgconfig >+USES= compiler:c++11-lib cmake:noninja execinfo pkgconfig > USE_XORG= x11 xcb > > .for i in gtk2 kde4 qt4 qt5 >Index: x11-toolkits/mygui/Makefile >=================================================================== >--- x11-toolkits/mygui/Makefile (revision 441977) >+++ x11-toolkits/mygui/Makefile (working copy) >@@ -30,7 +30,7 @@ > > MYGUI_RENDERSYSTEM?= 0 > >-USES= cmake compiler:c++11-lib pkgconfig >+USES= cmake:noninja compiler:c++11-lib pkgconfig > CMAKE_ARGS= -DMYGUI_BUILD_DEMOS=FALSE \ > -DMYGUI_BUILD_TOOLS=FALSE \ > -DMYGUI_BUILD_DOCS=FALSE \
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 219629
:
183029
|
183075
|
183076
|
183134
|
183219
|
183389
|
183390
|
183434
|
183515