pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: wiz
Date: Tue Jan 24 18:36:36 UTC 2023
Modified Files:
pkgsrc/archivers/brotli: Makefile
pkgsrc/archivers/zziplib: Makefile
pkgsrc/audio/cantata: Makefile
pkgsrc/audio/chromaprint: Makefile
pkgsrc/audio/fluidsynth: Makefile
pkgsrc/audio/jack-keyboard: Makefile
pkgsrc/audio/kid3: Makefile
pkgsrc/audio/libcuefile: Makefile
pkgsrc/audio/libebur128: Makefile
pkgsrc/audio/libmysofa: Makefile
pkgsrc/audio/libreplaygain: Makefile
pkgsrc/audio/libwildmidi: Makefile
pkgsrc/audio/musepack: Makefile
pkgsrc/audio/openal-soft: Makefile
pkgsrc/audio/taglib: Makefile
pkgsrc/audio/taglib-extras: Makefile
pkgsrc/benchmarks/google-benchmark: Makefile
pkgsrc/databases/hiredis: Makefile
pkgsrc/databases/mariadb106-client: Makefile.common
pkgsrc/devel/abseil: Makefile
pkgsrc/devel/cmocka: Makefile
pkgsrc/devel/cvise: Makefile
pkgsrc/devel/doxygen: Makefile
pkgsrc/devel/extra-cmake-modules: Makefile
pkgsrc/devel/fann: Makefile
pkgsrc/devel/gflags: Makefile
pkgsrc/devel/googletest: Makefile
pkgsrc/devel/libcerf: Makefile
pkgsrc/devel/libebml: Makefile
pkgsrc/devel/libepoll-shim: Makefile
pkgsrc/devel/libgit2: Makefile
pkgsrc/devel/lld: Makefile
pkgsrc/devel/re2: Makefile
pkgsrc/devel/snappy: Makefile
pkgsrc/devel/spdlog: Makefile
pkgsrc/devel/yajl: Makefile
pkgsrc/editors/xournalpp: Makefile
pkgsrc/finance/gnucash: Makefile
pkgsrc/finance/gnucash-docs: Makefile
pkgsrc/fonts/fontforge: Makefile
pkgsrc/fonts/woff2: Makefile
pkgsrc/graphics/box2d: Makefile
pkgsrc/graphics/exiv2: Makefile
pkgsrc/graphics/freeglut: Makefile
pkgsrc/graphics/glfw: Makefile
pkgsrc/graphics/glm: Makefile
pkgsrc/graphics/graphite2: Makefile
pkgsrc/graphics/inkscape: Makefile
pkgsrc/graphics/jasper: Makefile
pkgsrc/graphics/libjpeg-turbo: Makefile
pkgsrc/graphics/openexr: Makefile
pkgsrc/graphics/openjpeg: Makefile
pkgsrc/graphics/osg: Makefile
pkgsrc/graphics/oxygen-icons: Makefile
pkgsrc/graphics/zxing-cpp: Makefile
pkgsrc/lang/clang: Makefile.common
pkgsrc/lang/libLLVM: Makefile
pkgsrc/lang/libunwind: Makefile
pkgsrc/lang/llvm: Makefile
pkgsrc/lang/wasi-compiler-rt: Makefile
pkgsrc/lang/wasi-libcxx: Makefile
pkgsrc/mail/rspamd: Makefile
pkgsrc/math/double-conversion: Makefile
pkgsrc/math/dragonbox: Makefile
pkgsrc/math/imath: Makefile
pkgsrc/math/lapack: Makefile.common
pkgsrc/math/libfixmath: Makefile
pkgsrc/multimedia/libaom: Makefile
pkgsrc/multimedia/libmatroska: Makefile
pkgsrc/multimedia/obs-studio: Makefile
pkgsrc/multimedia/x265: Makefile
pkgsrc/net/grpc: Makefile
pkgsrc/net/libcares: Makefile
pkgsrc/net/ngtcp2: Makefile
pkgsrc/net/sshping: Makefile
pkgsrc/net/tigervnc: Makefile
pkgsrc/net/wireshark: Makefile
pkgsrc/print/podofo: Makefile
pkgsrc/print/scribus-qt5: Makefile
pkgsrc/security/gpgmepp: Makefile
pkgsrc/security/keepassxc: Makefile
pkgsrc/security/libssh: Makefile
pkgsrc/security/mbedtls: Makefile
pkgsrc/security/mbedtls3: Makefile
pkgsrc/security/minisign: Makefile
pkgsrc/security/polkit-qt: Makefile
pkgsrc/security/polkit-qt5: Makefile
pkgsrc/shells/fish: Makefile
pkgsrc/textproc/fmtlib: Makefile
pkgsrc/textproc/json-c: Makefile
pkgsrc/textproc/json-schema: Makefile
pkgsrc/textproc/jsoncpp: Makefile
pkgsrc/textproc/libclucene: Makefile
pkgsrc/textproc/libyaml: Makefile
pkgsrc/textproc/pugixml: Makefile
pkgsrc/textproc/rapidjson: Makefile
pkgsrc/textproc/tinyxml2: Makefile
pkgsrc/www/libproxy: Makefile
pkgsrc/www/libwebsockets: Makefile
pkgsrc/www/nghttp3: Makefile
pkgsrc/www/tidy: Makefile
pkgsrc/www/webkit-gtk: Makefile
pkgsrc/x11/qt5-qtwebkit: Makefile
Log Message:
*: convert to cmake/build.mk
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/archivers/brotli/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/archivers/zziplib/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/audio/cantata/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/audio/chromaprint/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/audio/fluidsynth/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/jack-keyboard/Makefile
cvs rdiff -u -r1.123 -r1.124 pkgsrc/audio/kid3/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/libcuefile/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/libebur128/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/libmysofa/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/libreplaygain/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/libwildmidi/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/musepack/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/audio/openal-soft/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/audio/taglib/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/taglib-extras/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/benchmarks/google-benchmark/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/hiredis/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/mariadb106-client/Makefile.common
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/abseil/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/cmocka/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/cvise/Makefile
cvs rdiff -u -r1.165 -r1.166 pkgsrc/devel/doxygen/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/extra-cmake-modules/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/fann/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gflags/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/googletest/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/libcerf/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/libebml/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/libepoll-shim/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/libgit2/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/lld/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/re2/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/snappy/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/spdlog/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/yajl/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/editors/xournalpp/Makefile
cvs rdiff -u -r1.328 -r1.329 pkgsrc/finance/gnucash/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/finance/gnucash-docs/Makefile
cvs rdiff -u -r1.132 -r1.133 pkgsrc/fonts/fontforge/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/woff2/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/box2d/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/graphics/exiv2/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/graphics/freeglut/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/glfw/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/glm/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/graphite2/Makefile
cvs rdiff -u -r1.257 -r1.258 pkgsrc/graphics/inkscape/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/graphics/jasper/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/libjpeg-turbo/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/graphics/openexr/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/openjpeg/Makefile
cvs rdiff -u -r1.153 -r1.154 pkgsrc/graphics/osg/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/oxygen-icons/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/zxing-cpp/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/lang/clang/Makefile.common
cvs rdiff -u -r1.43 -r1.44 pkgsrc/lang/libLLVM/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/libunwind/Makefile
cvs rdiff -u -r1.85 -r1.86 pkgsrc/lang/llvm/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/wasi-compiler-rt/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/wasi-libcxx/Makefile
cvs rdiff -u -r1.84 -r1.85 pkgsrc/mail/rspamd/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/double-conversion/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/dragonbox/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/imath/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/math/lapack/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/libfixmath/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/multimedia/libaom/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/multimedia/libmatroska/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/multimedia/obs-studio/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/multimedia/x265/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/net/grpc/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/libcares/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/ngtcp2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/sshping/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/net/tigervnc/Makefile
cvs rdiff -u -r1.285 -r1.286 pkgsrc/net/wireshark/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/print/podofo/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/print/scribus-qt5/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/security/gpgmepp/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/security/keepassxc/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/security/libssh/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/security/mbedtls/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/mbedtls3/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/minisign/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/security/polkit-qt/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/polkit-qt5/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/shells/fish/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/fmtlib/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/textproc/json-c/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/json-schema/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/jsoncpp/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/textproc/libclucene/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/libyaml/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/pugixml/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/rapidjson/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/tinyxml2/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/libproxy/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/libwebsockets/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/nghttp3/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/www/tidy/Makefile
cvs rdiff -u -r1.242 -r1.243 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.103 -r1.104 pkgsrc/x11/qt5-qtwebkit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/archivers/brotli/Makefile
diff -u pkgsrc/archivers/brotli/Makefile:1.9 pkgsrc/archivers/brotli/Makefile:1.10
--- pkgsrc/archivers/brotli/Makefile:1.9 Sun Mar 21 19:24:24 2021
+++ pkgsrc/archivers/brotli/Makefile Tue Jan 24 18:36:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/03/21 19:24:24 nros Exp $
+# $NetBSD: Makefile,v 1.10 2023/01/24 18:36:17 wiz Exp $
DISTNAME= brotli-1.0.9
CATEGORIES= archivers
@@ -10,11 +10,11 @@ HOMEPAGE= https://github.com/google/brot
COMMENT= Generic-purpose lossless compression algorithm
LICENSE= mit
-USE_CMAKE= yes
USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE+= scripts/libbrotlicommon.pc.in
PKGCONFIG_OVERRIDE+= scripts/libbrotlidec.pc.in
PKGCONFIG_OVERRIDE+= scripts/libbrotlienc.pc.in
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/archivers/zziplib/Makefile
diff -u pkgsrc/archivers/zziplib/Makefile:1.30 pkgsrc/archivers/zziplib/Makefile:1.31
--- pkgsrc/archivers/zziplib/Makefile:1.30 Mon Apr 12 11:20:27 2021
+++ pkgsrc/archivers/zziplib/Makefile Tue Jan 24 18:36:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2021/04/12 11:20:27 nia Exp $
+# $NetBSD: Makefile,v 1.31 2023/01/24 18:36:17 wiz Exp $
DISTNAME= zziplib-0.13.72
PKGREVISION= 1
@@ -14,7 +14,6 @@ LICENSE= gnu-lgpl-v2 OR mpl-1.1
BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-USE_CMAKE= yes
USE_TOOLS+= bash:build
CMAKE_ARGS+= -DZZIPTEST=NO
@@ -33,6 +32,7 @@ PLIST_SUBST+= SOEXT=so
PYTHON_FOR_BUILD_ONLY= tool
+.include "../../devel/cmake/build.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/python/tool.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/cantata/Makefile
diff -u pkgsrc/audio/cantata/Makefile:1.36 pkgsrc/audio/cantata/Makefile:1.37
--- pkgsrc/audio/cantata/Makefile:1.36 Wed Nov 23 16:19:17 2022
+++ pkgsrc/audio/cantata/Makefile Tue Jan 24 18:36:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2022/11/23 16:19:17 adam Exp $
+# $NetBSD: Makefile,v 1.37 2023/01/24 18:36:18 wiz Exp $
DISTNAME= cantata-2.4.2
PKGREVISION= 18
@@ -15,7 +15,6 @@ LICENSE= gnu-gpl-v3
TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= bash:run perl:run pkg-config
@@ -31,6 +30,7 @@ PLIST_VARS+= notdarwin
PLIST.notdarwin= yes
.endif
+.include "../../devel/cmake/build.mk"
.include "../../audio/libebur128/buildlink3.mk"
.include "../../audio/mpg123/buildlink3.mk"
.include "../../audio/taglib/buildlink3.mk"
Index: pkgsrc/audio/chromaprint/Makefile
diff -u pkgsrc/audio/chromaprint/Makefile:1.33 pkgsrc/audio/chromaprint/Makefile:1.34
--- pkgsrc/audio/chromaprint/Makefile:1.33 Tue Sep 27 20:58:21 2022
+++ pkgsrc/audio/chromaprint/Makefile Tue Jan 24 18:36:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2022/09/27 20:58:21 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2023/01/24 18:36:18 wiz Exp $
DISTNAME= chromaprint-1.5.1
PKGREVISION= 1
@@ -12,7 +12,6 @@ COMMENT= Audio fingerprinting
LICENSE= mit
USE_LANGUAGES= c c++
-USE_CMAKE= yes
# build and install "fpcalc"
CMAKE_ARGS+= -DBUILD_TOOLS=ON
CMAKE_ARGS+= -DFFT_LIB=fftw3
@@ -32,6 +31,7 @@ CMAKE_ARGS+= -DFFMPEG_LIB${lib}_LIBRARIE
PKGCONFIG_OVERRIDE= libchromaprint.pc.cmake
+.include "../../devel/cmake/build.mk"
.include "../../math/fftw/buildlink3.mk"
# On Darwin, chromaprint uses Accelerate.framework, but fpcalc still needs FFmpeg
# does not support ffmpeg4 yet:
Index: pkgsrc/audio/fluidsynth/Makefile
diff -u pkgsrc/audio/fluidsynth/Makefile:1.69 pkgsrc/audio/fluidsynth/Makefile:1.70
--- pkgsrc/audio/fluidsynth/Makefile:1.69 Mon Jan 16 20:48:41 2023
+++ pkgsrc/audio/fluidsynth/Makefile Tue Jan 24 18:36:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2023/01/16 20:48:41 adam Exp $
+# $NetBSD: Makefile,v 1.70 2023/01/24 18:36:18 wiz Exp $
DISTNAME= fluidsynth-2.3.1
CATEGORIES= audio
@@ -10,7 +10,6 @@ HOMEPAGE= https://www.fluidsynth.org/
COMMENT= Software synthesizer based on SoundFont2
LICENSE= gnu-lgpl-v2
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
@@ -42,6 +41,7 @@ SUBST_SED.oss+= -e "s,/dev/midi,${DEVOS
BUILDLINK_TRANSFORM+= rm:-Werror=incompatible-pointer-types
.include "options.mk"
+.include "../../devel/cmake/build.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../devel/libgetopt/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
Index: pkgsrc/audio/jack-keyboard/Makefile
diff -u pkgsrc/audio/jack-keyboard/Makefile:1.5 pkgsrc/audio/jack-keyboard/Makefile:1.6
--- pkgsrc/audio/jack-keyboard/Makefile:1.5 Tue Jan 3 17:36:45 2023
+++ pkgsrc/audio/jack-keyboard/Makefile Tue Jan 24 18:36:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/01/03 17:36:45 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2023/01/24 18:36:19 wiz Exp $
DISTNAME= jack-keyboard-2.7.2
PKGREVISION= 4
@@ -10,12 +10,12 @@ HOMEPAGE= http://jack-keyboard.sourcefor
COMMENT= Virtual MIDI keyboard for JACK applications
LICENSE= 2-clause-bsd
-USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
CMAKE_ARGS+= -DLashEnable=OFF
+.include "../../devel/cmake/build.mk"
.include "../../audio/jack/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/gtk2/buildlink3.mk"
Index: pkgsrc/audio/kid3/Makefile
diff -u pkgsrc/audio/kid3/Makefile:1.123 pkgsrc/audio/kid3/Makefile:1.124
--- pkgsrc/audio/kid3/Makefile:1.123 Wed Nov 23 16:19:21 2022
+++ pkgsrc/audio/kid3/Makefile Tue Jan 24 18:36:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2022/11/23 16:19:21 adam Exp $
+# $NetBSD: Makefile,v 1.124 2023/01/24 18:36:19 wiz Exp $
DISTNAME= kid3-3.5.1
PKGREVISION= 36
@@ -13,7 +13,6 @@ LICENSE= gnu-gpl-v2
BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= perl:build pkg-config
CMAKE_ARGS+= -DQt5Core_DIR:PATH=${QTDIR}
@@ -35,6 +34,7 @@ SUBST_FILES.apple+= src/app/qt/CMakeList
SUBST_FILES.apple+= src/plugins/kid3qml/CMakeLists.txt
SUBST_SED.apple= -e 's,APPLE,ELPPA,g'
+.include "../../devel/cmake/build.mk"
.include "../../audio/chromaprint/buildlink3.mk"
.include "../../audio/flac/buildlink3.mk"
.include "../../audio/id3lib/buildlink3.mk"
Index: pkgsrc/audio/libcuefile/Makefile
diff -u pkgsrc/audio/libcuefile/Makefile:1.2 pkgsrc/audio/libcuefile/Makefile:1.3
--- pkgsrc/audio/libcuefile/Makefile:1.2 Sun Jan 26 17:30:42 2020
+++ pkgsrc/audio/libcuefile/Makefile Tue Jan 24 18:36:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/01/26 17:30:42 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2023/01/24 18:36:19 wiz Exp $
DISTNAME= libcuefile_r475
PKGNAME= libcuefile-0rc475
@@ -10,10 +10,10 @@ HOMEPAGE= https://www.musepack.net/
COMMENT= CUE File library for the musepack decoder
LICENSE= gnu-gpl-v2
-USE_CMAKE= yes
INSTALLATION_DIRS= include/cuetools
post-install:
${INSTALL_DATA} ${WRKSRC}/include/cuetools/* ${DESTDIR}${PREFIX}/include/cuetools
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/libebur128/Makefile
diff -u pkgsrc/audio/libebur128/Makefile:1.7 pkgsrc/audio/libebur128/Makefile:1.8
--- pkgsrc/audio/libebur128/Makefile:1.7 Wed Feb 24 12:26:22 2021
+++ pkgsrc/audio/libebur128/Makefile Tue Jan 24 18:36:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/02/24 12:26:22 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2023/01/24 18:36:19 wiz Exp $
DISTNAME= libebur128-1.2.6
CATEGORIES= audio
@@ -11,11 +11,11 @@ HOMEPAGE= https://github.com/jiixyj/libe
COMMENT= EBU R128 loudness standard implementation
LICENSE= mit
-USE_CMAKE= yes
USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= ebur128/libebur128.pc.cmake
+.include "../../devel/cmake/build.mk"
.include "../../audio/speex/buildlink3.mk"
.include "../../audio/speexdsp/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/libmysofa/Makefile
diff -u pkgsrc/audio/libmysofa/Makefile:1.7 pkgsrc/audio/libmysofa/Makefile:1.8
--- pkgsrc/audio/libmysofa/Makefile:1.7 Sat Dec 3 08:47:28 2022
+++ pkgsrc/audio/libmysofa/Makefile Tue Jan 24 18:36:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/12/03 08:47:28 adam Exp $
+# $NetBSD: Makefile,v 1.8 2023/01/24 18:36:19 wiz Exp $
DISTNAME= libmysofa-1.3.1
CATEGORIES= audio
@@ -12,7 +12,6 @@ LICENSE= modified-bsd
TEST_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
-USE_CMAKE= yes
USE_LANGUAGES+= c c++
USE_TOOLS+= pkg-config
@@ -24,6 +23,7 @@ PKGCONFIG_OVERRIDE+= libmysofa.pc.cmake
do-test:
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ctest
+.include "../../devel/cmake/build.mk"
# for tests
BUILDLINK_DEPMETHOD.cunit= build
.include "../../devel/cunit/buildlink3.mk"
Index: pkgsrc/audio/libreplaygain/Makefile
diff -u pkgsrc/audio/libreplaygain/Makefile:1.3 pkgsrc/audio/libreplaygain/Makefile:1.4
--- pkgsrc/audio/libreplaygain/Makefile:1.3 Sun Jan 26 17:30:43 2020
+++ pkgsrc/audio/libreplaygain/Makefile Tue Jan 24 18:36:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/01/26 17:30:43 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2023/01/24 18:36:20 wiz Exp $
DISTNAME= libreplaygain_r475
PKGNAME= libreplaygain-0rc475
@@ -10,7 +10,6 @@ HOMEPAGE= https://www.musepack.net/
COMMENT= ReplayGain library for the musepack decoder
LICENSE= gnu-lgpl-v2.1
-USE_CMAKE= yes
INSTALLATION_DIRS= include/replaygain
SUBST_CLASSES+= crlf
@@ -21,4 +20,5 @@ SUBST_FILTER_CMD.crlf= ${TR} -d '\r'
post-install:
${INSTALL_DATA} ${WRKSRC}/include/replaygain/* ${DESTDIR}${PREFIX}/include/replaygain
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/libwildmidi/Makefile
diff -u pkgsrc/audio/libwildmidi/Makefile:1.12 pkgsrc/audio/libwildmidi/Makefile:1.13
--- pkgsrc/audio/libwildmidi/Makefile:1.12 Mon Jan 16 08:35:31 2023
+++ pkgsrc/audio/libwildmidi/Makefile Tue Jan 24 18:36:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/01/16 08:35:31 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2023/01/24 18:36:20 wiz Exp $
DISTNAME= wildmidi-0.4.5
PKGNAME= lib${DISTNAME}
@@ -14,7 +14,6 @@ LICENSE= gnu-lgpl-v3
WRKSRC= ${WRKDIR}/wildmidi-${DISTNAME}
USE_LANGUAGES= c99
-USE_CMAKE= yes
.include "../../mk/bsd.prefs.mk"
@@ -34,4 +33,5 @@ CMAKE_ARGS+= -DWANT_OSS=ON
. endif
.endif
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/musepack/Makefile
diff -u pkgsrc/audio/musepack/Makefile:1.5 pkgsrc/audio/musepack/Makefile:1.6
--- pkgsrc/audio/musepack/Makefile:1.5 Sun Mar 29 18:30:06 2020
+++ pkgsrc/audio/musepack/Makefile Tue Jan 24 18:36:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/03/29 18:30:06 gutteridge Exp $
+# $NetBSD: Makefile,v 1.6 2023/01/24 18:36:20 wiz Exp $
DISTNAME= musepack_src_r475
PKGNAME= musepack-0rc475
@@ -13,11 +13,10 @@ LICENSE= modified-bsd
CONFLICTS= libmpcdec-[0-9]*
-USE_CMAKE= yes
-
post-install:
rm -rf ${DESTDIR}${PREFIX}/include/mpc/.svn/
+.include "../../devel/cmake/build.mk"
.include "../../audio/libcuefile/buildlink3.mk"
.include "../../audio/libreplaygain/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/openal-soft/Makefile
diff -u pkgsrc/audio/openal-soft/Makefile:1.30 pkgsrc/audio/openal-soft/Makefile:1.31
--- pkgsrc/audio/openal-soft/Makefile:1.30 Sun Sep 11 12:51:20 2022
+++ pkgsrc/audio/openal-soft/Makefile Tue Jan 24 18:36:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2022/09/11 12:51:20 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2023/01/24 18:36:20 wiz Exp $
DISTNAME= openal-soft-1.22.2
PKGREVISION= 1
@@ -11,7 +11,6 @@ HOMEPAGE= https://openal-soft.org/
COMMENT= Software implementation of the OpenAL 3D audio API
LICENSE= gnu-lgpl-v2
-USE_CMAKE= yes
USE_LANGUAGES= c c++14
USE_TOOLS+= pkg-config gmake
@@ -58,6 +57,7 @@ SUBST_SED.oss= -e 's,/dev/dsp,${DEVOSSA
post-install:
${RM} ${DESTDIR}${PREFIX}/include/AL/al.h.orig
+.include "../../devel/cmake/build.mk"
.include "../../audio/libmysofa/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
Index: pkgsrc/audio/taglib/Makefile
diff -u pkgsrc/audio/taglib/Makefile:1.45 pkgsrc/audio/taglib/Makefile:1.46
--- pkgsrc/audio/taglib/Makefile:1.45 Wed Nov 2 22:54:39 2022
+++ pkgsrc/audio/taglib/Makefile Tue Jan 24 18:36:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2022/11/02 22:54:39 tnn Exp $
+# $NetBSD: Makefile,v 1.46 2023/01/24 18:36:20 wiz Exp $
DISTNAME= taglib-1.13
CATEGORIES= audio
@@ -12,7 +12,6 @@ LICENSE= gnu-lgpl-v2.1 OR mpl-1.1
USE_LANGUAGES= c c++11
GCC_REQD+= 4.7
-USE_CMAKE= YES
CMAKE_ARGS= -DWITH_MP4=ON -DWITH_ASF=ON
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
USE_LIBTOOL= YES
@@ -58,5 +57,6 @@ post-install:
${PREFIX}/lib/libtag.1.dylib
.endif
+.include "../../devel/cmake/build.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/taglib-extras/Makefile
diff -u pkgsrc/audio/taglib-extras/Makefile:1.6 pkgsrc/audio/taglib-extras/Makefile:1.7
--- pkgsrc/audio/taglib-extras/Makefile:1.6 Sat May 15 08:12:14 2021
+++ pkgsrc/audio/taglib-extras/Makefile Tue Jan 24 18:36:20 2023
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/05/15 08:12:14 nia Exp $
-#
+# $NetBSD: Makefile,v 1.7 2023/01/24 18:36:20 wiz Exp $
DISTNAME= taglib-extras-1.0.1
PKGREVISION= 1
@@ -12,7 +11,6 @@ COMMENT= Extra plugins for taglib
LICENSE= gnu-lgpl-v2
USE_LANGUAGES= c c++
-USE_CMAKE= yes
PKGCONFIG_OVERRIDE= taglib-extras.pc.cmake
REPLACE_SH= taglib-extras-config.cmake
@@ -23,8 +21,8 @@ SUBST_SED.rpath= -e "s|-L\\([^ ]*\\)|${
SUBST_STAGE.rpath= pre-configure
SUBST_MESSAGE.rpath= Add rpath to config script.
+.include "../../devel/cmake/build.mk"
BUILDLINK_ABI_DEPENDS.taglib+= taglib>=1.6
-
.include "../../audio/taglib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/benchmarks/google-benchmark/Makefile
diff -u pkgsrc/benchmarks/google-benchmark/Makefile:1.18 pkgsrc/benchmarks/google-benchmark/Makefile:1.19
--- pkgsrc/benchmarks/google-benchmark/Makefile:1.18 Sat Nov 26 17:53:02 2022
+++ pkgsrc/benchmarks/google-benchmark/Makefile Tue Jan 24 18:36:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2022/11/26 17:53:02 adam Exp $
+# $NetBSD: Makefile,v 1.19 2023/01/24 18:36:21 wiz Exp $
DISTNAME= benchmark-1.7.1
PKGNAME= google-${DISTNAME}
@@ -12,7 +12,6 @@ HOMEPAGE= https://github.com/google/benc
COMMENT= Microbenchmark support library
LICENSE= apache-2.0
-USE_CMAKE= yes
USE_LANGUAGES= c c++
CMAKE_ARGS+= -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
@@ -29,6 +28,7 @@ BUILDLINK_TRANSFORM+= rm:-Werror
PYTHON_FOR_BUILD_ONLY= yes
REPLACE_PYTHON= *.py */*.py */*/*.py
+.include "../../devel/cmake/build.mk"
.include "../../lang/python/application.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/databases/hiredis/Makefile
diff -u pkgsrc/databases/hiredis/Makefile:1.10 pkgsrc/databases/hiredis/Makefile:1.11
--- pkgsrc/databases/hiredis/Makefile:1.10 Fri Nov 25 10:40:35 2022
+++ pkgsrc/databases/hiredis/Makefile Tue Jan 24 18:36:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/11/25 10:40:35 adam Exp $
+# $NetBSD: Makefile,v 1.11 2023/01/24 18:36:21 wiz Exp $
DISTNAME= hiredis-1.1.0
CATEGORIES= databases
@@ -10,7 +10,6 @@ HOMEPAGE= https://github.com/redis/hired
COMMENT= Minimalistic C client library for the Redis database
LICENSE= modified-bsd
-USE_CMAKE= yes
TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}
# For Darwin
TEST_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}
@@ -19,4 +18,5 @@ TEST_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}
do-test:
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ./hiredis-test
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/databases/mariadb106-client/Makefile.common
diff -u pkgsrc/databases/mariadb106-client/Makefile.common:1.12 pkgsrc/databases/mariadb106-client/Makefile.common:1.13
--- pkgsrc/databases/mariadb106-client/Makefile.common:1.12 Wed Dec 28 09:15:17 2022
+++ pkgsrc/databases/mariadb106-client/Makefile.common Tue Jan 24 18:36:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2022/12/28 09:15:17 nia Exp $
+# $NetBSD: Makefile.common,v 1.13 2023/01/24 18:36:21 wiz Exp $
#
# used by databases/mariadb106-client/Makefile
# used by databases/mariadb106-server/Makefile
@@ -14,7 +14,6 @@ LICENSE= gnu-gpl-v2
DISTINFO_FILE?= ${.CURDIR}/../../databases/mariadb106-client/distinfo
PATCHDIR?= ${.CURDIR}/../../databases/mariadb106-client/patches
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= perl:run pkg-config bison
USE_CURSES= wide
@@ -111,6 +110,7 @@ CHECK_PORTABILITY_SKIP+= BUILD/compile-p
PKGCONFIG_OVERRIDE+= support-files/mariadb.pc.in
PKGCONFIG_OVERRIDE+= libmariadb/mariadb_config/libmariadb.pc.in
+.include "../../devel/cmake/build.mk"
.include "../../archivers/zstd/buildlink3.mk"
.include "../../devel/pcre2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
Index: pkgsrc/devel/abseil/Makefile
diff -u pkgsrc/devel/abseil/Makefile:1.12 pkgsrc/devel/abseil/Makefile:1.13
--- pkgsrc/devel/abseil/Makefile:1.12 Thu Sep 29 19:36:06 2022
+++ pkgsrc/devel/abseil/Makefile Tue Jan 24 18:36:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2022/09/29 19:36:06 adam Exp $
+# $NetBSD: Makefile,v 1.13 2023/01/24 18:36:21 wiz Exp $
DISTNAME= abseil-20220623.1
CATEGORIES= devel
@@ -11,7 +11,6 @@ HOMEPAGE= https://github.com/abseil/abse
COMMENT= C++ Common Libraries
LICENSE= apache-2.0
-USE_CMAKE= yes
USE_LANGUAGES= c++11
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
@@ -23,5 +22,6 @@ BUILDLINK_TRANSFORM+= rm:-lexecinfo
. endif
.endif
+.include "../../devel/cmake/build.mk"
.include "../../mk/atomic64.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/cmocka/Makefile
diff -u pkgsrc/devel/cmocka/Makefile:1.9 pkgsrc/devel/cmocka/Makefile:1.10
--- pkgsrc/devel/cmocka/Makefile:1.9 Fri Jul 3 16:08:46 2020
+++ pkgsrc/devel/cmocka/Makefile Tue Jan 24 18:36:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/07/03 16:08:46 hauke Exp $
+# $NetBSD: Makefile,v 1.10 2023/01/24 18:36:21 wiz Exp $
DISTNAME= cmocka-1.1.5
CATEGORIES= devel
@@ -10,8 +10,6 @@ HOMEPAGE= https://cmocka.org/
COMMENT= Unit testing framework for C supporting mock objects
LICENSE= apache-2.0
-USE_CMAKE= yes
-
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
@@ -22,4 +20,5 @@ CMAKE_ARGS+= -DWITH_WERROR_UNINITIALIZED
post-extract:
${MKDIR} ${WRKDIR}/build
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/cvise/Makefile
diff -u pkgsrc/devel/cvise/Makefile:1.9 pkgsrc/devel/cvise/Makefile:1.10
--- pkgsrc/devel/cvise/Makefile:1.9 Wed Nov 23 16:19:47 2022
+++ pkgsrc/devel/cvise/Makefile Tue Jan 24 18:36:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/11/23 16:19:47 adam Exp $
+# $NetBSD: Makefile,v 1.10 2023/01/24 18:36:21 wiz Exp $
DISTNAME= cvise-2.6.0
PKGREVISION= 1
@@ -23,10 +23,6 @@ DEPENDS+= unifdef-[0-9]*:../../devel/uni
.endif
TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
-USE_CMAKE= yes
-CONFIGURE_DIRS= build
-CMAKE_ARG_PATH= ..
-
USE_LANGUAGES= c c++
USE_TOOLS+= flex
TEST_TARGET= test
@@ -34,9 +30,7 @@ TEST_TARGET= test
REPLACE_PYTHON+= cvise.py
REPLACE_PYTHON+= cvise-delta.py
-pre-configure:
- ${MKDIR} ${WRKSRC}/build
-
+.include "../../devel/cmake/build.mk"
.include "../../lang/python/application.mk"
.include "../../lang/clang/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/doxygen/Makefile
diff -u pkgsrc/devel/doxygen/Makefile:1.165 pkgsrc/devel/doxygen/Makefile:1.166
--- pkgsrc/devel/doxygen/Makefile:1.165 Sat Dec 31 21:21:55 2022
+++ pkgsrc/devel/doxygen/Makefile Tue Jan 24 18:36:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.165 2022/12/31 21:21:55 adam Exp $
+# $NetBSD: Makefile,v 1.166 2023/01/24 18:36:22 wiz Exp $
DISTNAME= doxygen-1.9.6.src
PKGNAME= ${DISTNAME:S/.src//}
@@ -20,7 +20,6 @@ FLEX_REQD= 2.6.4
# Native std::filesystem requires GCC 9. Patch for emulation is still present
# Tested to work with GCC 7.5.0 from NetBSD 9.2
GCC_REQD+= 5
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= gmake gs:run perl:run bison flex
MAKE_ENV+= PKGSRC_CFLAGS=${CFLAGS:Q}
@@ -73,6 +72,7 @@ post-install:
${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/doxywizard.1
.endif
+.include "../../devel/cmake/build.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../graphics/graphviz/buildlink3.mk"
.include "../../lang/python/pyversion.mk"
Index: pkgsrc/devel/extra-cmake-modules/Makefile
diff -u pkgsrc/devel/extra-cmake-modules/Makefile:1.22 pkgsrc/devel/extra-cmake-modules/Makefile:1.23
--- pkgsrc/devel/extra-cmake-modules/Makefile:1.22 Thu Sep 29 00:36:30 2022
+++ pkgsrc/devel/extra-cmake-modules/Makefile Tue Jan 24 18:36:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2022/09/29 00:36:30 markd Exp $
+# $NetBSD: Makefile,v 1.23 2023/01/24 18:36:22 wiz Exp $
DISTNAME= extra-cmake-modules-5.98.0
CATEGORIES= devel kde
@@ -10,10 +10,7 @@ HOMEPAGE= https://community.kde.org/Fram
COMMENT= Extra modules and scripts for CMake
LICENSE= modified-bsd
-USE_CMAKE= yes
USE_LANGUAGES= # none
-CMAKE_ARG_PATH= ..
-CONFIGURE_DIRS= _KDE_build
CMAKE_ARGS+= -DBUILD_TESTING=OFF
CMAKE_ARGS+= -DBUILD_HTML_DOCS=OFF
@@ -24,7 +21,7 @@ CHECK_INTERPRETER_SKIP+= share/ECM/kde-m
CHECK_INTERPRETER_SKIP+= share/ECM/kde-modules/kde-git-commit-hooks/pre-commit.in
pre-configure:
- ${MKDIR} ${WRKSRC}/_KDE_build
${FIND} ${WRKSRC} -name \*.orig -exec rm {} \;
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/fann/Makefile
diff -u pkgsrc/devel/fann/Makefile:1.11 pkgsrc/devel/fann/Makefile:1.12
--- pkgsrc/devel/fann/Makefile:1.11 Mon Jul 25 11:12:21 2022
+++ pkgsrc/devel/fann/Makefile Tue Jan 24 18:36:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/07/25 11:12:21 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2023/01/24 18:36:22 wiz Exp $
PKGREVISION= 2
@@ -9,7 +9,6 @@ COMMENT= Fast Artificial Neural Network
LICENSE= gnu-lgpl-v2.1
USE_TOOLS+= cmake
-USE_CMAKE= yes
USE_LANGUAGES+= c99
# Perhaps not, but cmake complains
@@ -17,4 +16,5 @@ USE_LANGUAGES+= c++
PKGCONFIG_OVERRIDE+= cmake/fann.pc.cmake
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/gflags/Makefile
diff -u pkgsrc/devel/gflags/Makefile:1.3 pkgsrc/devel/gflags/Makefile:1.4
--- pkgsrc/devel/gflags/Makefile:1.3 Thu Mar 21 22:14:33 2019
+++ pkgsrc/devel/gflags/Makefile Tue Jan 24 18:36:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/03/21 22:14:33 adam Exp $
+# $NetBSD: Makefile,v 1.4 2023/01/24 18:36:22 wiz Exp $
DISTNAME= gflags-2.2.2
CATEGORIES= devel
@@ -10,7 +10,6 @@ HOMEPAGE= https://github.com/gflags/gfla
COMMENT= Commandline flags module for C++
LICENSE= modified-bsd
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= bash:run
TEST_TARGET= test
@@ -25,5 +24,6 @@ PTHREAD_OPTS+= require
PKGCONFIG_OVERRIDE= cmake/package.pc.in
+.include "../../devel/cmake/build.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/googletest/Makefile
diff -u pkgsrc/devel/googletest/Makefile:1.21 pkgsrc/devel/googletest/Makefile:1.22
--- pkgsrc/devel/googletest/Makefile:1.21 Sun Jul 3 13:36:45 2022
+++ pkgsrc/devel/googletest/Makefile Tue Jan 24 18:36:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2022/07/03 13:36:45 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2023/01/24 18:36:22 wiz Exp $
DISTNAME= googletest-1.12.1
CATEGORIES= devel
@@ -12,7 +12,6 @@ LICENSE= modified-bsd
INSTALLATION_DIRS= bin
-USE_CMAKE= yes
USE_LANGUAGES= c c++11
# cc1plus: error: unrecognized command line option "-std=c++11"
@@ -26,4 +25,5 @@ PKGCONFIG_OVERRIDE+= googlemock/cmake/gm
PKGCONFIG_OVERRIDE+= googletest/cmake/gtest.pc.in
PKGCONFIG_OVERRIDE+= googletest/cmake/gtest_main.pc.in
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/libcerf/Makefile
diff -u pkgsrc/devel/libcerf/Makefile:1.10 pkgsrc/devel/libcerf/Makefile:1.11
--- pkgsrc/devel/libcerf/Makefile:1.10 Sun Aug 11 12:46:54 2019
+++ pkgsrc/devel/libcerf/Makefile Tue Jan 24 18:36:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/08/11 12:46:54 adam Exp $
+# $NetBSD: Makefile,v 1.11 2023/01/24 18:36:23 wiz Exp $
DISTNAME= libcerf-1.13
CATEGORIES= devel math
@@ -10,15 +10,10 @@ HOMEPAGE= https://jugit.fz-juelich.de/ml
COMMENT= Library providing efficient and accurate complex error functions
LICENSE= mit
-USE_CMAKE= yes
USE_LANGUAGES= c99
USE_TOOLS+= pod2man
-CMAKE_ARG_PATH= ${WRKSRC}
-CONFIGURE_DIRS= ${WRKDIR}/build
PKGCONFIG_OVERRIDE= libcerf.pc.in
TEST_TARGET= test
-post-extract:
- ${MKDIR} ${WRKDIR}/build
-
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/libebml/Makefile
diff -u pkgsrc/devel/libebml/Makefile:1.52 pkgsrc/devel/libebml/Makefile:1.53
--- pkgsrc/devel/libebml/Makefile:1.52 Mon Oct 10 07:37:54 2022
+++ pkgsrc/devel/libebml/Makefile Tue Jan 24 18:36:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2022/10/10 07:37:54 adam Exp $
+# $NetBSD: Makefile,v 1.53 2023/01/24 18:36:23 wiz Exp $
DISTNAME= libebml-1.4.4
CATEGORIES= devel
@@ -10,9 +10,9 @@ HOMEPAGE= https://matroska-org.github.io
COMMENT= Extensible Binary Meta Language support library
LICENSE= gnu-lgpl-v2.1
-USE_CMAKE= yes
USE_LANGUAGES= c c++14
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=YES
PKGCONFIG_OVERRIDE= libebml.pc.in
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/libepoll-shim/Makefile
diff -u pkgsrc/devel/libepoll-shim/Makefile:1.9 pkgsrc/devel/libepoll-shim/Makefile:1.10
--- pkgsrc/devel/libepoll-shim/Makefile:1.9 Sun Aug 7 23:29:49 2022
+++ pkgsrc/devel/libepoll-shim/Makefile Tue Jan 24 18:36:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/08/07 23:29:49 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2023/01/24 18:36:23 wiz Exp $
DISTNAME= ${GITHUB_PROJECT}-0.0.20210418
PKGNAME= lib${DISTNAME}
@@ -13,7 +13,6 @@ HOMEPAGE= https://github.com/jiixyj/epol
COMMENT= Small epoll implemented using kevent
LICENSE= mit
-USE_CMAKE= yes
USE_LANGUAGES= c c++
CMAKE_ARGS+= -DBUILD_TESTING=OFF
@@ -35,4 +34,5 @@ PLIST.timerfd= YES
PKGCONFIG_OVERRIDE+= epoll-shim.pc.cmakein
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/libgit2/Makefile
diff -u pkgsrc/devel/libgit2/Makefile:1.58 pkgsrc/devel/libgit2/Makefile:1.59
--- pkgsrc/devel/libgit2/Makefile:1.58 Wed Oct 26 10:31:22 2022
+++ pkgsrc/devel/libgit2/Makefile Tue Jan 24 18:36:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2022/10/26 10:31:22 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2023/01/24 18:36:23 wiz Exp $
DISTNAME= libgit2-1.5.0
PKGREVISION= 1
@@ -11,7 +11,6 @@ HOMEPAGE= https://libgit2.org/
COMMENT= Portable, pure C implementation of the Git core methods
LICENSE= gnu-gpl-v2 # linking exception (linking allowed in more ways)
-USE_CMAKE= yes
USE_LANGUAGES= c99
USE_TOOLS+= pkg-config
@@ -20,8 +19,9 @@ CMAKE_ARGS+= -DREGEX_BACKEND="pcre2"
PKGCONFIG_OVERRIDE+= libgit2.pc.in
do-test:
- cd ${WRKSRC} && ctest
+ cd ${WRKSRC}/${CMAKE_BUILD_DIR} && ctest
+.include "../../devel/cmake/build.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../devel/pcre2/buildlink3.mk"
.include "../../security/libssh2/buildlink3.mk"
Index: pkgsrc/devel/lld/Makefile
diff -u pkgsrc/devel/lld/Makefile:1.19 pkgsrc/devel/lld/Makefile:1.20
--- pkgsrc/devel/lld/Makefile:1.19 Wed Nov 30 19:54:59 2022
+++ pkgsrc/devel/lld/Makefile Tue Jan 24 18:36:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/11/30 19:54:59 adam Exp $
+# $NetBSD: Makefile,v 1.20 2023/01/24 18:36:23 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -12,22 +12,16 @@ COMMENT= The LLVM Linker
LICENSE= apache-2.0
USE_LANGUAGES= c c++14
-USE_CMAKE= yes
GCC_REQD+= 7
-CONFIGURE_DIRS= ${WRKDIR}/build
-CMAKE_ARG_PATH= ${WRKSRC}
-
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
PYTHON_FOR_BUILD_ONLY= yes
-post-extract:
- ${MKDIR} ${WRKDIR}/build
-
.include "options.mk"
+.include "../../devel/cmake/build.mk"
.include "../../lang/llvm/buildlink3.mk"
.include "../../lang/libunwind/buildlink3.mk"
.include "../../lang/python/tool.mk"
Index: pkgsrc/devel/re2/Makefile
diff -u pkgsrc/devel/re2/Makefile:1.8 pkgsrc/devel/re2/Makefile:1.9
--- pkgsrc/devel/re2/Makefile:1.8 Thu Aug 6 16:23:21 2020
+++ pkgsrc/devel/re2/Makefile Tue Jan 24 18:36:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/08/06 16:23:21 adam Exp $
+# $NetBSD: Makefile,v 1.9 2023/01/24 18:36:24 wiz Exp $
DISTNAME= re2-${GITHUB_TAG:S/-//g}
CATEGORIES= devel
@@ -10,7 +10,6 @@ HOMEPAGE= https://github.com/google/re2
COMMENT= Regular expression library
LICENSE= modified-bsd
-USE_CMAKE= yes
USE_LANGUAGES= c c++11
TEST_ENV= LD_LIBRARY_PATH=${WRKSRC}
TEST_TARGET= test
@@ -30,4 +29,5 @@ SUBST_SED.path+= -e 's,@libdir@,${PREFIX
post-install:
${INSTALL_DATA} ${WRKSRC}/re2.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/snappy/Makefile
diff -u pkgsrc/devel/snappy/Makefile:1.16 pkgsrc/devel/snappy/Makefile:1.17
--- pkgsrc/devel/snappy/Makefile:1.16 Mon Jun 28 18:46:09 2021
+++ pkgsrc/devel/snappy/Makefile Tue Jan 24 18:36:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/06/28 18:46:09 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2023/01/24 18:36:24 wiz Exp $
DISTNAME= snappy-1.1.9
CATEGORIES= devel
@@ -10,13 +10,13 @@ HOMEPAGE= https://google.github.io/snapp
COMMENT= General purpose data compression library
LICENSE= apache-2.0
-USE_CMAKE= yes
USE_LANGUAGES= c c++
CMAKE_ARGS+= -DSNAPPY_BUILD_TESTS:BOOL=OFF
CMAKE_ARGS+= -DSNAPPY_BUILD_BENCHMARKS:BOOL=OFF
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+.include "../../devel/cmake/build.mk"
.include "../../archivers/lzo/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/spdlog/Makefile
diff -u pkgsrc/devel/spdlog/Makefile:1.14 pkgsrc/devel/spdlog/Makefile:1.15
--- pkgsrc/devel/spdlog/Makefile:1.14 Sat Nov 26 13:47:13 2022
+++ pkgsrc/devel/spdlog/Makefile Tue Jan 24 18:36:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2022/11/26 13:47:13 nia Exp $
+# $NetBSD: Makefile,v 1.15 2023/01/24 18:36:24 wiz Exp $
DISTNAME= spdlog-1.11.0
PKGREVISION= 1
@@ -11,7 +11,6 @@ HOMEPAGE= https://github.com/gabime/spdl
COMMENT= Fast C++ logging library
LICENSE= mit
-USE_CMAKE= yes
USE_LANGUAGES= c c++11
USE_TOOLS+= pkg-config
CMAKE_ARGS+= -DSPDLOG_BUILD_SHARED=ON
@@ -21,15 +20,10 @@ PKGCONFIG_OVERRIDE+= cmake/spdlog.pc.in
LDFLAGS.SunOS+= -lsocket
-CMAKE_ARG_PATH= ..
-CONFIGURE_DIRS= _build
-
-pre-configure:
- ${MKDIR} ${WRKSRC}/_build
-
post-install:
${FIND} ${DESTDIR} -name '*.orig' -exec rm -f '{}' ';'
+.include "../../devel/cmake/build.mk"
.include "../../lang/python/tool.mk"
.include "../../textproc/fmtlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/yajl/Makefile
diff -u pkgsrc/devel/yajl/Makefile:1.8 pkgsrc/devel/yajl/Makefile:1.9
--- pkgsrc/devel/yajl/Makefile:1.8 Sat Jan 18 23:30:44 2020
+++ pkgsrc/devel/yajl/Makefile Tue Jan 24 18:36:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/01/18 23:30:44 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2023/01/24 18:36:24 wiz Exp $
DISTNAME= yajl-2.1.0
CATEGORIES= devel textproc
@@ -13,7 +13,7 @@ WRKSRC= ${WRKDIR}/lloyd-yajl-66cb08c
USE_LANGUAGES= c
USE_LIBTOOL= yes
-USE_CMAKE= yes
PKGCONFIG_OVERRIDE= src/yajl.pc.cmake
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/editors/xournalpp/Makefile
diff -u pkgsrc/editors/xournalpp/Makefile:1.46 pkgsrc/editors/xournalpp/Makefile:1.47
--- pkgsrc/editors/xournalpp/Makefile:1.46 Tue Jan 3 17:37:02 2023
+++ pkgsrc/editors/xournalpp/Makefile Tue Jan 24 18:36:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2023/01/03 17:37:02 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2023/01/24 18:36:24 wiz Exp $
DISTNAME= xournalpp-1.1.3
PKGREVISION= 1
@@ -11,7 +11,6 @@ HOMEPAGE= https://github.com/xournalpp/x
COMMENT= Take notes, sketch and annotate PDFs
LICENSE= gnu-gpl-v2
-USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_TOOLS+= msgfmt msgmerge xgettext
USE_LANGUAGES= c c++
@@ -42,6 +41,7 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man1
post-install:
${MV} ${DESTDIR}${PREFIX}/share/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 || ${TRUE}
+.include "../../devel/cmake/build.mk"
.include "../../archivers/libzip/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/portaudio/buildlink3.mk"
Index: pkgsrc/finance/gnucash/Makefile
diff -u pkgsrc/finance/gnucash/Makefile:1.328 pkgsrc/finance/gnucash/Makefile:1.329
--- pkgsrc/finance/gnucash/Makefile:1.328 Sun Jan 22 16:28:25 2023
+++ pkgsrc/finance/gnucash/Makefile Tue Jan 24 18:36:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.328 2023/01/22 16:28:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.329 2023/01/24 18:36:25 wiz Exp $
DISTNAME= gnucash-4.13
PKGREVISION= 2
@@ -17,7 +17,6 @@ DEPENDS+= dconf-[0-9]*:../../devel/dcon
GCC_REQD+= 8
USE_LANGUAGES= c c++17
-USE_CMAKE= yes
USE_LIBTOOL= yes
INFO_FILES= yes
USE_TOOLS+= bash perl:run pkg-config
@@ -64,6 +63,7 @@ post-install:
.include "options.mk"
+.include "../../devel/cmake/build.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.56.1
.include "../../devel/glib2/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
Index: pkgsrc/finance/gnucash-docs/Makefile
diff -u pkgsrc/finance/gnucash-docs/Makefile:1.57 pkgsrc/finance/gnucash-docs/Makefile:1.58
--- pkgsrc/finance/gnucash-docs/Makefile:1.57 Fri Jan 13 08:24:28 2023
+++ pkgsrc/finance/gnucash-docs/Makefile Tue Jan 24 18:36:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2023/01/13 08:24:28 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2023/01/24 18:36:25 wiz Exp $
DISTNAME= gnucash-docs-4.13
CATEGORIES= finance
@@ -11,10 +11,10 @@ LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.1
DEPENDS+= yelp-[0-9]*:../../misc/yelp3
-USE_CMAKE= yes
USE_TOOLS+= bash
# CMake Error: failed to create symbolic link '.../work/gnucash-docs-4.13/share/doc/HTML/de': File exists
MAKE_JOBS_SAFE= no
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/fonts/fontforge/Makefile
diff -u pkgsrc/fonts/fontforge/Makefile:1.132 pkgsrc/fonts/fontforge/Makefile:1.133
--- pkgsrc/fonts/fontforge/Makefile:1.132 Tue Jan 3 17:37:06 2023
+++ pkgsrc/fonts/fontforge/Makefile Tue Jan 24 18:36:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2023/01/03 17:37:06 wiz Exp $
+# $NetBSD: Makefile,v 1.133 2023/01/24 18:36:25 wiz Exp $
DISTNAME= fontforge-20220308
PKGREVISION= 6
@@ -15,13 +15,10 @@ LICENSE= modified-bsd
USE_TOOLS+= gmake msgfmt pkg-config xgettext
USE_LANGUAGES= c c++11
-USE_CMAKE= yes
# C++11
GCC_REQD+= 4.8
-CONFIGURE_DIRS+= build
-CMAKE_ARGS+= ..
CMAKE_ARGS+= -DENABLE_DOCS=NO
PY_PATCHPLIST= yes
@@ -30,9 +27,7 @@ CHECK_PORTABILITY_SKIP+= osx/FontForge.a
PYTHON_VERSIONS_INCOMPATIBLE= 27
-pre-configure:
- ${MKDIR} ${WRKSRC}/build
-
+.include "../../devel/cmake/build.mk"
.include "../../lang/python/application.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../databases/shared-mime-info/mimedb.mk"
Index: pkgsrc/fonts/woff2/Makefile
diff -u pkgsrc/fonts/woff2/Makefile:1.3 pkgsrc/fonts/woff2/Makefile:1.4
--- pkgsrc/fonts/woff2/Makefile:1.3 Sun Jul 26 07:54:45 2020
+++ pkgsrc/fonts/woff2/Makefile Tue Jan 24 18:36:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/07/26 07:54:45 maya Exp $
+# $NetBSD: Makefile,v 1.4 2023/01/24 18:36:25 wiz Exp $
DISTNAME= woff2-1.0.2
PKGREVISION= 1
@@ -11,7 +11,6 @@ HOMEPAGE= https://github.com/google/woff
COMMENT= WOFF font file format library
LICENSE= mit
-USE_CMAKE= yes
USE_LANGUAGES= c c++
CMAKE_ARGS+= -DCANONICAL_PREFIXES=ON
@@ -21,5 +20,6 @@ PKGCONFIG_OVERRIDE+= libwoff2dec.pc
PKGCONFIG_OVERRIDE+= libwoff2enc.pc
PKGCONFIG_OVERRIDE_STAGE= post-build
+.include "../../devel/cmake/build.mk"
.include "../../archivers/brotli/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/box2d/Makefile
diff -u pkgsrc/graphics/box2d/Makefile:1.1 pkgsrc/graphics/box2d/Makefile:1.2
--- pkgsrc/graphics/box2d/Makefile:1.1 Sat Feb 6 06:41:33 2021
+++ pkgsrc/graphics/box2d/Makefile Tue Jan 24 18:36:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/02/06 06:41:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2023/01/24 18:36:25 wiz Exp $
GITHUB_PROJECT= box2d
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -11,12 +11,12 @@ HOMEPAGE= https://github.com/erincatto/b
COMMENT= 2D physics engine for games
LICENSE= mit
-USE_CMAKE= yes
USE_LANGUAGES= c c++
CMAKE_ARGS+= -DBOX2D_BUILD_TESTBED=OFF
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+.include "../../devel/cmake/build.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXcursor/buildlink3.mk"
.include "../../x11/libXi/buildlink3.mk"
Index: pkgsrc/graphics/exiv2/Makefile
diff -u pkgsrc/graphics/exiv2/Makefile:1.50 pkgsrc/graphics/exiv2/Makefile:1.51
--- pkgsrc/graphics/exiv2/Makefile:1.50 Sat Sep 10 06:33:09 2022
+++ pkgsrc/graphics/exiv2/Makefile Tue Jan 24 18:36:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2022/09/10 06:33:09 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2023/01/24 18:36:26 wiz Exp $
DISTNAME= exiv2-0.27.5-Source
PKGNAME= ${DISTNAME:S/-Source//}
@@ -14,7 +14,6 @@ LICENSE= gnu-gpl-v2
CHECK_PORTABILITY_SKIP+= contrib/coverity.sh
-USE_CMAKE= yes
USE_TOOLS+= msgfmt
USE_LANGUAGES= c c++
GCC_REQD+= 3.3
@@ -35,6 +34,7 @@ CXXFLAGS.SunOS+= -fPIC
PKGCONFIG_OVERRIDE= cmake/exiv2.pc.in
+.include "../../devel/cmake/build.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
Index: pkgsrc/graphics/freeglut/Makefile
diff -u pkgsrc/graphics/freeglut/Makefile:1.33 pkgsrc/graphics/freeglut/Makefile:1.34
--- pkgsrc/graphics/freeglut/Makefile:1.33 Thu Aug 11 05:08:40 2022
+++ pkgsrc/graphics/freeglut/Makefile Tue Jan 24 18:36:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2022/08/11 05:08:40 gutteridge Exp $
+# $NetBSD: Makefile,v 1.34 2023/01/24 18:36:26 wiz Exp $
DISTNAME= freeglut-3.2.2
PKGREVISION= 1
@@ -10,7 +10,6 @@ HOMEPAGE= http://freeglut.sourceforge.ne
COMMENT= Alternative to the OpenGL Utility Toolkit (GLUT) library
LICENSE= x11
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
@@ -25,6 +24,7 @@ post-install:
${DESTDIR}${PREFIX}/lib/pkgconfig/freeglut.pc
.include "options.mk"
+.include "../../devel/cmake/build.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
Index: pkgsrc/graphics/glfw/Makefile
diff -u pkgsrc/graphics/glfw/Makefile:1.12 pkgsrc/graphics/glfw/Makefile:1.13
--- pkgsrc/graphics/glfw/Makefile:1.12 Mon Aug 22 19:19:51 2022
+++ pkgsrc/graphics/glfw/Makefile Tue Jan 24 18:36:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2022/08/22 19:19:51 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2023/01/24 18:36:26 wiz Exp $
DISTNAME= glfw-3.3.8
CATEGORIES= graphics
@@ -9,7 +9,6 @@ HOMEPAGE= https://www.glfw.org/
COMMENT= Free, portable framework for OpenGL application development
LICENSE= zlib
-USE_CMAKE= yes
USE_TOOLS+= pkg-config
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
@@ -18,6 +17,7 @@ CMAKE_ARGS+= -DGLFW_BUILD_EXAMPLES=OFF
PKGCONFIG_OVERRIDE+= src/glfw3.pc.in
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} != "Darwin"
. include "options.mk"
Index: pkgsrc/graphics/glm/Makefile
diff -u pkgsrc/graphics/glm/Makefile:1.7 pkgsrc/graphics/glm/Makefile:1.8
--- pkgsrc/graphics/glm/Makefile:1.7 Mon Jul 25 11:12:24 2022
+++ pkgsrc/graphics/glm/Makefile Tue Jan 24 18:36:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/07/25 11:12:24 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2023/01/24 18:36:26 wiz Exp $
DISTNAME= glm-0.9.9.8
CATEGORIES= graphics math
@@ -25,11 +25,11 @@ do-install:
${DESTDIR}${PREFIX}/${GLM_DIR}
# for test target
-USE_CMAKE= yes
USE_LANGUAGES= c c++
do-test:
${RUN}cd ${WRKSRC} && \
cmake -DGLM_TEST_MODE=ON CMakeLists.txt && \
make
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/graphite2/Makefile
diff -u pkgsrc/graphics/graphite2/Makefile:1.14 pkgsrc/graphics/graphite2/Makefile:1.15
--- pkgsrc/graphics/graphite2/Makefile:1.14 Sat Jan 9 01:21:53 2021
+++ pkgsrc/graphics/graphite2/Makefile Tue Jan 24 18:36:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/01/09 01:21:53 gdt Exp $
+# $NetBSD: Makefile,v 1.15 2023/01/24 18:36:26 wiz Exp $
DISTNAME= graphite2-1.3.14
CATEGORIES= graphics
@@ -11,7 +11,6 @@ COMMENT= Cross-platform rendering for co
LICENSE= gnu-lgpl-v2
USE_LANGUAGES= c c++11
-USE_CMAKE= yes
USE_LIBTOOL= yes
# C++11
@@ -33,4 +32,5 @@ BUILDLINK_DEPMETHOD.freetype2?= build
#.include "../../lang/python/tool.mk"
#BUILD_DEPENDS+= ${PYPKGPREFIX}-fonttools-[0-9]*:../../fonts/py-fonttools/
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/inkscape/Makefile
diff -u pkgsrc/graphics/inkscape/Makefile:1.257 pkgsrc/graphics/inkscape/Makefile:1.258
--- pkgsrc/graphics/inkscape/Makefile:1.257 Sun Jan 22 16:28:27 2023
+++ pkgsrc/graphics/inkscape/Makefile Tue Jan 24 18:36:27 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.257 2023/01/22 16:28:27 ryoon Exp $
+# $NetBSD: Makefile,v 1.258 2023/01/24 18:36:27 wiz Exp $
DISTNAME= inkscape-1.2.1
PKGREVISION= 5
@@ -29,7 +29,6 @@ GCC_REQD+= 7
# This should be resolved in CMakeLists.txt.
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/inkscape
-USE_CMAKE= yes
USE_LANGUAGES= c c++17
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -92,6 +91,7 @@ fix-darwin-install-name:
${DESTDIR}${PREFIX}/bin/inkscape
.endif
+.include "../../devel/cmake/build.mk"
BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=7.4
.include "../../converters/libcdr/buildlink3.mk"
.include "../../converters/librevenge/buildlink3.mk"
Index: pkgsrc/graphics/jasper/Makefile
diff -u pkgsrc/graphics/jasper/Makefile:1.68 pkgsrc/graphics/jasper/Makefile:1.69
--- pkgsrc/graphics/jasper/Makefile:1.68 Thu Aug 11 05:08:43 2022
+++ pkgsrc/graphics/jasper/Makefile Tue Jan 24 18:36:27 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2022/08/11 05:08:43 gutteridge Exp $
+# $NetBSD: Makefile,v 1.69 2023/01/24 18:36:27 wiz Exp $
DISTNAME= jasper-2.0.33
PKGREVISION= 2
@@ -11,7 +11,6 @@ HOMEPAGE= https://jasper-software.github
COMMENT= Software-based reference implementation of the JPEG-2000 codec
LICENSE= modified-bsd
-USE_CMAKE= yes
USE_LANGUAGES= c99 c++
USE_TOOLS+= bash:test
CMAKE_ARGS+= -DALLOW_IN_SOURCE_BUILD=ON
@@ -22,5 +21,6 @@ REPLACE_BASH= test/bin/*
TEST_TARGET= test
.include "options.mk"
+.include "../../devel/cmake/build.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/libjpeg-turbo/Makefile
diff -u pkgsrc/graphics/libjpeg-turbo/Makefile:1.27 pkgsrc/graphics/libjpeg-turbo/Makefile:1.28
--- pkgsrc/graphics/libjpeg-turbo/Makefile:1.27 Sun Aug 14 20:57:40 2022
+++ pkgsrc/graphics/libjpeg-turbo/Makefile Tue Jan 24 18:36:27 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2022/08/14 20:57:40 adam Exp $
+# $NetBSD: Makefile,v 1.28 2023/01/24 18:36:27 wiz Exp $
DISTNAME= libjpeg-turbo-2.1.4
CATEGORIES= graphics
@@ -18,7 +18,6 @@ CONFLICTS= jpeg-[0-9]*
BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
.endif
-USE_CMAKE= yes
USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE= release/libturbojpeg.pc.in release/libjpeg.pc.in
TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}
@@ -32,4 +31,5 @@ CMAKE_ARGS+= -DWITH_JPEG8=ON
CHECK_PORTABILITY_SKIP+= release/makemacpkg.in
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/openexr/Makefile
diff -u pkgsrc/graphics/openexr/Makefile:1.46 pkgsrc/graphics/openexr/Makefile:1.47
--- pkgsrc/graphics/openexr/Makefile:1.46 Wed Apr 20 20:29:54 2022
+++ pkgsrc/graphics/openexr/Makefile Tue Jan 24 18:36:27 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2022/04/20 20:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2023/01/24 18:36:27 wiz Exp $
DISTNAME= openexr-3.1.5
CATEGORIES= graphics
@@ -11,7 +11,6 @@ HOMEPAGE= https://www.openexr.com/
COMMENT= High dynamic-range (HDR) image file format library and tools
LICENSE= modified-bsd
-USE_CMAKE= yes
USE_LANGUAGES= c c++14
# C++14
@@ -24,11 +23,8 @@ PTHREAD_OPTS= require
CHECK_PORTABILITY_SKIP+= Contrib/DtexToExr/bootstrap
CHECK_PORTABILITY_SKIP+= util/reformat.sh
+.include "../../devel/cmake/build.mk"
.include "../../mk/pthread.buildlink3.mk"
-
-#LIBS.SunOS+= -lm
-#LIBS.IRIX+= -lmx
-
.include "../../devel/zlib/buildlink3.mk"
.include "../../math/imath/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/openjpeg/Makefile
diff -u pkgsrc/graphics/openjpeg/Makefile:1.25 pkgsrc/graphics/openjpeg/Makefile:1.26
--- pkgsrc/graphics/openjpeg/Makefile:1.25 Tue Jan 3 17:37:27 2023
+++ pkgsrc/graphics/openjpeg/Makefile Tue Jan 24 18:36:27 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2023/01/03 17:37:27 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2023/01/24 18:36:27 wiz Exp $
DISTNAME= openjpeg-2.5.0
PKGREVISION= 1
@@ -11,10 +11,10 @@ HOMEPAGE= https://www.openjpeg.org/
COMMENT= JPEG 2000 library
LICENSE= 2-clause-bsd
-USE_CMAKE= yes
USE_LANGUAGES= c99 c++
CMAKE_ARGS+= -DOPENJPEG_INSTALL_MAN_DIR=${PKGMANDIR}
+.include "../../devel/cmake/build.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/lcms2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
Index: pkgsrc/graphics/osg/Makefile
diff -u pkgsrc/graphics/osg/Makefile:1.153 pkgsrc/graphics/osg/Makefile:1.154
--- pkgsrc/graphics/osg/Makefile:1.153 Tue Jan 3 17:36:26 2023
+++ pkgsrc/graphics/osg/Makefile Tue Jan 24 18:36:27 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.153 2023/01/03 17:36:26 wiz Exp $
+# $NetBSD: Makefile,v 1.154 2023/01/24 18:36:27 wiz Exp $
DISTNAME= osg-3.6.5
PKGREVISION= 29
@@ -14,7 +14,6 @@ LICENSE= gnu-lgpl-v2.1
WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE= packaging/pkgconfig/openscenegraph.pc.in
@@ -50,6 +49,7 @@ PLIST_VARS+= quartz notdarwin
CXXFLAGS+= -D__STDC_LIMIT_MACROS
.include "options.mk"
+.include "../../devel/cmake/build.mk"
.include "../../devel/SDL2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
Index: pkgsrc/graphics/oxygen-icons/Makefile
diff -u pkgsrc/graphics/oxygen-icons/Makefile:1.42 pkgsrc/graphics/oxygen-icons/Makefile:1.43
--- pkgsrc/graphics/oxygen-icons/Makefile:1.42 Thu Sep 29 00:52:14 2022
+++ pkgsrc/graphics/oxygen-icons/Makefile Tue Jan 24 18:36:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2022/09/29 00:52:14 markd Exp $
+# $NetBSD: Makefile,v 1.43 2023/01/24 18:36:28 wiz Exp $
DISTNAME= oxygen-icons5-5.98.0
PKGNAME= ${DISTNAME:S/5//}
@@ -12,16 +12,10 @@ COMMENT= Oxygen icon set for the KDE int
LICENSE= gnu-lgpl-v3
BUILD_DEPENDS+= extra-cmake-modules>=5.98.0:../../devel/extra-cmake-modules
-TOOLS_DEPENDS.cmake= cmake>=3.0:../../devel/cmake
-USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARG_PATH= ..
-CONFIGURE_DIRS= _KDE_build
CMAKE_ARGS+= -DKF_IGNORE_PLATFORM_CHECK=true
-pre-configure:
- ${MKDIR} ${WRKSRC}/_KDE_build
-
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/zxing-cpp/Makefile
diff -u pkgsrc/graphics/zxing-cpp/Makefile:1.7 pkgsrc/graphics/zxing-cpp/Makefile:1.8
--- pkgsrc/graphics/zxing-cpp/Makefile:1.7 Wed Aug 24 12:45:42 2022
+++ pkgsrc/graphics/zxing-cpp/Makefile Tue Jan 24 18:36:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/08/24 12:45:42 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2023/01/24 18:36:28 wiz Exp $
DISTNAME= zxing-cpp-1.4.0
CATEGORIES= graphics
@@ -10,7 +10,6 @@ HOMEPAGE= https://github.com/nu-book/zxi
COMMENT= 1D/2D barcode reader/writer library in C++
LICENSE= apache-2.0
-USE_CMAKE= yes
USE_LANGUAGES= c++11
CMAKE_ARGS+= -DBUILD_EXAMPLES=OFF
@@ -24,4 +23,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/core/src/BitArray.h \
${DESTDIR}${PREFIX}/include/ZXing
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/clang/Makefile.common
diff -u pkgsrc/lang/clang/Makefile.common:1.52 pkgsrc/lang/clang/Makefile.common:1.53
--- pkgsrc/lang/clang/Makefile.common:1.52 Sun Aug 14 12:13:03 2022
+++ pkgsrc/lang/clang/Makefile.common Tue Jan 24 18:36:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.52 2022/08/14 12:13:03 tnn Exp $
+# $NetBSD: Makefile.common,v 1.53 2023/01/24 18:36:28 wiz Exp $
# used by lang/clang/Makefile
# used by lang/clang-tools-extra/Makefile
@@ -12,11 +12,7 @@ HOMEPAGE= https://clang.llvm.org/
COMMENT= C language family frontend for LLVM
LICENSE= apache-2.0
-CONFIGURE_DIRS= build
-CMAKE_ARG_PATH= ${WRKSRC}
-
USE_LANGUAGES= c c++14
-USE_CMAKE= yes
GCC_REQD+= 7
CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
@@ -114,6 +110,7 @@ LIBCPP_CHECK= NO
CMAKE_ARGS+= -DCLANG_DEFAULT_CXX_STDLIB:STRING="libstdc++"
.endif
+.include "../../devel/cmake/build.mk"
# Enable full LLVM suite on SunOS
.if ${OPSYS} == "SunOS"
.include "../../lang/compiler-rt/buildlink3.mk"
@@ -163,9 +160,6 @@ PKG_FAIL_REASON+= "z3 PKG_OPTION must be
CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=ON
.endif
-post-extract:
- ${MKDIR} ${WRKSRC}/build
-
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/python/application.mk"
Index: pkgsrc/lang/libLLVM/Makefile
diff -u pkgsrc/lang/libLLVM/Makefile:1.43 pkgsrc/lang/libLLVM/Makefile:1.44
--- pkgsrc/lang/libLLVM/Makefile:1.43 Sun Dec 4 11:28:51 2022
+++ pkgsrc/lang/libLLVM/Makefile Tue Jan 24 18:36:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2022/12/04 11:28:51 he Exp $
+# $NetBSD: Makefile,v 1.44 2023/01/24 18:36:28 wiz Exp $
DISTNAME= llvm-13.0.1.src
PKGNAME= ${DISTNAME:S/llvm/libLLVM/:S/.src//}
@@ -15,15 +15,11 @@ COMMENT= Low Level Virtual Machine share
LICENSE= modified-bsd
USE_LANGUAGES= c c++11
-USE_CMAKE= yes
GCC_REQD+= 5
PYTHON_FOR_BUILD_ONLY= yes
PYTHON_VERSIONS_INCOMPATIBLE= 27
-CONFIGURE_DIRS= ${WRKDIR}/build
-CMAKE_ARG_PATH= ${WRKSRC}
-
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
@@ -134,7 +130,6 @@ CXXFLAGS+= -mno-pltseq
# replacing config.guess is required even for cmake.
# It is used to detect correct LLVM_HOST_TRIPLE, e.g. for NetBSD/evbarm.
post-extract:
- ${RUN} mkdir -p ${WRKDIR}/build
.for f in config.guess config.sub
cp ../../mk/gnu-config/${f} ${WRKSRC}/cmake/${f}
.endfor
@@ -154,6 +149,7 @@ post-install:
${DESTDIR}${PREFIX}/lib/libLLVM/libLLVM-${PKGVERSION_NOREV}.${SOEXT}
.endif
+.include "../../devel/cmake/build.mk"
.include "../../mk/atomic64.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/python/tool.mk"
Index: pkgsrc/lang/libunwind/Makefile
diff -u pkgsrc/lang/libunwind/Makefile:1.31 pkgsrc/lang/libunwind/Makefile:1.32
--- pkgsrc/lang/libunwind/Makefile:1.31 Thu Jan 12 19:32:54 2023
+++ pkgsrc/lang/libunwind/Makefile Tue Jan 24 18:36:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2023/01/12 19:32:54 adam Exp $
+# $NetBSD: Makefile,v 1.32 2023/01/24 18:36:28 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -18,10 +18,6 @@ EXTRA_DIST+= ${LIBCXX}${EXTRACT_SUFX}
SITES.${LIBCXX}${EXTRACT_SUFX}= \
${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-CONFIGURE_DIRS= build
-CMAKE_ARG_PATH= ${WRKSRC}
-
-USE_CMAKE= yes
USE_LANGUAGES= c c++11
USE_TOOLS+= pax
SSP_SUPPORTED= no
@@ -32,12 +28,12 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
INSTALLATION_DIRS= include
post-extract:
- ${MKDIR} ${WRKSRC}/build
${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx
post-install:
cd ${WRKSRC}/include && ${PAX} -rw . ${DESTDIR}${PREFIX}/include
+.include "../../devel/cmake/build.mk"
BUILDLINK_DEPMETHOD.llvm= build
.include "../../lang/llvm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.85 pkgsrc/lang/llvm/Makefile:1.86
--- pkgsrc/lang/llvm/Makefile:1.85 Wed Nov 30 19:54:59 2022
+++ pkgsrc/lang/llvm/Makefile Tue Jan 24 18:36:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2022/11/30 19:54:59 adam Exp $
+# $NetBSD: Makefile,v 1.86 2023/01/24 18:36:29 wiz Exp $
#
# When updating this, please also update:
# devel/include-what-you-use
@@ -35,7 +35,6 @@ COMMENT= Low Level Virtual Machine compi
LICENSE= apache-2.0
USE_LANGUAGES= c c++14
-USE_CMAKE= yes
GCC_REQD+= 7
PYTHON_FOR_BUILD_ONLY= yes
@@ -44,9 +43,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27
NOT_FOR_PLATFORM+= *-*-alpha
NOT_FOR_PLATFORM+= *-*-vax
-CONFIGURE_DIRS= build
-CMAKE_ARG_PATH= ${WRKSRC}
-
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
@@ -140,11 +136,11 @@ CMAKE_ARGS+= -DPKGSRC_LLVM_PTHREADLIB=-l
# replacing config.guess is required even for cmake.
# It is used to detect correct LLVM_HOST_TRIPLE, e.g. for NetBSD/evbarm.
post-extract:
- ${MKDIR} ${WRKSRC}/build
.for f in config.guess config.sub
${CP} ../../mk/gnu-config/${f} ${WRKSRC}/cmake/${f}
.endfor
+.include "../../devel/cmake/build.mk"
.include "../../archivers/zstd/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/python/application.mk"
Index: pkgsrc/lang/wasi-compiler-rt/Makefile
diff -u pkgsrc/lang/wasi-compiler-rt/Makefile:1.17 pkgsrc/lang/wasi-compiler-rt/Makefile:1.18
--- pkgsrc/lang/wasi-compiler-rt/Makefile:1.17 Wed Nov 30 19:55:00 2022
+++ pkgsrc/lang/wasi-compiler-rt/Makefile Tue Jan 24 18:36:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2022/11/30 19:55:00 adam Exp $
+# $NetBSD: Makefile,v 1.18 2023/01/24 18:36:29 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -16,14 +16,12 @@ DISTINFO_FILE= ${.CURDIR}/../../lang/com
NOT_FOR_PLATFORM= NetBSD-[0-7].*-*
-USE_CMAKE= yes
USE_LANGUAGES= c99 c++11
USE_TOOLS+= ggrep
SSP_SUPPORTED= no
PKGSRC_USE_STACK_CHECK= no
-CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ${WRKSRC}/lib/builtins
BUILDLINK_TRANSFORM+= rm:-I/usr/include
@@ -57,9 +55,6 @@ CMAKE_INSTALL_PREFIX= ${PREFIX}/lib/clan
GENERATE_PLIST+= find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
-post-extract:
- ${MKDIR} ${WRKSRC}/build
-
.include "../../mk/bsd.prefs.mk"
# Run llvm-ranlib again on the archive. Fixes mystery build failure
@@ -76,6 +71,7 @@ CFLAGS= -O2
CXXFLAGS= -O2
PKGSRC_COMPILER= clang
CLANGBASE= ${PREFIX}
+.include "../../devel/cmake/build.mk"
BUILDLINK_DEPMETHOD.clang= build
.include "../../lang/clang/buildlink3.mk"
.include "../../lang/llvm/buildlink3.mk"
Index: pkgsrc/lang/wasi-libcxx/Makefile
diff -u pkgsrc/lang/wasi-libcxx/Makefile:1.16 pkgsrc/lang/wasi-libcxx/Makefile:1.17
--- pkgsrc/lang/wasi-libcxx/Makefile:1.16 Wed Nov 30 19:55:00 2022
+++ pkgsrc/lang/wasi-libcxx/Makefile Tue Jan 24 18:36:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2022/11/30 19:55:00 adam Exp $
+# $NetBSD: Makefile,v 1.17 2023/01/24 18:36:29 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -33,7 +33,6 @@ BUILD_DIRS+= build_libcxxabi
INSTALL_DIRS+= ${BUILD_DIRS}
USE_LANGUAGES= c c++
-USE_CMAKE= yes
SSP_SUPPORTED= no
PKGSRC_USE_STACK_CHECK= no
@@ -169,6 +168,7 @@ post-install:
${PREFIX}/bin/llvm-ranlib \
${DESTDIR}${PREFIX}/wasi/lib/wasm32-wasi/libc++abi.a
+.include "../../devel/cmake/build.mk"
.include "../../lang/llvm/buildlink3.mk"
.include "../../lang/wasi-libc/buildlink3.mk"
.include "../../lang/wasi-compiler-rt/buildlink3.mk"
Index: pkgsrc/mail/rspamd/Makefile
diff -u pkgsrc/mail/rspamd/Makefile:1.84 pkgsrc/mail/rspamd/Makefile:1.85
--- pkgsrc/mail/rspamd/Makefile:1.84 Wed Nov 23 16:20:34 2022
+++ pkgsrc/mail/rspamd/Makefile Tue Jan 24 18:36:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2022/11/23 16:20:34 adam Exp $
+# $NetBSD: Makefile,v 1.85 2023/01/24 18:36:29 wiz Exp $
DISTNAME= rspamd-3.3
PKGREVISION= 1
@@ -15,7 +15,6 @@ DEPENDS+= ragel-[0-9]*:../../devel/ragel
GCC_REQD+= 8
-USE_CMAKE= yes
USE_TOOLS+= perl pkg-config
USE_LANGUAGES= c99 c++
BUILD_DEFS+= VARBASE
@@ -105,6 +104,7 @@ post-extract:
${FIND} ${WRKSRC}/conf -type d -exec ${CHMOD} ${PKGDIRMODE} {} \;
${FIND} ${WRKSRC}/conf -type f -exec ${CHMOD} ${DOCMODE} {} \;
+.include "../../devel/cmake/build.mk"
.include "../../databases/hiredis/buildlink3.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/fann/buildlink3.mk"
Index: pkgsrc/math/double-conversion/Makefile
diff -u pkgsrc/math/double-conversion/Makefile:1.5 pkgsrc/math/double-conversion/Makefile:1.6
--- pkgsrc/math/double-conversion/Makefile:1.5 Sun Aug 7 07:53:35 2022
+++ pkgsrc/math/double-conversion/Makefile Tue Jan 24 18:36:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/08/07 07:53:35 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2023/01/24 18:36:29 wiz Exp $
DISTNAME= double-conversion-3.2.1
CATEGORIES= math converters
@@ -10,9 +10,9 @@ HOMEPAGE= https://github.com/google/doub
COMMENT= Conversion routines for IEEE doubles
LICENSE= modified-bsd
-USE_CMAKE= yes
USE_LANGUAGES= c c++
CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
CMAKE_ARGS+= -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/dragonbox/Makefile
diff -u pkgsrc/math/dragonbox/Makefile:1.1 pkgsrc/math/dragonbox/Makefile:1.2
--- pkgsrc/math/dragonbox/Makefile:1.1 Wed Aug 24 12:53:24 2022
+++ pkgsrc/math/dragonbox/Makefile Tue Jan 24 18:36:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/08/24 12:53:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2023/01/24 18:36:30 wiz Exp $
DISTNAME= dragonbox-${GITHUB_TAG}
CATEGORIES= math
@@ -11,9 +11,9 @@ HOMEPAGE= https://github.com/jk-jeon/dra
COMMENT= Floating-point to binary-to-decimal conversion library
LICENSE= boost-license OR apache-2.0 # with LLVM exceptions
-USE_CMAKE= yes
USE_LANGUAGES= c c++
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/imath/Makefile
diff -u pkgsrc/math/imath/Makefile:1.5 pkgsrc/math/imath/Makefile:1.6
--- pkgsrc/math/imath/Makefile:1.5 Wed Apr 20 20:18:07 2022
+++ pkgsrc/math/imath/Makefile Tue Jan 24 18:36:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/04/20 20:18:07 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2023/01/24 18:36:30 wiz Exp $
DISTNAME= imath-3.1.5
CATEGORIES= math
@@ -11,7 +11,6 @@ HOMEPAGE= https://www.openexr.com/
COMMENT= 2D and 3D vector, matrix, and math operations for computer graphics
LICENSE= modified-bsd
-USE_CMAKE= yes
USE_LANGUAGES= c c++14
PTHREAD_OPTS= require
@@ -20,5 +19,6 @@ GCC_REQD+= 6
PKGCONFIG_OVERRIDE= config/Imath.pc.in
+.include "../../devel/cmake/build.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/lapack/Makefile.common
diff -u pkgsrc/math/lapack/Makefile.common:1.15 pkgsrc/math/lapack/Makefile.common:1.16
--- pkgsrc/math/lapack/Makefile.common:1.15 Tue Jun 15 15:06:23 2021
+++ pkgsrc/math/lapack/Makefile.common Tue Jan 24 18:36:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2021/06/15 15:06:23 thor Exp $
+# $NetBSD: Makefile.common,v 1.16 2023/01/24 18:36:30 wiz Exp $
# used by math/blas/Makefile
# used by math/cblas/Makefile
# used by math/lapacke/Makefile
@@ -29,11 +29,8 @@ PATCHDIR= ${.CURDIR}/../../math/lapack/p
DISTINFO_FILE= ${.CURDIR}/../../math/lapack/distinfo
USE_LANGUAGES= c fortran
-USE_CMAKE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
-CONFIGURE_DIRS= build
-CMAKE_ARG_PATH= ${WRKSRC}
.include "../../mk/bsd.prefs.mk"
@@ -68,7 +65,5 @@ post-install:
fi
.endif
+.include "../../devel/cmake/build.mk"
.include "../../math/lapack/version.mk"
-
-post-extract:
- ${RUN} ${MKDIR} ${WRKSRC}/build
Index: pkgsrc/math/libfixmath/Makefile
diff -u pkgsrc/math/libfixmath/Makefile:1.1 pkgsrc/math/libfixmath/Makefile:1.2
--- pkgsrc/math/libfixmath/Makefile:1.1 Wed Aug 24 12:49:24 2022
+++ pkgsrc/math/libfixmath/Makefile Tue Jan 24 18:36:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/08/24 12:49:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2023/01/24 18:36:30 wiz Exp $
DISTNAME= libfixmath-0.0.0pre20220623
CATEGORIES= math
@@ -11,10 +11,10 @@ HOMEPAGE= https://github.com/PetteriAimo
COMMENT= Q16.16 format fixed point operations in C
LICENSE= mit
-USE_CMAKE= yes
USE_LANGUAGES= c c++11
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
INSTALL_TARGET= install
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/multimedia/libaom/Makefile
diff -u pkgsrc/multimedia/libaom/Makefile:1.25 pkgsrc/multimedia/libaom/Makefile:1.26
--- pkgsrc/multimedia/libaom/Makefile:1.25 Thu Sep 29 15:48:16 2022
+++ pkgsrc/multimedia/libaom/Makefile Tue Jan 24 18:36:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2022/09/29 15:48:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.26 2023/01/24 18:36:30 wiz Exp $
DISTNAME= libaom-3.5.0
CATEGORIES= multimedia
@@ -9,7 +9,6 @@ HOMEPAGE= https://aomedia.googlesource.c
COMMENT= Library for using AV1, video coding format
LICENSE= 2-clause-bsd
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= perl
@@ -18,8 +17,6 @@ SUBST_FILES.version= build/cmake/version
SUBST_STAGE.version= pre-configure
SUBST_VARS.version= PKGVERSION_NOREV
-CONFIGURE_DIRS= build
-CMAKE_ARG_PATH= ../
CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
CMAKE_ARGS+= -DCMAKE_COLOR_MAKEFILE:BOOL=ON
CMAKE_ARGS+= -DENABLE_DECODE_PERF_TESTS:BOOL=OFF
@@ -65,4 +62,5 @@ TOOL_DEPENDS+= nasm>=2.13:../../devel/na
PKGCONFIG_OVERRIDE_STAGE= pre-install
PKGCONFIG_OVERRIDE+= build/aom.pc
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/multimedia/libmatroska/Makefile
diff -u pkgsrc/multimedia/libmatroska/Makefile:1.50 pkgsrc/multimedia/libmatroska/Makefile:1.51
--- pkgsrc/multimedia/libmatroska/Makefile:1.50 Mon Oct 10 07:39:30 2022
+++ pkgsrc/multimedia/libmatroska/Makefile Tue Jan 24 18:36:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2022/10/10 07:39:30 adam Exp $
+# $NetBSD: Makefile,v 1.51 2023/01/24 18:36:30 wiz Exp $
DISTNAME= libmatroska-1.7.1
CATEGORIES= multimedia devel
@@ -10,11 +10,11 @@ HOMEPAGE= https://www.matroska.org/
COMMENT= Extensible open standard Audio/Video container format
LICENSE= gnu-lgpl-v2.1
-USE_CMAKE= yes
USE_LANGUAGES= c c++14
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
PKGCONFIG_OVERRIDE= libmatroska.pc.in
+.include "../../devel/cmake/build.mk"
BUILDLINK_API_DEPENDS.libebml+= libebml>=1.4.3
.include "../../devel/libebml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/multimedia/obs-studio/Makefile
diff -u pkgsrc/multimedia/obs-studio/Makefile:1.48 pkgsrc/multimedia/obs-studio/Makefile:1.49
--- pkgsrc/multimedia/obs-studio/Makefile:1.48 Wed Nov 23 16:20:47 2022
+++ pkgsrc/multimedia/obs-studio/Makefile Tue Jan 24 18:36:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2022/11/23 16:20:47 adam Exp $
+# $NetBSD: Makefile,v 1.49 2023/01/24 18:36:31 wiz Exp $
DISTNAME= obs-studio-26.1.2
PKGREVISION= 20
@@ -10,7 +10,6 @@ HOMEPAGE= https://obsproject.com/
COMMENT= Video recording and live streaming software
LICENSE= gnu-gpl-v2
-USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c gnu++11
@@ -22,6 +21,7 @@ TOOL_DEPENDS+= swig3>=3.0:../../devel/sw
# Python 3 only
PYTHON_VERSIONS_INCOMPATIBLE= 27
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} != "FreeBSD"
. include "../../audio/alsa-lib/buildlink3.mk"
Index: pkgsrc/multimedia/x265/Makefile
diff -u pkgsrc/multimedia/x265/Makefile:1.35 pkgsrc/multimedia/x265/Makefile:1.36
--- pkgsrc/multimedia/x265/Makefile:1.35 Sat Jun 12 08:18:14 2021
+++ pkgsrc/multimedia/x265/Makefile Tue Jan 24 18:36:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2021/06/12 08:18:14 cirnatdan Exp $
+# $NetBSD: Makefile,v 1.36 2023/01/24 18:36:31 wiz Exp $
DISTNAME= x265_3.5
PKGNAME= ${DISTNAME:S/_/-/}
@@ -12,7 +12,6 @@ LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/${DISTNAME}/source
-USE_CMAKE= yes
USE_LANGUAGES= c c++
CMAKE_ARGS+= -DENABLE_PIC=ON
@@ -32,4 +31,5 @@ TOOL_DEPENDS+= nasm>=2.13.0:../../devel/
. endif
.endif
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/grpc/Makefile
diff -u pkgsrc/net/grpc/Makefile:1.65 pkgsrc/net/grpc/Makefile:1.66
--- pkgsrc/net/grpc/Makefile:1.65 Sun Dec 4 17:59:08 2022
+++ pkgsrc/net/grpc/Makefile Tue Jan 24 18:36:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2022/12/04 17:59:08 adam Exp $
+# $NetBSD: Makefile,v 1.66 2023/01/24 18:36:31 wiz Exp $
DISTNAME= grpc-1.51.1
CATEGORIES= net
@@ -10,7 +10,6 @@ HOMEPAGE= https://grpc.io/
COMMENT= High performance, open-source universal RPC framework
LICENSE= apache-2.0
-USE_CMAKE= yes
USE_LANGUAGES+= c c++11
USE_TOOLS+= pkg-config
@@ -37,6 +36,7 @@ post-extract:
${RMDIR} ${WRKSRC}/third_party/opencensus-proto
${LN} -s ${WRKDIR}/opencensus-proto-* ${WRKSRC}/third_party/opencensus-proto
+.include "../../devel/cmake/build.mk"
.include "../../mk/atomic64.mk"
.include "../../benchmarks/google-benchmark/buildlink3.mk"
.include "../../devel/abseil/buildlink3.mk"
Index: pkgsrc/net/libcares/Makefile
diff -u pkgsrc/net/libcares/Makefile:1.31 pkgsrc/net/libcares/Makefile:1.32
--- pkgsrc/net/libcares/Makefile:1.31 Mon Nov 1 09:57:53 2021
+++ pkgsrc/net/libcares/Makefile Tue Jan 24 18:36:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2021/11/01 09:57:53 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2023/01/24 18:36:31 wiz Exp $
DISTNAME= c-ares-1.18.1
PKGNAME= ${DISTNAME:S/c-/libc/1}
@@ -10,7 +10,7 @@ HOMEPAGE= https://c-ares.haxx.se/
COMMENT= Asynchronous resolver library, c-ares
LICENSE= mit
-USE_CMAKE= yes
CMAKE_ARGS+= -DCARES_STATIC=ON
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/ngtcp2/Makefile
diff -u pkgsrc/net/ngtcp2/Makefile:1.1 pkgsrc/net/ngtcp2/Makefile:1.2
--- pkgsrc/net/ngtcp2/Makefile:1.1 Sat Dec 3 16:02:29 2022
+++ pkgsrc/net/ngtcp2/Makefile Tue Jan 24 18:36:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/12/03 16:02:29 adam Exp $
+# $NetBSD: Makefile,v 1.2 2023/01/24 18:36:31 wiz Exp $
DISTNAME= ngtcp2-0.11.0
CATEGORIES= net
@@ -11,8 +11,8 @@ HOMEPAGE= https://github.com/ngtcp2/ngtc
COMMENT= Implements RFC9000 QUIC protocol
LICENSE= mit
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/sshping/Makefile
diff -u pkgsrc/net/sshping/Makefile:1.2 pkgsrc/net/sshping/Makefile:1.3
--- pkgsrc/net/sshping/Makefile:1.2 Sat May 28 20:46:16 2022
+++ pkgsrc/net/sshping/Makefile Tue Jan 24 18:36:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/05/28 20:46:16 leot Exp $
+# $NetBSD: Makefile,v 1.3 2023/01/24 18:36:31 wiz Exp $
DISTNAME= sshping-0.1.4
CATEGORIES= net
@@ -10,10 +10,10 @@ HOMEPAGE= https://github.com/spook/sshpi
COMMENT= Measure character-echo latency and bandwidth for ssh session
LICENSE= mit
-USE_CMAKE= yes
USE_TOOLS= pod2man
USE_LANGUAGES= c c++
+.include "../../devel/cmake/build.mk"
.include "../../security/libssh/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/tigervnc/Makefile
diff -u pkgsrc/net/tigervnc/Makefile:1.54 pkgsrc/net/tigervnc/Makefile:1.55
--- pkgsrc/net/tigervnc/Makefile:1.54 Wed Oct 26 10:31:52 2022
+++ pkgsrc/net/tigervnc/Makefile Tue Jan 24 18:36:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2022/10/26 10:31:52 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2023/01/24 18:36:32 wiz Exp $
DISTNAME= tigervnc-1.12.0
PKGNAME= ${DISTNAME}.1.20.13
@@ -27,7 +27,6 @@ REPLACE_PERL+= unix/vncserver/vncserver.
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_CMAKE= yes
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
USE_TOOLS+= intltool msgfmt msgmerge patch perl:run autoconf automake autoreconf pkg-config gmake bash:run
@@ -122,6 +121,7 @@ pre-configure:
${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \
./configure ${XORG_CONFIGURE_ARGS}
+.include "../../devel/cmake/build.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
Index: pkgsrc/net/wireshark/Makefile
diff -u pkgsrc/net/wireshark/Makefile:1.285 pkgsrc/net/wireshark/Makefile:1.286
--- pkgsrc/net/wireshark/Makefile:1.285 Fri Jan 20 13:09:09 2023
+++ pkgsrc/net/wireshark/Makefile Tue Jan 24 18:36:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.285 2023/01/20 13:09:09 adam Exp $
+# $NetBSD: Makefile,v 1.286 2023/01/24 18:36:32 wiz Exp $
DISTNAME= wireshark-4.0.3
CATEGORIES= net
@@ -12,13 +12,10 @@ LICENSE= gnu-gpl-v2
CONFLICTS+= ethereal-[0-9]*
-USE_CMAKE= yes
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
CMAKE_ARGS+= -DENABLE_APPLICATION_BUNDLE=OFF
CMAKE_ARGS+= -DVCSVERSION_OVERRIDE=${PKGVERSION_NOREV}
CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Asciidoctor=TRUE
-CMAKE_ARG_PATH= ..
-CONFIGURE_DIRS= build
USE_LANGUAGES= c c++
USE_TOOLS+= gmake perl pkg-config bison lex
@@ -45,9 +42,6 @@ REPLACE_PYTHON+= tools/rdps.py
CFLAGS.SunOS+= -D__EXTENSIONS__ # for getc_unlocked(3)
-pre-configure:
- ${MKDIR} ${WRKSRC}/build
-
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
@@ -68,6 +62,7 @@ BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.1
# [-Wint-conversion]
BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
+.include "../../devel/cmake/build.mk"
.include "../../archivers/brotli/buildlink3.mk"
.include "../../archivers/lz4/buildlink3.mk"
.include "../../archivers/minizip/buildlink3.mk"
Index: pkgsrc/print/podofo/Makefile
diff -u pkgsrc/print/podofo/Makefile:1.40 pkgsrc/print/podofo/Makefile:1.41
--- pkgsrc/print/podofo/Makefile:1.40 Tue Jan 17 14:01:57 2023
+++ pkgsrc/print/podofo/Makefile Tue Jan 24 18:36:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2023/01/17 14:01:57 spz Exp $
+# $NetBSD: Makefile,v 1.41 2023/01/24 18:36:32 wiz Exp $
DISTNAME= podofo-0.9.8
#PKGREVISION= 0
@@ -10,7 +10,6 @@ HOMEPAGE= http://podofo.sourceforge.net/
COMMENT= Library to work with the PDF file format
LICENSE= gnu-lgpl-v2 AND gnu-gpl-v2
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
@@ -26,6 +25,7 @@ CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAG
.include "options.mk"
+.include "../../devel/cmake/build.mk"
# tests-depend on cppunit (for unit tests)
.include "../../devel/libidn/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
Index: pkgsrc/print/scribus-qt5/Makefile
diff -u pkgsrc/print/scribus-qt5/Makefile:1.38 pkgsrc/print/scribus-qt5/Makefile:1.39
--- pkgsrc/print/scribus-qt5/Makefile:1.38 Sun Jan 22 16:28:37 2023
+++ pkgsrc/print/scribus-qt5/Makefile Tue Jan 24 18:36:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2023/01/22 16:28:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.39 2023/01/24 18:36:32 wiz Exp $
DISTNAME= scribus-1.5.8
PKGREVISION= 5
@@ -11,12 +11,12 @@ HOMEPAGE= https://www.scribus.net/
COMMENT= Publishing layout with graphical interface (Qt5 port)
LICENSE= gnu-gpl-v2
-USE_CMAKE= yes
USE_LANGUAGES= c c++17
USE_TOOLS+= pkg-config
CMAKE_ARGS+= -DWANT_CPP17=ON
+.include "../../devel/cmake/build.mk"
.include "../../converters/libcdr/buildlink3.mk"
.include "../../converters/libfreehand/buildlink3.mk"
.include "../../converters/libmspub/buildlink3.mk"
Index: pkgsrc/security/gpgmepp/Makefile
diff -u pkgsrc/security/gpgmepp/Makefile:1.26 pkgsrc/security/gpgmepp/Makefile:1.27
--- pkgsrc/security/gpgmepp/Makefile:1.26 Wed Nov 23 16:18:58 2022
+++ pkgsrc/security/gpgmepp/Makefile Tue Jan 24 18:36:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2022/11/23 16:18:58 adam Exp $
+# $NetBSD: Makefile,v 1.27 2023/01/24 18:36:32 wiz Exp $
DISTNAME= gpgmepp-15.12.2
PKGREVISION= 24
@@ -13,16 +13,11 @@ LICENSE= gnu-lgpl-v2.1
BUILD_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
-USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARG_PATH= ..
-CONFIGURE_DIRS= _KDE_build
CMAKE_ARGS+= -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-pre-configure:
- ${MKDIR} ${WRKSRC}/_KDE_build
-
+.include "../../devel/cmake/build.mk"
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
Index: pkgsrc/security/keepassxc/Makefile
diff -u pkgsrc/security/keepassxc/Makefile:1.50 pkgsrc/security/keepassxc/Makefile:1.51
--- pkgsrc/security/keepassxc/Makefile:1.50 Sun Jan 22 16:28:37 2023
+++ pkgsrc/security/keepassxc/Makefile Tue Jan 24 18:36:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2023/01/22 16:28:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.51 2023/01/24 18:36:32 wiz Exp $
DISTNAME= keepassxc-2.7.4-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -18,13 +18,10 @@ SUPERSEDES+= keepassx0-[0-9]*
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
-USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARG_PATH= ..
CMAKE_ARGS+= -DKEEPASSXC_BUILD_TYPE=Release
CMAKE_ARGS+= -DWITH_XC_DOCS=OFF
CMAKE_ARGS+= -DWITH_XC_BROWSER=ON
-CONFIGURE_DIRS= build
NOT_PAX_MPROTECT_SAFE+= bin/keepassxc
@@ -34,9 +31,7 @@ pre-configure: qmake-bin-add
qmake-bin-add:
${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
-pre-configure:
- ${MKDIR} ${WRKSRC}/build
-
+.include "../../devel/cmake/build.mk"
.include "../../converters/qrencode/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
Index: pkgsrc/security/libssh/Makefile
diff -u pkgsrc/security/libssh/Makefile:1.43 pkgsrc/security/libssh/Makefile:1.44
--- pkgsrc/security/libssh/Makefile:1.43 Sat Jan 29 09:04:14 2022
+++ pkgsrc/security/libssh/Makefile Tue Jan 24 18:36:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2022/01/29 09:04:14 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2023/01/24 18:36:32 wiz Exp $
#
# history: upstream renamed 0.11 to 0.1.1;
# we have to use the old-style convention so that version compares work.
@@ -16,13 +16,10 @@ HOMEPAGE= https://www.libssh.org/
COMMENT= SSHv2+v1 protocol library
LICENSE= 2-clause-bsd
-USE_CMAKE= yes
USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE+= libssh.pc.cmake
TEST_TARGET= test
-CONFIGURE_DIRS= build
-CMAKE_ARG_PATH= ${WRKSRC}
CMAKE_ARGS+= -DUNIT_TESTING=ON
CMAKE_ARGS+= -DWITH_EXAMPLES=OFF
@@ -32,14 +29,12 @@ BUILDLINK_TRANSFORM+= rm:-Werror=strict-
.include "options.mk"
-post-extract:
- ${MKDIR} ${WRKSRC}/build
-
-# for testing only
-BUILDLINK_DEPMETHOD.cmocka= build
+.include "../../devel/cmake/build.mk"
# for examples only
BUILDLINK_DEPMETHOD.argp= build
.include "../../devel/argp/buildlink3.mk"
+# for testing only
+BUILDLINK_DEPMETHOD.cmocka= build
.include "../../devel/cmocka/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/krb5.buildlink3.mk"
Index: pkgsrc/security/mbedtls/Makefile
diff -u pkgsrc/security/mbedtls/Makefile:1.24 pkgsrc/security/mbedtls/Makefile:1.25
--- pkgsrc/security/mbedtls/Makefile:1.24 Tue Jan 3 12:47:51 2023
+++ pkgsrc/security/mbedtls/Makefile Tue Jan 24 18:36:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/01/03 12:47:51 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2023/01/24 18:36:33 wiz Exp $
DISTNAME= mbedtls-2.28.2
CATEGORIES= security
@@ -14,7 +14,6 @@ CONFLICTS+= mbedtls3-[0-9]*
CONFLICTS+= polarssl-[0-9]*
SUPERSEDES+= polarssl-[0-9]*
-USE_CMAKE= yes
USE_LANGUAGES= c99
USE_TOOLS+= pkg-config
@@ -48,6 +47,7 @@ do-test:
${WRKSRC}/programs/test/selftest
.include "options.mk"
+.include "../../devel/cmake/build.mk"
.include "../../lang/python/tool.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/security/mbedtls3/Makefile
diff -u pkgsrc/security/mbedtls3/Makefile:1.1 pkgsrc/security/mbedtls3/Makefile:1.2
--- pkgsrc/security/mbedtls3/Makefile:1.1 Thu Aug 11 06:49:16 2022
+++ pkgsrc/security/mbedtls3/Makefile Tue Jan 24 18:36:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/08/11 06:49:16 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2023/01/24 18:36:33 wiz Exp $
DISTNAME= mbedtls-3.2.1
PKGNAME= ${DISTNAME:S/mbedtls/mbedtls3/}
@@ -16,7 +16,6 @@ CONFLICTS+= mbedtls-[0-9]*
CONFLICTS+= polarssl-[0-9]*
SUPERSEDES+= polarssl-[0-9]*
-USE_CMAKE= yes
USE_LANGUAGES= c99
USE_TOOLS+= pkg-config
@@ -50,6 +49,7 @@ do-test:
${WRKSRC}/programs/test/selftest
.include "options.mk"
+.include "../../devel/cmake/build.mk"
.include "../../lang/python/tool.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/security/minisign/Makefile
diff -u pkgsrc/security/minisign/Makefile:1.5 pkgsrc/security/minisign/Makefile:1.6
--- pkgsrc/security/minisign/Makefile:1.5 Mon Jun 27 15:29:17 2022
+++ pkgsrc/security/minisign/Makefile Tue Jan 24 18:36:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/06/27 15:29:17 fcambus Exp $
+# $NetBSD: Makefile,v 1.6 2023/01/24 18:36:33 wiz Exp $
DISTNAME= minisign-0.10
CATEGORIES= security
@@ -9,8 +9,8 @@ HOMEPAGE= https://github.com/jedisct1/mi
COMMENT= Dead simple tool to sign files and verify signatures
LICENSE= isc
-USE_CMAKE= yes
USE_TOOLS+= pkg-config
+.include "../../devel/cmake/build.mk"
.include "../../security/libsodium/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/security/polkit-qt/Makefile
diff -u pkgsrc/security/polkit-qt/Makefile:1.37 pkgsrc/security/polkit-qt/Makefile:1.38
--- pkgsrc/security/polkit-qt/Makefile:1.37 Wed Dec 8 16:02:35 2021
+++ pkgsrc/security/polkit-qt/Makefile Tue Jan 24 18:36:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2021/12/08 16:02:35 adam Exp $
+# $NetBSD: Makefile,v 1.38 2023/01/24 18:36:33 wiz Exp $
DISTNAME= polkit-qt-1-0.112.0
PKGNAME= ${DISTNAME:S/-qt-1-/-qt-/}
@@ -16,7 +16,6 @@ BUILD_DEPENDS+= automoc4>=0.9.87:../../d
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-USE_CMAKE= yes
CMAKE_ARGS+= -DUSE_QT4=ON
@@ -26,10 +25,10 @@ PKGCONFIG_OVERRIDE+= polkit-qt-core-1.pc
pre-configure:
${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
+.include "../../devel/cmake/build.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../security/polkit/buildlink3.mk"
.include "../../x11/qt4-libs/buildlink3.mk"
.include "../../x11/qt4-tools/buildlink3.mk"
.include "../../x11/qt4-qdbus/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/security/polkit-qt5/Makefile
diff -u pkgsrc/security/polkit-qt5/Makefile:1.25 pkgsrc/security/polkit-qt5/Makefile:1.26
--- pkgsrc/security/polkit-qt5/Makefile:1.25 Wed Nov 23 16:18:59 2022
+++ pkgsrc/security/polkit-qt5/Makefile Tue Jan 24 18:36:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2022/11/23 16:18:59 adam Exp $
+# $NetBSD: Makefile,v 1.26 2023/01/24 18:36:33 wiz Exp $
DISTNAME= polkit-qt-1-0.112.0
PKGNAME= ${DISTNAME:S/-qt-1-/-qt5-/}
@@ -12,15 +12,13 @@ HOMEPAGE= https://projects.kde.org/proje
COMMENT= Qt5 Wrapper around PolicyKit
LICENSE= gnu-lgpl-v2.1
-#EXTRACT_USING= gtar
-
USE_LANGUAGES= c c++
-USE_CMAKE= yes
USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= polkit-qt5-1.pc.cmake polkit-qt5-agent-1.pc.cmake
PKGCONFIG_OVERRIDE+= polkit-qt5-core-1.pc.cmake polkit-qt5-gui-1.pc.cmake
+.include "../../devel/cmake/build.mk"
.include "../../security/polkit/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/shells/fish/Makefile
diff -u pkgsrc/shells/fish/Makefile:1.40 pkgsrc/shells/fish/Makefile:1.41
--- pkgsrc/shells/fish/Makefile:1.40 Wed Jan 18 22:02:02 2023
+++ pkgsrc/shells/fish/Makefile Tue Jan 24 18:36:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2023/01/18 22:02:02 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2023/01/24 18:36:34 wiz Exp $
DISTNAME= fish-3.6.0
CATEGORIES= shells
@@ -13,7 +13,6 @@ COMMENT= User friendly command line she
LICENSE= gnu-gpl-v2
USE_LANGUAGES+= c c++
-USE_CMAKE= yes
USE_TOOLS+= msgfmt
CMAKE_ARGS+= -DIntl_INCLUDE_DIR=${PREFIX}/include
CMAKE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR}
@@ -51,6 +50,7 @@ REPLACE_PYTHON= share/tools/create_manpa
post-extract:
${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
+.include "../../devel/cmake/build.mk"
.include "../../devel/pcre2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/gettext-tools/buildlink3.mk"
Index: pkgsrc/textproc/fmtlib/Makefile
diff -u pkgsrc/textproc/fmtlib/Makefile:1.12 pkgsrc/textproc/fmtlib/Makefile:1.13
--- pkgsrc/textproc/fmtlib/Makefile:1.12 Sat Oct 8 09:43:19 2022
+++ pkgsrc/textproc/fmtlib/Makefile Tue Jan 24 18:36:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2022/10/08 09:43:19 bsiegert Exp $
+# $NetBSD: Makefile,v 1.13 2023/01/24 18:36:34 wiz Exp $
DISTNAME= fmt-9.1.0
PKGNAME= ${DISTNAME:S/fmt/fmtlib/}
@@ -11,7 +11,6 @@ HOMEPAGE= https://fmt.dev/
COMMENT= Formatting library
LICENSE= mit
-USE_CMAKE= yes
USE_LANGUAGES= c c++11
PKGCONFIG_OVERRIDE= support/cmake/fmt.pc.in
TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}
@@ -21,4 +20,5 @@ TEST_TARGET= test
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/json-c/Makefile
diff -u pkgsrc/textproc/json-c/Makefile:1.19 pkgsrc/textproc/json-c/Makefile:1.20
--- pkgsrc/textproc/json-c/Makefile:1.19 Mon Jan 9 18:16:14 2023
+++ pkgsrc/textproc/json-c/Makefile Tue Jan 24 18:36:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2023/01/09 18:16:14 khorben Exp $
+# $NetBSD: Makefile,v 1.20 2023/01/24 18:36:34 wiz Exp $
DISTNAME= json-c-0.16
CATEGORIES= textproc
@@ -9,8 +9,6 @@ HOMEPAGE= https://github.com/json-c/json
COMMENT= JSON library in C
LICENSE= mit
-USE_CMAKE= yes
-
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
CMAKE_ARGS+= -DDISABLE_WERROR=ON
@@ -18,4 +16,5 @@ PKGCONFIG_OVERRIDE+= json-c.pc.in
.include "options.mk"
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/json-schema/Makefile
diff -u pkgsrc/textproc/json-schema/Makefile:1.9 pkgsrc/textproc/json-schema/Makefile:1.10
--- pkgsrc/textproc/json-schema/Makefile:1.9 Tue Jun 28 11:36:11 2022
+++ pkgsrc/textproc/json-schema/Makefile Tue Jan 24 18:36:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/06/28 11:36:11 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2023/01/24 18:36:34 wiz Exp $
DISTNAME= json-schema-1.3
PKGREVISION= 3
@@ -12,12 +12,12 @@ HOMEPAGE= https://github.com/nfotex/json
COMMENT= C++ library to validate JSON documents against JSON Schemata
LICENSE= modified-bsd
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= perl:test pkg-config
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
TEST_TARGET= test
+.include "../../devel/cmake/build.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../textproc/jsoncpp/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/jsoncpp/Makefile
diff -u pkgsrc/textproc/jsoncpp/Makefile:1.16 pkgsrc/textproc/jsoncpp/Makefile:1.17
--- pkgsrc/textproc/jsoncpp/Makefile:1.16 Wed Nov 3 20:52:23 2021
+++ pkgsrc/textproc/jsoncpp/Makefile Tue Jan 24 18:36:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/11/03 20:52:23 adam Exp $
+# $NetBSD: Makefile,v 1.17 2023/01/24 18:36:34 wiz Exp $
DISTNAME= jsoncpp-1.9.5
CATEGORIES= textproc
@@ -9,16 +9,11 @@ HOMEPAGE= https://github.com/open-source
COMMENT= JSON reader and writer in C++
LICENSE= public-domain OR mit
-USE_CMAKE= yes
USE_LANGUAGES= c c++
CMAKE_ARGS+= -DBUILD_STATIC_LIBS=OFF
CMAKE_ARGS+= -DBUILD_OBJECT_LIBS=OFF
CMAKE_ARGS+= -DJSONCPP_WITH_TESTS=OFF
PKGCONFIG_OVERRIDE= pkg-config/jsoncpp.pc.in
-CONFIGURE_DIRS= ${WRKDIR}/build
-CMAKE_ARG_PATH= ${WRKSRC}
-
-post-extract:
- ${MKDIR} ${WRKDIR}/build
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/libclucene/Makefile
diff -u pkgsrc/textproc/libclucene/Makefile:1.35 pkgsrc/textproc/libclucene/Makefile:1.36
--- pkgsrc/textproc/libclucene/Makefile:1.35 Sun Jan 22 16:28:16 2023
+++ pkgsrc/textproc/libclucene/Makefile Tue Jan 24 18:36:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2023/01/22 16:28:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.36 2023/01/24 18:36:34 wiz Exp $
DISTNAME= clucene-core-2.3.3.4
PKGNAME= lib${DISTNAME:S/-core-/-/}
@@ -14,11 +14,10 @@ LICENSE= gnu-lgpl-v2.1 OR apache-2.0
PKGCONFIG_OVERRIDE+= libclucene-core.pc.in
USE_LANGUAGES= c c++
-USE_CMAKE= yes
CMAKE_ARGS+= -DBUILD_CONTRIBS_LIB=ON
-#BUILD_TARGET+= clucene-contribs-lib
USE_LIBTOOL= yes
+.include "../../devel/cmake/build.mk"
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/libyaml/Makefile
diff -u pkgsrc/textproc/libyaml/Makefile:1.17 pkgsrc/textproc/libyaml/Makefile:1.18
--- pkgsrc/textproc/libyaml/Makefile:1.17 Tue Jun 2 08:28:04 2020
+++ pkgsrc/textproc/libyaml/Makefile Tue Jan 24 18:36:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/06/02 08:28:04 adam Exp $
+# $NetBSD: Makefile,v 1.18 2023/01/24 18:36:35 wiz Exp $
DISTNAME= yaml-0.2.5
PKGNAME= lib${DISTNAME}
@@ -17,7 +17,7 @@ PKGCONFIG_OVERRIDE= yaml-0.1.pc.in
TEST_TARGET= check
# cmake support is incomplete
-#USE_CMAKE= yes
#CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
+#.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/pugixml/Makefile
diff -u pkgsrc/textproc/pugixml/Makefile:1.13 pkgsrc/textproc/pugixml/Makefile:1.14
--- pkgsrc/textproc/pugixml/Makefile:1.13 Tue Nov 8 12:56:38 2022
+++ pkgsrc/textproc/pugixml/Makefile Tue Jan 24 18:36:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2022/11/08 12:56:38 adam Exp $
+# $NetBSD: Makefile,v 1.14 2023/01/24 18:36:35 wiz Exp $
DISTNAME= pugixml-1.13
CATEGORIES= textproc
@@ -11,8 +11,8 @@ COMMENT= Light-weight C++ XML processing
LICENSE= mit
USE_LANGUAGES= c c++
-USE_CMAKE= yes
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/rapidjson/Makefile
diff -u pkgsrc/textproc/rapidjson/Makefile:1.6 pkgsrc/textproc/rapidjson/Makefile:1.7
--- pkgsrc/textproc/rapidjson/Makefile:1.6 Mon Oct 24 12:50:25 2022
+++ pkgsrc/textproc/rapidjson/Makefile Tue Jan 24 18:36:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/10/24 12:50:25 adam Exp $
+# $NetBSD: Makefile,v 1.7 2023/01/24 18:36:35 wiz Exp $
DISTNAME= rapidjson-1.1.0
PKGREVISION= 1
@@ -11,7 +11,6 @@ HOMEPAGE= https://rapidjson.org/
COMMENT= Fast JSON parser/generator with SAX/DOM style API
LICENSE= modified-bsd
-USE_CMAKE= yes
USE_LANGUAGES= c++11
TEST_TARGET= test
@@ -20,5 +19,6 @@ CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKA
PKGCONFIG_OVERRIDE+= RapidJSON.pc.in
BUILDLINK_TRANSFORM+= rm:-march=native rm:-Werror
+.include "../../devel/cmake/build.mk"
.include "../../devel/googletest/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/tinyxml2/Makefile
diff -u pkgsrc/textproc/tinyxml2/Makefile:1.5 pkgsrc/textproc/tinyxml2/Makefile:1.6
--- pkgsrc/textproc/tinyxml2/Makefile:1.5 Mon Nov 4 21:43:48 2019
+++ pkgsrc/textproc/tinyxml2/Makefile Tue Jan 24 18:36:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/11/04 21:43:48 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2023/01/24 18:36:35 wiz Exp $
DISTNAME= tinyxml2-2.2.0
CATEGORIES= textproc
@@ -10,9 +10,9 @@ HOMEPAGE= http://www.grinninglizard.com/
COMMENT= Simple, small and efficient C++ XML parser
LICENSE= zlib
-USE_CMAKE= yes
USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE= tinyxml2.pc.in
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/libproxy/Makefile
diff -u pkgsrc/www/libproxy/Makefile:1.35 pkgsrc/www/libproxy/Makefile:1.36
--- pkgsrc/www/libproxy/Makefile:1.35 Mon Nov 21 18:20:45 2022
+++ pkgsrc/www/libproxy/Makefile Tue Jan 24 18:36:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2022/11/21 18:20:45 jperkin Exp $
+# $NetBSD: Makefile,v 1.36 2023/01/24 18:36:35 wiz Exp $
DISTNAME= libproxy-0.4.15
PKGREVISION= 1
@@ -14,7 +14,6 @@ HOMEPAGE= https://libproxy.github.io/lib
COMMENT= Library that provides automatic proxy configuration management
LICENSE= gnu-lgpl-v2.1
-USE_CMAKE= yes
USE_LANGUAGES= c99 c++03
USE_TOOLS+= pkg-config
@@ -32,6 +31,7 @@ BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--no-
PKGCONFIG_OVERRIDE+= bindings/csharp/libproxy-sharp-1.0.pc.cmake
PKGCONFIG_OVERRIDE+= libproxy/libproxy-1.0.pc.in
+.include "../../devel/cmake/build.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
Index: pkgsrc/www/libwebsockets/Makefile
diff -u pkgsrc/www/libwebsockets/Makefile:1.3 pkgsrc/www/libwebsockets/Makefile:1.4
--- pkgsrc/www/libwebsockets/Makefile:1.3 Sun Jul 3 10:46:54 2022
+++ pkgsrc/www/libwebsockets/Makefile Tue Jan 24 18:36:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/07/03 10:46:54 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2023/01/24 18:36:35 wiz Exp $
DISTNAME= libwebsockets-4.3.0
CATEGORIES= www
@@ -10,7 +10,6 @@ HOMEPAGE= https://libwebsockets.org/
COMMENT= Lightweight C library for websocket clients and servers
LICENSE= mit
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
@@ -30,6 +29,7 @@ PKGCONFIG_OVERRIDE_STAGE= pre-install
PKGCONFIG_OVERRIDE+= libwebsockets.pc
PKGCONFIG_OVERRIDE+= libwebsockets_static.pc
+.include "../../devel/cmake/build.mk"
.include "../../devel/libuv/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
Index: pkgsrc/www/nghttp3/Makefile
diff -u pkgsrc/www/nghttp3/Makefile:1.1 pkgsrc/www/nghttp3/Makefile:1.2
--- pkgsrc/www/nghttp3/Makefile:1.1 Sat Dec 3 16:01:02 2022
+++ pkgsrc/www/nghttp3/Makefile Tue Jan 24 18:36:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/12/03 16:01:02 adam Exp $
+# $NetBSD: Makefile,v 1.2 2023/01/24 18:36:36 wiz Exp $
DISTNAME= nghttp3-0.7.1
CATEGORIES= www
@@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/ngtcp2/nght
COMMENT= Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK
LICENSE= mit
-USE_CMAKE= yes
USE_LANGUAGES= c c++
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/tidy/Makefile
diff -u pkgsrc/www/tidy/Makefile:1.56 pkgsrc/www/tidy/Makefile:1.57
--- pkgsrc/www/tidy/Makefile:1.56 Fri Nov 4 18:41:59 2022
+++ pkgsrc/www/tidy/Makefile Tue Jan 24 18:36:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2022/11/04 18:41:59 adam Exp $
+# $NetBSD: Makefile,v 1.57 2023/01/24 18:36:36 wiz Exp $
DISTNAME= tidy-html5-5.8.0
PKGNAME= ${DISTNAME:S/-html5//}
@@ -14,7 +14,6 @@ LICENSE= mit
# for man page
BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-USE_CMAKE= yes
USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE= tidy.pc.cmake.in
@@ -23,4 +22,5 @@ GCC_REQD+= 4.4
CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH=${PKGMANDIR}/man1
CMAKE_ARGS+= -DINCLUDE_INSTALL_DIR:PATH=include/tidy
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/webkit-gtk/Makefile
diff -u pkgsrc/www/webkit-gtk/Makefile:1.242 pkgsrc/www/webkit-gtk/Makefile:1.243
--- pkgsrc/www/webkit-gtk/Makefile:1.242 Tue Jan 3 17:36:34 2023
+++ pkgsrc/www/webkit-gtk/Makefile Tue Jan 24 18:36:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.242 2023/01/03 17:36:34 wiz Exp $
+# $NetBSD: Makefile,v 1.243 2023/01/24 18:36:36 wiz Exp $
DISTNAME= webkitgtk-2.36.8
PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
@@ -18,7 +18,6 @@ NOT_FOR_PLATFORM= NetBSD-[1-6].*-*
TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools
TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-USE_CMAKE= yes
USE_LANGUAGES= c c++17
USE_TOOLS+= automake bash bison flex gdbus-codegen gmake perl pkg-config msgfmt
@@ -141,6 +140,7 @@ CHECK_PORTABILITY_SKIP+= Source/WebKit/S
.include "options.mk"
+.include "../../devel/cmake/build.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
Index: pkgsrc/x11/qt5-qtwebkit/Makefile
diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.103 pkgsrc/x11/qt5-qtwebkit/Makefile:1.104
--- pkgsrc/x11/qt5-qtwebkit/Makefile:1.103 Thu Jan 5 23:30:09 2023
+++ pkgsrc/x11/qt5-qtwebkit/Makefile Tue Jan 24 18:36:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2023/01/05 23:30:09 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2023/01/24 18:36:36 wiz Exp $
QTWKVERSION= 5.212.0-alpha4
DISTNAME= qtwebkit-${QTWKVERSION}
@@ -22,9 +22,6 @@ TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9
USE_LANGUAGES= c c++11
USE_TOOLS+= perl:build pkg-config bison
-USE_CMAKE= yes
-CMAKE_ARG_PATH= ..
-CONFIGURE_DIRS= _build
CMAKE_INSTALL_PREFIX= ${PREFIX}/qt5
TEST_TARGET= test
@@ -44,9 +41,6 @@ UNLIMIT_RESOURCES+= cputime
GCC_REQD+= 4.9
-pre-configure:
- ${MKDIR} ${WRKSRC}/_build
-
# wcstof(3) etc. is used in C++ code.
CFLAGS.NetBSD+= -D_NETBSD_SOURCE
@@ -98,6 +92,7 @@ post-install:
# See comment in Source/WebKit2/PlatformQt.cmake
PLIST_VARS+= npapi
+.include "../../devel/cmake/build.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
.include "../../devel/libexecinfo/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index