Index: Mk/Uses/cmake.mk =================================================================== --- Mk/Uses/cmake.mk +++ Mk/Uses/cmake.mk @@ -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,7 @@ CMAKE_ARGS+= -DCMAKE_COLOR_MAKEFILE:BOOL=OFF .endif -.if defined(CMAKE_NINJA) +.if empty(cmake_ARGS:Mnoninja) && empty(USES:Mfortran) .include "${USESDIR}/ninja.mk" .endif Index: astro/marble/Makefile =================================================================== --- astro/marble/Makefile +++ astro/marble/Makefile @@ -10,7 +10,7 @@ LIB_DEPENDS= libquazip.so:archivers/quazip -USES= cmake:outsource gmake kde:4 shared-mime-info tar:xz +USES= cmake:outsource,noninja gmake 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: cad/opencascade/Makefile =================================================================== --- cad/opencascade/Makefile +++ cad/opencascade/Makefile @@ -21,7 +21,7 @@ # Check ${WRKSRC}/dox/overview/Overview.md # and ${WRKSRC}/dox/dev_guides/building -USES= alias:10 bison cmake compiler:c++11-lib dos2unix gmake \ +USES= alias:10 bison cmake:noninja compiler:c++11-lib dos2unix gmake \ shebangfix tk tar:tgz USE_XORG= xmu DOS2UNIX_FILES= adm/templates/* Index: chinese/fcitx/Makefile =================================================================== --- chinese/fcitx/Makefile +++ chinese/fcitx/Makefile @@ -39,7 +39,7 @@ USE_KDE= ecm USE_XORG= x11 xext xkbfile sm ice USE_LDCONFIG= yes -USES= tar:xz cmake desktop-file-utils execinfo \ +USES= tar:xz cmake:noninja desktop-file-utils execinfo \ gettext-tools:build,run gettext-runtime iconv:wchar_t \ kde:5 pkgconfig shared-mime-info INSTALLS_ICONS= yes Index: chinese/ibus-chewing/Makefile =================================================================== --- chinese/ibus-chewing/Makefile +++ chinese/ibus-chewing/Makefile @@ -20,7 +20,7 @@ -DLIB_DIR=${PREFIX}/lib LDFLAGS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.freedesktop.IBus.Chewing.gschema.xml -USES= cmake gettext pkgconfig +USES= cmake:noninja gettext pkgconfig USE_GNOME= gtk20 USE_XORG= xtst Index: comms/uhd/Makefile =================================================================== --- comms/uhd/Makefile +++ comms/uhd/Makefile @@ -26,7 +26,7 @@ BROKEN_powerpc64= fails to link: undefined reference to boost function -USES= compiler:c++0x cmake:outsource gmake ncurses pkgconfig \ +USES= compiler:c++0x cmake:outsource,noninja gmake ncurses pkgconfig \ dos2unix python:2.7 shebangfix USE_LDCONFIG= yes CMAKE_SOURCE_PATH= ${WRKSRC}/host Index: databases/clickhouse/Makefile =================================================================== --- databases/clickhouse/Makefile +++ databases/clickhouse/Makefile @@ -36,7 +36,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/mysql56-server/Makefile =================================================================== --- databases/mysql56-server/Makefile +++ databases/mysql56-server/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 SLAVEDIRS= databases/mysql56-client -USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib \ +USES= bison:build cmake:outsource,noninja compiler:c11 compiler:c++11-lib \ cpe libedit localbase perl5 shebangfix ssl USE_PERL5= run Index: databases/percona55-server/Makefile =================================================================== --- databases/percona55-server/Makefile +++ databases/percona55-server/Makefile @@ -12,7 +12,7 @@ COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/percona55-client -USES= bison cmake readline shebangfix +USES= bison cmake:noninja readline shebangfix CXXFLAGS+= ${CPPFLAGS} Index: databases/soci/Makefile =================================================================== --- databases/soci/Makefile +++ databases/soci/Makefile @@ -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 +++ databases/tarantool/Makefile @@ -14,7 +14,7 @@ BROKEN_powerpc64= Does not build: Unsupported architecture -- powerpc64 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 +++ databases/xtrabackup/Makefile @@ -27,7 +27,7 @@ BROKEN_powerpc64= Does not build: 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/kdepim4/Makefile =================================================================== --- deskutils/kdepim4/Makefile +++ deskutils/kdepim4/Makefile @@ -24,7 +24,7 @@ USE_GNOME= libxml2 libxslt:build USE_KDE= kdelibs pimlibs kactivities \ akonadi automoc4 soprano nepomuk-widgets baloo -USES= cmake:outsource gmake grantlee:4 iconv kde:4 shebangfix tar:xz +USES= cmake:outsource,noninja gmake 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 +++ deskutils/owncloudclient/Makefile @@ -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 +++ devel/bullet/Makefile @@ -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 +++ devel/compiler-rt/Makefile @@ -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/kdevelop-php/Makefile =================================================================== --- devel/kdevelop-php/Makefile +++ devel/kdevelop-php/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform BUILD_DEPENDS= ${KDE_PREFIX}/bin/kdev-pg-qt:devel/kdevelop-pg-qt -USES= cmake:outsource compiler:c++11-lib gmake kde:4 tar:xz +USES= cmake:outsource,noninja compiler:c++11-lib gmake kde:4 tar:xz USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build MAKE_JOBS_UNSAFE= yes Index: devel/mongo-c-driver/Makefile =================================================================== --- devel/mongo-c-driver/Makefile +++ devel/mongo-c-driver/Makefile @@ -17,7 +17,7 @@ USE_GITHUB= yes GH_ACCOUNT= mongodb -USES= cmake pkgconfig +USES= cmake:noninja pkgconfig USE_LDCONFIG= yes LDFLAGS+= -pthread Index: devel/rapidjson/Makefile =================================================================== --- devel/rapidjson/Makefile +++ devel/rapidjson/Makefile @@ -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: games/hedgewars/Makefile =================================================================== --- games/hedgewars/Makefile +++ games/hedgewars/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libphysfs.so:devel/physfs -USES= cmake desktop-file-utils lua:51 tar:bzip2 +USES= cmake:noninja desktop-file-utils lua:51 tar:bzip2 USE_SDL= sdl mixer image ttf net USE_FPC= opengl libpng rtl-objpas USE_QT4= corelib gui moc_build network \ Index: games/openclonk/Makefile =================================================================== --- games/openclonk/Makefile +++ games/openclonk/Makefile @@ -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 +++ games/palomino/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= libosg.so:graphics/osg -USES= alias cmake lua:51 tar:xz +USES= alias cmake:noninja lua:51 tar:xz USE_GL= gl MISC_VER= 20091027 Index: games/solarus/Makefile =================================================================== --- games/solarus/Makefile +++ games/solarus/Makefile @@ -23,7 +23,7 @@ USE_QT5= buildtools_build core gui linguisttools_build widgets USE_SDL= sdl2 ttf2 image2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= cmake qmake compiler:c++11-lib openal +USES= cmake:noninja qmake compiler:c++11-lib openal USE_LDCONFIG= yes .include Index: games/spring/Makefile =================================================================== --- games/spring/Makefile +++ games/spring/Makefile @@ -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 +++ graphics/cuneiform/Makefile @@ -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 +++ graphics/digikam-kde4/Makefile.common @@ -118,7 +118,7 @@ USES+= tar:bzip2 .if !defined(NO_BUILD) -USES+= cmake kde:4 +USES+= cmake:noninja kde:4 USE_KDE+= automoc4 kdelibs USE_QT4+= qmake_build moc_build rcc_build uic_build Index: graphics/ilmbase/files/patch-git_8eed7012 =================================================================== --- /dev/null +++ graphics/ilmbase/files/patch-git_8eed7012 @@ -0,0 +1,59 @@ +From 8eed7012c10f1a835385d750fd55f228d1d35df9 Mon Sep 17 00:00:00 2001 +From: Ralph Potter +Date: Wed, 5 Nov 2014 16:16:55 +0000 +Subject: [PATCH] Resolve dependency issue building eLut.h/toFloat.h with + CMake/Ninja. + +--- + IlmBase/Half/CMakeLists.txt | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) + +diff --git a/IlmBase/Half/CMakeLists.txt b/IlmBase/Half/CMakeLists.txt +index 6f9714d..958d1b0 100644 +--- Half/CMakeLists.txt ++++ Half/CMakeLists.txt +@@ -1,23 +1,24 @@ + # yue.nicholas@gmail.com + + ADD_EXECUTABLE ( eLut eLut.cpp ) +- +-ADD_CUSTOM_COMMAND ( +- TARGET eLut POST_BUILD +- COMMAND eLut > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h ++ADD_CUSTOM_COMMAND( ++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/eLut.h ++ COMMAND eLut ARGS > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h ++ DEPENDS eLut + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +-) ++ ) + SET_SOURCE_FILES_PROPERTIES( + ${CMAKE_CURRENT_BINARY_DIR}/eLut.h + PROPERTIES HEADER_FILE_ONLY TRUE + ) + + ADD_EXECUTABLE ( toFloat toFloat.cpp ) +-ADD_CUSTOM_COMMAND ( +- TARGET toFloat POST_BUILD +- COMMAND toFloat > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h ++ADD_CUSTOM_COMMAND( ++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h ++ COMMAND toFloat ARGS > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h ++ DEPENDS toFloat + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +-) ++ ) + SET_SOURCE_FILES_PROPERTIES( + ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h + PROPERTIES HEADER_FILE_ONLY TRUE +@@ -27,9 +28,7 @@ SET_SOURCE_FILES_PROPERTIES( + half.cpp + PROPERTIES + OBJECT_DEPENDS +- ${CMAKE_CURRENT_BINARY_DIR}/eLut.h +- OBJECT_DEPENDS +- ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h ++ "${CMAKE_CURRENT_BINARY_DIR}/eLut.h;${CMAKE_CURRENT_BINARY_DIR}/toFloat.h" + ) + + IF(BUILD_SHARED_LIBS) Index: graphics/luxrender/Makefile =================================================================== --- graphics/luxrender/Makefile +++ graphics/luxrender/Makefile @@ -28,7 +28,7 @@ ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= uses SSE instructions -USES+= bison cmake python:build tar:bzip2 +USES+= bison cmake:noninja python:build tar:bzip2 USE_GL= glu WRKSRC= ${WRKDIR}/${PORTNAME}-lux-${LUX_REV} Index: graphics/opencv/Makefile =================================================================== --- graphics/opencv/Makefile +++ graphics/opencv/Makefile @@ -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 +++ graphics/opensubdiv/Makefile @@ -20,7 +20,7 @@ USE_LDCONFIG= yes USE_GL= glew -USES= cmake:outsource compiler pkgconfig +USES= cmake:outsource,noninja compiler pkgconfig USE_XORG= x11 xi xcursor xrandr xxf86vm xinerama CMAKE_ARGS+= -DNO_TUTORIALS:BOOL=ON -DNO_EXAMPLES:BOOL=ON \ Index: graphics/xcftools/Makefile =================================================================== --- graphics/xcftools/Makefile +++ graphics/xcftools/Makefile @@ -18,7 +18,7 @@ GH_TAGNAME= d72ba82 # option NLS (for gettext) is wrong as this port allways needs NLS: -USES= libtool cmake gmake iconv pkgconfig perl5 gettext +USES= libtool cmake:noninja gmake iconv pkgconfig perl5 gettext USE_PERL5= build run GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: mail/libcmime/Makefile =================================================================== --- mail/libcmime/Makefile +++ mail/libcmime/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -USES= bison cmake pkgconfig +USES= bison cmake:noninja pkgconfig USE_LDCONFIG= yes CMAKE_ARGS= --no-warn-unused-cli Index: mail/libvmime/Makefile =================================================================== --- mail/libvmime/Makefile +++ mail/libvmime/Makefile @@ -20,7 +20,7 @@ GH_ACCOUNT= kisli GH_PROJECT= vmime -USES= cmake:outsource compiler:c++11-lib iconv pkgconfig +USES= cmake:outsource,noninja compiler:c++11-lib iconv pkgconfig USE_LDCONFIG= yes CMAKE_ARGS= -DLIB_SUFFIX:STRING="" \ Index: mail/spmfilter/Makefile =================================================================== --- mail/spmfilter/Makefile +++ mail/spmfilter/Makefile @@ -20,7 +20,7 @@ SMFGROUP?= mail SMFDIR?= /var/spool/spmfilter -USES= cmake pkgconfig +USES= cmake:noninja pkgconfig CMAKE_ARGS+= --no-warn-unused-cli \ -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \ -DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib" Index: math/metis/Makefile =================================================================== --- math/metis/Makefile +++ math/metis/Makefile @@ -14,7 +14,7 @@ CONFLICTS= metis4-4* metis-edf-[0-9]* -USES= cmake +USES= cmake:noninja OPTIONS_DEFINE= OPENMP SHARED STATIC DOCS Index: multimedia/avidemux/Makefile.common =================================================================== --- multimedia/avidemux/Makefile.common +++ multimedia/avidemux/Makefile.common @@ -19,7 +19,7 @@ OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options -USES= cmake:outsource pkgconfig iconv gmake compiler:features sqlite +USES= cmake:outsource,noninja pkgconfig iconv gmake compiler:features sqlite USES+= dos2unix execinfo DOS2UNIX_FILES= cmake/admCheckMiscLibs.cmake CMAKE_ARGS+= -DGNUMAKE_EXECUTABLE=gmake Index: multimedia/gstreamer-qt4/Makefile =================================================================== --- multimedia/gstreamer-qt4/Makefile +++ multimedia/gstreamer-qt4/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USES= bison cmake gmake kde:4 pathfix pkgconfig tar:bzip2 +USES= bison cmake:noninja gmake kde:4 pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes USE_GSTREAMER= yes USE_GNOME= glib20 Index: multimedia/zoneminder/Makefile =================================================================== --- multimedia/zoneminder/Makefile +++ multimedia/zoneminder/Makefile @@ -34,7 +34,7 @@ GH_PROJECT= ZoneMinder GH_TUPLE= FriendsOfCake:crud:c3976f1:crud -USES= cmake jpeg mysql perl5 php shebangfix ssl +USES= cmake:noninja jpeg mysql perl5 php shebangfix ssl USE_RC_SUBR= zoneminder USE_PHP= json pdo_mysql session gd sockets ctype Index: net-im/licq/Makefile =================================================================== --- net-im/licq/Makefile +++ net-im/licq/Makefile @@ -16,7 +16,7 @@ BROKEN_sparc64= Does not build: fails to link -USES= cmake iconv ssl +USES= cmake:noninja iconv ssl WRKSRC= ${WRKDIR}/${DISTNAME} LICQ_PORT?= net-im/licq Index: net-im/ring-libclient/Makefile =================================================================== --- net-im/ring-libclient/Makefile +++ net-im/ring-libclient/Makefile @@ -18,7 +18,7 @@ #GH_TUPLE+= savoirfairelinux:ring-lrc:9eaac77 GH_TUPLE+= savoirfairelinux:ring-lrc:cb5ee04 -USES= cmake compiler:c++14-lang gmake +USES= cmake:noninja compiler:c++14-lang gmake USE_GNOME= glib20 gtk20 cairo gdkpixbuf2 USE_XORG= x11 xscrnsaver USE_GL= gl Index: net-p2p/eiskaltdcpp-qt/Makefile =================================================================== --- net-p2p/eiskaltdcpp-qt/Makefile +++ net-p2p/eiskaltdcpp-qt/Makefile @@ -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: net/ceph-devel/Makefile =================================================================== --- net/ceph-devel/Makefile +++ net/ceph-devel/Makefile @@ -74,7 +74,7 @@ -D WITH_CEPHFS:BOOL=OFF \ -D WITH_EMBEDDED:BOOL=OFF -USES= gmake cmake:outsource python:2.7 fuse gettext-runtime shebangfix +USES= gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix SHEBANG_FILES=src/rbdmap src/ceph-post-file.in src/rbd-replay-many \ src/brag/client/ceph-brag src/ceph-rest-api \ src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \ Index: net/libproxy/Makefile =================================================================== --- net/libproxy/Makefile +++ net/libproxy/Makefile @@ -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: security/kwalletmanager/Makefile =================================================================== --- security/kwalletmanager/Makefile +++ security/kwalletmanager/Makefile @@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Password manager for KDE -USES= cmake:outsource gmake kde:4 tar:xz +USES= cmake:outsource,noninja gmake kde:4 tar:xz USE_KDE= automoc4 kdelibs USE_QT4= qmake_build moc_build rcc_build uic_build Index: sysutils/baloo/Makefile =================================================================== --- sysutils/baloo/Makefile +++ sysutils/baloo/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libxapian.so:databases/xapian-core \ libqjson.so:devel/qjson -USES= cmake:outsource gmake kde:4 tar:xz +USES= cmake:outsource,noninja gmake kde:4 tar:xz USE_KDE= akonadi automoc4 kdelibs kfilemetadata \ pimlibs USE_QT4= corelib qmake_build moc_build rcc_build uic_build Index: sysutils/kcm-polkit-kde/Makefile =================================================================== --- sysutils/kcm-polkit-kde/Makefile +++ sysutils/kcm-polkit-kde/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libpolkit-qt-agent-1.so:sysutils/polkit-qt RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde -USES= cmake gmake kde:4 pkgconfig tar:bzip2 +USES= cmake:noninja gmake 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 +++ sysutils/osquery/Makefile @@ -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,noninja gmake libtool python:build compiler:c++11-lib \ libarchive ssl USE_GNOME= libxml2 CONFIGURE_ENV+= OSQUERY_BUILD_VERSION="${PORTVERSION}" HOME="${WRKDIR}" \ Index: x11-themes/qtcurve/Makefile =================================================================== --- x11-themes/qtcurve/Makefile +++ x11-themes/qtcurve/Makefile @@ -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 +++ x11-toolkits/mygui/Makefile @@ -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 \ Index: x11/kde4-runtime/Makefile =================================================================== --- x11/kde4-runtime/Makefile +++ x11/kde4-runtime/Makefile @@ -24,7 +24,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:security/libssh RUN_DEPENDS= cagibid:net/cagibi -USES= cmake:outsource gettext gmake jpeg kde:4 samba:lib shared-mime-info \ +USES= cmake:outsource,noninja gettext gmake 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 +++ x11/kde4-workspace/Makefile @@ -40,7 +40,7 @@ ${LOCALBASE}/etc/pam.d/kde:security/pam_kde \ ${KDE_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:x11-themes/kde4-base-artwork -USES= cmake:outsource compiler:c++11-lib gettext gmake jpeg kde:4 \ +USES= cmake:outsource,noninja compiler:c++11-lib gettext gmake jpeg kde:4 \ pkgconfig shebangfix tar:xz USE_GL= gl glu USE_GNOME= glib20 libxml2 Index: x11/libkonq/Makefile =================================================================== --- x11/libkonq/Makefile +++ x11/libkonq/Makefile @@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Core library for Konqueror -USES= cmake kde:4 tar:xz +USES= cmake:noninja kde:4 tar:xz USE_KDE= kdelibs automoc4 USE_QT4= corelib dbus gui \ moc_build qmake_build rcc_build uic_build Index: x11/virtualgl/Makefile =================================================================== --- x11/virtualgl/Makefile +++ x11/virtualgl/Makefile @@ -20,7 +20,7 @@ CMAKE_INSTALL_PREFIX= ${LOCALBASE}/VirtualGL DOCSDIR= ${LOCALBASE}/VirtualGL/doc -USES= cmake compiler:c++11-lang +USES= cmake:ninja compiler:c++11-lang USE_GL= gl glu USE_XORG= x11 xcb xext CMAKE_ARGS= -DTJPEG_INCLUDE_DIR=${LOCALBASE}/include\