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: Sun Aug 25 06:19:21 UTC 2024
Modified Files:
pkgsrc/archivers/arqiver: Makefile options.mk
pkgsrc/archivers/innoextract: Makefile
pkgsrc/archivers/libzip: Makefile options.mk
pkgsrc/archivers/lxqt-archiver: Makefile
pkgsrc/archivers/unshield: Makefile
pkgsrc/archivers/zziplib: Makefile
pkgsrc/audio/aften: Makefile
pkgsrc/audio/alure: Makefile options.mk
pkgsrc/audio/chromaprint: Makefile options.mk
pkgsrc/audio/csound6: Makefile options.mk
pkgsrc/audio/dumb: Makefile
pkgsrc/audio/fasttracker2: Makefile
pkgsrc/audio/faudio: Makefile
pkgsrc/audio/fluidsynth: Makefile options.mk
pkgsrc/audio/game-music-emu: Makefile
pkgsrc/audio/hydrogen: Makefile options.mk
pkgsrc/audio/jack-keyboard: Makefile
pkgsrc/audio/kid3: Makefile options.mk
pkgsrc/audio/libgroove: Makefile
pkgsrc/audio/libkeyfinder: Makefile
pkgsrc/audio/libmysofa: Makefile
pkgsrc/audio/libsoxr: Makefile
pkgsrc/audio/libwildmidi: Makefile
pkgsrc/audio/lmms: Makefile options.mk
pkgsrc/audio/milkytracker: Makefile
pkgsrc/audio/mixxx: Makefile
pkgsrc/audio/musescore: Makefile options.mk
pkgsrc/audio/openal-soft: Makefile options.mk
pkgsrc/audio/qmmp: Makefile options.mk
pkgsrc/audio/snapcast: options.mk
pkgsrc/audio/spotify-qt: Makefile
pkgsrc/audio/strawberry: Makefile options.mk
pkgsrc/audio/taglib: Makefile
pkgsrc/audio/traverso: Makefile options.mk
pkgsrc/audio/ympd: options.mk
pkgsrc/audio/zynaddsubfx: options.mk
pkgsrc/benchmarks/google-benchmark: Makefile
pkgsrc/biology/kallisto: Makefile
pkgsrc/biology/molsketch: Makefile
pkgsrc/biology/openbabel: Makefile options.mk
pkgsrc/biology/sra-tools: Makefile
pkgsrc/cad/kicad: Makefile options.mk
pkgsrc/cad/occt: Makefile buildlink3.mk options.mk
pkgsrc/cad/solvespace: Makefile
pkgsrc/chat/anope: Makefile
pkgsrc/chat/dino: Makefile
pkgsrc/chat/jitsi-srtp: Makefile
pkgsrc/chat/libsignal-protocol-c: Makefile
pkgsrc/chat/mumble: Makefile options.mk
pkgsrc/chat/quassel: options.mk
pkgsrc/chat/weechat: Makefile options.mk
pkgsrc/chat/znc: options.mk
pkgsrc/comms/gammu: Makefile
pkgsrc/comms/obexftp: Makefile
pkgsrc/comms/srtp: Makefile
pkgsrc/converters/cbmconvert: Makefile
pkgsrc/databases/duckdb: Makefile
pkgsrc/databases/leveldb: Makefile
pkgsrc/databases/mariadb1011-client: Makefile Makefile.common
options.mk
pkgsrc/databases/mariadb1011-embedded: Makefile
pkgsrc/databases/mariadb1011-server: Makefile options.mk
pkgsrc/databases/mariadb105-client: Makefile Makefile.common options.mk
pkgsrc/databases/mariadb105-server: Makefile options.mk
pkgsrc/databases/mariadb106-client: Makefile Makefile.common options.mk
pkgsrc/databases/mariadb106-server: Makefile options.mk
pkgsrc/databases/mariadb114-client: Makefile Makefile.common options.mk
pkgsrc/databases/mariadb114-server: Makefile options.mk
pkgsrc/databases/mongo-c-driver: Makefile options.mk
pkgsrc/databases/myodbc: Makefile options.mk
pkgsrc/databases/mysql75-cluster: Makefile.common options.mk
pkgsrc/databases/mysql80-client: Makefile Makefile.common
pkgsrc/databases/mysql80-cluster: Makefile.common options.mk
pkgsrc/databases/mysql80-server: Makefile
pkgsrc/databases/postgresql-timescaledb: Makefile
pkgsrc/databases/prometheus-cpp: options.mk
pkgsrc/databases/soci: Makefile options.mk
pkgsrc/devel/allegro: Makefile options.mk
pkgsrc/devel/allegro5: Makefile options.mk
pkgsrc/devel/binaryen: Makefile options.mk
pkgsrc/devel/blosc: Makefile
pkgsrc/devel/blosc2: Makefile
pkgsrc/devel/bullet: Makefile
pkgsrc/devel/ccache: Makefile
pkgsrc/devel/cmake: build.mk
pkgsrc/devel/cmake-gui: Makefile
pkgsrc/devel/cmocka: Makefile
pkgsrc/devel/cppcheck: Makefile
pkgsrc/devel/cpu_features: Makefile
pkgsrc/devel/cxxopts: Makefile
pkgsrc/devel/deepstate: Makefile
pkgsrc/devel/deepstate-afl: Makefile
pkgsrc/devel/deepstate-honggfuzz: Makefile
pkgsrc/devel/deepstate-libfuzzer: Makefile
pkgsrc/devel/doxygen: Makefile options.mk
pkgsrc/devel/extra-cmake-modules: Makefile
pkgsrc/devel/fifechan: Makefile
pkgsrc/devel/fifengine: Makefile
pkgsrc/devel/flatbuffers: Makefile
pkgsrc/devel/frozen: Makefile
pkgsrc/devel/gflags: Makefile
pkgsrc/devel/gnustep-objc: Makefile
pkgsrc/devel/google-glog: Makefile options.mk
pkgsrc/devel/hyperscan: Makefile
pkgsrc/devel/include-what-you-use: Makefile
pkgsrc/devel/libcbor: Makefile
pkgsrc/devel/libdbusmenu-lxqt: Makefile
pkgsrc/devel/libdbusmenu-qt: Makefile Makefile.common
pkgsrc/devel/libdivsufsort: Makefile
pkgsrc/devel/libebml: Makefile
pkgsrc/devel/libepoll-shim: Makefile
pkgsrc/devel/libftdi1: Makefile
pkgsrc/devel/libgit2: Makefile
pkgsrc/devel/libyang: Makefile
pkgsrc/devel/libyang2: Makefile
pkgsrc/devel/lld: Makefile options.mk
pkgsrc/devel/lldb: Makefile options.mk
pkgsrc/devel/lua-luv: Makefile
pkgsrc/devel/lua-sdl2: Makefile
pkgsrc/devel/lxqt-build-tools: Makefile
pkgsrc/devel/mimalloc: Makefile
pkgsrc/devel/mold: Makefile
pkgsrc/devel/nextpnr: nextpnr.mk
pkgsrc/devel/polly: Makefile
pkgsrc/devel/protobuf: Makefile
pkgsrc/devel/py-llvmlite: Makefile
pkgsrc/devel/range-v3: Makefile
pkgsrc/devel/rapidcheck: Makefile
pkgsrc/devel/raylib: Makefile
pkgsrc/devel/re2: Makefile
pkgsrc/devel/rttr: Makefile
pkgsrc/devel/snappy: Makefile
pkgsrc/devel/spdlog: Makefile
pkgsrc/devel/tl-expected: Makefile
pkgsrc/devel/tlsh: Makefile
pkgsrc/devel/ucommon: Makefile options.mk
pkgsrc/devel/woboq_codebrowser: Makefile
pkgsrc/doc: HOWTO-dev-crosscompile pkgsrc.html pkgsrc.txt
pkgsrc/doc/guide/files: build.xml
pkgsrc/editors/PageEdit: Makefile
pkgsrc/editors/Sigil: Makefile
pkgsrc/editors/feathernotes: Makefile
pkgsrc/editors/focuswriter: Makefile
pkgsrc/editors/nvi2: options.mk
pkgsrc/editors/qtcreator: Makefile
pkgsrc/editors/xournalpp: Makefile
pkgsrc/emulators/cannonball: Makefile
pkgsrc/emulators/dolphin-emu: Makefile options.mk
pkgsrc/emulators/duckstation-qt: Makefile.common
pkgsrc/emulators/flycast: Makefile.common options.mk
pkgsrc/emulators/hatari: Makefile
pkgsrc/emulators/keystone: Makefile
pkgsrc/emulators/libretro-flycast: Makefile options.mk
pkgsrc/emulators/libretro-mgba: Makefile
pkgsrc/emulators/melonds: Makefile
pkgsrc/emulators/mgba: Makefile Makefile.common options.mk
pkgsrc/emulators/mgba-qt: Makefile options.mk
pkgsrc/emulators/snes9x-gtk: Makefile options.mk
pkgsrc/emulators/visualboyadvance-m: Makefile
pkgsrc/emulators/yabause: options.mk
pkgsrc/finance/gnucash: Makefile options.mk
pkgsrc/finance/ledger: options.mk
pkgsrc/finance/ledger32: options.mk
pkgsrc/fonts/fntsample: Makefile
pkgsrc/fonts/fontforge: Makefile
pkgsrc/fonts/woff2: Makefile
pkgsrc/games/amnesia-tdd: Makefile
pkgsrc/games/arx-libertatis: Makefile
pkgsrc/games/astromenace: Makefile
pkgsrc/games/black-hole-solver: Makefile
pkgsrc/games/corsix-th: Makefile
pkgsrc/games/devilutionx: Makefile
pkgsrc/games/dhewm3: Makefile
pkgsrc/games/eternal-lands: Makefile
pkgsrc/games/etlegacy: Makefile Makefile.common options.mk
pkgsrc/games/etlegacy-server: Makefile options.mk
pkgsrc/games/eureka: Makefile options.mk
pkgsrc/games/fallingtime: Makefile
pkgsrc/games/flare-engine: Makefile
pkgsrc/games/flare-game: Makefile
pkgsrc/games/flightgear: Makefile
pkgsrc/games/freecell-solver: Makefile
pkgsrc/games/gemrb: Makefile
pkgsrc/games/lgogdownloader: Makefile
pkgsrc/games/lugaru: Makefile
pkgsrc/games/megaglest: Makefile
pkgsrc/games/minetest: Makefile
pkgsrc/games/nxengine-evo: Makefile
pkgsrc/games/openhexagon: Makefile
pkgsrc/games/openjk: Makefile
pkgsrc/games/openmw: Makefile options.mk
pkgsrc/games/openrct2: Makefile
pkgsrc/games/openttd: Makefile
pkgsrc/games/oshu: Makefile
pkgsrc/games/prboom-plus: Makefile
pkgsrc/games/simgear: Makefile
pkgsrc/games/solarus: options.mk
pkgsrc/games/srb2: Makefile
pkgsrc/games/supertux: Makefile
pkgsrc/games/supertuxkart: Makefile
pkgsrc/games/teeworlds: Makefile
pkgsrc/games/vcmi: Makefile options.mk
pkgsrc/games/warzone2100: Makefile
pkgsrc/games/wesnoth: Makefile
pkgsrc/games/widelands: Makefile
pkgsrc/games/woof: Makefile
pkgsrc/geography/gdal-lib: Makefile
pkgsrc/geography/libmaxminddb: Makefile
pkgsrc/geography/mapcode: Makefile
pkgsrc/geography/opencpn: Makefile
pkgsrc/geography/opencpn-plugin-debugger: Makefile
pkgsrc/geography/opencpn-plugin-draw: Makefile
pkgsrc/geography/opencpn-plugin-plots: Makefile
pkgsrc/geography/opencpn-plugin-statusbar: Makefile
pkgsrc/geography/opencpn-plugin-watchdog: Makefile
pkgsrc/geography/opencpn-plugin-weather_routing: Makefile
pkgsrc/geography/osm2pgsql: Makefile
pkgsrc/geography/pdal-lib: Makefile
pkgsrc/geography/qgis: Makefile
pkgsrc/graphics/OpenJPH: Makefile
pkgsrc/graphics/blender: Makefile options.mk
pkgsrc/graphics/blender-lts: Makefile options.mk
pkgsrc/graphics/box2d: Makefile
pkgsrc/graphics/charls: Makefile
pkgsrc/graphics/darktable: Makefile
pkgsrc/graphics/drawpile: Makefile
pkgsrc/graphics/exiv2: Makefile
pkgsrc/graphics/freeglut: Makefile options.mk
pkgsrc/graphics/glad: Makefile
pkgsrc/graphics/glfw: Makefile options.mk
pkgsrc/graphics/gmic-qt-digikam: Makefile
pkgsrc/graphics/hugin: Makefile
pkgsrc/graphics/inkscape: Makefile
pkgsrc/graphics/jasper: Makefile options.mk
pkgsrc/graphics/kdiagram: Makefile
pkgsrc/graphics/kvantum: Makefile
pkgsrc/graphics/lensfun: Makefile
pkgsrc/graphics/leptonica: Makefile
pkgsrc/graphics/libhighway: Makefile options.mk
pkgsrc/graphics/libjpeg-turbo: Makefile
pkgsrc/graphics/luminance-hdr: Makefile
pkgsrc/graphics/mojoshader: Makefile
pkgsrc/graphics/mygui: Makefile
pkgsrc/graphics/nvidia-texture-tools: Makefile
pkgsrc/graphics/opencv: Makefile.common options.mk
pkgsrc/graphics/opencv-contrib-face: Makefile
pkgsrc/graphics/openexr: Makefile
pkgsrc/graphics/openimageio: Makefile
pkgsrc/graphics/osg: Makefile options.mk
pkgsrc/graphics/oxygen-icons: Makefile
pkgsrc/graphics/pcl: Makefile options.mk
pkgsrc/graphics/pfstools: Makefile options.mk
pkgsrc/graphics/rawtherapee: Makefile
pkgsrc/graphics/screengrab: Makefile
pkgsrc/graphics/tesseract: Makefile
pkgsrc/graphics/vtk: Makefile options.mk
pkgsrc/graphics/zint: Makefile options.mk
pkgsrc/graphics/zxing-cpp: Makefile
pkgsrc/ham/codec2: Makefile
pkgsrc/ham/gnuradio-core: options.mk
pkgsrc/ham/gr-osmosdr: Makefile
pkgsrc/ham/hackrf: Makefile
pkgsrc/ham/soapy-sdr: Makefile
pkgsrc/inputmethod/fcitx: Makefile
pkgsrc/inputmethod/fcitx5: Makefile
pkgsrc/inputmethod/fcitx5-configtool: Makefile
pkgsrc/inputmethod/fcitx5-qt: Makefile
pkgsrc/inputmethod/ibus-qt: Makefile
pkgsrc/inputmethod/ibus-table-chinese: Makefile
pkgsrc/inputmethod/librime: options.mk
pkgsrc/lang/clang: Makefile.common
pkgsrc/lang/compiler-rt: Makefile
pkgsrc/lang/flang: Makefile
pkgsrc/lang/libLLVM: Makefile options.mk
pkgsrc/lang/libcxx: Makefile
pkgsrc/lang/libcxxabi: Makefile
pkgsrc/lang/libunwind: Makefile
pkgsrc/lang/llvm: Makefile options.mk
pkgsrc/lang/lua51: buildlink3.mk
pkgsrc/lang/lua52: buildlink3.mk
pkgsrc/lang/lua53: buildlink3.mk
pkgsrc/lang/lua54: buildlink3.mk
pkgsrc/lang/mlir: Makefile
pkgsrc/lang/neko: options.mk
pkgsrc/lang/oorexx: Makefile
pkgsrc/lang/python: pyversion.mk
pkgsrc/lang/squeak-vm: Makefile
pkgsrc/lang/swi-prolog-jpl: Makefile
pkgsrc/lang/swi-prolog-lite: Makefile Makefile.common
pkgsrc/lang/swi-prolog-packages: Makefile
pkgsrc/lang/wasi-compiler-rt: Makefile
pkgsrc/lang/wasi-libcxx: Makefile
pkgsrc/mail/evolution: Makefile
pkgsrc/mail/evolution-data-server: Makefile
pkgsrc/mail/qsmtp: Makefile
pkgsrc/mail/rspamd: Makefile
pkgsrc/math/armadillo: Makefile
pkgsrc/math/arpack-ng: Makefile options.mk
pkgsrc/math/blas: Makefile
pkgsrc/math/blas64: Makefile
pkgsrc/math/cblas: Makefile
pkgsrc/math/cblas64: Makefile
pkgsrc/math/cgal: Makefile
pkgsrc/math/double-conversion: Makefile
pkgsrc/math/dragonbox: Makefile
pkgsrc/math/eigen3: Makefile
pkgsrc/math/flann-lib: Makefile
pkgsrc/math/hercules4sdl-decnumber: Makefile
pkgsrc/math/hercules4sdl-softfloat: Makefile
pkgsrc/math/kissfft: Makefile
pkgsrc/math/lapack: Makefile Makefile.common
pkgsrc/math/lapack64: Makefile
pkgsrc/math/lapacke: Makefile
pkgsrc/math/lapacke64: Makefile
pkgsrc/math/libfixmath: Makefile
pkgsrc/math/nlopt: Makefile
pkgsrc/math/qhull: Makefile
pkgsrc/math/scalapack: Makefile
pkgsrc/math/sundials: Makefile
pkgsrc/math/superlu: Makefile
pkgsrc/math/teapot: Makefile
pkgsrc/meta-pkgs/kde4: kde4.mk
pkgsrc/misc/attica: Makefile
pkgsrc/misc/bibletime: Makefile
pkgsrc/misc/indi: Makefile
pkgsrc/misc/kdeartwork4: Makefile
pkgsrc/misc/kdeplasma-addons4: Makefile
pkgsrc/misc/libcec: Makefile
pkgsrc/misc/raspberrypi-userland: Makefile options.mk
pkgsrc/misc/stellarium: Makefile
pkgsrc/misc/vym: Makefile
pkgsrc/misc/xygrib-devel: Makefile
pkgsrc/mk: bsd.pkg.mk
pkgsrc/mk/configure: cmake.mk configure.mk
pkgsrc/multimedia/avidemux: Makefile options.mk
pkgsrc/multimedia/ffmpegthumbnailer: Makefile
pkgsrc/multimedia/frei0r: Makefile
pkgsrc/multimedia/gerbera: options.mk
pkgsrc/multimedia/libaom: Makefile
pkgsrc/multimedia/libmatroska: Makefile
pkgsrc/multimedia/lightspark: Makefile
pkgsrc/multimedia/obs-studio: Makefile
pkgsrc/multimedia/olive-editor: Makefile
pkgsrc/multimedia/phonon: Makefile.common options.mk
pkgsrc/multimedia/phonon-qt5: options.mk
pkgsrc/multimedia/phonon-qt5-backend-gstreamer: Makefile
pkgsrc/multimedia/phonon-qt5-backend-vlc: Makefile
pkgsrc/multimedia/x265: Makefile options.mk
pkgsrc/net/ccrtp: Makefile
pkgsrc/net/ettercap: Makefile Makefile.common
pkgsrc/net/ettercap-gtk: Makefile
pkgsrc/net/freeDiameter: Makefile options.mk
pkgsrc/net/freerdp2: Makefile options.mk
pkgsrc/net/grpc: Makefile
pkgsrc/net/hercules4sdl-telnet: Makefile
pkgsrc/net/icinga2: Makefile options.mk
pkgsrc/net/lagrange: options.mk
pkgsrc/net/libcares: Makefile
pkgsrc/net/libvncserver: Makefile options.mk
pkgsrc/net/libzrtpcpp: Makefile options.mk
pkgsrc/net/mosquitto: Makefile options.mk
pkgsrc/net/nextcloud-client: Makefile
pkgsrc/net/nng: options.mk
pkgsrc/net/owncloudclient: Makefile
pkgsrc/net/qbittorrent: Makefile options.mk
pkgsrc/net/rabbitmq-c: Makefile
pkgsrc/net/remmina: Makefile options.mk
pkgsrc/net/softether: Makefile
pkgsrc/net/synergy: Makefile
pkgsrc/net/taskserver: Makefile
pkgsrc/net/tigervnc: Makefile
pkgsrc/net/transmission-gtk: Makefile
pkgsrc/net/transmission-qt: Makefile
pkgsrc/net/wireshark: Makefile options.mk
pkgsrc/news/neix: Makefile
pkgsrc/news/pan: Makefile options.mk
pkgsrc/parallel/opencl-clhpp: Makefile
pkgsrc/parallel/openmp: Makefile
pkgsrc/parallel/pocl: Makefile
pkgsrc/parallel/threadingbuildingblocks: Makefile
pkgsrc/pkgtools/pkglint4/files: makevars.map
pkgsrc/print/dspdfviewer: Makefile
pkgsrc/print/libharu: Makefile
pkgsrc/print/podofo: Makefile options.mk
pkgsrc/print/poppler: Makefile Makefile.common
pkgsrc/print/poppler-cpp: Makefile
pkgsrc/print/poppler-includes: Makefile
pkgsrc/print/poppler-qt5: Makefile
pkgsrc/print/poppler-qt6: Makefile
pkgsrc/print/poppler-utils: Makefile
pkgsrc/print/qpdf: Makefile
pkgsrc/print/scribus-qt5: Makefile
pkgsrc/print/xpdf4: Makefile options.mk
pkgsrc/security/gpgmepp: Makefile
pkgsrc/security/hercules4sdl-crypto: Makefile
pkgsrc/security/keepassxc: Makefile options.mk
pkgsrc/security/lastpass-cli: Makefile
pkgsrc/security/libdecaf: Makefile
pkgsrc/security/libfido2: Makefile
pkgsrc/security/libnitrokey: Makefile options.mk
pkgsrc/security/libssh: Makefile options.mk
pkgsrc/security/lxqt-sudo: Makefile
pkgsrc/security/mbedtls: Makefile options.mk
pkgsrc/security/mbedtls3: Makefile
pkgsrc/security/polkit-qt: Makefile
pkgsrc/security/polkit-qt6: Makefile
pkgsrc/security/qca2: Makefile Makefile.common
pkgsrc/security/qca2-gnupg: Makefile
pkgsrc/security/qca2-ossl: Makefile
pkgsrc/security/qca2-qt5: Makefile Makefile.common
pkgsrc/security/qca2-qt5-gnupg: Makefile
pkgsrc/security/qca2-qt5-ossl: Makefile
pkgsrc/security/qca2-qt6: Makefile
pkgsrc/security/zoneminder: Makefile
pkgsrc/shells/fish: Makefile
pkgsrc/sysutils/WCMCommander: Makefile
pkgsrc/sysutils/bareos: Makefile.common options.mk
pkgsrc/sysutils/bareos-clientonly: Makefile
pkgsrc/sysutils/cdrkit: Makefile
pkgsrc/sysutils/dfc: Makefile
pkgsrc/sysutils/fluent-bit: Makefile
pkgsrc/sysutils/strigi: Makefile
pkgsrc/textproc/PEGTL: Makefile
pkgsrc/textproc/cJSON: 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/libcue: Makefile
pkgsrc/textproc/libkolabxml: Makefile
pkgsrc/textproc/libyaml: Makefile
pkgsrc/textproc/lua-rapidjson: Makefile
pkgsrc/textproc/lucene++: Makefile
pkgsrc/textproc/multimarkdown: Makefile
pkgsrc/textproc/nlohmann-json: options.mk
pkgsrc/textproc/nuspell: Makefile
pkgsrc/textproc/pugixml: Makefile
pkgsrc/textproc/rapidjson: Makefile
pkgsrc/textproc/uriparser: Makefile options.mk
pkgsrc/textproc/utf8-cpp: Makefile
pkgsrc/textproc/yaml-cpp: Makefile
pkgsrc/time/taskwarrior: Makefile
pkgsrc/wm/awesome: Makefile options.mk
pkgsrc/wm/ctwm: Makefile
pkgsrc/wm/obconf-qt: Makefile
pkgsrc/wm/pekwm: Makefile
pkgsrc/www/cppcms: Makefile
pkgsrc/www/h2o: Makefile
pkgsrc/www/libwebsockets: Makefile
pkgsrc/www/otter-browser: Makefile
pkgsrc/www/tidy: Makefile
pkgsrc/www/webkit-gtk: Makefile options.mk
pkgsrc/x11/kactivities: Makefile
pkgsrc/x11/kde-runtime4: Makefile options.mk
pkgsrc/x11/kde-workspace4: Makefile
pkgsrc/x11/kdelibs4: Makefile
pkgsrc/x11/libfm-qt: Makefile
pkgsrc/x11/libkactivities4: Makefile
pkgsrc/x11/lxqt-config: Makefile
pkgsrc/x11/lxqt-panel: Makefile options.mk
pkgsrc/x11/lxqt-session: options.mk
pkgsrc/x11/maim: Makefile
pkgsrc/x11/qt4-tools: buildlink3.mk
pkgsrc/x11/qt5-qtwebkit: Makefile
pkgsrc/x11/qterminal: Makefile
pkgsrc/x11/read-edid: Makefile
pkgsrc/x11/slim: options.mk
pkgsrc/x11/slop: Makefile
pkgsrc/x11/tint2: Makefile
pkgsrc/x11/wxGTK32: Makefile
pkgsrc/x11/xfce4-whiskermenu-plugin: Makefile
pkgsrc/x11/xss-lock: Makefile
Log Message:
*: replace CMAKE_ARGS with CMAKE_CONFIGURE_ARGS
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/archivers/arqiver/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/archivers/arqiver/options.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/archivers/innoextract/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/archivers/libzip/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/archivers/libzip/options.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/archivers/lxqt-archiver/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/archivers/unshield/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/archivers/zziplib/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/aften/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/alure/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/alure/options.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/audio/chromaprint/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/chromaprint/options.mk
cvs rdiff -u -r1.87 -r1.88 pkgsrc/audio/csound6/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/csound6/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/dumb/Makefile
cvs rdiff -u -r1.122 -r1.123 pkgsrc/audio/fasttracker2/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/audio/faudio/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/audio/fluidsynth/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/fluidsynth/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/game-music-emu/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/audio/hydrogen/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/hydrogen/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/jack-keyboard/Makefile
cvs rdiff -u -r1.145 -r1.146 pkgsrc/audio/kid3/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/kid3/options.mk
cvs rdiff -u -r1.40 -r1.41 pkgsrc/audio/libgroove/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/libkeyfinder/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/libmysofa/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/libsoxr/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/audio/libwildmidi/Makefile
cvs rdiff -u -r1.95 -r1.96 pkgsrc/audio/lmms/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/lmms/options.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/audio/milkytracker/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/audio/mixxx/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/audio/musescore/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/musescore/options.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/audio/openal-soft/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/openal-soft/options.mk
cvs rdiff -u -r1.58 -r1.59 pkgsrc/audio/qmmp/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/qmmp/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/snapcast/options.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/audio/spotify-qt/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/audio/strawberry/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/strawberry/options.mk
cvs rdiff -u -r1.53 -r1.54 pkgsrc/audio/taglib/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/audio/traverso/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/traverso/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/ympd/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/zynaddsubfx/options.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/benchmarks/google-benchmark/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/biology/kallisto/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/biology/molsketch/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/biology/openbabel/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/biology/openbabel/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/biology/sra-tools/Makefile
cvs rdiff -u -r1.96 -r1.97 pkgsrc/cad/kicad/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/cad/kicad/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/cad/occt/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/cad/occt/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/cad/occt/options.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/cad/solvespace/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/chat/anope/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/chat/dino/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/jitsi-srtp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/libsignal-protocol-c/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/chat/mumble/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/chat/mumble/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/quassel/options.mk
cvs rdiff -u -r1.148 -r1.149 pkgsrc/chat/weechat/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/chat/weechat/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/chat/znc/options.mk
cvs rdiff -u -r1.57 -r1.58 pkgsrc/comms/gammu/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/comms/obexftp/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/comms/srtp/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/converters/cbmconvert/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/duckdb/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/leveldb/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/mariadb1011-client/Makefile
cvs rdiff -u -r1.14 -r1.15 \
pkgsrc/databases/mariadb1011-client/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb1011-client/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mariadb1011-embedded/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/mariadb1011-server/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb1011-server/options.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/mariadb105-client/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/databases/mariadb105-client/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb105-client/options.mk
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/mariadb105-server/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/mariadb105-server/options.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/mariadb106-client/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/databases/mariadb106-client/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb106-client/options.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/databases/mariadb106-server/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mariadb106-server/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb114-client/Makefile \
pkgsrc/databases/mariadb114-client/Makefile.common \
pkgsrc/databases/mariadb114-client/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb114-server/Makefile \
pkgsrc/databases/mariadb114-server/options.mk
cvs rdiff -u -r1.66 -r1.67 pkgsrc/databases/mongo-c-driver/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mongo-c-driver/options.mk
cvs rdiff -u -r1.46 -r1.47 pkgsrc/databases/myodbc/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/myodbc/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mysql75-cluster/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mysql75-cluster/options.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/mysql80-client/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/mysql80-client/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mysql80-cluster/Makefile.common \
pkgsrc/databases/mysql80-cluster/options.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/mysql80-server/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/databases/postgresql-timescaledb/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/prometheus-cpp/options.mk
cvs rdiff -u -r1.58 -r1.59 pkgsrc/databases/soci/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/soci/options.mk
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/allegro/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/allegro/options.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/allegro5/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/allegro5/options.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/binaryen/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/binaryen/options.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/blosc/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/blosc2/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/bullet/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/devel/ccache/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/cmake/build.mk
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/cmake-gui/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/cmocka/Makefile
cvs rdiff -u -r1.103 -r1.104 pkgsrc/devel/cppcheck/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/cpu_features/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/cxxopts/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/deepstate/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/deepstate-afl/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/deepstate-honggfuzz/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/deepstate-libfuzzer/Makefile
cvs rdiff -u -r1.189 -r1.190 pkgsrc/devel/doxygen/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/doxygen/options.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/extra-cmake-modules/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/fifechan/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/fifengine/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/flatbuffers/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/frozen/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/gflags/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/gnustep-objc/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/google-glog/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/google-glog/options.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/hyperscan/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/include-what-you-use/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/libcbor/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libdbusmenu-lxqt/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/libdbusmenu-qt/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libdbusmenu-qt/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libdivsufsort/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/libebml/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/libepoll-shim/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/libftdi1/Makefile
cvs rdiff -u -r1.82 -r1.83 pkgsrc/devel/libgit2/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libyang/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libyang2/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/lld/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/lld/options.mk
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/lldb/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/lldb/options.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/lua-luv/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/lua-sdl2/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/lxqt-build-tools/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/mimalloc/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/mold/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/nextpnr/nextpnr.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/polly/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/devel/protobuf/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/py-llvmlite/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/range-v3/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/rapidcheck/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/raylib/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/re2/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/rttr/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/snappy/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/spdlog/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/tl-expected/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/tlsh/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/ucommon/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ucommon/options.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/woboq_codebrowser/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/doc/HOWTO-dev-crosscompile
cvs rdiff -u -r1.372 -r1.373 pkgsrc/doc/pkgsrc.html
cvs rdiff -u -r1.370 -r1.371 pkgsrc/doc/pkgsrc.txt
cvs rdiff -u -r1.91 -r1.92 pkgsrc/doc/guide/files/build.xml
cvs rdiff -u -r1.20 -r1.21 pkgsrc/editors/PageEdit/Makefile
cvs rdiff -u -r1.174 -r1.175 pkgsrc/editors/Sigil/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/editors/feathernotes/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/editors/focuswriter/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/nvi2/options.mk
cvs rdiff -u -r1.30 -r1.31 pkgsrc/editors/qtcreator/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/editors/xournalpp/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/emulators/cannonball/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/emulators/dolphin-emu/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/dolphin-emu/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/duckstation-qt/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/flycast/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/flycast/options.mk
cvs rdiff -u -r1.71 -r1.72 pkgsrc/emulators/hatari/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/emulators/keystone/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/emulators/libretro-flycast/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/libretro-flycast/options.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/libretro-mgba/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/emulators/melonds/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/emulators/mgba/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/mgba/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/mgba/options.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/emulators/mgba-qt/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/mgba-qt/options.mk
cvs rdiff -u -r1.109 -r1.110 pkgsrc/emulators/snes9x-gtk/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/snes9x-gtk/options.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/emulators/visualboyadvance-m/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/emulators/yabause/options.mk
cvs rdiff -u -r1.353 -r1.354 pkgsrc/finance/gnucash/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/finance/gnucash/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/finance/ledger/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/finance/ledger32/options.mk
cvs rdiff -u -r1.49 -r1.50 pkgsrc/fonts/fntsample/Makefile
cvs rdiff -u -r1.147 -r1.148 pkgsrc/fonts/fontforge/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/woff2/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/amnesia-tdd/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/games/arx-libertatis/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/games/astromenace/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/black-hole-solver/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/games/corsix-th/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/games/devilutionx/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/games/dhewm3/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/games/eternal-lands/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/games/etlegacy/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/etlegacy/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/etlegacy/options.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/games/etlegacy-server/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/etlegacy-server/options.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/games/eureka/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/eureka/options.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/games/fallingtime/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/games/flare-engine/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/flare-game/Makefile
cvs rdiff -u -r1.174 -r1.175 pkgsrc/games/flightgear/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/freecell-solver/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/games/gemrb/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/games/lgogdownloader/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/lugaru/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/games/megaglest/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/games/minetest/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/games/nxengine-evo/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/openhexagon/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/openjk/Makefile
cvs rdiff -u -r1.87 -r1.88 pkgsrc/games/openmw/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/openmw/options.mk
cvs rdiff -u -r1.60 -r1.61 pkgsrc/games/openrct2/Makefile
cvs rdiff -u -r1.125 -r1.126 pkgsrc/games/openttd/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/games/oshu/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/games/prboom-plus/Makefile
cvs rdiff -u -r1.165 -r1.166 pkgsrc/games/simgear/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/solarus/options.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/srb2/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/games/supertux/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/games/supertuxkart/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/games/teeworlds/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/vcmi/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/vcmi/options.mk
cvs rdiff -u -r1.82 -r1.83 pkgsrc/games/warzone2100/Makefile
cvs rdiff -u -r1.216 -r1.217 pkgsrc/games/wesnoth/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/games/widelands/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/games/woof/Makefile
cvs rdiff -u -r1.176 -r1.177 pkgsrc/geography/gdal-lib/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/geography/libmaxminddb/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/geography/mapcode/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/geography/opencpn/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/geography/opencpn-plugin-debugger/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/geography/opencpn-plugin-draw/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/geography/opencpn-plugin-plots/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/geography/opencpn-plugin-statusbar/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/geography/opencpn-plugin-watchdog/Makefile
cvs rdiff -u -r1.35 -r1.36 \
pkgsrc/geography/opencpn-plugin-weather_routing/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/geography/osm2pgsql/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/geography/pdal-lib/Makefile
cvs rdiff -u -r1.219 -r1.220 pkgsrc/geography/qgis/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/OpenJPH/Makefile
cvs rdiff -u -r1.219 -r1.220 pkgsrc/graphics/blender/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/blender/options.mk
cvs rdiff -u -r1.44 -r1.45 pkgsrc/graphics/blender-lts/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/blender-lts/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/box2d/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/charls/Makefile
cvs rdiff -u -r1.157 -r1.158 pkgsrc/graphics/darktable/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/drawpile/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/graphics/exiv2/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/graphics/freeglut/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/freeglut/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/glad/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/glfw/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/glfw/options.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/gmic-qt-digikam/Makefile
cvs rdiff -u -r1.146 -r1.147 pkgsrc/graphics/hugin/Makefile
cvs rdiff -u -r1.288 -r1.289 pkgsrc/graphics/inkscape/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/graphics/jasper/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/jasper/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/kdiagram/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/kvantum/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/graphics/lensfun/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/leptonica/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/libhighway/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/libhighway/options.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/graphics/libjpeg-turbo/Makefile
cvs rdiff -u -r1.94 -r1.95 pkgsrc/graphics/luminance-hdr/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/mojoshader/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/mygui/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/nvidia-texture-tools/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/opencv/Makefile.common
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/opencv/options.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/opencv-contrib-face/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/graphics/openexr/Makefile
cvs rdiff -u -r1.109 -r1.110 pkgsrc/graphics/openimageio/Makefile
cvs rdiff -u -r1.179 -r1.180 pkgsrc/graphics/osg/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/osg/options.mk
cvs rdiff -u -r1.48 -r1.49 pkgsrc/graphics/oxygen-icons/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/graphics/pcl/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/pcl/options.mk
cvs rdiff -u -r1.107 -r1.108 pkgsrc/graphics/pfstools/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/pfstools/options.mk
cvs rdiff -u -r1.36 -r1.37 pkgsrc/graphics/rawtherapee/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/graphics/screengrab/Makefile
cvs rdiff -u -r1.80 -r1.81 pkgsrc/graphics/tesseract/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/graphics/vtk/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/vtk/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/zint/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/zint/options.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/zxing-cpp/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/ham/codec2/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/ham/gnuradio-core/options.mk
cvs rdiff -u -r1.56 -r1.57 pkgsrc/ham/gr-osmosdr/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/ham/hackrf/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/ham/soapy-sdr/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/inputmethod/fcitx/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/inputmethod/fcitx5/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/inputmethod/fcitx5-configtool/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/inputmethod/fcitx5-qt/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/inputmethod/ibus-qt/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/inputmethod/ibus-table-chinese/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/inputmethod/librime/options.mk
cvs rdiff -u -r1.62 -r1.63 pkgsrc/lang/clang/Makefile.common
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/compiler-rt/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/flang/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/lang/libLLVM/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/libLLVM/options.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/libcxx/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/libcxxabi/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/lang/libunwind/Makefile
cvs rdiff -u -r1.98 -r1.99 pkgsrc/lang/llvm/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/llvm/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/lua51/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/lua52/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/lua53/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/lua54/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/mlir/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/neko/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/oorexx/Makefile
cvs rdiff -u -r1.163 -r1.164 pkgsrc/lang/python/pyversion.mk
cvs rdiff -u -r1.66 -r1.67 pkgsrc/lang/squeak-vm/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/swi-prolog-jpl/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/lang/swi-prolog-lite/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/swi-prolog-lite/Makefile.common
cvs rdiff -u -r1.57 -r1.58 pkgsrc/lang/swi-prolog-packages/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/lang/wasi-compiler-rt/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/wasi-libcxx/Makefile
cvs rdiff -u -r1.276 -r1.277 pkgsrc/mail/evolution/Makefile
cvs rdiff -u -r1.229 -r1.230 pkgsrc/mail/evolution-data-server/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/qsmtp/Makefile
cvs rdiff -u -r1.110 -r1.111 pkgsrc/mail/rspamd/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/armadillo/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/math/arpack-ng/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/arpack-ng/options.mk
cvs rdiff -u -r1.40 -r1.41 pkgsrc/math/blas/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/blas64/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/cblas/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/cblas64/Makefile
cvs rdiff -u -r1.88 -r1.89 pkgsrc/math/cgal/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/double-conversion/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/dragonbox/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/math/eigen3/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/flann-lib/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/hercules4sdl-decnumber/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/hercules4sdl-softfloat/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/kissfft/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/math/lapack/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/math/lapack/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/lapack64/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/lapacke/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/lapacke64/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/libfixmath/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/nlopt/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/math/qhull/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/scalapack/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/sundials/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/math/superlu/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/math/teapot/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/meta-pkgs/kde4/kde4.mk
cvs rdiff -u -r1.40 -r1.41 pkgsrc/misc/attica/Makefile
cvs rdiff -u -r1.85 -r1.86 pkgsrc/misc/bibletime/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/indi/Makefile
cvs rdiff -u -r1.96 -r1.97 pkgsrc/misc/kdeartwork4/Makefile
cvs rdiff -u -r1.114 -r1.115 pkgsrc/misc/kdeplasma-addons4/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/misc/libcec/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/misc/raspberrypi-userland/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/raspberrypi-userland/options.mk
cvs rdiff -u -r1.162 -r1.163 pkgsrc/misc/stellarium/Makefile
cvs rdiff -u -r1.80 -r1.81 pkgsrc/misc/vym/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/xygrib-devel/Makefile
cvs rdiff -u -r1.2055 -r1.2056 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mk/configure/cmake.mk
cvs rdiff -u -r1.34 -r1.35 pkgsrc/mk/configure/configure.mk
cvs rdiff -u -r1.146 -r1.147 pkgsrc/multimedia/avidemux/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/avidemux/options.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/multimedia/ffmpegthumbnailer/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/frei0r/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/gerbera/options.mk
cvs rdiff -u -r1.34 -r1.35 pkgsrc/multimedia/libaom/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/multimedia/libmatroska/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/multimedia/lightspark/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/multimedia/obs-studio/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/multimedia/olive-editor/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/phonon/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/phonon/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/phonon-qt5/options.mk
cvs rdiff -u -r1.44 -r1.45 \
pkgsrc/multimedia/phonon-qt5-backend-gstreamer/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/multimedia/phonon-qt5-backend-vlc/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/multimedia/x265/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/x265/options.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/ccrtp/Makefile
cvs rdiff -u -r1.102 -r1.103 pkgsrc/net/ettercap/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/ettercap/Makefile.common
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/ettercap-gtk/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/freeDiameter/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/freeDiameter/options.mk
cvs rdiff -u -r1.48 -r1.49 pkgsrc/net/freerdp2/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/freerdp2/options.mk
cvs rdiff -u -r1.96 -r1.97 pkgsrc/net/grpc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/hercules4sdl-telnet/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/icinga2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/icinga2/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/lagrange/options.mk
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/libcares/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/net/libvncserver/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/libvncserver/options.mk
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/libzrtpcpp/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/libzrtpcpp/options.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/net/mosquitto/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/mosquitto/options.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/nextcloud-client/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/nng/options.mk
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/owncloudclient/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/net/qbittorrent/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/qbittorrent/options.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/rabbitmq-c/Makefile
cvs rdiff -u -r1.104 -r1.105 pkgsrc/net/remmina/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/remmina/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/softether/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/net/synergy/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/taskserver/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/net/tigervnc/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/net/transmission-gtk/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/net/transmission-qt/Makefile
cvs rdiff -u -r1.316 -r1.317 pkgsrc/net/wireshark/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/wireshark/options.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/news/neix/Makefile
cvs rdiff -u -r1.146 -r1.147 pkgsrc/news/pan/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/news/pan/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/parallel/opencl-clhpp/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/parallel/openmp/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/parallel/pocl/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/parallel/threadingbuildingblocks/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/pkgtools/pkglint4/files/makevars.map
cvs rdiff -u -r1.63 -r1.64 pkgsrc/print/dspdfviewer/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/libharu/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/print/podofo/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/podofo/options.mk
cvs rdiff -u -r1.103 -r1.104 pkgsrc/print/poppler/Makefile
cvs rdiff -u -r1.154 -r1.155 pkgsrc/print/poppler/Makefile.common
cvs rdiff -u -r1.43 -r1.44 pkgsrc/print/poppler-cpp/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/print/poppler-includes/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/print/poppler-qt5/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/print/poppler-qt6/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/print/poppler-utils/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/print/qpdf/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/print/scribus-qt5/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/print/xpdf4/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/xpdf4/options.mk
cvs rdiff -u -r1.38 -r1.39 pkgsrc/security/gpgmepp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/hercules4sdl-crypto/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/security/keepassxc/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/keepassxc/options.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/security/lastpass-cli/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/libdecaf/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/libfido2/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/libnitrokey/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/libnitrokey/options.mk
cvs rdiff -u -r1.49 -r1.50 pkgsrc/security/libssh/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/libssh/options.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/security/lxqt-sudo/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/security/mbedtls/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/mbedtls/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/mbedtls3/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/security/polkit-qt/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/polkit-qt6/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/security/qca2/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/qca2/Makefile.common
cvs rdiff -u -r1.32 -r1.33 pkgsrc/security/qca2-gnupg/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/security/qca2-ossl/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/security/qca2-qt5/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/qca2-qt5/Makefile.common
cvs rdiff -u -r1.32 -r1.33 pkgsrc/security/qca2-qt5-gnupg/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/security/qca2-qt5-ossl/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/qca2-qt6/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/security/zoneminder/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/shells/fish/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/WCMCommander/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/bareos/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/bareos/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/bareos-clientonly/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/sysutils/cdrkit/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/dfc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/fluent-bit/Makefile
cvs rdiff -u -r1.100 -r1.101 pkgsrc/sysutils/strigi/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/PEGTL/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/cJSON/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/textproc/fmtlib/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/textproc/json-c/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/json-schema/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/jsoncpp/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/textproc/libclucene/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/libcue/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/libkolabxml/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/libyaml/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/lua-rapidjson/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/textproc/lucene++/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/textproc/multimarkdown/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/nlohmann-json/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/nuspell/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/pugixml/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/rapidjson/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/uriparser/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/uriparser/options.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/utf8-cpp/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/yaml-cpp/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/time/taskwarrior/Makefile
cvs rdiff -u -r1.95 -r1.96 pkgsrc/wm/awesome/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/wm/awesome/options.mk
cvs rdiff -u -r1.43 -r1.44 pkgsrc/wm/ctwm/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/wm/obconf-qt/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/wm/pekwm/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/www/cppcms/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/h2o/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/libwebsockets/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/www/otter-browser/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/www/tidy/Makefile
cvs rdiff -u -r1.261 -r1.262 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/webkit-gtk/options.mk
cvs rdiff -u -r1.75 -r1.76 pkgsrc/x11/kactivities/Makefile
cvs rdiff -u -r1.163 -r1.164 pkgsrc/x11/kde-runtime4/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/kde-runtime4/options.mk
cvs rdiff -u -r1.118 -r1.119 pkgsrc/x11/kde-workspace4/Makefile
cvs rdiff -u -r1.144 -r1.145 pkgsrc/x11/kdelibs4/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/x11/libfm-qt/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/libkactivities4/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/x11/lxqt-config/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/x11/lxqt-panel/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/lxqt-panel/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/lxqt-session/options.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/maim/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/x11/qt4-tools/buildlink3.mk
cvs rdiff -u -r1.123 -r1.124 pkgsrc/x11/qt5-qtwebkit/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/x11/qterminal/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/read-edid/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/slim/options.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/slop/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/x11/tint2/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/x11/wxGTK32/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/xss-lock/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/arqiver/Makefile
diff -u pkgsrc/archivers/arqiver/Makefile:1.34 pkgsrc/archivers/arqiver/Makefile:1.35
--- pkgsrc/archivers/arqiver/Makefile:1.34 Wed May 29 16:31:16 2024
+++ pkgsrc/archivers/arqiver/Makefile Sun Aug 25 06:18:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2024/05/29 16:31:16 adam Exp $
+# $NetBSD: Makefile,v 1.35 2024/08/25 06:18:21 wiz Exp $
DISTNAME= Arqiver-0.12.0
PKGNAME= ${DISTNAME:tl}
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config bsdtar:run gzip:run 7za:run
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
SUBST_CLASSES+= prefix
SUBST_MESSAGE.prefix= Fixing paths.
Index: pkgsrc/archivers/arqiver/options.mk
diff -u pkgsrc/archivers/arqiver/options.mk:1.1 pkgsrc/archivers/arqiver/options.mk:1.2
--- pkgsrc/archivers/arqiver/options.mk:1.1 Wed Sep 6 11:21:59 2023
+++ pkgsrc/archivers/arqiver/options.mk Sun Aug 25 06:18:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/09/06 11:21:59 pin Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:21 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.arqiver
PKG_OPTIONS_OPTIONAL_GROUPS= gui
@@ -15,7 +15,7 @@ TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../
.endif
.if !empty(PKG_OPTIONS:Mqt6)
-CMAKE_ARGS+= -DENABLE_QT5=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5=OFF
TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
.include "../../x11/qt6-qtbase/buildlink3.mk"
.include "../../graphics/qt6-qtsvg/buildlink3.mk"
Index: pkgsrc/archivers/innoextract/Makefile
diff -u pkgsrc/archivers/innoextract/Makefile:1.29 pkgsrc/archivers/innoextract/Makefile:1.30
--- pkgsrc/archivers/innoextract/Makefile:1.29 Sun Apr 21 16:08:29 2024
+++ pkgsrc/archivers/innoextract/Makefile Sun Aug 25 06:18:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2024/04/21 16:08:29 adam Exp $
+# $NetBSD: Makefile,v 1.30 2024/08/25 06:18:21 wiz Exp $
DISTNAME= innoextract-1.9
PKGREVISION= 10
@@ -15,8 +15,8 @@ USE_LANGUAGES= c c++
.include "../../devel/cmake/build.mk"
-CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}
-CMAKE_ARGS+= -DSET_OPTIMIZATION_FLAGS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DSET_OPTIMIZATION_FLAGS=OFF
.include "../../archivers/xz/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
Index: pkgsrc/archivers/libzip/Makefile
diff -u pkgsrc/archivers/libzip/Makefile:1.71 pkgsrc/archivers/libzip/Makefile:1.72
--- pkgsrc/archivers/libzip/Makefile:1.71 Wed May 29 16:31:17 2024
+++ pkgsrc/archivers/libzip/Makefile Sun Aug 25 06:18:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2024/05/29 16:31:17 adam Exp $
+# $NetBSD: Makefile,v 1.72 2024/08/25 06:18:21 wiz Exp $
DISTNAME= libzip-1.10.1
PKGREVISION= 4
@@ -17,7 +17,7 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-nihtest-[
TEST_TARGET= test
# for tests
-CMAKE_ARGS+= -DNIHTEST=${PREFIX}/bin/nihtest-${PYVERSSUFFIX}
+CMAKE_CONFIGURE_ARGS+= -DNIHTEST=${PREFIX}/bin/nihtest-${PYVERSSUFFIX}
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
# for Darwin
MAKE_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
Index: pkgsrc/archivers/libzip/options.mk
diff -u pkgsrc/archivers/libzip/options.mk:1.1 pkgsrc/archivers/libzip/options.mk:1.2
--- pkgsrc/archivers/libzip/options.mk:1.1 Mon Mar 12 08:51:54 2018
+++ pkgsrc/archivers/libzip/options.mk Sun Aug 25 06:18:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2018/03/12 08:51:54 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:21 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libzip
PKG_OPTIONS_OPTIONAL_GROUPS= crypto
@@ -8,11 +8,11 @@ PKG_SUGGESTED_OPTIONS= openssl
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mgnutls)
-CMAKE_ARGS+= -DENABLE_OPENSSL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_OPENSSL=OFF
.include "../../security/gnutls/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mopenssl)
-CMAKE_ARGS+= -DENABLE_GNUTLS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GNUTLS=OFF
.include "../../security/openssl/buildlink3.mk"
.endif
Index: pkgsrc/archivers/lxqt-archiver/Makefile
diff -u pkgsrc/archivers/lxqt-archiver/Makefile:1.32 pkgsrc/archivers/lxqt-archiver/Makefile:1.33
--- pkgsrc/archivers/lxqt-archiver/Makefile:1.32 Tue Aug 20 06:08:03 2024
+++ pkgsrc/archivers/lxqt-archiver/Makefile Sun Aug 25 06:18:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2024/08/20 06:08:03 pin Exp $
+# $NetBSD: Makefile,v 1.33 2024/08/25 06:18:22 wiz Exp $
DISTNAME= lxqt-archiver-1.0.0
CATEGORIES= archivers
@@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config perl bsdtar:run gzip:run 7za:run gtar:run bzip2:run unzip:run zip:run xz:run
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
TOOL_DEPENDS+= lxqt-build-tools>=2.0.0:../../devel/lxqt-build-tools
TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
Index: pkgsrc/archivers/unshield/Makefile
diff -u pkgsrc/archivers/unshield/Makefile:1.14 pkgsrc/archivers/unshield/Makefile:1.15
--- pkgsrc/archivers/unshield/Makefile:1.14 Tue Oct 24 22:08:09 2023
+++ pkgsrc/archivers/unshield/Makefile Sun Aug 25 06:18:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2023/10/24 22:08:09 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2024/08/25 06:18:22 wiz Exp $
DISTNAME= unshield-1.5.1
PKGREVISION= 1
@@ -13,7 +13,7 @@ LICENSE= mit
USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_SHARED=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED=ON
LDFLAGS+= -liconv
Index: pkgsrc/archivers/zziplib/Makefile
diff -u pkgsrc/archivers/zziplib/Makefile:1.41 pkgsrc/archivers/zziplib/Makefile:1.42
--- pkgsrc/archivers/zziplib/Makefile:1.41 Sun Aug 11 07:18:22 2024
+++ pkgsrc/archivers/zziplib/Makefile Sun Aug 25 06:18:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2024/08/11 07:18:22 adam Exp $
+# $NetBSD: Makefile,v 1.42 2024/08/25 06:18:22 wiz Exp $
DISTNAME= zziplib-0.13.78
CATEGORIES= archivers
@@ -14,7 +14,7 @@ TOOL_DEPENDS+= zip-[0-9]*:../../archiver
USE_TOOLS+= bash:build
-CMAKE_ARGS+= -DZZIPTEST=NO
+CMAKE_CONFIGURE_ARGS+= -DZZIPTEST=NO
CHECK_PORTABILITY_SKIP+= old.configure
Index: pkgsrc/audio/aften/Makefile
diff -u pkgsrc/audio/aften/Makefile:1.1 pkgsrc/audio/aften/Makefile:1.2
--- pkgsrc/audio/aften/Makefile:1.1 Sat Sep 11 23:44:48 2021
+++ pkgsrc/audio/aften/Makefile Sun Aug 25 06:18:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/09/11 23:44:48 nia Exp $
+# $NetBSD: Makefile,v 1.2 2024/08/25 06:18:22 wiz Exp $
DISTNAME= aften-0.0.8
CATEGORIES= audio
@@ -15,8 +15,8 @@ USE_LANGUAGES= c c++
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DBINDINGS_CXX=ON
-CMAKE_ARGS+= -DSHARED=ON
+CMAKE_CONFIGURE_ARGS+= -DBINDINGS_CXX=ON
+CMAKE_CONFIGURE_ARGS+= -DSHARED=ON
pre-configure:
mkdir ${WRKSRC}/build
Index: pkgsrc/audio/alure/Makefile
diff -u pkgsrc/audio/alure/Makefile:1.15 pkgsrc/audio/alure/Makefile:1.16
--- pkgsrc/audio/alure/Makefile:1.15 Sat Apr 6 08:04:47 2024
+++ pkgsrc/audio/alure/Makefile Sun Aug 25 06:18:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2024/04/06 08:04:47 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2024/08/25 06:18:22 wiz Exp $
DISTNAME= alure-1.2
PKGREVISION= 11
@@ -13,7 +13,7 @@ LICENSE= mit
USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_EXAMPLES=OFF -DDUMB=OFF -DDYNLOAD=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_EXAMPLES=OFF -DDUMB=OFF -DDYNLOAD=OFF
PKGCONFIG_OVERRIDE+= alure-static.pc.in
PKGCONFIG_OVERRIDE+= alure.pc.in
Index: pkgsrc/audio/alure/options.mk
diff -u pkgsrc/audio/alure/options.mk:1.1 pkgsrc/audio/alure/options.mk:1.2
--- pkgsrc/audio/alure/options.mk:1.1 Fri Sep 21 13:24:34 2018
+++ pkgsrc/audio/alure/options.mk Sun Aug 25 06:18:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2018/09/21 13:24:34 maya Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:22 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.alure
PKG_SUPPORTED_OPTIONS= flac fluidsynth modplug mpg123 sndfile vorbis
@@ -6,43 +6,43 @@ PKG_SUPPORTED_OPTIONS= flac fluidsynth m
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mflac)
-CMAKE_ARGS+= -DFLAC=ON
+CMAKE_CONFIGURE_ARGS+= -DFLAC=ON
.include "../../audio/flac/buildlink3.mk"
.else
-CMAKE_ARGS+= -DFLAC=OFF
+CMAKE_CONFIGURE_ARGS+= -DFLAC=OFF
.endif
.if !empty(PKG_OPTIONS:Mfluidsynth)
-CMAKE_ARGS+= -DFLUIDSYNTH=ON
+CMAKE_CONFIGURE_ARGS+= -DFLUIDSYNTH=ON
.include "../../audio/fluidsynth/buildlink3.mk"
.else
-CMAKE_ARGS+= -DFLUIDSYNTH=OFF
+CMAKE_CONFIGURE_ARGS+= -DFLUIDSYNTH=OFF
.endif
.if !empty(PKG_OPTIONS:Mmodplug)
-CMAKE_ARGS+= -DMODPLUG=ON
+CMAKE_CONFIGURE_ARGS+= -DMODPLUG=ON
.include "../../audio/libmodplug/buildlink3.mk"
.else
-CMAKE_ARGS+= -DMODPLUG=OFF
+CMAKE_CONFIGURE_ARGS+= -DMODPLUG=OFF
.endif
.if !empty(PKG_OPTIONS:Msndfile)
-CMAKE_ARGS+= -DSNDFILE=ON
+CMAKE_CONFIGURE_ARGS+= -DSNDFILE=ON
.include "../../audio/libsndfile/buildlink3.mk"
.else
-CMAKE_ARGS+= -DSNDFILE=OFF
+CMAKE_CONFIGURE_ARGS+= -DSNDFILE=OFF
.endif
.if !empty(PKG_OPTIONS:Mvorbis)
-CMAKE_ARGS+= -DVORBIS=ON
+CMAKE_CONFIGURE_ARGS+= -DVORBIS=ON
.include "../../audio/libvorbis/buildlink3.mk"
.else
-CMAKE_ARGS+= -DVORBIS=OFF
+CMAKE_CONFIGURE_ARGS+= -DVORBIS=OFF
.endif
.if !empty(PKG_OPTIONS:Mmpg123)
-CMAKE_ARGS+= -DMPG123=ON
+CMAKE_CONFIGURE_ARGS+= -DMPG123=ON
.include "../../audio/mpg123/buildlink3.mk"
.else
-CMAKE_ARGS+= -DMPG123=OFF
+CMAKE_CONFIGURE_ARGS+= -DMPG123=OFF
.endif
Index: pkgsrc/audio/chromaprint/Makefile
diff -u pkgsrc/audio/chromaprint/Makefile:1.41 pkgsrc/audio/chromaprint/Makefile:1.42
--- pkgsrc/audio/chromaprint/Makefile:1.41 Mon Apr 15 17:24:18 2024
+++ pkgsrc/audio/chromaprint/Makefile Sun Aug 25 06:18:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2024/04/15 17:24:18 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2024/08/25 06:18:22 wiz Exp $
DISTNAME= chromaprint-1.5.1
PKGREVISION= 8
@@ -13,8 +13,8 @@ LICENSE= mit
USE_LANGUAGES= c c++
# build and install "fpcalc"
-CMAKE_ARGS+= -DBUILD_TOOLS=ON
-CMAKE_ARGS+= -DFFT_LIB=fftw3
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TOOLS=ON
+CMAKE_CONFIGURE_ARGS+= -DFFT_LIB=fftw3
USE_CXX_FEATURES+= c++11
@@ -27,8 +27,8 @@ SOEXT= so
.endif
.for lib in AVCODEC AVFORMAT AVUTIL SWRESAMPLE
-CMAKE_ARGS+= -DFFMPEG_LIB${lib}_INCLUDE_DIRS=${BUILDLINK_PREFIX.ffmpeg7}/include/ffmpeg7
-CMAKE_ARGS+= -DFFMPEG_LIB${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg7}/lib/ffmpeg7/lib${lib:tl}.${SOEXT}
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_LIB${lib}_INCLUDE_DIRS=${BUILDLINK_PREFIX.ffmpeg7}/include/ffmpeg7
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_LIB${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg7}/lib/ffmpeg7/lib${lib:tl}.${SOEXT}
.endfor
PKGCONFIG_OVERRIDE= libchromaprint.pc.cmake
Index: pkgsrc/audio/chromaprint/options.mk
diff -u pkgsrc/audio/chromaprint/options.mk:1.1 pkgsrc/audio/chromaprint/options.mk:1.2
--- pkgsrc/audio/chromaprint/options.mk:1.1 Sun Jul 30 08:11:49 2023
+++ pkgsrc/audio/chromaprint/options.mk Sun Aug 25 06:18:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/07/30 08:11:49 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:22 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.chromaprint
@@ -11,7 +11,7 @@ PKG_SUPPORTED_OPTIONS= tests
# googletest requires at least C++14. It bundles its own copy.
USE_CXX_FEATURES+= c++14
TEST_TARGET= check
-CMAKE_ARGS+= -DBUILD_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=ON
.else
-CMAKE_ARGS+= -DBUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=OFF
.endif
Index: pkgsrc/audio/csound6/Makefile
diff -u pkgsrc/audio/csound6/Makefile:1.87 pkgsrc/audio/csound6/Makefile:1.88
--- pkgsrc/audio/csound6/Makefile:1.87 Wed May 29 16:31:19 2024
+++ pkgsrc/audio/csound6/Makefile Sun Aug 25 06:18:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2024/05/29 16:31:19 adam Exp $
+# $NetBSD: Makefile,v 1.88 2024/08/25 06:18:22 wiz Exp $
DISTNAME= csound-${CSOUND_VERSION}
PKGNAME= csound6-${CSOUND_VERSION}
@@ -18,9 +18,9 @@ USE_TOOLS+= bison flex
CFLAGS+= -g -DBETA
CFLAGS+= -DCS_DEFAULT_PLUGINDIR=\"${PREFIX}/lib/csound/plugins64-6.0\"
USE_CMAKE= yes
-CMAKE_ARGS+= -DBUILD_RELEASE=1
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DBUILD_HDF5_OPCODES=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_RELEASE=1
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DBUILD_HDF5_OPCODES=OFF
# CMAKE_INSTALL_RPATH doesn't work for some reason, so do it here.
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/csound6
Index: pkgsrc/audio/csound6/options.mk
diff -u pkgsrc/audio/csound6/options.mk:1.3 pkgsrc/audio/csound6/options.mk:1.4
--- pkgsrc/audio/csound6/options.mk:1.3 Tue Oct 6 00:26:51 2020
+++ pkgsrc/audio/csound6/options.mk Sun Aug 25 06:18:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2020/10/06 00:26:51 mrg Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:22 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.csound6
PKG_SUPPORTED_OPTIONS= jack portaudio pulseaudio
@@ -17,37 +17,37 @@ PKG_SUGGESTED_OPTIONS+= portaudio
PLIST_VARS+= alsa
.if !empty(PKG_OPTIONS:Malsa)
.include "../../audio/alsa-lib/buildlink3.mk"
-CMAKE_ARGS+= -DUSE_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_ALSA=ON
PLIST.alsa= yes
.else
-CMAKE_ARGS+= -DUSE_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_ALSA=OFF
.endif
PLIST_VARS+= jack
.if !empty(PKG_OPTIONS:Mjack)
.include "../../audio/jack/buildlink3.mk"
-CMAKE_ARGS+= -DUSE_JACK=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_JACK=ON
PLIST.jack= yes
.else
-CMAKE_ARGS+= -DUSE_JACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_JACK=OFF
.endif
PLIST_VARS+= portaudio
.if !empty(PKG_OPTIONS:Mportaudio)
.include "../../audio/portaudio/buildlink3.mk"
-CMAKE_ARGS+= -DUSE_PORTAUDIO=ON
-CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH=${BUILDLINK_PREFIX.portaudio}/include/portaudio2
-CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH=${BUILDLINK_PREFIX.portaudio}/lib/portaudio2
+CMAKE_CONFIGURE_ARGS+= -DUSE_PORTAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INCLUDE_PATH=${BUILDLINK_PREFIX.portaudio}/include/portaudio2
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_LIBRARY_PATH=${BUILDLINK_PREFIX.portaudio}/lib/portaudio2
PLIST.portaudio= yes
.else
-CMAKE_ARGS+= -DUSE_PORTAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_PORTAUDIO=OFF
.endif
PLIST_VARS+= pulseaudio
.if !empty(PKG_OPTIONS:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
-CMAKE_ARGS+= -DUSE_PULSEAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_PULSEAUDIO=ON
PLIST.pulseaudio= yes
.else
-CMAKE_ARGS+= -DUSE_PULSEAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_PULSEAUDIO=OFF
.endif
Index: pkgsrc/audio/dumb/Makefile
diff -u pkgsrc/audio/dumb/Makefile:1.1 pkgsrc/audio/dumb/Makefile:1.2
--- pkgsrc/audio/dumb/Makefile:1.1 Tue Mar 17 21:41:50 2020
+++ pkgsrc/audio/dumb/Makefile Sun Aug 25 06:18:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/03/17 21:41:50 nia Exp $
+# $NetBSD: Makefile,v 1.2 2024/08/25 06:18:22 wiz Exp $
DISTNAME= dumb-2.0.3
CATEGORIES= audio
@@ -11,14 +11,14 @@ LICENSE= zlib
USE_CMAKE= yes
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DBUILD_ALLEGRO4=OFF
-CMAKE_ARGS+= -DBUILD_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_ALLEGRO4=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_EXAMPLES=OFF
.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "amd64"
-CMAKE_ARGS+= -DUSE_SSE=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_SSE=OFF
.endif
PKGCONFIG_OVERRIDE+= pkg-config.pc.in
Index: pkgsrc/audio/fasttracker2/Makefile
diff -u pkgsrc/audio/fasttracker2/Makefile:1.122 pkgsrc/audio/fasttracker2/Makefile:1.123
--- pkgsrc/audio/fasttracker2/Makefile:1.122 Sat Jun 29 00:54:05 2024
+++ pkgsrc/audio/fasttracker2/Makefile Sun Aug 25 06:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2024/06/29 00:54:05 fox Exp $
+# $NetBSD: Makefile,v 1.123 2024/08/25 06:18:23 wiz Exp $
DISTNAME= fasttracker2-1.84
CATEGORIES= audio
@@ -16,7 +16,7 @@ USE_LANGUAGES= c99 c++
USE_CMAKE= yes
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DEXTERNAL_LIBFLAC:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DEXTERNAL_LIBFLAC:BOOL=ON
LDFLAGS+= ${BUILDLINK_LDADD.iconv}
Index: pkgsrc/audio/faudio/Makefile
diff -u pkgsrc/audio/faudio/Makefile:1.28 pkgsrc/audio/faudio/Makefile:1.29
--- pkgsrc/audio/faudio/Makefile:1.28 Sat Apr 6 08:04:48 2024
+++ pkgsrc/audio/faudio/Makefile Sun Aug 25 06:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2024/04/06 08:04:48 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2024/08/25 06:18:23 wiz Exp $
DISTNAME= faudio-22.05
PKGREVISION= 9
@@ -16,7 +16,7 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DFFMPEG=ON
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG=ON
.include "../../devel/SDL2/buildlink3.mk"
.include "../../multimedia/ffmpeg4/buildlink3.mk"
Index: pkgsrc/audio/fluidsynth/Makefile
diff -u pkgsrc/audio/fluidsynth/Makefile:1.79 pkgsrc/audio/fluidsynth/Makefile:1.80
--- pkgsrc/audio/fluidsynth/Makefile:1.79 Tue Aug 6 12:36:51 2024
+++ pkgsrc/audio/fluidsynth/Makefile Sun Aug 25 06:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2024/08/06 12:36:51 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2024/08/25 06:18:23 wiz Exp $
DISTNAME= fluidsynth-2.3.6
CATEGORIES= audio
@@ -15,9 +15,9 @@ USE_TOOLS+= pkg-config gmake
CHECK_PORTABILITY_SKIP+= test-android/convert-tests.sh
-CMAKE_ARGS+= -DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}/man1
-CMAKE_ARGS+= -DLIB_SUFFIX=""
-CMAKE_ARGS+= -Denable-framework=OFF
+CMAKE_CONFIGURE_ARGS+= -DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}/man1
+CMAKE_CONFIGURE_ARGS+= -DLIB_SUFFIX=""
+CMAKE_CONFIGURE_ARGS+= -Denable-framework=OFF
PKGCONFIG_OVERRIDE= fluidsynth.pc.in
Index: pkgsrc/audio/fluidsynth/options.mk
diff -u pkgsrc/audio/fluidsynth/options.mk:1.6 pkgsrc/audio/fluidsynth/options.mk:1.7
--- pkgsrc/audio/fluidsynth/options.mk:1.6 Sun Jul 17 08:26:57 2022
+++ pkgsrc/audio/fluidsynth/options.mk Sun Aug 25 06:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2022/07/17 08:26:57 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2024/08/25 06:18:23 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.fluidsynth
@@ -23,50 +23,50 @@ PKG_SUGGESTED_OPTIONS+= ladspa
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CMAKE_ARGS+= -Denable-alsa=ON
+CMAKE_CONFIGURE_ARGS+= -Denable-alsa=ON
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -Denable-alsa=OFF
+CMAKE_CONFIGURE_ARGS+= -Denable-alsa=OFF
.endif
.if !empty(PKG_OPTIONS:Mdbus)
-CMAKE_ARGS+= -Denable-dbus=ON
+CMAKE_CONFIGURE_ARGS+= -Denable-dbus=ON
.include "../../sysutils/dbus/buildlink3.mk"
.else
-CMAKE_ARGS+= -Denable-dbus=OFF
+CMAKE_CONFIGURE_ARGS+= -Denable-dbus=OFF
.endif
.if !empty(PKG_OPTIONS:Mjack)
-CMAKE_ARGS+= -Denable-jack=ON
+CMAKE_CONFIGURE_ARGS+= -Denable-jack=ON
.include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -Denable-jack=OFF
+CMAKE_CONFIGURE_ARGS+= -Denable-jack=OFF
.endif
.if !empty(PKG_OPTIONS:Mportaudio)
-CMAKE_ARGS+= -Denable-portaudio=ON
+CMAKE_CONFIGURE_ARGS+= -Denable-portaudio=ON
.include "../../audio/portaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -Denable-portaudio=OFF
+CMAKE_CONFIGURE_ARGS+= -Denable-portaudio=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -Denable-pulseaudio=ON
+CMAKE_CONFIGURE_ARGS+= -Denable-pulseaudio=ON
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -Denable-pulseaudio=OFF
+CMAKE_CONFIGURE_ARGS+= -Denable-pulseaudio=OFF
.endif
.if !empty(PKG_OPTIONS:Msdl2)
-CMAKE_ARGS+= -Denable-sdl2=ON
+CMAKE_CONFIGURE_ARGS+= -Denable-sdl2=ON
.include "../../devel/SDL2/buildlink3.mk"
.else
-CMAKE_ARGS+= -Denable-sdl2=OFF
+CMAKE_CONFIGURE_ARGS+= -Denable-sdl2=OFF
.endif
.if !empty(PKG_OPTIONS:Mladspa)
-CMAKE_ARGS+= -Denable-ladspa=ON
+CMAKE_CONFIGURE_ARGS+= -Denable-ladspa=ON
.include "../../audio/ladspa/buildlink3.mk"
.else
-CMAKE_ARGS+= -Denable-ladspa=OFF
+CMAKE_CONFIGURE_ARGS+= -Denable-ladspa=OFF
.endif
Index: pkgsrc/audio/game-music-emu/Makefile
diff -u pkgsrc/audio/game-music-emu/Makefile:1.5 pkgsrc/audio/game-music-emu/Makefile:1.6
--- pkgsrc/audio/game-music-emu/Makefile:1.5 Sat Mar 28 17:48:44 2020
+++ pkgsrc/audio/game-music-emu/Makefile Sun Aug 25 06:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/03/28 17:48:44 nia Exp $
+# $NetBSD: Makefile,v 1.6 2024/08/25 06:18:23 wiz Exp $
DISTNAME= game-music-emu-0.6.3
CATEGORIES= audio
@@ -13,7 +13,7 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DENABLE_UBSAN=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_UBSAN=OFF
PKGCONFIG_OVERRIDE+= gme/libgme.pc.in
Index: pkgsrc/audio/hydrogen/Makefile
diff -u pkgsrc/audio/hydrogen/Makefile:1.97 pkgsrc/audio/hydrogen/Makefile:1.98
--- pkgsrc/audio/hydrogen/Makefile:1.97 Wed May 29 16:31:21 2024
+++ pkgsrc/audio/hydrogen/Makefile Sun Aug 25 06:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2024/05/29 16:31:21 adam Exp $
+# $NetBSD: Makefile,v 1.98 2024/08/25 06:18:23 wiz Exp $
DISTNAME= hydrogen-1.0.2
PKGREVISION= 26
@@ -18,16 +18,16 @@ USE_LANGUAGES= c c++
USE_CMAKE= yes
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DWANT_LRDF=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_LRDF=ON
.include "../../mk/oss.buildlink3.mk"
.if ${OSS_TYPE} != "none"
-CMAKE_ARGS+= -DWANT_OSS=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_OSS=ON
.else
-CMAKE_ARGS+= -DWANT_OSS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_OSS=OFF
.endif
-CMAKE_ARGS+= -DWANT_CPPUNIT=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_CPPUNIT=OFF
LDFLAGS.SunOS+= -lsocket -lnsl
Index: pkgsrc/audio/hydrogen/options.mk
diff -u pkgsrc/audio/hydrogen/options.mk:1.3 pkgsrc/audio/hydrogen/options.mk:1.4
--- pkgsrc/audio/hydrogen/options.mk:1.3 Sat Nov 13 10:48:03 2021
+++ pkgsrc/audio/hydrogen/options.mk Sun Aug 25 06:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2021/11/13 10:48:03 nia Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:23 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.hydrogen
@@ -15,31 +15,31 @@ PKG_SUGGESTED_OPTIONS+= jack
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CMAKE_ARGS+= -DWANT_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_ALSA=ON
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_ALSA=OFF
.endif
.if !empty(PKG_OPTIONS:Mjack)
-CMAKE_ARGS+= -DWANT_JACK=ON
-CMAKE_ARGS+= -DWANT_JACKSESSION=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_JACK=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_JACKSESSION=ON
.include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_JACK=OFF
-CMAKE_ARGS+= -DWANT_JACKSESSION=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_JACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_JACKSESSION=OFF
.endif
.if !empty(PKG_OPTIONS:Mportaudio)
-CMAKE_ARGS+= -DWANT_PORTAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_PORTAUDIO=ON
.include "../../audio/portaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_PORTAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_PORTAUDIO=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -DWANT_PULSEAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_PULSEAUDIO=ON
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_PULSEAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_PULSEAUDIO=OFF
.endif
Index: pkgsrc/audio/jack-keyboard/Makefile
diff -u pkgsrc/audio/jack-keyboard/Makefile:1.12 pkgsrc/audio/jack-keyboard/Makefile:1.13
--- pkgsrc/audio/jack-keyboard/Makefile:1.12 Sun Apr 7 07:33:32 2024
+++ pkgsrc/audio/jack-keyboard/Makefile Sun Aug 25 06:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2024/04/07 07:33:32 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2024/08/25 06:18:23 wiz Exp $
DISTNAME= jack-keyboard-2.7.2
PKGREVISION= 10
@@ -13,7 +13,7 @@ LICENSE= 2-clause-bsd
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DLashEnable=OFF
+CMAKE_CONFIGURE_ARGS+= -DLashEnable=OFF
.include "../../devel/cmake/build.mk"
.include "../../audio/jack/buildlink3.mk"
Index: pkgsrc/audio/kid3/Makefile
diff -u pkgsrc/audio/kid3/Makefile:1.145 pkgsrc/audio/kid3/Makefile:1.146
--- pkgsrc/audio/kid3/Makefile:1.145 Wed May 29 16:31:22 2024
+++ pkgsrc/audio/kid3/Makefile Sun Aug 25 06:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.145 2024/05/29 16:31:22 adam Exp $
+# $NetBSD: Makefile,v 1.146 2024/08/25 06:18:23 wiz Exp $
DISTNAME= kid3-3.9.5
PKGREVISION= 2
@@ -18,10 +18,10 @@ TOOL_DEPENDS+= docbook-xsl-[0-9]*:../..
USE_LANGUAGES= c c++
USE_CXX_FEATURES+= filesystem
USE_TOOLS+= perl:build pkg-config
-CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE:PATH=${QTDIR}/bin/qmake
-CMAKE_ARGS+= -DWITH_DOCBOOKDIR:PATH=${PREFIX}/share/xsl/docbook
-CMAKE_ARGS+= -DWITH_APPS:STRING="Qt;CLI"
-CMAKE_ARGS+= -DWITH_MANDIR:STRING=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DQT_QMAKE_EXECUTABLE:PATH=${QTDIR}/bin/qmake
+CMAKE_CONFIGURE_ARGS+= -DWITH_DOCBOOKDIR:PATH=${PREFIX}/share/xsl/docbook
+CMAKE_CONFIGURE_ARGS+= -DWITH_APPS:STRING="Qt;CLI"
+CMAKE_CONFIGURE_ARGS+= -DWITH_MANDIR:STRING=${PKGMANDIR}
# program-specific rpath is ignored since pkgsrc passes
# -DCMAKE_SKIP_RPATH:BOOL=TRUE, so re-add it manually
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/kid3
Index: pkgsrc/audio/kid3/options.mk
diff -u pkgsrc/audio/kid3/options.mk:1.2 pkgsrc/audio/kid3/options.mk:1.3
--- pkgsrc/audio/kid3/options.mk:1.2 Tue Feb 21 09:53:50 2023
+++ pkgsrc/audio/kid3/options.mk Sun Aug 25 06:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/02/21 09:53:50 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:23 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.kid3
PKG_OPTIONS_REQUIRED_GROUPS= gui
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS= qt6
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mqt5)
-CMAKE_ARGS+= -DQt5Core_DIR:PATH=${QTDIR}
+CMAKE_CONFIGURE_ARGS+= -DQt5Core_DIR:PATH=${QTDIR}
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
.include "../../x11/qt5-qttools/buildlink3.mk"
Index: pkgsrc/audio/libgroove/Makefile
diff -u pkgsrc/audio/libgroove/Makefile:1.40 pkgsrc/audio/libgroove/Makefile:1.41
--- pkgsrc/audio/libgroove/Makefile:1.40 Sat Apr 6 08:04:49 2024
+++ pkgsrc/audio/libgroove/Makefile Sun Aug 25 06:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2024/04/06 08:04:49 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2024/08/25 06:18:23 wiz Exp $
DISTNAME= libgroove-4.3.0
PKGREVISION= 21
@@ -23,8 +23,8 @@ SOEXT= so
.endif
.for lib in AVCODEC AVFILTER AVFORMAT AVUTIL
-CMAKE_ARGS+= -D${lib}_INCLUDE_DIRS=${BUILDLINK_PREFIX.ffmpeg4}/include/ffmpeg4
-CMAKE_ARGS+= -D${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg4}/lib/ffmpeg4/lib${lib:tl}.${SOEXT}
+CMAKE_CONFIGURE_ARGS+= -D${lib}_INCLUDE_DIRS=${BUILDLINK_PREFIX.ffmpeg4}/include/ffmpeg4
+CMAKE_CONFIGURE_ARGS+= -D${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg4}/lib/ffmpeg4/lib${lib:tl}.${SOEXT}
.endfor
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
Index: pkgsrc/audio/libkeyfinder/Makefile
diff -u pkgsrc/audio/libkeyfinder/Makefile:1.1 pkgsrc/audio/libkeyfinder/Makefile:1.2
--- pkgsrc/audio/libkeyfinder/Makefile:1.1 Sat Nov 20 18:09:45 2021
+++ pkgsrc/audio/libkeyfinder/Makefile Sun Aug 25 06:18:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/11/20 18:09:45 nia Exp $
+# $NetBSD: Makefile,v 1.2 2024/08/25 06:18:24 wiz Exp $
DISTNAME= libkeyfinder-2.2.5
CATEGORIES= audio
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v3
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
PKGCONFIG_OVERRIDE+= libkeyfinder.pc.in
Index: pkgsrc/audio/libmysofa/Makefile
diff -u pkgsrc/audio/libmysofa/Makefile:1.9 pkgsrc/audio/libmysofa/Makefile:1.10
--- pkgsrc/audio/libmysofa/Makefile:1.9 Sun Oct 15 19:33:54 2023
+++ pkgsrc/audio/libmysofa/Makefile Sun Aug 25 06:18:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/10/15 19:33:54 adam Exp $
+# $NetBSD: Makefile,v 1.10 2024/08/25 06:18:24 wiz Exp $
DISTNAME= libmysofa-1.3.2
CATEGORIES= audio
@@ -15,7 +15,7 @@ TEST_DEPENDS+= nodejs-[0-9]*:../../lang/
USE_LANGUAGES+= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
PKGCONFIG_OVERRIDE+= libmysofa.pc.cmake
Index: pkgsrc/audio/libsoxr/Makefile
diff -u pkgsrc/audio/libsoxr/Makefile:1.3 pkgsrc/audio/libsoxr/Makefile:1.4
--- pkgsrc/audio/libsoxr/Makefile:1.3 Mon Jul 25 11:12:19 2022
+++ pkgsrc/audio/libsoxr/Makefile Sun Aug 25 06:18:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/07/25 11:12:19 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2024/08/25 06:18:24 wiz Exp $
DISTNAME= soxr-0.1.3-Source
PKGNAME= lib${DISTNAME:S/-Source//}
@@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v2.1
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_TESTS=NO
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=NO
PKGCONFIG_OVERRIDE+= src/soxr.pc.in
PKGCONFIG_OVERRIDE+= src/soxr-lsr.pc.in
Index: pkgsrc/audio/libwildmidi/Makefile
diff -u pkgsrc/audio/libwildmidi/Makefile:1.14 pkgsrc/audio/libwildmidi/Makefile:1.15
--- pkgsrc/audio/libwildmidi/Makefile:1.14 Thu Apr 18 08:46:36 2024
+++ pkgsrc/audio/libwildmidi/Makefile Sun Aug 25 06:18:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2024/04/18 08:46:36 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2024/08/25 06:18:24 wiz Exp $
DISTNAME= wildmidi-0.4.6
PKGNAME= lib${DISTNAME}
@@ -18,18 +18,18 @@ USE_LANGUAGES= c99
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"
-CMAKE_ARGS+= -DWANT_OPENAL=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_OPENAL=ON
.else
-CMAKE_ARGS+= -DWANT_OPENAL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_OPENAL=OFF
.endif
.if ${OPSYS} == "Linux"
-CMAKE_ARGS+= -DWANT_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_ALSA=ON
. include "../../audio/alsa-lib/buildlink3.mk"
.else
. include "../../mk/oss.buildlink3.mk"
. if ${OSS_TYPE} != "none"
-CMAKE_ARGS+= -DWANT_OSS=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_OSS=ON
. endif
.endif
Index: pkgsrc/audio/lmms/Makefile
diff -u pkgsrc/audio/lmms/Makefile:1.95 pkgsrc/audio/lmms/Makefile:1.96
--- pkgsrc/audio/lmms/Makefile:1.95 Wed May 29 16:31:22 2024
+++ pkgsrc/audio/lmms/Makefile Sun Aug 25 06:18:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2024/05/29 16:31:22 adam Exp $
+# $NetBSD: Makefile,v 1.96 2024/08/25 06:18:24 wiz Exp $
DISTNAME= lmms_1.2.2
PKGNAME= ${DISTNAME:S/_/-/1}
@@ -27,14 +27,14 @@ USE_LANGUAGES= c c++
LDFLAGS+= ${LIBOSSAUDIO}
.endif
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DWANT_QT5=ON
-CMAKE_ARGS+= -DWANT_GIG=OFF # requires libgig
-CMAKE_ARGS+= -DWANT_STK=OFF # requires libstk
-CMAKE_ARGS+= -DWANT_CARLA=OFF # requires carla
-CMAKE_ARGS+= -DWANT_SOUNDIO=OFF # requires libsoundio
-CMAKE_ARGS+= -DWANT_SNDIO=OFF # requires sndio
-CMAKE_ARGS+= -DWANT_VST_NOWINE=ON
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DWANT_QT5=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_GIG=OFF # requires libgig
+CMAKE_CONFIGURE_ARGS+= -DWANT_STK=OFF # requires libstk
+CMAKE_CONFIGURE_ARGS+= -DWANT_CARLA=OFF # requires carla
+CMAKE_CONFIGURE_ARGS+= -DWANT_SOUNDIO=OFF # requires libsoundio
+CMAKE_CONFIGURE_ARGS+= -DWANT_SNDIO=OFF # requires sndio
+CMAKE_CONFIGURE_ARGS+= -DWANT_VST_NOWINE=ON
# for libzynaddsubfx.so in plugins/zynaddsubfx/.
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/lmms
Index: pkgsrc/audio/lmms/options.mk
diff -u pkgsrc/audio/lmms/options.mk:1.6 pkgsrc/audio/lmms/options.mk:1.7
--- pkgsrc/audio/lmms/options.mk:1.6 Sat Nov 13 10:48:03 2021
+++ pkgsrc/audio/lmms/options.mk Sun Aug 25 06:18:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2021/11/13 10:48:03 nia Exp $
+# $NetBSD: options.mk,v 1.7 2024/08/25 06:18:24 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.lmms
@@ -20,35 +20,35 @@ PKG_SUGGESTED_OPTIONS+= portaudio
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CMAKE_ARGS+= -DWANT_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_ALSA=ON
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_ALSA=OFF
.endif
.if !empty(PKG_OPTIONS:Mjack)
-CMAKE_ARGS+= -DWANT_JACK=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_JACK=ON
.include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_JACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_JACK=OFF
.endif
.if !empty(PKG_OPTIONS:Mportaudio)
-CMAKE_ARGS+= -DWANT_PORTAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_PORTAUDIO=ON
.include "../../audio/portaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_PORTAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_PORTAUDIO=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -DWANT_PULSEAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_PULSEAUDIO=ON
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_PULSEAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_PULSEAUDIO=OFF
.endif
.if !empty(PKG_OPTIONS:Msdl)
-CMAKE_ARGS+= -DWANT_SDL=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_SDL=ON
# libSDL defines some symbols that are also defined in libX11, which has
# been fixed in SDL 1.2.11.
BUILDLINK_ABI_DEPENDS.SDL+= SDL>=1.2.11
@@ -56,5 +56,5 @@ BUILDLINK_ABI_DEPENDS.SDL+= SDL>=1.2.11
.include "../../audio/SDL_sound/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_SDL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_SDL=OFF
.endif
Index: pkgsrc/audio/milkytracker/Makefile
diff -u pkgsrc/audio/milkytracker/Makefile:1.26 pkgsrc/audio/milkytracker/Makefile:1.27
--- pkgsrc/audio/milkytracker/Makefile:1.26 Sat Apr 6 08:04:50 2024
+++ pkgsrc/audio/milkytracker/Makefile Sun Aug 25 06:18:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2024/04/06 08:04:50 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2024/08/25 06:18:24 wiz Exp $
DISTNAME= milkytracker-1.04.00
PKGREVISION= 2
@@ -20,7 +20,7 @@ USE_LANGUAGES= c c++11
# As in docs/CMakeLists.txt, on "BSD", "share/doc/milkytracker" is always used
# Otherwise, "share/doc/MilkyTracker" is used.
# This is silly.
-CMAKE_ARGS+= -DCMAKE_INSTALL_DOCDIR="share/doc/milkytracker"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_DOCDIR="share/doc/milkytracker"
INSTALLATION_DIRS+= share/appdata
INSTALLATION_DIRS+= share/applications
Index: pkgsrc/audio/mixxx/Makefile
diff -u pkgsrc/audio/mixxx/Makefile:1.60 pkgsrc/audio/mixxx/Makefile:1.61
--- pkgsrc/audio/mixxx/Makefile:1.60 Wed May 29 16:31:23 2024
+++ pkgsrc/audio/mixxx/Makefile Sun Aug 25 06:18:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2024/05/29 16:31:23 adam Exp $
+# $NetBSD: Makefile,v 1.61 2024/08/25 06:18:24 wiz Exp $
DISTNAME= mixxx-2.3.1
PKGREVISION= 31
@@ -16,8 +16,8 @@ USE_TOOLS+= pkg-config
USE_CMAKE= yes
-CMAKE_ARGS+= -DUSE_SYMLINKS=OFF
-CMAKE_ARGS+= -DPORTMIDI=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYMLINKS=OFF
+CMAKE_CONFIGURE_ARGS+= -DPORTMIDI=OFF
USE_CXX_FEATURES+= c++11
Index: pkgsrc/audio/musescore/Makefile
diff -u pkgsrc/audio/musescore/Makefile:1.47 pkgsrc/audio/musescore/Makefile:1.48
--- pkgsrc/audio/musescore/Makefile:1.47 Wed May 29 16:31:23 2024
+++ pkgsrc/audio/musescore/Makefile Sun Aug 25 06:18:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2024/05/29 16:31:23 adam Exp $
+# $NetBSD: Makefile,v 1.48 2024/08/25 06:18:24 wiz Exp $
DISTNAME= musescore-3.6.2
PKGREVISION= 24
@@ -19,15 +19,15 @@ USE_LANGUAGES= c c++11
CONFIGURE_DIRS= bindir
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DMUSESCORE_BUILD_CONFIG=release
-CMAKE_ARGS+= -DUSE_SYSTEM_FREETYPE=ON
-CMAKE_ARGS+= -DDOWNLOAD_SOUNDFONT=OFF
-CMAKE_ARGS+= -DBUILD_PCH=OFF
-CMAKE_ARGS+= -DBUILD_PORTMIDI=OFF
-CMAKE_ARGS+= -DBUILD_TELEMETRY_MODULE=OFF
-CMAKE_ARGS+= -DBUILD_WEBENGINE=OFF
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DMUSESCORE_BUILD_CONFIG=release
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_FREETYPE=ON
+CMAKE_CONFIGURE_ARGS+= -DDOWNLOAD_SOUNDFONT=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PCH=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PORTMIDI=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TELEMETRY_MODULE=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WEBENGINE=OFF
pre-configure:
${MKDIR} ${WRKSRC}/bindir
Index: pkgsrc/audio/musescore/options.mk
diff -u pkgsrc/audio/musescore/options.mk:1.3 pkgsrc/audio/musescore/options.mk:1.4
--- pkgsrc/audio/musescore/options.mk:1.3 Sat Nov 13 10:48:03 2021
+++ pkgsrc/audio/musescore/options.mk Sun Aug 25 06:18:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2021/11/13 10:48:03 nia Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:24 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.musescore
PKG_SUPPORTED_OPTIONS= alsa jack portaudio pulseaudio
@@ -20,29 +20,29 @@ PKG_SUGGESTED_OPTIONS+= jack
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CMAKE_ARGS+= -DBUILD_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_ALSA=ON
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DBUILD_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_ALSA=OFF
.endif
.if !empty(PKG_OPTIONS:Mjack)
-CMAKE_ARGS+= -DBUILD_JACK=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_JACK=ON
.include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DBUILD_JACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_JACK=OFF
.endif
.if !empty(PKG_OPTIONS:Mportaudio)
-CMAKE_ARGS+= -DBUILD_PORTAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PORTAUDIO=ON
.include "../../audio/portaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DBUILD_PORTAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PORTAUDIO=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -DBUILD_PULSEAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PULSEAUDIO=ON
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DBUILD_PULSEAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PULSEAUDIO=OFF
.endif
Index: pkgsrc/audio/openal-soft/Makefile
diff -u pkgsrc/audio/openal-soft/Makefile:1.39 pkgsrc/audio/openal-soft/Makefile:1.40
--- pkgsrc/audio/openal-soft/Makefile:1.39 Tue Jan 30 14:21:33 2024
+++ pkgsrc/audio/openal-soft/Makefile Sun Aug 25 06:18:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2024/01/30 14:21:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2024/08/25 06:18:25 wiz Exp $
DISTNAME= openal-soft-1.23.1
PKGREVISION= 3
@@ -19,10 +19,10 @@ USE_CXX_FEATURES+= c++20
PKGCONFIG_OVERRIDE+= openal.pc.in
PKG_SYSCONFSUBDIR= openal
-CMAKE_ARGS+= -DALSOFT_EXAMPLES=OFF
-CMAKE_ARGS+= -DALSOFT_UTILS=ON
-CMAKE_ARGS+= -DALSOFT_NO_CONFIG_UTIL=ON
-CMAKE_ARGS+= -DALSOFT_RTKIT=OFF
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_UTILS=ON
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_NO_CONFIG_UTIL=ON
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_RTKIT=OFF
CFLAGS+= -DSYS_CONF_DIR="\"${PKG_SYSCONFDIR}\""
CFLAGS.NetBSD+= -D_NETBSD_SOURCE
@@ -36,15 +36,15 @@ CONF_FILES+= ${PREFIX}/share/openal/also
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD"
-CMAKE_ARGS+= -DALSOFT_BACKEND_SOLARIS=ON
-CMAKE_ARGS+= -DALSOFT_REQUIRE_SOLARIS=ON
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_SOLARIS=ON
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_REQUIRE_SOLARIS=ON
.endif
.include "../../mk/oss.buildlink3.mk"
.if ${OSS_TYPE} != "none"
-CMAKE_ARGS+= -DALSOFT_BACKEND_OSS=ON
-CMAKE_ARGS+= -DALSOFT_REQUIRE_OSS=ON
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_OSS=ON
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_REQUIRE_OSS=ON
SUBST_CLASSES+= oss
SUBST_STAGE.oss= pre-configure
SUBST_MESSAGE.oss= Fixing default OSS device references.
Index: pkgsrc/audio/openal-soft/options.mk
diff -u pkgsrc/audio/openal-soft/options.mk:1.2 pkgsrc/audio/openal-soft/options.mk:1.3
--- pkgsrc/audio/openal-soft/options.mk:1.2 Sat Jul 22 04:22:15 2023
+++ pkgsrc/audio/openal-soft/options.mk Sun Aug 25 06:18:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/07/22 04:22:15 pho Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:25 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openal-soft
PKG_SUPPORTED_OPTIONS= jack pulseaudio
@@ -16,22 +16,22 @@ PKG_SUPPORTED_OPTIONS+= alsa
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CMAKE_ARGS+= -DALSOFT_BACKEND_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_ALSA=ON
. include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DALSOFT_BACKEND_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_ALSA=OFF
.endif
.if !empty(PKG_OPTIONS:Mjack)
-CMAKE_ARGS+= -DALSOFT_BACKEND_JACK=ON
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_JACK=ON
. include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DALSOFT_BACKEND_JACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_JACK=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -DALSOFT_BACKEND_PULSEAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_PULSEAUDIO=ON
. include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DALSOFT_BACKEND_PULSEAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_PULSEAUDIO=OFF
.endif
Index: pkgsrc/audio/qmmp/Makefile
diff -u pkgsrc/audio/qmmp/Makefile:1.58 pkgsrc/audio/qmmp/Makefile:1.59
--- pkgsrc/audio/qmmp/Makefile:1.58 Wed May 29 16:31:24 2024
+++ pkgsrc/audio/qmmp/Makefile Sun Aug 25 06:18:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2024/05/29 16:31:24 adam Exp $
+# $NetBSD: Makefile,v 1.59 2024/08/25 06:18:25 wiz Exp $
DISTNAME= qmmp-1.6.5
PKGREVISION= 9
@@ -18,12 +18,12 @@ USE_LANGUAGES= c c++
TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
# using mpg123 instead, it's better maintained
-CMAKE_ARGS+= -DUSE_MAD=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_MAD=OFF
# ??? seems to break playing some files
-CMAKE_ARGS+= -DUSE_MPLAYER=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_MPLAYER=OFF
-CMAKE_ARGS+= -DUSE_PIPEWIRE=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_PIPEWIRE=OFF
.include "../../mk/oss.buildlink3.mk"
@@ -31,12 +31,12 @@ CMAKE_ARGS+= -DUSE_PIPEWIRE=OFF
PLIST_VARS+= oss oss4
. if ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS"
PLIST.oss4= yes
-CMAKE_ARGS+= -DUSE_OSS=OFF
-CMAKE_ARGS+= -DUSE_OSS4=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_OSS=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_OSS4=ON
. else
PLIST.oss= yes
-CMAKE_ARGS+= -DUSE_OSS=ON
-CMAKE_ARGS+= -DUSE_OSS4=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_OSS=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_OSS4=OFF
LDFLAGS+= ${LIBOSSAUDIO}
. endif
SUBST_CLASSES+= oss
Index: pkgsrc/audio/qmmp/options.mk
diff -u pkgsrc/audio/qmmp/options.mk:1.3 pkgsrc/audio/qmmp/options.mk:1.4
--- pkgsrc/audio/qmmp/options.mk:1.3 Sun Oct 29 13:28:08 2023
+++ pkgsrc/audio/qmmp/options.mk Sun Aug 25 06:18:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2023/10/29 13:28:08 rhialto Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:25 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qmmp
PKG_SUPPORTED_OPTIONS+= alsa jack pulseaudio
@@ -13,7 +13,7 @@ PLIST_VARS+= alsa
PLIST.alsa= yes
. include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DUSE_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_ALSA=OFF
.endif
PLIST_VARS+= pulse
@@ -21,7 +21,7 @@ PLIST_VARS+= pulse
PLIST.pulse= yes
. include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DUSE_PULSE=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_PULSE=OFF
.endif
PLIST_VARS+= jack
@@ -29,7 +29,7 @@ PLIST_VARS+= jack
PLIST.jack= yes
. include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DUSE_JACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_JACK=OFF
.endif
PLIST_VARS+= ffmpeg
@@ -37,7 +37,7 @@ PLIST_VARS+= ffmpeg
PLIST.ffmpeg= yes
. include "../../multimedia/ffmpeg4/buildlink3.mk"
.else
-CMAKE_ARGS+= -DUSE_FFMPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_FFMPEG=OFF
.endif
PLIST_VARS+= mpc
@@ -45,7 +45,7 @@ PLIST_VARS+= mpc
PLIST.mpc= yes
. include "../../audio/musepack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DUSE_MPC=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_MPC=OFF
.endif
PLIST_VARS+= wv
@@ -53,7 +53,7 @@ PLIST_VARS+= wv
PLIST.wv= yes
. include "../../audio/wavpack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DUSE_WAVPACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_WAVPACK=OFF
.endif
PLIST_VARS+= sid
@@ -61,5 +61,5 @@ PLIST_VARS+= sid
PLIST.sid= yes
. include "../../audio/libsidplayfp/buildlink3.mk"
.else
-CMAKE_ARGS+= -DUSE_SID=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_SID=OFF
.endif
Index: pkgsrc/audio/snapcast/options.mk
diff -u pkgsrc/audio/snapcast/options.mk:1.1 pkgsrc/audio/snapcast/options.mk:1.2
--- pkgsrc/audio/snapcast/options.mk:1.1 Sun Jul 3 16:09:15 2022
+++ pkgsrc/audio/snapcast/options.mk Sun Aug 25 06:18:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2022/07/03 16:09:15 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:25 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.snapcast
PKG_SUPPORTED_OPTIONS= alsa avahi pulseaudio
@@ -7,22 +7,22 @@ PKG_SUGGESTED_OPTIONS.Linux+= alsa
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CMAKE_ARGS+= -DBUILD_WITH_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_ALSA=ON
. include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DBUILD_WITH_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_ALSA=OFF
.endif
.if !empty(PKG_OPTIONS:Mavahi)
-CMAKE_ARGS+= -DBUILD_WITH_AVAHI=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_AVAHI=ON
. include "../../net/avahi/buildlink3.mk"
.else
-CMAKE_ARGS+= -DBUILD_WITH_AVAHI=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_AVAHI=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -DBUILD_WITH_PULSE=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_PULSE=ON
. include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DBUILD_WITH_PULSE=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_PULSE=OFF
.endif
Index: pkgsrc/audio/spotify-qt/Makefile
diff -u pkgsrc/audio/spotify-qt/Makefile:1.28 pkgsrc/audio/spotify-qt/Makefile:1.29
--- pkgsrc/audio/spotify-qt/Makefile:1.28 Wed May 29 16:31:25 2024
+++ pkgsrc/audio/spotify-qt/Makefile Sun Aug 25 06:18:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2024/05/29 16:31:25 adam Exp $
+# $NetBSD: Makefile,v 1.29 2024/08/25 06:18:25 wiz Exp $
DISTNAME= spotify-qt-3.11
PKGREVISION= 2
@@ -13,8 +13,8 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
DEPENDS+= librespot-[0-9]*:../../audio/librespot
Index: pkgsrc/audio/strawberry/Makefile
diff -u pkgsrc/audio/strawberry/Makefile:1.67 pkgsrc/audio/strawberry/Makefile:1.68
--- pkgsrc/audio/strawberry/Makefile:1.67 Wed May 29 16:31:25 2024
+++ pkgsrc/audio/strawberry/Makefile Sun Aug 25 06:18:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2024/05/29 16:31:25 adam Exp $
+# $NetBSD: Makefile,v 1.68 2024/08/25 06:18:25 wiz Exp $
DISTNAME= strawberry-1.0.23
PKGREVISION= 1
@@ -15,9 +15,9 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DBUILD_WITH_QT5=ON
-CMAKE_ARGS+= -DBUILD_WITH_QT6=OFF
-CMAKE_ARGS+= -DUSE_BUNDLE=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_QT5=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_QT6=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_BUNDLE=OFF
DEPENDS+= gst-plugins1-flac-[0-9]*:../../audio/gst-plugins1-flac
DEPENDS+= gst-plugins1-mpg123-[0-9]*:../../audio/gst-plugins1-mpg123
@@ -33,7 +33,7 @@ USE_CXX_FEATURES+= c++17
DEPENDS+= gst-plugins1-alsa-[0-9]*:../../audio/gst-plugins1-alsa
. include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_ALSA=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_ALSA=TRUE
.endif
.if ${OPSYS} != "Linux" && ${OSS_TYPE} != "none"
Index: pkgsrc/audio/strawberry/options.mk
diff -u pkgsrc/audio/strawberry/options.mk:1.2 pkgsrc/audio/strawberry/options.mk:1.3
--- pkgsrc/audio/strawberry/options.mk:1.2 Tue Aug 22 20:26:29 2023
+++ pkgsrc/audio/strawberry/options.mk Sun Aug 25 06:18:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/08/22 20:26:29 adam Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:25 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.strawberry
PKG_SUPPORTED_OPTIONS= pulseaudio
@@ -9,17 +9,17 @@ PKG_SUGGESTED_OPTIONS= qt5
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -DLIBPULSE=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBPULSE=ON
. include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DLIBPULSE=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBPULSE=OFF
.endif
.if !empty(PKG_OPTIONS:Mqt5) || !empty(PKG_OPTIONS:Mqt6)
. if !empty(PKG_OPTIONS:Mqt5)
TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
-CMAKE_ARGS+= -DBUILD_WITH_QT5=ON
-CMAKE_ARGS+= -DBUILD_WITH_QT6=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_QT5=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_QT6=OFF
. include "../../x11/qt5-qtbase/buildlink3.mk"
. if ${OPSYS} != "Darwin"
. include "../../x11/qt5-qtx11extras/buildlink3.mk"
@@ -28,8 +28,8 @@ CMAKE_ARGS+= -DBUILD_WITH_QT6=OFF
. endif
. elif !empty(PKG_OPTIONS:Mqt6)
TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
-CMAKE_ARGS+= -DBUILD_WITH_QT5=OFF
-CMAKE_ARGS+= -DBUILD_WITH_QT6=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_QT5=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_QT6=ON
. include "../../x11/qt6-qtbase/buildlink3.mk"
. endif
.endif
Index: pkgsrc/audio/taglib/Makefile
diff -u pkgsrc/audio/taglib/Makefile:1.53 pkgsrc/audio/taglib/Makefile:1.54
--- pkgsrc/audio/taglib/Makefile:1.53 Sat Aug 24 06:51:08 2024
+++ pkgsrc/audio/taglib/Makefile Sun Aug 25 06:18:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2024/08/24 06:51:08 adam Exp $
+# $NetBSD: Makefile,v 1.54 2024/08/25 06:18:25 wiz Exp $
DISTNAME= taglib-2.0.2
CATEGORIES= audio
@@ -13,9 +13,9 @@ USE_LANGUAGES= c c++
USE_CXX_FEATURES+= c++17
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DWITH_ASF=ON
-CMAKE_ARGS+= -DWITH_MP4=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ASF=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_MP4=ON
PKGCONFIG_OVERRIDE= bindings/c/taglib_c.pc.cmake taglib.pc.cmake
REPLACE_SH= taglib-config.cmake
@@ -30,10 +30,10 @@ SUBST_MESSAGE.pc= Fixing rpath in taglib
.if ${PKGSRC_RUN_TEST:U:tl} == yes
TEST_TARGET= test
-CMAKE_ARGS+= -DBUILD_TESTING=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=ON
.include "../../devel/cppunit/buildlink3.mk"
.else
-CMAKE_ARGS+= -DBUILD_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
.endif
.include "../../mk/compiler.mk"
Index: pkgsrc/audio/traverso/Makefile
diff -u pkgsrc/audio/traverso/Makefile:1.33 pkgsrc/audio/traverso/Makefile:1.34
--- pkgsrc/audio/traverso/Makefile:1.33 Wed May 29 16:31:25 2024
+++ pkgsrc/audio/traverso/Makefile Sun Aug 25 06:18:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2024/05/29 16:31:25 adam Exp $
+# $NetBSD: Makefile,v 1.34 2024/08/25 06:18:25 wiz Exp $
DISTNAME= traverso-0.49.6
PKGREVISION= 30
@@ -16,12 +16,12 @@ USE_TOOLS+= pkg-config
# note: C++11 'constexpr' only available with -std=c++11 or -std=gnu++11
USE_LANGUAGES= c c++11
-CMAKE_ARGS+= -DWANT_MP3_ENCODE=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_MP3_ENCODE=ON
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"
-CMAKE_ARGS+= -DWANT_COREAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_COREAUDIO=ON
.endif
INSTALLATION_DIRS+= share/applications
Index: pkgsrc/audio/traverso/options.mk
diff -u pkgsrc/audio/traverso/options.mk:1.1 pkgsrc/audio/traverso/options.mk:1.2
--- pkgsrc/audio/traverso/options.mk:1.1 Fri Apr 24 08:43:08 2020
+++ pkgsrc/audio/traverso/options.mk Sun Aug 25 06:18:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/04/24 08:43:08 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:25 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.traverso
PKG_SUPPORTED_OPTIONS= alsa jack portaudio pulseaudio
@@ -14,29 +14,29 @@ PKG_SUGGESTED_OPTIONS= jack portaudio
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CMAKE_ARGS+= -DWANT_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_ALSA=ON
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_ALSA=OFF
.endif
.if !empty(PKG_OPTIONS:Mjack)
-CMAKE_ARGS+= -DWANT_JACK=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_JACK=ON
.include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_JACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_JACK=OFF
.endif
.if !empty(PKG_OPTIONS:Mportaudio)
-CMAKE_ARGS+= -DWANT_PORTAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_PORTAUDIO=ON
.include "../../audio/portaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_PORTAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_PORTAUDIO=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -DWANT_PULSEAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_PULSEAUDIO=ON
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_PULSEAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_PULSEAUDIO=OFF
.endif
Index: pkgsrc/audio/ympd/options.mk
diff -u pkgsrc/audio/ympd/options.mk:1.1 pkgsrc/audio/ympd/options.mk:1.2
--- pkgsrc/audio/ympd/options.mk:1.1 Tue Jul 20 06:37:18 2021
+++ pkgsrc/audio/ympd/options.mk Sun Aug 25 06:18:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2021/07/20 06:37:18 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:25 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ympd
PKG_SUPPORTED_OPTIONS= inet6 ssl
@@ -7,14 +7,14 @@ PKG_SUGGESTED_OPTIONS= inet6 ssl
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Minet6)
-CMAKE_ARGS+= -DWITH_IPV6=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_IPV6=ON
.else
-CMAKE_ARGS+= -DWITH_IPV6=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_IPV6=OFF
.endif
.if !empty(PKG_OPTIONS:Mssl)
-CMAKE_ARGS+= -DWITH_SSL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=ON
. include "../../security/openssl/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_SSL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=OFF
.endif
Index: pkgsrc/audio/zynaddsubfx/options.mk
diff -u pkgsrc/audio/zynaddsubfx/options.mk:1.2 pkgsrc/audio/zynaddsubfx/options.mk:1.3
--- pkgsrc/audio/zynaddsubfx/options.mk:1.2 Sat Nov 13 10:48:03 2021
+++ pkgsrc/audio/zynaddsubfx/options.mk Sun Aug 25 06:18:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2021/11/13 10:48:03 nia Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:26 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.zynaddsubfx
PKG_SUPPORTED_OPTIONS= alsa jack portaudio
@@ -21,24 +21,24 @@ PKG_SUGGESTED_OPTIONS= portaudio
PLIST_VARS+= alsa
.if !empty(PKG_OPTIONS:Malsa)
PLIST.alsa= yes
-CMAKE_ARGS+= -DAlsaEnable=ON
+CMAKE_CONFIGURE_ARGS+= -DAlsaEnable=ON
. include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DAlsaEnable=OFF
+CMAKE_CONFIGURE_ARGS+= -DAlsaEnable=OFF
.endif
PLIST_VARS+= jack
.if !empty(PKG_OPTIONS:Mjack)
PLIST.jack= yes
-CMAKE_ARGS+= -DJackEnable=ON
+CMAKE_CONFIGURE_ARGS+= -DJackEnable=ON
. include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DJackEnable=OFF
+CMAKE_CONFIGURE_ARGS+= -DJackEnable=OFF
.endif
.if !empty(PKG_OPTIONS:Mportaudio)
-CMAKE_ARGS+= -DPaEnable=ON
+CMAKE_CONFIGURE_ARGS+= -DPaEnable=ON
. include "../../audio/portaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DJackEnable=OFF
+CMAKE_CONFIGURE_ARGS+= -DJackEnable=OFF
.endif
Index: pkgsrc/benchmarks/google-benchmark/Makefile
diff -u pkgsrc/benchmarks/google-benchmark/Makefile:1.27 pkgsrc/benchmarks/google-benchmark/Makefile:1.28
--- pkgsrc/benchmarks/google-benchmark/Makefile:1.27 Mon Aug 19 22:03:38 2024
+++ pkgsrc/benchmarks/google-benchmark/Makefile Sun Aug 25 06:18:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2024/08/19 22:03:38 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2024/08/25 06:18:26 wiz Exp $
DISTNAME= benchmark-1.9.0
PKGNAME= google-${DISTNAME}
@@ -18,8 +18,8 @@ USE_LANGUAGES= c c++
# 100% tests passed, 0 tests failed out of 67
TEST_TARGET= test
-CMAKE_ARGS+= -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
BUILDLINK_TRANSFORM+= rm:-Werror
Index: pkgsrc/biology/kallisto/Makefile
diff -u pkgsrc/biology/kallisto/Makefile:1.7 pkgsrc/biology/kallisto/Makefile:1.8
--- pkgsrc/biology/kallisto/Makefile:1.7 Sat Jul 27 12:22:54 2024
+++ pkgsrc/biology/kallisto/Makefile Sun Aug 25 06:18:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2024/07/27 12:22:54 bacon Exp $
+# $NetBSD: Makefile,v 1.8 2024/08/25 06:18:26 wiz Exp $
DISTNAME= kallisto-0.51.0
CATEGORIES= biology
@@ -19,7 +19,7 @@ SUBST_STAGE.test= pre-configure
SUBST_FILES.test= kallisto-test
SUBST_SED.test= -e 's|/usr/local/share/kallisto|${DATADIR}|g'
-CMAKE_ARGS+= -DUSE_HDF5:BOOL=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_HDF5:BOOL=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
# Build fails on 8-core Mac M1
MAKE_JOBS_SAFE= no
INSTALLATION_DIRS+= ${DATADIR}
Index: pkgsrc/biology/molsketch/Makefile
diff -u pkgsrc/biology/molsketch/Makefile:1.26 pkgsrc/biology/molsketch/Makefile:1.27
--- pkgsrc/biology/molsketch/Makefile:1.26 Wed May 29 16:31:26 2024
+++ pkgsrc/biology/molsketch/Makefile Sun Aug 25 06:18:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2024/05/29 16:31:26 adam Exp $
+# $NetBSD: Makefile,v 1.27 2024/08/25 06:18:26 wiz Exp $
DISTNAME= Molsketch-0.8.1-src
PKGNAME= ${DISTNAME:S/-src//:tl}
@@ -19,13 +19,13 @@ USE_LANGUAGES= c c++
# std::transform_reduce
USE_CXX_FEATURES+= parallelism_ts
-CMAKE_ARGS+= -DMSK_QT6=true
-CMAKE_ARGS+= -DMSK_PREFIX=${PREFIX:Q}
-CMAKE_ARGS+= -DMSK_INSTALL_PREFIX=${PREFIX:Q}
-CMAKE_ARGS+= -DMSK_INSTALL_DOCS=/share/doc/molsketch
-CMAKE_ARGS+= -DMSK_INSTALL_LIBS64=/lib
-CMAKE_ARGS+= -DMSK_INSTALL_LIBS=/lib
-CMAKE_ARGS+= -DMSK_INSTALL_INCLUDES=/include
+CMAKE_CONFIGURE_ARGS+= -DMSK_QT6=true
+CMAKE_CONFIGURE_ARGS+= -DMSK_PREFIX=${PREFIX:Q}
+CMAKE_CONFIGURE_ARGS+= -DMSK_INSTALL_PREFIX=${PREFIX:Q}
+CMAKE_CONFIGURE_ARGS+= -DMSK_INSTALL_DOCS=/share/doc/molsketch
+CMAKE_CONFIGURE_ARGS+= -DMSK_INSTALL_LIBS64=/lib
+CMAKE_CONFIGURE_ARGS+= -DMSK_INSTALL_LIBS=/lib
+CMAKE_CONFIGURE_ARGS+= -DMSK_INSTALL_INCLUDES=/include
post-install:
${RM} -rf ${DESTDIR}${PREFIX}/include/libmolsketch/molsketch_LIB_autogen
Index: pkgsrc/biology/openbabel/Makefile
diff -u pkgsrc/biology/openbabel/Makefile:1.67 pkgsrc/biology/openbabel/Makefile:1.68
--- pkgsrc/biology/openbabel/Makefile:1.67 Wed May 29 16:31:27 2024
+++ pkgsrc/biology/openbabel/Makefile Sun Aug 25 06:18:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2024/05/29 16:31:27 adam Exp $
+# $NetBSD: Makefile,v 1.68 2024/08/25 06:18:26 wiz Exp $
DISTNAME= openbabel-${RELVERSION:S/-/./g}
PKGREVISION= 26
@@ -24,7 +24,7 @@ PKGCONFIG_OVERRIDE+= openbabel-3.pc.cmak
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
post-extract:
${MKDIR} ${WRKDIR}/build
Index: pkgsrc/biology/openbabel/options.mk
diff -u pkgsrc/biology/openbabel/options.mk:1.3 pkgsrc/biology/openbabel/options.mk:1.4
--- pkgsrc/biology/openbabel/options.mk:1.3 Wed Jun 7 09:25:22 2023
+++ pkgsrc/biology/openbabel/options.mk Sun Aug 25 06:18:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2023/06/07 09:25:22 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:26 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openbabel
PKG_SUPPORTED_OPTIONS= wxwidgets
@@ -10,8 +10,8 @@ PLIST_VARS+= wx-gui
.if !empty(PKG_OPTIONS:Mwxwidgets)
. include "../../x11/wxGTK32/buildlink3.mk"
-CMAKE_ARGS+= -DBUILD_GUI=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GUI=ON
PLIST.wx-gui= yes
.else
-CMAKE_ARGS+= -DBUILD_GUI=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GUI=OFF
.endif
Index: pkgsrc/biology/sra-tools/Makefile
diff -u pkgsrc/biology/sra-tools/Makefile:1.4 pkgsrc/biology/sra-tools/Makefile:1.5
--- pkgsrc/biology/sra-tools/Makefile:1.4 Wed May 29 16:31:27 2024
+++ pkgsrc/biology/sra-tools/Makefile Sun Aug 25 06:18:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/05/29 16:31:27 adam Exp $
+# $NetBSD: Makefile,v 1.5 2024/08/25 06:18:26 wiz Exp $
DISTNAME= sra-tools-3.0.6
PKGREVISION= 3
@@ -39,8 +39,8 @@ SUBST_FILES.submoddir+= CMakeLists.txt
REPLACE_BASH= */*.sh */*/*.sh */*/*/*.sh */*/*/*/*.sh
USE_CMAKE= yes
-CMAKE_ARGS+= -DVDB_LIBDIR:STRING=${WRKSRC}/ncbi-vdb/build/lib
-CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DVDB_LIBDIR:STRING=${WRKSRC}/ncbi-vdb/build/lib
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
BUILDLINK_TRANSFORM.NetBSD+= rm:-ldl # ncbi-vdb/CMakeLists.posix.txt
EXAMPLESDIR= ${PREFIX}/share/examples/sra-tools
Index: pkgsrc/cad/kicad/Makefile
diff -u pkgsrc/cad/kicad/Makefile:1.96 pkgsrc/cad/kicad/Makefile:1.97
--- pkgsrc/cad/kicad/Makefile:1.96 Tue Aug 6 00:54:16 2024
+++ pkgsrc/cad/kicad/Makefile Sun Aug 25 06:18:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2024/08/06 00:54:16 tnn Exp $
+# $NetBSD: Makefile,v 1.97 2024/08/25 06:18:26 wiz Exp $
#
V= 8.0.4
@@ -23,16 +23,16 @@ USE_CXX_FEATURES+= charconv filesystem
USE_CMAKE= yes
USE_TOOLS+= pkg-config msgfmt msgmerge xgettext
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DKICAD_SCRIPTING_WXPYTHON=OFF
-CMAKE_ARGS+= -DKICAD_BUILD_I18N=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DKICAD_SCRIPTING_WXPYTHON=OFF
+CMAKE_CONFIGURE_ARGS+= -DKICAD_BUILD_I18N=ON
# KICAD_USE_EGL must be defined if wxWidgets was compiled with EGL canvas.
.include "../../graphics/MesaLib/features.mk"
.if !empty(MESALIB_SUPPORTS_EGL:Myes)
-CMAKE_ARGS+= -DKICAD_USE_EGL=ON
+CMAKE_CONFIGURE_ARGS+= -DKICAD_USE_EGL=ON
.else
-CMAKE_ARGS+= -DKICAD_USE_EGL=OFF
+CMAKE_CONFIGURE_ARGS+= -DKICAD_USE_EGL=OFF
.endif
PY_PATCHPLIST= yes
Index: pkgsrc/cad/kicad/options.mk
diff -u pkgsrc/cad/kicad/options.mk:1.1 pkgsrc/cad/kicad/options.mk:1.2
--- pkgsrc/cad/kicad/options.mk:1.1 Tue Jun 6 10:20:58 2023
+++ pkgsrc/cad/kicad/options.mk Sun Aug 25 06:18:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/06/06 10:20:58 bouyer Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:26 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.kicad
PKG_SUPPORTED_OPTIONS= ng-spice
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS= ng-spice
.if !empty(PKG_OPTIONS:Mng-spice)
. include "../../cad/ng-spice-shared/buildlink3.mk"
-CMAKE_ARGS+= -DKICAD_SPICE=ON
+CMAKE_CONFIGURE_ARGS+= -DKICAD_SPICE=ON
.else
-CMAKE_ARGS+= -DKICAD_SPICE=OFF
+CMAKE_CONFIGURE_ARGS+= -DKICAD_SPICE=OFF
.endif
Index: pkgsrc/cad/occt/Makefile
diff -u pkgsrc/cad/occt/Makefile:1.3 pkgsrc/cad/occt/Makefile:1.4
--- pkgsrc/cad/occt/Makefile:1.3 Tue Feb 27 16:33:20 2024
+++ pkgsrc/cad/occt/Makefile Sun Aug 25 06:18:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2024/02/27 16:33:20 bouyer Exp $
+# $NetBSD: Makefile,v 1.4 2024/08/25 06:18:26 wiz Exp $
DISTNAME= opencascade-7.7.0
PKGNAME= ${DISTNAME:S/opencascade/occt/}
@@ -19,10 +19,10 @@ WRKSRC= ${WRKDIR}/occt-V7_7_0
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
-CMAKE_ARGS+= -DUSE_FREETYPE=ON
-CMAKE_ARGS+= -DUSE_EIGEN=ON
-CMAKE_ARGS+= -DUSE_RAPIDJSON=ON
-CMAKE_ARGS+= -DBUILD_DOC_Overview=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_FREETYPE=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_EIGEN=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_RAPIDJSON=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DOC_Overview=OFF
REPLACE_BASH+= adm/templates/draw.sh
Index: pkgsrc/cad/occt/buildlink3.mk
diff -u pkgsrc/cad/occt/buildlink3.mk:1.2 pkgsrc/cad/occt/buildlink3.mk:1.3
--- pkgsrc/cad/occt/buildlink3.mk:1.2 Sun Nov 12 13:20:47 2023
+++ pkgsrc/cad/occt/buildlink3.mk Sun Aug 25 06:18:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2023/11/12 13:20:47 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2024/08/25 06:18:26 wiz Exp $
BUILDLINK_TREE+= occt
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.occt?= occt>=7.7.0
BUILDLINK_PKGSRCDIR.occt?= ../../cad/occt
BUILDLINK_INCDIRS.occt+= include/opencascade
-CMAKE_ARGS+= -DOCC_INCLUDE_DIR=${BUILDLINK_PREFIX.occt}/include/opencascade
+CMAKE_CONFIGURE_ARGS+= -DOCC_INCLUDE_DIR=${BUILDLINK_PREFIX.occt}/include/opencascade
pkgbase := occt
.include "../../mk/pkg-build-options.mk"
Index: pkgsrc/cad/occt/options.mk
diff -u pkgsrc/cad/occt/options.mk:1.1 pkgsrc/cad/occt/options.mk:1.2
--- pkgsrc/cad/occt/options.mk:1.1 Sun Feb 12 14:42:25 2023
+++ pkgsrc/cad/occt/options.mk Sun Aug 25 06:18:27 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/02/12 14:42:25 tnn Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:27 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.occt
PKG_SUPPORTED_OPTIONS= x11 occt-draw
@@ -14,34 +14,34 @@ PKG_SUGGESTED_OPTIONS+= x11
.include "../../graphics/freeimage/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
-CMAKE_ARGS+= -DUSE_XLIB=ON
-CMAKE_ARGS+= -DUSE_FREEIMAGE=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_XLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_FREEIMAGE=ON
.else
-CMAKE_ARGS+= -DUSE_XLIB=OFF
-CMAKE_ARGS+= -DUSE_FREEIMAGE=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_XLIB=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_FREEIMAGE=OFF
.endif
.if !empty(PKG_OPTIONS:Mocct-draw)
.include "../../lang/tcl/buildlink3.mk"
.include "../../x11/tk/buildlink3.mk"
-CMAKE_ARGS+= -DUSE_TCL=ON
-CMAKE_ARGS+= -DUSE_TK=ON
-CMAKE_ARGS+= -D3RDPARTY_TCL_INCLUDE_DIR=${BUILDLINK_PREFIX.tcl}/include
-CMAKE_ARGS+= -D3RDPARTY_TCL_LIBRARY_DIR=${BUILDLINK_PREFIX.tcl}/lib
-CMAKE_ARGS+= -D3RDPARTY_TK_INCLUDE_DIR=${BUILDLINK_PREFIX.tk}/include
-CMAKE_ARGS+= -D3RDPARTY_TK_LIBRARY_DIR=${BUILDLINK_PREFIX.tk}/lib
+CMAKE_CONFIGURE_ARGS+= -DUSE_TCL=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_TK=ON
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_INCLUDE_DIR=${BUILDLINK_PREFIX.tcl}/include
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_LIBRARY_DIR=${BUILDLINK_PREFIX.tcl}/lib
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_INCLUDE_DIR=${BUILDLINK_PREFIX.tk}/include
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_LIBRARY_DIR=${BUILDLINK_PREFIX.tk}/lib
. if ${OPSYS} == "Darwin"
-CMAKE_ARGS+= -D3RDPARTY_TCL_LIBRARY=${BUILDLINK_PREFIX.tcl}/lib/libtcl86.dylib
-CMAKE_ARGS+= -D3RDPARTY_TK_LIBRARY=${BUILDLINK_PREFIX.tk}/lib/libtk86.dylib
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_LIBRARY=${BUILDLINK_PREFIX.tcl}/lib/libtcl86.dylib
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_LIBRARY=${BUILDLINK_PREFIX.tk}/lib/libtk86.dylib
. elif ${OPSYS} == "SunOS"
-CMAKE_ARGS+= -D3RDPARTY_TCL_LIBRARY=${BUILDLINK_PREFIX.tcl}/lib/libtcl86.so
-CMAKE_ARGS+= -D3RDPARTY_TK_LIBRARY=${BUILDLINK_PREFIX.tk}/lib/libtk86.so
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_LIBRARY=${BUILDLINK_PREFIX.tcl}/lib/libtcl86.so
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_LIBRARY=${BUILDLINK_PREFIX.tk}/lib/libtk86.so
. endif
.else
-CMAKE_ARGS+= -DUSE_TCL=OFF
-CMAKE_ARGS+= -DUSE_TK=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_TCL=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_TK=OFF
.endif
# TODO
-CMAKE_ARGS+= -DUSE_VTK=OFF
-CMAKE_ARGS+= -DUSE_FFMPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_VTK=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_FFMPEG=OFF
Index: pkgsrc/cad/solvespace/Makefile
diff -u pkgsrc/cad/solvespace/Makefile:1.29 pkgsrc/cad/solvespace/Makefile:1.30
--- pkgsrc/cad/solvespace/Makefile:1.29 Wed May 29 16:31:28 2024
+++ pkgsrc/cad/solvespace/Makefile Sun Aug 25 06:18:27 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2024/05/29 16:31:28 adam Exp $
+# $NetBSD: Makefile,v 1.30 2024/08/25 06:18:27 wiz Exp $
#
#
# Both of these hashes need to be updated when the solvespace version
@@ -35,7 +35,7 @@ USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DGIT_COMMIT_HASH=${SOLVESPACE_HASH}
+CMAKE_CONFIGURE_ARGS+= -DGIT_COMMIT_HASH=${SOLVESPACE_HASH}
SUBST_CLASSES+= libdxfrw
SUBST_STAGE.libdxfrw= pre-configure
Index: pkgsrc/chat/anope/Makefile
diff -u pkgsrc/chat/anope/Makefile:1.50 pkgsrc/chat/anope/Makefile:1.51
--- pkgsrc/chat/anope/Makefile:1.50 Wed May 29 16:31:28 2024
+++ pkgsrc/chat/anope/Makefile Sun Aug 25 06:18:27 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2024/05/29 16:31:28 adam Exp $
+# $NetBSD: Makefile,v 1.51 2024/08/25 06:18:27 wiz Exp $
DISTNAME= anope-2.0.15
PKGNAME= ${DISTNAME:S/-source//1}
@@ -17,15 +17,15 @@ USE_LANGUAGES= c c++
USE_TOOLS+= msgfmt
USE_CMAKE= yes
-CMAKE_ARGS+= -DPROGRAM_NAME=anope
+CMAKE_CONFIGURE_ARGS+= -DPROGRAM_NAME=anope
-CMAKE_ARGS+= -DDISABLE_TOOLS=ON
+CMAKE_CONFIGURE_ARGS+= -DDISABLE_TOOLS=ON
-CMAKE_ARGS+= -DDB_DIR=anope/data
-CMAKE_ARGS+= -DCONF_DIR=${PKG_SYSCONFDIR}
-CMAKE_ARGS+= -DLIB_DIR=lib/anope
-CMAKE_ARGS+= -DLOCALE_DIR=${PKGLOCALEDIR}/locale
-CMAKE_ARGS+= -DLOGS_DIR=anope/logs
+CMAKE_CONFIGURE_ARGS+= -DDB_DIR=anope/data
+CMAKE_CONFIGURE_ARGS+= -DCONF_DIR=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DLIB_DIR=lib/anope
+CMAKE_CONFIGURE_ARGS+= -DLOCALE_DIR=${PKGLOCALEDIR}/locale
+CMAKE_CONFIGURE_ARGS+= -DLOGS_DIR=anope/logs
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/chat/dino/Makefile
diff -u pkgsrc/chat/dino/Makefile:1.39 pkgsrc/chat/dino/Makefile:1.40
--- pkgsrc/chat/dino/Makefile:1.39 Fri Aug 9 09:42:09 2024
+++ pkgsrc/chat/dino/Makefile Sun Aug 25 06:18:27 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2024/08/09 09:42:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2024/08/25 06:18:27 wiz Exp $
DISTNAME= dino-0.4.3
PKGREVISION= 4
@@ -18,7 +18,7 @@ DEPENDS+= glib-networking-[0-9]*:../../n
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DUSE_SOUP3:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SOUP3:BOOL=ON
BUILDLINK_TRANSFORM+= opt:-Wno-incompatible-pointer-types-discards-qualifiers:-Wno-incompatible-pointer-types
Index: pkgsrc/chat/jitsi-srtp/Makefile
diff -u pkgsrc/chat/jitsi-srtp/Makefile:1.3 pkgsrc/chat/jitsi-srtp/Makefile:1.4
--- pkgsrc/chat/jitsi-srtp/Makefile:1.3 Thu Apr 25 17:00:15 2024
+++ pkgsrc/chat/jitsi-srtp/Makefile Sun Aug 25 06:18:27 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2024/04/25 17:00:15 khorben Exp $
+# $NetBSD: Makefile,v 1.4 2024/08/25 06:18:27 wiz Exp $
GITHUB_TAG= 88a9c387a8dc006a06dbe911ef1252423004927b
DISTNAME= jitsi-srtp-1.1
@@ -20,9 +20,9 @@ SITES.jitsi-srtp-java-deps-1.1.tar.gz= \
USE_TOOLS+= pax:build
USE_CMAKE= yes
-CMAKE_ARGS+= -DJAVA_INCLUDE_PATH2=${PKG_JAVA_HOME}/include/netbsd
-CMAKE_ARGS+= -DJITSI_SRTP_LIBSSL_VERSION=3
-CMAKE_ARGS+= -DOPENSSL_INCLUDE_DIR=${PREFIX}/include
+CMAKE_CONFIGURE_ARGS+= -DJAVA_INCLUDE_PATH2=${PKG_JAVA_HOME}/include/netbsd
+CMAKE_CONFIGURE_ARGS+= -DJITSI_SRTP_LIBSSL_VERSION=3
+CMAKE_CONFIGURE_ARGS+= -DOPENSSL_INCLUDE_DIR=${PREFIX}/include
CMAKE_INSTALL_PREFIX= ${PREFIX}/lib
USE_JAVA2= 17
Index: pkgsrc/chat/libsignal-protocol-c/Makefile
diff -u pkgsrc/chat/libsignal-protocol-c/Makefile:1.2 pkgsrc/chat/libsignal-protocol-c/Makefile:1.3
--- pkgsrc/chat/libsignal-protocol-c/Makefile:1.2 Mon Jul 25 11:12:20 2022
+++ pkgsrc/chat/libsignal-protocol-c/Makefile Sun Aug 25 06:18:27 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/07/25 11:12:20 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:18:27 wiz Exp $
DISTNAME= libsignal-protocol-c-2.3.3
CATEGORIES= chat
@@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v3
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=true
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=true
PKGCONFIG_OVERRIDE+= src/libsignal-protocol-c.pc.in
Index: pkgsrc/chat/mumble/Makefile
diff -u pkgsrc/chat/mumble/Makefile:1.64 pkgsrc/chat/mumble/Makefile:1.65
--- pkgsrc/chat/mumble/Makefile:1.64 Wed May 29 16:31:31 2024
+++ pkgsrc/chat/mumble/Makefile Sun Aug 25 06:18:27 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2024/05/29 16:31:31 adam Exp $
+# $NetBSD: Makefile,v 1.65 2024/08/25 06:18:27 wiz Exp $
DISTNAME= mumble-1.4.287
PKGREVISION= 3
@@ -28,33 +28,33 @@ LDFLAGS.NetBSD+= -lrt
# Basic sensible stuff for packaging.
# Requires 0.7.x, pkgsrc version is too new
-#CMAKE_ARGS+= -Dbundled-celt=off
-CMAKE_ARGS+= -Dbundled-opus=off
-CMAKE_ARGS+= -Dbundled-speex=off
-CMAKE_ARGS+= -Dwarnings-as-errors=off
+#CMAKE_CONFIGURE_ARGS+= -Dbundled-celt=off
+CMAKE_CONFIGURE_ARGS+= -Dbundled-opus=off
+CMAKE_CONFIGURE_ARGS+= -Dbundled-speex=off
+CMAKE_CONFIGURE_ARGS+= -Dwarnings-as-errors=off
# Compatibility.
CXXFLAGS+= -DCELT_SET_VBR_RATE=CELT_SET_BITRATE
# Architecture-specific due to nasty hacks...
-CMAKE_ARGS+= -Doverlay=off
+CMAKE_CONFIGURE_ARGS+= -Doverlay=off
# Not available in pkgsrc yet.
-CMAKE_ARGS+= -Dpipewire=off
+CMAKE_CONFIGURE_ARGS+= -Dpipewire=off
# support for an old Logitech keyboard - requires missing library
-CMAKE_ARGS+= -Dg15=off
+CMAKE_CONFIGURE_ARGS+= -Dg15=off
# requires missing ZeroC utilities
-CMAKE_ARGS+= -Dice=off
+CMAKE_CONFIGURE_ARGS+= -Dice=off
.include "../../mk/oss.buildlink3.mk"
.if ${OSS_TYPE} != "none"
LDFLAGS+= ${LIBOSSAUDIO}
-CMAKE_ARGS+= -Doss=on
+CMAKE_CONFIGURE_ARGS+= -Doss=on
.else
-CMAKE_ARGS+= -Doss=off
+CMAKE_CONFIGURE_ARGS+= -Doss=off
.endif
CHECK_PORTABILITY_SKIP+= 3rdparty/opus-src/doc/build_draft.sh
Index: pkgsrc/chat/mumble/options.mk
diff -u pkgsrc/chat/mumble/options.mk:1.7 pkgsrc/chat/mumble/options.mk:1.8
--- pkgsrc/chat/mumble/options.mk:1.7 Fri Apr 1 11:53:28 2022
+++ pkgsrc/chat/mumble/options.mk Sun Aug 25 06:18:27 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2022/04/01 11:53:28 nia Exp $
+# $NetBSD: options.mk,v 1.8 2024/08/25 06:18:27 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mumble
PKG_SUPPORTED_OPTIONS= alsa dbus jack pulseaudio portaudio
@@ -8,35 +8,35 @@ PKG_SUGGESTED_OPTIONS.Linux= alsa
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CMAKE_ARGS+= -Dalsa=on
+CMAKE_CONFIGURE_ARGS+= -Dalsa=on
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -Dalsa=off
+CMAKE_CONFIGURE_ARGS+= -Dalsa=off
.endif
.if !empty(PKG_OPTIONS:Mdbus)
-CMAKE_ARGS+= -Ddbus=on
+CMAKE_CONFIGURE_ARGS+= -Ddbus=on
.else
-CMAKE_ARGS+= -Ddbus=off
+CMAKE_CONFIGURE_ARGS+= -Ddbus=off
.endif
.if !empty(PKG_OPTIONS:Mjack)
-CMAKE_ARGS+= -Djackaudio=on
+CMAKE_CONFIGURE_ARGS+= -Djackaudio=on
.include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -Djackaudio=off
+CMAKE_CONFIGURE_ARGS+= -Djackaudio=off
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -Dpulseaudio=on
+CMAKE_CONFIGURE_ARGS+= -Dpulseaudio=on
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -Dpulseaudio=off
+CMAKE_CONFIGURE_ARGS+= -Dpulseaudio=off
.endif
.if !empty(PKG_OPTIONS:Mportaudio)
-CMAKE_ARGS+= -Dportaudio=on
+CMAKE_CONFIGURE_ARGS+= -Dportaudio=on
.include "../../audio/portaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -Dportaudio=off
+CMAKE_CONFIGURE_ARGS+= -Dportaudio=off
.endif
Index: pkgsrc/chat/quassel/options.mk
diff -u pkgsrc/chat/quassel/options.mk:1.2 pkgsrc/chat/quassel/options.mk:1.3
--- pkgsrc/chat/quassel/options.mk:1.2 Fri Aug 2 08:37:43 2019
+++ pkgsrc/chat/quassel/options.mk Sun Aug 25 06:18:27 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/08/02 08:37:43 nia Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:27 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.quassel
PKG_SUPPORTED_OPTIONS= quassel-audio quassel-webkit
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS= quassel-audio qua
# Really just shows a small, difficult to read thumbnail on hover.
# Using WebEngine for this seems to be preferred.
.if !empty(PKG_OPTIONS:Mquassel-webkit)
-CMAKE_ARGS+= -DWITH_WEBKIT=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_WEBKIT=ON
.include "../../x11/qt5-qtwebkit/buildlink3.mk"
.endif
Index: pkgsrc/chat/weechat/Makefile
diff -u pkgsrc/chat/weechat/Makefile:1.148 pkgsrc/chat/weechat/Makefile:1.149
--- pkgsrc/chat/weechat/Makefile:1.148 Fri Aug 9 14:34:35 2024
+++ pkgsrc/chat/weechat/Makefile Sun Aug 25 06:18:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.148 2024/08/09 14:34:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.149 2024/08/25 06:18:28 wiz Exp $
DISTNAME= weechat-4.3.5
CATEGORIES= chat
@@ -20,17 +20,17 @@ USE_LANGUAGES= c99
USE_CMAKE= yes
FAKE_NCURSES= yes
-CMAKE_ARGS+= -DASCIIDOCTOR_FOUND=ON
-CMAKE_ARGS+= -DASCIIDOCTOR_EXECUTABLE=${PREFIX}/bin/asciidoctor${RUBY_VER}
-CMAKE_ARGS+= -DENABLE_GUILE=OFF
-CMAKE_ARGS+= -DENABLE_TCL=OFF
-CMAKE_ARGS+= -DENABLE_JAVASCRIPT=OFF
-CMAKE_ARGS+= -DENABLE_PHP=OFF
-CMAKE_ARGS+= -DENABLE_SPELL=OFF
-CMAKE_ARGS+= -DENABLE_CHARSET=ON
-CMAKE_ARGS+= -DENABLE_MAN=ON
-CMAKE_ARGS+= -DLOCALEDIR=${PKGLOCALEDIR}/locale
-CMAKE_ARGS+= -DMANDIR=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DASCIIDOCTOR_FOUND=ON
+CMAKE_CONFIGURE_ARGS+= -DASCIIDOCTOR_EXECUTABLE=${PREFIX}/bin/asciidoctor${RUBY_VER}
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GUILE=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TCL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_JAVASCRIPT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PHP=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SPELL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CHARSET=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MAN=ON
+CMAKE_CONFIGURE_ARGS+= -DLOCALEDIR=${PKGLOCALEDIR}/locale
+CMAKE_CONFIGURE_ARGS+= -DMANDIR=${PREFIX}/${PKGMANDIR}
USE_PKGLOCALEDIR= yes
Index: pkgsrc/chat/weechat/options.mk
diff -u pkgsrc/chat/weechat/options.mk:1.29 pkgsrc/chat/weechat/options.mk:1.30
--- pkgsrc/chat/weechat/options.mk:1.29 Sun Dec 19 13:22:21 2021
+++ pkgsrc/chat/weechat/options.mk Sun Aug 25 06:18:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.29 2021/12/19 13:22:21 nia Exp $
+# $NetBSD: options.mk,v 1.30 2024/08/25 06:18:28 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.weechat
# mk/curses will handle wide-curses
@@ -13,33 +13,33 @@ PLIST_VARS+= lua python perl ruby
.if !empty(PKG_OPTIONS:Mpython)
PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/extension.mk"
-CMAKE_ARGS+= -DENABLE_PYTHON=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PYTHON=ON
PLIST.python= yes
.else
-CMAKE_ARGS+= -DENABLE_PYTHON=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PYTHON=OFF
.endif
.if !empty(PKG_OPTIONS:Mlua)
#LUA_VERSIONS_ACCEPTED= 53 52 51
.include "../../lang/lua/buildlink3.mk"
-CMAKE_ARGS+= -DENABLE_LUA=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LUA=ON
PLIST.lua= yes
.else
-CMAKE_ARGS+= -DENABLE_LUA=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LUA=OFF
.endif
.if !empty(PKG_OPTIONS:Mperl)
.include "../../lang/perl5/buildlink3.mk"
-CMAKE_ARGS+= -DENABLE_PERL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PERL=ON
USE_TOOLS+= perl
PLIST.perl= yes
.else
-CMAKE_ARGS+= -DENABLE_PERL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PERL=OFF
.endif
.if !empty(PKG_OPTIONS:Mruby)
.include "../../lang/ruby/buildlink3.mk"
-CMAKE_ARGS+= -DENABLE_RUBY=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_RUBY=ON
PLIST.ruby= yes
SUBST_CLASSES+= ruby
SUBST_STAGE.ruby= pre-configure
@@ -49,5 +49,5 @@ SUBST_SED.ruby= -e 's,ruby-3.0,ruby-${R
#BUILDLINK_INCDIRS.${RUBY_BASE}+= ${RUBY_INC}
#BUILDLINK_INCDIRS.${RUBY_BASE}+= ${RUBY_ARCHINC}
.else
-CMAKE_ARGS+= -DENABLE_RUBY:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_RUBY:BOOL=OFF
.endif
Index: pkgsrc/chat/znc/options.mk
diff -u pkgsrc/chat/znc/options.mk:1.4 pkgsrc/chat/znc/options.mk:1.5
--- pkgsrc/chat/znc/options.mk:1.4 Sun Oct 31 07:47:06 2021
+++ pkgsrc/chat/znc/options.mk Sun Aug 25 06:18:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2021/10/31 07:47:06 kim Exp $
+# $NetBSD: options.mk,v 1.5 2024/08/25 06:18:28 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.znc
PKG_SUPPORTED_OPTIONS= icu inet6 nls perl python sasl-cyrus tcl
@@ -10,64 +10,64 @@ PKG_OPTIONS_LEGACY_OPTS+= sasl:sasl-cyru
# IPv6 support
.if !empty(PKG_OPTIONS:Minet6)
-CMAKE_ARGS+= -DWANT_IPV6=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_IPV6=ON
.else
-CMAKE_ARGS+= -DWANT_IPV6=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_IPV6=OFF
.endif
# Charset support
.if !empty(PKG_OPTIONS:Micu)
-CMAKE_ARGS+= -DWANT_ICU=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_ICU=ON
. include "../../textproc/icu/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_ICU=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_ICU=OFF
.endif
# Native Language support
.if !empty(PKG_OPTIONS:Mnls)
USE_TOOLS+= msgfmt
PLIST_SRC+= PLIST.nls
-CMAKE_ARGS+= -DWANT_I18N=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_I18N=ON
. include "../../devel/boost-libs/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_I18N=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_I18N=OFF
.endif
# Perl support
.if !empty(PKG_OPTIONS:Mperl)
. include "../../lang/perl5/buildlink3.mk"
-CMAKE_ARGS+= -DWANT_PERL=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_PERL=ON
USE_TOOLS+= perl
PLIST_SRC+= PLIST.perl
.else
-CMAKE_ARGS+= -DWANT_PERL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_PERL=OFF
.endif
# TCL option
.if !empty(PKG_OPTIONS:Mtcl)
. include "../../lang/tcl/buildlink3.mk"
-CMAKE_ARGS+= -DWANT_TCL=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_TCL=ON
PLIST_SRC+= PLIST.tcl
.else
-CMAKE_ARGS+= -DWANT_TCL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_TCL=OFF
.endif
# Python support
.if !empty(PKG_OPTIONS:Mpython)
PYTHON_VERSIONS_INCOMPATIBLE= 27
. include "../../lang/python/extension.mk"
-CMAKE_ARGS+= -DWANT_PYTHON=ON
-CMAKE_ARGS+= -DWANT_PYTHON_VERSION=python-${PYVERSSUFFIX}
+CMAKE_CONFIGURE_ARGS+= -DWANT_PYTHON=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_PYTHON_VERSION=python-${PYVERSSUFFIX}
PLIST_SRC+= PLIST.python
.else
-CMAKE_ARGS+= -DWANT_PYTHON=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_PYTHON=OFF
.endif
# Cyrus SASL support
.if !empty(PKG_OPTIONS:Msasl-cyrus)
.include "../../security/cyrus-sasl/buildlink3.mk"
-CMAKE_ARGS+= -DWANT_CYRUS=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_CYRUS=ON
PLIST_SRC+= PLIST.cyrus
.else
-CMAKE_ARGS+= -DWANT_CYRUS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_CYRUS=OFF
.endif
Index: pkgsrc/comms/gammu/Makefile
diff -u pkgsrc/comms/gammu/Makefile:1.57 pkgsrc/comms/gammu/Makefile:1.58
--- pkgsrc/comms/gammu/Makefile:1.57 Wed May 29 16:31:35 2024
+++ pkgsrc/comms/gammu/Makefile Sun Aug 25 06:18:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2024/05/29 16:31:35 adam Exp $
+# $NetBSD: Makefile,v 1.58 2024/08/25 06:18:28 wiz Exp $
#
DISTNAME= gammu-1.41.0
@@ -18,20 +18,20 @@ LICENSE= gnu-gpl-v2
DEPENDS+= dialog-[0-9]*:../../misc/dialog
USE_CMAKE= yes
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DINSTALL_MAN_DIR:STRING=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MAN_DIR:STRING=${PKGMANDIR}
# make sure some optional dependencies are not found:
-CMAKE_ARGS+= -DWITH_MySQL:BOOL=OFF
-CMAKE_ARGS+= -DWITH_Postgres:BOOL=OFF
-CMAKE_ARGS+= -DWITH_LibDBI:BOOL=OFF
-CMAKE_ARGS+= -DWITH_Glib:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_MySQL:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_Postgres:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_LibDBI:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_Glib:BOOL=OFF
# avoid installing bash completion scripts
-CMAKE_ARGS+= -DBASH_BIN:FILEPATH=
-#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DBASH_BIN:FILEPATH=
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
# silence warning
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DINSTALL_DOC=ON
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOC=ON
USE_LANGUAGES= c c++
USE_TOOLS+= bash:run msgfmt
Index: pkgsrc/comms/obexftp/Makefile
diff -u pkgsrc/comms/obexftp/Makefile:1.24 pkgsrc/comms/obexftp/Makefile:1.25
--- pkgsrc/comms/obexftp/Makefile:1.24 Mon Aug 14 05:23:57 2023
+++ pkgsrc/comms/obexftp/Makefile Sun Aug 25 06:18:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/08/14 05:23:57 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2024/08/25 06:18:28 wiz Exp $
#
DISTNAME= obexftp-0.24-Source
@@ -15,10 +15,10 @@ LICENSE= gnu-gpl-v2
USE_CMAKE= yes
USE_TOOLS+= cmake pkg-config
-CMAKE_ARGS+= -DENABLE_PERL:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_PYTHON:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_RUBY:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_TCL:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PERL:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PYTHON:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_RUBY:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TCL:BOOL=OFF
TOOL_DEPENDS+= asciidoc>=8.6.6:../../textproc/asciidoc
TOOL_DEPENDS+= xmlto>=0.0.25:../../textproc/xmlto
Index: pkgsrc/comms/srtp/Makefile
diff -u pkgsrc/comms/srtp/Makefile:1.7 pkgsrc/comms/srtp/Makefile:1.8
--- pkgsrc/comms/srtp/Makefile:1.7 Thu Feb 29 12:37:01 2024
+++ pkgsrc/comms/srtp/Makefile Sun Aug 25 06:18:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2024/02/29 12:37:01 adam Exp $
+# $NetBSD: Makefile,v 1.8 2024/08/25 06:18:28 wiz Exp $
DISTNAME= srtp-2.6.0
CATEGORIES= comms security
@@ -18,9 +18,9 @@ TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/${C
# For Darwin
TEST_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DBUILD_WITH_WARNINGS=OFF
-CMAKE_ARGS+= -DENABLE_OPENSSL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_WARNINGS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_OPENSSL=ON
LDFLAGS.SunOS+= -lsocket -lnsl
Index: pkgsrc/converters/cbmconvert/Makefile
diff -u pkgsrc/converters/cbmconvert/Makefile:1.21 pkgsrc/converters/cbmconvert/Makefile:1.22
--- pkgsrc/converters/cbmconvert/Makefile:1.21 Sun May 15 18:39:30 2022
+++ pkgsrc/converters/cbmconvert/Makefile Sun Aug 25 06:18:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2022/05/15 18:39:30 rhialto Exp $
+# $NetBSD: Makefile,v 1.22 2024/08/25 06:18:28 wiz Exp $
DISTNAME= cbmconvert-2.1.5
CATEGORIES= converters archivers
@@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES+= c
USE_CMAKE= yes
-#CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/cbmconvert
Index: pkgsrc/databases/duckdb/Makefile
diff -u pkgsrc/databases/duckdb/Makefile:1.3 pkgsrc/databases/duckdb/Makefile:1.4
--- pkgsrc/databases/duckdb/Makefile:1.3 Wed Jun 5 18:22:39 2024
+++ pkgsrc/databases/duckdb/Makefile Sun Aug 25 06:18:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2024/06/05 18:22:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2024/08/25 06:18:28 wiz Exp $
DISTNAME= duckdb-1.0.0
CATEGORIES= databases
@@ -17,22 +17,22 @@ USE_TOOLS+= gmake
# for alloca(3)
FORCE_CXX_STD+= gnu++11
-CMAKE_ARGS+= -DBUILD_CORE_FUNCTIONS_EXTENSION=ON
-CMAKE_ARGS+= -DBUILD_ICU_EXTENSION=ON
-CMAKE_ARGS+= -DBUILD_PARQUET_EXTENSION=ON
-CMAKE_ARGS+= -DBUILD_TPCH_EXTENSION=ON
-CMAKE_ARGS+= -DBUILD_TPCDS_EXTENSION=ON
-CMAKE_ARGS+= -DBUILD_FTS_EXTENSION=ON
-CMAKE_ARGS+= -DBUILD_HTTPFS_EXTENSION=ON
-CMAKE_ARGS+= -DBUILD_VISUALIZER_EXTENSION=ON
-CMAKE_ARGS+= -DBUILD_JSON_EXTENSION=ON
-CMAKE_ARGS+= -DBUILD_JEMALLOC_EXTENSION=ON
-CMAKE_ARGS+= -DBUILD_EXCEL_EXTENSION=ON
-CMAKE_ARGS+= -DBUILD_INET_EXTENSION=ON
-CMAKE_ARGS+= -DBUILD_BENCHMARKS=ON
-CMAKE_ARGS+= -DBUILD_SQLSMITH_EXTENSION=ON
-CMAKE_ARGS+= -DBUILD_TPCE=ON
-CMAKE_ARGS+= -DBUILD_AUTOCOMPLETE_EXTENSION=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_CORE_FUNCTIONS_EXTENSION=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_ICU_EXTENSION=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PARQUET_EXTENSION=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TPCH_EXTENSION=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TPCDS_EXTENSION=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_FTS_EXTENSION=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_HTTPFS_EXTENSION=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_VISUALIZER_EXTENSION=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_JSON_EXTENSION=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_JEMALLOC_EXTENSION=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_EXCEL_EXTENSION=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_INET_EXTENSION=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_BENCHMARKS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SQLSMITH_EXTENSION=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TPCE=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_AUTOCOMPLETE_EXTENSION=ON
.include "../../devel/cmake/build.mk"
.include "../../security/openssl/buildlink3.mk"
Index: pkgsrc/databases/leveldb/Makefile
diff -u pkgsrc/databases/leveldb/Makefile:1.4 pkgsrc/databases/leveldb/Makefile:1.5
--- pkgsrc/databases/leveldb/Makefile:1.4 Fri Aug 5 13:02:02 2022
+++ pkgsrc/databases/leveldb/Makefile Sun Aug 25 06:18:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/08/05 13:02:02 adam Exp $
+# $NetBSD: Makefile,v 1.5 2024/08/25 06:18:28 wiz Exp $
DISTNAME= leveldb-1.23
CATEGORIES= databases
@@ -11,9 +11,9 @@ LICENSE= modified-bsd
USE_CMAKE= yes
USE_LANGUAGES= c c++11
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DLEVELDB_BUILD_BENCHMARKS=OFF
-CMAKE_ARGS+= -DLEVELDB_BUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DLEVELDB_BUILD_BENCHMARKS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLEVELDB_BUILD_TESTS=OFF
CFLAGS+= -fPIC
Index: pkgsrc/databases/mariadb1011-client/Makefile
diff -u pkgsrc/databases/mariadb1011-client/Makefile:1.11 pkgsrc/databases/mariadb1011-client/Makefile:1.12
--- pkgsrc/databases/mariadb1011-client/Makefile:1.11 Sat Aug 17 00:19:21 2024
+++ pkgsrc/databases/mariadb1011-client/Makefile Sun Aug 25 06:18:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2024/08/17 00:19:21 nia Exp $
+# $NetBSD: Makefile,v 1.12 2024/08/25 06:18:28 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
COMMENT= MariaDB 10.11, a free MySQL compatible database (client)
@@ -7,13 +7,13 @@ CONFLICTS= mysql-client-[0-9]*
.include "Makefile.common"
-CMAKE_ARGS+= -DWITHOUT_SERVER=ON
-CMAKE_ARGS+= -DWITH_WSREP=OFF
-CMAKE_ARGS+= -DWITH_LIBFMT=system
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_SERVER=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_WSREP=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_LIBFMT=system
INSTALL_DIRS+= client include libmariadb man scripts
-CMAKE_ARGS.NetBSD+= -DTGOTOLIB=-ltermcap
+CMAKE_CONFIGURE_ARGS.NetBSD+= -DTGOTOLIB=-ltermcap
.include "options.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/databases/mariadb1011-client/Makefile.common
diff -u pkgsrc/databases/mariadb1011-client/Makefile.common:1.14 pkgsrc/databases/mariadb1011-client/Makefile.common:1.15
--- pkgsrc/databases/mariadb1011-client/Makefile.common:1.14 Sat Aug 17 00:19:21 2024
+++ pkgsrc/databases/mariadb1011-client/Makefile.common Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2024/08/17 00:19:21 nia Exp $
+# $NetBSD: Makefile.common,v 1.15 2024/08/25 06:18:29 wiz Exp $
#
# used by databases/mariadb1011-client/Makefile
# used by databases/mariadb1011-server/Makefile
@@ -36,66 +36,66 @@ MARIADB_EXTRA_CHARSET?= ${MYSQL_EXTRA_CH
BUILD_DEFS+= VARBASE
-CMAKE_ARGS+= -DCOMPILATION_COMMENT="pkgsrc"
-CMAKE_ARGS+= -DMANUFACTURER="pkgsrc"
+CMAKE_CONFIGURE_ARGS+= -DCOMPILATION_COMMENT="pkgsrc"
+CMAKE_CONFIGURE_ARGS+= -DMANUFACTURER="pkgsrc"
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DINSTALL_BINDIR="bin"
-CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
-CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
-CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
-CMAKE_ARGS+= -DINSTALL_INFODIR="${PKGINFODIR}"
-CMAKE_ARGS+= -DINSTALL_LIBDIR="lib"
-CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
-CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
-CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR=""
-CMAKE_ARGS+= -DINSTALL_PAMDIR="lib/security"
-CMAKE_ARGS+= -DINSTALL_PAMDATADIR="share/examples/mariadb_auth_pam"
-CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
-CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin"
-CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
-CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
-CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
-CMAKE_ARGS+= -DINSTALL_SYSCONFDIR="${PKG_SYSCONFDIR}"
-CMAKE_ARGS+= -DMYSQL_DATADIR=${MARIADB_DATADIR}
-
-CMAKE_ARGS+= -DKRB5_CONFIG=${KRB5_CONFIG}
-CMAKE_ARGS+= -DWITH_UNIT_TESTS=OFF
-CMAKE_ARGS+= -DWITH_LIBWRAP=ON
-CMAKE_ARGS+= -DWITH_PCRE="system"
-CMAKE_ARGS+= -DWITH_ZLIB="system"
-CMAKE_ARGS+= -DDEFAULT_CHARSET=${MARIADB_CHARSET}
-CMAKE_ARGS+= -DDEFAULT_COLLATION=${MARIADB_COLLATION:Q}
-CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MARIADB_EXTRA_CHARSET:Q}
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_BINDIR="bin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INFODIR="${PKGINFODIR}"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_LIBDIR="lib"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MYSQLTESTDIR=""
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PAMDIR="lib/security"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PAMDATADIR="share/examples/mariadb_auth_pam"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SBINDIR="sbin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SYSCONFDIR="${PKG_SYSCONFDIR}"
+CMAKE_CONFIGURE_ARGS+= -DMYSQL_DATADIR=${MARIADB_DATADIR}
+
+CMAKE_CONFIGURE_ARGS+= -DKRB5_CONFIG=${KRB5_CONFIG}
+CMAKE_CONFIGURE_ARGS+= -DWITH_UNIT_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_LIBWRAP=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PCRE="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_ZLIB="system"
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_CHARSET=${MARIADB_CHARSET}
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_COLLATION=${MARIADB_COLLATION:Q}
+CMAKE_CONFIGURE_ARGS+= -DWITH_EXTRA_CHARSETS=${MARIADB_EXTRA_CHARSET:Q}
-CMAKE_ARGS+= -DPLUGIN_EXAMPLE=NO
-CMAKE_ARGS+= -DPLUGIN_FEEDBACK=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_EXAMPLE=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_FEEDBACK=NO
# Requires Java
-CMAKE_ARGS+= -DCONNECT_WITH_JDBC=OFF
+CMAKE_CONFIGURE_ARGS+= -DCONNECT_WITH_JDBC=OFF
-CMAKE_ARGS+= -DCONNECT_WITH_LIBXML2=OFF
+CMAKE_CONFIGURE_ARGS+= -DCONNECT_WITH_LIBXML2=OFF
# Options which affect generation of includes
-CMAKE_ARGS+= -DWITH_ARIA_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DWITH_PARTITION_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Snappy=ON
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LZO=ON
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LZ4=ON
-CMAKE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ARIA_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PARTITION_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Snappy=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LZO=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LZ4=ON
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DENABLE_DTRACE=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DTRACE=OFF
# Ensure the correct DTrace ABI is used.
.if !empty(ABI)
-CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
+CMAKE_CONFIGURE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
.endif
# We don't clone MariaDB from git, so avoid peeking into
# the parent repository.
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
# https://github.com/MariaDB/server/pull/2326
# https://github.com/MariaDB/server/pull/2321
Index: pkgsrc/databases/mariadb1011-client/options.mk
diff -u pkgsrc/databases/mariadb1011-client/options.mk:1.1 pkgsrc/databases/mariadb1011-client/options.mk:1.2
--- pkgsrc/databases/mariadb1011-client/options.mk:1.1 Mon Jul 10 22:55:49 2023
+++ pkgsrc/databases/mariadb1011-client/options.mk Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/07/10 22:55:49 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:29 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-client
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS+= ssl
# Enable OpenSSL support
.if !empty(PKG_OPTIONS:Mssl)
.include "../../security/openssl/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_SSL=system
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=system
.else
-CMAKE_ARGS+= -DWITH_SSL=no
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=no
.endif
Index: pkgsrc/databases/mariadb1011-embedded/Makefile
diff -u pkgsrc/databases/mariadb1011-embedded/Makefile:1.7 pkgsrc/databases/mariadb1011-embedded/Makefile:1.8
--- pkgsrc/databases/mariadb1011-embedded/Makefile:1.7 Sat Aug 17 00:19:21 2024
+++ pkgsrc/databases/mariadb1011-embedded/Makefile Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2024/08/17 00:19:21 nia Exp $
+# $NetBSD: Makefile,v 1.8 2024/08/25 06:18:29 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-embedded-/}
COMMENT= MariaDB 10.11, a free MySQL compatible database (embedded)
@@ -14,8 +14,8 @@ DEPENDS+= mariadb-client-10.11.*:../../d
#
# This is ugly, so if you know a better solution, please improve this.
-CMAKE_ARGS+= -DCONNECT_WITH_MONGO=NO
-CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
+CMAKE_CONFIGURE_ARGS+= -DCONNECT_WITH_MONGO=NO
+CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
post-install:
for file in \
Index: pkgsrc/databases/mariadb1011-server/Makefile
diff -u pkgsrc/databases/mariadb1011-server/Makefile:1.14 pkgsrc/databases/mariadb1011-server/Makefile:1.15
--- pkgsrc/databases/mariadb1011-server/Makefile:1.14 Mon Aug 19 09:09:48 2024
+++ pkgsrc/databases/mariadb1011-server/Makefile Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2024/08/19 09:09:48 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2024/08/25 06:18:29 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
PKGREVISION= 1
@@ -35,9 +35,9 @@ RCD_SCRIPTS= mariadb
SMF_NAME= mariadb
SMF_METHODS= ${RCD_SCRIPTS}
-CMAKE_ARGS+= -DCONNECT_WITH_MONGO=NO
-CMAKE_ARGS+= -DHAVE_LIBCRACK=OFF
-CMAKE_ARGS+= -DWITH_SYSTEMD=no
+CMAKE_CONFIGURE_ARGS+= -DCONNECT_WITH_MONGO=NO
+CMAKE_CONFIGURE_ARGS+= -DHAVE_LIBCRACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SYSTEMD=no
FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
FILES_SUBST+= MARIADB_DATADIR=${MARIADB_DATADIR}
Index: pkgsrc/databases/mariadb1011-server/options.mk
diff -u pkgsrc/databases/mariadb1011-server/options.mk:1.1 pkgsrc/databases/mariadb1011-server/options.mk:1.2
--- pkgsrc/databases/mariadb1011-server/options.mk:1.1 Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-server/options.mk Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/07/10 22:55:50 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:29 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-server
@@ -21,88 +21,88 @@ PKG_SUGGESTED_OPTIONS+= auth-pam
.if !empty(PKG_OPTIONS:Mcolumnstore)
.include "../../devel/boost-headers/buildlink3.mk"
-CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=YES
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_COLUMNSTORE=YES
.else
-CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_COLUMNSTORE=NO
.endif
PLIST_VARS+= embedded
.if !empty(PKG_OPTIONS:Membedded-server)
-CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
PLIST.embedded= yes
.else
-CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=OFF
.endif
.if !empty(PKG_OPTIONS:Mlzo)
.include "../../archivers/lzo/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_INNODB_LZO=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZO=ON
.else
-CMAKE_ARGS+= -DWITH_INNODB_LZO=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZO=OFF
.endif
.if !empty(PKG_OPTIONS:Mlz4)
.include "../../archivers/lz4/buildlink3.mk"
-CMAKE_ARGS+= -DGRN_WITH_LZ4=ON
-CMAKE_ARGS+= -DWITH_INNODB_LZ4=ON
-CMAKE_ARGS+= -DWITH_ROCKSDB_LZ4=ON
-.else
-CMAKE_ARGS+= -DGRN_WITH_LZ4=OFF
-CMAKE_ARGS+= -DWITH_INNODB_LZ4=OFF
-CMAKE_ARGS+= -DWITH_ROCKSDB_LZ4=OFF
+CMAKE_CONFIGURE_ARGS+= -DGRN_WITH_LZ4=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZ4=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_LZ4=ON
+.else
+CMAKE_CONFIGURE_ARGS+= -DGRN_WITH_LZ4=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZ4=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_LZ4=OFF
.endif
PLIST_VARS+= oqgraph
.if !empty(PKG_OPTIONS:Moqgraph)
-CMAKE_ARGS+= -DPLUGIN_OQGRAPH=YES
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_OQGRAPH=YES
PLIST.oqgraph= yes
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/libjudy/buildlink3.mk"
.else
-CMAKE_ARGS+= -DPLUGIN_OQGRAPH=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_OQGRAPH=NO
.endif
PLIST_VARS+= rocksdb
.if !empty(PKG_OPTIONS:Mrocksdb)
.include "../../lang/python/application.mk"
PLIST.rocksdb= yes
-CMAKE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=OFF
-CMAKE_ARGS+= -DPYTHON_SHEBANG=${PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=OFF
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_SHEBANG=${PYTHONBIN}
.else
-CMAKE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=ON
.endif
.if !empty(PKG_OPTIONS:Msnappy)
.include "../../devel/snappy/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_INNODB_SNAPPY=ON
-CMAKE_ARGS+= -DWITH_ROCKSDB_snappy=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_SNAPPY=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_snappy=ON
.else
-CMAKE_ARGS+= -DWITH_INNODB_SNAPPY=OFF
-CMAKE_ARGS+= -DWITH_ROCKSDB_snappy=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_SNAPPY=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_snappy=OFF
.endif
# Enable OpenSSL support
.if !empty(PKG_OPTIONS:Mssl)
.include "../../security/openssl/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_SSL=system
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=system
LDFLAGS+= -lcrypto -lssl
.else
-CMAKE_ARGS+= -DWITH_SSL=no
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=no
.endif
.if !empty(PKG_OPTIONS:Mzstd)
.include "../../archivers/zstd/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_ROCKSDB_zstd=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_zstd=ON
.else
-CMAKE_ARGS+= -DWITH_ROCKSDB_zstd=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_zstd=OFF
.endif
PLIST_VARS+= auth_pam
.if !empty(PKG_OPTIONS:Mauth-pam)
-CMAKE_ARGS+= -DPLUGIN_AUTH_PAM=YES
-CMAKE_ARGS+= -DPLUGIN_AUTH_PAM_V1=YES
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM=YES
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM_V1=YES
PLIST.auth_pam= yes
.else
-CMAKE_ARGS+= -DPLUGIN_AUTH_PAM=NO
-CMAKE_ARGS+= -DPLUGIN_AUTH_PAM_V1=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM_V1=NO
.endif
Index: pkgsrc/databases/mariadb105-client/Makefile
diff -u pkgsrc/databases/mariadb105-client/Makefile:1.22 pkgsrc/databases/mariadb105-client/Makefile:1.23
--- pkgsrc/databases/mariadb105-client/Makefile:1.22 Sat Aug 17 00:57:32 2024
+++ pkgsrc/databases/mariadb105-client/Makefile Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2024/08/17 00:57:32 nia Exp $
+# $NetBSD: Makefile,v 1.23 2024/08/25 06:18:29 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
COMMENT= MariaDB 10.5, a free MySQL compatible database (client)
@@ -7,8 +7,8 @@ CONFLICTS= mysql-client-[0-9]*
.include "Makefile.common"
-CMAKE_ARGS+= -DWITHOUT_SERVER=ON
-CMAKE_ARGS+= -DWITH_WSREP=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_SERVER=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_WSREP=OFF
INSTALL_DIRS+= client include libmariadb man scripts
Index: pkgsrc/databases/mariadb105-client/Makefile.common
diff -u pkgsrc/databases/mariadb105-client/Makefile.common:1.32 pkgsrc/databases/mariadb105-client/Makefile.common:1.33
--- pkgsrc/databases/mariadb105-client/Makefile.common:1.32 Sat Aug 17 00:57:32 2024
+++ pkgsrc/databases/mariadb105-client/Makefile.common Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2024/08/17 00:57:32 nia Exp $
+# $NetBSD: Makefile.common,v 1.33 2024/08/25 06:18:29 wiz Exp $
#
# used by databases/mariadb105-client/Makefile
# used by databases/mariadb105-server/Makefile
@@ -35,60 +35,60 @@ MARIADB_EXTRA_CHARSET?= ${MYSQL_EXTRA_CH
BUILD_DEFS+= VARBASE
-CMAKE_ARGS+= -DCOMPILATION_COMMENT="pkgsrc"
-CMAKE_ARGS+= -DMANUFACTURER="pkgsrc"
+CMAKE_CONFIGURE_ARGS+= -DCOMPILATION_COMMENT="pkgsrc"
+CMAKE_CONFIGURE_ARGS+= -DMANUFACTURER="pkgsrc"
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DINSTALL_BINDIR="bin"
-CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
-CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
-CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
-CMAKE_ARGS+= -DINSTALL_INFODIR="${PKGINFODIR}"
-CMAKE_ARGS+= -DINSTALL_LIBDIR="lib"
-CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
-CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
-CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR=""
-CMAKE_ARGS+= -DINSTALL_PAMDIR="lib/security"
-CMAKE_ARGS+= -DINSTALL_PAMDATADIR="share/examples/mariadb_auth_pam"
-CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
-CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin"
-CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
-CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
-CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
-CMAKE_ARGS+= -DINSTALL_SYSCONFDIR="${PKG_SYSCONFDIR}"
-CMAKE_ARGS+= -DMYSQL_DATADIR=${MARIADB_DATADIR}
-
-CMAKE_ARGS+= -DWITH_UNIT_TESTS=OFF
-CMAKE_ARGS+= -DWITH_LIBWRAP=ON
-CMAKE_ARGS+= -DWITH_PCRE="system"
-CMAKE_ARGS+= -DWITH_ZLIB="system"
-CMAKE_ARGS+= -DDEFAULT_CHARSET=${MARIADB_CHARSET}
-CMAKE_ARGS+= -DDEFAULT_COLLATION=${MARIADB_COLLATION:Q}
-CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MARIADB_EXTRA_CHARSET:Q}
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_BINDIR="bin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INFODIR="${PKGINFODIR}"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_LIBDIR="lib"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MYSQLTESTDIR=""
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PAMDIR="lib/security"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PAMDATADIR="share/examples/mariadb_auth_pam"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SBINDIR="sbin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SYSCONFDIR="${PKG_SYSCONFDIR}"
+CMAKE_CONFIGURE_ARGS+= -DMYSQL_DATADIR=${MARIADB_DATADIR}
+
+CMAKE_CONFIGURE_ARGS+= -DWITH_UNIT_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_LIBWRAP=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PCRE="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_ZLIB="system"
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_CHARSET=${MARIADB_CHARSET}
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_COLLATION=${MARIADB_COLLATION:Q}
+CMAKE_CONFIGURE_ARGS+= -DWITH_EXTRA_CHARSETS=${MARIADB_EXTRA_CHARSET:Q}
-CMAKE_ARGS+= -DPLUGIN_EXAMPLE=NO
-CMAKE_ARGS+= -DPLUGIN_FEEDBACK=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_EXAMPLE=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_FEEDBACK=NO
# Requires Java
-CMAKE_ARGS+= -DCONNECT_WITH_JDBC=OFF
+CMAKE_CONFIGURE_ARGS+= -DCONNECT_WITH_JDBC=OFF
-CMAKE_ARGS+= -DCONNECT_WITH_LIBXML2=OFF
+CMAKE_CONFIGURE_ARGS+= -DCONNECT_WITH_LIBXML2=OFF
# Options which affect generation of includes
-CMAKE_ARGS+= -DWITH_ARIA_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DWITH_PARTITION_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ARIA_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PARTITION_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DENABLE_DTRACE=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DTRACE=OFF
-CMAKE_ARGS+= -DTOKUDB_OK=OFF
+CMAKE_CONFIGURE_ARGS+= -DTOKUDB_OK=OFF
# Ensure the correct DTrace ABI is used.
.if !empty(ABI)
-CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
+CMAKE_CONFIGURE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
.endif
CFLAGS.SunOS+= -fPIC
Index: pkgsrc/databases/mariadb105-client/options.mk
diff -u pkgsrc/databases/mariadb105-client/options.mk:1.1 pkgsrc/databases/mariadb105-client/options.mk:1.2
--- pkgsrc/databases/mariadb105-client/options.mk:1.1 Sun May 23 15:32:47 2021
+++ pkgsrc/databases/mariadb105-client/options.mk Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2021/05/23 15:32:47 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:29 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-client
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS+= ssl
# Enable OpenSSL support
.if !empty(PKG_OPTIONS:Mssl)
.include "../../security/openssl/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_SSL=system
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=system
.else
-CMAKE_ARGS+= -DWITH_SSL=no
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=no
.endif
Index: pkgsrc/databases/mariadb105-server/Makefile
diff -u pkgsrc/databases/mariadb105-server/Makefile:1.45 pkgsrc/databases/mariadb105-server/Makefile:1.46
--- pkgsrc/databases/mariadb105-server/Makefile:1.45 Sat Aug 17 00:57:32 2024
+++ pkgsrc/databases/mariadb105-server/Makefile Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2024/08/17 00:57:32 nia Exp $
+# $NetBSD: Makefile,v 1.46 2024/08/25 06:18:29 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
COMMENT= MariaDB 10.5, a free MySQL compatible database (server)
@@ -34,7 +34,7 @@ RCD_SCRIPTS= mariadb
SMF_NAME= mariadb
SMF_METHODS= ${RCD_SCRIPTS}
-CMAKE_ARGS+= -DCONNECT_WITH_MONGO=NO
+CMAKE_CONFIGURE_ARGS+= -DCONNECT_WITH_MONGO=NO
FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
FILES_SUBST+= MARIADB_DATADIR=${MARIADB_DATADIR}
Index: pkgsrc/databases/mariadb105-server/options.mk
diff -u pkgsrc/databases/mariadb105-server/options.mk:1.5 pkgsrc/databases/mariadb105-server/options.mk:1.6
--- pkgsrc/databases/mariadb105-server/options.mk:1.5 Mon Jul 12 22:40:00 2021
+++ pkgsrc/databases/mariadb105-server/options.mk Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2021/07/12 22:40:00 nia Exp $
+# $NetBSD: options.mk,v 1.6 2024/08/25 06:18:29 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-server
@@ -13,78 +13,78 @@ PKG_SUGGESTED_OPTIONS= ssl
.if !empty(PKG_OPTIONS:Mcolumnstore)
.include "../../devel/boost-headers/buildlink3.mk"
-CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=YES
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_COLUMNSTORE=YES
.else
-CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_COLUMNSTORE=NO
.endif
PLIST_VARS+= embedded
.if !empty(PKG_OPTIONS:Membedded-server)
-CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
PLIST.embedded= yes
.else
-CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=OFF
.endif
.if !empty(PKG_OPTIONS:Mlzo)
.include "../../archivers/lzo/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_INNODB_LZO=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZO=ON
.else
-CMAKE_ARGS+= -DWITH_INNODB_LZO=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZO=OFF
.endif
.if !empty(PKG_OPTIONS:Mlz4)
.include "../../archivers/lz4/buildlink3.mk"
-CMAKE_ARGS+= -DGRN_WITH_LZ4=ON
-CMAKE_ARGS+= -DWITH_INNODB_LZ4=ON
-CMAKE_ARGS+= -DWITH_ROCKSDB_LZ4=ON
-.else
-CMAKE_ARGS+= -DGRN_WITH_LZ4=OFF
-CMAKE_ARGS+= -DWITH_INNODB_LZ4=OFF
-CMAKE_ARGS+= -DWITH_ROCKSDB_LZ4=OFF
+CMAKE_CONFIGURE_ARGS+= -DGRN_WITH_LZ4=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZ4=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_LZ4=ON
+.else
+CMAKE_CONFIGURE_ARGS+= -DGRN_WITH_LZ4=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZ4=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_LZ4=OFF
.endif
PLIST_VARS+= oqgraph
.if !empty(PKG_OPTIONS:Moqgraph)
-CMAKE_ARGS+= -DPLUGIN_OQGRAPH=YES
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_OQGRAPH=YES
PLIST.oqgraph= yes
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/libjudy/buildlink3.mk"
.else
-CMAKE_ARGS+= -DPLUGIN_OQGRAPH=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_OQGRAPH=NO
.endif
PLIST_VARS+= rocksdb
.if !empty(PKG_OPTIONS:Mrocksdb)
.include "../../lang/python/application.mk"
PLIST.rocksdb= yes
-CMAKE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=OFF
-CMAKE_ARGS+= -DPYTHON_SHEBANG=${PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=OFF
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_SHEBANG=${PYTHONBIN}
.else
-CMAKE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=ON
.endif
.if !empty(PKG_OPTIONS:Msnappy)
.include "../../devel/snappy/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_INNODB_SNAPPY=ON
-CMAKE_ARGS+= -DWITH_ROCKSDB_snappy=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_SNAPPY=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_snappy=ON
.else
-CMAKE_ARGS+= -DWITH_INNODB_SNAPPY=OFF
-CMAKE_ARGS+= -DWITH_ROCKSDB_snappy=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_SNAPPY=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_snappy=OFF
.endif
# Enable OpenSSL support
.if !empty(PKG_OPTIONS:Mssl)
.include "../../security/openssl/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_SSL=system
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=system
LDFLAGS+= -lcrypto -lssl
.else
-CMAKE_ARGS+= -DWITH_SSL=no
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=no
.endif
.if !empty(PKG_OPTIONS:Mzstd)
.include "../../archivers/zstd/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_ROCKSDB_zstd=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_zstd=ON
.else
-CMAKE_ARGS+= -DWITH_ROCKSDB_zstd=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_zstd=OFF
.endif
Index: pkgsrc/databases/mariadb106-client/Makefile
diff -u pkgsrc/databases/mariadb106-client/Makefile:1.19 pkgsrc/databases/mariadb106-client/Makefile:1.20
--- pkgsrc/databases/mariadb106-client/Makefile:1.19 Sat Aug 17 00:06:23 2024
+++ pkgsrc/databases/mariadb106-client/Makefile Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/08/17 00:06:23 nia Exp $
+# $NetBSD: Makefile,v 1.20 2024/08/25 06:18:29 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
COMMENT= MariaDB 10.6, a free MySQL compatible database (client)
@@ -7,12 +7,12 @@ CONFLICTS= mysql-client-[0-9]*
.include "Makefile.common"
-CMAKE_ARGS+= -DWITHOUT_SERVER=ON
-CMAKE_ARGS+= -DWITH_WSREP=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_SERVER=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_WSREP=OFF
INSTALL_DIRS+= client include libmariadb man scripts
-CMAKE_ARGS.NetBSD+= -DTGOTOLIB=-ltermcap
+CMAKE_CONFIGURE_ARGS.NetBSD+= -DTGOTOLIB=-ltermcap
.include "options.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/databases/mariadb106-client/Makefile.common
diff -u pkgsrc/databases/mariadb106-client/Makefile.common:1.28 pkgsrc/databases/mariadb106-client/Makefile.common:1.29
--- pkgsrc/databases/mariadb106-client/Makefile.common:1.28 Sat Aug 17 00:06:23 2024
+++ pkgsrc/databases/mariadb106-client/Makefile.common Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2024/08/17 00:06:23 nia Exp $
+# $NetBSD: Makefile.common,v 1.29 2024/08/25 06:18:29 wiz Exp $
#
# used by databases/mariadb106-client/Makefile
# used by databases/mariadb106-server/Makefile
@@ -35,57 +35,57 @@ MARIADB_EXTRA_CHARSET?= ${MYSQL_EXTRA_CH
BUILD_DEFS+= VARBASE
-CMAKE_ARGS+= -DCOMPILATION_COMMENT="pkgsrc"
+CMAKE_CONFIGURE_ARGS+= -DCOMPILATION_COMMENT="pkgsrc"
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DINSTALL_BINDIR="bin"
-CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
-CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
-CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
-CMAKE_ARGS+= -DINSTALL_INFODIR="${PKGINFODIR}"
-CMAKE_ARGS+= -DINSTALL_LIBDIR="lib"
-CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
-CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
-CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR=""
-CMAKE_ARGS+= -DINSTALL_PAMDIR="lib/security"
-CMAKE_ARGS+= -DINSTALL_PAMDATADIR="share/examples/mariadb_auth_pam"
-CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
-CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin"
-CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
-CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
-CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
-CMAKE_ARGS+= -DINSTALL_SYSCONFDIR="${PKG_SYSCONFDIR}"
-CMAKE_ARGS+= -DMYSQL_DATADIR=${MARIADB_DATADIR}
-
-CMAKE_ARGS+= -DWITH_UNIT_TESTS=OFF
-CMAKE_ARGS+= -DWITH_LIBWRAP=ON
-CMAKE_ARGS+= -DWITH_PCRE="system"
-CMAKE_ARGS+= -DWITH_ZLIB="system"
-CMAKE_ARGS+= -DDEFAULT_CHARSET=${MARIADB_CHARSET}
-CMAKE_ARGS+= -DDEFAULT_COLLATION=${MARIADB_COLLATION:Q}
-CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MARIADB_EXTRA_CHARSET:Q}
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_BINDIR="bin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INFODIR="${PKGINFODIR}"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_LIBDIR="lib"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MYSQLTESTDIR=""
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PAMDIR="lib/security"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PAMDATADIR="share/examples/mariadb_auth_pam"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SBINDIR="sbin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SYSCONFDIR="${PKG_SYSCONFDIR}"
+CMAKE_CONFIGURE_ARGS+= -DMYSQL_DATADIR=${MARIADB_DATADIR}
+
+CMAKE_CONFIGURE_ARGS+= -DWITH_UNIT_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_LIBWRAP=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PCRE="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_ZLIB="system"
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_CHARSET=${MARIADB_CHARSET}
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_COLLATION=${MARIADB_COLLATION:Q}
+CMAKE_CONFIGURE_ARGS+= -DWITH_EXTRA_CHARSETS=${MARIADB_EXTRA_CHARSET:Q}
-CMAKE_ARGS+= -DPLUGIN_EXAMPLE=NO
-CMAKE_ARGS+= -DPLUGIN_FEEDBACK=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_EXAMPLE=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_FEEDBACK=NO
# Requires Java
-CMAKE_ARGS+= -DCONNECT_WITH_JDBC=OFF
+CMAKE_CONFIGURE_ARGS+= -DCONNECT_WITH_JDBC=OFF
-CMAKE_ARGS+= -DCONNECT_WITH_LIBXML2=OFF
+CMAKE_CONFIGURE_ARGS+= -DCONNECT_WITH_LIBXML2=OFF
# Options which affect generation of includes
-CMAKE_ARGS+= -DWITH_ARIA_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DWITH_PARTITION_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ARIA_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PARTITION_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DENABLE_DTRACE=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DTRACE=OFF
# Ensure the correct DTrace ABI is used.
.if !empty(ABI)
-CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
+CMAKE_CONFIGURE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
.endif
# https://github.com/MariaDB/server/pull/2326
Index: pkgsrc/databases/mariadb106-client/options.mk
diff -u pkgsrc/databases/mariadb106-client/options.mk:1.1 pkgsrc/databases/mariadb106-client/options.mk:1.2
--- pkgsrc/databases/mariadb106-client/options.mk:1.1 Wed Aug 4 15:47:24 2021
+++ pkgsrc/databases/mariadb106-client/options.mk Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2021/08/04 15:47:24 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:29 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-client
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS+= ssl
# Enable OpenSSL support
.if !empty(PKG_OPTIONS:Mssl)
.include "../../security/openssl/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_SSL=system
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=system
.else
-CMAKE_ARGS+= -DWITH_SSL=no
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=no
.endif
Index: pkgsrc/databases/mariadb106-server/Makefile
diff -u pkgsrc/databases/mariadb106-server/Makefile:1.35 pkgsrc/databases/mariadb106-server/Makefile:1.36
--- pkgsrc/databases/mariadb106-server/Makefile:1.35 Sat Aug 17 00:06:23 2024
+++ pkgsrc/databases/mariadb106-server/Makefile Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2024/08/17 00:06:23 nia Exp $
+# $NetBSD: Makefile,v 1.36 2024/08/25 06:18:29 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
COMMENT= MariaDB 10.6, a free MySQL compatible database (server)
@@ -34,7 +34,7 @@ RCD_SCRIPTS= mariadb
SMF_NAME= mariadb
SMF_METHODS= ${RCD_SCRIPTS}
-CMAKE_ARGS+= -DCONNECT_WITH_MONGO=NO
+CMAKE_CONFIGURE_ARGS+= -DCONNECT_WITH_MONGO=NO
FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
FILES_SUBST+= MARIADB_DATADIR=${MARIADB_DATADIR}
Index: pkgsrc/databases/mariadb106-server/options.mk
diff -u pkgsrc/databases/mariadb106-server/options.mk:1.3 pkgsrc/databases/mariadb106-server/options.mk:1.4
--- pkgsrc/databases/mariadb106-server/options.mk:1.3 Wed Apr 20 17:29:06 2022
+++ pkgsrc/databases/mariadb106-server/options.mk Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2022/04/20 17:29:06 tm Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:29 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-server
@@ -21,88 +21,88 @@ PKG_SUGGESTED_OPTIONS+= auth-pam
.if !empty(PKG_OPTIONS:Mcolumnstore)
.include "../../devel/boost-headers/buildlink3.mk"
-CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=YES
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_COLUMNSTORE=YES
.else
-CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_COLUMNSTORE=NO
.endif
PLIST_VARS+= embedded
.if !empty(PKG_OPTIONS:Membedded-server)
-CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
PLIST.embedded= yes
.else
-CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=OFF
.endif
.if !empty(PKG_OPTIONS:Mlzo)
.include "../../archivers/lzo/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_INNODB_LZO=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZO=ON
.else
-CMAKE_ARGS+= -DWITH_INNODB_LZO=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZO=OFF
.endif
.if !empty(PKG_OPTIONS:Mlz4)
.include "../../archivers/lz4/buildlink3.mk"
-CMAKE_ARGS+= -DGRN_WITH_LZ4=ON
-CMAKE_ARGS+= -DWITH_INNODB_LZ4=ON
-CMAKE_ARGS+= -DWITH_ROCKSDB_LZ4=ON
-.else
-CMAKE_ARGS+= -DGRN_WITH_LZ4=OFF
-CMAKE_ARGS+= -DWITH_INNODB_LZ4=OFF
-CMAKE_ARGS+= -DWITH_ROCKSDB_LZ4=OFF
+CMAKE_CONFIGURE_ARGS+= -DGRN_WITH_LZ4=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZ4=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_LZ4=ON
+.else
+CMAKE_CONFIGURE_ARGS+= -DGRN_WITH_LZ4=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZ4=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_LZ4=OFF
.endif
PLIST_VARS+= oqgraph
.if !empty(PKG_OPTIONS:Moqgraph)
-CMAKE_ARGS+= -DPLUGIN_OQGRAPH=YES
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_OQGRAPH=YES
PLIST.oqgraph= yes
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/libjudy/buildlink3.mk"
.else
-CMAKE_ARGS+= -DPLUGIN_OQGRAPH=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_OQGRAPH=NO
.endif
PLIST_VARS+= rocksdb
.if !empty(PKG_OPTIONS:Mrocksdb)
.include "../../lang/python/application.mk"
PLIST.rocksdb= yes
-CMAKE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=OFF
-CMAKE_ARGS+= -DPYTHON_SHEBANG=${PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=OFF
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_SHEBANG=${PYTHONBIN}
.else
-CMAKE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=ON
.endif
.if !empty(PKG_OPTIONS:Msnappy)
.include "../../devel/snappy/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_INNODB_SNAPPY=ON
-CMAKE_ARGS+= -DWITH_ROCKSDB_snappy=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_SNAPPY=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_snappy=ON
.else
-CMAKE_ARGS+= -DWITH_INNODB_SNAPPY=OFF
-CMAKE_ARGS+= -DWITH_ROCKSDB_snappy=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_SNAPPY=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_snappy=OFF
.endif
# Enable OpenSSL support
.if !empty(PKG_OPTIONS:Mssl)
.include "../../security/openssl/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_SSL=system
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=system
LDFLAGS+= -lcrypto -lssl
.else
-CMAKE_ARGS+= -DWITH_SSL=no
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=no
.endif
.if !empty(PKG_OPTIONS:Mzstd)
.include "../../archivers/zstd/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_ROCKSDB_zstd=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_zstd=ON
.else
-CMAKE_ARGS+= -DWITH_ROCKSDB_zstd=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_zstd=OFF
.endif
PLIST_VARS+= auth_pam
.if !empty(PKG_OPTIONS:Mauth-pam)
-CMAKE_ARGS+= -DPLUGIN_AUTH_PAM=YES
-CMAKE_ARGS+= -DPLUGIN_AUTH_PAM_V1=YES
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM=YES
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM_V1=YES
PLIST.auth_pam= yes
.else
-CMAKE_ARGS+= -DPLUGIN_AUTH_PAM=NO
-CMAKE_ARGS+= -DPLUGIN_AUTH_PAM_V1=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM_V1=NO
.endif
Index: pkgsrc/databases/mariadb114-client/Makefile
diff -u pkgsrc/databases/mariadb114-client/Makefile:1.1 pkgsrc/databases/mariadb114-client/Makefile:1.2
--- pkgsrc/databases/mariadb114-client/Makefile:1.1 Wed Aug 21 21:08:33 2024
+++ pkgsrc/databases/mariadb114-client/Makefile Sun Aug 25 06:18:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/08/21 21:08:33 nia Exp $
+# $NetBSD: Makefile,v 1.2 2024/08/25 06:18:29 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
COMMENT= MariaDB 11.4, a free MySQL compatible database (client)
@@ -7,13 +7,13 @@ CONFLICTS= mysql-client-[0-9]*
.include "Makefile.common"
-CMAKE_ARGS+= -DWITHOUT_SERVER=ON
-CMAKE_ARGS+= -DWITH_WSREP=OFF
-CMAKE_ARGS+= -DWITH_LIBFMT=system
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_SERVER=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_WSREP=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_LIBFMT=system
INSTALL_DIRS+= client include libmariadb man scripts
-CMAKE_ARGS.NetBSD+= -DTGOTOLIB=-ltermcap
+CMAKE_CONFIGURE_ARGS.NetBSD+= -DTGOTOLIB=-ltermcap
.include "options.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/databases/mariadb114-client/Makefile.common
diff -u pkgsrc/databases/mariadb114-client/Makefile.common:1.1 pkgsrc/databases/mariadb114-client/Makefile.common:1.2
--- pkgsrc/databases/mariadb114-client/Makefile.common:1.1 Wed Aug 21 21:08:33 2024
+++ pkgsrc/databases/mariadb114-client/Makefile.common Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2024/08/21 21:08:33 nia Exp $
+# $NetBSD: Makefile.common,v 1.2 2024/08/25 06:18:30 wiz Exp $
#
# used by databases/mariadb114-client/Makefile
# used by databases/mariadb114-server/Makefile
@@ -35,66 +35,66 @@ MARIADB_EXTRA_CHARSET?= ${MYSQL_EXTRA_CH
BUILD_DEFS+= VARBASE
-CMAKE_ARGS+= -DCOMPILATION_COMMENT="pkgsrc"
-CMAKE_ARGS+= -DMANUFACTURER="pkgsrc"
+CMAKE_CONFIGURE_ARGS+= -DCOMPILATION_COMMENT="pkgsrc"
+CMAKE_CONFIGURE_ARGS+= -DMANUFACTURER="pkgsrc"
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DINSTALL_BINDIR="bin"
-CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
-CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
-CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
-CMAKE_ARGS+= -DINSTALL_INFODIR="${PKGINFODIR}"
-CMAKE_ARGS+= -DINSTALL_LIBDIR="lib"
-CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
-CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
-CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR=""
-CMAKE_ARGS+= -DINSTALL_PAMDIR="lib/security"
-CMAKE_ARGS+= -DINSTALL_PAMDATADIR="share/examples/mariadb_auth_pam"
-CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
-CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin"
-CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
-CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
-CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
-CMAKE_ARGS+= -DINSTALL_SYSCONFDIR="${PKG_SYSCONFDIR}"
-CMAKE_ARGS+= -DMYSQL_DATADIR=${MARIADB_DATADIR}
-
-CMAKE_ARGS+= -DKRB5_CONFIG=${KRB5_CONFIG}
-CMAKE_ARGS+= -DWITH_UNIT_TESTS=OFF
-CMAKE_ARGS+= -DWITH_LIBWRAP=ON
-CMAKE_ARGS+= -DWITH_PCRE="system"
-CMAKE_ARGS+= -DWITH_ZLIB="system"
-CMAKE_ARGS+= -DDEFAULT_CHARSET=${MARIADB_CHARSET}
-CMAKE_ARGS+= -DDEFAULT_COLLATION=${MARIADB_COLLATION:Q}
-CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MARIADB_EXTRA_CHARSET:Q}
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_BINDIR="bin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INFODIR="${PKGINFODIR}"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_LIBDIR="lib"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MYSQLTESTDIR=""
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PAMDIR="lib/security"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PAMDATADIR="share/examples/mariadb_auth_pam"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SBINDIR="sbin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SYSCONFDIR="${PKG_SYSCONFDIR}"
+CMAKE_CONFIGURE_ARGS+= -DMYSQL_DATADIR=${MARIADB_DATADIR}
+
+CMAKE_CONFIGURE_ARGS+= -DKRB5_CONFIG=${KRB5_CONFIG}
+CMAKE_CONFIGURE_ARGS+= -DWITH_UNIT_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_LIBWRAP=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PCRE="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_ZLIB="system"
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_CHARSET=${MARIADB_CHARSET}
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_COLLATION=${MARIADB_COLLATION:Q}
+CMAKE_CONFIGURE_ARGS+= -DWITH_EXTRA_CHARSETS=${MARIADB_EXTRA_CHARSET:Q}
-CMAKE_ARGS+= -DPLUGIN_EXAMPLE=NO
-CMAKE_ARGS+= -DPLUGIN_FEEDBACK=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_EXAMPLE=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_FEEDBACK=NO
# Requires Java
-CMAKE_ARGS+= -DCONNECT_WITH_JDBC=OFF
+CMAKE_CONFIGURE_ARGS+= -DCONNECT_WITH_JDBC=OFF
-CMAKE_ARGS+= -DCONNECT_WITH_LIBXML2=OFF
+CMAKE_CONFIGURE_ARGS+= -DCONNECT_WITH_LIBXML2=OFF
# Options which affect generation of includes
-CMAKE_ARGS+= -DWITH_ARIA_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DWITH_PARTITION_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Snappy=ON
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LZO=ON
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LZ4=ON
-CMAKE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ARIA_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PARTITION_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Snappy=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LZO=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LZ4=ON
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=ON
-CMAKE_ARGS+= -DENABLE_DTRACE=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DTRACE=OFF
# Ensure the correct DTrace ABI is used.
.if !empty(ABI)
-CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
+CMAKE_CONFIGURE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
.endif
# We don't clone MariaDB from git, so avoid peeking into
# the parent repository.
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
# https://github.com/MariaDB/server/pull/2326
# https://github.com/MariaDB/server/pull/2321
Index: pkgsrc/databases/mariadb114-client/options.mk
diff -u pkgsrc/databases/mariadb114-client/options.mk:1.1 pkgsrc/databases/mariadb114-client/options.mk:1.2
--- pkgsrc/databases/mariadb114-client/options.mk:1.1 Wed Aug 21 21:08:33 2024
+++ pkgsrc/databases/mariadb114-client/options.mk Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2024/08/21 21:08:33 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:30 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-client
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS+= ssl
# Enable OpenSSL support
.if !empty(PKG_OPTIONS:Mssl)
.include "../../security/openssl/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_SSL=system
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=system
.else
-CMAKE_ARGS+= -DWITH_SSL=no
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=no
.endif
Index: pkgsrc/databases/mariadb114-server/Makefile
diff -u pkgsrc/databases/mariadb114-server/Makefile:1.1 pkgsrc/databases/mariadb114-server/Makefile:1.2
--- pkgsrc/databases/mariadb114-server/Makefile:1.1 Wed Aug 21 21:08:35 2024
+++ pkgsrc/databases/mariadb114-server/Makefile Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/08/21 21:08:35 nia Exp $
+# $NetBSD: Makefile,v 1.2 2024/08/25 06:18:30 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
COMMENT= MariaDB 11.4, a free MySQL compatible database (server)
@@ -34,9 +34,9 @@ RCD_SCRIPTS= mariadb
SMF_NAME= mariadb
SMF_METHODS= ${RCD_SCRIPTS}
-CMAKE_ARGS+= -DCONNECT_WITH_MONGO=NO
-CMAKE_ARGS+= -DHAVE_LIBCRACK=OFF
-CMAKE_ARGS+= -DWITH_SYSTEMD=no
+CMAKE_CONFIGURE_ARGS+= -DCONNECT_WITH_MONGO=NO
+CMAKE_CONFIGURE_ARGS+= -DHAVE_LIBCRACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SYSTEMD=no
FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
FILES_SUBST+= MARIADB_DATADIR=${MARIADB_DATADIR}
Index: pkgsrc/databases/mariadb114-server/options.mk
diff -u pkgsrc/databases/mariadb114-server/options.mk:1.1 pkgsrc/databases/mariadb114-server/options.mk:1.2
--- pkgsrc/databases/mariadb114-server/options.mk:1.1 Wed Aug 21 21:08:35 2024
+++ pkgsrc/databases/mariadb114-server/options.mk Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2024/08/21 21:08:35 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:30 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-server
@@ -21,88 +21,88 @@ PKG_SUGGESTED_OPTIONS+= auth-pam
.if !empty(PKG_OPTIONS:Mcolumnstore)
.include "../../devel/boost-headers/buildlink3.mk"
-CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=YES
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_COLUMNSTORE=YES
.else
-CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_COLUMNSTORE=NO
.endif
PLIST_VARS+= embedded
.if !empty(PKG_OPTIONS:Membedded-server)
-CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
PLIST.embedded= yes
.else
-CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=OFF
.endif
.if !empty(PKG_OPTIONS:Mlzo)
.include "../../archivers/lzo/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_INNODB_LZO=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZO=ON
.else
-CMAKE_ARGS+= -DWITH_INNODB_LZO=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZO=OFF
.endif
.if !empty(PKG_OPTIONS:Mlz4)
.include "../../archivers/lz4/buildlink3.mk"
-CMAKE_ARGS+= -DGRN_WITH_LZ4=ON
-CMAKE_ARGS+= -DWITH_INNODB_LZ4=ON
-CMAKE_ARGS+= -DWITH_ROCKSDB_LZ4=ON
-.else
-CMAKE_ARGS+= -DGRN_WITH_LZ4=OFF
-CMAKE_ARGS+= -DWITH_INNODB_LZ4=OFF
-CMAKE_ARGS+= -DWITH_ROCKSDB_LZ4=OFF
+CMAKE_CONFIGURE_ARGS+= -DGRN_WITH_LZ4=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZ4=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_LZ4=ON
+.else
+CMAKE_CONFIGURE_ARGS+= -DGRN_WITH_LZ4=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_LZ4=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_LZ4=OFF
.endif
PLIST_VARS+= oqgraph
.if !empty(PKG_OPTIONS:Moqgraph)
-CMAKE_ARGS+= -DPLUGIN_OQGRAPH=YES
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_OQGRAPH=YES
PLIST.oqgraph= yes
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/libjudy/buildlink3.mk"
.else
-CMAKE_ARGS+= -DPLUGIN_OQGRAPH=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_OQGRAPH=NO
.endif
PLIST_VARS+= rocksdb
.if !empty(PKG_OPTIONS:Mrocksdb)
.include "../../lang/python/application.mk"
PLIST.rocksdb= yes
-CMAKE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=OFF
-CMAKE_ARGS+= -DPYTHON_SHEBANG=${PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=OFF
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_SHEBANG=${PYTHONBIN}
.else
-CMAKE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=ON
.endif
.if !empty(PKG_OPTIONS:Msnappy)
.include "../../devel/snappy/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_INNODB_SNAPPY=ON
-CMAKE_ARGS+= -DWITH_ROCKSDB_snappy=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_SNAPPY=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_snappy=ON
.else
-CMAKE_ARGS+= -DWITH_INNODB_SNAPPY=OFF
-CMAKE_ARGS+= -DWITH_ROCKSDB_snappy=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_INNODB_SNAPPY=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_snappy=OFF
.endif
# Enable OpenSSL support
.if !empty(PKG_OPTIONS:Mssl)
.include "../../security/openssl/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_SSL=system
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=system
LDFLAGS+= -lcrypto -lssl
.else
-CMAKE_ARGS+= -DWITH_SSL=no
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=no
.endif
.if !empty(PKG_OPTIONS:Mzstd)
.include "../../archivers/zstd/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_ROCKSDB_zstd=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_zstd=ON
.else
-CMAKE_ARGS+= -DWITH_ROCKSDB_zstd=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_zstd=OFF
.endif
PLIST_VARS+= auth_pam
.if !empty(PKG_OPTIONS:Mauth-pam)
-CMAKE_ARGS+= -DPLUGIN_AUTH_PAM=YES
-CMAKE_ARGS+= -DPLUGIN_AUTH_PAM_V1=YES
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM=YES
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM_V1=YES
PLIST.auth_pam= yes
.else
-CMAKE_ARGS+= -DPLUGIN_AUTH_PAM=NO
-CMAKE_ARGS+= -DPLUGIN_AUTH_PAM_V1=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM=NO
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM_V1=NO
.endif
Index: pkgsrc/databases/mongo-c-driver/Makefile
diff -u pkgsrc/databases/mongo-c-driver/Makefile:1.66 pkgsrc/databases/mongo-c-driver/Makefile:1.67
--- pkgsrc/databases/mongo-c-driver/Makefile:1.66 Wed May 29 16:31:43 2024
+++ pkgsrc/databases/mongo-c-driver/Makefile Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2024/05/29 16:31:43 adam Exp $
+# $NetBSD: Makefile,v 1.67 2024/08/25 06:18:30 wiz Exp $
DISTNAME= mongo-c-driver-1.26.0
PKGREVISION= 1
@@ -22,14 +22,14 @@ TEST_TARGET= check
CFLAGS.NetBSD+= -D_NETBSD_SOURCE
# Set version here, so Python and Git are not needed.
-CMAKE_ARGS+= -DBUILD_VERSION=${PKGVERSION_NOREV}
-CMAKE_ARGS+= -DENABLE_ICU=ON
-CMAKE_ARGS+= -DENABLE_SNAPPY=ON
-CMAKE_ARGS+= -DENABLE_UNINSTALL=OFF
-CMAKE_ARGS+= -DENABLE_ZLIB=SYSTEM
-CMAKE_ARGS+= -DENABLE_ZSTD=ON
-CMAKE_ARGS+= -DENABLE_SHM_COUNTERS=OFF # ON is only supported on Linux or ARM Darwin
-CMAKE_ARGS+= -DMONGO_USE_CCACHE=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_VERSION=${PKGVERSION_NOREV}
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ICU=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SNAPPY=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_UNINSTALL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ZLIB=SYSTEM
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ZSTD=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SHM_COUNTERS=OFF # ON is only supported on Linux or ARM Darwin
+CMAKE_CONFIGURE_ARGS+= -DMONGO_USE_CCACHE=OFF
PKGCONFIG_OVERRIDE+= src/libbson/src/libbson-1.0.pc.in
PKGCONFIG_OVERRIDE+= src/libbson/src/libbson-static-1.0.pc.in
Index: pkgsrc/databases/mongo-c-driver/options.mk
diff -u pkgsrc/databases/mongo-c-driver/options.mk:1.2 pkgsrc/databases/mongo-c-driver/options.mk:1.3
--- pkgsrc/databases/mongo-c-driver/options.mk:1.2 Tue Mar 5 14:24:13 2019
+++ pkgsrc/databases/mongo-c-driver/options.mk Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/03/05 14:24:13 adam Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:30 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mongo-c-driver
PKG_SUPPORTED_OPTIONS= sasl ssl
@@ -11,16 +11,16 @@ PLIST_VARS+= ssl
# Enable SASL support
.if !empty(PKG_OPTIONS:Msasl)
. include "../../security/cyrus-sasl/buildlink3.mk"
-CMAKE_ARGS+= -DENABLE_SASL=CYRUS
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SASL=CYRUS
.else
-CMAKE_ARGS+= -DENABLE_SASL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SASL=OFF
.endif
# Enable OpenSSL support
.if !empty(PKG_OPTIONS:Mssl)
. include "../../security/openssl/buildlink3.mk"
-CMAKE_ARGS+= -DENABLE_SSL=OPENSSL
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SSL=OPENSSL
PLIST.ssl= yes
.else
-CMAKE_ARGS+= -DENABLE_SSL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SSL=OFF
.endif
Index: pkgsrc/databases/myodbc/Makefile
diff -u pkgsrc/databases/myodbc/Makefile:1.46 pkgsrc/databases/myodbc/Makefile:1.47
--- pkgsrc/databases/myodbc/Makefile:1.46 Sun Dec 25 08:22:26 2022
+++ pkgsrc/databases/myodbc/Makefile Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2022/12/25 08:22:26 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2024/08/25 06:18:30 wiz Exp $
DISTNAME= mysql-connector-odbc-8.0.31
PKGNAME= ${DISTNAME:S/mysql-connector-odbc/myodbc/}
@@ -14,9 +14,9 @@ COMMENT= ODBC driver (server side) for M
LICENSE= gnu-gpl-v2
USE_CMAKE= yes
-CMAKE_ARGS= -Wno-dev
-#CMAKE_ARGS+= -DMYSQL_DIR=${BUILDLINK_PREFIX.mysql-client}
-CMAKE_ARGS+= -DMYSQL_INCLUDE_DIR=${BUILDLINK_PREFIX.mysql-client}/include/mysql
+CMAKE_CONFIGURE_ARGS= -Wno-dev
+#CMAKE_CONFIGURE_ARGS+= -DMYSQL_DIR=${BUILDLINK_PREFIX.mysql-client}
+CMAKE_CONFIGURE_ARGS+= -DMYSQL_INCLUDE_DIR=${BUILDLINK_PREFIX.mysql-client}/include/mysql
USE_LANGUAGES= c c++
INSTALLATION_DIRS= share/doc/mysql-connector-odbc
Index: pkgsrc/databases/myodbc/options.mk
diff -u pkgsrc/databases/myodbc/options.mk:1.8 pkgsrc/databases/myodbc/options.mk:1.9
--- pkgsrc/databases/myodbc/options.mk:1.8 Sat Nov 2 15:38:02 2019
+++ pkgsrc/databases/myodbc/options.mk Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2019/11/02 15:38:02 rillig Exp $
+# $NetBSD: options.mk,v 1.9 2024/08/25 06:18:30 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.myodbc
PKG_OPTIONS_REQUIRED_GROUPS= db
@@ -13,5 +13,5 @@ PKG_SUGGESTED_OPTIONS= iodbc
.if !empty(PKG_OPTIONS:Munixodbc)
. include "../../databases/unixodbc/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_UNIXODBC=1
+CMAKE_CONFIGURE_ARGS+= -DWITH_UNIXODBC=1
.endif
Index: pkgsrc/databases/mysql75-cluster/Makefile.common
diff -u pkgsrc/databases/mysql75-cluster/Makefile.common:1.3 pkgsrc/databases/mysql75-cluster/Makefile.common:1.4
--- pkgsrc/databases/mysql75-cluster/Makefile.common:1.3 Sun Jul 9 10:18:21 2023
+++ pkgsrc/databases/mysql75-cluster/Makefile.common Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2023/07/09 10:18:21 nia Exp $
+# $NetBSD: Makefile.common,v 1.4 2024/08/25 06:18:30 wiz Exp $
#
DISTNAME= mysql-cluster-gpl-7.5.25
@@ -41,30 +41,30 @@ CFLAGS.IRIX+= -DIRIX5 -DNEEDS_BSTRING_H
BUILD_DEFS+= VARBASE
# paths
-CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
-CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
-CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
-CMAKE_ARGS+= -DINSTALL_INFODIR="info"
-CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
-CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
-CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test"
-CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
-CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin"
-CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
-CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
-CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
-CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR}
-
-CMAKE_ARGS+= -DWITH_BOOST="system"
-CMAKE_ARGS+= -UWITH_LIBEVENT="system"
-CMAKE_ARGS+= -DWITH_BUNDLED_LIBEVENT=ON
-CMAKE_ARGS+= -DWITH_ZLIB="system"
-CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET}
-CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q}
-CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q}
-CMAKE_ARGS+= -DWITH_NDB_JAVA=OFF
-CMAKE_ARGS+= -UWITH_UNIT_TESTS
-CMAKE_ARGS+= -DWITH_SSL=system
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INFODIR="info"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SBINDIR="sbin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
+CMAKE_CONFIGURE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR}
+
+CMAKE_CONFIGURE_ARGS+= -DWITH_BOOST="system"
+CMAKE_CONFIGURE_ARGS+= -UWITH_LIBEVENT="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_BUNDLED_LIBEVENT=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ZLIB="system"
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET}
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q}
+CMAKE_CONFIGURE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q}
+CMAKE_CONFIGURE_ARGS+= -DWITH_NDB_JAVA=OFF
+CMAKE_CONFIGURE_ARGS+= -UWITH_UNIT_TESTS
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=system
# MySQL 5 depends on builtin functions enabled with i486 and later with GCC.
.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == i386
@@ -74,7 +74,7 @@ CFLAGS+= -march=i486
# Ensure the correct DTrace ABI is used.
.if !empty(ABI)
-CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
+CMAKE_CONFIGURE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
.endif
CPPFLAGS+= -Dunix
@@ -88,7 +88,7 @@ CXXFLAGS+= -fPIC -DPIC
# force HAVE_CURSES_H on Solaris since the configure script is broken
# and does not properly detect this, breaking the build later on. Also
# explicitly disable epoll support as it is Linux-specific.
-CMAKE_ARGS.SunOS+= -DHAVE_SYS_EPOLL_H=NO -DHAVE_EPOLL_CREATE=NO
+CMAKE_CONFIGURE_ARGS.SunOS+= -DHAVE_SYS_EPOLL_H=NO -DHAVE_EPOLL_CREATE=NO
CFLAGS.SunOS+= -DHAVE_CURSES_H
CXXFLAGS.SunOS+= -DHAVE_CURSES_H
@@ -121,7 +121,7 @@ SOEXT= "dylib"
SOEXT= "so"
.endif
-CMAKE_ARGS+= -DWITH_EDITLINE=bundled
+CMAKE_CONFIGURE_ARGS+= -DWITH_EDITLINE=bundled
# Remove internal boost. Even though external boost is detected, the build might fail.
post-extract: remove-boost
Index: pkgsrc/databases/mysql75-cluster/options.mk
diff -u pkgsrc/databases/mysql75-cluster/options.mk:1.1 pkgsrc/databases/mysql75-cluster/options.mk:1.2
--- pkgsrc/databases/mysql75-cluster/options.mk:1.1 Sun Apr 17 04:07:13 2022
+++ pkgsrc/databases/mysql75-cluster/options.mk Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2022/04/17 04:07:13 jnemeth Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:30 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-cluster
@@ -8,7 +8,7 @@ PKG_SUPPORTED_OPTIONS+= dtrace
# Enable DTrace support
.if !empty(PKG_OPTIONS:Mdtrace)
-CMAKE_ARGS+= -DENABLE_DTRACE=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DTRACE=ON
.else
-CMAKE_ARGS+= -DENABLE_DTRACE=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DTRACE=OFF
.endif
Index: pkgsrc/databases/mysql80-client/Makefile
diff -u pkgsrc/databases/mysql80-client/Makefile:1.16 pkgsrc/databases/mysql80-client/Makefile:1.17
--- pkgsrc/databases/mysql80-client/Makefile:1.16 Wed May 29 16:31:44 2024
+++ pkgsrc/databases/mysql80-client/Makefile Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2024/05/29 16:31:44 adam Exp $
+# $NetBSD: Makefile,v 1.17 2024/08/25 06:18:30 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
PKGREVISION= 2
@@ -8,7 +8,7 @@ CONFLICTS= mysql3-client-[0-9]* mariadb-
.include "Makefile.common"
-CMAKE_ARGS+= -DWITHOUT_SERVER=ON
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_SERVER=ON
UNWRAP_FILES+= scripts/mysql_config
INFO_FILES= yes
Index: pkgsrc/databases/mysql80-client/Makefile.common
diff -u pkgsrc/databases/mysql80-client/Makefile.common:1.11 pkgsrc/databases/mysql80-client/Makefile.common:1.12
--- pkgsrc/databases/mysql80-client/Makefile.common:1.11 Fri Feb 16 22:01:10 2024
+++ pkgsrc/databases/mysql80-client/Makefile.common Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2024/02/16 22:01:10 adam Exp $
+# $NetBSD: Makefile.common,v 1.12 2024/08/25 06:18:30 wiz Exp $
#
# used by databases/mysql80-client/Makefile
# used by databases/mysql80-server/Makefile
@@ -44,48 +44,48 @@ CONFIG_SHELL= ${TOOLS_PATH.bash}
BUILD_DEFS+= VARBASE
# paths
-CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
-CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
-CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
-CMAKE_ARGS+= -DINSTALL_INFODIR="info"
-CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
-CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
-CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR=""
-CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
-CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin"
-CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
-CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
-CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
-CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR}
-CMAKE_ARGS+= -DROUTER_INSTALL_LOGROTATEDIR="share/mysql"
-
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DLOCAL_BOOST_DIR="${WRKSRC}/boost"
-CMAKE_ARGS+= -DWITH_BUILD_ID=OFF
-CMAKE_ARGS+= -DWITH_CURL="system"
-CMAKE_ARGS+= -DWITH_ICU="system"
-CMAKE_ARGS+= -DWITH_LIBEVENT="system"
-CMAKE_ARGS+= -DWITH_LZ4="system"
-CMAKE_ARGS+= -DWITH_RAPIDJSON="bundled"
-CMAKE_ARGS+= -DWITH_SSL="system"
-CMAKE_ARGS+= -DWITH_ZLIB="system"
-CMAKE_ARGS+= -DWITH_ZSTD="system"
-
-CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET}
-CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION}
-CMAKE_ARGS+= -DSHOW_BUILD_ID=OFF
-CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET}
-CMAKE_ARGS+= -DWITH_ROUTER=OFF
-CMAKE_ARGS+= -DWITH_UNIT_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INFODIR="info"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MYSQLTESTDIR=""
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SBINDIR="sbin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
+CMAKE_CONFIGURE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR}
+CMAKE_CONFIGURE_ARGS+= -DROUTER_INSTALL_LOGROTATEDIR="share/mysql"
+
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DLOCAL_BOOST_DIR="${WRKSRC}/boost"
+CMAKE_CONFIGURE_ARGS+= -DWITH_BUILD_ID=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_CURL="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_ICU="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_LIBEVENT="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_LZ4="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_RAPIDJSON="bundled"
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_ZLIB="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_ZSTD="system"
+
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET}
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION}
+CMAKE_CONFIGURE_ARGS+= -DSHOW_BUILD_ID=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET}
+CMAKE_CONFIGURE_ARGS+= -DWITH_ROUTER=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_UNIT_TESTS=OFF
CHECK_PORTABILITY_SKIP+= packaging/deb-in/mysql-packagesource-server.config.in
-CMAKE_ARGS.SunOS+= -DFORCE_UNSUPPORTED_COMPILER=YES
+CMAKE_CONFIGURE_ARGS.SunOS+= -DFORCE_UNSUPPORTED_COMPILER=YES
# Force HAVE_CURSES_H on Solaris since the configure script is broken
# and does not properly detect this, breaking the build later on. Also
# explicitly disable epoll support as it is Linux-specific.
-CMAKE_ARGS.SunOS+= -DHAVE_EPOLL=NO
+CMAKE_CONFIGURE_ARGS.SunOS+= -DHAVE_EPOLL=NO
BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--no-as-needed
@@ -104,14 +104,14 @@ SUBST_MESSAGE.scr= Fixing scripts.
.include "../../mk/readline.buildlink3.mk"
.if ${READLINE_TYPE} == "readline"
-CMAKE_ARGS+= -DWITH_READLINE="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_READLINE="system"
.else
-CMAKE_ARGS+= -DWITH_EDITLINE="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_EDITLINE="system"
.endif
.include "../../security/libfido2/platform.mk"
.if ${PLATFORM_SUPPORTS_FIDO2:tl} != "no"
-CMAKE_ARGS+= -DWITH_FIDO="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_FIDO="system"
.include "../../security/libfido2/buildlink3.mk"
.endif
Index: pkgsrc/databases/mysql80-cluster/Makefile.common
diff -u pkgsrc/databases/mysql80-cluster/Makefile.common:1.1 pkgsrc/databases/mysql80-cluster/Makefile.common:1.2
--- pkgsrc/databases/mysql80-cluster/Makefile.common:1.1 Mon Aug 5 01:23:58 2024
+++ pkgsrc/databases/mysql80-cluster/Makefile.common Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2024/08/05 01:23:58 jnemeth Exp $
+# $NetBSD: Makefile.common,v 1.2 2024/08/25 06:18:30 wiz Exp $
#
# used by databases/mysql-cluster/Makefile
@@ -49,36 +49,36 @@ CFLAGS.IRIX+= -DIRIX5 -DNEEDS_BSTRING_H
BUILD_DEFS+= VARBASE
# paths
-CMAKE_ARGS+= -DWITH_NDBCLUSTER=1
+CMAKE_CONFIGURE_ARGS+= -DWITH_NDBCLUSTER=1
-CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
-CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
-CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
-CMAKE_ARGS+= -DINSTALL_INFODIR="info"
-CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
-CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
-CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test"
-CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
-CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin"
-CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
-CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
-CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
-CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR}
-CMAKE_ARGS+= -DFORCE_INSOURCE_BUILD=1
-
-CMAKE_ARGS+= -DWITH_BOOST=${WRKDIR}/boost_${BOOSTVER:S/./_/g}
-CMAKE_ARGS+= -DWITH_ICU="system"
-CMAKE_ARGS+= -UWITH_LIBEVENT="system"
-CMAKE_ARGS+= -DWITH_BUNDLED_LIBEVENT=ON
-#CMAKE_ARGS+= -DWITH_ZLIB="system"
-#CMAKE_ARGS+= -DWITH_ZLIB="bundled"
-CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET}
-CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q}
-CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q}
-CMAKE_ARGS+= -DWITH_NDB_JAVA=OFF
-CMAKE_ARGS+= -UWITH_UNIT_TESTS
-CMAKE_ARGS+= -DWITH_SSL=system
-CMAKE_ARGS+= -DWITH_PROTOBUF="system"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INFODIR="info"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SBINDIR="sbin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
+CMAKE_CONFIGURE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR}
+CMAKE_CONFIGURE_ARGS+= -DFORCE_INSOURCE_BUILD=1
+
+CMAKE_CONFIGURE_ARGS+= -DWITH_BOOST=${WRKDIR}/boost_${BOOSTVER:S/./_/g}
+CMAKE_CONFIGURE_ARGS+= -DWITH_ICU="system"
+CMAKE_CONFIGURE_ARGS+= -UWITH_LIBEVENT="system"
+CMAKE_CONFIGURE_ARGS+= -DWITH_BUNDLED_LIBEVENT=ON
+#CMAKE_CONFIGURE_ARGS+= -DWITH_ZLIB="system"
+#CMAKE_CONFIGURE_ARGS+= -DWITH_ZLIB="bundled"
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET}
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q}
+CMAKE_CONFIGURE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q}
+CMAKE_CONFIGURE_ARGS+= -DWITH_NDB_JAVA=OFF
+CMAKE_CONFIGURE_ARGS+= -UWITH_UNIT_TESTS
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=system
+CMAKE_CONFIGURE_ARGS+= -DWITH_PROTOBUF="system"
# MySQL 5 depends on builtin functions enabled with i486 and later with GCC.
.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
@@ -88,7 +88,7 @@ CFLAGS+= -march=i486
# Ensure the correct DTrace ABI is used.
.if !empty(ABI)
-CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
+CMAKE_CONFIGURE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
.endif
CPPFLAGS+= -Dunix
@@ -102,7 +102,7 @@ CXXFLAGS+= -fPIC -DPIC
# force HAVE_CURSES_H on Solaris since the configure script is broken
# and does not properly detect this, breaking the build later on. Also
# explicitly disable epoll support as it is Linux-specific.
-CMAKE_ARGS.SunOS+= -DHAVE_SYS_EPOLL_H=NO -DHAVE_EPOLL_CREATE=NO
+CMAKE_CONFIGURE_ARGS.SunOS+= -DHAVE_SYS_EPOLL_H=NO -DHAVE_EPOLL_CREATE=NO
CFLAGS.SunOS+= -DHAVE_CURSES_H
CXXFLAGS.SunOS+= -DHAVE_CURSES_H
@@ -142,7 +142,7 @@ SOEXT= "dylib"
SOEXT= "so"
.endif
-CMAKE_ARGS+= -DWITH_EDITLINE=bundled
+CMAKE_CONFIGURE_ARGS+= -DWITH_EDITLINE=bundled
## Remove internal boost. Even though external boost is detected, the build might fail.
#post-extract: remove-boost
Index: pkgsrc/databases/mysql80-cluster/options.mk
diff -u pkgsrc/databases/mysql80-cluster/options.mk:1.1 pkgsrc/databases/mysql80-cluster/options.mk:1.2
--- pkgsrc/databases/mysql80-cluster/options.mk:1.1 Mon Aug 5 01:23:58 2024
+++ pkgsrc/databases/mysql80-cluster/options.mk Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2024/08/05 01:23:58 jnemeth Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:30 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-cluster
@@ -8,7 +8,7 @@ PKG_SUPPORTED_OPTIONS+= dtrace
# Enable DTrace support
.if !empty(PKG_OPTIONS:Mdtrace)
-CMAKE_ARGS+= -DENABLE_DTRACE=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DTRACE=ON
.else
-CMAKE_ARGS+= -DENABLE_DTRACE=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DTRACE=OFF
.endif
Index: pkgsrc/databases/mysql80-server/Makefile
diff -u pkgsrc/databases/mysql80-server/Makefile:1.22 pkgsrc/databases/mysql80-server/Makefile:1.23
--- pkgsrc/databases/mysql80-server/Makefile:1.22 Wed May 29 16:31:44 2024
+++ pkgsrc/databases/mysql80-server/Makefile Sun Aug 25 06:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2024/05/29 16:31:44 adam Exp $
+# $NetBSD: Makefile,v 1.23 2024/08/25 06:18:30 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
PKGREVISION= 3
@@ -8,11 +8,11 @@ CONFLICTS= mysql3-server-[0-9]*
.include "../../databases/mysql80-client/Makefile.common"
-CMAKE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR}
-CMAKE_ARGS+= -DWITH_PROTOBUF="system"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR}
+CMAKE_CONFIGURE_ARGS+= -DWITH_PROTOBUF="system"
MAKE_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/library_output_directory
# This is a hack for ${WRKSRC}/cmake/protobuf.cmake
-CMAKE_ARGS+= -DHOMEBREW_HOME=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DHOMEBREW_HOME=${PREFIX}
PLIST_VARS+= auth_socket
@@ -78,7 +78,7 @@ SUBST_SED.perlpath= -e 's,@PERL_PATH@,${
INSTALLATION_DIRS+= bin
TEST_TARGET= test
-CMAKE_ARGS+= -DWITHOUT_CLIENTLIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_CLIENTLIBS=ON
post-extract:
${CP} ${FILESDIR}/ffsll.cc ${WRKSRC}/sql/
Index: pkgsrc/databases/postgresql-timescaledb/Makefile
diff -u pkgsrc/databases/postgresql-timescaledb/Makefile:1.33 pkgsrc/databases/postgresql-timescaledb/Makefile:1.34
--- pkgsrc/databases/postgresql-timescaledb/Makefile:1.33 Wed Aug 7 09:40:31 2024
+++ pkgsrc/databases/postgresql-timescaledb/Makefile Sun Aug 25 06:18:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2024/08/07 09:40:31 adam Exp $
+# $NetBSD: Makefile,v 1.34 2024/08/25 06:18:31 wiz Exp $
DISTNAME= timescaledb-2.16.1
PKGNAME= postgresql${PGSQL_VERSION}-${DISTNAME}
@@ -13,8 +13,8 @@ LICENSE= apache-2.0
DEPENDS+= postgresql${PGSQL_VERSION}-server>=0:../../databases/postgresql${PGSQL_VERSION}-server
-CMAKE_ARGS+= -DUSE_OPENSSL=ON
-CMAKE_ARGS+= -DREGRESS_CHECKS=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_OPENSSL=ON
+CMAKE_CONFIGURE_ARGS+= -DREGRESS_CHECKS=OFF
.include "../../mk/bsd.prefs.mk"
@@ -35,7 +35,7 @@ PKG_SUGGESTED_OPTIONS+= timescale-licen
PLIST_VARS+= tsl
.if !empty(PKG_OPTIONS:Mtimescale-license)
LICENSE+= AND timescale-license
-CMAKE_ARGS+= -DAPACHE_ONLY=OFF
+CMAKE_CONFIGURE_ARGS+= -DAPACHE_ONLY=OFF
RESTRICTED= No clear permission granted to distribute
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
@@ -43,7 +43,7 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
PLIST.tsl= yes
.else
-CMAKE_ARGS+= -DAPACHE_ONLY=ON
+CMAKE_CONFIGURE_ARGS+= -DAPACHE_ONLY=ON
.endif
.include "../../devel/cmake/build.mk"
Index: pkgsrc/databases/prometheus-cpp/options.mk
diff -u pkgsrc/databases/prometheus-cpp/options.mk:1.1 pkgsrc/databases/prometheus-cpp/options.mk:1.2
--- pkgsrc/databases/prometheus-cpp/options.mk:1.1 Thu Jul 20 21:40:53 2023
+++ pkgsrc/databases/prometheus-cpp/options.mk Sun Aug 25 06:18:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/07/20 21:40:53 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:31 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.prometheus-cpp
@@ -9,9 +9,9 @@ PKG_SUPPORTED_OPTIONS= tests
.if !empty(PKG_OPTIONS:Mtests)
TEST_TARGET= test
-CMAKE_ARGS+= -DENABLE_TESTING=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TESTING=ON
# XXX: it's using an internal copy...
#. include "../../devel/googletest/buildlink3.mk"
.else
-CMAKE_ARGS+= -DENABLE_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TESTING=OFF
.endif
Index: pkgsrc/databases/soci/Makefile
diff -u pkgsrc/databases/soci/Makefile:1.58 pkgsrc/databases/soci/Makefile:1.59
--- pkgsrc/databases/soci/Makefile:1.58 Wed May 29 16:31:54 2024
+++ pkgsrc/databases/soci/Makefile Sun Aug 25 06:18:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2024/05/29 16:31:54 adam Exp $
+# $NetBSD: Makefile,v 1.59 2024/08/25 06:18:31 wiz Exp $
DISTNAME= soci-4.0.3
PKGREVISION= 5
@@ -12,12 +12,12 @@ LICENSE= boost-license
USE_LANGUAGES= c gnu++11
-CMAKE_ARGS+= -DSOCI_LIBDIR=lib
-CMAKE_ARGS+= -DCMAKE_CXX_FLAGS=${CXXFLAGS:Q}
-CMAKE_ARGS+= -DWITH_ODBC=OFF
-CMAKE_ARGS+= -DWITH_ORACLE=OFF
-CMAKE_ARGS+= -DWITH_FIREBIRD=OFF
-CMAKE_ARGS+= -DWITH_DB2=OFF
+CMAKE_CONFIGURE_ARGS+= -DSOCI_LIBDIR=lib
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_FLAGS=${CXXFLAGS:Q}
+CMAKE_CONFIGURE_ARGS+= -DWITH_ODBC=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ORACLE=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_FIREBIRD=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_DB2=OFF
.include "options.mk"
Index: pkgsrc/databases/soci/options.mk
diff -u pkgsrc/databases/soci/options.mk:1.3 pkgsrc/databases/soci/options.mk:1.4
--- pkgsrc/databases/soci/options.mk:1.3 Thu Mar 16 07:50:16 2023
+++ pkgsrc/databases/soci/options.mk Sun Aug 25 06:18:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2023/03/16 07:50:16 adam Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:31 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.soci
PKG_SUPPORTED_OPTIONS= boost mysql pgsql sqlite
@@ -10,31 +10,31 @@ PLIST_VARS+= mysql pgsql sqlite
.if !empty(PKG_OPTIONS:Mmysql)
.include "../../mk/mysql.buildlink3.mk"
-CMAKE_ARGS+= -DWITH_MYSQL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_MYSQL=ON
PLIST.mysql= yes
.else
-CMAKE_ARGS+= -DWITH_MYSQL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_MYSQL=OFF
.endif
.if !empty(PKG_OPTIONS:Mpgsql)
.include "../../mk/pgsql.buildlink3.mk"
-CMAKE_ARGS+= -DWITH_POSTGRESQL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_POSTGRESQL=ON
PLIST.pgsql= yes
.else
-CMAKE_ARGS+= -DWITH_POSTGRESQL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_POSTGRESQL=OFF
.endif
.if !empty(PKG_OPTIONS:Msqlite)
.include "../../databases/sqlite3/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_SQLITE3=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_SQLITE3=ON
PLIST.sqlite= yes
.else
-CMAKE_ARGS+= -DWITH_SQLITE3=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SQLITE3=OFF
.endif
.if !empty(PKG_OPTIONS:Mboost)
.include "../../devel/boost-libs/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_BOOST=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_BOOST=ON
.else
-CMAKE_ARGS+= -DWITH_BOOST=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_BOOST=OFF
.endif
Index: pkgsrc/devel/allegro/Makefile
diff -u pkgsrc/devel/allegro/Makefile:1.50 pkgsrc/devel/allegro/Makefile:1.51
--- pkgsrc/devel/allegro/Makefile:1.50 Sat Aug 5 07:37:28 2023
+++ pkgsrc/devel/allegro/Makefile Sun Aug 25 06:18:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2023/08/05 07:37:28 nia Exp $
+# $NetBSD: Makefile,v 1.51 2024/08/25 06:18:31 wiz Exp $
DISTNAME= allegro-4.4.3.1
PKGREVISION= 7
@@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config makeinfo
USE_LANGUAGES= c c++
INFO_FILES= yes
-CMAKE_ARGS+= -DINFODIR=${PKGINFODIR:Q}
+CMAKE_CONFIGURE_ARGS+= -DINFODIR=${PKGINFODIR:Q}
PLIST_SUBST+= ALLEG_VER=${PKGVERSION_NOREV:R}
Index: pkgsrc/devel/allegro/options.mk
diff -u pkgsrc/devel/allegro/options.mk:1.4 pkgsrc/devel/allegro/options.mk:1.5
--- pkgsrc/devel/allegro/options.mk:1.4 Mon Jan 20 22:12:21 2020
+++ pkgsrc/devel/allegro/options.mk Sun Aug 25 06:18:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2020/01/20 22:12:21 nia Exp $
+# $NetBSD: options.mk,v 1.5 2024/08/25 06:18:31 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.allegro
PKG_SUPPORTED_OPTIONS= alsa jack
@@ -11,16 +11,16 @@ PLIST_SRC+= PLIST
.if !empty(PKG_OPTIONS:Malsa)
PLIST_SRC+= PLIST.alsa
CFLAGS.NetBSD+= -DESTRPIPE=EPIPE
-CMAKE_ARGS+= -DWANT_ALSA=1
+CMAKE_CONFIGURE_ARGS+= -DWANT_ALSA=1
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_ALSA=0
+CMAKE_CONFIGURE_ARGS+= -DWANT_ALSA=0
.endif
.if !empty(PKG_OPTIONS:Mjack)
PLIST_SRC+= PLIST.jack
-CMAKE_ARGS+= -DWANT_JACK=1
+CMAKE_CONFIGURE_ARGS+= -DWANT_JACK=1
.include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_JACK=0
+CMAKE_CONFIGURE_ARGS+= -DWANT_JACK=0
.endif
Index: pkgsrc/devel/allegro5/Makefile
diff -u pkgsrc/devel/allegro5/Makefile:1.25 pkgsrc/devel/allegro5/Makefile:1.26
--- pkgsrc/devel/allegro5/Makefile:1.25 Sun Apr 7 07:33:43 2024
+++ pkgsrc/devel/allegro5/Makefile Sun Aug 25 06:18:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/04/07 07:33:43 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2024/08/25 06:18:31 wiz Exp $
DISTNAME= allegro-5.2.7.0
PKGNAME= ${DISTNAME:S/allegro-/allegro5-/1}
@@ -17,12 +17,12 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DWANT_IMAGE_FREEIMAGE=OFF
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DWANT_IMAGE_FREEIMAGE=OFF
# TODO: make this work and turn it into an option
-CMAKE_ARGS+= -DWANT_DOCS=OFF
-CMAKE_ARGS+= -DWANT_DEMO=OFF
-CMAKE_ARGS+= -DWANT_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_DEMO=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_EXAMPLES=OFF
.include "../../mk/oss.buildlink3.mk"
.if ${OSS_TYPE} != "none"
@@ -33,7 +33,7 @@ SUBST_MESSAGE.oss= Correcting the path t
SUBST_FILES.oss+= addons/audio/oss.c
SUBST_SED.oss+= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
.else
-CMAKE_ARGS+= -DWANT_OSS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_OSS=OFF
.endif
PKGCONFIG_OVERRIDE+= misc/allegro.pc.in
Index: pkgsrc/devel/allegro5/options.mk
diff -u pkgsrc/devel/allegro5/options.mk:1.3 pkgsrc/devel/allegro5/options.mk:1.4
--- pkgsrc/devel/allegro5/options.mk:1.3 Mon Apr 19 10:14:56 2021
+++ pkgsrc/devel/allegro5/options.mk Sun Aug 25 06:18:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2021/04/19 10:14:56 nia Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:31 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.allegro5
PKG_SUPPORTED_OPTIONS= alsa openal pulseaudio x11
@@ -13,31 +13,31 @@ PKG_SUGGESTED_OPTIONS= openal x11
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CMAKE_ARGS+= -DWANT_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_ALSA=ON
. include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_ALSA=OFF
.endif
.if !empty(PKG_OPTIONS:Mopenal)
-CMAKE_ARGS+= -DWANT_OPENAL=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_OPENAL=ON
. include "../../audio/openal-soft/buildlink3.mk"
.else
# OpenAL is required on Darwin and also built-in.
. if ${OPSYS} != "Darwin"
-CMAKE_ARGS+= -DWANT_OPENAL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_OPENAL=OFF
. endif
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -DWANT_PULSEAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_PULSEAUDIO=ON
. include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_PULSEAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_PULSEAUDIO=OFF
.endif
.if !empty(PKG_OPTIONS:Mx11)
-CMAKE_ARGS+= -DWANT_X11=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_X11=ON
. include "../../x11/libICE/buildlink3.mk"
. include "../../x11/libXScrnSaver/buildlink3.mk"
. include "../../x11/libX11/buildlink3.mk"
@@ -51,5 +51,5 @@ CMAKE_ARGS+= -DWANT_X11=ON
. include "../../x11/gtk3/buildlink3.mk" # native_dialog
. endif
.else
-CMAKE_ARGS+= -DWANT_X11=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_X11=OFF
.endif
Index: pkgsrc/devel/binaryen/Makefile
diff -u pkgsrc/devel/binaryen/Makefile:1.22 pkgsrc/devel/binaryen/Makefile:1.23
--- pkgsrc/devel/binaryen/Makefile:1.22 Thu Nov 16 09:57:43 2023
+++ pkgsrc/devel/binaryen/Makefile Sun Aug 25 06:18:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2023/11/16 09:57:43 nia Exp $
+# $NetBSD: Makefile,v 1.23 2024/08/25 06:18:31 wiz Exp $
VERSION= 116
DISTNAME= binaryen-${VERSION}
@@ -15,7 +15,7 @@ USE_LANGUAGES= c c++17
WRKSRC= ${WRKDIR}/binaryen-${GITHUB_TAG}
-CMAKE_ARGS+= -DENABLE_WERROR=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WERROR=OFF
PYTHON_FOR_BUILD_ONLY= yes
Index: pkgsrc/devel/binaryen/options.mk
diff -u pkgsrc/devel/binaryen/options.mk:1.2 pkgsrc/devel/binaryen/options.mk:1.3
--- pkgsrc/devel/binaryen/options.mk:1.2 Thu Nov 23 11:11:25 2023
+++ pkgsrc/devel/binaryen/options.mk Sun Aug 25 06:18:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/11/23 11:11:25 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:31 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.binaryen
@@ -8,9 +8,9 @@ PKG_SUPPORTED_OPTIONS= tests
PLIST_VARS+= test
.if !empty(PKG_OPTIONS:Mtests)
-CMAKE_ARGS+= -DBUILD_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=ON
. include "../../devel/googletest/buildlink3.mk"
PLIST.test= yes
.else
-CMAKE_ARGS+= -DBUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=OFF
.endif
Index: pkgsrc/devel/blosc/Makefile
diff -u pkgsrc/devel/blosc/Makefile:1.23 pkgsrc/devel/blosc/Makefile:1.24
--- pkgsrc/devel/blosc/Makefile:1.23 Sun Aug 18 19:58:53 2024
+++ pkgsrc/devel/blosc/Makefile Sun Aug 25 06:18:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2024/08/18 19:58:53 adam Exp $
+# $NetBSD: Makefile,v 1.24 2024/08/25 06:18:31 wiz Exp $
DISTNAME= blosc-1.21.6
CATEGORIES= devel
@@ -18,10 +18,10 @@ TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/${C
TEST_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/blosc
TEST_TARGET= test
-CMAKE_ARGS+= -DPREFER_EXTERNAL_LZ4=ON
-CMAKE_ARGS+= -DPREFER_EXTERNAL_SNAPPY=ON
-CMAKE_ARGS+= -DPREFER_EXTERNAL_ZLIB=ON
-CMAKE_ARGS+= -DPREFER_EXTERNAL_ZSTD=ON
+CMAKE_CONFIGURE_ARGS+= -DPREFER_EXTERNAL_LZ4=ON
+CMAKE_CONFIGURE_ARGS+= -DPREFER_EXTERNAL_SNAPPY=ON
+CMAKE_CONFIGURE_ARGS+= -DPREFER_EXTERNAL_ZLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DPREFER_EXTERNAL_ZSTD=ON
# error: 'for' loop initial declarations are only allowed in C99 mode
FORCE_C_STD= c99
Index: pkgsrc/devel/blosc2/Makefile
diff -u pkgsrc/devel/blosc2/Makefile:1.19 pkgsrc/devel/blosc2/Makefile:1.20
--- pkgsrc/devel/blosc2/Makefile:1.19 Wed Jul 31 07:02:13 2024
+++ pkgsrc/devel/blosc2/Makefile Sun Aug 25 06:18:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/07/31 07:02:13 adam Exp $
+# $NetBSD: Makefile,v 1.20 2024/08/25 06:18:32 wiz Exp $
DISTNAME= blosc2-2.15.1
CATEGORIES= devel
@@ -20,11 +20,11 @@ TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/blo
TEST_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/blosc
TEST_TARGET= test
-CMAKE_ARGS+= -DBUILD_EXAMPLES=OFF
-CMAKE_ARGS+= -DBUILD_FUZZERS=OFF
-CMAKE_ARGS+= -DPREFER_EXTERNAL_LZ4=ON
-CMAKE_ARGS+= -DPREFER_EXTERNAL_ZLIB=ON
-CMAKE_ARGS+= -DPREFER_EXTERNAL_ZSTD=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_FUZZERS=OFF
+CMAKE_CONFIGURE_ARGS+= -DPREFER_EXTERNAL_LZ4=ON
+CMAKE_CONFIGURE_ARGS+= -DPREFER_EXTERNAL_ZLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DPREFER_EXTERNAL_ZSTD=ON
# Needed to use posix_memalign, see tests/test_common.h
CFLAGS+= -D_POSIX_C_SOURCE=200112
Index: pkgsrc/devel/bullet/Makefile
diff -u pkgsrc/devel/bullet/Makefile:1.15 pkgsrc/devel/bullet/Makefile:1.16
--- pkgsrc/devel/bullet/Makefile:1.15 Fri Aug 7 08:57:04 2020
+++ pkgsrc/devel/bullet/Makefile Sun Aug 25 06:18:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/08/07 08:57:04 adam Exp $
+# $NetBSD: Makefile,v 1.16 2024/08/25 06:18:32 wiz Exp $
DISTNAME= bullet-2.89
CATEGORIES= devel
@@ -15,15 +15,15 @@ USE_TOOLS+= pkg-config
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=on
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=on
# doesn't install anything without this
-CMAKE_ARGS+= -DINSTALL_LIBS:BOOL=on
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_LIBS:BOOL=on
-CMAKE_ARGS+= -DBUILD_BULLET2_DEMOS:BOOL=off
-CMAKE_ARGS+= -DBUILD_CPU_DEMOS:BOOL=off
-CMAKE_ARGS+= -DBUILD_OPENGL3_DEMOS:BOOL=off
-CMAKE_ARGS+= -DBUILD_UNIT_TESTS:BOOL=off
+CMAKE_CONFIGURE_ARGS+= -DBUILD_BULLET2_DEMOS:BOOL=off
+CMAKE_CONFIGURE_ARGS+= -DBUILD_CPU_DEMOS:BOOL=off
+CMAKE_CONFIGURE_ARGS+= -DBUILD_OPENGL3_DEMOS:BOOL=off
+CMAKE_CONFIGURE_ARGS+= -DBUILD_UNIT_TESTS:BOOL=off
PKGCONFIG_OVERRIDE+= bullet.pc.in
Index: pkgsrc/devel/ccache/Makefile
diff -u pkgsrc/devel/ccache/Makefile:1.83 pkgsrc/devel/ccache/Makefile:1.84
--- pkgsrc/devel/ccache/Makefile:1.83 Mon Jul 22 17:48:58 2024
+++ pkgsrc/devel/ccache/Makefile Sun Aug 25 06:18:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2024/07/22 17:48:58 adam Exp $
+# $NetBSD: Makefile,v 1.84 2024/08/25 06:18:32 wiz Exp $
DISTNAME= ccache-4.10.2
CATEGORIES= devel
@@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v3 AND modified-bsd AND
USE_LANGUAGES= c c++
USE_TOOLS+= perl:build pkg-config
-CMAKE_ARGS+= -DENABLE_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TESTING=OFF
TEST_TARGET= test
USE_CXX_FEATURES+= filesystem
Index: pkgsrc/devel/cmake/build.mk
diff -u pkgsrc/devel/cmake/build.mk:1.17 pkgsrc/devel/cmake/build.mk:1.18
--- pkgsrc/devel/cmake/build.mk:1.17 Tue Aug 20 12:27:39 2024
+++ pkgsrc/devel/cmake/build.mk Sun Aug 25 06:18:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.17 2024/08/20 12:27:39 gdt Exp $
+# $NetBSD: build.mk,v 1.18 2024/08/25 06:18:32 wiz Exp $
#
# This Makefile fragment supports building using the CMake build tool.
#
@@ -19,12 +19,7 @@
# Package-settable variables:
#
# CMAKE_CONFIGURE_ARGS
-# Arguments to pass to CMake during the configure stage. Defaults
-# to CMAKE_ARGS for backwards compatibility with USE_CMAKE.
-# NB: "Defaults to" really means "if not defined", not
-# "CMAKE_ARGS are merged in". The point is that with mixed
-# CMAKE_ARGS and CMAKE_CONFIGURE_ARGS, the value of CMAKE_ARGS
-# is ignored.
+# Arguments to pass to CMake during the configure stage.
#
# CMAKE_BUILD_ARGS
# Arguments to pass to CMake during build. Default: empty
@@ -58,7 +53,6 @@ TOOL_DEPENDS+= cmake>=${version}:../../d
BUILD_USES_CMAKE= yes
OPSYSVARS+= CMAKE_CONFIGURE_ARGS
-CMAKE_CONFIGURE_ARGS?= ${CMAKE_ARGS}
# The assumption in pkgsrc is that packages don't download files
# mid-build.
@@ -138,7 +132,7 @@ _PKG_VARS.cmake+= CMAKE_BUILD_ARGS BUILD
_PKG_VARS.cmake+= TEST_DIRS TEST_TARGET
_PKG_VARS.cmake+= CMAKE_INSTALL_ARGS INSTALL_DIRS INSTALL_TARGET
_SYS_VARS.cmake+= CMAKE_BUILD_DIR
-_USE_VARS.cmake+= CMAKE_ARGS
+_USE_VARS.cmake+= CMAKE_CONFIGURE_ARGS
_USE_VARS.cmake+= CONFIGURE_ENV MAKE_ENV TEST_ENV INSTALL_ENV
_IGN_VARS.cmake+= BUILDLINK_DIR WRKSRC PREFIX
_IGN_VARS.cmake+= BUILD_USES_CMAKE SETENV TOOL_DEPENDS
Index: pkgsrc/devel/cmake-gui/Makefile
diff -u pkgsrc/devel/cmake-gui/Makefile:1.46 pkgsrc/devel/cmake-gui/Makefile:1.47
--- pkgsrc/devel/cmake-gui/Makefile:1.46 Tue Jun 4 08:33:04 2024
+++ pkgsrc/devel/cmake-gui/Makefile Sun Aug 25 06:18:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2024/06/04 08:33:04 adam Exp $
+# $NetBSD: Makefile,v 1.47 2024/08/25 06:18:32 wiz Exp $
.include "../../devel/cmake/Makefile.common"
@@ -8,15 +8,15 @@ COMMENT= CMake GUI
USE_CMAKE= yes
BUILD_DIRS= Source/QtDialog
-CMAKE_ARGS+= -DBUILD_TESTING=OFF
-CMAKE_ARGS+= -DBUILD_QtDialog=ON
-CMAKE_ARGS+= -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON
-CMAKE_ARGS+= -DCMAKE_USE_SYSTEM_CURL=ON
-CMAKE_ARGS+= -DCMAKE_USE_SYSTEM_EXPAT=ON
-CMAKE_ARGS+= -DCMAKE_USE_SYSTEM_FORM=ON
-CMAKE_ARGS+= -DCMAKE_USE_SYSTEM_JSONCPP=ON
-CMAKE_ARGS+= -DCMAKE_USE_SYSTEM_LIBRHASH=ON
-CMAKE_ARGS+= -DCMAKE_USE_SYSTEM_LIBUV=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_QtDialog=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_USE_SYSTEM_CURL=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_USE_SYSTEM_EXPAT=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_USE_SYSTEM_FORM=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_USE_SYSTEM_JSONCPP=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_USE_SYSTEM_LIBRHASH=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_USE_SYSTEM_LIBUV=ON
post-build:
cd ${WRKSRC}/bin && ${LN} -f -s ${CMAKE} cmake
Index: pkgsrc/devel/cmocka/Makefile
diff -u pkgsrc/devel/cmocka/Makefile:1.12 pkgsrc/devel/cmocka/Makefile:1.13
--- pkgsrc/devel/cmocka/Makefile:1.12 Sat Jan 6 09:07:07 2024
+++ pkgsrc/devel/cmocka/Makefile Sun Aug 25 06:18:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2024/01/06 09:07:07 pin Exp $
+# $NetBSD: Makefile,v 1.13 2024/08/25 06:18:32 wiz Exp $
DISTNAME= cmocka-1.1.7
CATEGORIES= devel
@@ -12,7 +12,7 @@ LICENSE= apache-2.0
# GCC 4.3/4.4 provides wrong warnings:
# cmocka.c:3281: error: 'setup_name' may be used uninitialized in this function
-CMAKE_ARGS+= -DWITH_WERROR_UNINITIALIZED_FLAG=0
+CMAKE_CONFIGURE_ARGS+= -DWITH_WERROR_UNINITIALIZED_FLAG=0
.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/cppcheck/Makefile
diff -u pkgsrc/devel/cppcheck/Makefile:1.103 pkgsrc/devel/cppcheck/Makefile:1.104
--- pkgsrc/devel/cppcheck/Makefile:1.103 Wed May 29 16:31:59 2024
+++ pkgsrc/devel/cppcheck/Makefile Sun Aug 25 06:18:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2024/05/29 16:31:59 adam Exp $
+# $NetBSD: Makefile,v 1.104 2024/08/25 06:18:32 wiz Exp $
DISTNAME= cppcheck-2.8
PKGREVISION= 14
@@ -26,9 +26,9 @@ MAKE_FLAGS+= FILESDIR=${PREFIX}/share/c
# rules support (needs pcre)
MAKE_FLAGS+= HAVE_RULES=yes
MAKE_FLAGS+= USE_Z3=yes
-#CMAKE_ARGS+= -DBUILD_TESTS=ON
-#CMAKE_ARGS+= -DHAVE_RULES=ON
-#CMAKE_ARGS+= -DUSE_Z3=ON
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=ON
+#CMAKE_CONFIGURE_ARGS+= -DHAVE_RULES=ON
+#CMAKE_CONFIGURE_ARGS+= -DUSE_Z3=ON
PYTHON_VERSIONS_INCOMPATIBLE= 27
Index: pkgsrc/devel/cpu_features/Makefile
diff -u pkgsrc/devel/cpu_features/Makefile:1.8 pkgsrc/devel/cpu_features/Makefile:1.9
--- pkgsrc/devel/cpu_features/Makefile:1.8 Sun Dec 31 09:48:58 2023
+++ pkgsrc/devel/cpu_features/Makefile Sun Aug 25 06:18:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/12/31 09:48:58 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2024/08/25 06:18:32 wiz Exp $
GITHUB_TAG= v${PKGVERSION_NOREV}
DISTNAME= cpu_features-0.7.0
@@ -11,8 +11,8 @@ COMMENT= Cross platform C99 library to g
LICENSE= apache-2.0
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-CMAKE_ARGS+= -DBUILD_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/devel/cxxopts/Makefile
diff -u pkgsrc/devel/cxxopts/Makefile:1.2 pkgsrc/devel/cxxopts/Makefile:1.3
--- pkgsrc/devel/cxxopts/Makefile:1.2 Wed Sep 6 17:57:00 2023
+++ pkgsrc/devel/cxxopts/Makefile Sun Aug 25 06:18:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/09/06 17:57:00 bsiegert Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:18:32 wiz Exp $
#
DISTNAME= cxxopts-3.1.1
@@ -14,7 +14,7 @@ LICENSE= mit
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCXXOPTS_BUILD_EXAMPLES=OFF
-CMAKE_ARGS+= -DCXXOPTS_BUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCXXOPTS_BUILD_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DCXXOPTS_BUILD_TESTS=OFF
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/deepstate/Makefile
diff -u pkgsrc/devel/deepstate/Makefile:1.18 pkgsrc/devel/deepstate/Makefile:1.19
--- pkgsrc/devel/deepstate/Makefile:1.18 Wed Aug 7 19:24:31 2024
+++ pkgsrc/devel/deepstate/Makefile Sun Aug 25 06:18:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2024/08/07 19:24:31 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2024/08/25 06:18:33 wiz Exp $
PKGREVISION= 7
@@ -31,7 +31,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 38 39 3
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -DPYTHON=${PREFIX}/bin/python${PYVERSSUFFIX}
+CMAKE_CONFIGURE_ARGS+= -DPYTHON=${PREFIX}/bin/python${PYVERSSUFFIX}
pre-configure:
cd ${WRKSRC} && ${MKDIR} ${CONFIGURE_DIRS}
Index: pkgsrc/devel/deepstate-afl/Makefile
diff -u pkgsrc/devel/deepstate-afl/Makefile:1.6 pkgsrc/devel/deepstate-afl/Makefile:1.7
--- pkgsrc/devel/deepstate-afl/Makefile:1.6 Wed Aug 7 19:24:31 2024
+++ pkgsrc/devel/deepstate-afl/Makefile Sun Aug 25 06:18:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2024/08/07 19:24:31 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2024/08/25 06:18:33 wiz Exp $
PKGNAME= deepstate-afl-${VERSION}
PKGREVISION= 2
@@ -15,10 +15,10 @@ DEPENDS+= deepstate>=${VERSION}:../../de
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -DPYTHON=${PREFIX}/bin/python${PYVERSSUFFIX}
-CMAKE_ARGS+= -DDEEPSTATE_AFL=ON
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${PREFIX:Q}/bin/afl-gcc
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${PREFIX:Q}/bin/afl-g++
+CMAKE_CONFIGURE_ARGS+= -DPYTHON=${PREFIX}/bin/python${PYVERSSUFFIX}
+CMAKE_CONFIGURE_ARGS+= -DDEEPSTATE_AFL=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${PREFIX:Q}/bin/afl-gcc
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${PREFIX:Q}/bin/afl-g++
PYTHON_VERSIONS_INCOMPATIBLE= 27 38 39 311 312
Index: pkgsrc/devel/deepstate-honggfuzz/Makefile
diff -u pkgsrc/devel/deepstate-honggfuzz/Makefile:1.6 pkgsrc/devel/deepstate-honggfuzz/Makefile:1.7
--- pkgsrc/devel/deepstate-honggfuzz/Makefile:1.6 Wed Aug 7 19:24:31 2024
+++ pkgsrc/devel/deepstate-honggfuzz/Makefile Sun Aug 25 06:18:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2024/08/07 19:24:31 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2024/08/25 06:18:33 wiz Exp $
PKGNAME= deepstate-honggfuzz-${VERSION}
PKGREVISION= 2
@@ -13,10 +13,10 @@ DEPENDS+= deepstate>=${VERSION}:../../de
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -DPYTHON=${PREFIX}/bin/python${PYVERSSUFFIX}
-CMAKE_ARGS+= -DDEEPSTATE_HONGGFUZZ=ON
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${PREFIX}/bin/hfuzz-gcc
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${PREFIX}/bin/hfuzz-g++
+CMAKE_CONFIGURE_ARGS+= -DPYTHON=${PREFIX}/bin/python${PYVERSSUFFIX}
+CMAKE_CONFIGURE_ARGS+= -DDEEPSTATE_HONGGFUZZ=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${PREFIX}/bin/hfuzz-gcc
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${PREFIX}/bin/hfuzz-g++
PYTHON_VERSIONS_INCOMPATIBLE= 27 38 39 311 312
Index: pkgsrc/devel/deepstate-libfuzzer/Makefile
diff -u pkgsrc/devel/deepstate-libfuzzer/Makefile:1.9 pkgsrc/devel/deepstate-libfuzzer/Makefile:1.10
--- pkgsrc/devel/deepstate-libfuzzer/Makefile:1.9 Wed Aug 7 19:24:31 2024
+++ pkgsrc/devel/deepstate-libfuzzer/Makefile Sun Aug 25 06:18:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2024/08/07 19:24:31 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2024/08/25 06:18:33 wiz Exp $
PKGNAME= deepstate-libfuzzer-${VERSION}
PKGREVISION= 2
@@ -14,10 +14,10 @@ TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -DPYTHON=${PREFIX}/bin/python${PYVERSSUFFIX}
-CMAKE_ARGS+= -DDEEPSTATE_LIBFUZZER=ON
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CLANGBASE:Q}/bin/clang
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CLANGBASE:Q}/bin/clang++
+CMAKE_CONFIGURE_ARGS+= -DPYTHON=${PREFIX}/bin/python${PYVERSSUFFIX}
+CMAKE_CONFIGURE_ARGS+= -DDEEPSTATE_LIBFUZZER=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CLANGBASE:Q}/bin/clang
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CLANGBASE:Q}/bin/clang++
PYTHON_VERSIONS_INCOMPATIBLE= 27 38 39 311 312
Index: pkgsrc/devel/doxygen/Makefile
diff -u pkgsrc/devel/doxygen/Makefile:1.189 pkgsrc/devel/doxygen/Makefile:1.190
--- pkgsrc/devel/doxygen/Makefile:1.189 Tue Aug 20 08:05:29 2024
+++ pkgsrc/devel/doxygen/Makefile Sun Aug 25 06:18:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.189 2024/08/20 08:05:29 adam Exp $
+# $NetBSD: Makefile,v 1.190 2024/08/25 06:18:33 wiz Exp $
DISTNAME= doxygen-1.12.0.src
PKGNAME= ${DISTNAME:S/.src//}
@@ -24,8 +24,8 @@ USE_TOOLS+= gmake gs:run perl:run bison
MAKE_ENV+= PKGSRC_CFLAGS=${CFLAGS:Q}
MAKE_FLAGS+= MAN1DIR=${PKGMANDIR}/man1
-CMAKE_ARGS+= -DDOC_INSTALL_DIR=share/doc/doxygen
-CMAKE_ARGS+= -DGIT_EXECUTABLE=git # avoid searching for git executable
+CMAKE_CONFIGURE_ARGS+= -DDOC_INSTALL_DIR=share/doc/doxygen
+CMAKE_CONFIGURE_ARGS+= -DGIT_EXECUTABLE=git # avoid searching for git executable
TEST_TARGET= tests
PYTHON_FOR_BUILD_ONLY= tool
Index: pkgsrc/devel/doxygen/options.mk
diff -u pkgsrc/devel/doxygen/options.mk:1.18 pkgsrc/devel/doxygen/options.mk:1.19
--- pkgsrc/devel/doxygen/options.mk:1.18 Tue Jun 6 12:40:36 2023
+++ pkgsrc/devel/doxygen/options.mk Sun Aug 25 06:18:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2023/06/06 12:40:36 riastradh Exp $
+# $NetBSD: options.mk,v 1.19 2024/08/25 06:18:33 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.doxygen
PKG_SUPPORTED_OPTIONS= latex qt
@@ -8,7 +8,7 @@ PKG_SUPPORTED_OPTIONS= latex qt
PLIST_VARS+= latex qt
.if !empty(PKG_OPTIONS:Mlatex)
-CMAKE_ARGS+= -Dbuild_doc=ON
+CMAKE_CONFIGURE_ARGS+= -Dbuild_doc=ON
BUILD_TARGET= all docs
PLIST.latex= yes
@@ -67,7 +67,7 @@ DEPENDS+= tex-xtab-[0-9]*:../../print/te
.if !empty(PKG_OPTIONS:Mqt)
-CMAKE_ARGS+= -Dbuild_wizard=ON
+CMAKE_CONFIGURE_ARGS+= -Dbuild_wizard=ON
PLIST.qt= yes
.include "../../x11/qt5-qtbase/buildlink3.mk"
.endif
Index: pkgsrc/devel/extra-cmake-modules/Makefile
diff -u pkgsrc/devel/extra-cmake-modules/Makefile:1.27 pkgsrc/devel/extra-cmake-modules/Makefile:1.28
--- pkgsrc/devel/extra-cmake-modules/Makefile:1.27 Sun May 26 10:58:32 2024
+++ pkgsrc/devel/extra-cmake-modules/Makefile Sun Aug 25 06:18:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2024/05/26 10:58:32 markd Exp $
+# $NetBSD: Makefile,v 1.28 2024/08/25 06:18:33 wiz Exp $
DISTNAME= extra-cmake-modules-6.2.0
CATEGORIES= devel kde
@@ -12,10 +12,10 @@ LICENSE= modified-bsd
USE_LANGUAGES= # none
-CMAKE_ARGS+= -DBUILD_TESTING=OFF
-CMAKE_ARGS+= -DBUILD_HTML_DOCS=OFF
-CMAKE_ARGS+= -DBUILD_MAN_DOCS=OFF
-CMAKE_ARGS+= -DBUILD_QTHELP_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_HTML_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_MAN_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_QTHELP_DOCS=OFF
CHECK_INTERPRETER_SKIP+= share/ECM/kde-modules/kde-git-commit-hooks/clang-format.sh
CHECK_INTERPRETER_SKIP+= share/ECM/kde-modules/kde-git-commit-hooks/json-schema.py
Index: pkgsrc/devel/fifechan/Makefile
diff -u pkgsrc/devel/fifechan/Makefile:1.11 pkgsrc/devel/fifechan/Makefile:1.12
--- pkgsrc/devel/fifechan/Makefile:1.11 Sat Apr 6 08:04:59 2024
+++ pkgsrc/devel/fifechan/Makefile Sun Aug 25 06:18:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2024/04/06 08:04:59 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2024/08/25 06:18:33 wiz Exp $
DISTNAME= fifechan-0.1.5
PKGREVISION= 10
@@ -17,7 +17,7 @@ USE_LANGUAGES= c c++
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
pre-configure:
${MKDIR} ${WRKSRC}/build
Index: pkgsrc/devel/fifengine/Makefile
diff -u pkgsrc/devel/fifengine/Makefile:1.31 pkgsrc/devel/fifengine/Makefile:1.32
--- pkgsrc/devel/fifengine/Makefile:1.31 Thu May 16 13:38:42 2024
+++ pkgsrc/devel/fifengine/Makefile Sun Aug 25 06:18:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2024/05/16 13:38:42 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2024/08/25 06:18:33 wiz Exp $
DISTNAME= fifengine-0.4.2
PKGREVISION= 27
@@ -27,7 +27,7 @@ UNLIMIT_RESOURCES= datasize virtualsize
PY_PATCHPLIST= yes
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
.include "../../devel/cmake/build.mk"
.include "../../audio/libvorbis/buildlink3.mk"
Index: pkgsrc/devel/flatbuffers/Makefile
diff -u pkgsrc/devel/flatbuffers/Makefile:1.6 pkgsrc/devel/flatbuffers/Makefile:1.7
--- pkgsrc/devel/flatbuffers/Makefile:1.6 Wed Aug 16 07:52:04 2023
+++ pkgsrc/devel/flatbuffers/Makefile Sun Aug 25 06:18:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/08/16 07:52:04 nia Exp $
+# $NetBSD: Makefile,v 1.7 2024/08/25 06:18:34 wiz Exp $
DISTNAME= flatbuffers-1.9.0
CATEGORIES= devel
@@ -13,8 +13,8 @@ LICENSE= apache-2.0
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DFLATBUFFERS_BUILD_SHAREDLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DFLATBUFFERS_BUILD_SHAREDLIB=ON
USE_CXX_FEATURES+= c++11
Index: pkgsrc/devel/frozen/Makefile
diff -u pkgsrc/devel/frozen/Makefile:1.2 pkgsrc/devel/frozen/Makefile:1.3
--- pkgsrc/devel/frozen/Makefile:1.2 Tue Nov 7 09:13:42 2023
+++ pkgsrc/devel/frozen/Makefile Sun Aug 25 06:18:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/11/07 09:13:42 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:18:34 wiz Exp $
DISTNAME= frozen-1.1.1
CATEGORIES= devel
@@ -12,7 +12,7 @@ LICENSE= apache-2.0
USE_LANGUAGES= c++
# constexpr tests fail with at least GCC 12 and 13
-CMAKE_ARGS+= -DBUILD_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/gflags/Makefile
diff -u pkgsrc/devel/gflags/Makefile:1.4 pkgsrc/devel/gflags/Makefile:1.5
--- pkgsrc/devel/gflags/Makefile:1.4 Tue Jan 24 18:36:22 2023
+++ pkgsrc/devel/gflags/Makefile Sun Aug 25 06:18:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/01/24 18:36:22 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2024/08/25 06:18:34 wiz Exp $
DISTNAME= gflags-2.2.2
CATEGORIES= devel
@@ -15,11 +15,11 @@ USE_TOOLS+= bash:run
TEST_TARGET= test
REPLACE_BASH= src/gflags_completions.sh
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
-CMAKE_ARGS+= -DBUILD_STATIC_LIBS:BOOL=ON
-CMAKE_ARGS+= -DBUILD_TESTING:BOOL=ON
-CMAKE_ARGS+= -DGFLAGS_NAMESPACE:STRING=gflags
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_STATIC_LIBS:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DGFLAGS_NAMESPACE:STRING=gflags
PTHREAD_OPTS+= require
PKGCONFIG_OVERRIDE= cmake/package.pc.in
Index: pkgsrc/devel/gnustep-objc/Makefile
diff -u pkgsrc/devel/gnustep-objc/Makefile:1.39 pkgsrc/devel/gnustep-objc/Makefile:1.40
--- pkgsrc/devel/gnustep-objc/Makefile:1.39 Wed Aug 23 11:57:05 2023
+++ pkgsrc/devel/gnustep-objc/Makefile Sun Aug 25 06:18:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2023/08/23 11:57:05 pho Exp $
+# $NetBSD: Makefile,v 1.40 2024/08/25 06:18:34 wiz Exp $
DISTNAME= libobjc2-2.1.0
PKGNAME= ${DISTNAME:S/libobjc2/gnustep-objc/}
@@ -35,7 +35,7 @@ post-extract:
do-configure:
cd ${WRKSRC} && \
- ${SETENV} ${CONFIGURE_ENV} ${CMAKE} -Wno-dev ${CMAKE_ARGS} .
+ ${SETENV} ${CONFIGURE_ENV} ${CMAKE} -Wno-dev ${CMAKE_CONFIGURE_ARGS} .
.include "../../mk/compiler.mk"
@@ -43,7 +43,7 @@ do-configure:
# Building tests with GCC is not supported.
.if empty(CC_VERSION:Mclang-*)
-CMAKE_ARGS+= -DTESTS:BOOL=FALSE
+CMAKE_CONFIGURE_ARGS+= -DTESTS:BOOL=FALSE
.endif
PLIST_VARS+= objcxx
Index: pkgsrc/devel/google-glog/Makefile
diff -u pkgsrc/devel/google-glog/Makefile:1.13 pkgsrc/devel/google-glog/Makefile:1.14
--- pkgsrc/devel/google-glog/Makefile:1.13 Fri Jul 21 08:16:01 2023
+++ pkgsrc/devel/google-glog/Makefile Sun Aug 25 06:18:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/07/21 08:16:01 nia Exp $
+# $NetBSD: Makefile,v 1.14 2024/08/25 06:18:34 wiz Exp $
DISTNAME= glog-0.6.0
PKGNAME= google-${DISTNAME}
@@ -16,7 +16,7 @@ LICENSE= modified-bsd
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DWITH_UNWIND=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_UNWIND=OFF
BUILDLINK_TRANSFORM.SunOS+= rm:-pie
Index: pkgsrc/devel/google-glog/options.mk
diff -u pkgsrc/devel/google-glog/options.mk:1.1 pkgsrc/devel/google-glog/options.mk:1.2
--- pkgsrc/devel/google-glog/options.mk:1.1 Fri Jul 21 08:16:01 2023
+++ pkgsrc/devel/google-glog/options.mk Sun Aug 25 06:18:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/07/21 08:16:01 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:34 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.google-glog
@@ -15,9 +15,9 @@ PKG_SUPPORTED_OPTIONS= tests
.if !empty(PKG_OPTIONS:Mtests)
# googletest requires minimum c++14.
TEST_TARGET= test
-CMAKE_ARGS+= -DBUILD_TESTING=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=ON
USE_LANGUAGES+= c++14
. include "../../devel/googletest/buildlink3.mk"
.else
-CMAKE_ARGS+= -DBUILD_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
.endif
Index: pkgsrc/devel/hyperscan/Makefile
diff -u pkgsrc/devel/hyperscan/Makefile:1.17 pkgsrc/devel/hyperscan/Makefile:1.18
--- pkgsrc/devel/hyperscan/Makefile:1.17 Wed May 29 16:32:03 2024
+++ pkgsrc/devel/hyperscan/Makefile Sun Aug 25 06:18:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2024/05/29 16:32:03 adam Exp $
+# $NetBSD: Makefile,v 1.18 2024/08/25 06:18:34 wiz Exp $
DISTNAME= hyperscan-5.0.0
PKGREVISION= 9
@@ -21,7 +21,7 @@ USE_CXX_FEATURES+= c++11
USE_TOOLS+= pkg-config
PYTHON_FOR_BUILD_ONLY= yes
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
PKGCONFIG_OVERRIDE+= libhs.pc.in
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/devel/include-what-you-use/Makefile
diff -u pkgsrc/devel/include-what-you-use/Makefile:1.41 pkgsrc/devel/include-what-you-use/Makefile:1.42
--- pkgsrc/devel/include-what-you-use/Makefile:1.41 Sat Jul 6 15:49:47 2024
+++ pkgsrc/devel/include-what-you-use/Makefile Sun Aug 25 06:18:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2024/07/06 15:49:47 adam Exp $
+# $NetBSD: Makefile,v 1.42 2024/08/25 06:18:34 wiz Exp $
DISTNAME= include-what-you-use-0.22
CATEGORIES= devel
@@ -12,7 +12,7 @@ LICENSE= modified-bsd
USE_CXX_FEATURES+= c++17
USE_LANGUAGES= c c++
-CMAKE_ARGS= -DIWYU_LLVM_ROOT_PATH:PATH=${BUILDLINK_PREFIX.clang}
+CMAKE_CONFIGURE_ARGS= -DIWYU_LLVM_ROOT_PATH:PATH=${BUILDLINK_PREFIX.clang}
REPLACE_PYTHON= *.py
Index: pkgsrc/devel/libcbor/Makefile
diff -u pkgsrc/devel/libcbor/Makefile:1.11 pkgsrc/devel/libcbor/Makefile:1.12
--- pkgsrc/devel/libcbor/Makefile:1.11 Sun Feb 4 19:13:16 2024
+++ pkgsrc/devel/libcbor/Makefile Sun Aug 25 06:18:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2024/02/04 19:13:16 schmonz Exp $
+# $NetBSD: Makefile,v 1.12 2024/08/25 06:18:34 wiz Exp $
DISTNAME= libcbor-0.11.0
CATEGORIES= devel
@@ -11,8 +11,8 @@ COMMENT= Parsing and generate schema-les
LICENSE= mit
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DWITH_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_EXAMPLES=OFF
CHECK_PORTABILITY_SKIP+= misc/hooks/*
Index: pkgsrc/devel/libdbusmenu-lxqt/Makefile
diff -u pkgsrc/devel/libdbusmenu-lxqt/Makefile:1.2 pkgsrc/devel/libdbusmenu-lxqt/Makefile:1.3
--- pkgsrc/devel/libdbusmenu-lxqt/Makefile:1.2 Tue Aug 20 06:10:04 2024
+++ pkgsrc/devel/libdbusmenu-lxqt/Makefile Sun Aug 25 06:18:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2024/08/20 06:10:04 pin Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:18:35 wiz Exp $
DISTNAME= libdbusmenu-lxqt-0.1.0
CATEGORIES= devel
@@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v2.1
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
PKGCONFIG_OVERRIDE+= dbusmenu-lxqt.pc.in
Index: pkgsrc/devel/libdbusmenu-qt/Makefile
diff -u pkgsrc/devel/libdbusmenu-qt/Makefile:1.34 pkgsrc/devel/libdbusmenu-qt/Makefile:1.35
--- pkgsrc/devel/libdbusmenu-qt/Makefile:1.34 Sun Nov 12 13:21:05 2023
+++ pkgsrc/devel/libdbusmenu-qt/Makefile Sun Aug 25 06:18:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2023/11/12 13:21:05 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2024/08/25 06:18:35 wiz Exp $
PKGREVISION= 8
.include "../../devel/libdbusmenu-qt/Makefile.common"
@@ -8,7 +8,7 @@ PKGNAME= ${DISTNAME:S/_/-/:S/+/./}
COMMENT= Dbusmenu library for Qt4
-CMAKE_ARGS+= -DUSE_QT4=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_QT4=ON
.include "../../x11/qt4-libs/buildlink3.mk"
.include "../../x11/qt4-tools/buildlink3.mk"
Index: pkgsrc/devel/libdbusmenu-qt/Makefile.common
diff -u pkgsrc/devel/libdbusmenu-qt/Makefile.common:1.3 pkgsrc/devel/libdbusmenu-qt/Makefile.common:1.4
--- pkgsrc/devel/libdbusmenu-qt/Makefile.common:1.3 Sun Nov 3 10:39:16 2019
+++ pkgsrc/devel/libdbusmenu-qt/Makefile.common Sun Aug 25 06:18:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2019/11/03 10:39:16 rillig Exp $
+# $NetBSD: Makefile.common,v 1.4 2024/08/25 06:18:35 wiz Exp $
# used by devel/libdbusmenu-qt/Makefile
# used by devel/libdbusmenu-qt5/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
USE_LANGUAGES= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DWITH_DOC=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_DOC=OFF
pre-configure:
${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
Index: pkgsrc/devel/libdivsufsort/Makefile
diff -u pkgsrc/devel/libdivsufsort/Makefile:1.2 pkgsrc/devel/libdivsufsort/Makefile:1.3
--- pkgsrc/devel/libdivsufsort/Makefile:1.2 Wed Jan 20 11:39:32 2021
+++ pkgsrc/devel/libdivsufsort/Makefile Sun Aug 25 06:18:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/01/20 11:39:32 nia Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:18:35 wiz Exp $
DISTNAME= libdivsufsort-2.0.1
CATEGORIES= devel
@@ -12,7 +12,7 @@ LICENSE= mit
USE_CMAKE= yes
# Examples do not get installed.
-CMAKE_ARGS+= -DBUILD_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_EXAMPLES=OFF
PKGCONFIG_OVERRIDE+= pkgconfig/libdivsufsort.pc.cmake
Index: pkgsrc/devel/libebml/Makefile
diff -u pkgsrc/devel/libebml/Makefile:1.58 pkgsrc/devel/libebml/Makefile:1.59
--- pkgsrc/devel/libebml/Makefile:1.58 Sat Dec 30 20:56:24 2023
+++ pkgsrc/devel/libebml/Makefile Sun Aug 25 06:18:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2023/12/30 20:56:24 zafer Exp $
+# $NetBSD: Makefile,v 1.59 2024/08/25 06:18:35 wiz Exp $
DISTNAME= libebml-1.4.5
CATEGORIES= devel
@@ -12,7 +12,7 @@ LICENSE= gnu-lgpl-v2.1
USE_LANGUAGES= c c++
USE_CXX_FEATURES+= c++14
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=YES
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=YES
PKGCONFIG_OVERRIDE= libebml.pc.in
.include "../../devel/cmake/build.mk"
Index: pkgsrc/devel/libepoll-shim/Makefile
diff -u pkgsrc/devel/libepoll-shim/Makefile:1.12 pkgsrc/devel/libepoll-shim/Makefile:1.13
--- pkgsrc/devel/libepoll-shim/Makefile:1.12 Sun Jun 9 14:06:32 2024
+++ pkgsrc/devel/libepoll-shim/Makefile Sun Aug 25 06:18:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2024/06/09 14:06:32 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2024/08/25 06:18:35 wiz Exp $
DISTNAME= ${GITHUB_PROJECT}-0.0.20240608
PKGNAME= lib${DISTNAME}
@@ -14,8 +14,8 @@ LICENSE= mit
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_TESTING=OFF
-CMAKE_ARGS+= -DCMAKE_INSTALL_PKGCONFIGDIR=${PREFIX}/lib/pkgconfig
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PKGCONFIGDIR=${PREFIX}/lib/pkgconfig
# re-defines read(2) itself
FORTIFY_SUPPORTED= no
Index: pkgsrc/devel/libftdi1/Makefile
diff -u pkgsrc/devel/libftdi1/Makefile:1.50 pkgsrc/devel/libftdi1/Makefile:1.51
--- pkgsrc/devel/libftdi1/Makefile:1.50 Sat Aug 17 09:18:41 2024
+++ pkgsrc/devel/libftdi1/Makefile Sun Aug 25 06:18:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2024/08/17 09:18:41 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2024/08/25 06:18:35 wiz Exp $
DISTNAME= libftdi1-1.5
PKGREVISION= 8
@@ -17,12 +17,12 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DEXAMPLES=off
-CMAKE_ARGS+= -DDOCUMENTATION=off
-CMAKE_ARGS+= -DLIB_SUFFIX=""
-CMAKE_ARGS+= -DFTDIPP=on
-CMAKE_ARGS+= -DPYTHON_BINDINGS=on
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DEXAMPLES=off
+CMAKE_CONFIGURE_ARGS+= -DDOCUMENTATION=off
+CMAKE_CONFIGURE_ARGS+= -DLIB_SUFFIX=""
+CMAKE_CONFIGURE_ARGS+= -DFTDIPP=on
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_BINDINGS=on
PKGCONFIG_OVERRIDE+= libftdi1.pc.in
PKGCONFIG_OVERRIDE+= libftdipp1.pc.in
Index: pkgsrc/devel/libgit2/Makefile
diff -u pkgsrc/devel/libgit2/Makefile:1.82 pkgsrc/devel/libgit2/Makefile:1.83
--- pkgsrc/devel/libgit2/Makefile:1.82 Wed May 29 16:32:13 2024
+++ pkgsrc/devel/libgit2/Makefile Sun Aug 25 06:18:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2024/05/29 16:32:13 adam Exp $
+# $NetBSD: Makefile,v 1.83 2024/08/25 06:18:35 wiz Exp $
DISTNAME= libgit2-1.8.1
PKGREVISION= 1
@@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config
USE_CC_FEATURES+= c99
FORCE_C_STD= gnu99 # src/cli/opt.c uses alloca(3)
-CMAKE_ARGS+= -DREGEX_BACKEND="pcre2"
+CMAKE_CONFIGURE_ARGS+= -DREGEX_BACKEND="pcre2"
PKGCONFIG_OVERRIDE+= ${CMAKE_BUILD_DIR}/libgit2.pc
PKGCONFIG_OVERRIDE_STAGE= pre-install
Index: pkgsrc/devel/libyang/Makefile
diff -u pkgsrc/devel/libyang/Makefile:1.3 pkgsrc/devel/libyang/Makefile:1.4
--- pkgsrc/devel/libyang/Makefile:1.3 Thu Sep 9 07:39:15 2021
+++ pkgsrc/devel/libyang/Makefile Sun Aug 25 06:18:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/09/09 07:39:15 kardel Exp $
+# $NetBSD: Makefile,v 1.4 2024/08/25 06:18:35 wiz Exp $
GITHUB_PROJECT= libyang
GITHUB_TAG= v1.0.240
@@ -31,8 +31,8 @@ CONFIGURE_DIRS= _build
pre-configure:
${MKDIR} ${WRKSRC}/_build
-CMAKE_ARGS?= -DCMAKE_BUILD_TYPE:String="Release"
-CMAKE_ARGS+= -DENABLE_LYD_PRIV=ON
+CMAKE_CONFIGURE_ARGS?= -DCMAKE_BUILD_TYPE:String="Release"
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LYD_PRIV=ON
.include "../../devel/pcre/buildlink3.mk"
Index: pkgsrc/devel/libyang2/Makefile
diff -u pkgsrc/devel/libyang2/Makefile:1.2 pkgsrc/devel/libyang2/Makefile:1.3
--- pkgsrc/devel/libyang2/Makefile:1.2 Tue Jan 9 15:53:59 2024
+++ pkgsrc/devel/libyang2/Makefile Sun Aug 25 06:18:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2024/01/09 15:53:59 chopps Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:18:36 wiz Exp $
GITHUB_PROJECT= libyang
GITHUB_TAG= v2.1.128
@@ -25,7 +25,7 @@ PKGCONFIG_OVERRIDE+= swig/libyang-cpp.pc
.include "../../mk/bsd.prefs.mk"
-CMAKE_ARGS?= -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE:String="Release"
+CMAKE_CONFIGURE_ARGS?= -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE:String="Release"
TEST_TARGET?= test
.include "../../devel/cmocka/buildlink3.mk"
Index: pkgsrc/devel/lld/Makefile
diff -u pkgsrc/devel/lld/Makefile:1.25 pkgsrc/devel/lld/Makefile:1.26
--- pkgsrc/devel/lld/Makefile:1.25 Sat Jul 6 15:45:08 2024
+++ pkgsrc/devel/lld/Makefile Sun Aug 25 06:18:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/07/06 15:45:08 adam Exp $
+# $NetBSD: Makefile,v 1.26 2024/08/25 06:18:36 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -15,9 +15,9 @@ USE_CXX_FEATURES= c++14
USE_LANGUAGES= c c++
GCC_REQD+= 7
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
PYTHON_FOR_BUILD_ONLY= yes
Index: pkgsrc/devel/lld/options.mk
diff -u pkgsrc/devel/lld/options.mk:1.1 pkgsrc/devel/lld/options.mk:1.2
--- pkgsrc/devel/lld/options.mk:1.1 Fri Feb 1 16:30:00 2019
+++ pkgsrc/devel/lld/options.mk Sun Aug 25 06:18:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2019/02/01 16:30:00 mgorny Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:36 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.lld
PKG_SUPPORTED_OPTIONS= tests
@@ -7,14 +7,14 @@ PKG_SUPPORTED_OPTIONS= tests
.if !empty(PKG_OPTIONS:Mtests)
DISTFILES+= llvm-${PKGVERSION_NOREV}.src${EXTRACT_SUFX}
-CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
-CMAKE_ARGS+= -DLLVM_BUILD_TESTS=ON
-CMAKE_ARGS+= -DLLVM_MAIN_SRC_DIR=${WRKDIR}/llvm-${PKGVERSION_NOREV}.src
-CMAKE_ARGS+= -DLLVM_EXTERNAL_LIT=${WRKDIR}/llvm-${PKGVERSION_NOREV}.src/utils/lit/lit.py
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_BUILD_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_MAIN_SRC_DIR=${WRKDIR}/llvm-${PKGVERSION_NOREV}.src
+CMAKE_CONFIGURE_ARGS+= -DLLVM_EXTERNAL_LIT=${WRKDIR}/llvm-${PKGVERSION_NOREV}.src/utils/lit/lit.py
REPLACE_PYTHON+= ${WRKDIR}/llvm-${PKGVERSION_NOREV}.src/utils/lit/lit.py
TEST_TARGET= check-lld # failing tests fixed in 8.0
TEST_ENV+= LD_LIBRARY_PATH=${WRKDIR}/build/lib
.else
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
.endif
Index: pkgsrc/devel/lldb/Makefile
diff -u pkgsrc/devel/lldb/Makefile:1.53 pkgsrc/devel/lldb/Makefile:1.54
--- pkgsrc/devel/lldb/Makefile:1.53 Sat Jul 13 11:37:48 2024
+++ pkgsrc/devel/lldb/Makefile Sun Aug 25 06:18:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2024/07/13 11:37:48 nikita Exp $
+# $NetBSD: Makefile,v 1.54 2024/08/25 06:18:36 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -21,14 +21,14 @@ USE_LANGUAGES= c c++
GCC_REQD+= 7
PY_PATCHPLIST= yes
-CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
-CMAKE_ARGS+= -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON
-CMAKE_ARGS+= -DLLDB_CODESIGN_IDENTITY=""
-CMAKE_ARGS+= -DLLDB_USE_SYSTEM_SIX=ON
-CMAKE_ARGS+= -DPYTHON_HOME=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON
+CMAKE_CONFIGURE_ARGS+= -DLLDB_CODESIGN_IDENTITY=""
+CMAKE_CONFIGURE_ARGS+= -DLLDB_USE_SYSTEM_SIX=ON
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_HOME=${PREFIX}
CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm
Index: pkgsrc/devel/lldb/options.mk
diff -u pkgsrc/devel/lldb/options.mk:1.3 pkgsrc/devel/lldb/options.mk:1.4
--- pkgsrc/devel/lldb/options.mk:1.3 Sat Jul 6 15:45:08 2024
+++ pkgsrc/devel/lldb/options.mk Sun Aug 25 06:18:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2024/07/06 15:45:08 adam Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:36 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.lldb
@@ -8,18 +8,18 @@ PKG_SUGGESTED_OPTIONS= curses
.include "../../mk/bsd.options.mk"
.if ${PKG_OPTIONS:Mtests}
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
.else
# py-lit, py-psutil, lld
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
.endif
.if ${PKG_OPTIONS:Mcurses}
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/terminfo.buildlink3.mk"
-CMAKE_ARGS+= -DLLDB_ENABLE_CURSES=ON
-CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=ON
+CMAKE_CONFIGURE_ARGS+= -DLLDB_ENABLE_CURSES=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_TERMINFO=ON
.else
-CMAKE_ARGS+= -DLLDB_ENABLE_CURSES=OFF
-CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLDB_ENABLE_CURSES=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF
.endif
Index: pkgsrc/devel/lua-luv/Makefile
diff -u pkgsrc/devel/lua-luv/Makefile:1.9 pkgsrc/devel/lua-luv/Makefile:1.10
--- pkgsrc/devel/lua-luv/Makefile:1.9 Sun May 28 10:05:36 2023
+++ pkgsrc/devel/lua-luv/Makefile Sun Aug 25 06:18:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/05/28 10:05:36 bsiegert Exp $
+# $NetBSD: Makefile,v 1.10 2024/08/25 06:18:36 wiz Exp $
DISTNAME= luv-1.43.0-0
PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/-0$/.0/1}
@@ -24,11 +24,11 @@ DEPENDS+= ${LUA_PKGPREFIX}-compat53-[0-9
USE_CMAKE= yes
-CMAKE_ARGS+= -DWITH_SHARED_LIBUV=ON
-CMAKE_ARGS+= -DBUILD_MODULE=ON
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DLUA_BUILD_TYPE=System
-CMAKE_ARGS+= -DWITH_LUA_ENGINE=Lua
+CMAKE_CONFIGURE_ARGS+= -DWITH_SHARED_LIBUV=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_MODULE=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DLUA_BUILD_TYPE=System
+CMAKE_CONFIGURE_ARGS+= -DWITH_LUA_ENGINE=Lua
PKGCONFIG_OVERRIDE+= libluv.pc.in
Index: pkgsrc/devel/lua-sdl2/Makefile
diff -u pkgsrc/devel/lua-sdl2/Makefile:1.15 pkgsrc/devel/lua-sdl2/Makefile:1.16
--- pkgsrc/devel/lua-sdl2/Makefile:1.15 Sat Apr 6 08:05:06 2024
+++ pkgsrc/devel/lua-sdl2/Makefile Sun Aug 25 06:18:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2024/04/06 08:05:06 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2024/08/25 06:18:36 wiz Exp $
DISTNAME= luasdl2-2.0.5.6.0
PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/^lua//1}
@@ -16,9 +16,9 @@ LICENSE= isc
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DWITH_DOCSDIR=${LUA_DOCDIR}
-CMAKE_ARGS+= -DWITH_LUAVER="user"
-CMAKE_ARGS+= -DLUA_LIBDIR=${LUA_CDIR}
+CMAKE_CONFIGURE_ARGS+= -DWITH_DOCSDIR=${LUA_DOCDIR}
+CMAKE_CONFIGURE_ARGS+= -DWITH_LUAVER="user"
+CMAKE_CONFIGURE_ARGS+= -DLUA_LIBDIR=${LUA_CDIR}
# build fails on lua52.
LUA_VERSIONS_INCOMPATIBLE= 52
Index: pkgsrc/devel/lxqt-build-tools/Makefile
diff -u pkgsrc/devel/lxqt-build-tools/Makefile:1.36 pkgsrc/devel/lxqt-build-tools/Makefile:1.37
--- pkgsrc/devel/lxqt-build-tools/Makefile:1.36 Tue Aug 20 06:09:24 2024
+++ pkgsrc/devel/lxqt-build-tools/Makefile Sun Aug 25 06:18:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2024/08/20 06:09:24 pin Exp $
+# $NetBSD: Makefile,v 1.37 2024/08/25 06:18:36 wiz Exp $
DISTNAME= lxqt-build-tools-2.0.0
CATEGORIES= devel
@@ -15,7 +15,7 @@ USE_TOOLS+= pkg-config perl
USE_LANGUAGES= c c++ # Needed to satisfy cmake
PKG_SYSCONFSUBDIR= xdg
-CMAKE_ARGS+= -DLXQT_ETC_XDG_DIR=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DLXQT_ETC_XDG_DIR=${PKG_SYSCONFDIR}
BUILDLINK_API_DEPENDS.qt6-qtbase+= qt6-qtbase>=6.6.0
.include "../../x11/qt6-qtbase/buildlink3.mk"
Index: pkgsrc/devel/mimalloc/Makefile
diff -u pkgsrc/devel/mimalloc/Makefile:1.10 pkgsrc/devel/mimalloc/Makefile:1.11
--- pkgsrc/devel/mimalloc/Makefile:1.10 Fri Jul 21 08:25:51 2023
+++ pkgsrc/devel/mimalloc/Makefile Sun Aug 25 06:18:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/07/21 08:25:51 nia Exp $
+# $NetBSD: Makefile,v 1.11 2024/08/25 06:18:36 wiz Exp $
DISTNAME= mimalloc-2.0.9
CATEGORIES= devel
@@ -13,7 +13,7 @@ LICENSE= mit
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DMI_INSTALL_TOPLEVEL=ON
+CMAKE_CONFIGURE_ARGS+= -DMI_INSTALL_TOPLEVEL=ON
# Requires stdatomic support.
USE_CC_FEATURES+= c11
Index: pkgsrc/devel/mold/Makefile
diff -u pkgsrc/devel/mold/Makefile:1.39 pkgsrc/devel/mold/Makefile:1.40
--- pkgsrc/devel/mold/Makefile:1.39 Wed May 15 13:02:04 2024
+++ pkgsrc/devel/mold/Makefile Sun Aug 25 06:18:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2024/05/15 13:02:04 ktnb Exp $
+# $NetBSD: Makefile,v 1.40 2024/08/25 06:18:36 wiz Exp $
DISTNAME= mold-2.31.0
CATEGORIES= devel
@@ -14,7 +14,7 @@ USE_LANGUAGES= c c++20
USE_CMAKE= yes
-CMAKE_ARGS+= -DMOLD_USE_SYSTEM_MIMALLOC=ON -DMOLD_USE_SYSTEM_TBB=ON
+CMAKE_CONFIGURE_ARGS+= -DMOLD_USE_SYSTEM_MIMALLOC=ON -DMOLD_USE_SYSTEM_TBB=ON
# Use <stdlib.h> on systems where <alloca.h> doesn't exist
.if !exists(/usr/include/alloca.h)
Index: pkgsrc/devel/nextpnr/nextpnr.mk
diff -u pkgsrc/devel/nextpnr/nextpnr.mk:1.4 pkgsrc/devel/nextpnr/nextpnr.mk:1.5
--- pkgsrc/devel/nextpnr/nextpnr.mk:1.4 Sun Apr 21 16:28:25 2024
+++ pkgsrc/devel/nextpnr/nextpnr.mk Sun Aug 25 06:18:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: nextpnr.mk,v 1.4 2024/04/21 16:28:25 adam Exp $
+# $NetBSD: nextpnr.mk,v 1.5 2024/08/25 06:18:37 wiz Exp $
NEXTPNR_VERSION=0.7
DISTNAME= nextpnr-${NEXTPNR_VERSION}
@@ -22,10 +22,10 @@ PATCHDIR?= ${.CURDIR}/../../devel/nextpn
USE_LANGUAGES= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DCURRENT_GIT_VERSION=${NEXTPNR_VERSION}
-CMAKE_ARGS+= -DARCH=${NEXTPNR_TARGET}
+CMAKE_CONFIGURE_ARGS+= -DCURRENT_GIT_VERSION=${NEXTPNR_VERSION}
+CMAKE_CONFIGURE_ARGS+= -DARCH=${NEXTPNR_TARGET}
.if defined(NEXTPNR_TARGET_ARGS)
-CMAKE_ARGS+= ${NEXTPNR_TARGET_ARGS}
+CMAKE_CONFIGURE_ARGS+= ${NEXTPNR_TARGET_ARGS}
.endif
# Python 3.5 or later, including development libraries, Python 3.9 or
Index: pkgsrc/devel/polly/Makefile
diff -u pkgsrc/devel/polly/Makefile:1.25 pkgsrc/devel/polly/Makefile:1.26
--- pkgsrc/devel/polly/Makefile:1.25 Sat Jul 6 15:45:08 2024
+++ pkgsrc/devel/polly/Makefile Sun Aug 25 06:18:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/07/06 15:45:08 adam Exp $
+# $NetBSD: Makefile,v 1.26 2024/08/25 06:18:37 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -18,9 +18,9 @@ FORCE_CXX_STD= c++17
USE_LANGUAGES= c c++
GCC_REQD+= 4.8
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
.include "../../devel/cmake/build.mk"
.include "../../lang/llvm/buildlink3.mk"
Index: pkgsrc/devel/protobuf/Makefile
diff -u pkgsrc/devel/protobuf/Makefile:1.81 pkgsrc/devel/protobuf/Makefile:1.82
--- pkgsrc/devel/protobuf/Makefile:1.81 Tue Aug 6 12:05:29 2024
+++ pkgsrc/devel/protobuf/Makefile Sun Aug 25 06:18:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2024/08/06 12:05:29 adam Exp $
+# $NetBSD: Makefile,v 1.82 2024/08/25 06:18:37 wiz Exp $
#
# When updating this, please also update devel/py-protobuf.
#
@@ -25,12 +25,12 @@ USE_LANGUAGES= c c++
# Fails with C++14 default language
FORCE_CXX_STD= c++14
-CMAKE_ARGS+= -Dprotobuf_ABSL_PROVIDER=package
+CMAKE_CONFIGURE_ARGS+= -Dprotobuf_ABSL_PROVIDER=package
# FIXME: Currently libupd makes net/grpc build fail.
-CMAKE_ARGS+= -Dprotobuf_BUILD_LIBUPB=OFF
-CMAKE_ARGS+= -Dprotobuf_BUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -Dprotobuf_BUILD_LIBUPB=OFF
+CMAKE_CONFIGURE_ARGS+= -Dprotobuf_BUILD_SHARED_LIBS=ON
# requires googletest to be checked out in third_party/googletest
-CMAKE_ARGS+= -Dprotobuf_BUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -Dprotobuf_BUILD_TESTS=OFF
# the [[ command will skip a test that would otherwise run
CHECK_PORTABILITY_SKIP+= src/google/protobuf/compiler/zip_output_unittest.sh
Index: pkgsrc/devel/py-llvmlite/Makefile
diff -u pkgsrc/devel/py-llvmlite/Makefile:1.25 pkgsrc/devel/py-llvmlite/Makefile:1.26
--- pkgsrc/devel/py-llvmlite/Makefile:1.25 Wed Jan 24 15:25:12 2024
+++ pkgsrc/devel/py-llvmlite/Makefile Sun Aug 25 06:18:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/01/24 15:25:12 thor Exp $
+# $NetBSD: Makefile,v 1.26 2024/08/25 06:18:37 wiz Exp $
DISTNAME= llvmlite-0.41.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -38,36 +38,36 @@ USE_TOOLS= cmake
# stuff from source is hard and keep it so:-/
# I kept some upstream comments inline.
-LLVM_CMAKE_ARGS= -DCMAKE_INSTALL_PREFIX=${WRKDIR}/llvm-inst
-LLVM_CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release
-LLVM_CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS:STRING=lld
+LLVM_CMAKE_CONFIGURE_ARGS= -DCMAKE_INSTALL_PREFIX=${WRKDIR}/llvm-inst
+LLVM_CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release
+LLVM_CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_PROJECTS:STRING=lld
# We explicitly want static linking.
-LLVM_CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=OFF
-LLVM_CMAKE_ARGS+= -DLLVM_ENABLE_ASSERTIONS:BOOL=ON
-LLVM_CMAKE_ARGS+= -DLINK_POLLY_INTO_TOOLS:BOOL=ON
+LLVM_CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_ASSERTIONS:BOOL=ON
+LLVM_CMAKE_CONFIGURE_ARGS+= -DLINK_POLLY_INTO_TOOLS:BOOL=ON
# Don't really require libxml2. Turn it off explicitly to avoid accidentally linking to system libs
-LLVM_CMAKE_ARGS+= -DLLVM_ENABLE_LIBXML2:BOOL=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_LIBXML2:BOOL=OFF
# Urgh, llvm *really* wants to link to ncurses / terminfo and we *really* do not want it to.
-LLVM_CMAKE_ARGS+= -DHAVE_TERMINFO_CURSES=OFF
-LLVM_CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DHAVE_TERMINFO_CURSES=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF
# Sometimes these are reported as unused. Whatever.
-LLVM_CMAKE_ARGS+= -DHAVE_TERMINFO_NCURSES=OFF
-LLVM_CMAKE_ARGS+= -DHAVE_TERMINFO_NCURSESW=OFF
-LLVM_CMAKE_ARGS+= -DHAVE_TERMINFO_TERMINFO=OFF
-LLVM_CMAKE_ARGS+= -DHAVE_TERMINFO_TINFO=OFF
-LLVM_CMAKE_ARGS+= -DHAVE_TERMIOS_H=OFF
-LLVM_CMAKE_ARGS+= -DCLANG_ENABLE_LIBXML=OFF
-LLVM_CMAKE_ARGS+= -DLIBOMP_INSTALL_ALIASES=OFF
-LLVM_CMAKE_ARGS+= -DLLVM_ENABLE_RTTI=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DHAVE_TERMINFO_NCURSES=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DHAVE_TERMINFO_NCURSESW=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DHAVE_TERMINFO_TERMINFO=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DHAVE_TERMINFO_TINFO=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DHAVE_TERMIOS_H=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DCLANG_ENABLE_LIBXML=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DLIBOMP_INSTALL_ALIASES=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_RTTI=OFF
# Not sure if this should be adapted for pkgsrc.
-LLVM_CMAKE_ARGS+= -DLLVM_TARGETS_TO_BUILD=all
-LLVM_CMAKE_ARGS+= -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly
+LLVM_CMAKE_CONFIGURE_ARGS+= -DLLVM_TARGETS_TO_BUILD=all
+LLVM_CMAKE_CONFIGURE_ARGS+= -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly
# for llvm-lit
-LLVM_CMAKE_ARGS+= -DLLVM_INCLUDE_UTILS=ON
+LLVM_CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_UTILS=ON
# doesn't build without the rest of LLVM project
-LLVM_CMAKE_ARGS+= -DLLVM_INCLUDE_BENCHMARKS:BOOL=OFF
-LLVM_CMAKE_ARGS+= -DLLVM_INCLUDE_DOCS=OFF
-LLVM_CMAKE_ARGS+= -DLLVM_INCLUDE_EXAMPLES=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_BENCHMARKS:BOOL=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_DOCS=OFF
+LLVM_CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_EXAMPLES=OFF
MAKE_ENV+= LLVM_CONFIG=${WRKDIR}/llvm-inst/bin/llvm-config
@@ -89,7 +89,7 @@ pre-configure:
${LN} -s lld-${LLVM_VERSION}.src ${WRKDIR}/lld
${LN} -s libunwind-${LLVM_VERSION}.src ${WRKDIR}/libunwind
cd ${WRKDIR} && mkdir build && cd build && \
- cmake -G'Unix Makefiles' ${LLVM_CMAKE_ARGS} ../llvm && \
+ cmake -G'Unix Makefiles' ${LLVM_CMAKE_CONFIGURE_ARGS} ../llvm && \
${MAKE} -j${MAKE_JOBS} && \
${MAKE} -j${MAKE_JOBS} check-llvm-unit && \
${MAKE} install
Index: pkgsrc/devel/range-v3/Makefile
diff -u pkgsrc/devel/range-v3/Makefile:1.2 pkgsrc/devel/range-v3/Makefile:1.3
--- pkgsrc/devel/range-v3/Makefile:1.2 Tue Mar 31 10:49:49 2020
+++ pkgsrc/devel/range-v3/Makefile Sun Aug 25 06:18:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/03/31 10:49:49 nia Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:18:37 wiz Exp $
DISTNAME= range-v3-0.10.0
PKGREVISION= 1
@@ -13,13 +13,13 @@ LICENSE= boost-license
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DRANGES_NATIVE=OFF
-CMAKE_ARGS+= -DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
+CMAKE_CONFIGURE_ARGS+= -DRANGES_NATIVE=OFF
+CMAKE_CONFIGURE_ARGS+= -DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
-CMAKE_ARGS+= -DRANGE_V3_DOCS=OFF
-CMAKE_ARGS+= -DRANGE_V3_EXAMPLES=OFF
-CMAKE_ARGS+= -DRANGE_V3_HEADER_CHECKS=OFF
-CMAKE_ARGS+= -DRANGE_V3_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DRANGE_V3_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DRANGE_V3_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DRANGE_V3_HEADER_CHECKS=OFF
+CMAKE_CONFIGURE_ARGS+= -DRANGE_V3_TESTS=OFF
post-install:
${RM} -f ${DESTDIR}${PREFIX}/include/module.modulemap
Index: pkgsrc/devel/rapidcheck/Makefile
diff -u pkgsrc/devel/rapidcheck/Makefile:1.1 pkgsrc/devel/rapidcheck/Makefile:1.2
--- pkgsrc/devel/rapidcheck/Makefile:1.1 Wed May 3 16:56:31 2023
+++ pkgsrc/devel/rapidcheck/Makefile Sun Aug 25 06:18:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2023/05/03 16:56:31 nikita Exp $
+# $NetBSD: Makefile,v 1.2 2024/08/25 06:18:37 wiz Exp $
DISTNAME= rapidcheck-0.0.0.20220314
CATEGORIES= devel
@@ -17,16 +17,16 @@ USE_LANGUAGES+= c c++11
USE_TOOLS+= cmake
#CXXFLAGS+= -I${WRKSRC}/extras/catch/include # only to fix tests (rapidcheck/catch.h)
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_POSITION_INDEPENDENT_CODE=True
-CMAKE_ARGS+= -DRC_ENABLE_EXAMPLES=Off
-CMAKE_ARGS+= -DRC_ENABLE_TESTS=Off
-CMAKE_ARGS+= -DRC_INSTALL_ALL_EXTRAS=On
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POSITION_INDEPENDENT_CODE=True
+CMAKE_CONFIGURE_ARGS+= -DRC_ENABLE_EXAMPLES=Off
+CMAKE_CONFIGURE_ARGS+= -DRC_ENABLE_TESTS=Off
+CMAKE_CONFIGURE_ARGS+= -DRC_INSTALL_ALL_EXTRAS=On
#do-test: # broken: https://github.com/emil-e/rapidcheck/issues/242
# @cd ${BUILD_WRKSRC} && \
-# ${SETENV} ${CONFIGURE_ENV} cmake ${CMAKE_ARGS} -DRC_ENABLE_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH:Q} && \
+# ${SETENV} ${CONFIGURE_ENV} cmake ${CMAKE_CONFIGURE_ARGS} -DRC_ENABLE_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH:Q} && \
# ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${BUILD_TARGET} && \
# ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} test
Index: pkgsrc/devel/raylib/Makefile
diff -u pkgsrc/devel/raylib/Makefile:1.3 pkgsrc/devel/raylib/Makefile:1.4
--- pkgsrc/devel/raylib/Makefile:1.3 Tue Feb 20 22:00:35 2024
+++ pkgsrc/devel/raylib/Makefile Sun Aug 25 06:18:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2024/02/20 22:00:35 charlotte Exp $
+# $NetBSD: Makefile,v 1.4 2024/08/25 06:18:37 wiz Exp $
DISTNAME= raylib-5.0
PKGREVISION= 1
@@ -12,10 +12,10 @@ LICENSE= zlib
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DPLATFORM=Desktop
-CMAKE_ARGS+= -DUSE_EXTERNAL_GLFW:BOOL=ON
-CMAKE_ARGS+= -DBUILD_EXAMPLES:BOOL=OFF
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DPLATFORM=Desktop
+CMAKE_CONFIGURE_ARGS+= -DUSE_EXTERNAL_GLFW:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_EXAMPLES:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
.include "../../devel/cmake/build.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
Index: pkgsrc/devel/re2/Makefile
diff -u pkgsrc/devel/re2/Makefile:1.22 pkgsrc/devel/re2/Makefile:1.23
--- pkgsrc/devel/re2/Makefile:1.22 Tue Jul 2 09:02:00 2024
+++ pkgsrc/devel/re2/Makefile Sun Aug 25 06:18:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2024/07/02 09:02:00 adam Exp $
+# $NetBSD: Makefile,v 1.23 2024/08/25 06:18:37 wiz Exp $
DISTNAME= re2-${GITHUB_TAG:S/-//g}
CATEGORIES= devel
@@ -12,14 +12,14 @@ LICENSE= modified-bsd
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
USE_CXX_FEATURES= c++11
PKGCONFIG_OVERRIDE= re2.pc.in
INSTALLATION_DIRS+= lib/pkgconfig
# To build unit-tests:
-#CMAKE_ARGS+= -DRE2_BUILD_TESTING=ON
+#CMAKE_CONFIGURE_ARGS+= -DRE2_BUILD_TESTING=ON
#TEST_ENV= LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
# For Darwin
#TEST_ENV= DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
Index: pkgsrc/devel/rttr/Makefile
diff -u pkgsrc/devel/rttr/Makefile:1.4 pkgsrc/devel/rttr/Makefile:1.5
--- pkgsrc/devel/rttr/Makefile:1.4 Sun Jan 26 17:31:04 2020
+++ pkgsrc/devel/rttr/Makefile Sun Aug 25 06:18:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/01/26 17:31:04 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2024/08/25 06:18:38 wiz Exp $
DISTNAME= rttr-0.9.6-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -15,9 +15,9 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_EXAMPLES=OFF
-CMAKE_ARGS+= -DBUILD_UNIT_TESTS=OFF
-CMAKE_ARGS+= -DBUILD_DOCUMENTATION=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_UNIT_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCUMENTATION=OFF
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
Index: pkgsrc/devel/snappy/Makefile
diff -u pkgsrc/devel/snappy/Makefile:1.21 pkgsrc/devel/snappy/Makefile:1.22
--- pkgsrc/devel/snappy/Makefile:1.21 Wed May 22 07:00:36 2024
+++ pkgsrc/devel/snappy/Makefile Sun Aug 25 06:18:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2024/05/22 07:00:36 adam Exp $
+# $NetBSD: Makefile,v 1.22 2024/08/25 06:18:38 wiz Exp $
DISTNAME= snappy-1.2.1
CATEGORIES= devel
@@ -12,9 +12,9 @@ LICENSE= apache-2.0
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DSNAPPY_BUILD_TESTS=OFF
-CMAKE_ARGS+= -DSNAPPY_BUILD_BENCHMARKS=OFF
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DSNAPPY_BUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DSNAPPY_BUILD_BENCHMARKS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
.include "../../archivers/lzo/buildlink3.mk"
.include "../../devel/cmake/build.mk"
Index: pkgsrc/devel/spdlog/Makefile
diff -u pkgsrc/devel/spdlog/Makefile:1.23 pkgsrc/devel/spdlog/Makefile:1.24
--- pkgsrc/devel/spdlog/Makefile:1.23 Tue Jul 16 10:02:01 2024
+++ pkgsrc/devel/spdlog/Makefile Sun Aug 25 06:18:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2024/07/16 10:02:01 prlw1 Exp $
+# $NetBSD: Makefile,v 1.24 2024/08/25 06:18:38 wiz Exp $
DISTNAME= spdlog-1.14.1
PKGREVISION= 1
@@ -13,8 +13,8 @@ LICENSE= mit
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DSPDLOG_BUILD_SHARED=ON
-CMAKE_ARGS+= -DSPDLOG_FMT_EXTERNAL=ON
+CMAKE_CONFIGURE_ARGS+= -DSPDLOG_BUILD_SHARED=ON
+CMAKE_CONFIGURE_ARGS+= -DSPDLOG_FMT_EXTERNAL=ON
USE_CXX_FEATURES+= c++11 put_time
Index: pkgsrc/devel/tl-expected/Makefile
diff -u pkgsrc/devel/tl-expected/Makefile:1.2 pkgsrc/devel/tl-expected/Makefile:1.3
--- pkgsrc/devel/tl-expected/Makefile:1.2 Mon May 25 11:44:25 2020
+++ pkgsrc/devel/tl-expected/Makefile Sun Aug 25 06:18:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/05/25 11:44:25 nia Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:18:38 wiz Exp $
DISTNAME= tl-expected-1.0.0
CATEGORIES= devel
@@ -18,8 +18,8 @@ LICENSE= cc0-1.0-universal
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DEXPECTED_ENABLE_TESTS=OFF
-CMAKE_ARGS+= -DFETCHCONTENT_SOURCE_DIR_TL_CMAKE=${WRKSRC}/cmake/tl-cmake
+CMAKE_CONFIGURE_ARGS+= -DEXPECTED_ENABLE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DFETCHCONTENT_SOURCE_DIR_TL_CMAKE=${WRKSRC}/cmake/tl-cmake
pre-configure:
${MKDIR} -p ${WRKSRC}/cmake/tl-cmake
Index: pkgsrc/devel/tlsh/Makefile
diff -u pkgsrc/devel/tlsh/Makefile:1.3 pkgsrc/devel/tlsh/Makefile:1.4
--- pkgsrc/devel/tlsh/Makefile:1.3 Sun Jan 14 20:07:44 2024
+++ pkgsrc/devel/tlsh/Makefile Sun Aug 25 06:18:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2024/01/14 20:07:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2024/08/25 06:18:38 wiz Exp $
DISTNAME= tlsh-4.8.2
CATEGORIES= devel
@@ -13,7 +13,7 @@ LICENSE= apache-2.0
USE_CMAKE= yes
CONFIGURE_DIRS= build/release
CMAKE_ARG_PATH= ../..
-CMAKE_ARGS+= -DTLSH_SHARED_LIBRARY=1
+CMAKE_CONFIGURE_ARGS+= -DTLSH_SHARED_LIBRARY=1
USE_LANGUAGES= c c++
TEST_TARGET= test
Index: pkgsrc/devel/ucommon/Makefile
diff -u pkgsrc/devel/ucommon/Makefile:1.29 pkgsrc/devel/ucommon/Makefile:1.30
--- pkgsrc/devel/ucommon/Makefile:1.29 Wed May 29 16:32:20 2024
+++ pkgsrc/devel/ucommon/Makefile Sun Aug 25 06:18:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2024/05/29 16:32:20 adam Exp $
+# $NetBSD: Makefile,v 1.30 2024/08/25 06:18:38 wiz Exp $
DISTNAME= ucommon-7.0.0
PKGREVISION= 14
@@ -15,7 +15,7 @@ USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
# Incompatible with OpenSSL 1.1
-CMAKE_ARGS+= -DCRYPTO_OPENSSL=OFF
+CMAKE_CONFIGURE_ARGS+= -DCRYPTO_OPENSSL=OFF
PKGCONFIG_OVERRIDE+= commoncpp.pc.in
PKGCONFIG_OVERRIDE+= ucommon.pc.in
Index: pkgsrc/devel/ucommon/options.mk
diff -u pkgsrc/devel/ucommon/options.mk:1.5 pkgsrc/devel/ucommon/options.mk:1.6
--- pkgsrc/devel/ucommon/options.mk:1.5 Fri Mar 6 12:12:58 2020
+++ pkgsrc/devel/ucommon/options.mk Sun Aug 25 06:18:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2020/03/06 12:12:58 nia Exp $
+# $NetBSD: options.mk,v 1.6 2024/08/25 06:18:38 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ucommon
PKG_SUPPORTED_OPTIONS= gnutls tests
@@ -7,14 +7,14 @@ PKG_SUGGESTED_OPTIONS+= gnutls
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mgnutls)
-CMAKE_ARGS+= -DCRYPTO_GNUTLS=ON
+CMAKE_CONFIGURE_ARGS+= -DCRYPTO_GNUTLS=ON
BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.0.0
.include "../../security/gnutls/buildlink3.mk"
-CMAKE_ARGS+= -DCRYPTO_GNUTLS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCRYPTO_GNUTLS=OFF
.endif
.if !empty(PKG_OPTIONS:Mtests)
-CMAKE_ARGS+= -DBUILD_TESTING=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=ON
.else
-CMAKE_ARGS+= -DBUILD_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
.endif
Index: pkgsrc/devel/woboq_codebrowser/Makefile
diff -u pkgsrc/devel/woboq_codebrowser/Makefile:1.22 pkgsrc/devel/woboq_codebrowser/Makefile:1.23
--- pkgsrc/devel/woboq_codebrowser/Makefile:1.22 Wed May 29 16:32:20 2024
+++ pkgsrc/devel/woboq_codebrowser/Makefile Sun Aug 25 06:18:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2024/05/29 16:32:20 adam Exp $
+# $NetBSD: Makefile,v 1.23 2024/08/25 06:18:38 wiz Exp $
DISTNAME= codebrowser-2.1.20231117
PKGNAME= woboq_${DISTNAME}
@@ -15,9 +15,9 @@ LICENSE= cc-by-nc-sa-v3.0-license
USE_CXX_FEATURES= c++17
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DLLVM_CONFIG_EXECUTABLE=${LLVM_CONFIG_PATH:Q}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-#CMAKE_ARGS+= -DCLANG_BUILTIN_HEADERS_DIR=${BUILDLINK_PREFIX.clang}/lib/clang/17/include
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG_EXECUTABLE=${LLVM_CONFIG_PATH:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+#CMAKE_CONFIGURE_ARGS+= -DCLANG_BUILTIN_HEADERS_DIR=${BUILDLINK_PREFIX.clang}/lib/clang/17/include
WRKSRC= ${WRKDIR}/codebrowser-${GITHUB_TAG}
BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--as-needed
Index: pkgsrc/doc/HOWTO-dev-crosscompile
diff -u pkgsrc/doc/HOWTO-dev-crosscompile:1.8 pkgsrc/doc/HOWTO-dev-crosscompile:1.9
--- pkgsrc/doc/HOWTO-dev-crosscompile:1.8 Thu Apr 25 14:56:30 2024
+++ pkgsrc/doc/HOWTO-dev-crosscompile Sun Aug 25 06:18:38 2024
@@ -1,7 +1,7 @@
Cross-compilation in pkgsrc (developer's guide) -*- outline -*-
Taylor R. Campbell <riastradh%NetBSD.org@localhost>
-$NetBSD: HOWTO-dev-crosscompile,v 1.8 2024/04/25 14:56:30 riastradh Exp $
+$NetBSD: HOWTO-dev-crosscompile,v 1.9 2024/08/25 06:18:38 wiz Exp $
These are some notes on how to make your package cross-compilable.
There is no single recipe for it -- each package is different, and
@@ -46,7 +46,7 @@ ${USE_CROSS_COMPILE:tl} == "yes" (after
- (pkg-config) ALL_ENV+= PKG_CONFIG_SYSROOT_DIR=${CROSS_DESTDIR:Q}
- (pkg-config) ALL_ENV+= PKG_CONFIG_FDO_SYSROOT_RULES=1
-- (cmake) CMAKE_ARGS+= -DCMAKE_SYSROOT:STRING=${CROSS_DESTDIR:Q}
+- (cmake) CMAKE_CONFIGURE_ARGS+= -DCMAKE_SYSROOT:STRING=${CROSS_DESTDIR:Q}
* Tool dependencies
Index: pkgsrc/doc/pkgsrc.html
diff -u pkgsrc/doc/pkgsrc.html:1.372 pkgsrc/doc/pkgsrc.html:1.373
--- pkgsrc/doc/pkgsrc.html:1.372 Fri May 10 12:31:21 2024
+++ pkgsrc/doc/pkgsrc.html Sun Aug 25 06:18:38 2024
@@ -4668,7 +4668,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
including <code class="filename">../../devel/cmake/build.mk</code>.
You can add variables to cmake's environment by adding them to the
<code class="varname">CONFIGURE_ENV</code> variable and arguments to cmake
- by adding them to the <code class="varname">CMAKE_ARGS</code> variable.
+ by adding them to the <code class="varname">CMAKE_CONFIGURE_ARGS</code> variable.
If you want to add arguments only for particular stages, you can use the
<code class="varname">CMAKE_CONFIGURE_ARGS</code>,
<code class="varname">CMAKE_BUILD_ARGS</code>, and
Index: pkgsrc/doc/pkgsrc.txt
diff -u pkgsrc/doc/pkgsrc.txt:1.370 pkgsrc/doc/pkgsrc.txt:1.371
--- pkgsrc/doc/pkgsrc.txt:1.370 Fri May 10 12:31:21 2024
+++ pkgsrc/doc/pkgsrc.txt Sun Aug 25 06:18:39 2024
@@ -3642,7 +3642,7 @@ SCRIPTS_ENV variable.
If the program uses cmake for configuration, the appropriate steps can be
invoked by including ../../devel/cmake/build.mk. You can add variables to
cmake's environment by adding them to the CONFIGURE_ENV variable and arguments
-to cmake by adding them to the CMAKE_ARGS variable. If you want to add
+to cmake by adding them to the CMAKE_CONFIGURE_ARGS variable. If you want to add
arguments only for particular stages, you can use the CMAKE_CONFIGURE_ARGS,
CMAKE_BUILD_ARGS, and CMAKE_INSTALL_ARGS variables. You can set the
CONFIGURE_DIRS variable to the directories in which CMake should be run,
Index: pkgsrc/doc/guide/files/build.xml
diff -u pkgsrc/doc/guide/files/build.xml:1.91 pkgsrc/doc/guide/files/build.xml:1.92
--- pkgsrc/doc/guide/files/build.xml:1.91 Tue Aug 20 18:02:04 2024
+++ pkgsrc/doc/guide/files/build.xml Sun Aug 25 06:18:39 2024
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.91 2024/08/20 18:02:04 gdt Exp $ -->
+<!-- $NetBSD: build.xml,v 1.92 2024/08/25 06:18:39 wiz Exp $ -->
<chapter id="build">
<title>The build process</title>
@@ -526,7 +526,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
including <filename>../../devel/cmake/build.mk</filename>.
You can add variables to cmake's environment by adding them to the
<varname>CONFIGURE_ENV</varname> variable and arguments to cmake
- by adding them to the <varname>CMAKE_ARGS</varname> variable.
+ by adding them to the <varname>CMAKE_CONFIGURE_ARGS</varname> variable.
If you want to add arguments only for particular stages, you can use the
<varname>CMAKE_CONFIGURE_ARGS</varname>,
<varname>CMAKE_BUILD_ARGS</varname>, and
@@ -539,9 +539,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
<para>Any package using the now-deprecated
<varname>USE_CMAKE=yes</varname> should be converted.
Essentially, replace with an include of
- <filename>../../devel/cmake/build.mk</filename>, change
- <varname>CMAKE_ARGS</varname> to
- <varname>CMAKE_CONFIGURE_ARGS</varname>, prune creation of a build
+ <filename>../../devel/cmake/build.mk</filename>, prune creation of a build
directory and settings to use it, and check/fix settings that
intend to perform the build in a subdirectory.
</para>
Index: pkgsrc/editors/PageEdit/Makefile
diff -u pkgsrc/editors/PageEdit/Makefile:1.20 pkgsrc/editors/PageEdit/Makefile:1.21
--- pkgsrc/editors/PageEdit/Makefile:1.20 Wed May 29 16:32:21 2024
+++ pkgsrc/editors/PageEdit/Makefile Sun Aug 25 06:18:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2024/05/29 16:32:21 adam Exp $
+# $NetBSD: Makefile,v 1.21 2024/08/25 06:18:39 wiz Exp $
DISTNAME= PageEdit-2.0.2
PKGREVISION= 5
@@ -21,7 +21,7 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
# upstream defaults to Qt6, but this needs the unpackaged qt6-webengine
-CMAKE_ARGS+= -DUSE_QT5=1
+CMAKE_CONFIGURE_ARGS+= -DUSE_QT5=1
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qttools/buildlink3.mk"
Index: pkgsrc/editors/Sigil/Makefile
diff -u pkgsrc/editors/Sigil/Makefile:1.174 pkgsrc/editors/Sigil/Makefile:1.175
--- pkgsrc/editors/Sigil/Makefile:1.174 Wed May 29 16:32:21 2024
+++ pkgsrc/editors/Sigil/Makefile Sun Aug 25 06:18:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.174 2024/05/29 16:32:21 adam Exp $
+# $NetBSD: Makefile,v 1.175 2024/08/25 06:18:39 wiz Exp $
DISTNAME= Sigil-2.0.2
PKGREVISION= 5
@@ -22,11 +22,11 @@ ALL_ENV+= Qt5_DIR=${Qt5_DIR}
USE_LANGUAGES= c c++0x
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DUSE_SYSTEM_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_LIBS=ON
# upstream defaults to Qt6, but this needs the unpackaged qt6-webengine
-CMAKE_ARGS+= -DUSE_QT5=1
-CMAKE_ARGS+= -DPYTHON_LIBRARY=${PREFIX}/lib/libpython${PYVERSSUFFIX}.so
-CMAKE_ARGS+= -DPYTHON_INCLUDE_DIR=${PREFIX}/include/python${PYVERSSUFFIX}
+CMAKE_CONFIGURE_ARGS+= -DUSE_QT5=1
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_LIBRARY=${PREFIX}/lib/libpython${PYVERSSUFFIX}.so
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_INCLUDE_DIR=${PREFIX}/include/python${PYVERSSUFFIX}
BUILDLINK_TRANSFORM+= l:BoostParts:boost_date_time:boost_filesystem:boost_regex:boost_system:boost_thread:boost_program_options
BUILDLINK_TRANSFORM+= l:Xerces:xerces-c
Index: pkgsrc/editors/feathernotes/Makefile
diff -u pkgsrc/editors/feathernotes/Makefile:1.34 pkgsrc/editors/feathernotes/Makefile:1.35
--- pkgsrc/editors/feathernotes/Makefile:1.34 Tue Aug 20 06:10:44 2024
+++ pkgsrc/editors/feathernotes/Makefile Sun Aug 25 06:18:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2024/08/20 06:10:44 pin Exp $
+# $NetBSD: Makefile,v 1.35 2024/08/25 06:18:39 wiz Exp $
VERSION= 1.3.0
DISTNAME= FeatherNotes-V${VERSION}
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/FeatherNotes-${VERSIO
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
.include "../../x11/qt6-qtbase/buildlink3.mk"
Index: pkgsrc/editors/focuswriter/Makefile
diff -u pkgsrc/editors/focuswriter/Makefile:1.36 pkgsrc/editors/focuswriter/Makefile:1.37
--- pkgsrc/editors/focuswriter/Makefile:1.36 Wed May 29 16:32:22 2024
+++ pkgsrc/editors/focuswriter/Makefile Sun Aug 25 06:18:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2024/05/29 16:32:22 adam Exp $
+# $NetBSD: Makefile,v 1.37 2024/08/25 06:18:39 wiz Exp $
DISTNAME= focuswriter-1.8.8
PKGREVISION= 1
@@ -15,9 +15,9 @@ USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
-CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PKGMANDIR}
-CMAKE_ARGS+= -DCMAKE_INSTALL_DATADIR=${PREFIX}/share
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_DATADIR=${PREFIX}/share
TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
Index: pkgsrc/editors/nvi2/options.mk
diff -u pkgsrc/editors/nvi2/options.mk:1.2 pkgsrc/editors/nvi2/options.mk:1.3
--- pkgsrc/editors/nvi2/options.mk:1.2 Sun Jun 14 11:47:03 2020
+++ pkgsrc/editors/nvi2/options.mk Sun Aug 25 06:18:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2020/06/14 11:47:03 nia Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:39 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.nvi2
PKG_SUPPORTED_OPTIONS= iconv wide-curses
@@ -8,19 +8,19 @@ PKG_SUGGESTED_OPTIONS= iconv wide-curses
.if !empty(PKG_OPTIONS:Miconv)
. include "../../converters/libiconv/buildlink3.mk"
-CMAKE_ARGS+= -DUSE_ICONV=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_ICONV=ON
.else
-CMAKE_ARGS+= -DUSE_ICONV=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_ICONV=OFF
.endif
.if !empty(PKG_OPTIONS:Mwide-curses)
. include "../../mk/curses.buildlink3.mk"
. if ${CURSES_TYPE} != "ncurses" # XXX: Why is this necessary!?
-CMAKE_ARGS+= -DUSE_WIDECHAR=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_WIDECHAR=ON
. else
-CMAKE_ARGS+= -DUSE_WIDECHAR=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_WIDECHAR=OFF
. endif
.else
. include "../../mk/curses.buildlink3.mk"
-CMAKE_ARGS+= -DUSE_WIDECHAR=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_WIDECHAR=OFF
.endif
Index: pkgsrc/editors/qtcreator/Makefile
diff -u pkgsrc/editors/qtcreator/Makefile:1.30 pkgsrc/editors/qtcreator/Makefile:1.31
--- pkgsrc/editors/qtcreator/Makefile:1.30 Wed May 29 16:32:24 2024
+++ pkgsrc/editors/qtcreator/Makefile Sun Aug 25 06:18:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2024/05/29 16:32:24 adam Exp $
+# $NetBSD: Makefile,v 1.31 2024/08/25 06:18:39 wiz Exp $
DISTNAME= qt-creator-opensource-src-5.0.3
PKGNAME= ${DISTNAME:S/qt-/qt/:S/-opensource-src//}
@@ -65,7 +65,7 @@ PYTHON_VERSIONS_ACCEPTED= 27
# XXX doesn't seem to get built on netbsd. probably results in
# PLIST differences when it does.
-CMAKE_ARGS.NetBSD+= -DBUILD_WITH_PCH=OFF
+CMAKE_CONFIGURE_ARGS.NetBSD+= -DBUILD_WITH_PCH=OFF
#LDFLAGS+= ${COMPILER_RPATH_FLAG}${QTDIR}/lib
#LDFLAGS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib
Index: pkgsrc/editors/xournalpp/Makefile
diff -u pkgsrc/editors/xournalpp/Makefile:1.68 pkgsrc/editors/xournalpp/Makefile:1.69
--- pkgsrc/editors/xournalpp/Makefile:1.68 Wed May 29 16:32:25 2024
+++ pkgsrc/editors/xournalpp/Makefile Sun Aug 25 06:18:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2024/05/29 16:32:25 adam Exp $
+# $NetBSD: Makefile,v 1.69 2024/08/25 06:18:40 wiz Exp $
DISTNAME= xournalpp-1.2.3
PKGREVISION= 5
@@ -16,7 +16,7 @@ USE_TOOLS+= msgfmt msgmerge xgettext
USE_LANGUAGES= c c++
BUILD_TARGET= translations xournalpp
-CMAKE_ARGS+= -DPKGSRC_CMAKE_MODS=${BUILDLINK_DIR}/cmake-Modules
+CMAKE_CONFIGURE_ARGS+= -DPKGSRC_CMAKE_MODS=${BUILDLINK_DIR}/cmake-Modules
USE_CXX_FEATURES+= c++17 filesystem
Index: pkgsrc/emulators/cannonball/Makefile
diff -u pkgsrc/emulators/cannonball/Makefile:1.24 pkgsrc/emulators/cannonball/Makefile:1.25
--- pkgsrc/emulators/cannonball/Makefile:1.24 Sat Apr 6 08:05:15 2024
+++ pkgsrc/emulators/cannonball/Makefile Sun Aug 25 06:18:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2024/04/06 08:05:15 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2024/08/25 06:18:40 wiz Exp $
DISTNAME= cannonball-0.34
PKGREVISION= 13
@@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config
USE_CMAKE= yes
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ${WRKSRC}/cmake
-CMAKE_ARGS+= -DTARGET=linux.cmake
+CMAKE_CONFIGURE_ARGS+= -DTARGET=linux.cmake
TOOL_DEPENDS+= icoutils-[0-9]*:../../graphics/icoutils
Index: pkgsrc/emulators/dolphin-emu/Makefile
diff -u pkgsrc/emulators/dolphin-emu/Makefile:1.57 pkgsrc/emulators/dolphin-emu/Makefile:1.58
--- pkgsrc/emulators/dolphin-emu/Makefile:1.57 Wed May 29 16:32:26 2024
+++ pkgsrc/emulators/dolphin-emu/Makefile Sun Aug 25 06:18:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2024/05/29 16:32:26 adam Exp $
+# $NetBSD: Makefile,v 1.58 2024/08/25 06:18:40 wiz Exp $
DISTNAME= dolphin-emu-5.0
PKGREVISION= 49
@@ -18,9 +18,9 @@ USE_LANGUAGES= c c++
# Since SFML is not available in pkgsrc, make sure the included version
# is always used.
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_SFML=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_SFML=ON
-CMAKE_ARGS+= -DPKGMANDIR=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DPKGMANDIR=${PKGMANDIR}
USE_CXX_FEATURES+= unique_ptr
@@ -33,11 +33,11 @@ ONLY_FOR_PLATFORM= ${LITTLEENDIANPLATFOR
BROKEN_ON_PLATFORM+= SunOS-*-*
.if ${MACHINE_ARCH} != "x86_64"
-CMAKE_ARGS+= -DENABLE_GENERIC=1
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GENERIC=1
.endif
# "Couldn't find libevdev and/or libudev. Can't build evdev controller backend."
-CMAKE_ARGS.Linux+= -DENABLE_EVDEV=0
+CMAKE_CONFIGURE_ARGS.Linux+= -DENABLE_EVDEV=0
# JIT
NOT_PAX_MPROTECT_SAFE+= bin/dolphin-emu
Index: pkgsrc/emulators/dolphin-emu/options.mk
diff -u pkgsrc/emulators/dolphin-emu/options.mk:1.4 pkgsrc/emulators/dolphin-emu/options.mk:1.5
--- pkgsrc/emulators/dolphin-emu/options.mk:1.4 Sun Oct 20 11:10:48 2019
+++ pkgsrc/emulators/dolphin-emu/options.mk Sun Aug 25 06:18:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2019/10/20 11:10:48 nia Exp $
+# $NetBSD: options.mk,v 1.5 2024/08/25 06:18:40 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dolphin-emu
PKG_SUPPORTED_OPTIONS= alsa libao llvm openal portaudio pulseaudio
@@ -7,12 +7,12 @@ PKG_SUGGESTED_OPTIONS+= alsa libao
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CMAKE_ARGS+= -DENABLE_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ALSA=ON
.include "../../audio/alsa-lib/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mlibao)
-CMAKE_ARGS+= -DENABLE_AO=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_AO=ON
.include "../../audio/libao/buildlink3.mk"
.endif
@@ -20,22 +20,22 @@ CMAKE_ARGS+= -DENABLE_AO=ON
# LLVM - Used for disassembly
#
.if !empty(PKG_OPTIONS:Mllvm)
-CMAKE_ARGS+= -DENABLE_LLVM=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LLVM=ON
.include "../../lang/libLLVM/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mopenal)
-CMAKE_ARGS+= -DENABLE_OPENAL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_OPENAL=ON
.include "../../audio/openal-soft/buildlink3.mk"
.include "../../audio/soundtouch/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mportaudio)
-CMAKE_ARGS+= -DENABLE_PORTAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PORTAUDIO=ON
.include "../../audio/portaudio/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -DENABLE_PULSEAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PULSEAUDIO=ON
.include "../../audio/pulseaudio/buildlink3.mk"
.endif
Index: pkgsrc/emulators/duckstation-qt/Makefile.common
diff -u pkgsrc/emulators/duckstation-qt/Makefile.common:1.3 pkgsrc/emulators/duckstation-qt/Makefile.common:1.4
--- pkgsrc/emulators/duckstation-qt/Makefile.common:1.3 Sat Feb 17 21:38:20 2024
+++ pkgsrc/emulators/duckstation-qt/Makefile.common Sun Aug 25 06:18:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2024/02/17 21:38:20 nia Exp $
+# $NetBSD: Makefile.common,v 1.4 2024/08/25 06:18:40 wiz Exp $
# This is a separate file out of optimism that the non-qt version will
# eventually be portable.
@@ -28,9 +28,9 @@ ONLY_FOR_PLATFORM+= *-*-x86_64
ONLY_FOR_PLATFORM+= *-*-aarch64
ONLY_FOR_PLATFORM+= *-*-earmv7hf
-CMAKE_ARGS+= -DENABLE_DISCORD_PRESENCE=OFF
-CMAKE_ARGS+= -DBUILD_REGTEST=OFF
-CMAKE_ARGS+= -DUSE_DBUS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DISCORD_PRESENCE=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_REGTEST=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_DBUS=OFF
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/emulators/flycast/Makefile.common
diff -u pkgsrc/emulators/flycast/Makefile.common:1.5 pkgsrc/emulators/flycast/Makefile.common:1.6
--- pkgsrc/emulators/flycast/Makefile.common:1.5 Fri Nov 17 09:27:51 2023
+++ pkgsrc/emulators/flycast/Makefile.common Sun Aug 25 06:18:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2023/11/17 09:27:51 nia Exp $
+# $NetBSD: Makefile.common,v 1.6 2024/08/25 06:18:40 wiz Exp $
# used by emulators/flycast/Makefile
# used by emulators/libretro-flycast/Makefile
@@ -22,14 +22,14 @@ USE_LANGUAGES= c c++
# core/hw/sh4/sh4_interrupts.cpp:250:1: internal compiler error: in gen_reg_rtx, at emit-rtl.c:1058
GCC_REQD+= 10
-CMAKE_ARGS+= -DUSE_HOST_LIBZIP=ON
-CMAKE_ARGS+= -DUSE_HOST_SDL=ON
-CMAKE_ARGS+= -DUSE_VULKAN=OFF
-CMAKE_ARGS+= -DUSE_DX9=OFF
-CMAKE_ARGS+= -DUSE_DX11=OFF
-CMAKE_ARGS+= -DWITH_SYSTEM_ZLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_HOST_LIBZIP=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_HOST_SDL=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_VULKAN=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_DX9=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_DX11=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SYSTEM_ZLIB=ON
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
DISTINFO_FILE= ${.CURDIR}/../../emulators/flycast/distinfo
PATCHDIR= ${.CURDIR}/../../emulators/flycast/patches
Index: pkgsrc/emulators/flycast/options.mk
diff -u pkgsrc/emulators/flycast/options.mk:1.2 pkgsrc/emulators/flycast/options.mk:1.3
--- pkgsrc/emulators/flycast/options.mk:1.2 Fri Nov 17 09:27:51 2023
+++ pkgsrc/emulators/flycast/options.mk Sun Aug 25 06:18:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/11/17 09:27:51 nia Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:40 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.flycast
@@ -19,7 +19,7 @@ PKG_SUGGESTED_OPTIONS+= rpi
.if !empty(PKG_OPTIONS:Malsa)
. include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_ALSA=ON
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
@@ -27,9 +27,9 @@ CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKA
.endif
.if !empty(PKG_OPTIONS:Mrpi)
-CMAKE_ARGS+= -DUSE_VIDEOCORE=ON
-CMAKE_ARGS+= -DUSE_GLES2=ON
-CMAKE_ARGS+= -DUSE_OPENGL=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_VIDEOCORE=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_GLES2=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_OPENGL=OFF
. include "../../misc/raspberrypi-userland/buildlink3.mk"
.else
. if ${OPSYS} != "Darwin"
Index: pkgsrc/emulators/hatari/Makefile
diff -u pkgsrc/emulators/hatari/Makefile:1.71 pkgsrc/emulators/hatari/Makefile:1.72
--- pkgsrc/emulators/hatari/Makefile:1.71 Sat Apr 6 08:05:17 2024
+++ pkgsrc/emulators/hatari/Makefile Sun Aug 25 06:18:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2024/04/06 08:05:17 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2024/08/25 06:18:40 wiz Exp $
DISTNAME= hatari-2.4.1
PKGREVISION= 4
@@ -13,8 +13,8 @@ LICENSE= gnu-gpl-v2
USE_CMAKE= yes
USE_LANGUAGES= c99
-CMAKE_ARGS+= -DENABLE_OSX_BUNDLE=OFF
-CMAKE_ARGS+= -DMANDIR=${PKGMANDIR}/man1
+CMAKE_CONFIGURE_ARGS+= -DENABLE_OSX_BUNDLE=OFF
+CMAKE_CONFIGURE_ARGS+= -DMANDIR=${PKGMANDIR}/man1
REPLACE_PYTHON+= python-ui/config.py
REPLACE_PYTHON+= python-ui/debugui.py
Index: pkgsrc/emulators/keystone/Makefile
diff -u pkgsrc/emulators/keystone/Makefile:1.8 pkgsrc/emulators/keystone/Makefile:1.9
--- pkgsrc/emulators/keystone/Makefile:1.8 Mon Aug 14 05:24:21 2023
+++ pkgsrc/emulators/keystone/Makefile Sun Aug 25 06:18:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/08/14 05:24:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2024/08/25 06:18:40 wiz Exp $
PKGREVISION= 2
.include "Makefile.common"
@@ -9,8 +9,8 @@ COMMENT= Multi-platform and multi-arch a
USE_CMAKE= yes
LICENSE= gnu-gpl-v2
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DLLVM_TARGETS_TO_BUILD=all
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_TARGETS_TO_BUILD=all
.include "../../lang/python/pyversion.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/emulators/libretro-flycast/Makefile
diff -u pkgsrc/emulators/libretro-flycast/Makefile:1.12 pkgsrc/emulators/libretro-flycast/Makefile:1.13
--- pkgsrc/emulators/libretro-flycast/Makefile:1.12 Wed May 29 16:32:26 2024
+++ pkgsrc/emulators/libretro-flycast/Makefile Sun Aug 25 06:18:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2024/05/29 16:32:26 adam Exp $
+# $NetBSD: Makefile,v 1.13 2024/08/25 06:18:40 wiz Exp $
PKGREVISION= 2
.include "../../emulators/flycast/Makefile.common"
@@ -8,8 +8,8 @@ PKGNAME= libretro-${DISTNAME}
MAINTAINER= nia%NetBSD.org@localhost
COMMENT= Libretro core based on the Flycast Sega Dreamcast emulator
-CMAKE_ARGS+= -DLIBRETRO=ON
-CMAKE_ARGS+= -DCMAKE_INSTALL_BINDIR=lib/libretro
+CMAKE_CONFIGURE_ARGS+= -DLIBRETRO=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_BINDIR=lib/libretro
.include "options.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/emulators/libretro-flycast/options.mk
diff -u pkgsrc/emulators/libretro-flycast/options.mk:1.3 pkgsrc/emulators/libretro-flycast/options.mk:1.4
--- pkgsrc/emulators/libretro-flycast/options.mk:1.3 Sun Jul 9 15:39:45 2023
+++ pkgsrc/emulators/libretro-flycast/options.mk Sun Aug 25 06:18:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2023/07/09 15:39:45 nia Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:40 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libretro-flycast
@@ -20,12 +20,12 @@ PKG_SUGGESTED_OPTIONS+= opengl
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mrpi)
-CMAKE_ARGS+= -DUSE_VIDEOCORE=ON
-CMAKE_ARGS+= -DUSE_GLES2=ON
-CMAKE_ARGS+= -DUSE_OPENGL=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_VIDEOCORE=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_GLES2=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_OPENGL=OFF
. include "../../misc/raspberrypi-userland/buildlink3.mk"
.elif !empty(PKG_OPTIONS:Mopengl)
-CMAKE_ARGS+= -DUSE_OPENGL=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_OPENGL=ON
. if ${OPSYS} != "Darwin"
. include "../../graphics/MesaLib/buildlink3.mk"
. endif
Index: pkgsrc/emulators/libretro-mgba/Makefile
diff -u pkgsrc/emulators/libretro-mgba/Makefile:1.16 pkgsrc/emulators/libretro-mgba/Makefile:1.17
--- pkgsrc/emulators/libretro-mgba/Makefile:1.16 Thu Dec 15 11:31:44 2022
+++ pkgsrc/emulators/libretro-mgba/Makefile Sun Aug 25 06:18:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2022/12/15 11:31:44 nia Exp $
+# $NetBSD: Makefile,v 1.17 2024/08/25 06:18:41 wiz Exp $
.include "${.CURDIR}/../../emulators/mgba/Makefile.common"
@@ -12,28 +12,28 @@ SOEXT.Darwin= dylib
SOEXT.*= so
PLIST_SUBST+= SOEXT=${SOEXT}
-CMAKE_ARGS+= -DUSE_DEBUGGERS=OFF
-CMAKE_ARGS+= -DUSE_GDB_STUB=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_DEBUGGERS=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_GDB_STUB=OFF
-CMAKE_ARGS+= -DUSE_EDITLINE=OFF
-CMAKE_ARGS+= -DUSE_FFMPEG=OFF
-CMAKE_ARGS+= -DUSE_ZLIB=OFF
-CMAKE_ARGS+= -DUSE_MINIZIP=OFF
-CMAKE_ARGS+= -DUSE_PNG=OFF
-CMAKE_ARGS+= -DUSE_LIBZIP=OFF
-CMAKE_ARGS+= -DUSE_SQLITE3=OFF
-CMAKE_ARGS+= -DUSE_LZMA=OFF
-CMAKE_ARGS+= -DUSE_EPOXY=OFF
-
-CMAKE_ARGS+= -DBUILD_QT=OFF
-CMAKE_ARGS+= -DBUILD_SDL=OFF
-CMAKE_ARGS+= -DBUILD_GL=OFF
-CMAKE_ARGS+= -DBUILD_GLES2=OFF
-CMAKE_ARGS+= -DBUILD_GLES3=OFF
-
-CMAKE_ARGS+= -DBUILD_LIBRETRO=ON
-CMAKE_ARGS+= -DSKIP_LIBRARY=ON
-CMAKE_ARGS+= -DLIBRETRO_LIBDIR=${PREFIX}/lib/libretro
+CMAKE_CONFIGURE_ARGS+= -DUSE_EDITLINE=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_FFMPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_ZLIB=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_MINIZIP=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_PNG=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_LIBZIP=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_SQLITE3=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_LZMA=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_EPOXY=OFF
+
+CMAKE_CONFIGURE_ARGS+= -DBUILD_QT=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SDL=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GL=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GLES2=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GLES3=OFF
+
+CMAKE_CONFIGURE_ARGS+= -DBUILD_LIBRETRO=ON
+CMAKE_CONFIGURE_ARGS+= -DSKIP_LIBRARY=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBRETRO_LIBDIR=${PREFIX}/lib/libretro
INSTALLATION_DIRS+= ${PREFIX}/lib/libretro
Index: pkgsrc/emulators/melonds/Makefile
diff -u pkgsrc/emulators/melonds/Makefile:1.23 pkgsrc/emulators/melonds/Makefile:1.24
--- pkgsrc/emulators/melonds/Makefile:1.23 Sun Apr 7 07:33:57 2024
+++ pkgsrc/emulators/melonds/Makefile Sun Aug 25 06:18:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2024/04/07 07:33:57 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2024/08/25 06:18:41 wiz Exp $
DISTNAME= melonDS-0.8.3
PKGNAME= ${DISTNAME:S/DS/ds/}
@@ -17,8 +17,8 @@ USE_LANGUAGES= c c++
USE_CXX_FEATURES+= c++11
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DENABLE_LTO=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LTO=OFF
ICON_SIZES= 16 32 48 64 128 256
Index: pkgsrc/emulators/mgba/Makefile
diff -u pkgsrc/emulators/mgba/Makefile:1.49 pkgsrc/emulators/mgba/Makefile:1.50
--- pkgsrc/emulators/mgba/Makefile:1.49 Wed Aug 7 22:02:48 2024
+++ pkgsrc/emulators/mgba/Makefile Sun Aug 25 06:18:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2024/08/07 22:02:48 nia Exp $
+# $NetBSD: Makefile,v 1.50 2024/08/25 06:18:41 wiz Exp $
.include "Makefile.common"
@@ -6,10 +6,10 @@ COMMENT= Emulator for running Game Boy A
CONFLICTS+= mgba-qt-[0-9]*
-CMAKE_ARGS+= -DBUILD_QT=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_QT=OFF
# XXX: unsure if any of this is useful with the SDL driver
-CMAKE_ARGS+= -DUSE_FFMPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_FFMPEG=OFF
.include "options.mk"
.include "../../archivers/libzip/buildlink3.mk"
Index: pkgsrc/emulators/mgba/Makefile.common
diff -u pkgsrc/emulators/mgba/Makefile.common:1.5 pkgsrc/emulators/mgba/Makefile.common:1.6
--- pkgsrc/emulators/mgba/Makefile.common:1.5 Sun Aug 11 19:42:57 2024
+++ pkgsrc/emulators/mgba/Makefile.common Sun Aug 25 06:18:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2024/08/11 19:42:57 nia Exp $
+# $NetBSD: Makefile.common,v 1.6 2024/08/25 06:18:41 wiz Exp $
# used by emulators/libretro-mgba/Makefile
# used by emulators/mgba/Makefile
@@ -17,9 +17,9 @@ USE_TOOLS+= pkg-config
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DUSE_DISCORD_RPC=OFF
-CMAKE_ARGS+= -DUSE_MINIZIP=OFF
-CMAKE_ARGS+= -DSKIP_GIT=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_DISCORD_RPC=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_MINIZIP=OFF
+CMAKE_CONFIGURE_ARGS+= -DSKIP_GIT=ON
DISTINFO_FILE= ${.CURDIR}/../../emulators/mgba/distinfo
PATCHDIR= ${.CURDIR}/../../emulators/mgba/patches
Index: pkgsrc/emulators/mgba/options.mk
diff -u pkgsrc/emulators/mgba/options.mk:1.6 pkgsrc/emulators/mgba/options.mk:1.7
--- pkgsrc/emulators/mgba/options.mk:1.6 Thu Dec 15 11:31:44 2022
+++ pkgsrc/emulators/mgba/options.mk Sun Aug 25 06:18:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2022/12/15 11:31:44 nia Exp $
+# $NetBSD: options.mk,v 1.7 2024/08/25 06:18:41 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mgba
@@ -13,12 +13,12 @@ PKG_SUGGESTED_OPTIONS+= opengl
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mopengl)
-CMAKE_ARGS+= -DBUILD_GL=ON
-CMAKE_ARGS+= -DUSE_EPOXY=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GL=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_EPOXY=ON
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/libepoxy/buildlink3.mk"
.else
-CMAKE_ARGS+= -DBUILD_GL=OFF
-CMAKE_ARGS+= -DUSE_EPOXY=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GL=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_EPOXY=OFF
.endif
Index: pkgsrc/emulators/mgba-qt/Makefile
diff -u pkgsrc/emulators/mgba-qt/Makefile:1.19 pkgsrc/emulators/mgba-qt/Makefile:1.20
--- pkgsrc/emulators/mgba-qt/Makefile:1.19 Wed Aug 7 22:02:48 2024
+++ pkgsrc/emulators/mgba-qt/Makefile Sun Aug 25 06:18:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/08/07 22:02:48 nia Exp $
+# $NetBSD: Makefile,v 1.20 2024/08/25 06:18:41 wiz Exp $
.include "${.CURDIR}/../../emulators/mgba/Makefile.common"
@@ -7,20 +7,20 @@ COMMENT= Emulator for running Game Boy A
CONFLICTS+= mgba-[0-9]*
-CMAKE_ARGS+= -DBUILD_QT=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_QT=ON
# performance problems...
-CMAKE_ARGS+= -DBUILD_GL=OFF
-CMAKE_ARGS+= -DBUILD_GLES2=OFF
-CMAKE_ARGS+= -DBUILD_GLES3=OFF
-CMAKE_ARGS+= -DUSE_EPOXY=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GL=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GLES2=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GLES3=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_EPOXY=OFF
USE_CXX_FEATURES+= c++14
# We probably don't actually want Qt5Multimedia.
# It's an option as an audio output, but SDL supports many more pkgsrc
# platforms natively, without going via PulseAudio.
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=TRUE
TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
Index: pkgsrc/emulators/mgba-qt/options.mk
diff -u pkgsrc/emulators/mgba-qt/options.mk:1.2 pkgsrc/emulators/mgba-qt/options.mk:1.3
--- pkgsrc/emulators/mgba-qt/options.mk:1.2 Sun Nov 19 22:56:13 2023
+++ pkgsrc/emulators/mgba-qt/options.mk Sun Aug 25 06:18:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/11/19 22:56:13 nia Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:41 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mgba-qt
@@ -8,8 +8,8 @@ PKG_SUGGESTED_OPTIONS+= ffmpeg
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mffmpeg)
-CMAKE_ARGS+= -DUSE_FFMPEG=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_FFMPEG=ON
.include "../../multimedia/ffmpeg6/buildlink3.mk"
.else
-CMAKE_ARGS+= -DUSE_FFMPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_FFMPEG=OFF
.endif
Index: pkgsrc/emulators/snes9x-gtk/Makefile
diff -u pkgsrc/emulators/snes9x-gtk/Makefile:1.109 pkgsrc/emulators/snes9x-gtk/Makefile:1.110
--- pkgsrc/emulators/snes9x-gtk/Makefile:1.109 Sat Aug 10 12:04:36 2024
+++ pkgsrc/emulators/snes9x-gtk/Makefile Sun Aug 25 06:18:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2024/08/10 12:04:36 nia Exp $
+# $NetBSD: Makefile,v 1.110 2024/08/25 06:18:41 wiz Exp $
.include "../../emulators/snes9x/Makefile.common"
@@ -16,9 +16,9 @@ FORCE_CXX_STD= c++17
USE_PKGLOCALEDIR= yes
-CMAKE_ARGS+= -DUSE_SYSTEMZIP=ON
-CMAKE_ARGS+= -DENABLE_PCH=OFF
-CMAKE_ARGS+= -DCMAKE_INSTALL_LOCALEDIR=${PKGLOCALEDIR}/locale
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEMZIP=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PCH=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_LOCALEDIR=${PKGLOCALEDIR}/locale
TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
@@ -36,7 +36,7 @@ SUBST_FILES.oss+= common/audio/s9x_sound
SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
LDFLAGS+= ${LIBOSSAUDIO}
.else
-CMAKE_ARGS+= -DUSE_OSS=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_OSS=OFF
.endif
LDFLAGS.SunOS+= -lsocket -lnsl
Index: pkgsrc/emulators/snes9x-gtk/options.mk
diff -u pkgsrc/emulators/snes9x-gtk/options.mk:1.6 pkgsrc/emulators/snes9x-gtk/options.mk:1.7
--- pkgsrc/emulators/snes9x-gtk/options.mk:1.6 Mon Nov 20 10:19:01 2023
+++ pkgsrc/emulators/snes9x-gtk/options.mk Sun Aug 25 06:18:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2023/11/20 10:19:01 nia Exp $
+# $NetBSD: options.mk,v 1.7 2024/08/25 06:18:41 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.snes9x-gtk
PKG_SUPPORTED_OPTIONS= alsa pulseaudio portaudio wayland
@@ -22,23 +22,23 @@ PKG_SUGGESTED_OPTIONS+= wayland
.if !empty(PKG_OPTIONS:Malsa)
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DUSE_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_ALSA=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DUSE_PULSEAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_PULSEAUDIO=OFF
.endif
.if !empty(PKG_OPTIONS:Mportaudio)
.include "../../audio/portaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DUSE_PORTAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_PORTAUDIO=OFF
.endif
.if !empty(PKG_OPTIONS:Mwayland)
.include "../../devel/wayland/buildlink3.mk"
.else
-CMAKE_ARGS+= -DUSE_WAYLAND=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_WAYLAND=ON
.endif
Index: pkgsrc/emulators/visualboyadvance-m/Makefile
diff -u pkgsrc/emulators/visualboyadvance-m/Makefile:1.21 pkgsrc/emulators/visualboyadvance-m/Makefile:1.22
--- pkgsrc/emulators/visualboyadvance-m/Makefile:1.21 Mon Apr 29 09:18:39 2024
+++ pkgsrc/emulators/visualboyadvance-m/Makefile Sun Aug 25 06:18:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2024/04/29 09:18:39 nia Exp $
+# $NetBSD: Makefile,v 1.22 2024/08/25 06:18:41 wiz Exp $
DISTNAME= visualboyadvance-m-2.1.4
PKGREVISION= 17
@@ -13,11 +13,11 @@ COMMENT= Game Boy and Game Boy Advance e
LICENSE= gnu-gpl-v2
# ASM is i386-only, problems with PIE and others
-CMAKE_ARGS+= -DENABLE_ASM=OFF
-CMAKE_ARGS+= -DENABLE_ASM_SCALERS=OFF
-CMAKE_ARGS+= -DENABLE_LINK=OFF
-CMAKE_ARGS+= -DENABLE_LTO=OFF
-CMAKE_ARGS+= -DENABLE_MMX=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ASM=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ASM_SCALERS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LINK=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LTO=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MMX=OFF
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
Index: pkgsrc/emulators/yabause/options.mk
diff -u pkgsrc/emulators/yabause/options.mk:1.10 pkgsrc/emulators/yabause/options.mk:1.11
--- pkgsrc/emulators/yabause/options.mk:1.10 Tue Jun 6 12:41:22 2023
+++ pkgsrc/emulators/yabause/options.mk Sun Aug 25 06:18:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2023/06/06 12:41:22 riastradh Exp $
+# $NetBSD: options.mk,v 1.11 2024/08/25 06:18:41 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.yabause
PKG_SUPPORTED_OPTIONS= openal opengl sdl
@@ -16,37 +16,37 @@ PKG_SUGGESTED_OPTIONS= qt sdl2
.if !empty(PKG_OPTIONS:Mqt)
CONFIGURE_ENV+= YAB_PORTS=qt
-CMAKE_ARGS+= -DYAB_PORTS=qt
+CMAKE_CONFIGURE_ARGS+= -DYAB_PORTS=qt
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
.elif !empty(PKG_OPTIONS:Mgtk)
CONFIGURE_ENV+= YAB_PORTS=gtk
-CMAKE_ARGS+= -DYAB_PORTS=gtk
-CMAKE_ARGS+= -DGTK2_GDKCONFIG_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.gtk2}/lib/gtk-2.0/include
-CMAKE_ARGS+= -DGTK2_GLIB_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include/glib/glib-2.0
-CMAKE_ARGS+= -DGTK2_GLIBCONFIG_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/lib/glib-2.0/include
+CMAKE_CONFIGURE_ARGS+= -DYAB_PORTS=gtk
+CMAKE_CONFIGURE_ARGS+= -DGTK2_GDKCONFIG_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.gtk2}/lib/gtk-2.0/include
+CMAKE_CONFIGURE_ARGS+= -DGTK2_GLIB_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include/glib/glib-2.0
+CMAKE_CONFIGURE_ARGS+= -DGTK2_GLIBCONFIG_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/lib/glib-2.0/include
BUILDLINK_API_DEPENDS.gtkglext+= gtkglext>=1.2.0nb4
.include "../../graphics/gtkglext/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mopenal)
.include "../../audio/openal-soft/buildlink3.mk"
-CMAKE_ARGS+= -DYAB_WANT_OPENAL=ON
+CMAKE_CONFIGURE_ARGS+= -DYAB_WANT_OPENAL=ON
.else
-CMAKE_ARGS+= -DYAB_WANT_OPENAL=OFF
+CMAKE_CONFIGURE_ARGS+= -DYAB_WANT_OPENAL=OFF
.endif
.if !empty(PKG_OPTIONS:Mopengl)
.include "../../graphics/freeglut/buildlink3.mk"
-CMAKE_ARGS+= -DYAB_WANT_OPENGL=ON
+CMAKE_CONFIGURE_ARGS+= -DYAB_WANT_OPENGL=ON
.else
-CMAKE_ARGS+= -DYAB_WANT_OPENGL=OFF
+CMAKE_CONFIGURE_ARGS+= -DYAB_WANT_OPENGL=OFF
.endif
.if !empty(PKG_OPTIONS:Msdl)
.include "../../devel/SDL/buildlink3.mk"
-CMAKE_ARGS+= -DYAB_WANT_SDL1=ON
+CMAKE_CONFIGURE_ARGS+= -DYAB_WANT_SDL1=ON
.elif !empty(PKG_OPTIONS:Msdl2)
.include "../../devel/SDL2/buildlink3.mk"
-CMAKE_ARGS+= -DYAB_WANT_SDL2=ON
+CMAKE_CONFIGURE_ARGS+= -DYAB_WANT_SDL2=ON
.endif
Index: pkgsrc/finance/gnucash/Makefile
diff -u pkgsrc/finance/gnucash/Makefile:1.353 pkgsrc/finance/gnucash/Makefile:1.354
--- pkgsrc/finance/gnucash/Makefile:1.353 Sun Jul 7 19:41:15 2024
+++ pkgsrc/finance/gnucash/Makefile Sun Aug 25 06:18:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.353 2024/07/07 19:41:15 wiz Exp $
+# $NetBSD: Makefile,v 1.354 2024/08/25 06:18:42 wiz Exp $
DISTNAME= gnucash-5.8
CATEGORIES= finance
@@ -35,9 +35,9 @@ CXXFLAGS+= -Wno-deprecated-declarations
CFLAGS+= -Wno-char-subscripts
MAKE_ENV+= GUILE_AUTO_COMPILE=0
-CMAKE_ARGS+= -DWITH_AQBANKING=OFF
-CMAKE_ARGS+= -DPERL_EXECUTABLE=${PERL5}
-CMAKE_ARGS+= -DCOMPILE_GSCHEMAS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_AQBANKING=OFF
+CMAKE_CONFIGURE_ARGS+= -DPERL_EXECUTABLE=${PERL5}
+CMAKE_CONFIGURE_ARGS+= -DCOMPILE_GSCHEMAS=OFF
# test status as of 5.4.1
# after 'make install'
Index: pkgsrc/finance/gnucash/options.mk
diff -u pkgsrc/finance/gnucash/options.mk:1.8 pkgsrc/finance/gnucash/options.mk:1.9
--- pkgsrc/finance/gnucash/options.mk:1.8 Mon Oct 23 06:37:45 2023
+++ pkgsrc/finance/gnucash/options.mk Sun Aug 25 06:18:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2023/10/23 06:37:45 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2024/08/25 06:18:42 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gnucash
PKG_SUPPORTED_OPTIONS= libdbi libofx gnucash-finance-quote python
@@ -12,24 +12,24 @@ DEPENDS+= p5-Date-Manip-[0-9]*:../../dev
.endif
.if !empty(PKG_OPTIONS:Mlibofx)
-CMAKE_ARGS+= -DWITH_OFX=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_OFX=ON
PLIST_SRC+= PLIST.ofx
.include "../../finance/libofx/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_OFX=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_OFX=OFF
.endif
.if !empty(PKG_OPTIONS:Mlibdbi)
-CMAKE_ARGS+= -DWITH_SQL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_SQL=ON
PLIST_SRC+= PLIST.dbi
TOOL_DEPENDS+= libdbi-driver-sqlite3-[0-9]*:../../databases/libdbi-driver-sqlite3
.include "../../databases/libdbi/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_SQL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SQL=OFF
.endif
.if !empty(PKG_OPTIONS:Mpython)
-CMAKE_ARGS+= -DWITH_PYTHON=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PYTHON=ON
PYTHON_VERSIONS_INCOMPATIBLE= 27
REPLACE_PYTHON+= bindings/python/example_scripts/*.py
REPLACE_PYTHON+= bindings/python/example_scripts/rest-api/*.py
@@ -45,5 +45,5 @@ DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.else
-CMAKE_ARGS+= -DWITH_PYTHON=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PYTHON=OFF
.endif
Index: pkgsrc/finance/ledger/options.mk
diff -u pkgsrc/finance/ledger/options.mk:1.4 pkgsrc/finance/ledger/options.mk:1.5
--- pkgsrc/finance/ledger/options.mk:1.4 Mon Jun 15 16:54:38 2020
+++ pkgsrc/finance/ledger/options.mk Sun Aug 25 06:18:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2020/06/15 16:54:38 adam Exp $
+# $NetBSD: options.mk,v 1.5 2024/08/25 06:18:42 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ledger
PKG_SUPPORTED_OPTIONS+= python
@@ -9,7 +9,7 @@ PLIST_VARS+= python
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mpython)
-CMAKE_ARGS+= -DUSE_PYTHON:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DUSE_PYTHON:BOOL=TRUE
PLIST.python= yes
PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
.include "../../devel/py-boost/buildlink3.mk"
Index: pkgsrc/finance/ledger32/options.mk
diff -u pkgsrc/finance/ledger32/options.mk:1.1 pkgsrc/finance/ledger32/options.mk:1.2
--- pkgsrc/finance/ledger32/options.mk:1.1 Sun Mar 3 16:12:50 2024
+++ pkgsrc/finance/ledger32/options.mk Sun Aug 25 06:18:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2024/03/03 16:12:50 riastradh Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:42 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ledger
PKG_SUPPORTED_OPTIONS+= python
@@ -9,7 +9,7 @@ PLIST_VARS+= python
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mpython)
-CMAKE_ARGS+= -DUSE_PYTHON:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DUSE_PYTHON:BOOL=TRUE
PLIST.python= yes
PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
.include "../../devel/py-boost/buildlink3.mk"
Index: pkgsrc/fonts/fntsample/Makefile
diff -u pkgsrc/fonts/fntsample/Makefile:1.49 pkgsrc/fonts/fntsample/Makefile:1.50
--- pkgsrc/fonts/fntsample/Makefile:1.49 Sun Apr 7 07:33:59 2024
+++ pkgsrc/fonts/fntsample/Makefile Sun Aug 25 06:18:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2024/04/07 07:33:59 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2024/08/25 06:18:42 wiz Exp $
DISTNAME= fntsample-5.4
PKGREVISION= 6
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-/-relea
REPLACE_PERL= scripts/pdfoutline.pl scripts/pdf-extract-outline.pl
-CMAKE_ARGS+= -DUNICODE_BLOCKS=${WRKDIR}/${BLOCKS_TXT}
+CMAKE_CONFIGURE_ARGS+= -DUNICODE_BLOCKS=${WRKDIR}/${BLOCKS_TXT}
.include "../../devel/pango/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
Index: pkgsrc/fonts/fontforge/Makefile
diff -u pkgsrc/fonts/fontforge/Makefile:1.147 pkgsrc/fonts/fontforge/Makefile:1.148
--- pkgsrc/fonts/fontforge/Makefile:1.147 Mon Jun 17 18:51:37 2024
+++ pkgsrc/fonts/fontforge/Makefile Sun Aug 25 06:18:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.147 2024/06/17 18:51:37 adam Exp $
+# $NetBSD: Makefile,v 1.148 2024/08/25 06:18:42 wiz Exp $
DISTNAME= fontforge-20230101
PKGREVISION= 9
@@ -18,7 +18,7 @@ USE_LANGUAGES= c c++
USE_CXX_FEATURES+= c++11
-CMAKE_ARGS+= -DENABLE_DOCS=NO
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DOCS=NO
PY_PATCHPLIST= yes
@@ -28,7 +28,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"
-CMAKE_ARGS+= -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
+CMAKE_CONFIGURE_ARGS+= -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
.endif
.include "../../devel/cmake/build.mk"
Index: pkgsrc/fonts/woff2/Makefile
diff -u pkgsrc/fonts/woff2/Makefile:1.4 pkgsrc/fonts/woff2/Makefile:1.5
--- pkgsrc/fonts/woff2/Makefile:1.4 Tue Jan 24 18:36:25 2023
+++ pkgsrc/fonts/woff2/Makefile Sun Aug 25 06:18:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/01/24 18:36:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2024/08/25 06:18:42 wiz Exp $
DISTNAME= woff2-1.0.2
PKGREVISION= 1
@@ -13,7 +13,7 @@ LICENSE= mit
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCANONICAL_PREFIXES=ON
+CMAKE_CONFIGURE_ARGS+= -DCANONICAL_PREFIXES=ON
PKGCONFIG_OVERRIDE= libwoff2common.pc
PKGCONFIG_OVERRIDE+= libwoff2dec.pc
Index: pkgsrc/games/amnesia-tdd/Makefile
diff -u pkgsrc/games/amnesia-tdd/Makefile:1.8 pkgsrc/games/amnesia-tdd/Makefile:1.9
--- pkgsrc/games/amnesia-tdd/Makefile:1.8 Sat Apr 6 08:05:22 2024
+++ pkgsrc/games/amnesia-tdd/Makefile Sun Aug 25 06:18:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2024/04/06 08:05:22 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2024/08/25 06:18:42 wiz Exp $
DISTNAME= amnesia-tdd-0.3.2
PKGREVISION= 5
@@ -16,9 +16,9 @@ USE_LANGUAGES= c c++
USE_TOOLS+= perl
USE_CMAKE= yes
-CMAKE_ARGS+= -DSYSTEMWIDE_RESOURCES=ON
-CMAKE_ARGS+= -DSYSTEMWIDE_RESOURCES_LOCATION="${PREFIX}/share/amnesia-tdd"
-CMAKE_ARGS+= ./amnesia/src
+CMAKE_CONFIGURE_ARGS+= -DSYSTEMWIDE_RESOURCES=ON
+CMAKE_CONFIGURE_ARGS+= -DSYSTEMWIDE_RESOURCES_LOCATION="${PREFIX}/share/amnesia-tdd"
+CMAKE_CONFIGURE_ARGS+= ./amnesia/src
USE_CXX_FEATURES+= c++11
FORCE_CXX_STD= c++11
Index: pkgsrc/games/arx-libertatis/Makefile
diff -u pkgsrc/games/arx-libertatis/Makefile:1.16 pkgsrc/games/arx-libertatis/Makefile:1.17
--- pkgsrc/games/arx-libertatis/Makefile:1.16 Sat Apr 6 08:05:22 2024
+++ pkgsrc/games/arx-libertatis/Makefile Sun Aug 25 06:18:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2024/04/06 08:05:22 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2024/08/25 06:18:42 wiz Exp $
DISTNAME= arx-libertatis-1.2
PKGREVISION= 10
@@ -14,9 +14,9 @@ LICENSE= gnu-gpl-v3
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -D CMAKE_INSTALL_MANDIR:STRING:=${PKGMANDIR}
-CMAKE_ARGS+= -D USE_QT4:BOOL=OFF
-CMAKE_ARGS+= -D USE_QT5:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -D CMAKE_INSTALL_MANDIR:STRING:=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -D USE_QT4:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -D USE_QT5:BOOL=OFF
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/games/astromenace/Makefile
diff -u pkgsrc/games/astromenace/Makefile:1.15 pkgsrc/games/astromenace/Makefile:1.16
--- pkgsrc/games/astromenace/Makefile:1.15 Sat Apr 6 08:05:23 2024
+++ pkgsrc/games/astromenace/Makefile Sun Aug 25 06:18:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2024/04/06 08:05:23 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2024/08/25 06:18:43 wiz Exp $
DISTNAME= astromenace-1.4.1
PKGREVISION= 14
@@ -19,7 +19,7 @@ OBJDIR= build
CONFIGURE_DIRS= ${OBJDIR}
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -DDATADIR=${PREFIX}/share/astromenace
+CMAKE_CONFIGURE_ARGS+= -DDATADIR=${PREFIX}/share/astromenace
ICON_SIZES= 64 128
Index: pkgsrc/games/black-hole-solver/Makefile
diff -u pkgsrc/games/black-hole-solver/Makefile:1.5 pkgsrc/games/black-hole-solver/Makefile:1.6
--- pkgsrc/games/black-hole-solver/Makefile:1.5 Mon Aug 14 05:24:25 2023
+++ pkgsrc/games/black-hole-solver/Makefile Sun Aug 25 06:18:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/08/14 05:24:25 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2024/08/25 06:18:43 wiz Exp $
DISTNAME= black-hole-solver-1.10.1
PKGREVISION= 3
@@ -15,7 +15,7 @@ USE_TOOLS+= gmake perl
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_STATIC_LIBRARY=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_STATIC_LIBRARY=OFF
PYTHON_FOR_BUILD_ONLY= tool
PYTHON_VERSIONS_INCOMPATIBLE= 27
Index: pkgsrc/games/corsix-th/Makefile
diff -u pkgsrc/games/corsix-th/Makefile:1.22 pkgsrc/games/corsix-th/Makefile:1.23
--- pkgsrc/games/corsix-th/Makefile:1.22 Sat Apr 6 08:05:24 2024
+++ pkgsrc/games/corsix-th/Makefile Sun Aug 25 06:18:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2024/04/06 08:05:24 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2024/08/25 06:18:43 wiz Exp $
DISTNAME= corsix-th-0.67
PKGREVISION= 4
@@ -34,8 +34,8 @@ SOEXT= so
.endif
.for module in AVCODEC AVFORMAT AVDEVICE AVUTIL SWSCALE POSTPROC SWRESAMPLE
-CMAKE_ARGS+= -D${module}_INCLUDE_DIRS=${BUILDLINK_PREFIX.ffmpeg4}/include/ffmpeg4
-CMAKE_ARGS+= -D${module}_LIBRARIES=${PREFIX}/lib/ffmpeg4/lib${module:tl}.${SOEXT}
+CMAKE_CONFIGURE_ARGS+= -D${module}_INCLUDE_DIRS=${BUILDLINK_PREFIX.ffmpeg4}/include/ffmpeg4
+CMAKE_CONFIGURE_ARGS+= -D${module}_LIBRARIES=${PREFIX}/lib/ffmpeg4/lib${module:tl}.${SOEXT}
.endfor
.include "../../audio/SDL2_mixer/buildlink3.mk"
Index: pkgsrc/games/devilutionx/Makefile
diff -u pkgsrc/games/devilutionx/Makefile:1.31 pkgsrc/games/devilutionx/Makefile:1.32
--- pkgsrc/games/devilutionx/Makefile:1.31 Sat Apr 6 08:05:24 2024
+++ pkgsrc/games/devilutionx/Makefile Sun Aug 25 06:18:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2024/04/06 08:05:24 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2024/08/25 06:18:43 wiz Exp $
DISTNAME= devilutionx-1.2.1
PKGREVISION= 12
@@ -23,12 +23,12 @@ USE_CXX_FEATURES+= unique_ptr
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DASAN=OFF -DUBSAN=OFF
-CMAKE_ARGS+= -DDEBUG=OFF
-CMAKE_ARGS+= -DVERSION_NUM=${PKGVERSION_NOREV}
-CMAKE_ARGS+= -DDEVILUTIONX_SYSTEM_LIBSODIUM=ON
-CMAKE_ARGS+= -DDEVILUTIONX_STATIC_LIBSODIUM=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DASAN=OFF -DUBSAN=OFF
+CMAKE_CONFIGURE_ARGS+= -DDEBUG=OFF
+CMAKE_CONFIGURE_ARGS+= -DVERSION_NUM=${PKGVERSION_NOREV}
+CMAKE_CONFIGURE_ARGS+= -DDEVILUTIONX_SYSTEM_LIBSODIUM=ON
+CMAKE_CONFIGURE_ARGS+= -DDEVILUTIONX_STATIC_LIBSODIUM=OFF
LDFLAGS.SunOS+= -lsocket
Index: pkgsrc/games/dhewm3/Makefile
diff -u pkgsrc/games/dhewm3/Makefile:1.26 pkgsrc/games/dhewm3/Makefile:1.27
--- pkgsrc/games/dhewm3/Makefile:1.26 Wed May 29 16:32:33 2024
+++ pkgsrc/games/dhewm3/Makefile Sun Aug 25 06:18:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2024/05/29 16:32:33 adam Exp $
+# $NetBSD: Makefile,v 1.27 2024/08/25 06:18:43 wiz Exp $
DISTNAME= dhewm3-1.5.1-src
PKGNAME= ${DISTNAME:S/-src//1}
@@ -23,8 +23,8 @@ USE_CXX_FEATURES+= c++11
CONFIGURE_DIRS+= neo
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DDEDICATED=ON
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DDEDICATED=ON
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/games/eternal-lands/Makefile
diff -u pkgsrc/games/eternal-lands/Makefile:1.21 pkgsrc/games/eternal-lands/Makefile:1.22
--- pkgsrc/games/eternal-lands/Makefile:1.21 Wed May 29 16:32:34 2024
+++ pkgsrc/games/eternal-lands/Makefile Sun Aug 25 06:18:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2024/05/29 16:32:34 adam Exp $
+# $NetBSD: Makefile,v 1.22 2024/08/25 06:18:43 wiz Exp $
EL_VER= 1.9.6.1
PKGNAME= eternal-lands-${EL_VER}
@@ -39,7 +39,7 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config pax
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DEXEC=el
+CMAKE_CONFIGURE_ARGS+= -DEXEC=el
.include "../../mk/endian.mk"
Index: pkgsrc/games/etlegacy/Makefile
diff -u pkgsrc/games/etlegacy/Makefile:1.45 pkgsrc/games/etlegacy/Makefile:1.46
--- pkgsrc/games/etlegacy/Makefile:1.45 Sat Aug 10 11:12:16 2024
+++ pkgsrc/games/etlegacy/Makefile Sun Aug 25 06:18:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2024/08/10 11:12:16 nia Exp $
+# $NetBSD: Makefile,v 1.46 2024/08/25 06:18:43 wiz Exp $
.include "Makefile.common"
@@ -6,8 +6,8 @@ PKGNAME= etlegacy-${ETL_VERSION}
COMMENT= Open source Wolfenstein: Enemy Territory client and server
-CMAKE_ARGS+= -DRENDERER_DYNAMIC=OFF
-CMAKE_ARGS+= -DFEATURE_RENDERER2=OFF # experimental, buggy
+CMAKE_CONFIGURE_ARGS+= -DRENDERER_DYNAMIC=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_RENDERER2=OFF # experimental, buggy
PLIST_VARS+= client
PLIST.client= yes
Index: pkgsrc/games/etlegacy/Makefile.common
diff -u pkgsrc/games/etlegacy/Makefile.common:1.10 pkgsrc/games/etlegacy/Makefile.common:1.11
--- pkgsrc/games/etlegacy/Makefile.common:1.10 Sat Aug 10 11:12:16 2024
+++ pkgsrc/games/etlegacy/Makefile.common Sun Aug 25 06:18:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2024/08/10 11:12:16 nia Exp $
+# $NetBSD: Makefile.common,v 1.11 2024/08/25 06:18:43 wiz Exp $
# used by games/etlegacy/Makefile
# used by games/etlegacy-server/Makefile
@@ -34,41 +34,41 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++
# use libraries from pkgsrc
-CMAKE_ARGS+= -DBUNDLED_CJSON=OFF
-CMAKE_ARGS+= -DBUNDLED_CURL=OFF
-CMAKE_ARGS+= -DBUNDLED_FREETYPE=OFF
-CMAKE_ARGS+= -DBUNDLED_GLEW=OFF
-CMAKE_ARGS+= -DBUNDLED_JANSSON=OFF
-CMAKE_ARGS+= -DBUNDLED_JPEG=OFF
-CMAKE_ARGS+= -DBUNDLED_LUA=OFF
-CMAKE_ARGS+= -DBUNDLED_MINIZIP=OFF
-CMAKE_ARGS+= -DBUNDLED_OGG_VORBIS=OFF
-CMAKE_ARGS+= -DBUNDLED_OPENAL=OFF
-CMAKE_ARGS+= -DBUNDLED_OPENSSL=OFF
-CMAKE_ARGS+= -DBUNDLED_PNG=OFF
-CMAKE_ARGS+= -DBUNDLED_SDL=OFF
-CMAKE_ARGS+= -DBUNDLED_SQLITE3=OFF
-CMAKE_ARGS+= -DBUNDLED_THEORA=OFF
-CMAKE_ARGS+= -DBUNDLED_WOLFSSL=OFF
-CMAKE_ARGS+= -DBUNDLED_ZLIB=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_CJSON=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_CURL=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_FREETYPE=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_GLEW=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_JANSSON=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_JPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_LUA=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_MINIZIP=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_OGG_VORBIS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_OPENAL=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_OPENSSL=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_PNG=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_SDL=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_SQLITE3=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_THEORA=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_WOLFSSL=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUNDLED_ZLIB=OFF
# don't try to build i386 binaries on amd64
-CMAKE_ARGS+= -DCROSS_COMPILE32=OFF
+CMAKE_CONFIGURE_ARGS+= -DCROSS_COMPILE32=OFF
# Don't download unversioned tarballs
-CMAKE_ARGS+= -DINSTALL_EXTRA=OFF
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_EXTRA=OFF
-CMAKE_ARGS+= -DFEATURE_AUTOUPDATE=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_AUTOUPDATE=OFF
# tries to install binaries
# but maybe this can be built from source separately
-CMAKE_ARGS+= -DFEATURE_OMNIBOT=OFF
-CMAKE_ARGS+= -DINSTALL_OMNIBOT=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_OMNIBOT=OFF
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_OMNIBOT=OFF
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DINSTALL_DEFAULT_BASEDIR="${PREFIX}/share/etlegacy"
-CMAKE_ARGS+= -DINSTALL_DEFAULT_BINDIR="bin"
-CMAKE_ARGS+= -DINSTALL_DEFAULT_MODDIR="share/etlegacy"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DEFAULT_BASEDIR="${PREFIX}/share/etlegacy"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DEFAULT_BINDIR="bin"
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DEFAULT_MODDIR="share/etlegacy"
# don't use fopen64 etc
CFLAGS+= -DIOAPI_NO_64
Index: pkgsrc/games/etlegacy/options.mk
diff -u pkgsrc/games/etlegacy/options.mk:1.3 pkgsrc/games/etlegacy/options.mk:1.4
--- pkgsrc/games/etlegacy/options.mk:1.3 Thu Dec 9 16:10:58 2021
+++ pkgsrc/games/etlegacy/options.mk Sun Aug 25 06:18:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2021/12/09 16:10:58 nia Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:43 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.etlegacy
PKG_SUPPORTED_OPTIONS= lua ogg theora freetype sqlite3
@@ -7,36 +7,36 @@ PKG_SUGGESTED_OPTIONS= lua ogg theora f
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mlua)
-CMAKE_ARGS+= -DFEATURE_LUA=ON
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_LUA=ON
.include "../../lang/lua54/buildlink3.mk"
.else
-CMAKE_ARGS+= -DFEATURE_LUA=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_LUA=OFF
.endif
.if !empty(PKG_OPTIONS:Mogg)
-CMAKE_ARGS+= -DFEATURE_OGG_VORBIS=ON
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_OGG_VORBIS=ON
.include "../../audio/libvorbis/buildlink3.mk"
.else
-CMAKE_ARGS+= -DFEATURE_OGG_VORBIS=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_OGG_VORBIS=OFF
.endif
.if !empty(PKG_OPTIONS:Mtheora)
-CMAKE_ARGS+= -DFEATURE_THEORA=ON
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_THEORA=ON
.include "../../multimedia/libtheora/buildlink3.mk"
.else
-CMAKE_ARGS+= -DFEATURE_THEORA=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_THEORA=OFF
.endif
.if !empty(PKG_OPTIONS:Mfreetype)
-CMAKE_ARGS+= -DFEATURE_FREETYPE=ON
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_FREETYPE=ON
.include "../../graphics/freetype2/buildlink3.mk"
.else
-CMAKE_ARGS+= -DFEATURE_FREETYPE=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_FREETYPE=OFF
.endif
.if !empty(PKG_OPTIONS:Msqlite3)
-CMAKE_ARGS+= -DFEATURE_DBMS=ON
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_DBMS=ON
.include "../../databases/sqlite3/buildlink3.mk"
.else
-CMAKE_ARGS+= -DFEATURE_DBMS=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_DBMS=OFF
.endif
Index: pkgsrc/games/etlegacy-server/Makefile
diff -u pkgsrc/games/etlegacy-server/Makefile:1.29 pkgsrc/games/etlegacy-server/Makefile:1.30
--- pkgsrc/games/etlegacy-server/Makefile:1.29 Sat Aug 10 11:12:16 2024
+++ pkgsrc/games/etlegacy-server/Makefile Sun Aug 25 06:18:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2024/08/10 11:12:16 nia Exp $
+# $NetBSD: Makefile,v 1.30 2024/08/25 06:18:43 wiz Exp $
.include "../../games/etlegacy/Makefile.common"
@@ -6,14 +6,14 @@ PKGNAME= etlegacy-server-${ETL_VERSION}
COMMENT= Open source Wolfenstein: Enemy Territory server
-CMAKE_ARGS+= -DBUILD_CLIENT=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_CLIENT=OFF
# Disable client-only features.
-CMAKE_ARGS+= -DFEATURE_OGG_VORBIS=OFF
-CMAKE_ARGS+= -DFEATURE_THEORA=OFF
-CMAKE_ARGS+= -DFEATURE_OPENAL=OFF
-CMAKE_ARGS+= -DFEATURE_FREETYPE=OFF
-CMAKE_ARGS+= -DFEATURE_RENDERER2=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_OGG_VORBIS=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_THEORA=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_OPENAL=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_FREETYPE=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_RENDERER2=OFF
# Not set.
PLIST_VARS+= client
Index: pkgsrc/games/etlegacy-server/options.mk
diff -u pkgsrc/games/etlegacy-server/options.mk:1.2 pkgsrc/games/etlegacy-server/options.mk:1.3
--- pkgsrc/games/etlegacy-server/options.mk:1.2 Thu Dec 23 16:32:56 2021
+++ pkgsrc/games/etlegacy-server/options.mk Sun Aug 25 06:18:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2021/12/23 16:32:56 nia Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:43 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.etlegacy-server
PKG_SUPPORTED_OPTIONS= lua sqlite3
@@ -7,15 +7,15 @@ PKG_SUGGESTED_OPTIONS= lua sqlite3
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mlua)
-CMAKE_ARGS+= -DFEATURE_LUA=ON
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_LUA=ON
.include "../../lang/lua54/buildlink3.mk"
.else
-CMAKE_ARGS+= -DFEATURE_LUA=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_LUA=OFF
.endif
.if !empty(PKG_OPTIONS:Msqlite3)
-CMAKE_ARGS+= -DFEATURE_DBMS=ON
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_DBMS=ON
.include "../../databases/sqlite3/buildlink3.mk"
.else
-CMAKE_ARGS+= -DFEATURE_DBMS=OFF
+CMAKE_CONFIGURE_ARGS+= -DFEATURE_DBMS=OFF
.endif
Index: pkgsrc/games/eureka/Makefile
diff -u pkgsrc/games/eureka/Makefile:1.11 pkgsrc/games/eureka/Makefile:1.12
--- pkgsrc/games/eureka/Makefile:1.11 Mon Jul 15 13:08:44 2024
+++ pkgsrc/games/eureka/Makefile Sun Aug 25 06:18:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2024/07/15 13:08:44 micha Exp $
+# $NetBSD: Makefile,v 1.12 2024/08/25 06:18:44 wiz Exp $
DISTNAME= eureka-2.0.2
PKGREVISION= 1
@@ -17,7 +17,7 @@ USE_CC_FEATURES+= c11
# charconv is not used by package, but needs GCC 8 (GCC 7.5 is not good enough)
USE_CXX_FEATURES+= c++17 charconv has_include unique_ptr
-CMAKE_ARGS+= -DENABLE_UNIT_TESTS=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_UNIT_TESTS=off
# DOOMWADDIR is intentionally shared with other Doom packages
DOOMWADDIR= share/doom
Index: pkgsrc/games/eureka/options.mk
diff -u pkgsrc/games/eureka/options.mk:1.4 pkgsrc/games/eureka/options.mk:1.5
--- pkgsrc/games/eureka/options.mk:1.4 Mon Jul 8 14:04:42 2024
+++ pkgsrc/games/eureka/options.mk Sun Aug 25 06:18:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2024/07/08 14:04:42 micha Exp $
+# $NetBSD: options.mk,v 1.5 2024/08/25 06:18:44 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.eureka
PKG_SUPPORTED_OPTIONS= opengl xdg-utils
@@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS= opengl xdg-utils
# If FLTK is compiled with opengl option, disabling it here allows to force
# usage of the software renderer (recommended without hardware acceleration).
.if empty(PKG_OPTIONS.fltk13:Mopengl) || empty(PKG_OPTIONS:Mopengl)
-CMAKE_ARGS+= -DENABLE_OPENGL=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_OPENGL=off
.endif
# xdg-utils: Create dependency for xdg-utils (Portland project)
Index: pkgsrc/games/fallingtime/Makefile
diff -u pkgsrc/games/fallingtime/Makefile:1.19 pkgsrc/games/fallingtime/Makefile:1.20
--- pkgsrc/games/fallingtime/Makefile:1.19 Sat Apr 6 08:05:25 2024
+++ pkgsrc/games/fallingtime/Makefile Sun Aug 25 06:18:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/04/06 08:05:25 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2024/08/25 06:18:44 wiz Exp $
DISTNAME= fallingtime-1.0.2
PKGREVISION= 13
@@ -20,8 +20,8 @@ USE_LANGUAGES= c c++
# Also needed for alloca(), c99 creeps in and overrides otherwise...
FORCE_C_STD= gnu99
-CMAKE_ARGS+= -DINSTALL_PREFIX=${PREFIX}/libexec
-CMAKE_ARGS+= -DINSTALL_DATA_PREFIX=${PREFIX}/share/fallingtime
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PREFIX=${PREFIX}/libexec
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DATA_PREFIX=${PREFIX}/share/fallingtime
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= share/applications
Index: pkgsrc/games/flare-engine/Makefile
diff -u pkgsrc/games/flare-engine/Makefile:1.26 pkgsrc/games/flare-engine/Makefile:1.27
--- pkgsrc/games/flare-engine/Makefile:1.26 Sat Apr 6 08:05:25 2024
+++ pkgsrc/games/flare-engine/Makefile Sun Aug 25 06:18:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2024/04/06 08:05:25 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2024/08/25 06:18:44 wiz Exp $
DISTNAME= flare-engine-1.12
PKGREVISION= 13
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_LANGUAGES= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DDATADIR:STRING="${PREFIX}/share/flare" -DBINDIR:STRING=bin -DMANDIR:STRING=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DDATADIR:STRING="${PREFIX}/share/flare" -DBINDIR:STRING=bin -DMANDIR:STRING=${PKGMANDIR}
REPLACE_PYTHON+= mods/default/languages/xgettext.py
Index: pkgsrc/games/flare-game/Makefile
diff -u pkgsrc/games/flare-game/Makefile:1.13 pkgsrc/games/flare-game/Makefile:1.14
--- pkgsrc/games/flare-game/Makefile:1.13 Mon Aug 14 05:24:26 2023
+++ pkgsrc/games/flare-game/Makefile Sun Aug 25 06:18:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/08/14 05:24:26 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2024/08/25 06:18:44 wiz Exp $
DISTNAME= flare-game-1.12
PKGREVISION= 2
@@ -21,7 +21,7 @@ REPLACE_PYTHON+= mods/alpha_demo/languag
REPLACE_PYTHON+= mods/default/languages/xgettext.py
REPLACE_PYTHON+= mods/fantasycore/languages/xgettext.py
-CMAKE_ARGS+= -DDATADIR:STRING="${PREFIX}/share/flare"
+CMAKE_CONFIGURE_ARGS+= -DDATADIR:STRING="${PREFIX}/share/flare"
.include "../../lang/python/application.mk"
.include "../../mk/pthread.buildlink3.mk"
Index: pkgsrc/games/flightgear/Makefile
diff -u pkgsrc/games/flightgear/Makefile:1.174 pkgsrc/games/flightgear/Makefile:1.175
--- pkgsrc/games/flightgear/Makefile:1.174 Wed May 29 16:32:34 2024
+++ pkgsrc/games/flightgear/Makefile Sun Aug 25 06:18:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.174 2024/05/29 16:32:34 adam Exp $
+# $NetBSD: Makefile,v 1.175 2024/08/25 06:18:44 wiz Exp $
DISTNAME= flightgear-2020.3.11
PKGREVISION= 44
@@ -19,11 +19,11 @@ CONFIGURE_DIRS= fgbuild
BUILD_DIRS= fgbuild
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DFG_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DFG_BUILD_TYPE=Release
-CMAKE_ARGS+= -DSYSTEM_FLITE=OFF
-CMAKE_ARGS+= -DSYSTEM_HTS_ENGINE=OFF
+CMAKE_CONFIGURE_ARGS+= -DSYSTEM_FLITE=OFF
+CMAKE_CONFIGURE_ARGS+= -DSYSTEM_HTS_ENGINE=OFF
# The cmake script warns against building in the source directory.
pre-configure:
Index: pkgsrc/games/freecell-solver/Makefile
diff -u pkgsrc/games/freecell-solver/Makefile:1.9 pkgsrc/games/freecell-solver/Makefile:1.10
--- pkgsrc/games/freecell-solver/Makefile:1.9 Mon Aug 14 05:24:26 2023
+++ pkgsrc/games/freecell-solver/Makefile Sun Aug 25 06:18:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/08/14 05:24:26 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2024/08/25 06:18:44 wiz Exp $
DISTNAME= freecell-solver-5.14.0
PKGREVISION= 6
@@ -15,8 +15,8 @@ USE_TOOLS+= gmake perl
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DFCS_WITH_TEST_SUITE=OFF
-CMAKE_ARGS+= -DBUILD_STATIC_LIBRARY=OFF
+CMAKE_CONFIGURE_ARGS+= -DFCS_WITH_TEST_SUITE=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_STATIC_LIBRARY=OFF
PYTHON_VERSIONS_INCOMPATIBLE= 27
Index: pkgsrc/games/gemrb/Makefile
diff -u pkgsrc/games/gemrb/Makefile:1.25 pkgsrc/games/gemrb/Makefile:1.26
--- pkgsrc/games/gemrb/Makefile:1.25 Sat Apr 6 08:05:26 2024
+++ pkgsrc/games/gemrb/Makefile Sun Aug 25 06:18:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/04/06 08:05:26 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2024/08/25 06:18:44 wiz Exp $
DISTNAME= gemrb-0.9.2
PKGREVISION= 3
@@ -20,11 +20,11 @@ USE_CXX_FEATURES+= c++11
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/gemrb
LDFLAGS+= -lm # ldexpf
-CMAKE_ARGS+= -DDISABLE_WERROR=ON
-CMAKE_ARGS+= -DUSE_LIBVLC=OFF
-CMAKE_ARGS+= -DMAN_DIR="${PREFIX}/${PKGMANDIR}/man6"
-CMAKE_ARGS+= -DEXAMPLE_CONF_DIR="${PREFIX}/share/examples/gemrb"
-CMAKE_ARGS+= -DSDL_BACKEND="SDL2"
+CMAKE_CONFIGURE_ARGS+= -DDISABLE_WERROR=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_LIBVLC=OFF
+CMAKE_CONFIGURE_ARGS+= -DMAN_DIR="${PREFIX}/${PKGMANDIR}/man6"
+CMAKE_CONFIGURE_ARGS+= -DEXAMPLE_CONF_DIR="${PREFIX}/share/examples/gemrb"
+CMAKE_CONFIGURE_ARGS+= -DSDL_BACKEND="SDL2"
CMAKE_ARG_PATH= ..
CONFIGURE_DIRS= build
Index: pkgsrc/games/lgogdownloader/Makefile
diff -u pkgsrc/games/lgogdownloader/Makefile:1.75 pkgsrc/games/lgogdownloader/Makefile:1.76
--- pkgsrc/games/lgogdownloader/Makefile:1.75 Sun Jun 16 18:57:11 2024
+++ pkgsrc/games/lgogdownloader/Makefile Sun Aug 25 06:18:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2024/06/16 18:57:11 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2024/08/25 06:18:44 wiz Exp $
DISTNAME= lgogdownloader-3.14
PKGREVISION= 1
@@ -14,7 +14,7 @@ LICENSE= public-domain # actually, dwtfy
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DJSONCPP_INCLUDE_DIR=${BUILDLINK_DIR}/include/json
+CMAKE_CONFIGURE_ARGS+= -DJSONCPP_INCLUDE_DIR=${BUILDLINK_DIR}/include/json
.include "../../devel/cmake/build.mk"
.include "../../devel/boost-libs/buildlink3.mk"
Index: pkgsrc/games/lugaru/Makefile
diff -u pkgsrc/games/lugaru/Makefile:1.13 pkgsrc/games/lugaru/Makefile:1.14
--- pkgsrc/games/lugaru/Makefile:1.13 Sat Apr 6 08:05:33 2024
+++ pkgsrc/games/lugaru/Makefile Sun Aug 25 06:18:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2024/04/06 08:05:33 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2024/08/25 06:18:45 wiz Exp $
DISTNAME= lugaru-${VERSION}
VERSION= 1.2
@@ -16,8 +16,8 @@ USE_LANGUAGES= c c++
USE_CMAKE= yes
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DSYSTEM_INSTALL=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DSYSTEM_INSTALL=ON
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/openal-soft/buildlink3.mk"
Index: pkgsrc/games/megaglest/Makefile
diff -u pkgsrc/games/megaglest/Makefile:1.38 pkgsrc/games/megaglest/Makefile:1.39
--- pkgsrc/games/megaglest/Makefile:1.38 Wed May 29 16:32:42 2024
+++ pkgsrc/games/megaglest/Makefile Sun Aug 25 06:18:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2024/05/29 16:32:42 adam Exp $
+# $NetBSD: Makefile,v 1.39 2024/08/25 06:18:45 wiz Exp $
DISTNAME= megaglest-3.13.0
PKGREVISION= 36
@@ -20,13 +20,13 @@ DEPENDS+= megaglest-data>=${PKGVERSION_N
TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DWANT_GIT_STAMP=OFF
-CMAKE_ARGS+= -DWANT_USE_VLC=OFF
-CMAKE_ARGS+= -DWANT_USE_GoogleBreakpad=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DWANT_GIT_STAMP=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_USE_VLC=OFF
+CMAKE_CONFIGURE_ARGS+= -DWANT_USE_GoogleBreakpad=OFF
# detection fails; only used by tests?
-CMAKE_ARGS+= -DWANT_USE_FriBiDi=OFF
-CMAKE_ARGS+= -DMEGAGLEST_MANPAGE_INSTALL_PATH="${PKGMANDIR}/man6/"
+CMAKE_CONFIGURE_ARGS+= -DWANT_USE_FriBiDi=OFF
+CMAKE_CONFIGURE_ARGS+= -DMEGAGLEST_MANPAGE_INSTALL_PATH="${PKGMANDIR}/man6/"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/openal-soft/buildlink3.mk"
Index: pkgsrc/games/minetest/Makefile
diff -u pkgsrc/games/minetest/Makefile:1.38 pkgsrc/games/minetest/Makefile:1.39
--- pkgsrc/games/minetest/Makefile:1.38 Tue Aug 13 14:45:28 2024
+++ pkgsrc/games/minetest/Makefile Sun Aug 25 06:18:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2024/08/13 14:45:28 ktnb Exp $
+# $NetBSD: Makefile,v 1.39 2024/08/25 06:18:45 wiz Exp $
DISTNAME= minetest-5.9.0
CATEGORIES= games
@@ -19,23 +19,23 @@ USE_LANGUAGES= c c++
# "Insufficient gcc version, found 4.8.5. Version 4.9 or higher is required."
GCC_REQD+= 4.9
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DBUILD_CLIENT=TRUE
-CMAKE_ARGS+= -DBUILD_SERVER=TRUE
+CMAKE_CONFIGURE_ARGS+= -DBUILD_CLIENT=TRUE
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SERVER=TRUE
-CMAKE_ARGS+= -DENABLE_POSTGRESQL=FALSE
-CMAKE_ARGS+= -DENABLE_LEVELDB=FALSE
-CMAKE_ARGS+= -DENABLE_REDIS=FALSE
-CMAKE_ARGS+= -DENABLE_SPATIAL=FALSE
+CMAKE_CONFIGURE_ARGS+= -DENABLE_POSTGRESQL=FALSE
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LEVELDB=FALSE
+CMAKE_CONFIGURE_ARGS+= -DENABLE_REDIS=FALSE
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SPATIAL=FALSE
#.include "../../lang/LuaJIT2/platform.mk"
#.if ${PLATFORM_SUPPORTS_LUAJIT} == "no"
-#CMAKE_ARGS+= -DENABLE_LUAJIT=FALSE
+#CMAKE_CONFIGURE_ARGS+= -DENABLE_LUAJIT=FALSE
#.endif
# Binaries built with LuaJIT support have been broken since 2015, see:
# https://github.com/minetest/minetest/issues/2988
-CMAKE_ARGS+= -DENABLE_LUAJIT=FALSE
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LUAJIT=FALSE
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../audio/openal-soft/buildlink3.mk"
Index: pkgsrc/games/nxengine-evo/Makefile
diff -u pkgsrc/games/nxengine-evo/Makefile:1.16 pkgsrc/games/nxengine-evo/Makefile:1.17
--- pkgsrc/games/nxengine-evo/Makefile:1.16 Tue Jul 16 10:02:01 2024
+++ pkgsrc/games/nxengine-evo/Makefile Sun Aug 25 06:18:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2024/07/16 10:02:01 prlw1 Exp $
+# $NetBSD: Makefile,v 1.17 2024/08/25 06:18:45 wiz Exp $
PKGNAME= nxengine-evo-2.6.5.1
PKGREVISION= 9
@@ -25,8 +25,8 @@ LDFLAGS+= -lfmt
WRKSRC= ${WRKDIR}/nxengine-evo-2.6.5-1
ALL_ENV+= SDL2DIR=${PREFIX}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DCMAKE_SYSTEM_PREFIX_PATH=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_SYSTEM_PREFIX_PATH=${PREFIX}
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= share/applications
Index: pkgsrc/games/openhexagon/Makefile
diff -u pkgsrc/games/openhexagon/Makefile:1.7 pkgsrc/games/openhexagon/Makefile:1.8
--- pkgsrc/games/openhexagon/Makefile:1.7 Sun Nov 12 13:21:41 2023
+++ pkgsrc/games/openhexagon/Makefile Sun Aug 25 06:18:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/11/12 13:21:41 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2024/08/25 06:18:45 wiz Exp $
#
DISTNAME= openhexagon-2.0
@@ -44,14 +44,14 @@ SUBST_MESSAGE.include= Fixing hardcoded
SUBST_FILES.include= extlibs/SSVLuaWrapper/include/SSVLuaWrapper/LuaContext/LuaContext.h
SUBST_SED.include= -e 's,lua5.1,lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR},'
-CMAKE_ARGS+= -DPKGBASE=${PKGBASE}
-CMAKE_ARGS+= -DBUILD_SHARED_LIB:BOOL=OFF
-CMAKE_ARGS+= -DLUA_LIBRARY=${BUILDLINK_DIR}/lib/liblua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.so
-CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${BUILDLINK_DIR}/${LUA_INCDIR}
+CMAKE_CONFIGURE_ARGS+= -DPKGBASE=${PKGBASE}
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIB:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLUA_LIBRARY=${BUILDLINK_DIR}/lib/liblua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.so
+CMAKE_CONFIGURE_ARGS+= -DLUA_INCLUDE_DIR=${BUILDLINK_DIR}/${LUA_INCDIR}
.for mod in ${MODULES:NSSVOpenHexagon*:C/-.*//}
-CMAKE_ARGS+= -D${mod:tu}_INCLUDE_DIR=${WRKSRC}/extlibs/${mod}/include
-CMAKE_ARGS+= -D${mod:tu}_LIBRARY_RELEASE=${WRKSRC}/extlibs/${mod}/lib${mod}-s.a
+CMAKE_CONFIGURE_ARGS+= -D${mod:tu}_INCLUDE_DIR=${WRKSRC}/extlibs/${mod}/include
+CMAKE_CONFIGURE_ARGS+= -D${mod:tu}_LIBRARY_RELEASE=${WRKSRC}/extlibs/${mod}/lib${mod}-s.a
.endfor
CONFIGURE_DIRS+= ${MODULES:NSSVOpenHexagon*:C/-.*//:%=extlibs/%} .
Index: pkgsrc/games/openjk/Makefile
diff -u pkgsrc/games/openjk/Makefile:1.13 pkgsrc/games/openjk/Makefile:1.14
--- pkgsrc/games/openjk/Makefile:1.13 Sat Apr 6 08:05:34 2024
+++ pkgsrc/games/openjk/Makefile Sun Aug 25 06:18:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2024/04/06 08:05:34 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2024/08/25 06:18:45 wiz Exp $
DISTNAME= openjk-0.0.0.20191030
PKGREVISION= 10
@@ -20,13 +20,13 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++11
-CMAKE_ARGS+= -DJK2InstallDir="share/JediAcademy"
+CMAKE_CONFIGURE_ARGS+= -DJK2InstallDir="share/JediAcademy"
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} != "Darwin"
CXXFLAGS+= -I${BUILDLINK_DIR}/include/GL
.else
-CMAKE_ARGS+= -DUseInternalJPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DUseInternalJPEG=OFF
.endif
.if ${MACHINE_ARCH} == "i386" && ${OPSYS} == "Darwin"
Index: pkgsrc/games/openmw/Makefile
diff -u pkgsrc/games/openmw/Makefile:1.87 pkgsrc/games/openmw/Makefile:1.88
--- pkgsrc/games/openmw/Makefile:1.87 Sun Aug 4 10:40:42 2024
+++ pkgsrc/games/openmw/Makefile Sun Aug 25 06:18:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2024/08/04 10:40:42 nia Exp $
+# $NetBSD: Makefile,v 1.88 2024/08/25 06:18:45 wiz Exp $
DISTNAME= openmw-openmw-0.47.0
PKGNAME= ${DISTNAME:S/^openmw-//1}
@@ -23,11 +23,11 @@ USE_TOOLS+= pkg-config
USE_CXX_FEATURES+= c++11
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DGLOBAL_CONFIG_DIR=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DGLOBAL_CONFIG_DIR=${PKG_SYSCONFDIR}
# System bullet is unacceptable due to OpenMW requiring
# double-precision bullet.
-CMAKE_ARGS+= -DOPENMW_USE_SYSTEM_BULLET=OFF
+CMAKE_CONFIGURE_ARGS+= -DOPENMW_USE_SYSTEM_BULLET=OFF
EGDIR= ${PREFIX}/share/examples/openmw
Index: pkgsrc/games/openmw/options.mk
diff -u pkgsrc/games/openmw/options.mk:1.3 pkgsrc/games/openmw/options.mk:1.4
--- pkgsrc/games/openmw/options.mk:1.3 Fri Oct 22 22:43:11 2021
+++ pkgsrc/games/openmw/options.mk Sun Aug 25 06:18:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2021/10/22 22:43:11 nia Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:45 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openmw
PKG_SUPPORTED_OPTIONS= qt5
@@ -10,11 +10,11 @@ PLIST_VARS+= gui
.if !empty(PKG_OPTIONS:Mqt5)
PLIST.gui= yes
-CMAKE_ARGS+= -DDESIRED_QT_VERSION=5
+CMAKE_CONFIGURE_ARGS+= -DDESIRED_QT_VERSION=5
CONF_FILES+= ${EGDIR}/defaults-cs.bin ${PKG_SYSCONFDIR}/defaults-cs.bin
.include "../../x11/qt5-qtbase/buildlink3.mk"
.else
-CMAKE_ARGS+= -DBUILD_LAUNCHER=OFF
-CMAKE_ARGS+= -DBUILD_OPENCS=OFF
-CMAKE_ARGS+= -DBUILD_WIZARD=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_LAUNCHER=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_OPENCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WIZARD=OFF
.endif
Index: pkgsrc/games/openrct2/Makefile
diff -u pkgsrc/games/openrct2/Makefile:1.60 pkgsrc/games/openrct2/Makefile:1.61
--- pkgsrc/games/openrct2/Makefile:1.60 Wed May 29 16:32:42 2024
+++ pkgsrc/games/openrct2/Makefile Sun Aug 25 06:18:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2024/05/29 16:32:42 adam Exp $
+# $NetBSD: Makefile,v 1.61 2024/08/25 06:18:45 wiz Exp $
PKGNAME= openrct2-0.4.11
PKGREVISION= 2
@@ -45,17 +45,17 @@ WRKSRC= ${WRKDIR}/OpenRCT2-${PKGVERSION
USE_TOOLS+= pkg-config unzip
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER_AR="/usr/bin/ar"
-CMAKE_ARGS+= -DDISABLE_DISCORD_RPC=ON
-CMAKE_ARGS+= -DDISABLE_GOOGLE_BENCHMARK=ON
-CMAKE_ARGS+= -DMACOS_USE_DEPENDENCIES=OFF
-CMAKE_ARGS+= -DMACOS_BUNDLE=OFF
-
-CMAKE_ARGS+= -DDOWNLOAD_TITLE_SEQUENCES=OFF
-CMAKE_ARGS+= -DDOWNLOAD_OBJECTS=OFF
-CMAKE_ARGS+= -DDOWNLOAD_OPENSFX=OFF
-CMAKE_ARGS+= -DDOWNLOAD_OPENMSX=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER_AR="/usr/bin/ar"
+CMAKE_CONFIGURE_ARGS+= -DDISABLE_DISCORD_RPC=ON
+CMAKE_CONFIGURE_ARGS+= -DDISABLE_GOOGLE_BENCHMARK=ON
+CMAKE_CONFIGURE_ARGS+= -DMACOS_USE_DEPENDENCIES=OFF
+CMAKE_CONFIGURE_ARGS+= -DMACOS_BUNDLE=OFF
+
+CMAKE_CONFIGURE_ARGS+= -DDOWNLOAD_TITLE_SEQUENCES=OFF
+CMAKE_CONFIGURE_ARGS+= -DDOWNLOAD_OBJECTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DDOWNLOAD_OPENSFX=OFF
+CMAKE_CONFIGURE_ARGS+= -DDOWNLOAD_OPENMSX=OFF
CXXFLAGS+= -DORCT2_RESOURCE_DIR=\"${PREFIX}/share/openrct2\"
Index: pkgsrc/games/openttd/Makefile
diff -u pkgsrc/games/openttd/Makefile:1.125 pkgsrc/games/openttd/Makefile:1.126
--- pkgsrc/games/openttd/Makefile:1.125 Wed May 29 16:32:42 2024
+++ pkgsrc/games/openttd/Makefile Sun Aug 25 06:18:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.125 2024/05/29 16:32:42 adam Exp $
+# $NetBSD: Makefile,v 1.126 2024/08/25 06:18:46 wiz Exp $
DISTNAME= openttd-14.1-source
PKGNAME= ${DISTNAME:S/-source//}
@@ -26,16 +26,16 @@ FORCE_CXX_STD= gnu++20
.include "../../mk/bsd.prefs.mk"
-CMAKE_ARGS+= -DPERSONAL_DIR=.openttd
-CMAKE_ARGS+= -DSHARED_DIR=${VARBASE}/games/openttd
-CMAKE_ARGS+= -DGLOBAL_DIR=${PREFIX}/share/openttd
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_INSTALL_BINDIR=bin
-CMAKE_ARGS+= -DCMAKE_INSTALL_DATADIR=share
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Allegro=ON
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Grfcodec=ON
-CMAKE_ARGS+= -DOPTION_INSTALL_FHS=ON
+CMAKE_CONFIGURE_ARGS+= -DPERSONAL_DIR=.openttd
+CMAKE_CONFIGURE_ARGS+= -DSHARED_DIR=${VARBASE}/games/openttd
+CMAKE_CONFIGURE_ARGS+= -DGLOBAL_DIR=${PREFIX}/share/openttd
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_BINDIR=bin
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_DATADIR=share
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Allegro=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Grfcodec=ON
+CMAKE_CONFIGURE_ARGS+= -DOPTION_INSTALL_FHS=ON
PLIST_VARS= unix
.if ${OPSYS} != "Darwin"
Index: pkgsrc/games/oshu/Makefile
diff -u pkgsrc/games/oshu/Makefile:1.24 pkgsrc/games/oshu/Makefile:1.25
--- pkgsrc/games/oshu/Makefile:1.24 Sun Apr 7 07:34:03 2024
+++ pkgsrc/games/oshu/Makefile Sun Aug 25 06:18:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2024/04/07 07:34:03 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2024/08/25 06:18:46 wiz Exp $
DISTNAME= oshu-2.0.2
PKGREVISION= 11
@@ -16,7 +16,7 @@ USE_CMAKE= yes
LDFLAGS+= -lm # fmaf()
-CMAKE_ARGS+= -DOSHU_SKINS="minimal"
+CMAKE_CONFIGURE_ARGS+= -DOSHU_SKINS="minimal"
.include "../../devel/SDL2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
Index: pkgsrc/games/prboom-plus/Makefile
diff -u pkgsrc/games/prboom-plus/Makefile:1.17 pkgsrc/games/prboom-plus/Makefile:1.18
--- pkgsrc/games/prboom-plus/Makefile:1.17 Sat Apr 6 08:05:36 2024
+++ pkgsrc/games/prboom-plus/Makefile Sun Aug 25 06:18:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2024/04/06 08:05:36 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2024/08/25 06:18:46 wiz Exp $
DISTNAME= prboom-plus-2.6.66
PKGREVISION= 2
@@ -22,12 +22,12 @@ DOOMWADDIR= share/doom
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DPRBOOMDATADIR=${PREFIX}/${DOOMWADDIR}
-CMAKE_ARGS+= -DDOOMWADDIR=${PREFIX}/${DOOMWADDIR}
-CMAKE_ARGS+= -DWITH_DUMB=OFF
-CMAKE_ARGS+= -DWITH_FLUIDSYNTH=OFF
-CMAKE_ARGS+= -DWITH_PORTMIDI=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DPRBOOMDATADIR=${PREFIX}/${DOOMWADDIR}
+CMAKE_CONFIGURE_ARGS+= -DDOOMWADDIR=${PREFIX}/${DOOMWADDIR}
+CMAKE_CONFIGURE_ARGS+= -DWITH_DUMB=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_FLUIDSYNTH=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PORTMIDI=OFF
# Process INSTALL.pkgsrc
SUBST_CLASSES+= install
Index: pkgsrc/games/simgear/Makefile
diff -u pkgsrc/games/simgear/Makefile:1.165 pkgsrc/games/simgear/Makefile:1.166
--- pkgsrc/games/simgear/Makefile:1.165 Sun Jul 7 09:29:23 2024
+++ pkgsrc/games/simgear/Makefile Sun Aug 25 06:18:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.165 2024/07/07 09:29:23 nia Exp $
+# $NetBSD: Makefile,v 1.166 2024/08/25 06:18:46 wiz Exp $
DISTNAME= simgear-2020.3.11
PKGREVISION= 39
@@ -18,15 +18,15 @@ CONFIGURE_DIRS= sgbuild
BUILD_DIRS= sgbuild
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DSIMGEAR_SHARED=ON
-CMAKE_ARGS+= -DSYSTEM_EXPAT=ON
-CMAKE_ARGS+= -DSYSTEM_UDNS=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DSIMGEAR_SHARED=ON
+CMAKE_CONFIGURE_ARGS+= -DSYSTEM_EXPAT=ON
+CMAKE_CONFIGURE_ARGS+= -DSYSTEM_UDNS=ON
.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_ARCH} != "x86_64"
-CMAKE_ARGS+= -DENABLE_SIMD=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SIMD=OFF
.endif
LDFLAGS.SunOS+= -lsocket -lnsl
Index: pkgsrc/games/solarus/options.mk
diff -u pkgsrc/games/solarus/options.mk:1.3 pkgsrc/games/solarus/options.mk:1.4
--- pkgsrc/games/solarus/options.mk:1.3 Sun Jun 28 09:29:16 2020
+++ pkgsrc/games/solarus/options.mk Sun Aug 25 06:18:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2020/06/28 09:29:16 nia Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:46 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.solarus
@@ -12,9 +12,9 @@ PKG_SUGGESTED_OPTIONS= luajit
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mluajit)
-CMAKE_ARGS+= -DSOLARUS_USE_LUAJIT=ON
+CMAKE_CONFIGURE_ARGS+= -DSOLARUS_USE_LUAJIT=ON
. include "../../lang/LuaJIT2/buildlink3.mk"
.else
-CMAKE_ARGS+= -DSOLARUS_USE_LUAJIT=OFF
+CMAKE_CONFIGURE_ARGS+= -DSOLARUS_USE_LUAJIT=OFF
. include "../../lang/lua51/buildlink3.mk"
.endif
Index: pkgsrc/games/srb2/Makefile
diff -u pkgsrc/games/srb2/Makefile:1.13 pkgsrc/games/srb2/Makefile:1.14
--- pkgsrc/games/srb2/Makefile:1.13 Sat Apr 6 08:05:38 2024
+++ pkgsrc/games/srb2/Makefile Sun Aug 25 06:18:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2024/04/06 08:05:38 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2024/08/25 06:18:46 wiz Exp $
PKGNAME= srb2-2.2.4
PKGREVISION= 9
@@ -33,8 +33,8 @@ USE_TOOLS+= pkg-config
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DGME_INCLUDE_DIR=${BUILDLINK_DIR}/include
-CMAKE_ARGS+= -DSDL2_INCLUDE_DIR=${BUILDLINK_DIR}/include
+CMAKE_CONFIGURE_ARGS+= -DGME_INCLUDE_DIR=${BUILDLINK_DIR}/include
+CMAKE_CONFIGURE_ARGS+= -DSDL2_INCLUDE_DIR=${BUILDLINK_DIR}/include
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/games/supertux/Makefile
diff -u pkgsrc/games/supertux/Makefile:1.52 pkgsrc/games/supertux/Makefile:1.53
--- pkgsrc/games/supertux/Makefile:1.52 Wed May 29 16:32:44 2024
+++ pkgsrc/games/supertux/Makefile Sun Aug 25 06:18:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2024/05/29 16:32:44 adam Exp $
+# $NetBSD: Makefile,v 1.53 2024/08/25 06:18:46 wiz Exp $
PKGNAME= supertux-0.6.3
PKGREVISION= 9
@@ -13,8 +13,8 @@ COMMENT= 2D jump and run game in the st
LICENSE= gnu-gpl-v2
USE_CMAKE= yes
-CMAKE_ARGS+= -DINSTALL_SUBDIR_BIN=bin
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=off
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SUBDIR_BIN=bin
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=off
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++14
Index: pkgsrc/games/supertuxkart/Makefile
diff -u pkgsrc/games/supertuxkart/Makefile:1.56 pkgsrc/games/supertuxkart/Makefile:1.57
--- pkgsrc/games/supertuxkart/Makefile:1.56 Wed May 29 16:32:44 2024
+++ pkgsrc/games/supertuxkart/Makefile Sun Aug 25 06:18:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2024/05/29 16:32:44 adam Exp $
+# $NetBSD: Makefile,v 1.57 2024/08/25 06:18:46 wiz Exp $
DISTNAME= SuperTuxKart-1.4-src
PKGNAME= ${DISTNAME:tl:S/-src//}
@@ -18,15 +18,15 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= cmake pkg-config
-CMAKE_ARGS+= -DUSE_WIIUSE=OFF
-CMAKE_ARGS+= -DBUILD_RECORDER=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_WIIUSE=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_RECORDER=OFF
# "error: sorry, unimplemented: non-trivial designated initializers not supported"
# apparently gcc 8 should work.
USE_CXX_FEATURES+= c++20
# Needs linux joystick support.
-CMAKE_ARGS+= -DENABLE_WAYLAND_DEVICE=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WAYLAND_DEVICE=OFF
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
Index: pkgsrc/games/teeworlds/Makefile
diff -u pkgsrc/games/teeworlds/Makefile:1.32 pkgsrc/games/teeworlds/Makefile:1.33
--- pkgsrc/games/teeworlds/Makefile:1.32 Sat Apr 6 08:05:38 2024
+++ pkgsrc/games/teeworlds/Makefile Sun Aug 25 06:18:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2024/04/06 08:05:38 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2024/08/25 06:18:47 wiz Exp $
DISTNAME= teeworlds-0.7.5-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -16,7 +16,7 @@ USE_LANGUAGES= c c++
USE_CMAKE= yes
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
TOOL_DEPENDS+= icoutils-[0-9]*:../../graphics/icoutils
Index: pkgsrc/games/vcmi/Makefile
diff -u pkgsrc/games/vcmi/Makefile:1.2 pkgsrc/games/vcmi/Makefile:1.3
--- pkgsrc/games/vcmi/Makefile:1.2 Fri Aug 23 10:08:09 2024
+++ pkgsrc/games/vcmi/Makefile Sun Aug 25 06:18:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2024/08/23 10:08:09 nia Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:18:47 wiz Exp $
DISTNAME= vcmi-1.5.6
CATEGORIES= games
@@ -27,7 +27,7 @@ USE_CXX_FEATURES+= c++17
.include "../../mk/compiler.mk"
.if ${CC_VERSION:Mgcc-*}
-CMAKE_ARGS+= -DENABLE_PCH=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PCH=OFF
.endif
.include "../../mk/bsd.fast.prefs.mk"
Index: pkgsrc/games/vcmi/options.mk
diff -u pkgsrc/games/vcmi/options.mk:1.1 pkgsrc/games/vcmi/options.mk:1.2
--- pkgsrc/games/vcmi/options.mk:1.1 Mon Aug 12 11:19:25 2024
+++ pkgsrc/games/vcmi/options.mk Sun Aug 25 06:18:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2024/08/12 11:19:25 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:47 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.vcmi
@@ -24,8 +24,8 @@ PLIST.qt= yes
PLIST.qt= yes
. include "../../x11/qt5-qtbase/buildlink3.mk"
.else
-CMAKE_ARGS+= -DENABLE_LAUNCHER=OFF
-CMAKE_ARGS+= -DENABLE_EDITOR=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LAUNCHER=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_EDITOR=OFF
.endif
.if !empty(PKG_OPTIONS:Mluajit)
Index: pkgsrc/games/warzone2100/Makefile
diff -u pkgsrc/games/warzone2100/Makefile:1.82 pkgsrc/games/warzone2100/Makefile:1.83
--- pkgsrc/games/warzone2100/Makefile:1.82 Wed May 29 16:32:45 2024
+++ pkgsrc/games/warzone2100/Makefile Sun Aug 25 06:18:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2024/05/29 16:32:45 adam Exp $
+# $NetBSD: Makefile,v 1.83 2024/08/25 06:18:47 wiz Exp $
DISTNAME= warzone2100_src
PKGNAME= warzone2100-4.4.2
@@ -42,8 +42,8 @@ WRKSRC= ${WRKDIR}/warzone2100
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -DCMAKE_MAKE_PROGRAM=${MAKE_PROGRAM} -DWZ_DISTRIBUTOR=pkgsrc
-CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=1
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_MAKE_PROGRAM=${MAKE_PROGRAM} -DWZ_DISTRIBUTOR=pkgsrc
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=1
CFLAGS.NetBSD+= -D_NETBSD_SOURCE
CFLAGS.Darwin+= -fobjc-arc
Index: pkgsrc/games/wesnoth/Makefile
diff -u pkgsrc/games/wesnoth/Makefile:1.216 pkgsrc/games/wesnoth/Makefile:1.217
--- pkgsrc/games/wesnoth/Makefile:1.216 Mon Aug 12 18:25:18 2024
+++ pkgsrc/games/wesnoth/Makefile Sun Aug 25 06:18:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.216 2024/08/12 18:25:18 adam Exp $
+# $NetBSD: Makefile,v 1.217 2024/08/25 06:18:47 wiz Exp $
DISTNAME= wesnoth-1.18.2
CATEGORIES= games
@@ -17,9 +17,9 @@ USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= bash msgfmt perl:run pkg-config
# detects history.h, but does not link against libhistory
-CMAKE_ARGS+= -DENABLE_HISTORY=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_HISTORY=OFF
# if OPT is set, -O3 will not be added
-CMAKE_ARGS+= -DOPT="${DBG}"
+CMAKE_CONFIGURE_ARGS+= -DOPT="${DBG}"
UNLIMIT_RESOURCES+= datasize
UNLIMIT_RESOURCES+= stacksize
Index: pkgsrc/games/widelands/Makefile
diff -u pkgsrc/games/widelands/Makefile:1.41 pkgsrc/games/widelands/Makefile:1.42
--- pkgsrc/games/widelands/Makefile:1.41 Mon Jun 3 15:16:21 2024
+++ pkgsrc/games/widelands/Makefile Sun Aug 25 06:18:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2024/06/03 15:16:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2024/08/25 06:18:47 wiz Exp $
DISTNAME= widelands-build21-source
PKGNAME= widelands-21
@@ -21,8 +21,8 @@ FORCE_CXX_STD= c++17
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DWL_INSTALL_BASEDIR=${PREFIX}
-CMAKE_ARGS+= -DWL_INSTALL_DATADIR=${PREFIX}/share/widelands
+CMAKE_CONFIGURE_ARGS+= -DWL_INSTALL_BASEDIR=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DWL_INSTALL_DATADIR=${PREFIX}/share/widelands
BUILDLINK_TRANSFORM+= rm:-Werror=shadow
BUILDLINK_TRANSFORM+= rm:-Werror=uninitialized
Index: pkgsrc/games/woof/Makefile
diff -u pkgsrc/games/woof/Makefile:1.50 pkgsrc/games/woof/Makefile:1.51
--- pkgsrc/games/woof/Makefile:1.50 Wed Apr 17 16:58:25 2024
+++ pkgsrc/games/woof/Makefile Sun Aug 25 06:18:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2024/04/17 16:58:25 micha Exp $
+# $NetBSD: Makefile,v 1.51 2024/08/25 06:18:47 wiz Exp $
DISTNAME= woof_14.3.0
PKGNAME= ${DISTNAME:S/_/-/}
@@ -16,7 +16,7 @@ USE_CC_FEATURES= c99
USE_CMAKE= yes
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -G "Unix Makefiles" ..
+CMAKE_CONFIGURE_ARGS+= -G "Unix Makefiles" ..
CONFIGURE_DIRS= build
WRKSRC= ${WRKDIR}/woof-${DISTNAME}
Index: pkgsrc/geography/gdal-lib/Makefile
diff -u pkgsrc/geography/gdal-lib/Makefile:1.176 pkgsrc/geography/gdal-lib/Makefile:1.177
--- pkgsrc/geography/gdal-lib/Makefile:1.176 Fri Aug 16 11:58:38 2024
+++ pkgsrc/geography/gdal-lib/Makefile Sun Aug 25 06:18:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.176 2024/08/16 11:58:38 gdt Exp $
+# $NetBSD: Makefile,v 1.177 2024/08/25 06:18:47 wiz Exp $
.include "../../geography/gdal-lib/Makefile.common"
PKGNAME= ${DISTNAME:S/gdal/gdal-lib/}
@@ -56,12 +56,12 @@ CMAKE_CONFIGURE_ARGS+= -DGDAL_USE_ZSTD=O
# are to allow multiple python versions, and to remove the dependency
# on numpy and hence the need for blas and fortran from the base gdal
# package.
-CMAKE_ARGS+= -DBUILD_PYTHON_BINDINGS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PYTHON_BINDINGS=OFF
# Disable things that we don't want to build, more as documentation
# than them needing to be forced off.
-CMAKE_ARGS+= -DBUILD_CSHARP_BINDINGS=OFF
-CMAKE_ARGS+= -DBUILD_JAVA_BINDINGS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_CSHARP_BINDINGS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_JAVA_BINDINGS=OFF
# \todo One would think these are unnnecessary. Check if these
# can/should be dropped. If not, explain why we have some and not
Index: pkgsrc/geography/libmaxminddb/Makefile
diff -u pkgsrc/geography/libmaxminddb/Makefile:1.13 pkgsrc/geography/libmaxminddb/Makefile:1.14
--- pkgsrc/geography/libmaxminddb/Makefile:1.13 Mon Jun 17 09:29:10 2024
+++ pkgsrc/geography/libmaxminddb/Makefile Sun Aug 25 06:18:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2024/06/17 09:29:10 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2024/08/25 06:18:47 wiz Exp $
DISTNAME= libmaxminddb-1.10.0
CATEGORIES= geography
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
USE_TOOLS+= gmake
# cmake build doesn't install man pages yet
# https://github.com/maxmind/libmaxminddb/issues/351
-#CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
USE_CC_FEATURES= c99
Index: pkgsrc/geography/mapcode/Makefile
diff -u pkgsrc/geography/mapcode/Makefile:1.10 pkgsrc/geography/mapcode/Makefile:1.11
--- pkgsrc/geography/mapcode/Makefile:1.10 Thu Oct 21 12:06:15 2021
+++ pkgsrc/geography/mapcode/Makefile Sun Aug 25 06:18:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/10/21 12:06:15 gdt Exp $
+# $NetBSD: Makefile,v 1.11 2024/08/25 06:18:48 wiz Exp $
GITHUB_PROJECT= mapcode-cpp
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -17,7 +17,7 @@ USE_LANGUAGES= c c++
# Included CMakeLists is nonsensical
USE_CMAKE= yes
-CMAKE_ARGS+= -DCMAKE_BINARY_DIR=${WRKSRC}/build
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BINARY_DIR=${WRKSRC}/build
LDFLAGS+= -lm
Index: pkgsrc/geography/opencpn/Makefile
diff -u pkgsrc/geography/opencpn/Makefile:1.68 pkgsrc/geography/opencpn/Makefile:1.69
--- pkgsrc/geography/opencpn/Makefile:1.68 Wed May 29 16:32:47 2024
+++ pkgsrc/geography/opencpn/Makefile Sun Aug 25 06:18:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2024/05/29 16:32:47 adam Exp $
+# $NetBSD: Makefile,v 1.69 2024/08/25 06:18:48 wiz Exp $
DISTNAME= OpenCPN-5.0.0
PKGNAME= ${DISTNAME:S/OpenCPN/opencpn/}
@@ -18,9 +18,9 @@ USE_LANGUAGES= c c++11
USE_TOOLS+= gettext pkg-config
USE_CMAKE= yes
-CMAKE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
-CMAKE_ARGS+= -DBUNDLE_DOCS=ON -DBUNDLE_GSHHS=CRUDE -DBUNDLE_TCDATA=ON
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
+CMAKE_CONFIGURE_ARGS+= -DBUNDLE_DOCS=ON -DBUNDLE_GSHHS=CRUDE -DBUNDLE_TCDATA=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
CMAKE_MODULE_PATH_OVERRIDE = \
plugins/chartdldr_pi/CMakeLists.txt \
plugins/dashboard_pi/CMakeLists.txt \
Index: pkgsrc/geography/opencpn-plugin-debugger/Makefile
diff -u pkgsrc/geography/opencpn-plugin-debugger/Makefile:1.26 pkgsrc/geography/opencpn-plugin-debugger/Makefile:1.27
--- pkgsrc/geography/opencpn-plugin-debugger/Makefile:1.26 Sun Apr 7 07:34:06 2024
+++ pkgsrc/geography/opencpn-plugin-debugger/Makefile Sun Aug 25 06:18:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2024/04/07 07:34:06 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2024/08/25 06:18:48 wiz Exp $
#
VERSION= 20170414
@@ -18,7 +18,7 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
+CMAKE_CONFIGURE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginConfigure.cmake \
cmake/PluginInstall.cmake \
Index: pkgsrc/geography/opencpn-plugin-draw/Makefile
diff -u pkgsrc/geography/opencpn-plugin-draw/Makefile:1.35 pkgsrc/geography/opencpn-plugin-draw/Makefile:1.36
--- pkgsrc/geography/opencpn-plugin-draw/Makefile:1.35 Sun Apr 7 07:34:06 2024
+++ pkgsrc/geography/opencpn-plugin-draw/Makefile Sun Aug 25 06:18:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2024/04/07 07:34:06 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2024/08/25 06:18:48 wiz Exp $
#
VERSION= 1.6.8
@@ -18,7 +18,7 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES= c c++11
USE_CMAKE= yes
-CMAKE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
+CMAKE_CONFIGURE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginConfigure.cmake \
cmake/PluginInstall.cmake \
Index: pkgsrc/geography/opencpn-plugin-plots/Makefile
diff -u pkgsrc/geography/opencpn-plugin-plots/Makefile:1.11 pkgsrc/geography/opencpn-plugin-plots/Makefile:1.12
--- pkgsrc/geography/opencpn-plugin-plots/Makefile:1.11 Sun Apr 7 07:34:06 2024
+++ pkgsrc/geography/opencpn-plugin-plots/Makefile Sun Aug 25 06:18:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2024/04/07 07:34:06 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2024/08/25 06:18:48 wiz Exp $
#
VERSION= 2.2.12
@@ -18,7 +18,7 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c c++11
USE_CMAKE= yes
-CMAKE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
+CMAKE_CONFIGURE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginConfigure.cmake \
cmake/PluginInstall.cmake \
Index: pkgsrc/geography/opencpn-plugin-statusbar/Makefile
diff -u pkgsrc/geography/opencpn-plugin-statusbar/Makefile:1.24 pkgsrc/geography/opencpn-plugin-statusbar/Makefile:1.25
--- pkgsrc/geography/opencpn-plugin-statusbar/Makefile:1.24 Sun Apr 7 07:34:06 2024
+++ pkgsrc/geography/opencpn-plugin-statusbar/Makefile Sun Aug 25 06:18:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2024/04/07 07:34:06 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2024/08/25 06:18:48 wiz Exp $
VERSION= 20180405
PKGREVISION= 19
@@ -17,7 +17,7 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
+CMAKE_CONFIGURE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginConfigure.cmake \
cmake/PluginInstall.cmake \
Index: pkgsrc/geography/opencpn-plugin-watchdog/Makefile
diff -u pkgsrc/geography/opencpn-plugin-watchdog/Makefile:1.34 pkgsrc/geography/opencpn-plugin-watchdog/Makefile:1.35
--- pkgsrc/geography/opencpn-plugin-watchdog/Makefile:1.34 Sun Apr 7 07:34:06 2024
+++ pkgsrc/geography/opencpn-plugin-watchdog/Makefile Sun Aug 25 06:18:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2024/04/07 07:34:06 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2024/08/25 06:18:48 wiz Exp $
#
VERSION= 2.4.6
@@ -18,7 +18,7 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c c++11
USE_CMAKE= yes
-CMAKE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
+CMAKE_CONFIGURE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
CMAKE_MODULE_PATH_OVERRIDE= \
cmake/PluginConfigure.cmake \
cmake/PluginInstall.cmake \
Index: pkgsrc/geography/opencpn-plugin-weather_routing/Makefile
diff -u pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.35 pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.36
--- pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.35 Sun Apr 7 07:34:06 2024
+++ pkgsrc/geography/opencpn-plugin-weather_routing/Makefile Sun Aug 25 06:18:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2024/04/07 07:34:06 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2024/08/25 06:18:48 wiz Exp $
#
VERSION= 20180827
@@ -19,7 +19,7 @@ USE_LANGUAGES= c c++
USE_TOOLS= gettext
USE_CMAKE= yes
-CMAKE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
+CMAKE_CONFIGURE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginConfigure.cmake \
cmake/PluginInstall.cmake \
Index: pkgsrc/geography/osm2pgsql/Makefile
diff -u pkgsrc/geography/osm2pgsql/Makefile:1.47 pkgsrc/geography/osm2pgsql/Makefile:1.48
--- pkgsrc/geography/osm2pgsql/Makefile:1.47 Wed May 29 16:32:48 2024
+++ pkgsrc/geography/osm2pgsql/Makefile Sun Aug 25 06:18:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2024/05/29 16:32:48 adam Exp $
+# $NetBSD: Makefile,v 1.48 2024/08/25 06:18:49 wiz Exp $
DISTNAME= osm2pgsql-1.3.0
PKGREVISION= 17
@@ -21,7 +21,7 @@ post-extract:
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -DBUILD_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=ON
TEST_TARGET= test
.include "../../geography/proj/buildlink3.mk"
Index: pkgsrc/geography/pdal-lib/Makefile
diff -u pkgsrc/geography/pdal-lib/Makefile:1.31 pkgsrc/geography/pdal-lib/Makefile:1.32
--- pkgsrc/geography/pdal-lib/Makefile:1.31 Wed May 29 16:32:48 2024
+++ pkgsrc/geography/pdal-lib/Makefile Sun Aug 25 06:18:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2024/05/29 16:32:48 adam Exp $
+# $NetBSD: Makefile,v 1.32 2024/08/25 06:18:49 wiz Exp $
DISTNAME= PDAL-2.7.1-src
PKGNAME= ${DISTNAME:S/PDAL/pdal-lib/:S/-src//}
@@ -26,30 +26,30 @@ PKGCONFIG_OVERRIDE+= apps/pdal.pc.in
PKGCONFIG_OVERRIDE+= vendor/gtest/cmake/gtest.pc.in
PKGCONFIG_OVERRIDE+= vendor/gtest/cmake/gtest_main.pc.in
-CMAKE_ARGS+= -DBUILD_PLUGIN_CPD=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_E57=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_FBX=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_GEOWAVE=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_HDF=ON
-CMAKE_ARGS+= -DBUILD_PLUGIN_I3S=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_ICEBRIDGE=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_MATLAB=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_MBIO=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_MRSID=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_NITF=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_OCI=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_OPENSCENEGRAPH=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_PGPOINTCLOUD=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_RDBLIB=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_RIVLIB=OFF
-CMAKE_ARGS+= -DBUILD_PLUGIN_TILEDB=OFF
-
-CMAKE_ARGS+= -DWITH_COMPLETION=OFF
-CMAKE_ARGS+= -DWITH_LASZIP=ON
-CMAKE_ARGS+= -DWITH_LAZPERF=OFF
-CMAKE_ARGS+= -DWITH_LZMA=ON
-CMAKE_ARGS+= -DWITH_ZLIB=ON
-CMAKE_ARGS+= -DWITH_ZSTD=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_CPD=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_E57=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_FBX=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_GEOWAVE=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_HDF=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_I3S=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_ICEBRIDGE=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_MATLAB=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_MBIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_MRSID=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_NITF=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_OCI=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_OPENSCENEGRAPH=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_PGPOINTCLOUD=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_RDBLIB=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_RIVLIB=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGIN_TILEDB=OFF
+
+CMAKE_CONFIGURE_ARGS+= -DWITH_COMPLETION=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_LASZIP=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_LAZPERF=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_LZMA=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ZLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ZSTD=ON
.include "../../archivers/xz/buildlink3.mk"
.include "../../archivers/zstd/buildlink3.mk"
Index: pkgsrc/geography/qgis/Makefile
diff -u pkgsrc/geography/qgis/Makefile:1.219 pkgsrc/geography/qgis/Makefile:1.220
--- pkgsrc/geography/qgis/Makefile:1.219 Sat Aug 24 00:07:05 2024
+++ pkgsrc/geography/qgis/Makefile Sun Aug 25 06:18:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.219 2024/08/24 00:07:05 gdt Exp $
+# $NetBSD: Makefile,v 1.220 2024/08/25 06:18:49 wiz Exp $
# This is intentionally 3.34 Long Term Release. Please do not update
# to later branches, and instead discuss whether/how we want multiple
@@ -62,18 +62,18 @@ SUBST_SED.pyqt+= -e '/^ *SET/s,pyuic5,&-
SUBST_SED.pyqt+= -e '/^ *SET/s,pyrcc5,&-${PYVERSSUFFIX},'
SUBST_SED.pyqt+= -e '/ *FIND_PROGRAM(__pyuic5 /s,"pyuic5,&-${PYVERSSUFFIX},'
-CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=TRUE
-CMAKE_ARGS+= -DWITH_INTERNAL_MARKUPSAFE=FALSE
+CMAKE_CONFIGURE_ARGS+= -DWITH_BINDINGS:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DWITH_INTERNAL_MARKUPSAFE=FALSE
# \todo Understand what draco is and perhaps add to pkgsrc.
-CMAKE_ARGS+= -DWITH_DRACO=FALSE
+CMAKE_CONFIGURE_ARGS+= -DWITH_DRACO=FALSE
# \todo Understand and probably add.
-CMAKE_ARGS+= -DWITH_3D=FALSE
+CMAKE_CONFIGURE_ARGS+= -DWITH_3D=FALSE
# Server support is WIP; it has merely been tested that regular use
# has not been broken.
-CMAKE_ARGS+= -DWITH_SERVER:BOOL=TRUE
-CMAKE_ARGS+= -DQGIS_CGIBIN_SUBDIR=libexec/cgi-bin
+CMAKE_CONFIGURE_ARGS+= -DWITH_SERVER:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DQGIS_CGIBIN_SUBDIR=libexec/cgi-bin
PYTHON_VERSIONS_INCOMPATIBLE= 27 38
@@ -90,10 +90,10 @@ DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../
# for metasearch
DEPENDS+= ${PYPKGPREFIX}-owslib-[0-9]*:../../geography/py-owslib
-CMAKE_ARGS+= -DWITH_QTWEBKIT=FALSE
-CMAKE_ARGS+= -DQWT_DIR=${QWT_DIR}
+CMAKE_CONFIGURE_ARGS+= -DWITH_QTWEBKIT=FALSE
+CMAKE_CONFIGURE_ARGS+= -DQWT_DIR=${QWT_DIR}
# uncomment to tell cmake not to hide build commands (i.e., to show them)
-#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=TRUE
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=TRUE
# \todo Hoist this to become a general facility where a variable controls
# actually showing build output.
Index: pkgsrc/graphics/OpenJPH/Makefile
diff -u pkgsrc/graphics/OpenJPH/Makefile:1.2 pkgsrc/graphics/OpenJPH/Makefile:1.3
--- pkgsrc/graphics/OpenJPH/Makefile:1.2 Sun Jul 7 09:25:40 2024
+++ pkgsrc/graphics/OpenJPH/Makefile Sun Aug 25 06:18:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2024/07/07 09:25:40 nia Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:18:49 wiz Exp $
DISTNAME= OpenJPH-0.10.0
CATEGORIES= graphics
@@ -17,8 +17,8 @@ PKGCONFIG_OVERRIDE_STAGE= post-build
.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_ARCH} != "x86_64"
-CMAKE_ARGS+= -DOJPH_DISABLE_INTEL_SIMD=ON
-CMAKE_ARGS+= -DOJPH_ENABLE_INTEL_AVX512=OFF
+CMAKE_CONFIGURE_ARGS+= -DOJPH_DISABLE_INTEL_SIMD=ON
+CMAKE_CONFIGURE_ARGS+= -DOJPH_ENABLE_INTEL_AVX512=OFF
.endif
.include "../../devel/cmake/build.mk"
Index: pkgsrc/graphics/blender/Makefile
diff -u pkgsrc/graphics/blender/Makefile:1.219 pkgsrc/graphics/blender/Makefile:1.220
--- pkgsrc/graphics/blender/Makefile:1.219 Sun Jul 21 20:54:14 2024
+++ pkgsrc/graphics/blender/Makefile Sun Aug 25 06:18:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.219 2024/07/21 20:54:14 markd Exp $
+# $NetBSD: Makefile,v 1.220 2024/08/25 06:18:49 wiz Exp $
DISTNAME= blender-4.1.1
CATEGORIES= graphics
@@ -21,40 +21,40 @@ CXXFLAGS+= -fpermissive # return value t
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DWITH_MEM_JEMALLOC=OFF
-CMAKE_ARGS+= -DWITH_PYTHON_INSTALL=OFF
-CMAKE_ARGS+= -DWITH_INSTALL_PORTABLE=OFF
-
-CMAKE_ARGS+= -DWITH_BULLET=OFF
-CMAKE_ARGS+= -DWITH_OPENCOLORIO=ON
-CMAKE_ARGS+= -DWITH_FFTW3=ON
-CMAKE_ARGS+= -DWITH_SDL=ON
-CMAKE_ARGS+= -DWITH_SDL_DYNLOAD=OFF
-CMAKE_ARGS+= -DWITH_CODEC_FFMPEG=ON
-CMAKE_ARGS+= -DFFMPEG_AVCODEC_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavcodec.so
-CMAKE_ARGS+= -DFFMPEG_AVDEVICE_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavdevice.so
-CMAKE_ARGS+= -DFFMPEG_AVFILTER_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavfilter.so
-CMAKE_ARGS+= -DFFMPEG_AVFORMAT_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavformat.so
-CMAKE_ARGS+= -DFFMPEG_AVUTIL_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavutil.so
-CMAKE_ARGS+= -DFFMPEG_SWSCALE_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libswscale.so
-CMAKE_ARGS+= -DFFMPEG_SWRESAMPLE_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libswresample.so
-CMAKE_ARGS+= -D_ffmpeg_INCLUDE_DIR=${BUILDLINK_DIR}/include/ffmpeg6
-CMAKE_ARGS+= -DWITH_CODEC_SNDFILE=ON
-CMAKE_ARGS+= -DWITH_SYSTEM_GLEW=ON
-CMAKE_ARGS+= -DWITH_CYCLES_EMBREE=OFF
-CMAKE_ARGS+= -DWITH_POTRACE=OFF
-
-CMAKE_ARGS+= -DPYTHON_VERSION=${PYVERSSUFFIX}
-CMAKE_ARGS+= -DWITH_PYTHON_INSTALL_NUMPY=OFF
-CMAKE_ARGS+= -DWITH_PYTHON_INSTALL_REQUESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_MEM_JEMALLOC=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PYTHON_INSTALL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_INSTALL_PORTABLE=OFF
+
+CMAKE_CONFIGURE_ARGS+= -DWITH_BULLET=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_OPENCOLORIO=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_FFTW3=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_SDL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_SDL_DYNLOAD=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_CODEC_FFMPEG=ON
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_AVCODEC_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavcodec.so
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_AVDEVICE_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavdevice.so
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_AVFILTER_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavfilter.so
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_AVFORMAT_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavformat.so
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_AVUTIL_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavutil.so
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_SWSCALE_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libswscale.so
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_SWRESAMPLE_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libswresample.so
+CMAKE_CONFIGURE_ARGS+= -D_ffmpeg_INCLUDE_DIR=${BUILDLINK_DIR}/include/ffmpeg6
+CMAKE_CONFIGURE_ARGS+= -DWITH_CODEC_SNDFILE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_SYSTEM_GLEW=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_CYCLES_EMBREE=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_POTRACE=OFF
+
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_VERSION=${PYVERSSUFFIX}
+CMAKE_CONFIGURE_ARGS+= -DWITH_PYTHON_INSTALL_NUMPY=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PYTHON_INSTALL_REQUESTS=OFF
-CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=ON
.include "../../graphics/MesaLib/buildlink3.mk"
.if ${MESALIB_SUPPORTS_EGL} == "yes"
-#CMAKE_ARGS+= -DWITH_GL_EGL=ON
+#CMAKE_CONFIGURE_ARGS+= -DWITH_GL_EGL=ON
.endif
PLIST_SUBST+= BLENDERVER=${PKGVERSION_NOREV:C/[a-z]//}
Index: pkgsrc/graphics/blender/options.mk
diff -u pkgsrc/graphics/blender/options.mk:1.9 pkgsrc/graphics/blender/options.mk:1.10
--- pkgsrc/graphics/blender/options.mk:1.9 Fri Feb 4 16:47:52 2022
+++ pkgsrc/graphics/blender/options.mk Sun Aug 25 06:18:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2022/02/04 16:47:52 ryoon Exp $
+# $NetBSD: options.mk,v 1.10 2024/08/25 06:18:49 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.blender
PKG_SUPPORTED_OPTIONS= jack pulseaudio
@@ -6,17 +6,17 @@ PKG_SUPPORTED_OPTIONS= jack pulseaudio
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mjack)
-CMAKE_ARGS+= -DWITH_JACK=ON
-CMAKE_ARGS+= -DWITH_JACK_DYNLOAD=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_JACK=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_JACK_DYNLOAD=OFF
.include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_JACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_JACK=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -DWITH_PULSEAUDIO=ON
-CMAKE_ARGS+= -DWITH_PULSEAUDIO_DYNLOAD=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PULSEAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PULSEAUDIO_DYNLOAD=OFF
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_PULSEAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PULSEAUDIO=OFF
.endif
Index: pkgsrc/graphics/blender-lts/Makefile
diff -u pkgsrc/graphics/blender-lts/Makefile:1.44 pkgsrc/graphics/blender-lts/Makefile:1.45
--- pkgsrc/graphics/blender-lts/Makefile:1.44 Mon Jun 17 13:55:45 2024
+++ pkgsrc/graphics/blender-lts/Makefile Sun Aug 25 06:18:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2024/06/17 13:55:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.45 2024/08/25 06:18:49 wiz Exp $
DISTNAME= blender-3.6.12
CATEGORIES= graphics
@@ -21,38 +21,38 @@ CXXFLAGS+= -fpermissive # return value t
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DWITH_MEM_JEMALLOC=OFF
-CMAKE_ARGS+= -DWITH_PYTHON_INSTALL=OFF
-CMAKE_ARGS+= -DWITH_INSTALL_PORTABLE=OFF
-
-CMAKE_ARGS+= -DWITH_BULLET=OFF
-CMAKE_ARGS+= -DWITH_OPENCOLORIO=ON
-CMAKE_ARGS+= -DWITH_FFTW3=ON
-CMAKE_ARGS+= -DWITH_SDL=ON
-CMAKE_ARGS+= -DWITH_SDL_DYNLOAD=OFF
-CMAKE_ARGS+= -DWITH_CODEC_FFMPEG=ON
-CMAKE_ARGS+= -DFFMPEG_AVCODEC_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavcodec.so
-CMAKE_ARGS+= -DFFMPEG_AVDEVICE_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavdevice.so
-CMAKE_ARGS+= -DFFMPEG_AVFILTER_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavfilter.so
-CMAKE_ARGS+= -DFFMPEG_AVFORMAT_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavformat.so
-CMAKE_ARGS+= -DFFMPEG_AVUTIL_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavutil.so
-CMAKE_ARGS+= -DFFMPEG_SWSCALE_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libswscale.so
-CMAKE_ARGS+= -DFFMPEG_SWRESAMPLE_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libswresample.so
-CMAKE_ARGS+= -D_ffmpeg_INCLUDE_DIR=${BUILDLINK_DIR}/include/ffmpeg6
-CMAKE_ARGS+= -DWITH_CODEC_SNDFILE=ON
-CMAKE_ARGS+= -DWITH_SYSTEM_GLEW=ON
-CMAKE_ARGS+= -DWITH_CYCLES_EMBREE=OFF
-CMAKE_ARGS+= -DWITH_POTRACE=OFF
-
-CMAKE_ARGS+= -DPYTHON_VERSION=${PYVERSSUFFIX}
-CMAKE_ARGS+= -DWITH_PYTHON_INSTALL_NUMPY=OFF
-CMAKE_ARGS+= -DWITH_PYTHON_INSTALL_REQUESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_MEM_JEMALLOC=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PYTHON_INSTALL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_INSTALL_PORTABLE=OFF
+
+CMAKE_CONFIGURE_ARGS+= -DWITH_BULLET=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_OPENCOLORIO=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_FFTW3=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_SDL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_SDL_DYNLOAD=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_CODEC_FFMPEG=ON
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_AVCODEC_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavcodec.so
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_AVDEVICE_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavdevice.so
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_AVFILTER_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavfilter.so
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_AVFORMAT_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavformat.so
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_AVUTIL_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libavutil.so
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_SWSCALE_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libswscale.so
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_SWRESAMPLE_LIBRARY=${BUILDLINK_DIR}/lib/ffmpeg6/libswresample.so
+CMAKE_CONFIGURE_ARGS+= -D_ffmpeg_INCLUDE_DIR=${BUILDLINK_DIR}/include/ffmpeg6
+CMAKE_CONFIGURE_ARGS+= -DWITH_CODEC_SNDFILE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_SYSTEM_GLEW=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_CYCLES_EMBREE=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_POTRACE=OFF
+
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_VERSION=${PYVERSSUFFIX}
+CMAKE_CONFIGURE_ARGS+= -DWITH_PYTHON_INSTALL_NUMPY=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PYTHON_INSTALL_REQUESTS=OFF
.include "../../graphics/MesaLib/buildlink3.mk"
.if ${MESALIB_SUPPORTS_EGL} == "yes"
-#CMAKE_ARGS+= -DWITH_GL_EGL=ON
+#CMAKE_CONFIGURE_ARGS+= -DWITH_GL_EGL=ON
.endif
PLIST_SUBST+= BLENDERVER=${PKGVERSION_NOREV:C/[a-z]//}
Index: pkgsrc/graphics/blender-lts/options.mk
diff -u pkgsrc/graphics/blender-lts/options.mk:1.3 pkgsrc/graphics/blender-lts/options.mk:1.4
--- pkgsrc/graphics/blender-lts/options.mk:1.3 Sun Feb 11 15:29:58 2024
+++ pkgsrc/graphics/blender-lts/options.mk Sun Aug 25 06:18:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2024/02/11 15:29:58 ryoon Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:49 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.blender
PKG_SUPPORTED_OPTIONS= jack pulseaudio
@@ -6,17 +6,17 @@ PKG_SUPPORTED_OPTIONS= jack pulseaudio
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mjack)
-CMAKE_ARGS+= -DWITH_JACK=ON
-CMAKE_ARGS+= -DWITH_JACK_DYNLOAD=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_JACK=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_JACK_DYNLOAD=OFF
.include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_JACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_JACK=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -DWITH_PULSEAUDIO=ON
-CMAKE_ARGS+= -DWITH_PULSEAUDIO_DYNLOAD=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PULSEAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PULSEAUDIO_DYNLOAD=OFF
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_PULSEAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PULSEAUDIO=OFF
.endif
Index: pkgsrc/graphics/box2d/Makefile
diff -u pkgsrc/graphics/box2d/Makefile:1.4 pkgsrc/graphics/box2d/Makefile:1.5
--- pkgsrc/graphics/box2d/Makefile:1.4 Sun Aug 11 06:39:04 2024
+++ pkgsrc/graphics/box2d/Makefile Sun Aug 25 06:18:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/08/11 06:39:04 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2024/08/25 06:18:49 wiz Exp $
DISTNAME= box2d-2.4.2
CATEGORIES= graphics
@@ -12,9 +12,9 @@ LICENSE= mit
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBOX2D_BUILD_UNIT_TESTS=OFF
-CMAKE_ARGS+= -DBOX2D_BUILD_TESTBED=OFF
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBOX2D_BUILD_UNIT_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBOX2D_BUILD_TESTBED=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
.include "../../devel/cmake/build.mk"
.include "../../x11/libX11/buildlink3.mk"
Index: pkgsrc/graphics/charls/Makefile
diff -u pkgsrc/graphics/charls/Makefile:1.6 pkgsrc/graphics/charls/Makefile:1.7
--- pkgsrc/graphics/charls/Makefile:1.6 Sat Oct 21 11:20:23 2023
+++ pkgsrc/graphics/charls/Makefile Sun Aug 25 06:18:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/10/21 11:20:23 nros Exp $
+# $NetBSD: Makefile,v 1.7 2024/08/25 06:18:49 wiz Exp $
DISTNAME= charls-2.4.2
CATEGORIES= graphics
@@ -12,8 +12,8 @@ LICENSE= modified-bsd
USE_LANGUAGES= c c++
USE_CXX_FEATURES+= c++14
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
PKGCONFIG_OVERRIDE= src/charls-template.pc
Index: pkgsrc/graphics/darktable/Makefile
diff -u pkgsrc/graphics/darktable/Makefile:1.157 pkgsrc/graphics/darktable/Makefile:1.158
--- pkgsrc/graphics/darktable/Makefile:1.157 Wed May 29 16:32:50 2024
+++ pkgsrc/graphics/darktable/Makefile Sun Aug 25 06:18:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.157 2024/05/29 16:32:50 adam Exp $
+# $NetBSD: Makefile,v 1.158 2024/08/25 06:18:50 wiz Exp $
DISTNAME= darktable-4.4.2
PKGREVISION= 12
@@ -29,20 +29,20 @@ REPLACE_BASH+= tools/purge_unused_tags.s
CFLAGS+= -Wno-reserved-id-macro
-CMAKE_ARGS+= -DLENSFUN_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include/lensfun
-CMAKE_ARGS+= -DGTHREAD_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include
-CMAKE_ARGS+= -DGMODULE_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include
+CMAKE_CONFIGURE_ARGS+= -DLENSFUN_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include/lensfun
+CMAKE_CONFIGURE_ARGS+= -DGTHREAD_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include
+CMAKE_CONFIGURE_ARGS+= -DGMODULE_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include
# Honour system CFLAGS.
-CMAKE_ARGS+= -DCUSTOM_CFLAGS=ON
-CMAKE_ARGS+= -DUSE_OPENCL=OFF
-CMAKE_ARGS+= -DUSE_OPENMP=OFF
-
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DBINARY_PACKAGE_BUILD=Yes
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DUSE_COLORD=OFF
-CMAKE_ARGS+= -DRAWSPEED_ENABLE_WERROR=OFF
-CMAKE_ARGS+= -DTESTBUILD_OPENCL_PROGRAMS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCUSTOM_CFLAGS=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_OPENCL=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_OPENMP=OFF
+
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DBINARY_PACKAGE_BUILD=Yes
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DUSE_COLORD=OFF
+CMAKE_CONFIGURE_ARGS+= -DRAWSPEED_ENABLE_WERROR=OFF
+CMAKE_CONFIGURE_ARGS+= -DTESTBUILD_OPENCL_PROGRAMS=OFF
CONFIGURE_DIRS= ../pkgsrc_build
CMAKE_ARG_PATH= ${WRKSRC}
@@ -55,7 +55,7 @@ CFLAGS+= -mstackrealign -msse2 -march=i6
.elif ${MACHINE_ARCH} == "x86_64"
CFLAGS+= -msse2
.else
-CMAKE_ARGS+= -DBUILD_SSE2_CODEPATHS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SSE2_CODEPATHS=OFF
.endif
CFLAGS.NetBSD+= -D_NETBSD_SOURCE
Index: pkgsrc/graphics/drawpile/Makefile
diff -u pkgsrc/graphics/drawpile/Makefile:1.25 pkgsrc/graphics/drawpile/Makefile:1.26
--- pkgsrc/graphics/drawpile/Makefile:1.25 Wed May 29 16:32:51 2024
+++ pkgsrc/graphics/drawpile/Makefile Sun Aug 25 06:18:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/05/29 16:32:51 adam Exp $
+# $NetBSD: Makefile,v 1.26 2024/08/25 06:18:50 wiz Exp $
DISTNAME= Drawpile-2.1.17
PKGNAME= ${DISTNAME:tl}
@@ -18,7 +18,7 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DINITSYS=""
+CMAKE_CONFIGURE_ARGS+= -DINITSYS=""
.include "../../archivers/karchive/buildlink3.mk"
.include "../../graphics/giflib/buildlink3.mk"
Index: pkgsrc/graphics/exiv2/Makefile
diff -u pkgsrc/graphics/exiv2/Makefile:1.65 pkgsrc/graphics/exiv2/Makefile:1.66
--- pkgsrc/graphics/exiv2/Makefile:1.65 Sun Jul 14 12:59:11 2024
+++ pkgsrc/graphics/exiv2/Makefile Sun Aug 25 06:18:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2024/07/14 12:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2024/08/25 06:18:50 wiz Exp $
DISTNAME= exiv2-0.28.3
CATEGORIES= graphics
@@ -19,11 +19,11 @@ USE_CXX_FEATURES+= filesystem
.include "../../mk/bsd.prefs.mk"
-CMAKE_ARGS+= -DEXIV2_BUILD_SAMPLES:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DEXIV2_BUILD_SAMPLES:BOOL=OFF
# turn on BMFF support -- will be default as of 1.00
-CMAKE_ARGS+= -DEXIV2_ENABLE_BMFF:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DEXIV2_ENABLE_BMFF:BOOL=ON
.if ${OPSYS} == "Darwin"
-CMAKE_ARGS+= -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
+CMAKE_CONFIGURE_ARGS+= -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
.endif
LDFLAGS.Linux+= -ldl
Index: pkgsrc/graphics/freeglut/Makefile
diff -u pkgsrc/graphics/freeglut/Makefile:1.36 pkgsrc/graphics/freeglut/Makefile:1.37
--- pkgsrc/graphics/freeglut/Makefile:1.36 Sat Apr 6 08:05:45 2024
+++ pkgsrc/graphics/freeglut/Makefile Sun Aug 25 06:18:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2024/04/06 08:05:45 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2024/08/25 06:18:50 wiz Exp $
DISTNAME= freeglut-3.4.0
PKGREVISION= 1
@@ -13,9 +13,9 @@ LICENSE= x11
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DFREEGLUT_BUILD_DEMOS=OFF
-CMAKE_ARGS+= -DFREEGLUT_REPLACE_GLUT=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DFREEGLUT_BUILD_DEMOS=OFF
+CMAKE_CONFIGURE_ARGS+= -DFREEGLUT_REPLACE_GLUT=ON
PKGCONFIG_OVERRIDE= freeglut.pc.in
Index: pkgsrc/graphics/freeglut/options.mk
diff -u pkgsrc/graphics/freeglut/options.mk:1.1 pkgsrc/graphics/freeglut/options.mk:1.2
--- pkgsrc/graphics/freeglut/options.mk:1.1 Thu Oct 3 11:17:51 2019
+++ pkgsrc/graphics/freeglut/options.mk Sun Aug 25 06:18:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2019/10/03 11:17:51 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:50 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.freeglut
PKG_OPTIONS_REQUIRED_GROUPS= ui
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS= x11
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mwayland)
-CMAKE_ARGS+= -DFREEGLUT_WAYLAND=ON
+CMAKE_CONFIGURE_ARGS+= -DFREEGLUT_WAYLAND=ON
.include "../../devel/wayland/buildlink3.mk"
.include "../../x11/libxkbcommon/buildlink3.mk"
.endif
Index: pkgsrc/graphics/glad/Makefile
diff -u pkgsrc/graphics/glad/Makefile:1.5 pkgsrc/graphics/glad/Makefile:1.6
--- pkgsrc/graphics/glad/Makefile:1.5 Mon Oct 23 06:37:46 2023
+++ pkgsrc/graphics/glad/Makefile Sun Aug 25 06:18:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/10/23 06:37:46 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2024/08/25 06:18:50 wiz Exp $
DISTNAME= glad-0.1.34
PKGREVISION= 2
@@ -13,9 +13,9 @@ LICENSE= mit
USE_CMAKE= yes
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DGLAD_REPRODUCIBLE=ON
-CMAKE_ARGS+= -DGLAD_INSTALL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DGLAD_REPRODUCIBLE=ON
+CMAKE_CONFIGURE_ARGS+= -DGLAD_INSTALL=ON
PYTHON_FOR_BUILD_ONLY= tool
Index: pkgsrc/graphics/glfw/Makefile
diff -u pkgsrc/graphics/glfw/Makefile:1.14 pkgsrc/graphics/glfw/Makefile:1.15
--- pkgsrc/graphics/glfw/Makefile:1.14 Sat Apr 6 08:05:45 2024
+++ pkgsrc/graphics/glfw/Makefile Sun Aug 25 06:18:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2024/04/06 08:05:45 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2024/08/25 06:18:50 wiz Exp $
DISTNAME= glfw-3.3.8
PKGREVISION= 1
@@ -12,9 +12,9 @@ LICENSE= zlib
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DGLFW_BUILD_DOCS=OFF
-CMAKE_ARGS+= -DGLFW_BUILD_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DGLFW_BUILD_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DGLFW_BUILD_EXAMPLES=OFF
PKGCONFIG_OVERRIDE+= src/glfw3.pc.in
Index: pkgsrc/graphics/glfw/options.mk
diff -u pkgsrc/graphics/glfw/options.mk:1.1 pkgsrc/graphics/glfw/options.mk:1.2
--- pkgsrc/graphics/glfw/options.mk:1.1 Thu Mar 19 11:23:53 2020
+++ pkgsrc/graphics/glfw/options.mk Sun Aug 25 06:18:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/03/19 11:23:53 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:50 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.glfw
@@ -13,11 +13,11 @@ PKG_SUGGESTED_OPTIONS= x11
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mosmesa)
-CMAKE_ARGS+= -DGLFW_USE_OSMESA=ON
+CMAKE_CONFIGURE_ARGS+= -DGLFW_USE_OSMESA=ON
.endif
.if !empty(PKG_OPTIONS:Mwayland)
-CMAKE_ARGS+= -DGLFW_USE_WAYLAND=ON
+CMAKE_CONFIGURE_ARGS+= -DGLFW_USE_WAYLAND=ON
. include "../../devel/wayland/buildlink3.mk"
. include "../../devel/wayland-protocols/buildlink3.mk"
. include "../../x11/libxkbcommon/buildlink3.mk"
Index: pkgsrc/graphics/gmic-qt-digikam/Makefile
diff -u pkgsrc/graphics/gmic-qt-digikam/Makefile:1.10 pkgsrc/graphics/gmic-qt-digikam/Makefile:1.11
--- pkgsrc/graphics/gmic-qt-digikam/Makefile:1.10 Wed May 29 16:32:53 2024
+++ pkgsrc/graphics/gmic-qt-digikam/Makefile Sun Aug 25 06:18:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2024/05/29 16:32:53 adam Exp $
+# $NetBSD: Makefile,v 1.11 2024/08/25 06:18:50 wiz Exp $
DISTNAME= gmic-qt-digikam-3.2.2.20230417
PKGREVISION= 9
@@ -15,8 +15,8 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c c++
USE_TOOLS+= gmake bash:build
-CMAKE_ARGS+= -DENABLE_SYSTEM_GMIC=OFF
-CMAKE_ARGS+= -DGMIC_QT_HOST=digikam
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SYSTEM_GMIC=OFF
+CMAKE_CONFIGURE_ARGS+= -DGMIC_QT_HOST=digikam
REPLACE_BASH+= translations/lrelease.sh
Index: pkgsrc/graphics/hugin/Makefile
diff -u pkgsrc/graphics/hugin/Makefile:1.146 pkgsrc/graphics/hugin/Makefile:1.147
--- pkgsrc/graphics/hugin/Makefile:1.146 Wed May 29 16:32:55 2024
+++ pkgsrc/graphics/hugin/Makefile Sun Aug 25 06:18:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.146 2024/05/29 16:32:55 adam Exp $
+# $NetBSD: Makefile,v 1.147 2024/08/25 06:18:50 wiz Exp $
DISTNAME= hugin-2023.0.0
PKGREVISION= 4
@@ -19,7 +19,7 @@ USE_LANGUAGES= c c++
USE_TOOLS+= msgfmt pkg-config
CONFIGURE_ENV+= MANDIR=${PKGMANDIR}
-CMAKE_ARGS+= -DBUILD_HSI=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_HSI=ON
PY_PATCHPLIST= yes
REPLACE_PYTHON+= src/hugin_script_interface/*.py
Index: pkgsrc/graphics/inkscape/Makefile
diff -u pkgsrc/graphics/inkscape/Makefile:1.288 pkgsrc/graphics/inkscape/Makefile:1.289
--- pkgsrc/graphics/inkscape/Makefile:1.288 Wed May 29 16:32:55 2024
+++ pkgsrc/graphics/inkscape/Makefile Sun Aug 25 06:18:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.288 2024/05/29 16:32:55 adam Exp $
+# $NetBSD: Makefile,v 1.289 2024/08/25 06:18:51 wiz Exp $
DISTNAME= inkscape-1.3.2
PKGREVISION= 4
@@ -75,13 +75,13 @@ CHECK_INTERPRETER_SKIP+= share/inkscape/
CHECK_PORTABILITY_SKIP+= packaging/macosx/Resources/bin/inkscape
CHECK_PORTABILITY_SKIP+= packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh
-CMAKE_ARGS+= -DPACKAGE_LOCALE_DIR=${PREFIX}/${PKGLOCALEDIR}/locale
+CMAKE_CONFIGURE_ARGS+= -DPACKAGE_LOCALE_DIR=${PREFIX}/${PKGLOCALEDIR}/locale
MANCOMPRESSED= yes
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"
-CMAKE_ARGS+= -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
+CMAKE_CONFIGURE_ARGS+= -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
.endif
# There exists some race condition in create_default_templates.py that
Index: pkgsrc/graphics/jasper/Makefile
diff -u pkgsrc/graphics/jasper/Makefile:1.79 pkgsrc/graphics/jasper/Makefile:1.80
--- pkgsrc/graphics/jasper/Makefile:1.79 Mon Aug 5 12:05:50 2024
+++ pkgsrc/graphics/jasper/Makefile Sun Aug 25 06:18:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2024/08/05 12:05:50 tnn Exp $
+# $NetBSD: Makefile,v 1.80 2024/08/25 06:18:51 wiz Exp $
DISTNAME= jasper-4.2.4
CATEGORIES= graphics
@@ -13,8 +13,8 @@ LICENSE= modified-bsd
USE_LANGUAGES= c c++
FORCE_C_STD= c99
USE_TOOLS+= bash:test
-CMAKE_ARGS+= -DALLOW_IN_SOURCE_BUILD=ON
-CMAKE_ARGS+= -DJAS_ENABLE_DOC=OFF
+CMAKE_CONFIGURE_ARGS+= -DALLOW_IN_SOURCE_BUILD=ON
+CMAKE_CONFIGURE_ARGS+= -DJAS_ENABLE_DOC=OFF
PKGCONFIG_OVERRIDE= build/jasper.pc.in
REPLACE_BASH= test/bin/*
Index: pkgsrc/graphics/jasper/options.mk
diff -u pkgsrc/graphics/jasper/options.mk:1.3 pkgsrc/graphics/jasper/options.mk:1.4
--- pkgsrc/graphics/jasper/options.mk:1.3 Tue Apr 11 18:22:14 2023
+++ pkgsrc/graphics/jasper/options.mk Sun Aug 25 06:18:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2023/04/11 18:22:14 adam Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:51 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.jasper
PKG_SUPPORTED_OPTIONS= opengl
@@ -8,12 +8,12 @@ PKG_SUPPORTED_OPTIONS= opengl
PLIST_VARS+= opengl
.if !empty(PKG_OPTIONS:Mopengl)
-CMAKE_ARGS+= -DJAS_ENABLE_OPENGL=ON
+CMAKE_CONFIGURE_ARGS+= -DJAS_ENABLE_OPENGL=ON
PLIST.opengl= yes
. if ${OPSYS} != "Darwin"
. include "../../graphics/freeglut/buildlink3.mk"
. include "../../x11/libXmu/buildlink3.mk"
. endif
.else
-CMAKE_ARGS+= -DJAS_ENABLE_OPENGL=OFF
+CMAKE_CONFIGURE_ARGS+= -DJAS_ENABLE_OPENGL=OFF
.endif
Index: pkgsrc/graphics/kdiagram/Makefile
diff -u pkgsrc/graphics/kdiagram/Makefile:1.7 pkgsrc/graphics/kdiagram/Makefile:1.8
--- pkgsrc/graphics/kdiagram/Makefile:1.7 Wed May 29 16:32:56 2024
+++ pkgsrc/graphics/kdiagram/Makefile Sun Aug 25 06:18:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2024/05/29 16:32:56 adam Exp $
+# $NetBSD: Makefile,v 1.8 2024/08/25 06:18:51 wiz Exp $
DISTNAME= kdiagram-2.8.0
PKGREVISION= 6
@@ -15,7 +15,7 @@ TOOL_DEPENDS+= extra-cmake-modules>=5.60
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DECM_MKSPECS_INSTALL_DIR=${QTDIR}/mkspecs/modules
+CMAKE_CONFIGURE_ARGS+= -DECM_MKSPECS_INSTALL_DIR=${QTDIR}/mkspecs/modules
.include "../../devel/cmake/build.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
Index: pkgsrc/graphics/kvantum/Makefile
diff -u pkgsrc/graphics/kvantum/Makefile:1.42 pkgsrc/graphics/kvantum/Makefile:1.43
--- pkgsrc/graphics/kvantum/Makefile:1.42 Wed Jul 31 18:05:57 2024
+++ pkgsrc/graphics/kvantum/Makefile Sun Aug 25 06:18:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2024/07/31 18:05:57 pin Exp $
+# $NetBSD: Makefile,v 1.43 2024/08/25 06:18:51 wiz Exp $
DISTNAME= Kvantum-1.1.2
PKGNAME= ${DISTNAME:tl}
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/Kvantum
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
Index: pkgsrc/graphics/lensfun/Makefile
diff -u pkgsrc/graphics/lensfun/Makefile:1.45 pkgsrc/graphics/lensfun/Makefile:1.46
--- pkgsrc/graphics/lensfun/Makefile:1.45 Mon Aug 19 19:25:03 2024
+++ pkgsrc/graphics/lensfun/Makefile Sun Aug 25 06:18:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2024/08/19 19:25:03 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2024/08/25 06:18:51 wiz Exp $
DISTNAME= lensfun-0.3.4
PKGREVISION= 1
@@ -29,8 +29,8 @@ REPLACE_PYTHON+= apps/lensfun-update-dat
.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_ARCH} != "x86_64"
-CMAKE_ARGS+= -DBUILD_FOR_SSE=OFF
-CMAKE_ARGS+= -DBUILD_FOR_SSE2=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_FOR_SSE=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_FOR_SSE2=OFF
.endif
.include "../../devel/cmake/build.mk"
Index: pkgsrc/graphics/leptonica/Makefile
diff -u pkgsrc/graphics/leptonica/Makefile:1.28 pkgsrc/graphics/leptonica/Makefile:1.29
--- pkgsrc/graphics/leptonica/Makefile:1.28 Wed Jan 31 22:45:33 2024
+++ pkgsrc/graphics/leptonica/Makefile Sun Aug 25 06:18:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2024/01/31 22:45:33 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2024/08/25 06:18:51 wiz Exp $
DISTNAME= leptonica-1.84.1
PKGREVISION= 1
@@ -13,8 +13,8 @@ LICENSE= 2-clause-bsd
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DBUILD_PROG=ON
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PROG=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
USE_CC_FEATURES= c17
Index: pkgsrc/graphics/libhighway/Makefile
diff -u pkgsrc/graphics/libhighway/Makefile:1.5 pkgsrc/graphics/libhighway/Makefile:1.6
--- pkgsrc/graphics/libhighway/Makefile:1.5 Fri Jan 5 11:09:53 2024
+++ pkgsrc/graphics/libhighway/Makefile Sun Aug 25 06:18:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2024/01/05 11:09:53 nros Exp $
+# $NetBSD: Makefile,v 1.6 2024/08/25 06:18:51 wiz Exp $
DISTNAME= highway-1.0.7
PKGNAME= lib${DISTNAME}
@@ -16,8 +16,8 @@ USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
GCC_REQD+= 8 # -latomic and gcc 7 gives internal compiler error
-CMAKE_ARGS+= -DHWY_SYSTEM_GTEST:BOOL=TRUE
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DHWY_SYSTEM_GTEST:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=TRUE
PKGCONFIG_OVERRIDE+= libhwy-contrib.pc.in
PKGCONFIG_OVERRIDE+= libhwy-test.pc.in
Index: pkgsrc/graphics/libhighway/options.mk
diff -u pkgsrc/graphics/libhighway/options.mk:1.1 pkgsrc/graphics/libhighway/options.mk:1.2
--- pkgsrc/graphics/libhighway/options.mk:1.1 Wed Aug 16 15:20:49 2023
+++ pkgsrc/graphics/libhighway/options.mk Sun Aug 25 06:18:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/08/16 15:20:49 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:51 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libhighway
@@ -8,9 +8,9 @@ PKG_SUPPORTED_OPTIONS= tests
.if !empty(PKG_OPTIONS:Mtests)
TEST_TARGET= test
-CMAKE_ARGS+= -DBUILD_TESTING=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=ON
BUILDLINK_API_DEPENDS.googletest+= googletest>=1.10.0nb1
. include "../../devel/googletest/buildlink3.mk"
.else
-CMAKE_ARGS+= -DBUILD_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
.endif
Index: pkgsrc/graphics/libjpeg-turbo/Makefile
diff -u pkgsrc/graphics/libjpeg-turbo/Makefile:1.35 pkgsrc/graphics/libjpeg-turbo/Makefile:1.36
--- pkgsrc/graphics/libjpeg-turbo/Makefile:1.35 Thu May 9 09:55:50 2024
+++ pkgsrc/graphics/libjpeg-turbo/Makefile Sun Aug 25 06:18:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2024/05/09 09:55:50 adam Exp $
+# $NetBSD: Makefile,v 1.36 2024/08/25 06:18:51 wiz Exp $
DISTNAME= libjpeg-turbo-3.0.3
CATEGORIES= graphics
@@ -27,7 +27,7 @@ TEST_TARGET= test
# Ask for compatibility with jpeg 8, to get the highest ABI that
# libjpeg-turbo supports.
-CMAKE_ARGS+= -DWITH_JPEG8=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_JPEG8=ON
CHECK_PORTABILITY_SKIP+= release/makemacpkg.in
Index: pkgsrc/graphics/luminance-hdr/Makefile
diff -u pkgsrc/graphics/luminance-hdr/Makefile:1.94 pkgsrc/graphics/luminance-hdr/Makefile:1.95
--- pkgsrc/graphics/luminance-hdr/Makefile:1.94 Wed May 29 16:33:00 2024
+++ pkgsrc/graphics/luminance-hdr/Makefile Sun Aug 25 06:18:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2024/05/29 16:33:00 adam Exp $
+# $NetBSD: Makefile,v 1.95 2024/08/25 06:18:52 wiz Exp $
DISTNAME= luminance-hdr-2.6.1.1
PKGREVISION= 9
@@ -16,8 +16,8 @@ USE_LANGUAGES= c c++
FORCE_CXX_STD= c++14
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DQt5WebEngineCore_FOUND=FALSE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DQt5WebEngineCore_FOUND=FALSE
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/cfitsio/buildlink3.mk"
Index: pkgsrc/graphics/mojoshader/Makefile
diff -u pkgsrc/graphics/mojoshader/Makefile:1.13 pkgsrc/graphics/mojoshader/Makefile:1.14
--- pkgsrc/graphics/mojoshader/Makefile:1.13 Sun Jul 7 09:59:51 2024
+++ pkgsrc/graphics/mojoshader/Makefile Sun Aug 25 06:18:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2024/07/07 09:59:51 nia Exp $
+# $NetBSD: Makefile,v 1.14 2024/08/25 06:18:52 wiz Exp $
DISTNAME= mojoshader-0.0.20220415
PKGREVISION= 5
@@ -16,7 +16,7 @@ USE_LANGUAGES+= c c++
USE_CMAKE= yes
# FLIP_VIEWPORT is needed by some FNA games (FEZ if I recall correctly)
-CMAKE_ARGS= -DBUILD_SHARED_LIBS=ON \
+CMAKE_CONFIGURE_ARGS= -DBUILD_SHARED_LIBS=ON \
-DFLIP_VIEWPORT=1 \
-DPROFILE_METAL=OFF
Index: pkgsrc/graphics/mygui/Makefile
diff -u pkgsrc/graphics/mygui/Makefile:1.14 pkgsrc/graphics/mygui/Makefile:1.15
--- pkgsrc/graphics/mygui/Makefile:1.14 Sat Apr 6 08:05:51 2024
+++ pkgsrc/graphics/mygui/Makefile Sun Aug 25 06:18:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2024/04/06 08:05:51 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2024/08/25 06:18:52 wiz Exp $
DISTNAME= mygui-3.2.3.20190707
PKGREVISION= 12
@@ -18,13 +18,13 @@ USE_TOOLS+= pkg-config
USE_CXX_FEATURES+= c++11
-CMAKE_ARGS+= -DMYGUI_RENDERSYSTEM=7 # OpenGL 3.*
-CMAKE_ARGS+= -DMYGUI_SAMPLES_INPUT=4 # SDL2
+CMAKE_CONFIGURE_ARGS+= -DMYGUI_RENDERSYSTEM=7 # OpenGL 3.*
+CMAKE_CONFIGURE_ARGS+= -DMYGUI_SAMPLES_INPUT=4 # SDL2
# None of these are installed
-CMAKE_ARGS+= -DMYGUI_BUILD_DEMOS=FALSE
-CMAKE_ARGS+= -DMYGUI_BUILD_TOOLS=FALSE
-CMAKE_ARGS+= -DMYGUI_BUILD_DOCS=FALSE
+CMAKE_CONFIGURE_ARGS+= -DMYGUI_BUILD_DEMOS=FALSE
+CMAKE_CONFIGURE_ARGS+= -DMYGUI_BUILD_TOOLS=FALSE
+CMAKE_CONFIGURE_ARGS+= -DMYGUI_BUILD_DOCS=FALSE
.include "../../devel/SDL2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
Index: pkgsrc/graphics/nvidia-texture-tools/Makefile
diff -u pkgsrc/graphics/nvidia-texture-tools/Makefile:1.12 pkgsrc/graphics/nvidia-texture-tools/Makefile:1.13
--- pkgsrc/graphics/nvidia-texture-tools/Makefile:1.12 Wed Nov 15 20:00:39 2023
+++ pkgsrc/graphics/nvidia-texture-tools/Makefile Sun Aug 25 06:18:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/11/15 20:00:39 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2024/08/25 06:18:52 wiz Exp $
DISTNAME= nvidia-texture-tools-2.1.0
PKGREVISION= 9
@@ -15,7 +15,7 @@ HAS_CONFIGURE= yes
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DNVTT_SHARED=ON
+CMAKE_CONFIGURE_ARGS+= -DNVTT_SHARED=ON
.include "../../graphics/openexr/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
Index: pkgsrc/graphics/opencv/Makefile.common
diff -u pkgsrc/graphics/opencv/Makefile.common:1.20 pkgsrc/graphics/opencv/Makefile.common:1.21
--- pkgsrc/graphics/opencv/Makefile.common:1.20 Tue Jan 16 19:23:05 2024
+++ pkgsrc/graphics/opencv/Makefile.common Sun Aug 25 06:18:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2024/01/16 19:23:05 adam Exp $
+# $NetBSD: Makefile.common,v 1.21 2024/08/25 06:18:52 wiz Exp $
# used by graphics/opencv/Makefile
# used by graphics/opencv-contrib-face/Makefile
#
@@ -26,28 +26,28 @@ CHECK_PORTABILITY_SKIP+= platforms/ios/c
CHECK_PORTABILITY_SKIP+= cmake/templates/xcode-*
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -DBUILD_JAVA=OFF
-CMAKE_ARGS+= -DBUILD_PROTOBUF=OFF
-CMAKE_ARGS+= -DCV_ENABLE_INTRINSICS=OFF # XXX: problematic
-CMAKE_ARGS+= -DENABLE_CCACHE=OFF
-CMAKE_ARGS+= -DOPENCV_GENERATE_SETUPVARS=OFF
-CMAKE_ARGS+= -DPROTOBUF_UPDATE_FILES=ON
-CMAKE_ARGS+= -DWITH_EIGEN=OFF
-CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
-CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=OFF
-CMAKE_ARGS.SunOS+= -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_JAVA=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PROTOBUF=OFF
+CMAKE_CONFIGURE_ARGS+= -DCV_ENABLE_INTRINSICS=OFF # XXX: problematic
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CCACHE=OFF
+CMAKE_CONFIGURE_ARGS+= -DOPENCV_GENERATE_SETUPVARS=OFF
+CMAKE_CONFIGURE_ARGS+= -DPROTOBUF_UPDATE_FILES=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_EIGEN=OFF
+CMAKE_CONFIGURE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
+CMAKE_CONFIGURE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=OFF
+CMAKE_CONFIGURE_ARGS.SunOS+= -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON
# Pulled in via numpy, too, but we need to handle it explicitly
# for LAPACK C API and CMake tests here.
BLAS_C_INTERFACE= yes
.include "../../mk/blas.buildlink3.mk"
-CMAKE_ARGS+= -DWITH_LAPACK=ON
-CMAKE_ARGS+= -DBLA_PREFER_PKGCONFIG=ON
-CMAKE_ARGS+= -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
-CMAKE_ARGS+= -DBLA_PKGCONFIG_LAPACK=${LAPACK_PC}
-CMAKE_ARGS+= -DBLA_PKGCONFIG_CBLAS=${CBLAS_PC}
-CMAKE_ARGS+= -DBLA_PKGCONFIG_LAPACKE=${LAPACKE_PC}
-CMAKE_ARGS+= -DOPENCV_SKIP_LAPACK_EXTERN_C=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_LAPACK=ON
+CMAKE_CONFIGURE_ARGS+= -DBLA_PREFER_PKGCONFIG=ON
+CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
+CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_LAPACK=${LAPACK_PC}
+CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_CBLAS=${CBLAS_PC}
+CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_LAPACKE=${LAPACKE_PC}
+CMAKE_CONFIGURE_ARGS+= -DOPENCV_SKIP_LAPACK_EXTERN_C=ON
BUILDLINK_TRANSFORM+= rm:-Werror=address
BUILDLINK_TRANSFORM+= rm:-Werror=non-virtual-dtor
@@ -59,7 +59,7 @@ BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--gc-
.if ${MACHINE_ARCH} == "i386"
# Disable SSE/SSE2 to avoid build errors from missing _mm_pause.
-CMAKE_ARGS+= -DCPU_BASELINE=""
+CMAKE_CONFIGURE_ARGS+= -DCPU_BASELINE=""
.endif
PYTHON_VERSIONS_INCOMPATIBLE= 27 # avoid Python 2.7
Index: pkgsrc/graphics/opencv/options.mk
diff -u pkgsrc/graphics/opencv/options.mk:1.13 pkgsrc/graphics/opencv/options.mk:1.14
--- pkgsrc/graphics/opencv/options.mk:1.13 Mon Aug 3 23:02:18 2020
+++ pkgsrc/graphics/opencv/options.mk Sun Aug 25 06:18:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2020/08/03 23:02:18 joerg Exp $
+# $NetBSD: options.mk,v 1.14 2024/08/25 06:18:52 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.opencv
PKG_SUPPORTED_OPTIONS= ffmpeg jasper
@@ -13,29 +13,29 @@ PKG_SUGGESTED_OPTIONS+= gtk
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mffmpeg)
-CMAKE_ARGS+= -DWITH_FFMPEG=ON
-CMAKE_ARGS+= -DFFMPEG_INCLUDE_DIR=${PREFIX}/include/ffmpeg4
-CMAKE_ARGS+= -DFFMPEG_LIB_DIR=${PREFIX}/lib/ffmpeg4
+CMAKE_CONFIGURE_ARGS+= -DWITH_FFMPEG=ON
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_INCLUDE_DIR=${PREFIX}/include/ffmpeg4
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_LIB_DIR=${PREFIX}/lib/ffmpeg4
.include "../../multimedia/ffmpeg4/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_FFMPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_FFMPEG=OFF
.endif
.if !empty(PKG_OPTIONS:Mjasper)
-CMAKE_ARGS+= -DWITH_JASPER=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_JASPER=ON
# jasper uses SIZE_MAX and friends in its headers.
CXXFLAGS+= -D__STDC_LIMIT_MACROS
.include "../../graphics/jasper/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_JASPER=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_JASPER=OFF
.endif
.if !empty(PKG_OPTIONS:Mgtk)
-CMAKE_ARGS+= -DWITH_GTK=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_GTK=ON
.include "../../x11/gtk3/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_GTK=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_GTK=OFF
.endif
# FIXME: should be option.mk'ed instead
-CMAKE_ARGS+= -DBUILD_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCS=OFF
Index: pkgsrc/graphics/opencv-contrib-face/Makefile
diff -u pkgsrc/graphics/opencv-contrib-face/Makefile:1.39 pkgsrc/graphics/opencv-contrib-face/Makefile:1.40
--- pkgsrc/graphics/opencv-contrib-face/Makefile:1.39 Wed May 29 16:35:18 2024
+++ pkgsrc/graphics/opencv-contrib-face/Makefile Sun Aug 25 06:18:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2024/05/29 16:35:18 adam Exp $
+# $NetBSD: Makefile,v 1.40 2024/08/25 06:18:52 wiz Exp $
PKGREVISION= 3
.include "../../graphics/opencv/Makefile.common"
@@ -16,57 +16,57 @@ INSTALL_DIRS= build/modules/face build/m
WRKSRC= ${WRKDIR}/opencv-${PKGVERSION_NOREV}
-CMAKE_ARGS+= -DBUILD_DOCS=OFF
-CMAKE_ARGS+= -DWITH_FFMPEG=OFF
-CMAKE_ARGS+= -DWITH_JASPER=OFF
-
-CMAKE_ARGS+= -DOPENCV_EXTRA_MODULES_PATH=${WRKDIR}/${DISTNAME}/modules
-CMAKE_ARGS+= -DBUILD_opencv_adas=OFF
-CMAKE_ARGS+= -DBUILD_opencv_bgsegm=OFF
-CMAKE_ARGS+= -DBUILD_opencv_bioinspired=OFF
-CMAKE_ARGS+= -DBUILD_opencv_ccalib=OFF
-CMAKE_ARGS+= -DBUILD_opencv_contrib_world=OFF
-CMAKE_ARGS+= -DBUILD_opencv_cvv=OFF
-CMAKE_ARGS+= -DBUILD_opencv_datasets=OFF
-CMAKE_ARGS+= -DBUILD_opencv_dnn_objdetect=OFF
-CMAKE_ARGS+= -DBUILD_opencv_hdf=OFF
-CMAKE_ARGS+= -DBUILD_opencv_hfs=OFF
-CMAKE_ARGS+= -DBUILD_opencv_img_hash=OFF
-CMAKE_ARGS+= -DBUILD_opencv_latentsvm=OFF
-CMAKE_ARGS+= -DBUILD_opencv_line_descriptor=OFF
-CMAKE_ARGS+= -DBUILD_opencv_matlab=OFF
-CMAKE_ARGS+= -DBUILD_opencv_optflow=OFF
-CMAKE_ARGS+= -DBUILD_opencv_reg=OFF
-CMAKE_ARGS+= -DBUILD_opencv_rgbd=OFF
-CMAKE_ARGS+= -DBUILD_opencv_saliency=OFF
-CMAKE_ARGS+= -DBUILD_opencv_surface_matching=OFF
-CMAKE_ARGS+= -DBUILD_opencv_text=OFF
-CMAKE_ARGS+= -DBUILD_opencv_xfeatures2d=OFF
-CMAKE_ARGS+= -DBUILD_opencv_ximgproc=OFF
-CMAKE_ARGS+= -DBUILD_opencv_xobjdetect=OFF
-CMAKE_ARGS+= -DBUILD_opencv_xphoto=OFF
-
-CMAKE_ARGS+= -DBUILD_opencv_dnn=OFF
-CMAKE_ARGS+= -DBUILD_opencv_flann=OFF
-CMAKE_ARGS+= -DBUILD_opencv_highgui=OFF
-CMAKE_ARGS+= -DBUILD_opencv_ml=OFF
-CMAKE_ARGS+= -DBUILD_opencv_python2=OFF
-CMAKE_ARGS+= -DBUILD_opencv_python3=OFF
-CMAKE_ARGS+= -DBUILD_opencv_stitching=OFF
-CMAKE_ARGS+= -DBUILD_opencv_superres=OFF
-CMAKE_ARGS+= -DBUILD_opencv_ts=OFF
-CMAKE_ARGS+= -DBUILD_opencv_videoio=OFF
-CMAKE_ARGS+= -DBUILD_opencv_videostab=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_FFMPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_JASPER=OFF
+
+CMAKE_CONFIGURE_ARGS+= -DOPENCV_EXTRA_MODULES_PATH=${WRKDIR}/${DISTNAME}/modules
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_adas=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_bgsegm=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_bioinspired=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_ccalib=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_contrib_world=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_cvv=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_datasets=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_dnn_objdetect=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_hdf=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_hfs=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_img_hash=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_latentsvm=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_line_descriptor=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_matlab=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_optflow=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_reg=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_rgbd=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_saliency=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_surface_matching=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_text=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_xfeatures2d=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_ximgproc=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_xobjdetect=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_xphoto=OFF
+
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_dnn=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_flann=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_highgui=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_ml=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_python2=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_python3=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_stitching=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_superres=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_ts=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_videoio=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_videostab=OFF
# At least as of 3.4.6, these are dependencies of the 'face' module
# and need to be built and installed ('photo' and 'video' are
# part of the main opencv package already
-#CMAKE_ARGS+= -DBUILD_opencv_calib3d=OFF
-#CMAKE_ARGS+= -DBUILD_opencv_features2d=OFF
-#CMAKE_ARGS+= -DBUILD_opencv_photo=OFF
-#CMAKE_ARGS+= -DBUILD_opencv_plot=OFF
-#CMAKE_ARGS+= -DBUILD_opencv_tracking=OFF
-#CMAKE_ARGS+= -DBUILD_opencv_video=OFF
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_calib3d=OFF
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_features2d=OFF
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_photo=OFF
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_plot=OFF
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_tracking=OFF
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_video=OFF
# XXX: INSTALL_DIRS currently do not work as desired in cmake/build.mk.
USE_CMAKE= yes
Index: pkgsrc/graphics/openexr/Makefile
diff -u pkgsrc/graphics/openexr/Makefile:1.61 pkgsrc/graphics/openexr/Makefile:1.62
--- pkgsrc/graphics/openexr/Makefile:1.61 Fri Apr 5 10:45:55 2024
+++ pkgsrc/graphics/openexr/Makefile Sun Aug 25 06:18:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2024/04/05 10:45:55 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2024/08/25 06:18:52 wiz Exp $
DISTNAME= openexr-3.2.4
CATEGORIES= graphics
@@ -22,7 +22,7 @@ PKGCONFIG_OVERRIDE= cmake/OpenEXR.pc.in
PTHREAD_OPTS= require
# https://github.com/AcademySoftwareFoundation/openexr/issues/1594
-CMAKE_ARGS+= -DBUILD_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
CHECK_PORTABILITY_SKIP+= Contrib/DtexToExr/bootstrap
CHECK_PORTABILITY_SKIP+= share/util/reformat.sh
Index: pkgsrc/graphics/openimageio/Makefile
diff -u pkgsrc/graphics/openimageio/Makefile:1.109 pkgsrc/graphics/openimageio/Makefile:1.110
--- pkgsrc/graphics/openimageio/Makefile:1.109 Tue Jul 16 10:02:01 2024
+++ pkgsrc/graphics/openimageio/Makefile Sun Aug 25 06:18:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2024/07/16 10:02:01 prlw1 Exp $
+# $NetBSD: Makefile,v 1.110 2024/08/25 06:18:52 wiz Exp $
DISTNAME= OpenImageIO-2.5.13.1
PKGNAME= ${DISTNAME:tl}
@@ -19,28 +19,28 @@ USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
TEST_TARGET= test
-CMAKE_ARGS+= -DSTOP_ON_WARNING=OFF # Disable -Werror
-CMAKE_ARGS+= -DBUILD_MISSING_ROBINMAP=OFF
-CMAKE_ARGS+= -DUSE_EXTERNAL_PUGIXML=ON
-CMAKE_ARGS+= -DUSE_PYTHON=OFF
-CMAKE_ARGS+= -DROBINMAP_INCLUDE_DIR=${BUILDLINK_PREFIX.robin-map}/include
-CMAKE_ARGS+= -DOpenJpeg_ROOT=${BUILDLINK_PREFIX.openjpeg}
-CMAKE_ARGS+= -DOpenEXR_ROOT=${BUILDLINK_PREFIX.openexr}
+CMAKE_CONFIGURE_ARGS+= -DSTOP_ON_WARNING=OFF # Disable -Werror
+CMAKE_CONFIGURE_ARGS+= -DBUILD_MISSING_ROBINMAP=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_EXTERNAL_PUGIXML=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_PYTHON=OFF
+CMAKE_CONFIGURE_ARGS+= -DROBINMAP_INCLUDE_DIR=${BUILDLINK_PREFIX.robin-map}/include
+CMAKE_CONFIGURE_ARGS+= -DOpenJpeg_ROOT=${BUILDLINK_PREFIX.openjpeg}
+CMAKE_CONFIGURE_ARGS+= -DOpenEXR_ROOT=${BUILDLINK_PREFIX.openexr}
# none of these are available in pkgsrc yet
-CMAKE_ARGS+= -DUSE_DCMTK=OFF
-CMAKE_ARGS+= -DUSE_Libsquish=OFF
-CMAKE_ARGS+= -DUSE_Nuke=OFF
-CMAKE_ARGS+= -DUSE_OpenVDB=OFF
-CMAKE_ARGS+= -DUSE_Field3D=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_DCMTK=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_Libsquish=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_Nuke=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_OpenVDB=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_Field3D=OFF
# disable imageviewer since it requires Qt5 to build
-CMAKE_ARGS+= -DENABLE_IV=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_IV=OFF
# disabled by default in arch linux, freebsd...
-CMAKE_ARGS+= -DUSE_HDF5=OFF
-CMAKE_ARGS+= -DUSE_FFmpeg=OFF
-CMAKE_ARGS+= -DUSE_OpenCV=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_HDF5=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_FFmpeg=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_OpenCV=OFF
# We're using cmake...
CHECK_PORTABILITY_SKIP+= Makefile
Index: pkgsrc/graphics/osg/Makefile
diff -u pkgsrc/graphics/osg/Makefile:1.179 pkgsrc/graphics/osg/Makefile:1.180
--- pkgsrc/graphics/osg/Makefile:1.179 Wed May 29 16:33:00 2024
+++ pkgsrc/graphics/osg/Makefile Sun Aug 25 06:18:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.179 2024/05/29 16:33:00 adam Exp $
+# $NetBSD: Makefile,v 1.180 2024/08/25 06:18:53 wiz Exp $
DISTNAME= osg-3.6.5
PKGREVISION= 54
@@ -19,27 +19,27 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE= packaging/pkgconfig/openscenegraph.pc.in
PKGCONFIG_OVERRIDE+= packaging/pkgconfig/openthreads.pc.in
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DDYNAMIC_OPENSCENEGRAPH=ON
-CMAKE_ARGS+= -DBUILD_OSG_EXAMPLES=OFF
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Asio=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_SDL=TRUE # disable legacy SDL
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GTA=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GLIB=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_DCMTK=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_NVTT=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_ZeroConf=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_DirectInput=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_DirectShow=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_FBX=TRUE
-CMAKE_ARGS+= -DOSG_USE_LOCAL_LUA_SOURCE=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DDYNAMIC_OPENSCENEGRAPH=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_OSG_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Asio=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_SDL=TRUE # disable legacy SDL
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GTA=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GLIB=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_DCMTK=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_NVTT=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_ZeroConf=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_DirectInput=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_DirectShow=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_FBX=TRUE
+CMAKE_CONFIGURE_ARGS+= -DOSG_USE_LOCAL_LUA_SOURCE=OFF
PLIST_VARS+= quartz notdarwin
Index: pkgsrc/graphics/osg/options.mk
diff -u pkgsrc/graphics/osg/options.mk:1.3 pkgsrc/graphics/osg/options.mk:1.4
--- pkgsrc/graphics/osg/options.mk:1.3 Sat Dec 30 12:57:53 2023
+++ pkgsrc/graphics/osg/options.mk Sun Aug 25 06:18:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2023/12/30 12:57:53 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:53 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.osg
PKG_SUPPORTED_OPTIONS+= gdal pdf svg
@@ -10,7 +10,7 @@ PLIST_VARS+= gdal pdf svg
.include "../../geography/gdal-lib/buildlink3.mk"
PLIST.gdal= yes
.else
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GDAL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GDAL=TRUE
.endif
.if !empty(PKG_OPTIONS:Mpdf)
@@ -18,12 +18,12 @@ BUILDLINK_API_DEPENDS.poppler+= poppler>
.include "../../print/poppler/buildlink3.mk"
PLIST.pdf= yes
.else
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Poppler-glib=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Poppler-glib=TRUE
.endif
.if !empty(PKG_OPTIONS:Msvg)
.include "../../graphics/librsvg/buildlink3.mk"
PLIST.svg= yes
.else
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_RSVG=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_RSVG=TRUE
.endif
Index: pkgsrc/graphics/oxygen-icons/Makefile
diff -u pkgsrc/graphics/oxygen-icons/Makefile:1.48 pkgsrc/graphics/oxygen-icons/Makefile:1.49
--- pkgsrc/graphics/oxygen-icons/Makefile:1.48 Tue Feb 6 11:24:07 2024
+++ pkgsrc/graphics/oxygen-icons/Makefile Sun Aug 25 06:18:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2024/02/06 11:24:07 markd Exp $
+# $NetBSD: Makefile,v 1.49 2024/08/25 06:18:53 wiz Exp $
DISTNAME= oxygen-icons-5.114.0
CATEGORIES= graphics kde
@@ -18,7 +18,7 @@ USE_LANGUAGES= c c++
# but this is a hard requirement from the KDE cmake infrastructure.
USE_CXX_FEATURES+= c++17
-CMAKE_ARGS+= -DKF_IGNORE_PLATFORM_CHECK=true
+CMAKE_CONFIGURE_ARGS+= -DKF_IGNORE_PLATFORM_CHECK=true
.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/pcl/Makefile
diff -u pkgsrc/graphics/pcl/Makefile:1.33 pkgsrc/graphics/pcl/Makefile:1.34
--- pkgsrc/graphics/pcl/Makefile:1.33 Wed May 29 16:33:00 2024
+++ pkgsrc/graphics/pcl/Makefile Sun Aug 25 06:18:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2024/05/29 16:33:00 adam Exp $
+# $NetBSD: Makefile,v 1.34 2024/08/25 06:18:53 wiz Exp $
DISTNAME= pcl-1.14.1
PKGREVISION= 3
@@ -18,9 +18,9 @@ USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
# Those could be enabled as options if desired.
-CMAKE_ARGS+= -DWITH_CUDA=FALSE
+CMAKE_CONFIGURE_ARGS+= -DWITH_CUDA=FALSE
# test is missing
-CMAKE_ARGS.NetBSD+= -DHAVE_POSIX_MEMALIGN=1
+CMAKE_CONFIGURE_ARGS.NetBSD+= -DHAVE_POSIX_MEMALIGN=1
.include "../../mk/bsd.prefs.mk"
# See LIBATOMIC_NOT_NEEDED in CMakeLists.txt
Index: pkgsrc/graphics/pcl/options.mk
diff -u pkgsrc/graphics/pcl/options.mk:1.3 pkgsrc/graphics/pcl/options.mk:1.4
--- pkgsrc/graphics/pcl/options.mk:1.3 Sun May 5 20:58:06 2024
+++ pkgsrc/graphics/pcl/options.mk Sun Aug 25 06:18:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2024/05/05 20:58:06 adam Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:53 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.pcl
# Qt could be an option, but relies on vtk's qt support, too.
@@ -12,17 +12,17 @@ PKG_SUGGESTED_OPTIONS= vtk
PLIST_VARS+= vtk qt
.if !empty(PKG_OPTIONS:Mvtk)
-CMAKE_ARGS+= -DWITH_VTK=TRUE
+CMAKE_CONFIGURE_ARGS+= -DWITH_VTK=TRUE
PLIST.vtk= yes
.include "../../graphics/glew/buildlink3.mk"
.include "../../graphics/vtk/buildlink3.mk"
. if ${PKG_BUILD_OPTIONS.vtk:Mqt}
-CMAKE_ARGS+= -DWITH_QT=QT5
-CMAKE_ARGS+= -DBUILD_apps=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_QT=QT5
+CMAKE_CONFIGURE_ARGS+= -DBUILD_apps=ON
PLIST.qt= yes
.include "../../x11/qt5-qtbase/buildlink3.mk"
. endif
.else
-CMAKE_ARGS+= -DWITH_VTK=FALSE
-CMAKE_ARGS+= -DWITH_QT=NO
+CMAKE_CONFIGURE_ARGS+= -DWITH_VTK=FALSE
+CMAKE_CONFIGURE_ARGS+= -DWITH_QT=NO
.endif
Index: pkgsrc/graphics/pfstools/Makefile
diff -u pkgsrc/graphics/pfstools/Makefile:1.107 pkgsrc/graphics/pfstools/Makefile:1.108
--- pkgsrc/graphics/pfstools/Makefile:1.107 Wed May 29 16:33:01 2024
+++ pkgsrc/graphics/pfstools/Makefile Sun Aug 25 06:18:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2024/05/29 16:33:01 adam Exp $
+# $NetBSD: Makefile,v 1.108 2024/08/25 06:18:53 wiz Exp $
DISTNAME= pfstools-2.2.0
PKGREVISION= 9
@@ -20,10 +20,10 @@ USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= bash perl pkg-config
PKGCONFIG_OVERRIDE+= src/pfs/pfs.pc.in
-CMAKE_ARGS+= -DBASH_EXECUTABLE=${TOOLS_BASH}
-CMAKE_ARGS+= -DPKGMANDIR=${PKGMANDIR}
-CMAKE_ARGS+= -DWITH_MATLAB=OFF
-CMAKE_ARGS+= -DWITH_OpenCV=OFF
+CMAKE_CONFIGURE_ARGS+= -DBASH_EXECUTABLE=${TOOLS_BASH}
+CMAKE_CONFIGURE_ARGS+= -DPKGMANDIR=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DWITH_MATLAB=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_OpenCV=OFF
#CXXFLAGS+= -std=c++14 # OpenEXR
REPLACE_BASH+= src/camera/pfs_automerge
Index: pkgsrc/graphics/pfstools/options.mk
diff -u pkgsrc/graphics/pfstools/options.mk:1.9 pkgsrc/graphics/pfstools/options.mk:1.10
--- pkgsrc/graphics/pfstools/options.mk:1.9 Sun Jul 23 21:47:15 2023
+++ pkgsrc/graphics/pfstools/options.mk Sun Aug 25 06:18:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2023/07/23 21:47:15 adam Exp $
+# $NetBSD: options.mk,v 1.10 2024/08/25 06:18:53 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.pfstools
PKG_SUPPORTED_OPTIONS= octave opengl qt
@@ -13,9 +13,9 @@ PLIST_VARS+= octave gl qt
#.if !empty(PKG_OPTIONS:Mimagemagick)
#.include "../../graphics/ImageMagick6/buildlink3.mk"
#PLIST.im= yes
-#CMAKE_ARGS+= -DWITH_ImageMagick=ON
+#CMAKE_CONFIGURE_ARGS+= -DWITH_ImageMagick=ON
#.else
-CMAKE_ARGS+= -DWITH_ImageMagick=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ImageMagick=OFF
#.endif
.if !empty(PKG_OPTIONS:Moctave)
@@ -26,17 +26,17 @@ REPLACE_OCTAVE+= src/octave/pfsstat
PLIST.octave= yes
PLIST_SUBST+= OCT_LOCALVEROCTFILEDIR=${OCT_LOCALVEROCTFILEDIR:S/${BUILDLINK_PREFIX.octave}\///}
PLIST_SUBST+= OCT_LOCALVERFCNFILEDIR=${OCT_LOCALVERFCNFILEDIR:S/${BUILDLINK_PREFIX.octave}\///}
-CMAKE_ARGS+= -DWITH_Octave=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_Octave=ON
.else
-CMAKE_ARGS+= -DWITH_Octave=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_Octave=OFF
.endif
.if !empty(PKG_OPTIONS:Mqt)
.include "../../x11/qt5-qtbase/buildlink3.mk"
PLIST.qt= yes
-CMAKE_ARGS+= -DWITH_QT=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_QT=ON
.else
-CMAKE_ARGS+= -DWITH_QT=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_QT=OFF
.endif
.if !empty(PKG_OPTIONS:Mopengl)
@@ -46,7 +46,7 @@ CMAKE_ARGS+= -DWITH_QT=OFF
# XXX nasty hack
CXXFLAGS.NetBSD+= -lpthread
PLIST.gl= yes
-CMAKE_ARGS+= -DWITH_pfsglview=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_pfsglview=ON
.else
-CMAKE_ARGS+= -DWITH_pfsglview=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_pfsglview=OFF
.endif
Index: pkgsrc/graphics/rawtherapee/Makefile
diff -u pkgsrc/graphics/rawtherapee/Makefile:1.36 pkgsrc/graphics/rawtherapee/Makefile:1.37
--- pkgsrc/graphics/rawtherapee/Makefile:1.36 Wed May 29 16:33:02 2024
+++ pkgsrc/graphics/rawtherapee/Makefile Sun Aug 25 06:18:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2024/05/29 16:33:02 adam Exp $
+# $NetBSD: Makefile,v 1.37 2024/08/25 06:18:53 wiz Exp $
DISTNAME= rawtherapee-5.9
PKGREVISION= 3
@@ -16,7 +16,7 @@ USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
# for patch-CMakeLists.txt
-CMAKE_ARGS+= -DPKGMANDIR=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DPKGMANDIR=${PKGMANDIR}
.include "../../audio/libcanberra/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
Index: pkgsrc/graphics/screengrab/Makefile
diff -u pkgsrc/graphics/screengrab/Makefile:1.30 pkgsrc/graphics/screengrab/Makefile:1.31
--- pkgsrc/graphics/screengrab/Makefile:1.30 Tue Aug 20 06:12:39 2024
+++ pkgsrc/graphics/screengrab/Makefile Sun Aug 25 06:18:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2024/08/20 06:12:39 pin Exp $
+# $NetBSD: Makefile,v 1.31 2024/08/25 06:18:53 wiz Exp $
DISTNAME= screengrab-2.8.0
CATEGORIES= graphics
@@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2
USE_TOOLS+= pkg-config perl
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/screengrab \
-L${PREFIX}/lib/screengrab/
Index: pkgsrc/graphics/tesseract/Makefile
diff -u pkgsrc/graphics/tesseract/Makefile:1.80 pkgsrc/graphics/tesseract/Makefile:1.81
--- pkgsrc/graphics/tesseract/Makefile:1.80 Tue Jun 11 19:35:52 2024
+++ pkgsrc/graphics/tesseract/Makefile Sun Aug 25 06:18:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2024/06/11 19:35:52 adam Exp $
+# $NetBSD: Makefile,v 1.81 2024/08/25 06:18:53 wiz Exp $
DISTNAME= tesseract-5.4.1
CATEGORIES= graphics
@@ -27,7 +27,7 @@ INSTALL_TARGET= install training-instal
TEST_TARGET= check
REPLACE_BASH+= src/training/*.sh
-#CMAKE_ARGS+= -DUSE_SYSTEM_ICU=ON
+#CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_ICU=ON
post-extract:
${MV} ${WRKDIR}/tessdata_best-${LANGVER}/*.traineddata ${WRKSRC}/tessdata/
Index: pkgsrc/graphics/vtk/Makefile
diff -u pkgsrc/graphics/vtk/Makefile:1.45 pkgsrc/graphics/vtk/Makefile:1.46
--- pkgsrc/graphics/vtk/Makefile:1.45 Wed May 29 16:33:04 2024
+++ pkgsrc/graphics/vtk/Makefile Sun Aug 25 06:18:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2024/05/29 16:33:04 adam Exp $
+# $NetBSD: Makefile,v 1.46 2024/08/25 06:18:53 wiz Exp $
DISTNAME= VTK-9.2.6
PKGNAME= ${DISTNAME:tl}
@@ -18,31 +18,31 @@ USE_LANGUAGES= c c++11
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DVTK_LEGACY_REMOVE=ON
-CMAKE_ARGS+= -DVTK_USE_MPI=OFF
-CMAKE_ARGS+= -DVTK_USE_CUDA=OFF
-CMAKE_ARGS+= -DVTK_ENABLE_LOGGING=OFF
-CMAKE_ARGS+= -DVTK_BUILD_ALL_MODULES=OFF
-CMAKE_ARGS+= -DVTK_ENABLE_REMOTE_MODULES=OFF
-CMAKE_ARGS+= -DVTK_ENABLE_KITS=OFF
-CMAKE_ARGS+= -DVTK_USE_EXTERNAL=ON
-CMAKE_ARGS+= -DVTK_USE_TK=OFF
-CMAKE_ARGS+= -DVTK_ENABLE_WRAPPING=OFF
-CMAKE_ARGS+= -DVTK_WRAP_PYTHON=OFF
-CMAKE_ARGS+= -DVTK_WRAP_JAVA=OFF
-CMAKE_ARGS+= -DVTK_FORBID_DOWNLOADS=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DVTK_LEGACY_REMOVE=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_USE_MPI=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_USE_CUDA=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_ENABLE_LOGGING=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_BUILD_ALL_MODULES=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_ENABLE_REMOTE_MODULES=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_ENABLE_KITS=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_USE_EXTERNAL=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_USE_TK=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_ENABLE_WRAPPING=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_WRAP_PYTHON=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_WRAP_JAVA=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_FORBID_DOWNLOADS=ON
# https://discourse.vtk.org/t/9-0-0-rc1-contextopengl2-not-built/2933
-CMAKE_ARGS+= -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES
# A header-only C++ lib shipped with VTK. Non-versioned archive with the
# 1.5M header at http://www.partow.net/downloads/exprtk.zip .
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
# The fork needed by forked ioss.
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_fmt=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_fmt=OFF
# SEACAS ioss. Uneasy about packaging that. No proper releases, even.
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
# Verdict, some quadrature computations in 2D, 3D. Unsure if useful as pkg.
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/build/lib
Index: pkgsrc/graphics/vtk/options.mk
diff -u pkgsrc/graphics/vtk/options.mk:1.2 pkgsrc/graphics/vtk/options.mk:1.3
--- pkgsrc/graphics/vtk/options.mk:1.2 Sat Aug 12 13:34:02 2023
+++ pkgsrc/graphics/vtk/options.mk Sun Aug 25 06:18:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/08/12 13:34:02 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:53 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.vtk
PKG_SUPPORTED_OPTIONS= qt
@@ -8,13 +8,13 @@ PKG_SUGGESTED_OPTIONS= qt
PLIST_VARS+= qt
.if !empty(PKG_OPTIONS:Mqt)
-CMAKE_ARGS+= -DVTK_MODULE_ENABLE_VTK_GUISupportQt=YES
-CMAKE_ARGS+= -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL=NO
-CMAKE_ARGS+= -DVTK_MODULE_ENABLE_VTK_RenderingQt=YES
-CMAKE_ARGS+= -DVTK_MODULE_ENABLE_VTK_ViewsQt=YES
-CMAKE_ARGS+= -DVTK_QT_VERSION=5
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_ENABLE_VTK_GUISupportQt=YES
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL=NO
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_ENABLE_VTK_RenderingQt=YES
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_ENABLE_VTK_ViewsQt=YES
+CMAKE_CONFIGURE_ARGS+= -DVTK_QT_VERSION=5
PLIST.qt= yes
.include "../../x11/qt5-qtbase/buildlink3.mk"
.else
-CMAKE_ARGS+= -DVTK_GROUP_ENABLE_Qt=NO
+CMAKE_CONFIGURE_ARGS+= -DVTK_GROUP_ENABLE_Qt=NO
.endif
Index: pkgsrc/graphics/zint/Makefile
diff -u pkgsrc/graphics/zint/Makefile:1.3 pkgsrc/graphics/zint/Makefile:1.4
--- pkgsrc/graphics/zint/Makefile:1.3 Wed May 29 16:33:04 2024
+++ pkgsrc/graphics/zint/Makefile Sun Aug 25 06:18:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2024/05/29 16:33:04 adam Exp $
+# $NetBSD: Makefile,v 1.4 2024/08/25 06:18:54 wiz Exp $
DISTNAME= zint-2.13.0-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -13,7 +13,7 @@ COMMENT= Open source barcode generating
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
.include "options.mk"
.include "../../devel/cmake/build.mk"
Index: pkgsrc/graphics/zint/options.mk
diff -u pkgsrc/graphics/zint/options.mk:1.1 pkgsrc/graphics/zint/options.mk:1.2
--- pkgsrc/graphics/zint/options.mk:1.1 Thu Mar 14 12:24:54 2024
+++ pkgsrc/graphics/zint/options.mk Sun Aug 25 06:18:54 2024
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2024/03/14 12:24:54 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:54 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.zint
PKG_SUPPORTED_OPTIONS+= qt5
PKG_SUGGESTED_OPTIONS+= qt5
# TODO: add qt6 support
-#CMAKE_ARGS+= -DZINT_QT6=ON
+#CMAKE_CONFIGURE_ARGS+= -DZINT_QT6=ON
PLIST_VARS+= qt5
Index: pkgsrc/graphics/zxing-cpp/Makefile
diff -u pkgsrc/graphics/zxing-cpp/Makefile:1.13 pkgsrc/graphics/zxing-cpp/Makefile:1.14
--- pkgsrc/graphics/zxing-cpp/Makefile:1.13 Mon Dec 11 10:10:16 2023
+++ pkgsrc/graphics/zxing-cpp/Makefile Sun Aug 25 06:18:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/12/11 10:10:16 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2024/08/25 06:18:54 wiz Exp $
DISTNAME= zxing-cpp-2.2.1
CATEGORIES= graphics
@@ -12,9 +12,9 @@ LICENSE= apache-2.0
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_EXAMPLES=OFF
# Blackbox tests target pulls fmtlib with git command.
-CMAKE_ARGS+= -DBUILD_BLACKBOX_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_BLACKBOX_TESTS=OFF
USE_CXX_FEATURES+= c++17
Index: pkgsrc/ham/codec2/Makefile
diff -u pkgsrc/ham/codec2/Makefile:1.7 pkgsrc/ham/codec2/Makefile:1.8
--- pkgsrc/ham/codec2/Makefile:1.7 Mon Aug 19 17:19:32 2024
+++ pkgsrc/ham/codec2/Makefile Sun Aug 25 06:18:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2024/08/19 17:19:32 gdt Exp $
+# $NetBSD: Makefile,v 1.8 2024/08/25 06:18:54 wiz Exp $
#
# https://github.com/drowe67/codec2/archive/v0.9.2.tar.gz
@@ -21,7 +21,7 @@ CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYP
# XXX this creates a circular dependency between
# lpcnetfreedv and codec2 that requires bootstrapping
# and causes problems with pkg tools once created.
-#CMAKE_ARGS+= -DLPCNET=ON
+#CMAKE_CONFIGURE_ARGS+= -DLPCNET=ON
#.include "../../ham/lpcnetfreedv/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-core/options.mk
diff -u pkgsrc/ham/gnuradio-core/options.mk:1.12 pkgsrc/ham/gnuradio-core/options.mk:1.13
--- pkgsrc/ham/gnuradio-core/options.mk:1.12 Tue Aug 20 17:46:17 2024
+++ pkgsrc/ham/gnuradio-core/options.mk Sun Aug 25 06:18:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2024/08/20 17:46:17 gdt Exp $
+# $NetBSD: options.mk,v 1.13 2024/08/25 06:18:54 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gnuradio
PKG_SUPPORTED_OPTIONS= ninja-build filter-design alsa
@@ -15,7 +15,7 @@ PKG_SUGGESTED_OPTIONS= filter-design
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mninja-build)
-CMAKE_ARGS+= -GNinja
+CMAKE_CONFIGURE_ARGS+= -GNinja
TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
do-build:
Index: pkgsrc/ham/gr-osmosdr/Makefile
diff -u pkgsrc/ham/gr-osmosdr/Makefile:1.56 pkgsrc/ham/gr-osmosdr/Makefile:1.57
--- pkgsrc/ham/gr-osmosdr/Makefile:1.56 Tue Jul 16 10:02:03 2024
+++ pkgsrc/ham/gr-osmosdr/Makefile Sun Aug 25 06:18:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2024/07/16 10:02:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.57 2024/08/25 06:18:54 wiz Exp $
DISTNAME= gr-osmosdr-0.2.6
PKGREVISION= 1
@@ -20,10 +20,10 @@ USE_CXX_FEATURES= c++11 filesystem
USE_LANGUAGES= c c++
# Suppress warning for developer
-CMAKE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
# TODO: make it PKG_OPTION
-CMAKE_ARGS+= -DENABLE_DOXYGEN=OFF
-CMAKE_ARGS+= -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DOXYGEN=OFF
+CMAKE_CONFIGURE_ARGS+= -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
PLIST_SUBST+= PYSITELIB=${PYSITELIB}
Index: pkgsrc/ham/hackrf/Makefile
diff -u pkgsrc/ham/hackrf/Makefile:1.17 pkgsrc/ham/hackrf/Makefile:1.18
--- pkgsrc/ham/hackrf/Makefile:1.17 Sat Apr 6 06:10:01 2024
+++ pkgsrc/ham/hackrf/Makefile Sun Aug 25 06:18:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2024/04/06 06:10:01 adam Exp $
+# $NetBSD: Makefile,v 1.18 2024/08/25 06:18:54 wiz Exp $
DISTNAME= hackrf-2024.02.1
CATEGORIES= ham
@@ -15,7 +15,7 @@ USE_LANGUAGES= c c++
USE_TOOLS+= pax pkg-config
CONFIGURE_DIR= host
-CMAKE_ARGS+= -DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0
+CMAKE_CONFIGURE_ARGS+= -DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0
INSTALLATION_DIRS+= share/hackerRF
Index: pkgsrc/ham/soapy-sdr/Makefile
diff -u pkgsrc/ham/soapy-sdr/Makefile:1.5 pkgsrc/ham/soapy-sdr/Makefile:1.6
--- pkgsrc/ham/soapy-sdr/Makefile:1.5 Mon Aug 19 17:37:32 2024
+++ pkgsrc/ham/soapy-sdr/Makefile Sun Aug 25 06:18:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2024/08/19 17:37:32 gdt Exp $
+# $NetBSD: Makefile,v 1.6 2024/08/25 06:18:54 wiz Exp $
DISTNAME= soapy-sdr-0.8.1
CATEGORIES= ham
@@ -16,7 +16,7 @@ USE_TOOLS+= pkg-config
.include "../../devel/cmake/build.mk"
# Do not use /lib64. \todo File upstream bug.
-CMAKE_ARGS+= -DLIB_SUFFIX=""
+CMAKE_CONFIGURE_ARGS+= -DLIB_SUFFIX=""
SUBST_CLASSES+= getopt
SUBST_STAGE.getopt= pre-configure
Index: pkgsrc/inputmethod/fcitx/Makefile
diff -u pkgsrc/inputmethod/fcitx/Makefile:1.46 pkgsrc/inputmethod/fcitx/Makefile:1.47
--- pkgsrc/inputmethod/fcitx/Makefile:1.46 Wed May 29 16:33:07 2024
+++ pkgsrc/inputmethod/fcitx/Makefile Sun Aug 25 06:18:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2024/05/29 16:33:07 adam Exp $
+# $NetBSD: Makefile,v 1.47 2024/08/25 06:18:54 wiz Exp $
#
DISTNAME= fcitx-4.2.9.6
@@ -36,13 +36,13 @@ USE_CMAKE= yes
REPLACE_BASH+= data/script/*sh
REPLACE_BASH+= cmake/*sh
-CMAKE_ARGS+= -DENABLE_PRESAGE=OFF
-CMAKE_ARGS+= -DENABLE_GIR=OFF
-CMAKE_ARGS+= -DENABLE_GTK2_IM_MODULE=ON
-CMAKE_ARGS+= -DENABLE_GTK3_IM_MODULE=ON
-CMAKE_ARGS+= -DENABLE_QT=OFF
-CMAKE_ARGS+= -DENABLE_QT_IM_MODULE=OFF
-CMAKE_ARGS+= -DENABLE_QT_GUI=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PRESAGE=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GIR=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GTK2_IM_MODULE=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GTK3_IM_MODULE=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT_IM_MODULE=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT_GUI=OFF
PTHREAD_AUTO_VARS= yes
LDFLAGS.NetBSD+= -lexecinfo -lintl
Index: pkgsrc/inputmethod/fcitx5/Makefile
diff -u pkgsrc/inputmethod/fcitx5/Makefile:1.21 pkgsrc/inputmethod/fcitx5/Makefile:1.22
--- pkgsrc/inputmethod/fcitx5/Makefile:1.21 Tue Jul 16 10:02:04 2024
+++ pkgsrc/inputmethod/fcitx5/Makefile Sun Aug 25 06:18:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2024/07/16 10:02:04 prlw1 Exp $
+# $NetBSD: Makefile,v 1.22 2024/08/25 06:18:55 wiz Exp $
DISTNAME= fcitx5-5.1.7
PKGREVISION= 3
@@ -39,10 +39,10 @@ REPLACE_BASH+= data/fcitx5-diagnose.sh
TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-CMAKE_ARGS+= -DENABLE_WAYLAND=off # cairo-egl is required.
-CMAKE_ARGS+= -DUSE_SYSTEMD=off
-CMAKE_ARGS+= -DLibIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
-CMAKE_ARGS+= -DLIBUUID_INCLUDE_DIR=${BUILDLINK_PREFIX.libuuid}/include
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WAYLAND=off # cairo-egl is required.
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEMD=off
+CMAKE_CONFIGURE_ARGS+= -DLibIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
+CMAKE_CONFIGURE_ARGS+= -DLIBUUID_INCLUDE_DIR=${BUILDLINK_PREFIX.libuuid}/include
CXXFLAGS.NetBSD+= -DLIBKVM_FOUND
Index: pkgsrc/inputmethod/fcitx5-configtool/Makefile
diff -u pkgsrc/inputmethod/fcitx5-configtool/Makefile:1.21 pkgsrc/inputmethod/fcitx5-configtool/Makefile:1.22
--- pkgsrc/inputmethod/fcitx5-configtool/Makefile:1.21 Wed May 29 16:33:08 2024
+++ pkgsrc/inputmethod/fcitx5-configtool/Makefile Sun Aug 25 06:18:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2024/05/29 16:33:08 adam Exp $
+# $NetBSD: Makefile,v 1.22 2024/08/25 06:18:55 wiz Exp $
DISTNAME= fcitx5-configtool-5.1.3
PKGREVISION= 2
@@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config
TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-CMAKE_ARGS+= -DENABLE_KCM=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_KCM=off
# CMAKE_INSTALL_RPATH does not work.
SUBST_CLASSES+= rpath
Index: pkgsrc/inputmethod/fcitx5-qt/Makefile
diff -u pkgsrc/inputmethod/fcitx5-qt/Makefile:1.19 pkgsrc/inputmethod/fcitx5-qt/Makefile:1.20
--- pkgsrc/inputmethod/fcitx5-qt/Makefile:1.19 Wed May 29 16:33:09 2024
+++ pkgsrc/inputmethod/fcitx5-qt/Makefile Sun Aug 25 06:18:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/05/29 16:33:09 adam Exp $
+# $NetBSD: Makefile,v 1.20 2024/08/25 06:18:55 wiz Exp $
DISTNAME= fcitx5-qt-5.1.4
PKGREVISION= 2
@@ -16,9 +16,9 @@ TOOL_DEPENDS+= extra-cmake-modules-[0-9]
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DENABLE_QT4=off
-CMAKE_ARGS+= -DENABLE_QT5=on
-CMAKE_ARGS+= -DENABLE_QT6=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT4=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5=on
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6=off
.include "../../devel/cmake/build.mk"
.include "../../inputmethod/fcitx5/buildlink3.mk"
Index: pkgsrc/inputmethod/ibus-qt/Makefile
diff -u pkgsrc/inputmethod/ibus-qt/Makefile:1.72 pkgsrc/inputmethod/ibus-qt/Makefile:1.73
--- pkgsrc/inputmethod/ibus-qt/Makefile:1.72 Wed May 29 16:33:10 2024
+++ pkgsrc/inputmethod/ibus-qt/Makefile Sun Aug 25 06:18:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2024/05/29 16:33:10 adam Exp $
+# $NetBSD: Makefile,v 1.73 2024/08/25 06:18:55 wiz Exp $
DISTNAME= ibus-qt-1.3.3-Source
PKGNAME= ${DISTNAME:S/-Source//}
@@ -19,7 +19,7 @@ USE_TOOLS+= pkg-config
TOOL_DEPENDS+= doxygen>=1.6:../../devel/doxygen
# avoid lib64
-CMAKE_ARGS+= -DLIBDIR=lib
+CMAKE_CONFIGURE_ARGS+= -DLIBDIR=lib
BUILDLINK_API_DEPENDS.ibus+= ibus>=1.3.7
.include "../../inputmethod/ibus/buildlink3.mk"
Index: pkgsrc/inputmethod/ibus-table-chinese/Makefile
diff -u pkgsrc/inputmethod/ibus-table-chinese/Makefile:1.17 pkgsrc/inputmethod/ibus-table-chinese/Makefile:1.18
--- pkgsrc/inputmethod/ibus-table-chinese/Makefile:1.17 Fri Dec 23 13:33:43 2022
+++ pkgsrc/inputmethod/ibus-table-chinese/Makefile Sun Aug 25 06:18:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2022/12/23 13:33:43 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2024/08/25 06:18:55 wiz Exp $
DISTNAME= ibus-table-chinese-1.8.12
CATEGORIES= inputmethod chinese
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v3
USE_CMAKE= yes
USE_LANGUAGES= # none
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DDATA_DIR=${PREFIX}/share
+CMAKE_CONFIGURE_ARGS+= -DDATA_DIR=${PREFIX}/share
.include "../../inputmethod/ibus-table/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/inputmethod/librime/options.mk
diff -u pkgsrc/inputmethod/librime/options.mk:1.2 pkgsrc/inputmethod/librime/options.mk:1.3
--- pkgsrc/inputmethod/librime/options.mk:1.2 Sat Feb 20 20:53:01 2021
+++ pkgsrc/inputmethod/librime/options.mk Sun Aug 25 06:18:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2021/02/20 20:53:01 ryoon Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:55 wiz Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.librime
@@ -8,9 +8,9 @@ PKG_SUPPORTED_OPTIONS= tests
.if !empty(PKG_OPTIONS:Mtests)
.include "../../devel/googletest/buildlink3.mk"
-CMAKE_ARGS+= -DBUILD_TEST=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TEST=ON
TEST_TARGET= test
TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/lib
.else
-CMAKE_ARGS+= -DBUILD_TEST=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TEST=OFF
.endif
Index: pkgsrc/lang/clang/Makefile.common
diff -u pkgsrc/lang/clang/Makefile.common:1.62 pkgsrc/lang/clang/Makefile.common:1.63
--- pkgsrc/lang/clang/Makefile.common:1.62 Sun Jul 7 14:00:38 2024
+++ pkgsrc/lang/clang/Makefile.common Sun Aug 25 06:18:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.62 2024/07/07 14:00:38 wiz Exp $
+# $NetBSD: Makefile.common,v 1.63 2024/08/25 06:18:55 wiz Exp $
# used by lang/clang/Makefile
# used by lang/clang-tools-extra/Makefile
@@ -20,16 +20,16 @@ USE_LANGUAGES= c c++
USE_CMAKE= yes
GCC_REQD+= 7
-CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
.include "../../mk/compiler.mk"
-CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
+CMAKE_CONFIGURE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
.if defined(OSX_SDK_PATH)
-CMAKE_ARGS.Darwin+= -DDEFAULT_SYSROOT=${OSX_SDK_PATH:Q}
+CMAKE_CONFIGURE_ARGS.Darwin+= -DDEFAULT_SYSROOT=${OSX_SDK_PATH:Q}
.endif
# NetBSD < 10 did not provide ENOTRECOVERABLE
@@ -109,7 +109,7 @@ LIBCPP_CHECK= NO
.endif
.if ${OPSYS} == "NetBSD" && ${LIBCPP_CHECK} != YES
-CMAKE_ARGS+= -DCLANG_DEFAULT_CXX_STDLIB:STRING="libstdc++"
+CMAKE_CONFIGURE_ARGS+= -DCLANG_DEFAULT_CXX_STDLIB:STRING="libstdc++"
.endif
# On SunOS use the libraries from the GCC used to build clang rather than
@@ -149,14 +149,14 @@ PKG_SUPPORTED_OPTIONS= tests z3
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mtests)
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
-CMAKE_ARGS+= -DCLANG_INCLUDE_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DCLANG_INCLUDE_TESTS=ON
TEST_TARGET= clang-test
TEST_ENV+= LD_LIBRARY_PATH=${WRKDIR}/build/lib
. include "../../devel/googletest/buildlink3.mk"
.else
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
-CMAKE_ARGS+= -DCLANG_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCLANG_INCLUDE_TESTS=OFF
.endif
.include "../../lang/llvm/buildlink3.mk"
@@ -166,7 +166,7 @@ CMAKE_ARGS+= -DCLANG_INCLUDE_TESTS=OFF
PKG_FAIL_REASON+= "z3 PKG_OPTION must be enabled in lang/llvm"
. endif
. include "../../math/z3/buildlink3.mk"
-CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=ON
.endif
post-extract:
Index: pkgsrc/lang/compiler-rt/Makefile
diff -u pkgsrc/lang/compiler-rt/Makefile:1.25 pkgsrc/lang/compiler-rt/Makefile:1.26
--- pkgsrc/lang/compiler-rt/Makefile:1.25 Sat Jul 6 15:45:06 2024
+++ pkgsrc/lang/compiler-rt/Makefile Sun Aug 25 06:18:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/07/06 15:45:06 adam Exp $
+# $NetBSD: Makefile,v 1.26 2024/08/25 06:18:55 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -21,12 +21,12 @@ USE_TOOLS+= ggrep
GCC_REQD+= 4.8
SSP_SUPPORTED= no
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${PKG_CC:Q}
-CMAKE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=${OPSYS:tl}
-CMAKE_ARGS+= -DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${LLVM_MAJOR_VERSION}
-CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
-CMAKE_ARGS+= -DCOMPILER_RT_ENABLE_IOS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${PKG_CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=${OPSYS:tl}
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${LLVM_MAJOR_VERSION}
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_ENABLE_IOS=OFF
TEST_TARGET= check-compiler-rt
Index: pkgsrc/lang/flang/Makefile
diff -u pkgsrc/lang/flang/Makefile:1.6 pkgsrc/lang/flang/Makefile:1.7
--- pkgsrc/lang/flang/Makefile:1.6 Sat Jul 6 15:45:09 2024
+++ pkgsrc/lang/flang/Makefile Sun Aug 25 06:18:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2024/07/06 15:45:09 adam Exp $
+# $NetBSD: Makefile,v 1.7 2024/08/25 06:18:56 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -16,10 +16,10 @@ USE_LANGUAGES= c c++
USE_TOOLS+= bash:run gmake
GCC_REQD+= 12
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DFLANG_INCLUDE_TESTS=OFF
-CMAKE_ARGS+= -DCLANG_DIR=${BUILDLINK_PREFIX.clang}/lib/cmake/clang
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=YES
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DFLANG_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCLANG_DIR=${BUILDLINK_PREFIX.clang}/lib/cmake/clang
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=YES
REPLACE_BASH= tools/f18/flang-to-external-fc.in
Index: pkgsrc/lang/libLLVM/Makefile
diff -u pkgsrc/lang/libLLVM/Makefile:1.47 pkgsrc/lang/libLLVM/Makefile:1.48
--- pkgsrc/lang/libLLVM/Makefile:1.47 Mon Aug 14 05:24:44 2023
+++ pkgsrc/lang/libLLVM/Makefile Sun Aug 25 06:18:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2023/08/14 05:24:44 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2024/08/25 06:18:56 wiz Exp $
DISTNAME= llvm-13.0.1.src
PKGNAME= ${DISTNAME:S/llvm/libLLVM/:S/.src//}
@@ -20,22 +20,22 @@ PYTHON_FOR_BUILD_ONLY= tool
PYTHON_VERSIONS_INCOMPATIBLE= 27
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
-CMAKE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=ON
-CMAKE_ARGS+= -DLLVM_INSTALL_UTILS=OFF
-CMAKE_ARGS+= -DLLVM_LINK_LLVM_DYLIB=ON
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
-CMAKE_ARGS+= -DLLVM_ENABLE_LIBXML2=OFF
-CMAKE_ARGS+= -DLLVM_BUILD_UTILS=ON # for llvm-tblgen
-CMAKE_ARGS+= -DLLVM_TOOLS_INSTALL_DIR=${PREFIX}/libexec/libLLVM
-CMAKE_ARGS+= -DLLVM_INCLUDE_BENCHMARKS=OFF
-CMAKE_ARGS+= -DLLVM_ENABLE_RTTI=ON
-CMAKE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/lib/libLLVM
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
+CMAKE_CONFIGURE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INSTALL_UTILS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_LINK_LLVM_DYLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_LIBXML2=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_BUILD_UTILS=ON # for llvm-tblgen
+CMAKE_CONFIGURE_ARGS+= -DLLVM_TOOLS_INSTALL_DIR=${PREFIX}/libexec/libLLVM
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_BENCHMARKS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_RTTI=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/lib/libLLVM
-CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
+CMAKE_CONFIGURE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
.for tool in bugpoint bugpoint_passes dsymutil gold llc lli llvm_ar \
llvm_as llvm_as_fuzzer llvm_bcanalyzer llvm_c_test llvm_cat \
@@ -57,7 +57,7 @@ CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr
llvm_libtool_darwin llvm_ifs llvm_dwarfdump llvm_sim \
llvm_tapi_diff
-CMAKE_ARGS+= -DLLVM_TOOL_${tool:tu}_BUILD=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_TOOL_${tool:tu}_BUILD=OFF
.endfor
SUBST_CLASSES+= fix-cnf
@@ -92,7 +92,7 @@ TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/${
.if ${USE_CROSS_COMPILE:U:tl} == "yes"
TOOL_DEPENDS+= ${PKGNAME}:../../${PKGPATH}
-CMAKE_ARGS+= -DLLVM_TABLEGEN:STRING=${TOOLBASE:Q}/libexec/libLLVM/llvm-tblgen
+CMAKE_CONFIGURE_ARGS+= -DLLVM_TABLEGEN:STRING=${TOOLBASE:Q}/libexec/libLLVM/llvm-tblgen
.endif
# 7.0.1 -> 7.0
Index: pkgsrc/lang/libLLVM/options.mk
diff -u pkgsrc/lang/libLLVM/options.mk:1.7 pkgsrc/lang/libLLVM/options.mk:1.8
--- pkgsrc/lang/libLLVM/options.mk:1.7 Tue Jan 24 23:34:36 2023
+++ pkgsrc/lang/libLLVM/options.mk Sun Aug 25 06:18:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2023/01/24 23:34:36 wiz Exp $
+# $NetBSD: options.mk,v 1.8 2024/08/25 06:18:56 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libLLVM
@@ -54,7 +54,7 @@ LLVM_TARGETS_TO_BUILD+= ${tgt}
.if !empty(PKG_OPTIONS:Mterminfo)
.include "../../mk/terminfo.buildlink3.mk"
.else
-CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF
.endif
-CMAKE_ARGS+= -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD:ts;}"
+CMAKE_CONFIGURE_ARGS+= -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD:ts;}"
Index: pkgsrc/lang/libcxx/Makefile
diff -u pkgsrc/lang/libcxx/Makefile:1.20 pkgsrc/lang/libcxx/Makefile:1.21
--- pkgsrc/lang/libcxx/Makefile:1.20 Sat Jul 6 15:45:07 2024
+++ pkgsrc/lang/libcxx/Makefile Sun Aug 25 06:18:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2024/07/06 15:45:07 adam Exp $
+# $NetBSD: Makefile,v 1.21 2024/08/25 06:18:56 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -26,11 +26,11 @@ USE_LANGUAGES= c c++
SSP_SUPPORTED= no
GCC_REQD+= 13
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DLIBCXX_CXX_ABI=system-libcxxabi
-CMAKE_ARGS+= -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/${LIBCXXABI}/include
-CMAKE_ARGS+= -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-CMAKE_ARGS+= -DLIBCXX_INCLUDE_BENCHMARKS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_CXX_ABI=system-libcxxabi
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/${LIBCXXABI}/include
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_INCLUDE_BENCHMARKS=OFF
# avoid conflict with stddef.h
CXXFLAGS.NetBSD+= -D__DEFINED_max_align_t=1
Index: pkgsrc/lang/libcxxabi/Makefile
diff -u pkgsrc/lang/libcxxabi/Makefile:1.20 pkgsrc/lang/libcxxabi/Makefile:1.21
--- pkgsrc/lang/libcxxabi/Makefile:1.20 Sat Jul 6 15:45:06 2024
+++ pkgsrc/lang/libcxxabi/Makefile Sun Aug 25 06:18:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2024/07/06 15:45:06 adam Exp $
+# $NetBSD: Makefile,v 1.21 2024/08/25 06:18:56 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -26,10 +26,10 @@ USE_LANGUAGES= c c++
SSP_SUPPORTED= no
GCC_REQD+= 13 # must be in sync with libcxx
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
# "LIBCXXABI_USE_LLVM_UNWINDER is set to ON, but libunwind is not specified in LLVM_ENABLE_RUNTIMES."
-#CMAKE_ARGS+= -DLLVM_ENABLE_RUNTIMES=libunwind
-CMAKE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+#CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_RUNTIMES=libunwind
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
# avoid conflict with stddef.h
CXXFLAGS.NetBSD+= -D__DEFINED_max_align_t=1
Index: pkgsrc/lang/libunwind/Makefile
diff -u pkgsrc/lang/libunwind/Makefile:1.38 pkgsrc/lang/libunwind/Makefile:1.39
--- pkgsrc/lang/libunwind/Makefile:1.38 Fri Jul 26 22:30:47 2024
+++ pkgsrc/lang/libunwind/Makefile Sun Aug 25 06:18:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2024/07/26 22:30:47 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2024/08/25 06:18:56 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -32,7 +32,7 @@ SSP_SUPPORTED= no
GCC_REQD+= 10 # must be in sync with libcxx
.endif
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
INSTALLATION_DIRS= include
Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.98 pkgsrc/lang/llvm/Makefile:1.99
--- pkgsrc/lang/llvm/Makefile:1.98 Sat Jul 6 15:45:05 2024
+++ pkgsrc/lang/llvm/Makefile Sun Aug 25 06:18:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2024/07/06 15:45:05 adam Exp $
+# $NetBSD: Makefile,v 1.99 2024/08/25 06:18:56 wiz Exp $
#
# When updating this, please also update:
# devel/include-what-you-use
@@ -44,16 +44,16 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27
NOT_FOR_PLATFORM+= *-*-alpha
NOT_FOR_PLATFORM+= *-*-vax
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
-CMAKE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=ON
-CMAKE_ARGS+= -DLLVM_INCLUDE_BENCHMARKS=OFF
-CMAKE_ARGS+= -DLLVM_INSTALL_UTILS=ON
-CMAKE_ARGS+= -DLLVM_LINK_LLVM_DYLIB=ON
-CMAKE_ARGS+= -DLLVM_ENABLE_RTTI=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
+CMAKE_CONFIGURE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_BENCHMARKS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INSTALL_UTILS=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_LINK_LLVM_DYLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_RTTI=ON
-CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
+CMAKE_CONFIGURE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm
@@ -125,12 +125,12 @@ CXXFLAGS+= -mno-pltseq
PLIST_SUBST+= RELEASE_TYPE=${RELEASE_TYPE}
.if ${OPSYS} == "NetBSD"
-CMAKE_ARGS+= -DPKGSRC_LLVM_PTHREADLIB=-lpthread
+CMAKE_CONFIGURE_ARGS+= -DPKGSRC_LLVM_PTHREADLIB=-lpthread
.endif
.if ${USE_CROSS_COMPILE:U:tl} == "yes"
TOOL_DEPENDS+= ${PKGNAME}:../../${PKGPATH}
-CMAKE_ARGS+= -DLLVM_TABLEGEN:STRING=${TOOLBASE:Q}/bin/llvm-tblgen
+CMAKE_CONFIGURE_ARGS+= -DLLVM_TABLEGEN:STRING=${TOOLBASE:Q}/bin/llvm-tblgen
.endif
.include "options.mk"
Index: pkgsrc/lang/llvm/options.mk
diff -u pkgsrc/lang/llvm/options.mk:1.19 pkgsrc/lang/llvm/options.mk:1.20
--- pkgsrc/lang/llvm/options.mk:1.19 Sat Jul 6 15:45:05 2024
+++ pkgsrc/lang/llvm/options.mk Sun Aug 25 06:18:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2024/07/06 15:45:05 adam Exp $
+# $NetBSD: options.mk,v 1.20 2024/08/25 06:18:56 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.llvm
@@ -57,33 +57,33 @@ LLVM_EXPERIMENTAL_TARGETS_TO_BUILD+= ${t
. endif
.endfor
.if !empty(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD)
-CMAKE_ARGS+= -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD:ts;}"
+CMAKE_CONFIGURE_ARGS+= -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD:ts;}"
.endif
.if !empty(PKG_OPTIONS:Mterminfo)
.include "../../mk/terminfo.buildlink3.mk"
.else
-CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF
.endif
.if !empty(PKG_OPTIONS:Mz3)
.include "../../math/z3/buildlink3.mk"
-CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=ON
.endif
.if !empty(PKG_OPTIONS:Mdebug)
RELEASE_TYPE?= debug
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
.else
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
RELEASE_TYPE?= release
.endif
.if !empty(PKG_OPTIONS:Mtests)
# requires "unittes" ?
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
.else
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
.endif
-CMAKE_ARGS+= -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD:ts;}"
+CMAKE_CONFIGURE_ARGS+= -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD:ts;}"
Index: pkgsrc/lang/lua51/buildlink3.mk
diff -u pkgsrc/lang/lua51/buildlink3.mk:1.6 pkgsrc/lang/lua51/buildlink3.mk:1.7
--- pkgsrc/lang/lua51/buildlink3.mk:1.6 Sat Mar 25 18:55:46 2023
+++ pkgsrc/lang/lua51/buildlink3.mk Sun Aug 25 06:18:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2023/03/25 18:55:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2024/08/25 06:18:56 wiz Exp $
BUILDLINK_TREE+= lua51
@@ -18,10 +18,10 @@ BUILDLINK_INCDIRS.lua51+= include/lua-5.
.if defined(USE_CMAKE) || defined(BUILD_USES_CMAKE)
# used by FindLua.cmake
-CMAKE_ARGS+= -DLua_FIND_VERSION_EXACT=ON
-CMAKE_ARGS+= -DLua_FIND_VERSION_COUNT=2
-CMAKE_ARGS+= -DLua_FIND_VERSION_MAJOR=5
-CMAKE_ARGS+= -DLua_FIND_VERSION_MINOR=1
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_EXACT=ON
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_COUNT=2
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_MAJOR=5
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_MINOR=1
.endif
.include "../../mk/readline.buildlink3.mk"
Index: pkgsrc/lang/lua52/buildlink3.mk
diff -u pkgsrc/lang/lua52/buildlink3.mk:1.6 pkgsrc/lang/lua52/buildlink3.mk:1.7
--- pkgsrc/lang/lua52/buildlink3.mk:1.6 Sat Mar 25 18:55:46 2023
+++ pkgsrc/lang/lua52/buildlink3.mk Sun Aug 25 06:18:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2023/03/25 18:55:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2024/08/25 06:18:56 wiz Exp $
BUILDLINK_TREE+= lua52
@@ -18,10 +18,10 @@ BUILDLINK_INCDIRS.lua52+= include/lua-5.
.if defined(USE_CMAKE) || defined(BUILD_USES_CMAKE)
# used by FindLua.cmake
-CMAKE_ARGS+= -DLua_FIND_VERSION_EXACT=ON
-CMAKE_ARGS+= -DLua_FIND_VERSION_COUNT=2
-CMAKE_ARGS+= -DLua_FIND_VERSION_MAJOR=5
-CMAKE_ARGS+= -DLua_FIND_VERSION_MINOR=2
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_EXACT=ON
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_COUNT=2
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_MAJOR=5
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_MINOR=2
.endif
.include "../../mk/readline.buildlink3.mk"
Index: pkgsrc/lang/lua53/buildlink3.mk
diff -u pkgsrc/lang/lua53/buildlink3.mk:1.4 pkgsrc/lang/lua53/buildlink3.mk:1.5
--- pkgsrc/lang/lua53/buildlink3.mk:1.4 Sat Mar 25 18:55:46 2023
+++ pkgsrc/lang/lua53/buildlink3.mk Sun Aug 25 06:18:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2023/03/25 18:55:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2024/08/25 06:18:57 wiz Exp $
BUILDLINK_TREE+= lua53
@@ -18,10 +18,10 @@ BUILDLINK_INCDIRS.lua53+= include/lua-5.
.if defined(USE_CMAKE) || defined(BUILD_USES_CMAKE)
# used by FindLua.cmake
-CMAKE_ARGS+= -DLua_FIND_VERSION_EXACT=ON
-CMAKE_ARGS+= -DLua_FIND_VERSION_COUNT=2
-CMAKE_ARGS+= -DLua_FIND_VERSION_MAJOR=5
-CMAKE_ARGS+= -DLua_FIND_VERSION_MINOR=3
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_EXACT=ON
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_COUNT=2
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_MAJOR=5
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_MINOR=3
.endif
.include "../../mk/readline.buildlink3.mk"
Index: pkgsrc/lang/lua54/buildlink3.mk
diff -u pkgsrc/lang/lua54/buildlink3.mk:1.4 pkgsrc/lang/lua54/buildlink3.mk:1.5
--- pkgsrc/lang/lua54/buildlink3.mk:1.4 Sat Mar 25 18:55:47 2023
+++ pkgsrc/lang/lua54/buildlink3.mk Sun Aug 25 06:18:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2023/03/25 18:55:47 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2024/08/25 06:18:57 wiz Exp $
BUILDLINK_TREE+= lua54
@@ -18,10 +18,10 @@ BUILDLINK_INCDIRS.lua54+= include/lua-5.
.if defined(USE_CMAKE) || defined(BUILD_USES_CMAKE)
# used by FindLua.cmake
-CMAKE_ARGS+= -DLua_FIND_VERSION_EXACT=ON
-CMAKE_ARGS+= -DLua_FIND_VERSION_COUNT=2
-CMAKE_ARGS+= -DLua_FIND_VERSION_MAJOR=5
-CMAKE_ARGS+= -DLua_FIND_VERSION_MINOR=4
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_EXACT=ON
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_COUNT=2
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_MAJOR=5
+CMAKE_CONFIGURE_ARGS+= -DLua_FIND_VERSION_MINOR=4
.endif
.include "../../mk/readline.buildlink3.mk"
Index: pkgsrc/lang/mlir/Makefile
diff -u pkgsrc/lang/mlir/Makefile:1.4 pkgsrc/lang/mlir/Makefile:1.5
--- pkgsrc/lang/mlir/Makefile:1.4 Sat Jul 6 15:45:09 2024
+++ pkgsrc/lang/mlir/Makefile Sun Aug 25 06:18:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/07/06 15:45:09 adam Exp $
+# $NetBSD: Makefile,v 1.5 2024/08/25 06:18:57 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -15,9 +15,9 @@ USE_CXX_FEATURES= c++14
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DMLIR_INSTALL_AGGREGATE_OBJECTS=NO
-CMAKE_ARGS+= -DMLIR_BUILD_MLIR_C_DYLIB=YES
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DMLIR_INSTALL_AGGREGATE_OBJECTS=NO
+CMAKE_CONFIGURE_ARGS+= -DMLIR_BUILD_MLIR_C_DYLIB=YES
.include "../../devel/cmake/build.mk"
.include "../../lang/llvm/buildlink3.mk"
Index: pkgsrc/lang/neko/options.mk
diff -u pkgsrc/lang/neko/options.mk:1.1 pkgsrc/lang/neko/options.mk:1.2
--- pkgsrc/lang/neko/options.mk:1.1 Tue Mar 24 13:23:46 2020
+++ pkgsrc/lang/neko/options.mk Sun Aug 25 06:18:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/03/24 13:23:46 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:57 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.neko
@@ -9,54 +9,54 @@ PKG_SUGGESTED_OPTIONS= apache mysql pcre
PLIST_VARS+= apache
.if !empty(PKG_OPTIONS:Mapache)
-CMAKE_ARGS+= -DWITH_APACHE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_APACHE=ON
.include "../../www/apache24/buildlink3.mk"
PLIST.apache= yes
.else
-CMAKE_ARGS+= -DWITH_APACHE=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_APACHE=OFF
.endif
PLIST_VARS+= mysql
.if !empty(PKG_OPTIONS:Mmysql)
-CMAKE_ARGS+= -DWITH_MYSQL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_MYSQL=ON
.include "../../mk/mysql.buildlink3.mk"
PLIST.mysql= yes
.else
-CMAKE_ARGS+= -DWITH_MYSQL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_MYSQL=OFF
.endif
PLIST_VARS+= regexp
.if !empty(PKG_OPTIONS:Mpcre)
-CMAKE_ARGS+= -DWITH_REGEXP=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_REGEXP=ON
.include "../../devel/pcre/buildlink3.mk"
PLIST.regexp= yes
.else
-CMAKE_ARGS+= -DWITH_REGEXP=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_REGEXP=OFF
.endif
PLIST_VARS+= sqlite
.if !empty(PKG_OPTIONS:Msqlite)
-CMAKE_ARGS+= -DWITH_SQLITE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_SQLITE=ON
.include "../../databases/sqlite3/buildlink3.mk"
PLIST.sqlite= yes
.else
-CMAKE_ARGS+= -DWITH_SQLITE=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SQLITE=OFF
.endif
PLIST_VARS+= ssl
.if !empty(PKG_OPTIONS:Mssl)
-CMAKE_ARGS+= -DWITH_SSL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=ON
.include "../../security/mbedtls/buildlink3.mk"
PLIST.ssl= yes
.else
-CMAKE_ARGS+= -DWITH_SSL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SSL=OFF
.endif
PLIST_VARS+= ui
.if !empty(PKG_OPTIONS:Mgtk2)
-CMAKE_ARGS+= -DWITH_UI=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_UI=ON
.include "../../x11/gtk2/buildlink3.mk"
PLIST.ui= yes
.else
-CMAKE_ARGS+= -DWITH_UI=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_UI=OFF
.endif
Index: pkgsrc/lang/oorexx/Makefile
diff -u pkgsrc/lang/oorexx/Makefile:1.2 pkgsrc/lang/oorexx/Makefile:1.3
--- pkgsrc/lang/oorexx/Makefile:1.2 Wed Jun 19 11:11:23 2024
+++ pkgsrc/lang/oorexx/Makefile Sun Aug 25 06:18:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2024/06/19 11:11:23 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:18:57 wiz Exp $
#
DISTNAME= oorexx-5.0.0-12583
@@ -28,8 +28,8 @@ WRKSRC= ${WRKDIR}
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/lib
MAKE_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/lib
-CMAKE_ARGS+= -DORX_SHEBANG=${PREFIX}/bin/rexx
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Subversion:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DORX_SHEBANG=${PREFIX}/bin/rexx
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Subversion:BOOL=TRUE
post-install:
# Fix up bad permissions.
Index: pkgsrc/lang/python/pyversion.mk
diff -u pkgsrc/lang/python/pyversion.mk:1.163 pkgsrc/lang/python/pyversion.mk:1.164
--- pkgsrc/lang/python/pyversion.mk:1.163 Mon Aug 12 07:49:50 2024
+++ pkgsrc/lang/python/pyversion.mk Sun Aug 25 06:18:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.163 2024/08/12 07:49:50 wiz Exp $
+# $NetBSD: pyversion.mk,v 1.164 2024/08/25 06:18:57 wiz Exp $
# This file should be included by packages as a way to depend on
# python when none of the other methods are appropriate, e.g. a
@@ -258,25 +258,25 @@ PRINT_PLIST_AWK+= /(^|^\$$.+\})${PYLIB:S
ALL_ENV+= PYTHON=${TOOL_PYTHONBIN}
.if defined(USE_CMAKE) || defined(BUILD_USES_CMAKE)
# used by FindPython
-CMAKE_ARGS+= -DPython_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
-CMAKE_ARGS+= -DPython_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
+CMAKE_CONFIGURE_ARGS+= -DPython_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DPython_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
# used by FindPython2
. if !empty(_PYTHON_VERSION:M2*)
-CMAKE_ARGS+= -DPython2_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
-CMAKE_ARGS+= -DPython2_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
+CMAKE_CONFIGURE_ARGS+= -DPython2_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DPython2_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
. endif
# used by FindPython3
. if !empty(_PYTHON_VERSION:M3*)
-CMAKE_ARGS+= -DPython3_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
-CMAKE_ARGS+= -DPython3_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
+CMAKE_CONFIGURE_ARGS+= -DPython3_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DPython3_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
. endif
# used by FindPythonInterp.cmake and FindPythonLibs.cmake
-CMAKE_ARGS+= -DPYVERSSUFFIX:STRING=${PYVERSSUFFIX}
+CMAKE_CONFIGURE_ARGS+= -DPYVERSSUFFIX:STRING=${PYVERSSUFFIX}
# set this explicitly, as by default it will prefer the built in framework
# on Darwin
-CMAKE_ARGS+= -DPYTHON_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
-CMAKE_ARGS+= -DPYTHON_INCLUDE_PATH:PATH=${BUILDLINK_DIR}/${PYINC}
-CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_INCLUDE_PATH:PATH=${BUILDLINK_DIR}/${PYINC}
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${TOOL_PYTHONBIN}
.endif
_VARGROUPS+= pyversion
@@ -287,7 +287,7 @@ _PKG_VARS.pyversion= \
_SYS_VARS.pyversion= \
PYTHON_VERSION PYTHON_VERSION_REQD PYPACKAGE PYVERSSUFFIX \
PYPKGSRCDIR PYPKGPREFIX PYTHONBIN PYTHONCONFIG PY_COMPILE_ALL \
- PY_COMPILE_O_ALL PYINC PYLIB PYSITELIB CMAKE_ARGS \
+ PY_COMPILE_O_ALL PYINC PYLIB PYSITELIB CMAKE_CONFIGURE_ARGS \
TOOL_PYTHONBIN
_USE_VARS.pyversion= \
PKGNAME_REQD PKGNAME_OLD LOCALBASE PREFIX BUILDLINK_DIR PKGNAME
Index: pkgsrc/lang/squeak-vm/Makefile
diff -u pkgsrc/lang/squeak-vm/Makefile:1.66 pkgsrc/lang/squeak-vm/Makefile:1.67
--- pkgsrc/lang/squeak-vm/Makefile:1.66 Sun Apr 7 07:34:32 2024
+++ pkgsrc/lang/squeak-vm/Makefile Sun Aug 25 06:18:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2024/04/07 07:34:32 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2024/08/25 06:18:57 wiz Exp $
#
SQUEAK_VERSION= 4.10.2.2614
@@ -23,10 +23,10 @@ USE_TOOLS+= gzip pkg-config
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ../unix
-#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE # debug
-CMAKE_ARGS+= -DPKGMANDIR=${PKGMANDIR}
-CMAKE_ARGS+= -DVM_HOST=${MACHINE_GNU_PLATFORM:Q} -DVM_VERSION=${SQUEAK_VERSION}
-CMAKE_ARGS+= -DDEVOSSAUDIO=${DEVOSSAUDIO}
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE # debug
+CMAKE_CONFIGURE_ARGS+= -DPKGMANDIR=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DVM_HOST=${MACHINE_GNU_PLATFORM:Q} -DVM_VERSION=${SQUEAK_VERSION}
+CMAKE_CONFIGURE_ARGS+= -DDEVOSSAUDIO=${DEVOSSAUDIO}
LDFLAGS.SunOS+= -lsocket -lnsl -lm
@@ -58,6 +58,6 @@ pre-configure:
.include "../../mk/oss.buildlink3.mk"
.if ${OSS_TYPE} != "none"
PLIST.oss= yes
-CMAKE_ARGS+= -DLIBOSSAUDIO=${LIBOSSAUDIO:S/-l//}
+CMAKE_CONFIGURE_ARGS+= -DLIBOSSAUDIO=${LIBOSSAUDIO:S/-l//}
.endif
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/swi-prolog-jpl/Makefile
diff -u pkgsrc/lang/swi-prolog-jpl/Makefile:1.8 pkgsrc/lang/swi-prolog-jpl/Makefile:1.9
--- pkgsrc/lang/swi-prolog-jpl/Makefile:1.8 Wed Dec 21 13:06:48 2022
+++ pkgsrc/lang/swi-prolog-jpl/Makefile Sun Aug 25 06:18:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/12/21 13:06:48 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2024/08/25 06:18:57 wiz Exp $
.include "../../lang/swi-prolog-lite/Makefile.common"
@@ -12,18 +12,18 @@ USE_TOOLS+= pkg-config
# does not find JNI for java>=11
PKG_JVMS_ACCEPTED= kaffe openjdk8 sun-jdk7 oracle-jdk8
-CMAKE_ARGS+= -DSWIPL_PACKAGES_JAVA=ON
-CMAKE_ARGS+= -DINSTALL_PACKAGES=OFF
-CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_JAVA=ON
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PACKAGES=OFF
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCUMENTATION=OFF
# Part of swi-prolog-lite
-CMAKE_ARGS+= -DSWIPL_PACKAGES_ARCHIVE=OFF
-CMAKE_ARGS+= -DSWIPL_PACKAGES_BASIC=OFF
-CMAKE_ARGS+= -DSWIPL_PACKAGES_SSL=OFF
-CMAKE_ARGS+= -DSWIPL_PACKAGES_TERM=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_ARCHIVE=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_BASIC=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_SSL=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_TERM=OFF
# Part of swi-prolog-packages
-CMAKE_ARGS+= -DSWIPL_PACKAGES_X=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_X=OFF
SWIPL_PACKAGES_COMPONENTS+= Java_interface
Index: pkgsrc/lang/swi-prolog-lite/Makefile
diff -u pkgsrc/lang/swi-prolog-lite/Makefile:1.33 pkgsrc/lang/swi-prolog-lite/Makefile:1.34
--- pkgsrc/lang/swi-prolog-lite/Makefile:1.33 Tue Oct 24 22:09:40 2023
+++ pkgsrc/lang/swi-prolog-lite/Makefile Sun Aug 25 06:18:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2023/10/24 22:09:40 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2024/08/25 06:18:58 wiz Exp $
.include "Makefile.common"
@@ -8,18 +8,18 @@ PKGREVISION= 3
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= ISO/Edinburgh-style Prolog compiler
-CMAKE_ARGS+= -DSWIPL_INSTALL_MANPAGES=${PKGMANDIR}/man1
-CMAKE_ARGS+= -DSWIPL_PACKAGES_BASIC=ON
-CMAKE_ARGS+= -DSWIPL_PACKAGES_ARCHIVE=ON
-CMAKE_ARGS+= -DSWIPL_PACKAGES_SSL=ON
-CMAKE_ARGS+= -DSWIPL_PACKAGES_TERM=ON
-CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=ON
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_INSTALL_MANPAGES=${PKGMANDIR}/man1
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_BASIC=ON
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_ARCHIVE=ON
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_SSL=ON
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_TERM=ON
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCUMENTATION=ON
# Part of swi-prolog-jpl
-CMAKE_ARGS+= -DSWIPL_PACKAGES_JAVA=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_JAVA=OFF
# Part of swi-prolog-packages
-CMAKE_ARGS+= -DSWIPL_PACKAGES_X=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_X=OFF
USE_TOOLS+= bash:run
Index: pkgsrc/lang/swi-prolog-lite/Makefile.common
diff -u pkgsrc/lang/swi-prolog-lite/Makefile.common:1.18 pkgsrc/lang/swi-prolog-lite/Makefile.common:1.19
--- pkgsrc/lang/swi-prolog-lite/Makefile.common:1.18 Wed Jul 10 10:32:05 2019
+++ pkgsrc/lang/swi-prolog-lite/Makefile.common Sun Aug 25 06:18:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2019/07/10 10:32:05 nia Exp $
+# $NetBSD: Makefile.common,v 1.19 2024/08/25 06:18:58 wiz Exp $
#
# used by lang/swi-prolog/Makefile
# used by lang/swi-prolog-packages/Makefile
@@ -18,18 +18,18 @@ DISTINFO_FILE= ${.CURDIR}/../../lang/sw
PATCHDIR= ${.CURDIR}/../../lang/swi-prolog-lite/patches
USE_CMAKE= yes
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DSWIPL_ARCH=${MACHINE_GNU_PLATFORM}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_ARCH=${MACHINE_GNU_PLATFORM}
# XXX: Explicitly disable all not wanted packages to avoid possible build
# XXX: failures. For a complete list please see:
# XXX: ${WRKSRC}/cmake/PackageSelection.cmake
-CMAKE_ARGS+= -DSWIPL_PACKAGES_ODBC=OFF
-CMAKE_ARGS+= -DSWIPL_PACKAGES_BDB=OFF
-CMAKE_ARGS+= -DSWIPL_PACKAGES_PCRE=OFF
-CMAKE_ARGS+= -DSWIPL_PACKAGES_YAML=OFF
-CMAKE_ARGS+= -DSWIPL_PACKAGES_TIPC=OFF
-CMAKE_ARGS+= -DSWIPL_PACKAGES_QT=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_ODBC=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_BDB=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_PCRE=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_YAML=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_TIPC=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_QT=OFF
USE_LANGUAGES= c c++
Index: pkgsrc/lang/swi-prolog-packages/Makefile
diff -u pkgsrc/lang/swi-prolog-packages/Makefile:1.57 pkgsrc/lang/swi-prolog-packages/Makefile:1.58
--- pkgsrc/lang/swi-prolog-packages/Makefile:1.57 Sun Nov 12 13:22:33 2023
+++ pkgsrc/lang/swi-prolog-packages/Makefile Sun Aug 25 06:18:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2023/11/12 13:22:33 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2024/08/25 06:18:58 wiz Exp $
PKGREVISION= 5
.include "../../lang/swi-prolog-lite/Makefile.common"
@@ -10,19 +10,19 @@ COMMENT= Packages for SWI Prolog
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DINSTALL_PACKAGES=ON
-CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=ON
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PACKAGES=ON
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOCUMENTATION=ON
# Part of swi-prolog-lite
-CMAKE_ARGS+= -DSWIPL_PACKAGES_BASIC=OFF
-CMAKE_ARGS+= -DSWIPL_PACKAGES_SSL=OFF
-CMAKE_ARGS+= -DSWIPL_PACKAGES_TERM=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_BASIC=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_SSL=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_TERM=OFF
# Part of swi-prolog-lite... ...but needed to build documentation.
-CMAKE_ARGS+= -DSWIPL_PACKAGES_ARCHIVE=ON
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_ARCHIVE=ON
# Part of swi-prolog-jpl
-CMAKE_ARGS+= -DSWIPL_PACKAGES_JAVA=OFF
+CMAKE_CONFIGURE_ARGS+= -DSWIPL_PACKAGES_JAVA=OFF
SWIPL_PACKAGES_COMPONENTS+= Graphics_subsystem
Index: pkgsrc/lang/wasi-compiler-rt/Makefile
diff -u pkgsrc/lang/wasi-compiler-rt/Makefile:1.27 pkgsrc/lang/wasi-compiler-rt/Makefile:1.28
--- pkgsrc/lang/wasi-compiler-rt/Makefile:1.27 Sat Jul 6 15:45:09 2024
+++ pkgsrc/lang/wasi-compiler-rt/Makefile Sun Aug 25 06:18:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2024/07/06 15:45:09 adam Exp $
+# $NetBSD: Makefile,v 1.28 2024/08/25 06:18:58 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -32,32 +32,32 @@ BUILDLINK_TRANSFORM+= rm:-I${PREFIX}/inc
CMAKE_BUILD_DIR= cmake-pkgsrc-build
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=wasi
-CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
-CMAKE_ARGS+= -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=wasm32-wasi
-CMAKE_ARGS+= -DCOMPILER_RT_BAREMETAL_BUILD=TRUE
-CMAKE_ARGS+= -DCMAKE_SYSROOT=${BUILDLINK_DIR}/wasi
-CMAKE_ARGS+= -DCOMPILER_RT_BAREMETAL_BUILD=TRUE
-CMAKE_ARGS+= -DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=TRUE
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_FPIC_FLAG:BOOL=ON
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_FPIE_FLAG:BOOL=ON
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_FNO_BUILTIN_FLAG:BOOL=ON
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_STD_C11_FLAG:BOOL=ON
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_VISIBILITY_HIDDEN_FLAG:BOOL=ON
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_FREESTANDING_FLAG:BOOL=ON
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_XRAY_COMPILER_FLAG:BOOL=OFF
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_ATOMIC_KEYWORD:BOOL=ON
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_BFLOAT16:BOOL=OFF
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_FLOAT16:BOOL=OFF
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_ASM_LSE:BOOL=OFF
-CMAKE_ARGS+= -DCMAKE_C_COMPILER_WORKS=1 # Do not test clang compile
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER_WORKS=1 # Do not test clang++ compile
-CMAKE_ARGS+= -DCOMPILER_RT_ENABLE_IOS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=wasi
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=wasm32-wasi
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_BAREMETAL_BUILD=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_SYSROOT=${BUILDLINK_DIR}/wasi
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_BAREMETAL_BUILD=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_FPIC_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_FPIE_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_FNO_BUILTIN_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_STD_C11_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_VISIBILITY_HIDDEN_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_FREESTANDING_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_XRAY_COMPILER_FLAG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_ATOMIC_KEYWORD:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_BFLOAT16:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_FLOAT16:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_ASM_LSE:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER_WORKS=1 # Do not test clang compile
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER_WORKS=1 # Do not test clang++ compile
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_ENABLE_IOS:BOOL=OFF
CMAKE_INSTALL_PREFIX= ${PREFIX}/lib/clang/${LLVM_MAJOR_VERSION}
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
GENERATE_PLIST+= find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
@@ -70,18 +70,18 @@ pre-configure:
do-configure:
${RUN} cd ${WRKSRC}/${CMAKE_BUILD_DIR} && \
${SETENV} ${CONFIGURE_ENV} cmake \
- ${CMAKE_ARGS} \
+ ${CMAKE_CONFIGURE_ARGS} \
${WRKSRC}/lib/builtins
do-build:
${RUN} cd ${WRKSRC}/${CMAKE_BUILD_DIR} && \
${SETENV} ${MAKE_ENV} \
- ${MAKE} ${CMAKE_ARGS} ${BUILD_TARGET}
+ ${MAKE} ${CMAKE_CONFIGURE_ARGS} ${BUILD_TARGET}
do-install:
${RUN} cd ${WRKSRC}/${CMAKE_BUILD_DIR} && \
${SETENV} ${INSTALL_ENV} \
- ${MAKE} ${CMAKE_ARGS} ${INSTALL_TARGET}
+ ${MAKE} ${CMAKE_CONFIGURE_ARGS} ${INSTALL_TARGET}
# Run llvm-ranlib again on the archive. Fixes mystery build failure
# in Firefox due to missing index (see PR pkg/56590). Might be a MAKE_JOBS
Index: pkgsrc/lang/wasi-libcxx/Makefile
diff -u pkgsrc/lang/wasi-libcxx/Makefile:1.25 pkgsrc/lang/wasi-libcxx/Makefile:1.26
--- pkgsrc/lang/wasi-libcxx/Makefile:1.25 Sat Jul 6 15:45:09 2024
+++ pkgsrc/lang/wasi-libcxx/Makefile Sun Aug 25 06:18:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/07/06 15:45:09 adam Exp $
+# $NetBSD: Makefile,v 1.26 2024/08/25 06:18:58 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -38,108 +38,108 @@ USE_CMAKE= yes
SSP_SUPPORTED= no
PKGSRC_USE_STACK_CHECK= no
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DLIBCXXABI_LIBCXX_INCLUDES=${WRKDIR}/libcxx/include
-CMAKE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-CMAKE_ARGS+= -DCMAKE_C_COMPILER_WORKS=1
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER_WORKS=1
-CMAKE_ARGS+= -DCXX_SUPPORTS_CXX11=ON
-CMAKE_ARGS+= -DLLVM_COMPILER_CHECKED=ON
-CMAKE_ARGS+= -DUNIX:BOOL=ON
-CMAKE_ARGS+= -DCMAKE_SYSROOT=${BUILDLINK_DIR}/wasi
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER_TARGET=wasm32-wasi
-CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${PREFIX}/bin/llvm-config
-CMAKE_ARGS+= -DLIBCXX_LIBDIR_SUFFIX=/wasm32-wasi
-CMAKE_ARGS+= -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=FALSE
-CMAKE_ARGS+= -DLIBCXX_INCLUDE_TESTS:BOOL=FALSE
-CMAKE_ARGS+= -DLIBCXX_ENABLE_THREADS:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_HAS_PTHREAD_API:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_HAS_EXTERNAL_THREAD_API:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_HAS_WIN32_THREAD_API:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_ENABLE_SHARED:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_ENABLE_EXCEPTIONS:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_ENABLE_FILESYSTEM:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_CXX_ABI=libcxxabi
-CMAKE_ARGS+= -DLIBCXX_HAS_MUSL_LIBC:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_ABI_VERSION=2
-CMAKE_ARGS+= -DLIBCXXABI_LIBDIR_SUFFIX=/wasm32-wasi
-CMAKE_ARGS+= -DLIBCXXABI_ENABLE_EXCEPTIONS:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_ENABLE_SHARED:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_SILENT_TERMINATE:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_ENABLE_THREADS:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_HAS_PTHREAD_API:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_FNO_EXCEPTIONS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_NOSTDLIBXX_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_NODEFAULTLIBS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_HAS_COMMENT_LIB_PRAGMA:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_FALIGNED_ALLOCATION_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_NOSTDINCXX_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_FVISIBILITY_EQ_HIDDEN_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WALL_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WEXTRA_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_W_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WWRITE_STRINGS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WNO_UNUSED_PARAMETER_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WNO_LONG_LONG_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WERROR_EQ_RETURN_TYPE_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WEXTRA_SEMI_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WNO_COVERED_SWITCH_DEFAULT_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WNO_SUGGEST_OVERRIDE_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WNO_IGNORED_ATTRIBUTES_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_EHS_FLAG:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_EHA_FLAG:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_ZL_FLAG:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_NODEFAULTLIB_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_FNO_EXCEPTIONS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_NOSTDLIBXX_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_NODEFAULTLIBS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_HAS_COMMENT_LIB_PRAGMA:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_FALIGNED_ALLOCATION_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_NOSTDINCXX_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_FVISIBILITY_EQ_HIDDEN_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WALL_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WEXTRA_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_W_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WWRITE_STRINGS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_UNUSED_PARAMETER_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_LONG_LONG_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WERROR_EQ_RETURN_TYPE_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WEXTRA_SEMI_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_COVERED_SWITCH_DEFAULT_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_SUGGEST_OVERRIDE_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_IGNORED_ATTRIBUTES_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_EHS_FLAG:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_EHA_FLAG:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_ZL_FLAG:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_NODEFAULTLIB_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WCHAR_SUBSCRIPTS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WCONVERSION_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WMISMATCHED_TAGS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WMISSING_BRACES_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WNEWLINE_EOF_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WUNUSED_FUNCTION_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WSHADOW_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WSHORTEN_64_TO_32_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WSIGN_COMPARE_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WSIGN_CONVERSION_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WSTRICT_ALIASING_EQ_2_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WSTRICT_OVERFLOW_EQ_4_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WUNUSED_PARAMETER_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WUNUSED_VARIABLE_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_PEDANTIC_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_FSTRICT_ALIASING_FLAG:BOOL=ON
-CMAKE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
-CMAKE_ARGS+= -DCMAKE_C_FLAGS=-fno-exceptions
-CMAKE_ARGS+= -DCMAKE_CXX_FLAGS=-fno-exceptions
-CMAKE_ARGS+= -DLIBCXX_CXX_ABI=system-libcxxabi
-CMAKE_ARGS+= -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/libcxxabi/include
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_LIBCXX_INCLUDES=${WRKDIR}/libcxx/include
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER_WORKS=1
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER_WORKS=1
+CMAKE_CONFIGURE_ARGS+= -DCXX_SUPPORTS_CXX11=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_COMPILER_CHECKED=ON
+CMAKE_CONFIGURE_ARGS+= -DUNIX:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_SYSROOT=${BUILDLINK_DIR}/wasi
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER_TARGET=wasm32-wasi
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG_PATH=${PREFIX}/bin/llvm-config
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_LIBDIR_SUFFIX=/wasm32-wasi
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=FALSE
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_INCLUDE_TESTS:BOOL=FALSE
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ENABLE_THREADS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_HAS_PTHREAD_API:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_HAS_EXTERNAL_THREAD_API:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_HAS_WIN32_THREAD_API:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ENABLE_SHARED:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ENABLE_EXCEPTIONS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ENABLE_FILESYSTEM:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_CXX_ABI=libcxxabi
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_HAS_MUSL_LIBC:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ABI_VERSION=2
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_LIBDIR_SUFFIX=/wasm32-wasi
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_ENABLE_EXCEPTIONS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_ENABLE_SHARED:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SILENT_TERMINATE:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_ENABLE_THREADS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_HAS_PTHREAD_API:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_FNO_EXCEPTIONS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_NOSTDLIBXX_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_NODEFAULTLIBS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_HAS_COMMENT_LIB_PRAGMA:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_FALIGNED_ALLOCATION_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_NOSTDINCXX_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_FVISIBILITY_EQ_HIDDEN_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WALL_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WEXTRA_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_W_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WWRITE_STRINGS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WNO_UNUSED_PARAMETER_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WNO_LONG_LONG_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WERROR_EQ_RETURN_TYPE_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WEXTRA_SEMI_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WNO_COVERED_SWITCH_DEFAULT_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WNO_SUGGEST_OVERRIDE_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WNO_IGNORED_ATTRIBUTES_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_EHS_FLAG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_EHA_FLAG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_ZL_FLAG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_NODEFAULTLIB_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_FNO_EXCEPTIONS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_NOSTDLIBXX_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_NODEFAULTLIBS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_HAS_COMMENT_LIB_PRAGMA:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_FALIGNED_ALLOCATION_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_NOSTDINCXX_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_FVISIBILITY_EQ_HIDDEN_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WALL_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WEXTRA_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_W_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WWRITE_STRINGS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_UNUSED_PARAMETER_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_LONG_LONG_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WERROR_EQ_RETURN_TYPE_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WEXTRA_SEMI_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_COVERED_SWITCH_DEFAULT_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_SUGGEST_OVERRIDE_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_IGNORED_ATTRIBUTES_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_EHS_FLAG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_EHA_FLAG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_ZL_FLAG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_NODEFAULTLIB_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WCHAR_SUBSCRIPTS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WCONVERSION_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WMISMATCHED_TAGS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WMISSING_BRACES_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WNEWLINE_EOF_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WUNUSED_FUNCTION_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WSHADOW_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WSHORTEN_64_TO_32_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WSIGN_COMPARE_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WSIGN_CONVERSION_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WSTRICT_ALIASING_EQ_2_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WSTRICT_OVERFLOW_EQ_4_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WUNUSED_PARAMETER_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WUNUSED_VARIABLE_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_PEDANTIC_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_FSTRICT_ALIASING_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_FLAGS=-fno-exceptions
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_FLAGS=-fno-exceptions
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_CXX_ABI=system-libcxxabi
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/libcxxabi/include
CMAKE_INSTALL_PREFIX= ${PREFIX}/wasi
@@ -155,10 +155,10 @@ post-extract:
do-configure:
cd ${WRKSRC} && cd build_libcxx && \
${PKGSRC_SETENV} ${_CONFIGURE_CMAKE_ENV} \
- cmake ${CMAKE_ARGS} ../libcxx
+ cmake ${CMAKE_CONFIGURE_ARGS} ../libcxx
cd ${WRKSRC} && cd build_libcxxabi && \
${PKGSRC_SETENV} ${_CONFIGURE_CMAKE_ENV} \
- cmake ${CMAKE_ARGS} ../libcxxabi
+ cmake ${CMAKE_CONFIGURE_ARGS} ../libcxxabi
# Run llvm-ranlib again on the archives. Fixes mystery build failure
# in Firefox due to missing index (see PR pkg/56590). Might be a MAKE_JOBS
Index: pkgsrc/mail/evolution/Makefile
diff -u pkgsrc/mail/evolution/Makefile:1.276 pkgsrc/mail/evolution/Makefile:1.277
--- pkgsrc/mail/evolution/Makefile:1.276 Wed May 29 16:33:20 2024
+++ pkgsrc/mail/evolution/Makefile Sun Aug 25 06:18:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.276 2024/05/29 16:33:20 adam Exp $
+# $NetBSD: Makefile,v 1.277 2024/08/25 06:18:58 wiz Exp $
DISTNAME= evolution-3.34.1
PKGREVISION= 30
@@ -20,13 +20,13 @@ DEPENDS+= highlight-[0-9]*:../../textpro
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/evolution
-CMAKE_ARGS+= -DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
-CMAKE_ARGS+= -DENABLE_GNOME_DESKTOP=OFF
-CMAKE_ARGS+= -DENABLE_CONTACT_MAPS=OFF
-CMAKE_ARGS+= -DENABLE_AUTOAR=OFF
-CMAKE_ARGS+= -DENABLE_WEATHER=OFF
-CMAKE_ARGS+= -DENABLE_PST_IMPORT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GNOME_DESKTOP=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CONTACT_MAPS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_AUTOAR=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WEATHER=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PST_IMPORT=OFF
PKGCONFIG_OVERRIDE+= evolution-calendar.pc.in
PKGCONFIG_OVERRIDE+= evolution-mail.pc.in
Index: pkgsrc/mail/evolution-data-server/Makefile
diff -u pkgsrc/mail/evolution-data-server/Makefile:1.229 pkgsrc/mail/evolution-data-server/Makefile:1.230
--- pkgsrc/mail/evolution-data-server/Makefile:1.229 Sat Jun 1 18:07:53 2024
+++ pkgsrc/mail/evolution-data-server/Makefile Sun Aug 25 06:18:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.229 2024/06/01 18:07:53 prlw1 Exp $
+# $NetBSD: Makefile,v 1.230 2024/08/25 06:18:58 wiz Exp $
DISTNAME= evolution-data-server-3.42.2
PKGREVISION= 18
@@ -19,10 +19,10 @@ USE_LANGUAGES= c c++
FORCE_CXX_STD= c++17
-CMAKE_ARGS+= -DWITH_LIBDB=OFF
-CMAKE_ARGS+= -DENABLE_GOA=OFF
-CMAKE_ARGS+= -DENABLE_WEATHER=OFF
-CMAKE_ARGS+= -DENABLE_OAUTH2=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_LIBDB=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GOA=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WEATHER=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_OAUTH2=OFF
CFLAGS.NetBSD+= -D_NETBSD_SOURCE
Index: pkgsrc/mail/qsmtp/Makefile
diff -u pkgsrc/mail/qsmtp/Makefile:1.9 pkgsrc/mail/qsmtp/Makefile:1.10
--- pkgsrc/mail/qsmtp/Makefile:1.9 Tue Oct 24 22:09:49 2023
+++ pkgsrc/mail/qsmtp/Makefile Sun Aug 25 06:18:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/10/24 22:09:49 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2024/08/25 06:18:58 wiz Exp $
DISTNAME= Qsmtp-0.39
PKGREVISION= 1
@@ -12,7 +12,7 @@ COMMENT= Drop-in replacement for qmail-
LICENSE= gnu-gpl-v2
USE_CMAKE= yes
-CMAKE_ARGS+= -DAUTOQMAIL=${QMAILDIR}
+CMAKE_CONFIGURE_ARGS+= -DAUTOQMAIL=${QMAILDIR}
CFLAGS.SunOS+= -D__EXTENSIONS__
Index: pkgsrc/mail/rspamd/Makefile
diff -u pkgsrc/mail/rspamd/Makefile:1.110 pkgsrc/mail/rspamd/Makefile:1.111
--- pkgsrc/mail/rspamd/Makefile:1.110 Fri Aug 9 09:42:24 2024
+++ pkgsrc/mail/rspamd/Makefile Sun Aug 25 06:18:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2024/08/09 09:42:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.111 2024/08/25 06:18:58 wiz Exp $
DISTNAME= rspamd-3.9.1
PKGREVISION= 1
@@ -54,19 +54,19 @@ INSTALLATION_DIRS+= share/examples
RCD_SCRIPTS= rspamd
SMF_METHODS= rspamd
-CMAKE_ARGS+= -DMANDIR:PATH=${PREFIX}/${PKGMANDIR}
-CMAKE_ARGS+= -DLOGDIR:PATH=${LOGDIR}
-CMAKE_ARGS+= -DRUNDIR:PATH=${VARBASE}/run/rspamd
-CMAKE_ARGS+= -DDBDIR:PATH=${DBDIR}
-CMAKE_ARGS+= -DCONFDIR:PATH=${PKG_SYSCONFDIR}
-CMAKE_ARGS+= -DEXAMPLESDIR:PATH=${EGDIR}
-CMAKE_ARGS+= -DRSPAMD_USER=${RSPAMD_USER}
-CMAKE_ARGS+= -DRSPAMD_GROUP=${RSPAMD_GROUP}
+CMAKE_CONFIGURE_ARGS+= -DMANDIR:PATH=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DLOGDIR:PATH=${LOGDIR}
+CMAKE_CONFIGURE_ARGS+= -DRUNDIR:PATH=${VARBASE}/run/rspamd
+CMAKE_CONFIGURE_ARGS+= -DDBDIR:PATH=${DBDIR}
+CMAKE_CONFIGURE_ARGS+= -DCONFDIR:PATH=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DEXAMPLESDIR:PATH=${EGDIR}
+CMAKE_CONFIGURE_ARGS+= -DRSPAMD_USER=${RSPAMD_USER}
+CMAKE_CONFIGURE_ARGS+= -DRSPAMD_GROUP=${RSPAMD_GROUP}
# Torch requires LuaJIT2, but LuaJIT2 only supports Lua 5.1
-CMAKE_ARGS+= -DENABLE_LUAJIT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LUAJIT=OFF
# Assumes inotify == Linux
-CMAKE_ARGS.SunOS+= -DHAVE_INOTIFY_INIT=NO
+CMAKE_CONFIGURE_ARGS.SunOS+= -DHAVE_INOTIFY_INIT=NO
REPLACE_PERL+= utils/rspamd_stats.pl
Index: pkgsrc/math/armadillo/Makefile
diff -u pkgsrc/math/armadillo/Makefile:1.1 pkgsrc/math/armadillo/Makefile:1.2
--- pkgsrc/math/armadillo/Makefile:1.1 Tue Dec 19 12:28:50 2023
+++ pkgsrc/math/armadillo/Makefile Sun Aug 25 06:18:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2023/12/19 12:28:50 thor Exp $
+# $NetBSD: Makefile,v 1.2 2024/08/25 06:18:59 wiz Exp $
DISTNAME= armadillo-12.6.7
CATEGORIES= math
@@ -15,10 +15,10 @@ USE_LANGUAGES+= c c++
USE_CXX_FEATURES= c++11
USE_CMAKE= yes
-CMAKE_ARGS+= -DINSTALL_LIB_DIR=${PREFIX}/lib
-CMAKE_ARGS+= -DBLA_PREFER_PKGCONFIG=ON
-CMAKE_ARGS+= -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
-CMAKE_ARGS+= -DBLA_PKGCONFIG_LAPACK=${LAPACK_PC}
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_LIB_DIR=${PREFIX}/lib
+CMAKE_CONFIGURE_ARGS+= -DBLA_PREFER_PKGCONFIG=ON
+CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
+CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_LAPACK=${LAPACK_PC}
.include "../../mk/blas.buildlink3.mk"
.include "../../math/superlu/buildlink3.mk"
Index: pkgsrc/math/arpack-ng/Makefile
diff -u pkgsrc/math/arpack-ng/Makefile:1.10 pkgsrc/math/arpack-ng/Makefile:1.11
--- pkgsrc/math/arpack-ng/Makefile:1.10 Mon Jan 22 14:13:44 2024
+++ pkgsrc/math/arpack-ng/Makefile Sun Aug 25 06:18:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2024/01/22 14:13:44 thor Exp $
+# $NetBSD: Makefile,v 1.11 2024/08/25 06:18:59 wiz Exp $
DISTNAME= arpack-ng-3.9.1
CATEGORIES= math
@@ -12,9 +12,9 @@ LICENSE= original-bsd
USE_LANGUAGES= c fortran
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DBLA_PREFER_PKGCONFIG=true
-CMAKE_ARGS+= -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBLA_PREFER_PKGCONFIG=true
+CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
# For Darwin
Index: pkgsrc/math/arpack-ng/options.mk
diff -u pkgsrc/math/arpack-ng/options.mk:1.3 pkgsrc/math/arpack-ng/options.mk:1.4
--- pkgsrc/math/arpack-ng/options.mk:1.3 Wed May 31 21:35:31 2023
+++ pkgsrc/math/arpack-ng/options.mk Sun Aug 25 06:18:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2023/05/31 21:35:31 adam Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:59 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.arpack-ng
PKG_SUPPORTED_OPTIONS= mpi
@@ -9,8 +9,8 @@ PKG_SUPPORTED_OPTIONS= mpi
PLIST_VARS+= mpi
.if !empty(PKG_OPTIONS:Mmpi)
PLIST.mpi= yes
-CMAKE_ARGS+= -DMPI=on
+CMAKE_CONFIGURE_ARGS+= -DMPI=on
.include "../../mk/mpi.buildlink3.mk"
.else
-CMAKE_ARGS+= -DMPI=off
+CMAKE_CONFIGURE_ARGS+= -DMPI=off
.endif
Index: pkgsrc/math/blas/Makefile
diff -u pkgsrc/math/blas/Makefile:1.40 pkgsrc/math/blas/Makefile:1.41
--- pkgsrc/math/blas/Makefile:1.40 Tue Jun 15 04:41:51 2021
+++ pkgsrc/math/blas/Makefile Sun Aug 25 06:18:59 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.40 2021/06/15 04:41:51 thor Exp $
+# $NetBSD: Makefile,v 1.41 2024/08/25 06:18:59 wiz Exp $
MAINTAINER= thomas.orgis%uni-hamburg.de@localhost
COMMENT= Basic Linear Algebra System (Netlib reference implementation)
LAPACK_COMPONENT= blas
-LAPACK_COMPONENT_CMAKE_ARGS= \
+LAPACK_COMPONENT_CMAKE_CONFIGURE_ARGS= \
-DUSE_OPTIMIZED_BLAS=OFF \
-DCBLAS=OFF -DLAPACKE=OFF -DLAPACK=OFF
Index: pkgsrc/math/blas64/Makefile
diff -u pkgsrc/math/blas64/Makefile:1.2 pkgsrc/math/blas64/Makefile:1.3
--- pkgsrc/math/blas64/Makefile:1.2 Tue Nov 23 22:45:01 2021
+++ pkgsrc/math/blas64/Makefile Sun Aug 25 06:18:59 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2021/11/23 22:45:01 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:18:59 wiz Exp $
MAINTAINER= thomas.orgis%uni-hamburg.de@localhost
COMMENT= Reference Basic Linear Algebra System with 64 bit indices
LAPACK_COMPONENT= blas64
-LAPACK_COMPONENT_CMAKE_ARGS= \
+LAPACK_COMPONENT_CMAKE_CONFIGURE_ARGS= \
-DBUILD_INDEX64=ON \
-DUSE_OPTIMIZED_BLAS=OFF \
-DCBLAS=OFF -DLAPACKE=OFF -DLAPACK=OFF
Index: pkgsrc/math/cblas/Makefile
diff -u pkgsrc/math/cblas/Makefile:1.5 pkgsrc/math/cblas/Makefile:1.6
--- pkgsrc/math/cblas/Makefile:1.5 Mon Jan 8 21:28:57 2024
+++ pkgsrc/math/cblas/Makefile Sun Aug 25 06:18:59 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2024/01/08 21:28:57 thor Exp $
+# $NetBSD: Makefile,v 1.6 2024/08/25 06:18:59 wiz Exp $
MAINTAINER= thomas.orgis%uni-hamburg.de@localhost
COMMENT= C interface to the reference BLAS library
LAPACK_COMPONENT= cblas
-LAPACK_COMPONENT_CMAKE_ARGS= \
+LAPACK_COMPONENT_CMAKE_CONFIGURE_ARGS= \
-DUSE_OPTIMIZED_BLAS=ON \
-DBLAS_LIBRARIES=-lblas \
-DCBLAS=ON -DLAPACKE=OFF -DLAPACK=OFF \
Index: pkgsrc/math/cblas64/Makefile
diff -u pkgsrc/math/cblas64/Makefile:1.2 pkgsrc/math/cblas64/Makefile:1.3
--- pkgsrc/math/cblas64/Makefile:1.2 Mon Jan 8 21:28:57 2024
+++ pkgsrc/math/cblas64/Makefile Sun Aug 25 06:18:59 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2024/01/08 21:28:57 thor Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:18:59 wiz Exp $
MAINTAINER= thomas.orgis%uni-hamburg.de@localhost
COMMENT= C interface to the reference BLAS with 64 bit indices
LAPACK_COMPONENT= cblas64
-LAPACK_COMPONENT_CMAKE_ARGS= \
+LAPACK_COMPONENT_CMAKE_CONFIGURE_ARGS= \
-DBUILD_INDEX64=ON \
-DUSE_OPTIMIZED_BLAS=ON \
-DBLAS_LIBRARIES=-lblas64 \
Index: pkgsrc/math/cgal/Makefile
diff -u pkgsrc/math/cgal/Makefile:1.88 pkgsrc/math/cgal/Makefile:1.89
--- pkgsrc/math/cgal/Makefile:1.88 Wed May 29 16:33:27 2024
+++ pkgsrc/math/cgal/Makefile Sun Aug 25 06:18:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2024/05/29 16:33:27 adam Exp $
+# $NetBSD: Makefile,v 1.89 2024/08/25 06:18:59 wiz Exp $
DISTNAME= CGAL-4.14
PKGNAME= ${DISTNAME:tl}
@@ -15,7 +15,7 @@ LICENSE= gnu-lgpl-v3
USE_CMAKE= yes
USE_LANGUAGES= c c++11
-CMAKE_ARGS+= -DCGAL_INSTALL_MAN_DIR=${PREFIX}/${PKGMANDIR}/man1
+CMAKE_CONFIGURE_ARGS+= -DCGAL_INSTALL_MAN_DIR=${PREFIX}/${PKGMANDIR}/man1
REPLACE_SH+= scripts/cgal_create_CMakeLists
REPLACE_SH+= scripts/cgal_create_cmake_script
Index: pkgsrc/math/double-conversion/Makefile
diff -u pkgsrc/math/double-conversion/Makefile:1.7 pkgsrc/math/double-conversion/Makefile:1.8
--- pkgsrc/math/double-conversion/Makefile:1.7 Sun May 21 19:01:15 2023
+++ pkgsrc/math/double-conversion/Makefile Sun Aug 25 06:18:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/05/21 19:01:15 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2024/08/25 06:18:59 wiz Exp $
DISTNAME= double-conversion-3.3.0
CATEGORIES= math converters
@@ -11,8 +11,8 @@ COMMENT= Conversion routines for IEEE do
LICENSE= modified-bsd
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
-CMAKE_ARGS+= -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
+CMAKE_CONFIGURE_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.4 pkgsrc/math/dragonbox/Makefile:1.5
--- pkgsrc/math/dragonbox/Makefile:1.4 Sun Jul 30 08:24:21 2023
+++ pkgsrc/math/dragonbox/Makefile Sun Aug 25 06:19:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/07/30 08:24:21 nia Exp $
+# $NetBSD: Makefile,v 1.5 2024/08/25 06:19:00 wiz Exp $
DISTNAME= dragonbox-${GITHUB_TAG}
CATEGORIES= math
@@ -13,7 +13,7 @@ LICENSE= boost-license OR apache-2.0 # w
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
USE_CXX_FEATURES+= c++17
Index: pkgsrc/math/eigen3/Makefile
diff -u pkgsrc/math/eigen3/Makefile:1.19 pkgsrc/math/eigen3/Makefile:1.20
--- pkgsrc/math/eigen3/Makefile:1.19 Tue May 2 09:32:56 2023
+++ pkgsrc/math/eigen3/Makefile Sun Aug 25 06:19:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2023/05/02 09:32:56 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2024/08/25 06:19:00 wiz Exp $
DISTNAME= eigen-3.4.0
PKGNAME= ${DISTNAME:S/eigen/eigen3/}
@@ -14,10 +14,10 @@ LICENSE= mpl-2.0
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKEPACKAGE_INSTALL_DIR=${PREFIX}/lib/cmake/eigen3
-CMAKE_ARGS+= -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
-CMAKE_ARGS+= -DEIGEN_BUILD_PKGCONFIG=ON
-CMAKE_ARGS+= -DPKGCONFIG_INSTALL_DIR=${PREFIX}/lib/pkgconfig
+CMAKE_CONFIGURE_ARGS+= -DCMAKEPACKAGE_INSTALL_DIR=${PREFIX}/lib/cmake/eigen3
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
+CMAKE_CONFIGURE_ARGS+= -DEIGEN_BUILD_PKGCONFIG=ON
+CMAKE_CONFIGURE_ARGS+= -DPKGCONFIG_INSTALL_DIR=${PREFIX}/lib/pkgconfig
# header-only
# PKGCONFIG_OVERRIDE+= eigen3.pc.in
Index: pkgsrc/math/flann-lib/Makefile
diff -u pkgsrc/math/flann-lib/Makefile:1.6 pkgsrc/math/flann-lib/Makefile:1.7
--- pkgsrc/math/flann-lib/Makefile:1.6 Fri Sep 1 11:34:59 2023
+++ pkgsrc/math/flann-lib/Makefile Sun Aug 25 06:19:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/09/01 11:34:59 nia Exp $
+# $NetBSD: Makefile,v 1.7 2024/08/25 06:19:00 wiz Exp $
DISTNAME= flann-1.9.2
PKGNAME= ${DISTNAME:S/-/-lib-/}
@@ -15,13 +15,13 @@ LICENSE= modified-bsd
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DBUILD_DOC=OFF
-CMAKE_ARGS+= -DBUILD_PYTHON_BINDINGS=OFF
-CMAKE_ARGS+= -DBUILD_MATLAB_BINDINGS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DOC=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PYTHON_BINDINGS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_MATLAB_BINDINGS=OFF
# Need to check if those two are out of experimental stage.
# MPI needs parallel HDF5.
-CMAKE_ARGS+= -DUSE_MPI=OFF
-CMAKE_ARGS+= -DBUILD_CUDA_LIB=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_MPI=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_CUDA_LIB=OFF
FORCE_CXX_STD= c++11
USE_CXX_FEATURES+= c++11
Index: pkgsrc/math/hercules4sdl-decnumber/Makefile
diff -u pkgsrc/math/hercules4sdl-decnumber/Makefile:1.2 pkgsrc/math/hercules4sdl-decnumber/Makefile:1.3
--- pkgsrc/math/hercules4sdl-decnumber/Makefile:1.2 Sun Nov 27 15:07:06 2022
+++ pkgsrc/math/hercules4sdl-decnumber/Makefile Sun Aug 25 06:19:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/11/27 15:07:06 rhialto Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:19:00 wiz Exp $
DISTNAME= hercules4sdl-decnumber-3.68.0
PKGREVISION= 20220201
@@ -19,7 +19,7 @@ USE_CMAKE= yes
BLDDIR= ${WRKDIR}/decNumber64.Release
CONFIGURE_DIRS= ${BLDDIR}
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/hercules4sdl
+CMAKE_CONFIGURE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/hercules4sdl
pre-configure:
${MKDIR} ${BLDDIR}
Index: pkgsrc/math/hercules4sdl-softfloat/Makefile
diff -u pkgsrc/math/hercules4sdl-softfloat/Makefile:1.2 pkgsrc/math/hercules4sdl-softfloat/Makefile:1.3
--- pkgsrc/math/hercules4sdl-softfloat/Makefile:1.2 Sun Nov 27 15:12:12 2022
+++ pkgsrc/math/hercules4sdl-softfloat/Makefile Sun Aug 25 06:19:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/11/27 15:12:12 rhialto Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:19:00 wiz Exp $
DISTNAME= hercules4sdl-softfloat-3.5.0
PKGREVISION= 20220201
@@ -19,7 +19,7 @@ USE_CMAKE= yes
BLDDIR= ${WRKDIR}/SoftFloat64.Release
CONFIGURE_DIRS= ${BLDDIR}
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/hercules4sdl
+CMAKE_CONFIGURE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/hercules4sdl
pre-configure:
${MKDIR} ${BLDDIR}
Index: pkgsrc/math/kissfft/Makefile
diff -u pkgsrc/math/kissfft/Makefile:1.1 pkgsrc/math/kissfft/Makefile:1.2
--- pkgsrc/math/kissfft/Makefile:1.1 Fri Apr 9 11:00:28 2021
+++ pkgsrc/math/kissfft/Makefile Sun Aug 25 06:19:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/04/09 11:00:28 nia Exp $
+# $NetBSD: Makefile,v 1.2 2024/08/25 06:19:00 wiz Exp $
DISTNAME= kissfft-131.1.0
CATEGORIES= math
@@ -13,7 +13,7 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DKISSFFT_TEST=OFF
+CMAKE_CONFIGURE_ARGS+= -DKISSFFT_TEST=OFF
PKGCONFIG_OVERRIDE+= kissfft.pc.in
PKGCONFIG_OVERRIDE+= kissfft-float.pc
Index: pkgsrc/math/lapack/Makefile
diff -u pkgsrc/math/lapack/Makefile:1.46 pkgsrc/math/lapack/Makefile:1.47
--- pkgsrc/math/lapack/Makefile:1.46 Mon Jan 8 21:28:55 2024
+++ pkgsrc/math/lapack/Makefile Sun Aug 25 06:19:00 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.46 2024/01/08 21:28:55 thor Exp $
+# $NetBSD: Makefile,v 1.47 2024/08/25 06:19:00 wiz Exp $
MAINTAINER= thomas.orgis%uni-hamburg.de@localhost
COMMENT= Linear Algebra PACKage (Netlib reference implementation)
LAPACK_COMPONENT= lapack
-LAPACK_COMPONENT_CMAKE_ARGS= \
+LAPACK_COMPONENT_CMAKE_CONFIGURE_ARGS= \
-DUSE_OPTIMIZED_BLAS=ON \
-DBLAS_LIBRARIES=-lblas \
-DUSE_OPTIMIZED_LAPACK=OFF \
Index: pkgsrc/math/lapack/Makefile.common
diff -u pkgsrc/math/lapack/Makefile.common:1.19 pkgsrc/math/lapack/Makefile.common:1.20
--- pkgsrc/math/lapack/Makefile.common:1.19 Mon Jan 8 21:28:55 2024
+++ pkgsrc/math/lapack/Makefile.common Sun Aug 25 06:19:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2024/01/08 21:28:55 thor Exp $
+# $NetBSD: Makefile.common,v 1.20 2024/08/25 06:19:00 wiz Exp $
# used by math/blas/Makefile
# used by math/cblas/Makefile
# used by math/lapacke/Makefile
@@ -9,7 +9,7 @@
# used by math/lapack64/Makefile
# Common Makefile for packages derived from the Netlib BLAS/LAPACK sources.
-# Package Makefile sets LAPACK_COMPONENT and LAPACK_COMPONENT_CMAKE_ARGS to
+# Package Makefile sets LAPACK_COMPONENT and LAPACK_COMPONENT_CMAKE_CONFIGURE_ARGS to
# choose the library to install.
# LAPACK_COMPONENT can be "lapack", "lapacke", or "cblas",
# or any of those with 64 suffix for ILP64 mode (64 bit indexing).
@@ -45,10 +45,10 @@ HEADERDIR= netlib
# Note: We patch the build to install both static and
# shared libraries.
-CMAKE_ARGS= -DBUILD_DEPRECATED=ON \
+CMAKE_CONFIGURE_ARGS= -DBUILD_DEPRECATED=ON \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_INSTALL_INCLUDEDIR=${PREFIX}/include/${HEADERDIR} \
- ${LAPACK_COMPONENT_CMAKE_ARGS}
+ ${LAPACK_COMPONENT_CMAKE_CONFIGURE_ARGS}
# The cmake files are not ready for prime time.
post-install:
Index: pkgsrc/math/lapack64/Makefile
diff -u pkgsrc/math/lapack64/Makefile:1.2 pkgsrc/math/lapack64/Makefile:1.3
--- pkgsrc/math/lapack64/Makefile:1.2 Mon Jan 8 21:28:56 2024
+++ pkgsrc/math/lapack64/Makefile Sun Aug 25 06:19:00 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2024/01/08 21:28:56 thor Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:19:00 wiz Exp $
MAINTAINER= thomas.orgis%uni-hamburg.de@localhost
COMMENT= Reference Linear Algebra PACKage with 64 bit indices
LAPACK_COMPONENT= lapack64
-LAPACK_COMPONENT_CMAKE_ARGS= \
+LAPACK_COMPONENT_CMAKE_CONFIGURE_ARGS= \
-DBUILD_INDEX64=ON \
-DUSE_OPTIMIZED_BLAS=ON \
-DBLAS_LIBRARIES=-lblas64 \
Index: pkgsrc/math/lapacke/Makefile
diff -u pkgsrc/math/lapacke/Makefile:1.5 pkgsrc/math/lapacke/Makefile:1.6
--- pkgsrc/math/lapacke/Makefile:1.5 Mon Jan 8 21:28:56 2024
+++ pkgsrc/math/lapacke/Makefile Sun Aug 25 06:19:01 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2024/01/08 21:28:56 thor Exp $
+# $NetBSD: Makefile,v 1.6 2024/08/25 06:19:01 wiz Exp $
MAINTAINER= thomas.orgis%uni-hamburg.de@localhost
COMMENT= C interface to the reference LAPACK library
LAPACK_COMPONENT= lapacke
-LAPACK_COMPONENT_CMAKE_ARGS= \
+LAPACK_COMPONENT_CMAKE_CONFIGURE_ARGS= \
-DUSE_OPTIMIZED_BLAS=ON \
-DBLAS_LIBRARIES=-lblas \
-DUSE_OPTIMIZED_LAPACK=ON \
Index: pkgsrc/math/lapacke64/Makefile
diff -u pkgsrc/math/lapacke64/Makefile:1.2 pkgsrc/math/lapacke64/Makefile:1.3
--- pkgsrc/math/lapacke64/Makefile:1.2 Mon Jan 8 21:28:56 2024
+++ pkgsrc/math/lapacke64/Makefile Sun Aug 25 06:19:01 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2024/01/08 21:28:56 thor Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:19:01 wiz Exp $
MAINTAINER= thomas.orgis%uni-hamburg.de@localhost
COMMENT= C interface to the reference LAPACK with 64 bit indices
LAPACK_COMPONENT= lapacke64
-LAPACK_COMPONENT_CMAKE_ARGS= \
+LAPACK_COMPONENT_CMAKE_CONFIGURE_ARGS= \
-DBUILD_INDEX64=ON \
-DUSE_OPTIMIZED_BLAS=ON \
-DBLAS_LIBRARIES=-lblas64 \
Index: pkgsrc/math/libfixmath/Makefile
diff -u pkgsrc/math/libfixmath/Makefile:1.3 pkgsrc/math/libfixmath/Makefile:1.4
--- pkgsrc/math/libfixmath/Makefile:1.3 Sun Mar 5 16:08:27 2023
+++ pkgsrc/math/libfixmath/Makefile Sun Aug 25 06:19:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/03/05 16:08:27 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2024/08/25 06:19:01 wiz Exp $
DISTNAME= libfixmath-0.0.0pre20220623
PKGREVISION= 1
@@ -14,7 +14,7 @@ LICENSE= mit
USE_LANGUAGES= c c++11
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
INSTALL_TARGET= install
BUILDLINK_TRANSFORM+= rm:-fsanitize=undefined
Index: pkgsrc/math/nlopt/Makefile
diff -u pkgsrc/math/nlopt/Makefile:1.4 pkgsrc/math/nlopt/Makefile:1.5
--- pkgsrc/math/nlopt/Makefile:1.4 Tue May 7 21:44:12 2024
+++ pkgsrc/math/nlopt/Makefile Sun Aug 25 06:19:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/05/07 21:44:12 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2024/08/25 06:19:01 wiz Exp $
VERSION= 2.7.1
DISTNAME= nlopt-${VERSION}
@@ -15,7 +15,7 @@ USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DNLOPT_PYTHON=OFF
+CMAKE_CONFIGURE_ARGS+= -DNLOPT_PYTHON=OFF
.include "../../devel/cmake/build.mk"
.include "../../devel/gmp/buildlink3.mk"
Index: pkgsrc/math/qhull/Makefile
diff -u pkgsrc/math/qhull/Makefile:1.12 pkgsrc/math/qhull/Makefile:1.13
--- pkgsrc/math/qhull/Makefile:1.12 Mon Aug 19 17:28:58 2024
+++ pkgsrc/math/qhull/Makefile Sun Aug 25 06:19:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2024/08/19 17:28:58 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2024/08/25 06:19:01 wiz Exp $
DISTNAME= qhull-2020-src-${LIBVERSION}
PKGNAME= qhull-2020.2
@@ -21,7 +21,7 @@ LIBVERSION= ${LIBMAJOR}.2
LIBMAJOR= 8.0
PLIST_SUBST+= LIBVERSION=${LIBVERSION} LIBMAJOR=${LIBMAJOR}
-CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH=${PREFIX}/${PKGMANDIR}/man1
+CMAKE_CONFIGURE_ARGS+= -DMAN_INSTALL_DIR:PATH=${PREFIX}/${PKGMANDIR}/man1
PKGCONFIG_OVERRIDE= build/qhull.pc.in
Index: pkgsrc/math/scalapack/Makefile
diff -u pkgsrc/math/scalapack/Makefile:1.1 pkgsrc/math/scalapack/Makefile:1.2
--- pkgsrc/math/scalapack/Makefile:1.1 Thu Aug 25 22:58:00 2022
+++ pkgsrc/math/scalapack/Makefile Sun Aug 25 06:19:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/08/25 22:58:00 thor Exp $
+# $NetBSD: Makefile,v 1.2 2024/08/25 06:19:01 wiz Exp $
DISTNAME= scalapack-2.2.0
CATEGORIES= math
@@ -14,7 +14,7 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c fortran
-CMAKE_ARGS= -DBLA_PREFER_PKGCONFIG=on \
+CMAKE_CONFIGURE_ARGS= -DBLA_PREFER_PKGCONFIG=on \
-DBLA_PKGCONFIG_LAPACK=${LAPACK_PC:Q} \
-DBLA_PKGCONFIG_BLAS=${BLAS_PC:Q} \
-DBUILD_SHARED_LIBS=ON
Index: pkgsrc/math/sundials/Makefile
diff -u pkgsrc/math/sundials/Makefile:1.6 pkgsrc/math/sundials/Makefile:1.7
--- pkgsrc/math/sundials/Makefile:1.6 Mon Aug 14 05:24:50 2023
+++ pkgsrc/math/sundials/Makefile Sun Aug 25 06:19:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/08/14 05:24:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2024/08/25 06:19:01 wiz Exp $
DISTNAME= sundials-4.1.0
PKGREVISION= 2
@@ -15,7 +15,7 @@ USE_CMAKE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DEXAMPLES_INSTALL_PATH=${PREFIX}/share/examples/sundials
+CMAKE_CONFIGURE_ARGS+= -DEXAMPLES_INSTALL_PATH=${PREFIX}/share/examples/sundials
INSTALLATION_DIRS+= share/doc/${PKGBASE}
Index: pkgsrc/math/superlu/Makefile
diff -u pkgsrc/math/superlu/Makefile:1.35 pkgsrc/math/superlu/Makefile:1.36
--- pkgsrc/math/superlu/Makefile:1.35 Tue Dec 19 11:53:01 2023
+++ pkgsrc/math/superlu/Makefile Sun Aug 25 06:19:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2023/12/19 11:53:01 thor Exp $
+# $NetBSD: Makefile,v 1.36 2024/08/25 06:19:01 wiz Exp $
DISTNAME= superlu-6.0.1
PKGREVISION= 1
@@ -15,10 +15,10 @@ USE_CMAKE= yes
USE_LANGUAGES= c fortran
TEST_TARGET= test
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DTPL_ENABLE_INTERNAL_BLASLIB=OFF
-CMAKE_ARGS+= -DBLA_PREFER_PKGCONFIG=ON
-CMAKE_ARGS+= -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DTPL_ENABLE_INTERNAL_BLASLIB=OFF
+CMAKE_CONFIGURE_ARGS+= -DBLA_PREFER_PKGCONFIG=ON
+CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
.include "../../mk/blas.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/teapot/Makefile
diff -u pkgsrc/math/teapot/Makefile:1.10 pkgsrc/math/teapot/Makefile:1.11
--- pkgsrc/math/teapot/Makefile:1.10 Mon May 6 08:40:29 2024
+++ pkgsrc/math/teapot/Makefile Sun Aug 25 06:19:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2024/05/06 08:40:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2024/08/25 06:19:02 wiz Exp $
DISTNAME= teapot-2.3.0
PKGREVISION= 3
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DENABLE_HELP=NO
+CMAKE_CONFIGURE_ARGS+= -DENABLE_HELP=NO
CFLAGS.SunOS+= -D__EXTENSIONS__
LDFLAGS.SunOS+= -lnsl
Index: pkgsrc/meta-pkgs/kde4/kde4.mk
diff -u pkgsrc/meta-pkgs/kde4/kde4.mk:1.6 pkgsrc/meta-pkgs/kde4/kde4.mk:1.7
--- pkgsrc/meta-pkgs/kde4/kde4.mk:1.6 Wed Jan 17 18:55:20 2018
+++ pkgsrc/meta-pkgs/kde4/kde4.mk Sun Aug 25 06:19:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: kde4.mk,v 1.6 2018/01/17 18:55:20 markd Exp $
+# $NetBSD: kde4.mk,v 1.7 2024/08/25 06:19:02 wiz Exp $
#
# This Makefile fragment is included by packages that use the KDE4
# configure-and-build process.
@@ -10,18 +10,18 @@ KDE4_MK= # defined
USE_PKGLOCALEDIR= YES
USE_CMAKE= yes
-CMAKE_ARGS+= -DHTML_INSTALL_DIR=${PREFIX}/share/doc/kde/HTML
-CMAKE_ARGS+= -DDATA_INSTALL_DIR=${PREFIX}/share/kde/apps
-CMAKE_ARGS+= -DCONFIG_INSTALL_DIR=${PREFIX}/share/kde/config
-CMAKE_ARGS+= -DKCFG_INSTALL_DIR=${PREFIX}/share/kde/config.kcfg
-CMAKE_ARGS+= -DLOCALE_INSTALL_DIR=${PREFIX}/${PKGLOCALEDIR}/locale
-CMAKE_ARGS+= -DMIME_INSTALL_DIR=${PREFIX}/share/kde/mimelnk
-CMAKE_ARGS+= -DTEMPLATES_INSTALL_DIR=${PREFIX}/share/kde/templates
-CMAKE_ARGS+= -DWALLPAPER_INSTALL_DIR=${PREFIX}/share/kde/wallpapers
-CMAKE_ARGS+= -DAUTOSTART_INSTALL_DIR=${PREFIX}/share/kde/autostart
-CMAKE_ARGS+= -DSYSCONF_INSTALL_DIR=${PKG_SYSCONFDIR:Q}
-CMAKE_ARGS+= -DINFO_INSTALL_DIR=${PREFIX}/${PKGINFODIR}
-CMAKE_ARGS+= -DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DHTML_INSTALL_DIR=${PREFIX}/share/doc/kde/HTML
+CMAKE_CONFIGURE_ARGS+= -DDATA_INSTALL_DIR=${PREFIX}/share/kde/apps
+CMAKE_CONFIGURE_ARGS+= -DCONFIG_INSTALL_DIR=${PREFIX}/share/kde/config
+CMAKE_CONFIGURE_ARGS+= -DKCFG_INSTALL_DIR=${PREFIX}/share/kde/config.kcfg
+CMAKE_CONFIGURE_ARGS+= -DLOCALE_INSTALL_DIR=${PREFIX}/${PKGLOCALEDIR}/locale
+CMAKE_CONFIGURE_ARGS+= -DMIME_INSTALL_DIR=${PREFIX}/share/kde/mimelnk
+CMAKE_CONFIGURE_ARGS+= -DTEMPLATES_INSTALL_DIR=${PREFIX}/share/kde/templates
+CMAKE_CONFIGURE_ARGS+= -DWALLPAPER_INSTALL_DIR=${PREFIX}/share/kde/wallpapers
+CMAKE_CONFIGURE_ARGS+= -DAUTOSTART_INSTALL_DIR=${PREFIX}/share/kde/autostart
+CMAKE_CONFIGURE_ARGS+= -DSYSCONF_INSTALL_DIR=${PKG_SYSCONFDIR:Q}
+CMAKE_CONFIGURE_ARGS+= -DINFO_INSTALL_DIR=${PREFIX}/${PKGINFODIR}
+CMAKE_CONFIGURE_ARGS+= -DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
KDELIBSVER= 4.14.38
KDELIBSPVER= ${KDELIBSVER:S/4/5/}
Index: pkgsrc/misc/attica/Makefile
diff -u pkgsrc/misc/attica/Makefile:1.40 pkgsrc/misc/attica/Makefile:1.41
--- pkgsrc/misc/attica/Makefile:1.40 Sun Nov 12 13:22:42 2023
+++ pkgsrc/misc/attica/Makefile Sun Aug 25 06:19:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2023/11/12 13:22:42 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2024/08/25 06:19:02 wiz Exp $
DISTNAME= attica-0.4.2
PKGREVISION= 11
@@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
USE_CMAKE= yes
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DQT4_BUILD=YES
+CMAKE_CONFIGURE_ARGS+= -DQT4_BUILD=YES
CONFIGURE_DIRS= _build
PKGCONFIG_OVERRIDE+= lib/cmake/libattica.pc.cmake
Index: pkgsrc/misc/bibletime/Makefile
diff -u pkgsrc/misc/bibletime/Makefile:1.85 pkgsrc/misc/bibletime/Makefile:1.86
--- pkgsrc/misc/bibletime/Makefile:1.85 Wed May 29 16:33:30 2024
+++ pkgsrc/misc/bibletime/Makefile Sun Aug 25 06:19:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2024/05/29 16:33:30 adam Exp $
+# $NetBSD: Makefile,v 1.86 2024/08/25 06:19:02 wiz Exp $
DISTNAME= bibletime-3.0.3
PKGREVISION= 17
@@ -21,15 +21,15 @@ DEPENDS+= dejavu-ttf-[0-9]*:../../fonts
TOOL_DEPENDS+= po4a-[0-9]*:../../textproc/po4a
TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-CMAKE_ARGS+= -DBUILD_HANDBOOK_PDF=OFF
-CMAKE_ARGS+= -DBUILD_HOWTO_PDF=OFF
-CMAKE_ARGS+= -DBT_DOCBOOK_XSL_HTML_CHUNK_XSL:PATH="${PREFIX}/share/xsl/docbook/html/chunk.xsl"
-CMAKE_ARGS+= -DBT_RUNTIME_DOCDIR="${PREFIX}/share/doc/bibletime"
+CMAKE_CONFIGURE_ARGS+= -DBUILD_HANDBOOK_PDF=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_HOWTO_PDF=OFF
+CMAKE_CONFIGURE_ARGS+= -DBT_DOCBOOK_XSL_HTML_CHUNK_XSL:PATH="${PREFIX}/share/xsl/docbook/html/chunk.xsl"
+CMAKE_CONFIGURE_ARGS+= -DBT_RUNTIME_DOCDIR="${PREFIX}/share/doc/bibletime"
# macs need this to install correctly
-CMAKE_ARGS+= -DBT_BINDIR:PATH=${PREFIX}/bin
-CMAKE_ARGS+= -DBT_DATAROOTDIR:PATH=${PREFIX}/share
-CMAKE_ARGS+= -DBT_DATADIR:PATH=${PREFIX}/share
+CMAKE_CONFIGURE_ARGS+= -DBT_BINDIR:PATH=${PREFIX}/bin
+CMAKE_CONFIGURE_ARGS+= -DBT_DATAROOTDIR:PATH=${PREFIX}/share
+CMAKE_CONFIGURE_ARGS+= -DBT_DATADIR:PATH=${PREFIX}/share
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../misc/sword/buildlink3.mk"
Index: pkgsrc/misc/indi/Makefile
diff -u pkgsrc/misc/indi/Makefile:1.6 pkgsrc/misc/indi/Makefile:1.7
--- pkgsrc/misc/indi/Makefile:1.6 Mon Aug 5 14:51:37 2024
+++ pkgsrc/misc/indi/Makefile Sun Aug 25 06:19:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2024/08/05 14:51:37 adam Exp $
+# $NetBSD: Makefile,v 1.7 2024/08/25 06:19:02 wiz Exp $
DISTNAME= indi-2.0.9
CATEGORIES= misc
@@ -14,7 +14,7 @@ USE_CXX_FEATURES= c++17
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DINDI_BUILD_SERVER=NO
+CMAKE_CONFIGURE_ARGS+= -DINDI_BUILD_SERVER=NO
PKGCONFIG_OVERRIDE= libindi.pc.cmake
Index: pkgsrc/misc/kdeartwork4/Makefile
diff -u pkgsrc/misc/kdeartwork4/Makefile:1.96 pkgsrc/misc/kdeartwork4/Makefile:1.97
--- pkgsrc/misc/kdeartwork4/Makefile:1.96 Wed May 29 16:33:33 2024
+++ pkgsrc/misc/kdeartwork4/Makefile Sun Aug 25 06:19:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2024/05/29 16:33:33 adam Exp $
+# $NetBSD: Makefile,v 1.97 2024/08/25 06:19:02 wiz Exp $
DISTNAME= kdeartwork-15.08.3
PKGNAME= ${DISTNAME:S/-1/4-1/}
@@ -9,10 +9,10 @@ MASTER_SITES= ${MASTER_SITE_KDE:=applica
.include "../../meta-pkgs/kde4/Makefile.kde4"
-CMAKE_ARGS+= -DXSCREENSAVER_CONFIG_DIR:PATH=${BUILDLINK_PREFIX.xscreensaver}/libexec/xscreensaver/config
-CMAKE_ARGS+= -DXSCREENSAVER_DIR:PATH=${BUILDLINK_PREFIX.xscreensaver}/libexec/xscreensaver
-CMAKE_ARGS+= -DWITH_Eigen3:BOOL=OFF
-CMAKE_ARGS+= -DWITH_Kexiv2:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DXSCREENSAVER_CONFIG_DIR:PATH=${BUILDLINK_PREFIX.xscreensaver}/libexec/xscreensaver/config
+CMAKE_CONFIGURE_ARGS+= -DXSCREENSAVER_DIR:PATH=${BUILDLINK_PREFIX.xscreensaver}/libexec/xscreensaver
+CMAKE_CONFIGURE_ARGS+= -DWITH_Eigen3:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_Kexiv2:BOOL=OFF
#BUILD_MAKE_FLAGS+= VERBOSE=1
Index: pkgsrc/misc/kdeplasma-addons4/Makefile
diff -u pkgsrc/misc/kdeplasma-addons4/Makefile:1.114 pkgsrc/misc/kdeplasma-addons4/Makefile:1.115
--- pkgsrc/misc/kdeplasma-addons4/Makefile:1.114 Wed May 29 16:33:33 2024
+++ pkgsrc/misc/kdeplasma-addons4/Makefile Sun Aug 25 06:19:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2024/05/29 16:33:33 adam Exp $
+# $NetBSD: Makefile,v 1.115 2024/08/25 06:19:02 wiz Exp $
DISTNAME= kdeplasma-addons-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
@@ -10,9 +10,9 @@ COMMENT= Plasmoids
# BUILD_MAKE_FLAGS+= VERBOSE=1
-CMAKE_ARGS+= -D BUILD_ibus:BOOL=OFF
-CMAKE_ARGS+= -DWITH_Marble:BOOL=OFF
-CMAKE_ARGS+= -DWITH_Kexiv2:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -D BUILD_ibus:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_Marble:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_Kexiv2:BOOL=OFF
.include "../../meta-pkgs/kde4/kde4.mk"
Index: pkgsrc/misc/libcec/Makefile
diff -u pkgsrc/misc/libcec/Makefile:1.8 pkgsrc/misc/libcec/Makefile:1.9
--- pkgsrc/misc/libcec/Makefile:1.8 Mon Aug 14 05:24:53 2023
+++ pkgsrc/misc/libcec/Makefile Sun Aug 25 06:19:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/08/14 05:24:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2024/08/25 06:19:02 wiz Exp $
DISTNAME= libcec-4.0.4
PKGREVISION= 3
@@ -18,7 +18,7 @@ USE_LANGUAGES= c c++
USE_CXX_FEATURES+= c++11
-CMAKE_ARGS+= -DSKIP_PYTHON_WRAPPER=ON
+CMAKE_CONFIGURE_ARGS+= -DSKIP_PYTHON_WRAPPER=ON
REPLACE_PYTHON+= src/pyCecClient/pyCecClient.py
Index: pkgsrc/misc/raspberrypi-userland/Makefile
diff -u pkgsrc/misc/raspberrypi-userland/Makefile:1.19 pkgsrc/misc/raspberrypi-userland/Makefile:1.20
--- pkgsrc/misc/raspberrypi-userland/Makefile:1.19 Mon Jan 2 21:03:57 2023
+++ pkgsrc/misc/raspberrypi-userland/Makefile Sun Aug 25 06:19:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2023/01/02 21:03:57 gdt Exp $
+# $NetBSD: Makefile,v 1.20 2024/08/25 06:19:03 wiz Exp $
DISTNAME= userland-20170109
PKGREVISION= 3
@@ -20,7 +20,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-*arm*
USE_LANGUAGES= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DCMAKE_TOOLCHAIN_FILE=${WRKSRC}/makefiles/cmake/toolchains/arm-netbsdelf.cmake
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_TOOLCHAIN_FILE=${WRKSRC}/makefiles/cmake/toolchains/arm-netbsdelf.cmake
USE_TOOLS+= bash:run pkg-config
SUBST_CLASSES+= vc
Index: pkgsrc/misc/raspberrypi-userland/options.mk
diff -u pkgsrc/misc/raspberrypi-userland/options.mk:1.2 pkgsrc/misc/raspberrypi-userland/options.mk:1.3
--- pkgsrc/misc/raspberrypi-userland/options.mk:1.2 Sun Nov 3 17:04:26 2019
+++ pkgsrc/misc/raspberrypi-userland/options.mk Sun Aug 25 06:19:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/11/03 17:04:26 rillig Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:19:03 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.raspberrypi-userland
PKG_SUPPORTED_OPTIONS= debug
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= debug
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdebug)
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
.else
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
.endif
Index: pkgsrc/misc/stellarium/Makefile
diff -u pkgsrc/misc/stellarium/Makefile:1.162 pkgsrc/misc/stellarium/Makefile:1.163
--- pkgsrc/misc/stellarium/Makefile:1.162 Mon Aug 12 14:06:58 2024
+++ pkgsrc/misc/stellarium/Makefile Sun Aug 25 06:19:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.162 2024/08/12 14:06:58 adam Exp $
+# $NetBSD: Makefile,v 1.163 2024/08/25 06:19:03 wiz Exp $
DISTNAME= stellarium-24.2
CATEGORIES= misc
@@ -16,8 +16,8 @@ USE_LANGUAGES= c c++
USE_TOOLS+= msgfmt perl pod2man
GCC_REQD+= 12 # std::from_chars
-CMAKE_ARGS+= -DENABLE_GPS=OFF
-CMAKE_ARGS+= -DENABLE_SHOWMYSKY=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GPS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SHOWMYSKY=OFF
LDFLAGS.SunOS+= -lnsl -lsocket
Index: pkgsrc/misc/vym/Makefile
diff -u pkgsrc/misc/vym/Makefile:1.80 pkgsrc/misc/vym/Makefile:1.81
--- pkgsrc/misc/vym/Makefile:1.80 Sun Aug 18 05:16:08 2024
+++ pkgsrc/misc/vym/Makefile Sun Aug 25 06:19:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2024/08/18 05:16:08 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2024/08/25 06:19:03 wiz Exp $
#
DISTNAME= vym-2.9.28
@@ -38,7 +38,7 @@ SUBST_MESSAGE.man-gz= Fix installing gzi
SUBST_FILES.man-gz= CMakeLists.txt
SUBST_SED.man-gz= -e 's;doc/vym.1.gz;doc/vym.1;g'
-# 'CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=man/man1' seems to be ignored
+# 'CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR=man/man1' seems to be ignored
SUBST_CLASSES+= cmake-mandir
SUBST_STAGE.cmake-mandir= pre-configure
SUBST_MESSAGE.cmake-mandir= Fix man page path
@@ -64,12 +64,12 @@ SUBST_FILES.pdf-path= CMakeLists.txt
SUBST_SED.pdf-path= -e 's;doc DESTINATION;doc/ DESTINATION;g'
CMAKE_ARG_PATH= .
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
-CMAKE_ARGS+= -DCMAKE_INSTALL_DATADIR=share/vym
-CMAKE_ARGS+= -DCMAKE_INSTALL_DATAROOTDIR=share/vym
-CMAKE_ARGS+= -DCMAKE_INSTALL_DOCDIR=share/doc/vym
-#CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=man/man1
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_DATADIR=share/vym
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_DATAROOTDIR=share/vym
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_DOCDIR=share/doc/vym
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR=man/man1
post-extract:
${GZIP_CMD} -d ${WRKSRC}/doc/vym.1.gz
Index: pkgsrc/misc/xygrib-devel/Makefile
diff -u pkgsrc/misc/xygrib-devel/Makefile:1.1 pkgsrc/misc/xygrib-devel/Makefile:1.2
--- pkgsrc/misc/xygrib-devel/Makefile:1.1 Thu Jun 27 12:31:32 2024
+++ pkgsrc/misc/xygrib-devel/Makefile Sun Aug 25 06:19:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/06/27 12:31:32 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 2024/08/25 06:19:03 wiz Exp $
VERSION= 20240620
DISTNAME= XyGrib-${VERSION}
@@ -23,7 +23,7 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES+= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DGNU_PACKAGE=ON -DGEN_TRANSLATIONS=OFF
+CMAKE_CONFIGURE_ARGS+= -DGNU_PACKAGE=ON -DGEN_TRANSLATIONS=OFF
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
Index: pkgsrc/mk/bsd.pkg.mk
diff -u pkgsrc/mk/bsd.pkg.mk:1.2055 pkgsrc/mk/bsd.pkg.mk:1.2056
--- pkgsrc/mk/bsd.pkg.mk:1.2055 Sat May 4 17:58:53 2024
+++ pkgsrc/mk/bsd.pkg.mk Sun Aug 25 06:19:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.2055 2024/05/04 17:58:53 leot Exp $
+# $NetBSD: bsd.pkg.mk,v 1.2056 2024/08/25 06:19:03 wiz Exp $
#
# This file is in the public domain.
#
@@ -141,7 +141,7 @@ PKG_FAIL_REASON+= 'Please unset PKG_PATH
# Allow variables to be set on a per-OS basis
OPSYSVARS+= CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS
-OPSYSVARS+= CMAKE_ARGS CONFIGURE_ARGS CONFIGURE_ENV
+OPSYSVARS+= CMAKE_CONFIGURE_ARGS CONFIGURE_ARGS CONFIGURE_ENV
OPSYSVARS+= BUILDLINK_TRANSFORM SUBST_CLASSES
OPSYSVARS+= BUILD_TARGET MAKE_ENV MAKE_FLAGS USE_TOOLS
.for _var_ in ${OPSYSVARS:O}
Index: pkgsrc/mk/configure/cmake.mk
diff -u pkgsrc/mk/configure/cmake.mk:1.27 pkgsrc/mk/configure/cmake.mk:1.28
--- pkgsrc/mk/configure/cmake.mk:1.27 Tue Aug 20 22:28:01 2024
+++ pkgsrc/mk/configure/cmake.mk Sun Aug 25 06:19:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: cmake.mk,v 1.27 2024/08/20 22:28:01 gdt Exp $
+# $NetBSD: cmake.mk,v 1.28 2024/08/25 06:19:03 wiz Exp $
# WARNING: This file is part of "USE_CMAKE", which is deprecated and
# should not be used. However, it has not yet been deleted because
@@ -59,14 +59,10 @@ CMAKE_USE_GNU_INSTALL_DIRS?= yes
CMAKE_INSTALL_PREFIX?= ${PREFIX}
CMAKE_INSTALL_NAME_DIR?=${PREFIX}/lib
-# To accomodate packages that include mk files across a
-# build.mk/USE_CMAKE boundary, merge in any CMAKE_CONFIGURE_ARGS.
-CMAKE_ARGS+= ${CMAKE_CONFIGURE_ARGS}
-
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-CMAKE_ARGS+= -DCMAKE_MODULE_PATH:PATH=${_CMAKE_DIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_MODULE_PATH:PATH=${_CMAKE_DIR}
.if empty(CMAKE_PKGSRC_BUILD_FLAGS:M[nN][oO])
-CMAKE_ARGS+= -DCMAKE_PKGSRC_BUILD_FLAGS:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_PKGSRC_BUILD_FLAGS:BOOL=TRUE
.endif
.if ${OPSYS} != "Darwin"
@@ -74,29 +70,29 @@ CMAKE_ARGS+= -DCMAKE_PKGSRC_BUILD_FLA
# both equal to ${PREFIX}/lib, and omit -Wl,-R from LDFLAGS, to align
# with how cmake thinks RPATH should be handled, but that is a
# somewhat risky change.
-CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=TRUE
.else
# TODO: Explain this better.
-CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=FALSE
-CMAKE_ARGS+= -DCMAKE_INSTALL_NAME_DIR:PATH=${CMAKE_INSTALL_NAME_DIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=FALSE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_NAME_DIR:PATH=${CMAKE_INSTALL_NAME_DIR}
.endif
.if defined(CMAKE_USE_GNU_INSTALL_DIRS) && empty(CMAKE_USE_GNU_INSTALL_DIRS:M[nN][oO])
-CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR:PATH=lib
-CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_LIBDIR:PATH=lib
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH=${PKGMANDIR}
. if defined(INFO_FILES)
-CMAKE_ARGS+= -DCMAKE_INSTALL_INFODIR:PATH=${PKGINFODIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_INFODIR:PATH=${PKGINFODIR}
. endif
. if defined(USE_PKGLOCALEDIR) && empty(USE_PKGLOCALEDIR:M[nN][oO])
-CMAKE_ARGS+= -DCMAKE_INSTALL_LOCALEDIR:PATH=${PKGLOCALEDIR}/locale
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_LOCALEDIR:PATH=${PKGLOCALEDIR}/locale
. endif
.endif
.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
-CMAKE_ARGS+= -DCMAKE_APPLE_SILICON_PROCESSOR=arm64
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_APPLE_SILICON_PROCESSOR=arm64
.endif
.if defined(CMAKE_PREFIX_PATH)
-CMAKE_ARGS+=-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH:ts;:Q}
+CMAKE_CONFIGURE_ARGS+=-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH:ts;:Q}
.endif
CMAKE_MODULE_PATH_OVERRIDE+= CMakeLists.txt
Index: pkgsrc/mk/configure/configure.mk
diff -u pkgsrc/mk/configure/configure.mk:1.34 pkgsrc/mk/configure/configure.mk:1.35
--- pkgsrc/mk/configure/configure.mk:1.34 Sat Aug 17 13:09:46 2024
+++ pkgsrc/mk/configure/configure.mk Sun Aug 25 06:19:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: configure.mk,v 1.34 2024/08/17 13:09:46 gdt Exp $
+# $NetBSD: configure.mk,v 1.35 2024/08/25 06:19:03 wiz Exp $
#
# = Package-settable variables =
#
@@ -50,7 +50,7 @@ _PKG_VARS.configure= \
CONFIGURE_DIRS CONFIGURE_ENV CONFIG_SHELL CONFIGURE_SCRIPT \
CONFIGURE_ARGS OVERRIDE_GNU_CONFIG_SCRIPTS HAS_CONFIGURE \
GNU_CONFIGURE PKGCONFIG_OVERRIDE USE_PKGLOCALEDIR \
- CMAKE_ARGS CMAKE_ARG_PATH
+ CMAKE_CONFIGURE_ARGS CMAKE_ARG_PATH
_SORTED_VARS.configure= *_ENV *_OVERRIDE
_LISTED_VARS.configure= *_ARGS *_SCRIPTS
@@ -59,9 +59,9 @@ CONFIGURE_ENV+= ${ALL_ENV}
CONFIGURE_ARGS?= # empty
CONFIG_SHELL?= ${SH}
CONFIG_SHELL_FLAGS?= # none
-CMAKE_ARGS?= # empty
+CMAKE_CONFIGURE_ARGS?= # empty
CMAKE_ARG_PATH?= .
-_BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS CMAKE_ARGS
+_BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS CMAKE_CONFIGURE_ARGS
.if defined(GNU_CONFIGURE)
. include "gnu-configure.mk"
@@ -253,7 +253,7 @@ do-configure-cmake:
${RUN}${_ULIMIT_CMD} \
cd ${WRKSRC} && cd ${_dir_} && \
${PKGSRC_SETENV} ${_CONFIGURE_CMAKE_ENV} \
- cmake ${CMAKE_ARGS} ${CMAKE_ARG_PATH}
+ cmake ${CMAKE_CONFIGURE_ARGS} ${CMAKE_ARG_PATH}
.endfor
######################################################################
Index: pkgsrc/multimedia/avidemux/Makefile
diff -u pkgsrc/multimedia/avidemux/Makefile:1.146 pkgsrc/multimedia/avidemux/Makefile:1.147
--- pkgsrc/multimedia/avidemux/Makefile:1.146 Wed May 29 16:33:41 2024
+++ pkgsrc/multimedia/avidemux/Makefile Sun Aug 25 06:19:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.146 2024/05/29 16:33:41 adam Exp $
+# $NetBSD: Makefile,v 1.147 2024/08/25 06:19:03 wiz Exp $
DISTNAME= avidemux_2.5.4
PKGNAME= ${DISTNAME:S/_/-/}
@@ -24,8 +24,8 @@ CONFIGURE_DIRS= _build
# Fails with C++14 default language.
FORCE_CXX_STD= c++03
-CMAKE_ARGS+= -DNO_ARTS=1
-CMAKE_ARGS+= -DUSE_SYSTEM_SPIDERMONKEY=1
+CMAKE_CONFIGURE_ARGS+= -DNO_ARTS=1
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_SPIDERMONKEY=1
LIBS+= ${LIBOSSAUDIO}
Index: pkgsrc/multimedia/avidemux/options.mk
diff -u pkgsrc/multimedia/avidemux/options.mk:1.1 pkgsrc/multimedia/avidemux/options.mk:1.2
--- pkgsrc/multimedia/avidemux/options.mk:1.1 Sun Jan 4 21:37:54 2009
+++ pkgsrc/multimedia/avidemux/options.mk Sun Aug 25 06:19:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2009/01/04 21:37:54 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:19:03 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.avidemux
PKG_SUPPORTED_OPTIONS= pulseaudio
@@ -9,5 +9,5 @@ PKG_SUGGESTED_OPTIONS= pulseaudio
.if !empty(PKG_OPTIONS:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DNO_PULSE_SIMPLE:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DNO_PULSE_SIMPLE:BOOL=TRUE
.endif
Index: pkgsrc/multimedia/ffmpegthumbnailer/Makefile
diff -u pkgsrc/multimedia/ffmpegthumbnailer/Makefile:1.32 pkgsrc/multimedia/ffmpegthumbnailer/Makefile:1.33
--- pkgsrc/multimedia/ffmpegthumbnailer/Makefile:1.32 Mon Jan 22 13:17:01 2024
+++ pkgsrc/multimedia/ffmpegthumbnailer/Makefile Sun Aug 25 06:19:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2024/01/22 13:17:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.33 2024/08/25 06:19:04 wiz Exp $
DISTNAME= ffmpegthumbnailer-2.2.2
PKGREVISION= 6
@@ -20,9 +20,9 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= libffmpegthumbnailer.pc.in
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DENABLE_GIO=ON
-CMAKE_ARGS+= -DENABLE_THUMBNAILER=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GIO=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_THUMBNAILER=ON
CONFIGURE_DIRS= build
pre-configure:
Index: pkgsrc/multimedia/frei0r/Makefile
diff -u pkgsrc/multimedia/frei0r/Makefile:1.8 pkgsrc/multimedia/frei0r/Makefile:1.9
--- pkgsrc/multimedia/frei0r/Makefile:1.8 Sun Apr 7 07:34:42 2024
+++ pkgsrc/multimedia/frei0r/Makefile Sun Aug 25 06:19:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2024/04/07 07:34:42 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2024/08/25 06:19:04 wiz Exp $
DISTNAME= frei0r-plugins-1.8.0
PKGNAME= ${DISTNAME:S/-plugins//}
@@ -15,11 +15,11 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
# Not in pkgsrc yet
-CMAKE_ARGS+= -DWITHOUT_GAVL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_GAVL=ON
# Not compatible with latest version
-CMAKE_ARGS+= -DWITHOUT_OPENCV=ON
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_OPENCV=ON
.include "../../graphics/cairo/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/multimedia/gerbera/options.mk
diff -u pkgsrc/multimedia/gerbera/options.mk:1.4 pkgsrc/multimedia/gerbera/options.mk:1.5
--- pkgsrc/multimedia/gerbera/options.mk:1.4 Wed Jul 10 06:17:17 2024
+++ pkgsrc/multimedia/gerbera/options.mk Sun Aug 25 06:19:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2024/07/10 06:17:17 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2024/08/25 06:19:04 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gerbera
@@ -8,30 +8,30 @@ PKG_SUGGESTED_OPTIONS= javascript matros
.include "../../mk/bsd.options.mk"
.if empty(PKG_OPTIONS:Mdebug)
-CMAKE_ARGS+= -DWITH_DEBUG=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_DEBUG=OFF
.endif
.if !empty(PKG_OPTIONS:Mffmpeg)
-CMAKE_ARGS+= -DWITH_AVCODEC=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_AVCODEC=ON
. include "../../multimedia/ffmpeg4/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mffmpegthumbnailer)
-CMAKE_ARGS+= -DWITH_FFMPEGTHUMBNAILER=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_FFMPEGTHUMBNAILER=ON
. include "../../multimedia/ffmpegthumbnailer/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mjavascript)
-CMAKE_ARGS+= -DWITH_JS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_JS=OFF
. include "../../lang/libduktape/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mmatroska)
. include "../../multimedia/libmatroska/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_MATROSKA=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_MATROSKA=OFF
.endif
.if empty(PKG_OPTIONS:Msystemd)
-CMAKE_ARGS+= -DWITH_SYSTEMD=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SYSTEMD=OFF
.endif
Index: pkgsrc/multimedia/libaom/Makefile
diff -u pkgsrc/multimedia/libaom/Makefile:1.34 pkgsrc/multimedia/libaom/Makefile:1.35
--- pkgsrc/multimedia/libaom/Makefile:1.34 Fri Jun 28 13:27:05 2024
+++ pkgsrc/multimedia/libaom/Makefile Sun Aug 25 06:19:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2024/06/28 13:27:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.35 2024/08/25 06:19:04 wiz Exp $
DISTNAME= libaom-3.9.1
CATEGORIES= multimedia
@@ -17,15 +17,15 @@ SUBST_FILES.version= build/cmake/version
SUBST_STAGE.version= pre-configure
SUBST_VARS.version= PKGVERSION_NOREV
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
-CMAKE_ARGS+= -DCMAKE_COLOR_MAKEFILE:BOOL=ON
-CMAKE_ARGS+= -DENABLE_DECODE_PERF_TESTS:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_EXAMPLES:BOOL=ON
-CMAKE_ARGS+= -DENABLE_DOCS:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_GOMA:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_TESTS:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_TOOLS:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_WERROR:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_COLOR_MAKEFILE:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DECODE_PERF_TESTS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_EXAMPLES:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DOCS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GOMA:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TESTS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TOOLS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WERROR:BOOL=OFF
# aom_dsp/x86/synonyms.h:53:29: warning: implicit declaration of function '_mm_loadu_si64'; did you mean '_mm_loadl_epi64'? [-Wimplicit-function-declaration]
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78782
@@ -36,30 +36,30 @@ GCC_REQD+= 9
.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) \
|| !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) \
|| !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
-CMAKE_ARGS+= -DCONFIG_RUNTIME_CPU_DETECT=0
+CMAKE_CONFIGURE_ARGS+= -DCONFIG_RUNTIME_CPU_DETECT=0
.endif
.if !empty(MACHINE_ARCH:Mmips64*)
-CMAKE_ARGS+= -DAOM_TARGET_CPU="mips64"
+CMAKE_CONFIGURE_ARGS+= -DAOM_TARGET_CPU="mips64"
.elif !empty(MACHINE_ARCH:Mmips*)
-CMAKE_ARGS+= -DAOM_TARGET_CPU="mips"
+CMAKE_CONFIGURE_ARGS+= -DAOM_TARGET_CPU="mips"
.elif !empty(MACHINE_ARCH:Mpowerpc*)
-CMAKE_ARGS+= -DAOM_TARGET_CPU="ppc"
+CMAKE_CONFIGURE_ARGS+= -DAOM_TARGET_CPU="ppc"
.elif ${MACHINE_ARCH} == "earmv7hf"
CFLAGS+= -mfpu=neon
-CMAKE_ARGS+= -DAOM_TARGET_CPU="armv7"
+CMAKE_CONFIGURE_ARGS+= -DAOM_TARGET_CPU="armv7"
.elif ${MACHINE_ARCH} == "aarch64"
-CMAKE_ARGS+= -DAOM_TARGET_CPU="arm64"
+CMAKE_CONFIGURE_ARGS+= -DAOM_TARGET_CPU="arm64"
.elif ${MACHINE_ARCH} == "x86_64"
-CMAKE_ARGS+= -DAOM_TARGET_CPU="x86_64"
+CMAKE_CONFIGURE_ARGS+= -DAOM_TARGET_CPU="x86_64"
.elif ${MACHINE_ARCH} == "i386"
-CMAKE_ARGS+= -DAOM_TARGET_CPU="x86"
+CMAKE_CONFIGURE_ARGS+= -DAOM_TARGET_CPU="x86"
.else
-CMAKE_ARGS+= -DAOM_TARGET_CPU="generic"
+CMAKE_CONFIGURE_ARGS+= -DAOM_TARGET_CPU="generic"
.endif
.if ${MACHINE_ARCH} == x86_64 || ${MACHINE_ARCH} == i386
-CMAKE_ARGS+= -DENABLE_NASM:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_NASM:BOOL=ON
TOOL_DEPENDS+= nasm>=2.13:../../devel/nasm
.endif
Index: pkgsrc/multimedia/libmatroska/Makefile
diff -u pkgsrc/multimedia/libmatroska/Makefile:1.51 pkgsrc/multimedia/libmatroska/Makefile:1.52
--- pkgsrc/multimedia/libmatroska/Makefile:1.51 Tue Jan 24 18:36:30 2023
+++ pkgsrc/multimedia/libmatroska/Makefile Sun Aug 25 06:19:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2023/01/24 18:36:30 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2024/08/25 06:19:04 wiz Exp $
DISTNAME= libmatroska-1.7.1
CATEGORIES= multimedia devel
@@ -11,7 +11,7 @@ COMMENT= Extensible open standard Audio/
LICENSE= gnu-lgpl-v2.1
USE_LANGUAGES= c c++14
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
PKGCONFIG_OVERRIDE= libmatroska.pc.in
.include "../../devel/cmake/build.mk"
Index: pkgsrc/multimedia/lightspark/Makefile
diff -u pkgsrc/multimedia/lightspark/Makefile:1.40 pkgsrc/multimedia/lightspark/Makefile:1.41
--- pkgsrc/multimedia/lightspark/Makefile:1.40 Wed May 29 16:33:45 2024
+++ pkgsrc/multimedia/lightspark/Makefile Sun Aug 25 06:19:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2024/05/29 16:33:45 adam Exp $
+# $NetBSD: Makefile,v 1.41 2024/08/25 06:19:04 wiz Exp $
DISTNAME= lightspark-0.8.5
PKGREVISION= 22
@@ -14,8 +14,8 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config msgfmt msgmerge
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DMANUAL_DIRECTORY=${PKGMANDIR}
-CMAKE_ARGS+= -DETCDIR=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DMANUAL_DIRECTORY=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DETCDIR=${PKG_SYSCONFDIR}
TOOL_DEPENDS+= nasm>=1.1:../../devel/nasm
Index: pkgsrc/multimedia/obs-studio/Makefile
diff -u pkgsrc/multimedia/obs-studio/Makefile:1.63 pkgsrc/multimedia/obs-studio/Makefile:1.64
--- pkgsrc/multimedia/obs-studio/Makefile:1.63 Wed May 29 16:33:46 2024
+++ pkgsrc/multimedia/obs-studio/Makefile Sun Aug 25 06:19:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2024/05/29 16:33:46 adam Exp $
+# $NetBSD: Makefile,v 1.64 2024/08/25 06:19:04 wiz Exp $
DISTNAME= obs-studio-26.1.2
PKGREVISION= 34
@@ -13,8 +13,8 @@ LICENSE= gnu-gpl-v2
USE_TOOLS+= pkg-config
USE_LANGUAGES= c gnu++11
-CMAKE_ARGS+= -DDISABLE_LIBFDK=BOOL:ON
-CMAKE_ARGS+= -DOBS_VERSION_OVERRIDE="${PKGVERSION}"
+CMAKE_CONFIGURE_ARGS+= -DDISABLE_LIBFDK=BOOL:ON
+CMAKE_CONFIGURE_ARGS+= -DOBS_VERSION_OVERRIDE="${PKGVERSION}"
TOOL_DEPENDS+= swig3>=3.0:../../devel/swig3
@@ -44,7 +44,7 @@ PLIST_VARS+= lua
PLIST.lua= yes
. include "../../lang/LuaJIT2/buildlink3.mk"
.else
-CMAKE_ARGS+= -DDISABLE_LUA=ON
+CMAKE_CONFIGURE_ARGS+= -DDISABLE_LUA=ON
.endif
.include "../../lang/python/pyversion.mk"
.include "../../multimedia/ffmpeg4/buildlink3.mk"
Index: pkgsrc/multimedia/olive-editor/Makefile
diff -u pkgsrc/multimedia/olive-editor/Makefile:1.43 pkgsrc/multimedia/olive-editor/Makefile:1.44
--- pkgsrc/multimedia/olive-editor/Makefile:1.43 Wed May 29 16:33:46 2024
+++ pkgsrc/multimedia/olive-editor/Makefile Sun Aug 25 06:19:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2024/05/29 16:33:46 adam Exp $
+# $NetBSD: Makefile,v 1.44 2024/08/25 06:19:04 wiz Exp $
DISTNAME= olive-editor-0.2.0pre20230924
PKGREVISION= 12
@@ -22,10 +22,10 @@ USE_LANGUAGES= c c++
USE_CXX_FEATURES+= c++11
-CMAKE_ARGS+= -DFFMPEG_INCLUDE_ROOT=${BUILDLINK_DIR}/include/ffmpeg6
-CMAKE_ARGS+= -DFFMPEG_LIB_ROOT=${BUILDLINK_DIR}/lib/ffmpeg6
-CMAKE_ARGS+= -DPORTAUDIO_INCLUDE_DIR=${BUILDLINK_DIR}/include/portaudio2
-CMAKE_ARGS+= -DPORTAUDIO_LIBRARY=${BUILDLINK_DIR}/lib/portaudio2/libportaudiocpp.so
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_INCLUDE_ROOT=${BUILDLINK_DIR}/include/ffmpeg6
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_LIB_ROOT=${BUILDLINK_DIR}/lib/ffmpeg6
+CMAKE_CONFIGURE_ARGS+= -DPORTAUDIO_INCLUDE_DIR=${BUILDLINK_DIR}/include/portaudio2
+CMAKE_CONFIGURE_ARGS+= -DPORTAUDIO_LIBRARY=${BUILDLINK_DIR}/lib/portaudio2/libportaudiocpp.so
.include "../../audio/portaudio/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
Index: pkgsrc/multimedia/phonon/Makefile.common
diff -u pkgsrc/multimedia/phonon/Makefile.common:1.7 pkgsrc/multimedia/phonon/Makefile.common:1.8
--- pkgsrc/multimedia/phonon/Makefile.common:1.7 Thu Sep 29 05:35:48 2022
+++ pkgsrc/multimedia/phonon/Makefile.common Sun Aug 25 06:19:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2022/09/29 05:35:48 markd Exp $
+# $NetBSD: Makefile.common,v 1.8 2024/08/25 06:19:05 wiz Exp $
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_KDE:=phonon/4.10.3/}
@@ -16,7 +16,7 @@ USE_LANGUAGES= c c++
USE_CMAKE= yes
CMAKE_ARG_PATH= ..
CONFIGURE_DIRS= _build
-CMAKE_ARGS+= -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE
.include "../../multimedia/phonon/options.mk"
Index: pkgsrc/multimedia/phonon/options.mk
diff -u pkgsrc/multimedia/phonon/options.mk:1.1 pkgsrc/multimedia/phonon/options.mk:1.2
--- pkgsrc/multimedia/phonon/options.mk:1.1 Tue May 21 12:13:14 2013
+++ pkgsrc/multimedia/phonon/options.mk Sun Aug 25 06:19:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2013/05/21 12:13:14 markd Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:19:05 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.phonon
PKG_SUPPORTED_OPTIONS= pulseaudio
@@ -9,5 +9,5 @@ PKG_SUGGESTED_OPTIONS=
.if !empty(PKG_OPTIONS:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
.endif
Index: pkgsrc/multimedia/phonon-qt5/options.mk
diff -u pkgsrc/multimedia/phonon-qt5/options.mk:1.2 pkgsrc/multimedia/phonon-qt5/options.mk:1.3
--- pkgsrc/multimedia/phonon-qt5/options.mk:1.2 Fri Jun 2 13:40:19 2023
+++ pkgsrc/multimedia/phonon-qt5/options.mk Sun Aug 25 06:19:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/06/02 13:40:19 plunky Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:19:05 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.phonon
PKG_SUPPORTED_OPTIONS= pulseaudio
@@ -9,5 +9,5 @@ PKG_SUGGESTED_OPTIONS=
.if !empty(PKG_OPTIONS:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio:BOOL=TRUE
.endif
Index: pkgsrc/multimedia/phonon-qt5-backend-gstreamer/Makefile
diff -u pkgsrc/multimedia/phonon-qt5-backend-gstreamer/Makefile:1.44 pkgsrc/multimedia/phonon-qt5-backend-gstreamer/Makefile:1.45
--- pkgsrc/multimedia/phonon-qt5-backend-gstreamer/Makefile:1.44 Wed May 29 16:33:47 2024
+++ pkgsrc/multimedia/phonon-qt5-backend-gstreamer/Makefile Sun Aug 25 06:19:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2024/05/29 16:33:47 adam Exp $
+# $NetBSD: Makefile,v 1.45 2024/08/25 06:19:05 wiz Exp $
DISTNAME= phonon-backend-gstreamer-4.10.0
PKGNAME= ${DISTNAME:S/-/-qt5-/}
@@ -18,7 +18,7 @@ USE_CMAKE= yes
CMAKE_ARG_PATH= ..
CONFIGURE_DIRS= _build
-CMAKE_ARGS+= -DKDE_INSTALL_QTPLUGINDIR=${QTDIR}/plugins
+CMAKE_CONFIGURE_ARGS+= -DKDE_INSTALL_QTPLUGINDIR=${QTDIR}/plugins
#WRKSRC= ${WRKDIR}/phonon-gstreamer-4.9.1
Index: pkgsrc/multimedia/phonon-qt5-backend-vlc/Makefile
diff -u pkgsrc/multimedia/phonon-qt5-backend-vlc/Makefile:1.43 pkgsrc/multimedia/phonon-qt5-backend-vlc/Makefile:1.44
--- pkgsrc/multimedia/phonon-qt5-backend-vlc/Makefile:1.43 Wed May 29 16:33:47 2024
+++ pkgsrc/multimedia/phonon-qt5-backend-vlc/Makefile Sun Aug 25 06:19:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2024/05/29 16:33:47 adam Exp $
+# $NetBSD: Makefile,v 1.44 2024/08/25 06:19:05 wiz Exp $
DISTNAME= phonon-backend-vlc-0.11.2
PKGNAME= ${DISTNAME:S/-/-qt5-/}
@@ -18,7 +18,7 @@ USE_CMAKE= yes
CMAKE_ARG_PATH= ..
CONFIGURE_DIRS= _build
-CMAKE_ARGS+= -DKDE_INSTALL_QTPLUGINDIR=${QTDIR}/plugins
+CMAKE_CONFIGURE_ARGS+= -DKDE_INSTALL_QTPLUGINDIR=${QTDIR}/plugins
pre-configure:
${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
Index: pkgsrc/multimedia/x265/Makefile
diff -u pkgsrc/multimedia/x265/Makefile:1.39 pkgsrc/multimedia/x265/Makefile:1.40
--- pkgsrc/multimedia/x265/Makefile:1.39 Fri Apr 5 13:45:50 2024
+++ pkgsrc/multimedia/x265/Makefile Sun Aug 25 06:19:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2024/04/05 13:45:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2024/08/25 06:19:05 wiz Exp $
DISTNAME= x265_3.6
PKGNAME= ${DISTNAME:S/_/-/}
@@ -15,10 +15,10 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/source
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DENABLE_PIC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PIC=ON
# Set version here instead of relying on git; see patch-CMakeLists.txt
-CMAKE_ARGS+= -DX265_VERSION=${PKGVERSION_NOREV}
-CMAKE_ARGS+= -DX265_LATEST_TAG=${PKGVERSION_NOREV}
+CMAKE_CONFIGURE_ARGS+= -DX265_VERSION=${PKGVERSION_NOREV}
+CMAKE_CONFIGURE_ARGS+= -DX265_LATEST_TAG=${PKGVERSION_NOREV}
SUBST_CLASSES+= cr
SUBST_STAGE.cr= post-extract
@@ -33,17 +33,17 @@ SUBST_NOOP_OK.cr= yes
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
. if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD") && ${MACHINE_ARCH} == "i386"
# Avoid text relocations
-CMAKE_ARGS+= -DENABLE_ASSEMBLY=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ASSEMBLY=OFF
. else
TOOL_DEPENDS+= nasm>=2.13.0:../../devel/nasm
. endif
.endif
.if ${USE_CROSS_COMPILE:tl} == "yes"
-CMAKE_ARGS+= -DCMAKE_SYSTEM:STRING=${OPSYS}-${OS_VERSION}
-CMAKE_ARGS+= -DCMAKE_SYSTEM_NAME:STRING=${OPSYS}
-CMAKE_ARGS+= -DCMAKE_SYSTEM_VERSION:STRING=${OS_VERSION}
-CMAKE_ARGS+= -DCMAKE_SYSTEM_PROCESSOR:STRING=${MACHINE_ARCH}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_SYSTEM:STRING=${OPSYS}-${OS_VERSION}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_SYSTEM_NAME:STRING=${OPSYS}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_SYSTEM_VERSION:STRING=${OS_VERSION}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_SYSTEM_PROCESSOR:STRING=${MACHINE_ARCH}
.endif
.include "../../devel/cmake/build.mk"
Index: pkgsrc/multimedia/x265/options.mk
diff -u pkgsrc/multimedia/x265/options.mk:1.2 pkgsrc/multimedia/x265/options.mk:1.3
--- pkgsrc/multimedia/x265/options.mk:1.2 Sat Oct 6 15:41:56 2018
+++ pkgsrc/multimedia/x265/options.mk Sun Aug 25 06:19:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2018/10/06 15:41:56 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:19:05 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.x265
PKG_SUPPORTED_OPTIONS= x265-main10
@@ -6,5 +6,5 @@ PKG_SUPPORTED_OPTIONS= x265-main10
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mx265-main10)
-CMAKE_ARGS+= -DHIGH_BIT_DEPTH=ON
+CMAKE_CONFIGURE_ARGS+= -DHIGH_BIT_DEPTH=ON
.endif
Index: pkgsrc/net/ccrtp/Makefile
diff -u pkgsrc/net/ccrtp/Makefile:1.27 pkgsrc/net/ccrtp/Makefile:1.28
--- pkgsrc/net/ccrtp/Makefile:1.27 Wed May 29 16:33:49 2024
+++ pkgsrc/net/ccrtp/Makefile Sun Aug 25 06:19:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2024/05/29 16:33:49 adam Exp $
+# $NetBSD: Makefile,v 1.28 2024/08/25 06:19:05 wiz Exp $
DISTNAME= ccrtp-2.1.2
PKGREVISION= 18
@@ -17,8 +17,8 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= libccrtp.pc.in
INFO_FILES= yes
-CMAKE_ARGS+= -DLIB_VERSION=${PKGVERSION_NOREV}
-CMAKE_ARGS+= -DSOVERSION=2
+CMAKE_CONFIGURE_ARGS+= -DLIB_VERSION=${PKGVERSION_NOREV}
+CMAKE_CONFIGURE_ARGS+= -DSOVERSION=2
.include "options.mk"
Index: pkgsrc/net/ettercap/Makefile
diff -u pkgsrc/net/ettercap/Makefile:1.102 pkgsrc/net/ettercap/Makefile:1.103
--- pkgsrc/net/ettercap/Makefile:1.102 Wed May 29 16:33:50 2024
+++ pkgsrc/net/ettercap/Makefile Sun Aug 25 06:19:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2024/05/29 16:33:50 adam Exp $
+# $NetBSD: Makefile,v 1.103 2024/08/25 06:19:05 wiz Exp $
PKGREVISION= 10
.include "Makefile.common"
@@ -8,6 +8,6 @@ COMMENT= Suite for man in the middle att
CONFLICTS+= ettercap-gtk-[0-9]*
-CMAKE_ARGS+= -DENABLE_GTK=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GTK=OFF
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/ettercap/Makefile.common
diff -u pkgsrc/net/ettercap/Makefile.common:1.3 pkgsrc/net/ettercap/Makefile.common:1.4
--- pkgsrc/net/ettercap/Makefile.common:1.3 Mon May 6 08:27:54 2024
+++ pkgsrc/net/ettercap/Makefile.common Sun Aug 25 06:19:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2024/05/06 08:27:54 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.4 2024/08/25 06:19:05 wiz Exp $
# used by net/ettercap/Makefile
# used by net/ettercap-gtk/Makefile
@@ -20,8 +20,8 @@ CMAKE_ARG_PATH= ..
TEST_TARGET= test
-CMAKE_ARGS+= -DENABLE_IPV6=ON
-CMAKE_ARGS+= -DENABLE_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_IPV6=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TESTS=ON
DISTINFO_FILE= ${.CURDIR}/../../net/ettercap/distinfo
PATCHDIR= ${.CURDIR}/../../net/ettercap/patches
Index: pkgsrc/net/ettercap-gtk/Makefile
diff -u pkgsrc/net/ettercap-gtk/Makefile:1.19 pkgsrc/net/ettercap-gtk/Makefile:1.20
--- pkgsrc/net/ettercap-gtk/Makefile:1.19 Wed May 29 16:33:50 2024
+++ pkgsrc/net/ettercap-gtk/Makefile Sun Aug 25 06:19:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/05/29 16:33:50 adam Exp $
+# $NetBSD: Makefile,v 1.20 2024/08/25 06:19:05 wiz Exp $
PKGREVISION= 18
.include "../../net/ettercap/Makefile.common"
@@ -10,8 +10,8 @@ COMMENT= Suite for man in the middle att
CONFLICTS+= ettercap-[0-9]*
-CMAKE_ARGS+= -DGTK_BUILD_TYPE=GTK3
-CMAKE_ARGS+= -DENABLE_GTK=ON
+CMAKE_CONFIGURE_ARGS+= -DGTK_BUILD_TYPE=GTK3
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GTK=ON
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/gtk3/buildlink3.mk"
Index: pkgsrc/net/freeDiameter/Makefile
diff -u pkgsrc/net/freeDiameter/Makefile:1.41 pkgsrc/net/freeDiameter/Makefile:1.42
--- pkgsrc/net/freeDiameter/Makefile:1.41 Wed May 29 16:33:51 2024
+++ pkgsrc/net/freeDiameter/Makefile Sun Aug 25 06:19:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2024/05/29 16:33:51 adam Exp $
+# $NetBSD: Makefile,v 1.42 2024/08/25 06:19:06 wiz Exp $
DISTNAME= 1.5.0
PKGNAME= freeDiameter-${DISTNAME}
@@ -14,7 +14,7 @@ LICENSE= modified-bsd
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_CMAKE= yes
-CMAKE_ARGS+= -DDISABLE_SCTP:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DDISABLE_SCTP:BOOL=ON
USE_LANGUAGES= c c++
USE_TOOLS+= bison flex pkg-config
FLEX_REQD= 2.5.35
Index: pkgsrc/net/freeDiameter/options.mk
diff -u pkgsrc/net/freeDiameter/options.mk:1.3 pkgsrc/net/freeDiameter/options.mk:1.4
--- pkgsrc/net/freeDiameter/options.mk:1.3 Tue Aug 2 16:56:32 2016
+++ pkgsrc/net/freeDiameter/options.mk Sun Aug 25 06:19:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2016/08/02 16:56:32 dholland Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:19:06 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.freeDiameter
PKG_SUPPORTED_OPTIONS= freediameter-all-extensions
@@ -10,14 +10,14 @@ PLIST_VARS+= ext
.if !empty(PKG_OPTIONS:Mfreediameter-all-extensions)
# enable all except debugging and test
-#CMAKE_ARGS+= -DALL_EXTENSIONS:BOOL=ON
-CMAKE_ARGS+= -DBUILD_APP_ACCT:BOOL=ON
-CMAKE_ARGS+= -DBUILD_APP_DIAMEAP:BOOL=ON
-CMAKE_ARGS+= -DBUILD_APP_RADGW:BOOL=ON
-CMAKE_ARGS+= -DBUILD_APP_REDIRECT:BOOL=ON
-CMAKE_ARGS+= -DBUILD_APP_SIP:BOOL=ON
-CMAKE_ARGS+= -DBUILD_DICT_LEGACY_XML:BOOL=ON
-CMAKE_ARGS+= -DBUILD_RT_EREG:BOOL=ON
+#CMAKE_CONFIGURE_ARGS+= -DALL_EXTENSIONS:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_APP_ACCT:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_APP_DIAMEAP:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_APP_RADGW:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_APP_REDIRECT:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_APP_SIP:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DICT_LEGACY_XML:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_RT_EREG:BOOL=ON
# for debug-interactive-extension only
#.include "../../devel/swig/buildlink3.mk"
#.include "../../lang/python/extension.mk"
@@ -26,5 +26,5 @@ CMAKE_ARGS+= -DBUILD_RT_EREG:BOOL=ON
.include "../../textproc/libxml2/buildlink3.mk"
PLIST.ext= yes
.else
-CMAKE_ARGS+= -DALL_EXTENSIONS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DALL_EXTENSIONS:BOOL=OFF
.endif
Index: pkgsrc/net/freerdp2/Makefile
diff -u pkgsrc/net/freerdp2/Makefile:1.48 pkgsrc/net/freerdp2/Makefile:1.49
--- pkgsrc/net/freerdp2/Makefile:1.48 Sat Aug 17 00:42:06 2024
+++ pkgsrc/net/freerdp2/Makefile Sun Aug 25 06:19:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2024/08/17 00:42:06 markd Exp $
+# $NetBSD: Makefile,v 1.49 2024/08/25 06:19:06 wiz Exp $
DISTNAME= freerdp-2.11.7
PKGNAME= ${DISTNAME:S/freerdp-/freerdp2-/1}
@@ -18,22 +18,22 @@ TOOL_DEPENDS+= libxslt-[0-9]*:../../text
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DWITH_SERVER=ON
-CMAKE_ARGS+= -DWITH_CHANNELS=ON
-CMAKE_ARGS+= -DWITH_JPEG=ON
-CMAKE_ARGS+= -DWITH_GSTREAMER_1_0=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SERVER=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_CHANNELS=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_JPEG=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_GSTREAMER_1_0=OFF
-CMAKE_ARGS+= -DAVCODEC_LIBRARY=${PREFIX}/lib/ffmpeg6/libavcodec.so
+CMAKE_CONFIGURE_ARGS+= -DAVCODEC_LIBRARY=${PREFIX}/lib/ffmpeg6/libavcodec.so
CFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t -Du_int64_t=uint64_t
.include "../../mk/oss.buildlink3.mk"
.if ${OSS_TYPE} != "none"
-CMAKE_ARGS+= -DWITH_OSS=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_OSS=ON
LDFLAGS+= ${LIBOSSAUDIO}
.else
-CMAKE_ARGS+= -DWITH_OSS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_OSS=OFF
.endif
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/net/freerdp2/options.mk
diff -u pkgsrc/net/freerdp2/options.mk:1.4 pkgsrc/net/freerdp2/options.mk:1.5
--- pkgsrc/net/freerdp2/options.mk:1.4 Sat Aug 6 08:02:27 2022
+++ pkgsrc/net/freerdp2/options.mk Sun Aug 25 06:19:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2022/08/06 08:02:27 nia Exp $
+# $NetBSD: options.mk,v 1.5 2024/08/25 06:19:06 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.freerdp2
PKG_SUPPORTED_OPTIONS= alsa pcsc pulseaudio cups wayland x11
@@ -13,30 +13,30 @@ PKG_SUGGESTED_OPTIONS+= wayland
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CMAKE_ARGS+= -DWITH_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ALSA=ON
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ALSA=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -DWITH_PULSE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PULSE=ON
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_PULSE=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PULSE=OFF
.endif
.if !empty(PKG_OPTIONS:Mcups)
-CMAKE_ARGS+= -DWITH_CUPS=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_CUPS=ON
.include "../../print/libcups/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_CUPS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_CUPS=OFF
.endif
PLIST_VARS+= x11
.if !empty(PKG_OPTIONS:Mx11)
PLIST.x11= yes
-CMAKE_ARGS+= -DWITH_X11=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_X11=ON
.include "../../x11/libxkbfile/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXcursor/buildlink3.mk"
@@ -50,15 +50,15 @@ CMAKE_ARGS+= -DWITH_X11=ON
.include "../../x11/libXtst/buildlink3.mk"
.include "../../x11/libXv/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_X11=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_X11=OFF
.endif
.if !empty(PKG_OPTIONS:Mpcsc)
. include "../../security/pcsc-lite/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_PCSC=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PCSC=ON
PLIST.pcsc= yes
.else
-CMAKE_ARGS+= -DWITH_PCSC=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PCSC=OFF
.endif
PLIST_VARS+= wayland
@@ -66,7 +66,7 @@ PLIST_VARS+= wayland
. include "../../devel/wayland/buildlink3.mk"
. include "../../x11/libxkbcommon/buildlink3.mk"
PLIST.wayland= yes
-CMAKE_ARGS+= -DWITH_WAYLAND=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_WAYLAND=ON
.else
-CMAKE_ARGS+= -DWITH_WAYLAND=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_WAYLAND=OFF
.endif
Index: pkgsrc/net/grpc/Makefile
diff -u pkgsrc/net/grpc/Makefile:1.96 pkgsrc/net/grpc/Makefile:1.97
--- pkgsrc/net/grpc/Makefile:1.96 Sat Aug 3 05:46:03 2024
+++ pkgsrc/net/grpc/Makefile Sun Aug 25 06:19:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2024/08/03 05:46:03 adam Exp $
+# $NetBSD: Makefile,v 1.97 2024/08/25 06:19:06 wiz Exp $
DISTNAME= grpc-1.65.4
CATEGORIES= net
@@ -14,15 +14,15 @@ USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
USE_CXX_FEATURES= c++14
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
# use cmake's find_package() to locate a pre-installed dependency
-CMAKE_ARGS+= -DgRPC_ABSL_PROVIDER=package
-CMAKE_ARGS+= -DgRPC_BENCHMARK_PROVIDER=package
-CMAKE_ARGS+= -DgRPC_CARES_PROVIDER=package
-CMAKE_ARGS+= -DgRPC_PROTOBUF_PROVIDER=package
-CMAKE_ARGS+= -DgRPC_RE2_PROVIDER=package
-CMAKE_ARGS+= -DgRPC_SSL_PROVIDER=package
-CMAKE_ARGS+= -DgRPC_ZLIB_PROVIDER=package
+CMAKE_CONFIGURE_ARGS+= -DgRPC_ABSL_PROVIDER=package
+CMAKE_CONFIGURE_ARGS+= -DgRPC_BENCHMARK_PROVIDER=package
+CMAKE_CONFIGURE_ARGS+= -DgRPC_CARES_PROVIDER=package
+CMAKE_CONFIGURE_ARGS+= -DgRPC_PROTOBUF_PROVIDER=package
+CMAKE_CONFIGURE_ARGS+= -DgRPC_RE2_PROVIDER=package
+CMAKE_CONFIGURE_ARGS+= -DgRPC_SSL_PROVIDER=package
+CMAKE_CONFIGURE_ARGS+= -DgRPC_ZLIB_PROVIDER=package
SUBST_CLASSES+= vars
SUBST_STAGE.vars= pre-configure
Index: pkgsrc/net/hercules4sdl-telnet/Makefile
diff -u pkgsrc/net/hercules4sdl-telnet/Makefile:1.2 pkgsrc/net/hercules4sdl-telnet/Makefile:1.3
--- pkgsrc/net/hercules4sdl-telnet/Makefile:1.2 Sun Nov 27 15:02:17 2022
+++ pkgsrc/net/hercules4sdl-telnet/Makefile Sun Aug 25 06:19:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/11/27 15:02:17 rhialto Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:19:06 wiz Exp $
DISTNAME= hercules4sdl-telnet-1.0.0
PKGREVISION= 20220201
@@ -19,7 +19,7 @@ USE_CMAKE= yes
BLDDIR= ${WRKDIR}/telnet64.Release
CONFIGURE_DIRS= ${BLDDIR}
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/hercules4sdl
+CMAKE_CONFIGURE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/hercules4sdl
pre-configure:
${MKDIR} ${BLDDIR}
Index: pkgsrc/net/icinga2/Makefile
diff -u pkgsrc/net/icinga2/Makefile:1.11 pkgsrc/net/icinga2/Makefile:1.12
--- pkgsrc/net/icinga2/Makefile:1.11 Fri Dec 29 18:24:55 2023
+++ pkgsrc/net/icinga2/Makefile Sun Aug 25 06:19:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2023/12/29 18:24:55 adam Exp $
+# $NetBSD: Makefile,v 1.12 2024/08/25 06:19:06 wiz Exp $
DISTNAME= icinga2-2.12.9
PKGREVISION= 3
@@ -127,18 +127,18 @@ CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_S
#OWN_DIRS+= ${PKG_SYSCONFDIR}/keys
#OWN_DIRS+= ${PKG_SYSCONFDIR}/pki
-CMAKE_ARGS+= -DICINGA2_USER=${ICINGA2_USER} -DICINGA2_GROUP=${ICINGA2_GROUP}
-CMAKE_ARGS+= -DICINGA2_GIT_VERSION_INFO=OFF
-CMAKE_ARGS+= -DICINGA2_COMMAND_GROUP=${ICINGA2_COMMAND_GROUP}
-#CMAKE_ARGS+= -DICINGA2_UNITY_BUILD=??? # Whether to perform a unity build; defaults to `ON`
-#CMAKE_ARGS+= -DICINGA2_LTO_BUILD=??? # Whether to use link time optimization (LTO); defaults to `OFF`
-CMAKE_ARGS+= -DICINGA2_PLUGINDIR=${PLUGINDIR}
-CMAKE_ARGS+= -DICINGA2_RUNDIR=${RUNDIR_PARENT}
-CMAKE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFBASE} # not PKG_SYSCONFDIR!
-#CMAKE_ARGS+= -DICINGA2_SYSCONFIGFILE=??? # Where to put the config file the initscript/systemd pulls it's dirs from; defaults to `CMAKE_INSTALL_PREFIX/etc/sysconfig/icinga2`
-CMAKE_ARGS+= -DCMAKE_INSTALL_LOCALSTATEDIR=${VARBASE}
+CMAKE_CONFIGURE_ARGS+= -DICINGA2_USER=${ICINGA2_USER} -DICINGA2_GROUP=${ICINGA2_GROUP}
+CMAKE_CONFIGURE_ARGS+= -DICINGA2_GIT_VERSION_INFO=OFF
+CMAKE_CONFIGURE_ARGS+= -DICINGA2_COMMAND_GROUP=${ICINGA2_COMMAND_GROUP}
+#CMAKE_CONFIGURE_ARGS+= -DICINGA2_UNITY_BUILD=??? # Whether to perform a unity build; defaults to `ON`
+#CMAKE_CONFIGURE_ARGS+= -DICINGA2_LTO_BUILD=??? # Whether to use link time optimization (LTO); defaults to `OFF`
+CMAKE_CONFIGURE_ARGS+= -DICINGA2_PLUGINDIR=${PLUGINDIR}
+CMAKE_CONFIGURE_ARGS+= -DICINGA2_RUNDIR=${RUNDIR_PARENT}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFBASE} # not PKG_SYSCONFDIR!
+#CMAKE_CONFIGURE_ARGS+= -DICINGA2_SYSCONFIGFILE=??? # Where to put the config file the initscript/systemd pulls it's dirs from; defaults to `CMAKE_INSTALL_PREFIX/etc/sysconfig/icinga2`
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_LOCALSTATEDIR=${VARBASE}
# For ICINGA2_WITH_XXX see options.mk
-CMAKE_ARGS+= -DICINGA2_WITH_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DICINGA2_WITH_TESTS=OFF
# Avoid a name clash with Boost header on case-insensitive file systems.
# Remove outdated GNUInstallDirs.cmake.
@@ -157,10 +157,10 @@ CHECK_FILES_SKIP+= ${PREFIX}/share/examp
CHECK_FILES_SKIP+= ${PREFIX}/share/examples/icinga2/features-enabled/mainlog.conf
CHECK_FILES_SKIP+= ${PREFIX}/share/examples/icinga2/features-enabled/notification.conf
-#CMAKE_ARGS+= -DCMAKE_SKIP_BUILD_RPATH=FALSE
-#CMAKE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE
-#CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib/icinga2
-#CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_SKIP_BUILD_RPATH=FALSE
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib/icinga2
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/icinga2
Index: pkgsrc/net/icinga2/options.mk
diff -u pkgsrc/net/icinga2/options.mk:1.2 pkgsrc/net/icinga2/options.mk:1.3
--- pkgsrc/net/icinga2/options.mk:1.2 Fri Jan 15 12:05:06 2021
+++ pkgsrc/net/icinga2/options.mk Sun Aug 25 06:19:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2021/01/15 12:05:06 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:19:06 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.icinga2
PKG_SUPPORTED_OPTIONS= debug
@@ -15,33 +15,33 @@ PLIST_VARS+= mysql pgsql
.if !empty(PKG_OPTIONS:Mmysql)
PLIST.mysql= yes
-CMAKE_ARGS+= -DICINGA2_WITH_MYSQL=ON
+CMAKE_CONFIGURE_ARGS+= -DICINGA2_WITH_MYSQL=ON
.include "../../mk/mysql.buildlink3.mk"
.else
-CMAKE_ARGS+= -DICINGA2_WITH_MYSQL=OFF
+CMAKE_CONFIGURE_ARGS+= -DICINGA2_WITH_MYSQL=OFF
.endif
.if !empty(PKG_OPTIONS:Mpgsql)
PLIST.pgsql= yes
-CMAKE_ARGS+= -DICINGA2_WITH_PGSQL=ON
+CMAKE_CONFIGURE_ARGS+= -DICINGA2_WITH_PGSQL=ON
.include "../../mk/pgsql.buildlink3.mk"
.else
-CMAKE_ARGS+= -DICINGA2_WITH_PGSQL=OFF
+CMAKE_CONFIGURE_ARGS+= -DICINGA2_WITH_PGSQL=OFF
.endif
PLIST_VARS+= icingadb
.if !empty(PKG_OPTIONS:Micingadb)
-CMAKE_ARGS+= -DICINGA2_WITH_ICINGADB=ON
+CMAKE_CONFIGURE_ARGS+= -DICINGA2_WITH_ICINGADB=ON
PLIST.icingadb= yes
.else
-CMAKE_ARGS+= -DICINGA2_WITH_ICINGADB=OFF
+CMAKE_CONFIGURE_ARGS+= -DICINGA2_WITH_ICINGADB=OFF
.endif
.for option in checker compat livestatus notification perfdata
PLIST_VARS+= ${option}
. if !empty(PKG_OPTIONS:Micinga2-${option})
-CMAKE_ARGS+= -DICINGA2_WITH_${option:tu}=ON
+CMAKE_CONFIGURE_ARGS+= -DICINGA2_WITH_${option:tu}=ON
PLIST.${option}= yes
. else
-CMAKE_ARGS+= -DICINGA2_WITH_${option:tu}=OFF
+CMAKE_CONFIGURE_ARGS+= -DICINGA2_WITH_${option:tu}=OFF
. endif
.endfor
Index: pkgsrc/net/lagrange/options.mk
diff -u pkgsrc/net/lagrange/options.mk:1.1 pkgsrc/net/lagrange/options.mk:1.2
--- pkgsrc/net/lagrange/options.mk:1.1 Fri Jul 16 16:00:33 2021
+++ pkgsrc/net/lagrange/options.mk Sun Aug 25 06:19:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2021/07/16 16:00:33 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:19:06 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.lagrange
@@ -9,13 +9,13 @@ PKG_SUGGESTED_OPTIONS= mpg123
.if !empty(PKG_OPTIONS:Mmpg123)
.include "../../audio/mpg123/buildlink3.mk"
-CMAKE_ARGS+= -DENABLE_MPG123=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MPG123=ON
.else
-CMAKE_ARGS+= -DENABLE_MPG123=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MPG123=OFF
.endif
.if !empty(PKG_OPTIONS:Mopengl)
-CMAKE_ARGS+= -DENABLE_X11_SWRENDER=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_X11_SWRENDER=OFF
.else
-CMAKE_ARGS+= -DENABLE_X11_SWRENDER=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_X11_SWRENDER=ON
.endif
Index: pkgsrc/net/libcares/Makefile
diff -u pkgsrc/net/libcares/Makefile:1.45 pkgsrc/net/libcares/Makefile:1.46
--- pkgsrc/net/libcares/Makefile:1.45 Sun Apr 14 08:15:58 2024
+++ pkgsrc/net/libcares/Makefile Sun Aug 25 06:19:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2024/04/14 08:15:58 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2024/08/25 06:19:06 wiz Exp $
DISTNAME= c-ares-1.28.1
PKGNAME= ${DISTNAME:S/c-/libc/1}
@@ -11,7 +11,7 @@ HOMEPAGE= https://c-ares.haxx.se/
COMMENT= Asynchronous resolver library, c-ares
LICENSE= mit
-CMAKE_ARGS+= -DCARES_STATIC=ON
+CMAKE_CONFIGURE_ARGS+= -DCARES_STATIC=ON
PKGCONFIG_OVERRIDE+= libcares.pc.cmake
PKGCONFIG_OVERRIDE+= libcares.pc.in
Index: pkgsrc/net/libvncserver/Makefile
diff -u pkgsrc/net/libvncserver/Makefile:1.44 pkgsrc/net/libvncserver/Makefile:1.45
--- pkgsrc/net/libvncserver/Makefile:1.44 Wed May 29 16:33:58 2024
+++ pkgsrc/net/libvncserver/Makefile Sun Aug 25 06:19:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2024/05/29 16:33:58 adam Exp $
+# $NetBSD: Makefile,v 1.45 2024/08/25 06:19:07 wiz Exp $
DISTNAME= libvncserver-LibVNCServer-0.9.13
PKGNAME= libVNCServer-0.9.13
@@ -21,19 +21,19 @@ USE_CMAKE= yes
PKGCONFIG_OVERRIDE+= libvncserver.pc.cmakein
PKGCONFIG_OVERRIDE+= libvncclient.pc.cmakein
-CMAKE_ARGS+= -DWITH_FFMPEG=OFF
-CMAKE_ARGS+= -DWITH_GTK=OFF
-CMAKE_ARGS+= -DWITH_SDL=OFF
-CMAKE_ARGS+= -DWITH_SYSTEMD=OFF
-
-CMAKE_ARGS+= -DWITH_THREADS=ON
-CMAKE_ARGS+= -DWITH_TIGHTVNC_FILETRANSFER=ON
-CMAKE_ARGS+= -DWITH_WEBSOCKETS=ON
-CMAKE_ARGS+= -DWITH_24BPP=ON
-CMAKE_ARGS+= -DWITH_LZO=ON
-CMAKE_ARGS+= -DWITH_ZLIB=ON
-CMAKE_ARGS+= -DWITH_JPEG=ON
-CMAKE_ARGS+= -DWITH_PNG=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_FFMPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_GTK=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SDL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SYSTEMD=OFF
+
+CMAKE_CONFIGURE_ARGS+= -DWITH_THREADS=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_TIGHTVNC_FILETRANSFER=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_WEBSOCKETS=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_24BPP=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_LZO=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ZLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_JPEG=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PNG=ON
LDFLAGS.SunOS+= -lsocket
Index: pkgsrc/net/libvncserver/options.mk
diff -u pkgsrc/net/libvncserver/options.mk:1.5 pkgsrc/net/libvncserver/options.mk:1.6
--- pkgsrc/net/libvncserver/options.mk:1.5 Fri Dec 18 23:25:59 2020
+++ pkgsrc/net/libvncserver/options.mk Sun Aug 25 06:19:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2020/12/18 23:25:59 nia Exp $
+# $NetBSD: options.mk,v 1.6 2024/08/25 06:19:07 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libVNCServer
PKG_SUPPORTED_OPTIONS= inet6 libgcrypt sasl
@@ -10,34 +10,34 @@ PKG_OPTIONS_GROUP.ssl= gnutls openssl
.if !empty(PKG_OPTIONS:Mgnutls)
.include "../../security/gnutls/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_GNUTLS=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_GNUTLS=ON
.else
-CMAKE_ARGS+= -DWITH_GNUTLS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_GNUTLS=OFF
.endif
.if !empty(PKG_OPTIONS:Minet6)
-CMAKE_ARGS+= -DWITH_IPv6=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_IPv6=ON
.else
-CMAKE_ARGS+= -DWITH_IPv6=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_IPv6=OFF
.endif
.if !empty(PKG_OPTIONS:Mlibgcrypt)
.include "../../security/libgcrypt/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_GCRYPT=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_GCRYPT=ON
.else
-CMAKE_ARGS+= -DWITH_GCRYPT=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_GCRYPT=OFF
.endif
.if !empty(PKG_OPTIONS:Mopenssl)
.include "../../security/openssl/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_OPENSSL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_OPENSSL=ON
.else
-CMAKE_ARGS+= -DWITH_OPENSSL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_OPENSSL=OFF
.endif
.if !empty(PKG_OPTIONS:Msasl)
.include "../../security/cyrus-sasl/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_SASL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_SASL=ON
.else
-CMAKE_ARGS+= -DWITH_SASL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SASL=OFF
.endif
Index: pkgsrc/net/libzrtpcpp/Makefile
diff -u pkgsrc/net/libzrtpcpp/Makefile:1.46 pkgsrc/net/libzrtpcpp/Makefile:1.47
--- pkgsrc/net/libzrtpcpp/Makefile:1.46 Wed May 29 16:33:58 2024
+++ pkgsrc/net/libzrtpcpp/Makefile Sun Aug 25 06:19:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2024/05/29 16:33:58 adam Exp $
+# $NetBSD: Makefile,v 1.47 2024/08/25 06:19:07 wiz Exp $
DISTNAME= libzrtpcpp-4.7.0
PKGREVISION= 7
@@ -17,8 +17,8 @@ USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
USE_LANGUAGES+= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DCCRTP=ON
-CMAKE_ARGS+= -DLIB_SUFFIX=""
+CMAKE_CONFIGURE_ARGS+= -DCCRTP=ON
+CMAKE_CONFIGURE_ARGS+= -DLIB_SUFFIX=""
CMAKE_USE_GNU_INSTALL_DIRS= no
Index: pkgsrc/net/libzrtpcpp/options.mk
diff -u pkgsrc/net/libzrtpcpp/options.mk:1.1 pkgsrc/net/libzrtpcpp/options.mk:1.2
--- pkgsrc/net/libzrtpcpp/options.mk:1.1 Sat Apr 18 03:36:23 2015
+++ pkgsrc/net/libzrtpcpp/options.mk Sun Aug 25 06:19:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/04/18 03:36:23 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:19:07 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libzrtpcpp
PKG_SUPPORTED_OPTIONS= sqlite3
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS+= # blank
.if !empty(PKG_OPTIONS:Msqlite3)
BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7
.include "../../databases/sqlite3/buildlink3.mk"
-CMAKE_ARGS+= -DSQLITE=ON
+CMAKE_CONFIGURE_ARGS+= -DSQLITE=ON
.else
-CMAKE_ARGS+= -DSQLITE=OFF
+CMAKE_CONFIGURE_ARGS+= -DSQLITE=OFF
.endif
Index: pkgsrc/net/mosquitto/Makefile
diff -u pkgsrc/net/mosquitto/Makefile:1.35 pkgsrc/net/mosquitto/Makefile:1.36
--- pkgsrc/net/mosquitto/Makefile:1.35 Mon Aug 19 19:11:36 2024
+++ pkgsrc/net/mosquitto/Makefile Sun Aug 25 06:19:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2024/08/19 19:11:36 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2024/08/25 06:19:07 wiz Exp $
DISTNAME= mosquitto-2.0.18
PKGREVISION= 1
@@ -16,8 +16,8 @@ TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../
USE_LANGUAGES+= c c++
LDFLAGS.SunOS+= -lsocket -lnsl
-CMAKE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/share/examples
-CMAKE_ARGS+= -DWITH_PLUGINS=NO
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/share/examples
+CMAKE_CONFIGURE_ARGS+= -DWITH_PLUGINS=NO
MOSQUITTO_USER= mosquitto
MOSQUITTO_GROUP= mosquitto
Index: pkgsrc/net/mosquitto/options.mk
diff -u pkgsrc/net/mosquitto/options.mk:1.1 pkgsrc/net/mosquitto/options.mk:1.2
--- pkgsrc/net/mosquitto/options.mk:1.1 Tue Jun 8 10:12:55 2021
+++ pkgsrc/net/mosquitto/options.mk Sun Aug 25 06:19:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2021/06/08 10:12:55 bouyer Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:19:07 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mosquitto
PKG_SUPPORTED_OPTIONS= websockets
@@ -7,8 +7,8 @@ PKG_SUGGESTED_OPTIONS= websockets
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mwebsockets)
-CMAKE_ARGS+= -DWITH_WEBSOCKETS=yes
+CMAKE_CONFIGURE_ARGS+= -DWITH_WEBSOCKETS=yes
.include "../../www/libwebsockets/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_WEBSOCKETS=no
+CMAKE_CONFIGURE_ARGS+= -DWITH_WEBSOCKETS=no
.endif
Index: pkgsrc/net/nextcloud-client/Makefile
diff -u pkgsrc/net/nextcloud-client/Makefile:1.11 pkgsrc/net/nextcloud-client/Makefile:1.12
--- pkgsrc/net/nextcloud-client/Makefile:1.11 Tue Aug 20 10:21:34 2024
+++ pkgsrc/net/nextcloud-client/Makefile Sun Aug 25 06:19:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2024/08/20 10:21:34 plunky Exp $
+# $NetBSD: Makefile,v 1.12 2024/08/25 06:19:07 wiz Exp $
#
DISTNAME= nextcloud-client-3.13.2
@@ -20,18 +20,18 @@ PKG_SYSCONFSUBDIR= Nextcloud
EGDIR= ${PREFIX}/share/examples/Nextcloud
CONF_FILES= ${EGDIR}/sync-exclude.lst ${PKG_SYSCONFDIR}/sync-exclude.lst
-CMAKE_ARGS+= -DSYSCONF_EGDIR:PATH=${EGDIR}
-CMAKE_ARGS+= -DSYSCONF_INSTALL_DIR:PATH=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DSYSCONF_EGDIR:PATH=${EGDIR}
+CMAKE_CONFIGURE_ARGS+= -DSYSCONF_INSTALL_DIR:PATH=${PKG_SYSCONFDIR}
-CMAKE_ARGS+= -DBUILD_TESTING:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING:BOOL=OFF
# used as tool during configure
-CMAKE_ARGS+= -DSVG_CONVERTER:FILEPATH=${BUILDLINK_DIR}/bin/rsvg-convert
+CMAKE_CONFIGURE_ARGS+= -DSVG_CONVERTER:FILEPATH=${BUILDLINK_DIR}/bin/rsvg-convert
# cmake finds these even when we have not depended on them
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:BOOL=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_PdfLatex:BOOL=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_PdfLatex:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx:BOOL=TRUE
# ignore warns about xdr functions in a library
LDFLAGS+= -Wl,--no-fatal-warnings
Index: pkgsrc/net/nng/options.mk
diff -u pkgsrc/net/nng/options.mk:1.2 pkgsrc/net/nng/options.mk:1.3
--- pkgsrc/net/nng/options.mk:1.2 Tue Jun 6 12:42:05 2023
+++ pkgsrc/net/nng/options.mk Sun Aug 25 06:19:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/06/06 12:42:05 riastradh Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:19:07 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.nng
@@ -12,14 +12,14 @@ PLIST_VARS+= doc shared static
.if !empty(PKG_OPTIONS:Mdoc)
.include "../../lang/ruby/rubyversion.mk"
TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor
-CMAKE_ARGS+= -DNNG_ENABLE_DOC=1
-CMAKE_ARGS+= -DASCIIDOCTOR=${PREFIX}/bin/asciidoctor${RUBY_VER}
+CMAKE_CONFIGURE_ARGS+= -DNNG_ENABLE_DOC=1
+CMAKE_CONFIGURE_ARGS+= -DASCIIDOCTOR=${PREFIX}/bin/asciidoctor${RUBY_VER}
PLIST.doc= yes
.endif
.if !empty(PKG_OPTIONS:Mstatic)
PLIST.static= yes
.else
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
PLIST.shared= yes
.endif
Index: pkgsrc/net/owncloudclient/Makefile
diff -u pkgsrc/net/owncloudclient/Makefile:1.46 pkgsrc/net/owncloudclient/Makefile:1.47
--- pkgsrc/net/owncloudclient/Makefile:1.46 Wed May 29 16:34:00 2024
+++ pkgsrc/net/owncloudclient/Makefile Sun Aug 25 06:19:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2024/05/29 16:34:00 adam Exp $
+# $NetBSD: Makefile,v 1.47 2024/08/25 06:19:07 wiz Exp $
DISTNAME= ownCloud-2.7.6.3261
PKGNAME= ${DISTNAME:S/ownCloud/owncloudclient/1}
@@ -19,9 +19,9 @@ USE_LANGUAGES= c c++
TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-CMAKE_ARGS+= -DSYSCONF_INSTALL_DIR=${PKG_SYSCONFDIR}
-CMAKE_ARGS+= -DBUILD_SHELL_INTEGRATION=OFF
-CMAKE_ARGS+= -DBUILD_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DSYSCONF_INSTALL_DIR=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHELL_INTEGRATION=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
EGDIR= ${PREFIX}/share/examples/owncloudclient
CONF_FILES= ${EGDIR}/sync-exclude.lst \
Index: pkgsrc/net/qbittorrent/Makefile
diff -u pkgsrc/net/qbittorrent/Makefile:1.69 pkgsrc/net/qbittorrent/Makefile:1.70
--- pkgsrc/net/qbittorrent/Makefile:1.69 Tue Aug 20 07:23:21 2024
+++ pkgsrc/net/qbittorrent/Makefile Sun Aug 25 06:19:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2024/08/20 07:23:21 adam Exp $
+# $NetBSD: Makefile,v 1.70 2024/08/25 06:19:07 wiz Exp $
DISTNAME= qbittorrent-4.6.6
CATEGORIES= net
@@ -15,9 +15,9 @@ LICENSE= gnu-gpl-v2
# https://github.com/qbittorrent/qBittorrent/issues/11425
USE_LANGUAGES= c gnu++14
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
# error "Boost.Stacktrace requires `_Unwind_Backtrace` function
-CMAKE_ARGS+= -DSTACKTRACE=OFF
+CMAKE_CONFIGURE_ARGS+= -DSTACKTRACE=OFF
GCC_REQD+= 10 # c++14
Index: pkgsrc/net/qbittorrent/options.mk
diff -u pkgsrc/net/qbittorrent/options.mk:1.1 pkgsrc/net/qbittorrent/options.mk:1.2
--- pkgsrc/net/qbittorrent/options.mk:1.1 Wed Jan 17 20:14:28 2024
+++ pkgsrc/net/qbittorrent/options.mk Sun Aug 25 06:19:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2024/01/17 20:14:28 adam Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:19:07 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qbittorrent
PKG_OPTIONS_OPTIONAL_GROUPS= gui
@@ -8,11 +8,11 @@ PKG_SUGGESTED_OPTIONS= qt6
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mqt5)
-CMAKE_ARGS+= -DQT6=OFF
+CMAKE_CONFIGURE_ARGS+= -DQT6=OFF
TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
. include "../../x11/qt5-qtbase/buildlink3.mk"
.elif !empty(PKG_OPTIONS:Mqt6)
-CMAKE_ARGS+= -DQT6=ON
+CMAKE_CONFIGURE_ARGS+= -DQT6=ON
TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
. include "../../graphics/qt6-qtsvg/buildlink3.mk"
. include "../../x11/qt6-qtbase/buildlink3.mk"
Index: pkgsrc/net/rabbitmq-c/Makefile
diff -u pkgsrc/net/rabbitmq-c/Makefile:1.23 pkgsrc/net/rabbitmq-c/Makefile:1.24
--- pkgsrc/net/rabbitmq-c/Makefile:1.23 Sun Apr 7 19:26:14 2024
+++ pkgsrc/net/rabbitmq-c/Makefile Sun Aug 25 06:19:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2024/04/07 19:26:14 adam Exp $
+# $NetBSD: Makefile,v 1.24 2024/08/25 06:19:07 wiz Exp $
DISTNAME= rabbitmq-c-0.14.0
CATEGORIES= net
@@ -16,9 +16,9 @@ USE_CC_FEATURES= c99
USE_LANGUAGES= c
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DBUILD_TOOLS=ON
-CMAKE_ARGS+= -DBUILD_TOOLS_DOCS=ON
-CMAKE_ARGS+= -DENABLE_SSL_SUPPORT=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TOOLS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TOOLS_DOCS=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SSL_SUPPORT=ON
TEST_TARGET= test
.include "../../devel/cmake/build.mk"
Index: pkgsrc/net/remmina/Makefile
diff -u pkgsrc/net/remmina/Makefile:1.104 pkgsrc/net/remmina/Makefile:1.105
--- pkgsrc/net/remmina/Makefile:1.104 Fri Aug 9 09:42:32 2024
+++ pkgsrc/net/remmina/Makefile Sun Aug 25 06:19:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2024/08/09 09:42:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.105 2024/08/25 06:19:08 wiz Exp $
DISTNAME= Remmina-v1.4.35
PKGNAME= ${DISTNAME:tl:S/-v/-/1}
@@ -20,7 +20,7 @@ USE_TOOLS+= pkg-config msgmerge
REPLACE_SH+= data/desktop/remmina-file-wrapper.in
-CMAKE_ARGS+= -DWITH_WWW=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_WWW=OFF
CFLAGS.NetBSD+= -D_NETBSD_SOURCE # for NI_MAXSERV constant
LDFLAGS.SunOS+= -lsocket -lnsl
Index: pkgsrc/net/remmina/options.mk
diff -u pkgsrc/net/remmina/options.mk:1.2 pkgsrc/net/remmina/options.mk:1.3
--- pkgsrc/net/remmina/options.mk:1.2 Thu Oct 3 00:07:07 2019
+++ pkgsrc/net/remmina/options.mk Sun Aug 25 06:19:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/10/03 00:07:07 nia Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:19:08 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.remmina
@@ -9,10 +9,10 @@ PKG_SUGGESTED_OPTIONS= libappindicator
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mavahi)
-CMAKE_ARGS+= -DWITH_AVAHI=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_AVAHI=ON
.include "../../net/avahi/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_AVAHI=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_AVAHI=OFF
.endif
.if !empty(PKG_OPTIONS:Mlibappindicator)
Index: pkgsrc/net/softether/Makefile
diff -u pkgsrc/net/softether/Makefile:1.2 pkgsrc/net/softether/Makefile:1.3
--- pkgsrc/net/softether/Makefile:1.2 Sun Apr 14 08:56:02 2024
+++ pkgsrc/net/softether/Makefile Sun Aug 25 06:19:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2024/04/14 08:56:02 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:19:08 wiz Exp $
NAME= softether
VERSION= 5.02.5181
@@ -32,7 +32,7 @@ FILES_SUBST+= SE_PIDDIR=${SE_PIDDIR}
BUILD_DEFS+= VARBASE
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSE_DBDIR="${SE_DBDIR}" \
-DSE_LOGDIR="${SE_LOGDIR}" \
-DSE_PIDDIR="${SE_PIDDIR}"
Index: pkgsrc/net/synergy/Makefile
diff -u pkgsrc/net/synergy/Makefile:1.86 pkgsrc/net/synergy/Makefile:1.87
--- pkgsrc/net/synergy/Makefile:1.86 Wed May 29 16:34:04 2024
+++ pkgsrc/net/synergy/Makefile Sun Aug 25 06:19:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2024/05/29 16:34:04 adam Exp $
+# $NetBSD: Makefile,v 1.87 2024/08/25 06:19:08 wiz Exp $
DISTNAME= synergy-core-1.14.6.19
PKGNAME= ${DISTNAME:S/-core//}
@@ -23,8 +23,8 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES= c c++11
USE_CMAKE= yes
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DSYNERGY_BUILD_LEGACY_GUI=OFF
-CMAKE_ARGS+= -DSYNERGY_BUILD_LEGACY_INSTALLER=OFF
+CMAKE_CONFIGURE_ARGS+= -DSYNERGY_BUILD_LEGACY_GUI=OFF
+CMAKE_CONFIGURE_ARGS+= -DSYNERGY_BUILD_LEGACY_INSTALLER=OFF
CONFIGURE_ENV+= GIT_COMMIT=218fa800
Index: pkgsrc/net/taskserver/Makefile
diff -u pkgsrc/net/taskserver/Makefile:1.15 pkgsrc/net/taskserver/Makefile:1.16
--- pkgsrc/net/taskserver/Makefile:1.15 Wed May 29 16:34:04 2024
+++ pkgsrc/net/taskserver/Makefile Sun Aug 25 06:19:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2024/05/29 16:34:04 adam Exp $
+# $NetBSD: Makefile,v 1.16 2024/08/25 06:19:08 wiz Exp $
DISTNAME= taskd-1.1.0
PKGNAME= ${DISTNAME:S/taskd/taskserver/}
@@ -14,8 +14,8 @@ LICENSE= mit
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DTASKD_MAN1DIR=${PREFIX}/${PKGMANDIR}/man1
-CMAKE_ARGS+= -DTASKD_MAN5DIR=${PREFIX}/${PKGMANDIR}/man5
+CMAKE_CONFIGURE_ARGS+= -DTASKD_MAN1DIR=${PREFIX}/${PKGMANDIR}/man1
+CMAKE_CONFIGURE_ARGS+= -DTASKD_MAN5DIR=${PREFIX}/${PKGMANDIR}/man5
LDFLAGS.SunOS+= -lsocket -lnsl
Index: pkgsrc/net/tigervnc/Makefile
diff -u pkgsrc/net/tigervnc/Makefile:1.72 pkgsrc/net/tigervnc/Makefile:1.73
--- pkgsrc/net/tigervnc/Makefile:1.72 Wed May 29 16:34:04 2024
+++ pkgsrc/net/tigervnc/Makefile Sun Aug 25 06:19:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2024/05/29 16:34:04 adam Exp $
+# $NetBSD: Makefile,v 1.73 2024/08/25 06:19:08 wiz Exp $
DISTNAME= tigervnc-1.13.1
PKGNAME= ${DISTNAME}.1.20.13
@@ -40,7 +40,7 @@ INSTALL_DIRS= . unix/xserver/hw/vnc
INSTALL_TARGET= install
# CMake build appends 'tigervnc', so this is not PKG_SYSCONFDIR
-CMAKE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFBASE}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFBASE}
# for reallocarray()
CPPFLAGS.NetBSD+= -D_OPENBSD_SOURCE
Index: pkgsrc/net/transmission-gtk/Makefile
diff -u pkgsrc/net/transmission-gtk/Makefile:1.71 pkgsrc/net/transmission-gtk/Makefile:1.72
--- pkgsrc/net/transmission-gtk/Makefile:1.71 Sat Aug 24 20:49:17 2024
+++ pkgsrc/net/transmission-gtk/Makefile Sun Aug 25 06:19:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2024/08/24 20:49:17 abs Exp $
+# $NetBSD: Makefile,v 1.72 2024/08/25 06:19:08 wiz Exp $
PKGNAME= transmission-gtk-${VERSION}
COMMENT= Free, lightweight BitTorrent client (GTK version)
@@ -9,15 +9,15 @@ CONFLICTS+= Transmission-gui-[0-9]*
.include "../../net/transmission/Makefile.common"
-CMAKE_ARGS+= -DENABLE_DAEMON=OFF
-CMAKE_ARGS+= -DENABLE_GTK=ON
-CMAKE_ARGS+= -DENABLE_QT=OFF
-CMAKE_ARGS+= -DENABLE_MAC=OFF
-CMAKE_ARGS+= -DENABLE_WEB=OFF
-CMAKE_ARGS+= -DENABLE_UTILS=OFF
-CMAKE_ARGS+= -DENABLE_CLI=OFF
-CMAKE_ARGS+= -DINSTALL_DOC=OFF
-CMAKE_ARGS+= -DENABLE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DAEMON=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GTK=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MAC=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WEB=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_UTILS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CLI=OFF
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOC=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TESTS=OFF
# https://github.com/transmission/transmission/issues/4864
post-install:
Index: pkgsrc/net/transmission-qt/Makefile
diff -u pkgsrc/net/transmission-qt/Makefile:1.86 pkgsrc/net/transmission-qt/Makefile:1.87
--- pkgsrc/net/transmission-qt/Makefile:1.86 Sat Aug 24 20:49:17 2024
+++ pkgsrc/net/transmission-qt/Makefile Sun Aug 25 06:19:08 2024
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.86 2024/08/24 20:49:17 abs Exp $
+# $NetBSD: Makefile,v 1.87 2024/08/25 06:19:08 wiz Exp $
PKGNAME= transmission-qt-${VERSION}
COMMENT= Free, lightweight BitTorrent client (QT version)
DEPENDS+= transmission-common>=${VERSION}:../../net/transmission-common
-CMAKE_ARGS+= -DENABLE_DAEMON=OFF
-CMAKE_ARGS+= -DENABLE_GTK=OFF
-CMAKE_ARGS+= -DENABLE_QT=ON
-CMAKE_ARGS+= -DENABLE_MAC=OFF
-CMAKE_ARGS+= -DENABLE_WEB=OFF
-CMAKE_ARGS+= -DENABLE_UTILS=OFF
-CMAKE_ARGS+= -DENABLE_CLI=OFF
-CMAKE_ARGS+= -DINSTALL_DOC=OFF
-CMAKE_ARGS+= -DENABLE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DAEMON=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GTK=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MAC=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WEB=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_UTILS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CLI=OFF
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOC=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TESTS=OFF
USE_CXX_FEATURES+= filesystem
Index: pkgsrc/net/wireshark/Makefile
diff -u pkgsrc/net/wireshark/Makefile:1.316 pkgsrc/net/wireshark/Makefile:1.317
--- pkgsrc/net/wireshark/Makefile:1.316 Sat Jul 13 21:33:59 2024
+++ pkgsrc/net/wireshark/Makefile Sun Aug 25 06:19:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.316 2024/07/13 21:33:59 adam Exp $
+# $NetBSD: Makefile,v 1.317 2024/08/25 06:19:09 wiz Exp $
DISTNAME= wireshark-4.2.6
CATEGORIES= net
@@ -14,10 +14,10 @@ CONFLICTS+= ethereal-[0-9]*
DEPENDS+= lemon-[0-9]*:../../devel/lemon
-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_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DENABLE_APPLICATION_BUNDLE=OFF
+CMAKE_CONFIGURE_ARGS+= -DVCSVERSION_OVERRIDE=${PKGVERSION_NOREV}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Asciidoctor=TRUE
USE_LANGUAGES= c c++
USE_TOOLS+= gmake perl pkg-config bison lex
Index: pkgsrc/net/wireshark/options.mk
diff -u pkgsrc/net/wireshark/options.mk:1.34 pkgsrc/net/wireshark/options.mk:1.35
--- pkgsrc/net/wireshark/options.mk:1.34 Mon Nov 20 18:34:49 2023
+++ pkgsrc/net/wireshark/options.mk Sun Aug 25 06:19:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.34 2023/11/20 18:34:49 adam Exp $
+# $NetBSD: options.mk,v 1.35 2024/08/25 06:19:09 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark
PKG_SUPPORTED_OPTIONS= http2 http3 ilbc lua spandsp
@@ -13,32 +13,32 @@ PLIST_VARS+= icons ilbc qt spandsp
.if !empty(PKG_OPTIONS:Mhttp2)
. include "../../www/nghttp2/buildlink3.mk"
.else
-CMAKE_ARGS+= -DENABLE_NGHTTP2=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_NGHTTP2=OFF
.endif
.if !empty(PKG_OPTIONS:Mhttp3)
. include "../../www/nghttp3/buildlink3.mk"
.else
-CMAKE_ARGS+= -DENABLE_NGHTTP3=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_NGHTTP3=OFF
.endif
.if !empty(PKG_OPTIONS:Milbc)
. include "../../audio/libilbc/buildlink3.mk"
PLIST.ilbc= yes
.else
-CMAKE_ARGS+= -DENABLE_ILBC=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ILBC=OFF
.endif
.if !empty(PKG_OPTIONS:Mlua)
LUA_VERSIONS_ACCEPTED= 52 51
. include "../../lang/lua/buildlink3.mk"
.else
-CMAKE_ARGS+= -DENABLE_LUA=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LUA=OFF
.endif
.if !empty(PKG_OPTIONS:Mqt5) || !empty(PKG_OPTIONS:Mqt6)
. if !empty(PKG_OPTIONS:Mqt5)
-CMAKE_ARGS+= -DUSE_qt6=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_qt6=OFF
. include "../../x11/qt5-qtsvg/buildlink3.mk"
. include "../../x11/qt5-qttools/buildlink3.mk"
. if ${OPSYS} == "Darwin"
@@ -47,7 +47,7 @@ CMAKE_ARGS+= -DUSE_qt6=OFF
. include "../../x11/qt5-qtx11extras/buildlink3.mk"
. endif
. elif !empty(PKG_OPTIONS:Mqt6)
-CMAKE_ARGS+= -DUSE_qt6=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_qt6=ON
. include "../../graphics/qt6-qtsvg/buildlink3.mk"
. include "../../multimedia/qt6-qtmultimedia/buildlink3.mk"
. include "../../devel/qt6-qttools/buildlink3.mk"
@@ -83,13 +83,13 @@ install-icons:
. endfor
. endif
.else
-CMAKE_ARGS+= -DBUILD_wireshark=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_wireshark=OFF
.endif
.if !empty(PKG_OPTIONS:Mspandsp)
.include "../../comms/spandsp/buildlink3.mk"
PLIST.spandsp= yes
-CMAKE_ARGS+= -DENABLE_SPANDSP=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SPANDSP=ON
.else
-CMAKE_ARGS+= -DENABLE_SPANDSP=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SPANDSP=OFF
.endif
Index: pkgsrc/news/neix/Makefile
diff -u pkgsrc/news/neix/Makefile:1.21 pkgsrc/news/neix/Makefile:1.22
--- pkgsrc/news/neix/Makefile:1.21 Tue Aug 20 06:27:17 2024
+++ pkgsrc/news/neix/Makefile Sun Aug 25 06:19:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2024/08/20 06:27:17 pin Exp $
+# $NetBSD: Makefile,v 1.22 2024/08/25 06:19:09 wiz Exp $
DISTNAME= neix-0.1.5
PKGREVISION= 9
@@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v3
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
USE_CXX_FEATURES+= regex
Index: pkgsrc/news/pan/Makefile
diff -u pkgsrc/news/pan/Makefile:1.146 pkgsrc/news/pan/Makefile:1.147
--- pkgsrc/news/pan/Makefile:1.146 Fri Aug 9 09:42:32 2024
+++ pkgsrc/news/pan/Makefile Sun Aug 25 06:19:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.146 2024/08/09 09:42:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.147 2024/08/25 06:19:09 wiz Exp $
PKGNAME= pan-0.159
PKGREVISION= 1
@@ -27,12 +27,12 @@ USE_PKGLOCALEDIR= YES
LIBS+= -lcompat
.endif
-CMAKE_ARGS+= -DENABLE_MANUAL=1
-CMAKE_ARGS+= -DWANT_GKR=0
-CMAKE_ARGS+= -DWANT_GMIME_CRYPTO=1
-CMAKE_ARGS+= -DWANT_GNUTLS=1
-CMAKE_ARGS+= -DWANT_GTKSPELL=1
-CMAKE_ARGS+= -DWANT_NOTIFY=0
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MANUAL=1
+CMAKE_CONFIGURE_ARGS+= -DWANT_GKR=0
+CMAKE_CONFIGURE_ARGS+= -DWANT_GMIME_CRYPTO=1
+CMAKE_CONFIGURE_ARGS+= -DWANT_GNUTLS=1
+CMAKE_CONFIGURE_ARGS+= -DWANT_GTKSPELL=1
+CMAKE_CONFIGURE_ARGS+= -DWANT_NOTIFY=0
LIBS.SunOS+= -lsocket
Index: pkgsrc/news/pan/options.mk
diff -u pkgsrc/news/pan/options.mk:1.1 pkgsrc/news/pan/options.mk:1.2
--- pkgsrc/news/pan/options.mk:1.1 Thu Jun 6 18:51:13 2024
+++ pkgsrc/news/pan/options.mk Sun Aug 25 06:19:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2024/06/06 18:51:13 rhialto Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:19:09 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.pan
PKG_SUPPORTED_OPTIONS= dbus
@@ -7,8 +7,8 @@ PKG_SUGGESTED_OPTIONS=
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdbus)
-CMAKE_ARGS+= -DWANT_DBUS=1
+CMAKE_CONFIGURE_ARGS+= -DWANT_DBUS=1
.include "../../sysutils/dbus/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWANT_DBUS=0
+CMAKE_CONFIGURE_ARGS+= -DWANT_DBUS=0
.endif
Index: pkgsrc/parallel/opencl-clhpp/Makefile
diff -u pkgsrc/parallel/opencl-clhpp/Makefile:1.1 pkgsrc/parallel/opencl-clhpp/Makefile:1.2
--- pkgsrc/parallel/opencl-clhpp/Makefile:1.1 Wed Jun 9 20:49:58 2021
+++ pkgsrc/parallel/opencl-clhpp/Makefile Sun Aug 25 06:19:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/06/09 20:49:58 nia Exp $
+# $NetBSD: Makefile,v 1.2 2024/08/25 06:19:09 wiz Exp $
DISTNAME= OpenCL-CLHPP-v2.0.14
PKGNAME= ${DISTNAME:tl:S/-v/-/1}
@@ -15,8 +15,8 @@ LICENSE= apache-2.0
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_DOCS=OFF
-CMAKE_ARGS+= -DBUILD_EXAMPLES=OFF
-CMAKE_ARGS+= -DBUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=OFF
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/parallel/openmp/Makefile
diff -u pkgsrc/parallel/openmp/Makefile:1.20 pkgsrc/parallel/openmp/Makefile:1.21
--- pkgsrc/parallel/openmp/Makefile:1.20 Sat Jul 6 15:45:08 2024
+++ pkgsrc/parallel/openmp/Makefile Sun Aug 25 06:19:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2024/07/06 15:45:08 adam Exp $
+# $NetBSD: Makefile,v 1.21 2024/08/25 06:19:09 wiz Exp $
.include "../../lang/llvm/version.mk"
@@ -16,9 +16,9 @@ USE_LANGUAGES= c gnu++17
USE_TOOLS+= perl pkg-config
GCC_REQD+= 7
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DOPENMP_ENABLE_LIBOMPTARGET=OFF
-CMAKE_ARGS+= -DOPENMP_ENABLE_OMPT_TOOLS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DOPENMP_ENABLE_LIBOMPTARGET=OFF
+CMAKE_CONFIGURE_ARGS+= -DOPENMP_ENABLE_OMPT_TOOLS=OFF
BUILDLINK_TRANSFORM.NetBSD+= opt:-std=c++17:-std=gnu++17 # alloca
Index: pkgsrc/parallel/pocl/Makefile
diff -u pkgsrc/parallel/pocl/Makefile:1.17 pkgsrc/parallel/pocl/Makefile:1.18
--- pkgsrc/parallel/pocl/Makefile:1.17 Sat Jul 6 16:16:06 2024
+++ pkgsrc/parallel/pocl/Makefile Sun Aug 25 06:19:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2024/07/06 16:16:06 adam Exp $
+# $NetBSD: Makefile,v 1.18 2024/08/25 06:19:09 wiz Exp $
DISTNAME= pocl-6.0
CATEGORIES= parallel
@@ -15,10 +15,10 @@ USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
TEST_TARGET= check
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-#CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
-CMAKE_ARGS+= -DPOCL_INSTALL_ICD_VENDORDIR="${PREFIX}/share/examples/OpenCL/vendors"
-CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
+CMAKE_CONFIGURE_ARGS+= -DPOCL_INSTALL_ICD_VENDORDIR="${PREFIX}/share/examples/OpenCL/vendors"
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/pocl
@@ -30,9 +30,9 @@ GENERATE_PLIST+= find ${DESTDIR}${PREFIX
# "Don't know what CPU variants to use for kernel library on this platform."
.if ${MACHINE_ARCH:Maarch64*}
-CMAKE_ARGS+= -DLLC_HOST_CPU="cortex-a53"
+CMAKE_CONFIGURE_ARGS+= -DLLC_HOST_CPU="cortex-a53"
.else
-CMAKE_ARGS+= -DKERNELLIB_HOST_CPU_VARIANTS="distro"
+CMAKE_CONFIGURE_ARGS+= -DKERNELLIB_HOST_CPU_VARIANTS="distro"
.endif
pre-configure:
Index: pkgsrc/parallel/threadingbuildingblocks/Makefile
diff -u pkgsrc/parallel/threadingbuildingblocks/Makefile:1.13 pkgsrc/parallel/threadingbuildingblocks/Makefile:1.14
--- pkgsrc/parallel/threadingbuildingblocks/Makefile:1.13 Fri Jul 1 16:21:08 2022
+++ pkgsrc/parallel/threadingbuildingblocks/Makefile Sun Aug 25 06:19:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2022/07/01 16:21:08 adam Exp $
+# $NetBSD: Makefile,v 1.14 2024/08/25 06:19:09 wiz Exp $
DISTNAME= oneTBB-2021.5.0
PKGNAME= ${DISTNAME:S/oneTBB-/threadingbuildingblocks-/}
@@ -15,8 +15,8 @@ LICENSE= apache-2.0
USE_CMAKE= yes
USE_LANGUAGES= c c++11
# Use one build directory across platforms.
-CMAKE_ARGS+= -DTBB_OUTPUT_DIR_BASE=pkgsrc
-CMAKE_ARGS+= -DTBB_STRICT=OFF
+CMAKE_CONFIGURE_ARGS+= -DTBB_OUTPUT_DIR_BASE=pkgsrc
+CMAKE_CONFIGURE_ARGS+= -DTBB_STRICT=OFF
TEST_TARGET= test
# For Darwin
TEST_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/pkgsrc_relwithdebinfo
Index: pkgsrc/pkgtools/pkglint4/files/makevars.map
diff -u pkgsrc/pkgtools/pkglint4/files/makevars.map:1.15 pkgsrc/pkgtools/pkglint4/files/makevars.map:1.16
--- pkgsrc/pkgtools/pkglint4/files/makevars.map:1.15 Mon Apr 25 06:25:43 2022
+++ pkgsrc/pkgtools/pkglint4/files/makevars.map Sun Aug 25 06:19:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.15 2022/04/25 06:25:43 wiz Exp $
+# $NetBSD: makevars.map,v 1.16 2024/08/25 06:19:09 wiz Exp $
#
# This file contains the guessed type of some variables, according to
@@ -233,7 +233,7 @@ CHECK_SHLIBS_SKIP List of Pathmask [$pac
CHECK_SHLIBS_SUPPORTED YesNo [m:s]
CHECK_WRKREF_SKIP List of Pathmask [$package_list]
CMAKE_ARG_PATH Pathname [$package]
-CMAKE_ARGS List of ShellWord [$package_list]
+CMAKE_CONFIGURE_ARGS List of ShellWord [$package_list]
COMMENT Comment [m:as,c:as]
COMPILER_RPATH_FLAG { -Wl,-rpath } [$system]
CONFIGURE_ARGS List of ShellWord [$package_list]
Index: pkgsrc/print/dspdfviewer/Makefile
diff -u pkgsrc/print/dspdfviewer/Makefile:1.63 pkgsrc/print/dspdfviewer/Makefile:1.64
--- pkgsrc/print/dspdfviewer/Makefile:1.63 Wed May 29 16:34:09 2024
+++ pkgsrc/print/dspdfviewer/Makefile Sun Aug 25 06:19:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2024/05/29 16:34:09 adam Exp $
+# $NetBSD: Makefile,v 1.64 2024/08/25 06:19:10 wiz Exp $
DISTNAME= dspdfviewer-1.15.1
PKGREVISION= 60
@@ -16,7 +16,7 @@ DEPENDS+= qt5-qttools>=5.5.1:../../x11/q
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
USE_CMAKE= yes
-CMAKE_ARGS+= -DBuildTests=OFF
+CMAKE_CONFIGURE_ARGS+= -DBuildTests=OFF
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
BUILD_MAKE_FLAGS+= VERBOSE=1
Index: pkgsrc/print/libharu/Makefile
diff -u pkgsrc/print/libharu/Makefile:1.3 pkgsrc/print/libharu/Makefile:1.4
--- pkgsrc/print/libharu/Makefile:1.3 Tue Jul 25 12:30:28 2023
+++ pkgsrc/print/libharu/Makefile Sun Aug 25 06:19:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/07/25 12:30:28 thor Exp $
+# $NetBSD: Makefile,v 1.4 2024/08/25 06:19:10 wiz Exp $
DISTNAME= libharu-2.4.3
CATEGORIES= print
@@ -13,7 +13,7 @@ LICENSE= zlib
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DLIBHPDF_STATIC=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBHPDF_STATIC=OFF
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/print/podofo/Makefile
diff -u pkgsrc/print/podofo/Makefile:1.47 pkgsrc/print/podofo/Makefile:1.48
--- pkgsrc/print/podofo/Makefile:1.47 Sun Nov 12 13:23:19 2023
+++ pkgsrc/print/podofo/Makefile Sun Aug 25 06:19:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2023/11/12 13:23:19 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2024/08/25 06:19:10 wiz Exp $
DISTNAME= podofo-0.9.8
PKGREVISION= 4
@@ -14,15 +14,15 @@ USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DPODOFO_BUILD_SHARED=ON
-CMAKE_ARGS+= -DPODOFO_BUILD_STATIC=ON
-CMAKE_ARGS+= -DFREETYPE_INCLUDE_DIR_FT2BUILD:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2
-CMAKE_ARGS+= -DFREETYPE_INCLUDE_DIR_FTHEADER:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2/config
-CMAKE_ARGS+= -DFREETYPE_LIB_PATHS:PATH=${BUILDLINK_PREFIX.freetype2}/lib
+CMAKE_CONFIGURE_ARGS+= -DPODOFO_BUILD_SHARED=ON
+CMAKE_CONFIGURE_ARGS+= -DPODOFO_BUILD_STATIC=ON
+CMAKE_CONFIGURE_ARGS+= -DFREETYPE_INCLUDE_DIR_FT2BUILD:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2
+CMAKE_CONFIGURE_ARGS+= -DFREETYPE_INCLUDE_DIR_FTHEADER:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2/config
+CMAKE_CONFIGURE_ARGS+= -DFREETYPE_LIB_PATHS:PATH=${BUILDLINK_PREFIX.freetype2}/lib
# Avoid building unit tests.
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CppUnit=TRUE
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LUA=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CppUnit=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LUA=TRUE
# Podofo uses thread_local, which is a C++11 feature, but does not
# appropriately set -std=c++11.
Index: pkgsrc/print/podofo/options.mk
diff -u pkgsrc/print/podofo/options.mk:1.2 pkgsrc/print/podofo/options.mk:1.3
--- pkgsrc/print/podofo/options.mk:1.2 Sat May 3 13:01:24 2014
+++ pkgsrc/print/podofo/options.mk Sun Aug 25 06:19:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2014/05/03 13:01:24 alnsn Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:19:10 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.podofo
PKG_SUPPORTED_OPTIONS= lua
@@ -11,5 +11,5 @@ PKG_SUPPORTED_OPTIONS= lua
.if !empty(PKG_OPTIONS:Mlua)
LUA_VERSIONS_INCOMPATIBLE= 52
. include "../../lang/lua/buildlink3.mk"
-CMAKE_ARGS+= -DLUA_ENABLED:LUA_ENABLED=true
+CMAKE_CONFIGURE_ARGS+= -DLUA_ENABLED:LUA_ENABLED=true
.endif
Index: pkgsrc/print/poppler/Makefile
diff -u pkgsrc/print/poppler/Makefile:1.103 pkgsrc/print/poppler/Makefile:1.104
--- pkgsrc/print/poppler/Makefile:1.103 Sun Apr 7 07:34:54 2024
+++ pkgsrc/print/poppler/Makefile Sun Aug 25 06:19:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2024/04/07 07:34:54 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2024/08/25 06:19:10 wiz Exp $
PKGREVISION= 1
.include "../../print/poppler/Makefile.common"
@@ -11,24 +11,24 @@ INSTALLATION_DIRS+= include/poppler shar
.if ${OPSYS} == "Darwin"
# MacOS Xcode does not provide /usr/include, so be explicit
-CMAKE_ARGS+= -DGLIB2_INCLUDE_DIRS=${PREFIX}/include
+CMAKE_CONFIGURE_ARGS+= -DGLIB2_INCLUDE_DIRS=${PREFIX}/include
.endif
# Don't compile GTK+ test program.
-CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GTK_TESTS=OFF
# Compile GLib wrapper which also needs gtk2
-CMAKE_ARGS+= -DENABLE_GLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GLIB=ON
# Don't build and install the tools
-CMAKE_ARGS+= -DENABLE_UTILS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_UTILS=OFF
# Don't compile poppler cpp wrapper.
-CMAKE_ARGS+= -DENABLE_CPP=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CPP=OFF
# Don't compile poppler qt5/6 wrapper.
-CMAKE_ARGS+= -DENABLE_QT5=OFF
-CMAKE_ARGS+= -DENABLE_QT6=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6=OFF
# Don't build libcurl based HTTP support. ## might want to include
-CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LIBCURL=OFF
# Don't run gperf if it's present
-CMAKE_ARGS+= -DRUN_GPERF_IF_PRESENT=OFF
+CMAKE_CONFIGURE_ARGS+= -DRUN_GPERF_IF_PRESENT=OFF
SUPERSEDES+= poppler-glib-[0-9]*
@@ -36,7 +36,7 @@ SUPERSEDES+= poppler-glib-[0-9]*
.if ${USE_CROSS_COMPILE:tl} == "yes"
ALL_ENV+= PKG_CONFIG_SYSROOT_DIR=${CROSS_DESTDIR:Q}
-CMAKE_ARGS+= -DCMAKE_SYSROOT:STRING=${CROSS_DESTDIR:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_SYSROOT:STRING=${CROSS_DESTDIR:Q}
.endif
# Passing "-ansi" turns "long long" support off on FreeBSD/amd64:
Index: pkgsrc/print/poppler/Makefile.common
diff -u pkgsrc/print/poppler/Makefile.common:1.154 pkgsrc/print/poppler/Makefile.common:1.155
--- pkgsrc/print/poppler/Makefile.common:1.154 Mon Mar 11 14:39:48 2024
+++ pkgsrc/print/poppler/Makefile.common Sun Aug 25 06:19:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.154 2024/03/11 14:39:48 wiz Exp $
+# $NetBSD: Makefile.common,v 1.155 2024/08/25 06:19:10 wiz Exp $
#
# used by print/poppler/Makefile
# used by print/poppler-cpp/Makefile
@@ -25,8 +25,8 @@ USE_LANGUAGES= c c++17
USE_TOOLS+= pkg-config gsed
GCC_REQD+= 8 # std::optional
-CMAKE_ARGS+= -DENABLE_GPGME:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_NSS3:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GPGME:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_NSS3:BOOL=OFF
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/print/poppler-cpp/Makefile
diff -u pkgsrc/print/poppler-cpp/Makefile:1.43 pkgsrc/print/poppler-cpp/Makefile:1.44
--- pkgsrc/print/poppler-cpp/Makefile:1.43 Sun Apr 7 07:34:54 2024
+++ pkgsrc/print/poppler-cpp/Makefile Sun Aug 25 06:19:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2024/04/07 07:34:54 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2024/08/25 06:19:10 wiz Exp $
PKGREVISION= 1
.include "../../print/poppler/Makefile.common"
@@ -12,18 +12,18 @@ CONFLICTS+= poppler<0.4.5nb1
PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cpp.pc.cmake
# Don't compile GTK+ test program.
-CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GTK_TESTS=OFF
# Don't compile GLib wrapper which also needs gtk2
-CMAKE_ARGS+= -DENABLE_GLIB=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GLIB=OFF
# Don't build and install the tools
-CMAKE_ARGS+= -DENABLE_UTILS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_UTILS=OFF
# Compile poppler cpp wrapper.
-CMAKE_ARGS+= -DENABLE_CPP=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CPP=ON
# Don't compile poppler qt5/6 wrapper.
-CMAKE_ARGS+= -DENABLE_QT5=OFF
-CMAKE_ARGS+= -DENABLE_QT6=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6=OFF
# Don't build libcurl based HTTP support. ## might want to include
-CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LIBCURL=OFF
BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}{,nb*}
.include "../../print/poppler/buildlink3.mk"
@@ -40,8 +40,8 @@ CHECK_BUILTIN.iconv:= yes
CHECK_BUILTIN.iconv:= no
.if !empty(USE_BUILTIN.iconv:M[nN][oO])
-CMAKE_ARGS+= -DICONV_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.iconv}/include
-CMAKE_ARGS+= -DICONV_LIBRARIES:PATH=${BUILDLINK_PREFIX.iconv}/lib
+CMAKE_CONFIGURE_ARGS+= -DICONV_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.iconv}/include
+CMAKE_CONFIGURE_ARGS+= -DICONV_LIBRARIES:PATH=${BUILDLINK_PREFIX.iconv}/lib
LDFLAGS.Darwin+=-liconv
.endif
Index: pkgsrc/print/poppler-includes/Makefile
diff -u pkgsrc/print/poppler-includes/Makefile:1.36 pkgsrc/print/poppler-includes/Makefile:1.37
--- pkgsrc/print/poppler-includes/Makefile:1.36 Mon Jun 3 12:22:35 2024
+++ pkgsrc/print/poppler-includes/Makefile Sun Aug 25 06:19:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2024/06/03 12:22:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2024/08/25 06:19:10 wiz Exp $
.include "../../print/poppler/Makefile.common"
@@ -12,8 +12,8 @@ NO_BUILD= yes
INCDIR= ${DESTDIR}${PREFIX}/include
-CMAKE_ARGS+= -DENABLE_QT5:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_QT6:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6:BOOL=OFF
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/print/poppler-qt5/Makefile
diff -u pkgsrc/print/poppler-qt5/Makefile:1.76 pkgsrc/print/poppler-qt5/Makefile:1.77
--- pkgsrc/print/poppler-qt5/Makefile:1.76 Wed May 29 16:34:11 2024
+++ pkgsrc/print/poppler-qt5/Makefile Sun Aug 25 06:19:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2024/05/29 16:34:11 adam Exp $
+# $NetBSD: Makefile,v 1.77 2024/08/25 06:19:10 wiz Exp $
PKGREVISION= 3
.include "../../print/poppler/Makefile.common"
@@ -7,14 +7,14 @@ PKGNAME= poppler-qt5-${POPPLER_VERS}
COMMENT= PDF rendering library (QT5 wrapper)
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
-CMAKE_ARGS+= -DENABLE_GLIB=OFF
-CMAKE_ARGS+= -DENABLE_UTILS=OFF
-CMAKE_ARGS+= -DENABLE_CPP=OFF
-CMAKE_ARGS+= -DENABLE_QT5=ON
-CMAKE_ARGS+= -DENABLE_QT6=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GTK_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GLIB=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_UTILS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CPP=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6=OFF
# Don't build libcurl based HTTP support. ## might want to include
-CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LIBCURL=OFF
BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
.include "../../print/poppler/buildlink3.mk"
Index: pkgsrc/print/poppler-qt6/Makefile
diff -u pkgsrc/print/poppler-qt6/Makefile:1.22 pkgsrc/print/poppler-qt6/Makefile:1.23
--- pkgsrc/print/poppler-qt6/Makefile:1.22 Wed May 29 16:34:11 2024
+++ pkgsrc/print/poppler-qt6/Makefile Sun Aug 25 06:19:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2024/05/29 16:34:11 adam Exp $
+# $NetBSD: Makefile,v 1.23 2024/08/25 06:19:10 wiz Exp $
# this must be set before compiler.mk
# is included in Makefile.common
@@ -11,14 +11,14 @@ PKGNAME= poppler-qt6-${POPPLER_VERS}
COMMENT= PDF rendering library (QT6 wrapper)
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
-CMAKE_ARGS+= -DENABLE_GLIB=OFF
-CMAKE_ARGS+= -DENABLE_UTILS=OFF
-CMAKE_ARGS+= -DENABLE_CPP=OFF
-CMAKE_ARGS+= -DENABLE_QT5=OFF
-CMAKE_ARGS+= -DENABLE_QT6=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GTK_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GLIB=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_UTILS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CPP=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6=ON
# Don't build libcurl based HTTP support. ## might want to include
-CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LIBCURL=OFF
BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
.include "../../print/poppler/buildlink3.mk"
Index: pkgsrc/print/poppler-utils/Makefile
diff -u pkgsrc/print/poppler-utils/Makefile:1.68 pkgsrc/print/poppler-utils/Makefile:1.69
--- pkgsrc/print/poppler-utils/Makefile:1.68 Thu May 9 06:46:47 2024
+++ pkgsrc/print/poppler-utils/Makefile Sun Aug 25 06:19:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2024/05/09 06:46:47 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2024/08/25 06:19:11 wiz Exp $
USE_CXX_FEATURES+= filesystem
PKGREVISION= 1
@@ -11,21 +11,21 @@ CONFLICTS+= poppler-0.5.1{,nb*}
CONFLICTS+= xpdf<3.02pl4nb1
# for pdfsig
-CMAKE_ARGS+= -DENABLE_NSS3:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_NSS3:BOOL=ON
# Don't compile GTK+ test program.
-CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GTK_TESTS=OFF
# Don't compile GLib wrapper which also needs gtk2
-CMAKE_ARGS+= -DENABLE_GLIB=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GLIB=OFF
# Build and install the tools
-CMAKE_ARGS+= -DENABLE_UTILS=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_UTILS=ON
# Don't compile poppler cpp wrapper.
-CMAKE_ARGS+= -DENABLE_CPP=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CPP=OFF
# Don't compile poppler qt5/6 wrapper.
-CMAKE_ARGS+= -DENABLE_QT5=OFF
-CMAKE_ARGS+= -DENABLE_QT6=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6=OFF
# Don't build libcurl based HTTP support. ## might want to include
-CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LIBCURL=OFF
BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
.include "../../print/poppler/buildlink3.mk"
Index: pkgsrc/print/qpdf/Makefile
diff -u pkgsrc/print/qpdf/Makefile:1.61 pkgsrc/print/qpdf/Makefile:1.62
--- pkgsrc/print/qpdf/Makefile:1.61 Tue Jun 11 08:48:59 2024
+++ pkgsrc/print/qpdf/Makefile Sun Aug 25 06:19:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2024/06/11 08:48:59 adam Exp $
+# $NetBSD: Makefile,v 1.62 2024/08/25 06:19:11 wiz Exp $
DISTNAME= qpdf-11.9.1
CATEGORIES= print
@@ -15,10 +15,10 @@ USE_TOOLS+= perl:test pkg-config
PKGCONFIG_OVERRIDE+= libqpdf.pc.in
TEST_TARGET= test
-CMAKE_ARGS+= -DUSE_IMPLICIT_CRYPTO=OFF
-CMAKE_ARGS+= -DREQUIRE_CRYPTO_GNUTLS=OFF
-CMAKE_ARGS+= -DREQUIRE_CRYPTO_OPENSSL=ON
-CMAKE_ARGS+= -DDEFAULT_CRYPTO=openssl
+CMAKE_CONFIGURE_ARGS+= -DUSE_IMPLICIT_CRYPTO=OFF
+CMAKE_CONFIGURE_ARGS+= -DREQUIRE_CRYPTO_GNUTLS=OFF
+CMAKE_CONFIGURE_ARGS+= -DREQUIRE_CRYPTO_OPENSSL=ON
+CMAKE_CONFIGURE_ARGS+= -DDEFAULT_CRYPTO=openssl
.include "../../devel/cmake/build.mk"
.include "../../mk/jpeg.buildlink3.mk"
Index: pkgsrc/print/scribus-qt5/Makefile
diff -u pkgsrc/print/scribus-qt5/Makefile:1.69 pkgsrc/print/scribus-qt5/Makefile:1.70
--- pkgsrc/print/scribus-qt5/Makefile:1.69 Thu Aug 1 21:04:30 2024
+++ pkgsrc/print/scribus-qt5/Makefile Sun Aug 25 06:19:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2024/08/01 21:04:30 markd Exp $
+# $NetBSD: Makefile,v 1.70 2024/08/25 06:19:11 wiz Exp $
DISTNAME= scribus-1.6.2
CATEGORIES= print
@@ -14,7 +14,7 @@ USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
USE_CXX_FEATURES+= c++17
-CMAKE_ARGS+= -DWANT_CPP17=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_CPP17=ON
.include "../../devel/cmake/build.mk"
.include "../../converters/libcdr/buildlink3.mk"
Index: pkgsrc/print/xpdf4/Makefile
diff -u pkgsrc/print/xpdf4/Makefile:1.36 pkgsrc/print/xpdf4/Makefile:1.37
--- pkgsrc/print/xpdf4/Makefile:1.36 Wed May 29 16:34:12 2024
+++ pkgsrc/print/xpdf4/Makefile Sun Aug 25 06:19:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2024/05/29 16:34:12 adam Exp $
+# $NetBSD: Makefile,v 1.37 2024/08/25 06:19:11 wiz Exp $
DISTNAME= xpdf-4.05
PKGREVISION= 3
@@ -19,7 +19,7 @@ USE_LANGUAGES= c c++
TOOL_DEPENDS+= icoutils-[0-9]*:../../graphics/icoutils
# don't accidentally find qt6
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=TRUE
INSTALLATION_DIRS+= share/applications
INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps
Index: pkgsrc/print/xpdf4/options.mk
diff -u pkgsrc/print/xpdf4/options.mk:1.2 pkgsrc/print/xpdf4/options.mk:1.3
--- pkgsrc/print/xpdf4/options.mk:1.2 Thu Nov 5 12:24:07 2020
+++ pkgsrc/print/xpdf4/options.mk Sun Aug 25 06:19:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2020/11/05 12:24:07 nia Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:19:11 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xpdf4
@@ -12,8 +12,8 @@ PKG_SUGGESTED_OPTIONS= cups
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mcups)
-CMAKE_ARGS+= -DXPDFWIDGET_PRINTING=ON
+CMAKE_CONFIGURE_ARGS+= -DXPDFWIDGET_PRINTING=ON
.include "../../print/libcups/buildlink3.mk"
.elif ${OPSYS} != "Darwin"
-CMAKE_ARGS+= -DXPDFWIDGET_PRINTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DXPDFWIDGET_PRINTING=OFF
.endif
Index: pkgsrc/security/gpgmepp/Makefile
diff -u pkgsrc/security/gpgmepp/Makefile:1.38 pkgsrc/security/gpgmepp/Makefile:1.39
--- pkgsrc/security/gpgmepp/Makefile:1.38 Fri Aug 9 09:42:33 2024
+++ pkgsrc/security/gpgmepp/Makefile Sun Aug 25 06:19:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2024/08/09 09:42:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.39 2024/08/25 06:19:11 wiz Exp $
DISTNAME= gpgmepp-15.12.2
PKGREVISION= 34
@@ -15,7 +15,7 @@ TOOL_DEPENDS+= extra-cmake-modules>=5.19
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+CMAKE_CONFIGURE_ARGS+= -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
.include "../../devel/cmake/build.mk"
.include "../../devel/boost-headers/buildlink3.mk"
Index: pkgsrc/security/hercules4sdl-crypto/Makefile
diff -u pkgsrc/security/hercules4sdl-crypto/Makefile:1.2 pkgsrc/security/hercules4sdl-crypto/Makefile:1.3
--- pkgsrc/security/hercules4sdl-crypto/Makefile:1.2 Sun Nov 27 15:16:02 2022
+++ pkgsrc/security/hercules4sdl-crypto/Makefile Sun Aug 25 06:19:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/11/27 15:16:02 rhialto Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:19:11 wiz Exp $
DISTNAME= hercules4sdl-crypto-1.0.0
PKGREVISION= 20220201
@@ -19,7 +19,7 @@ USE_CMAKE= yes
BLDDIR= ${WRKDIR}/crypto64.Release
CONFIGURE_DIRS= ${BLDDIR}
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/hercules4sdl
+CMAKE_CONFIGURE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/hercules4sdl
pre-configure:
${MKDIR} ${BLDDIR}
Index: pkgsrc/security/keepassxc/Makefile
diff -u pkgsrc/security/keepassxc/Makefile:1.74 pkgsrc/security/keepassxc/Makefile:1.75
--- pkgsrc/security/keepassxc/Makefile:1.74 Sun Jun 23 21:21:56 2024
+++ pkgsrc/security/keepassxc/Makefile Sun Aug 25 06:19:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2024/06/23 21:21:56 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2024/08/25 06:19:11 wiz Exp $
DISTNAME= keepassxc-2.7.9-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -21,9 +21,9 @@ GCC_REQD+= 11
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DKEEPASSXC_BUILD_TYPE=Release
-CMAKE_ARGS+= -DWITH_XC_DOCS=OFF
-CMAKE_ARGS+= -DWITH_XC_BROWSER=ON
+CMAKE_CONFIGURE_ARGS+= -DKEEPASSXC_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_BROWSER=ON
NOT_PAX_MPROTECT_SAFE+= bin/keepassxc
Index: pkgsrc/security/keepassxc/options.mk
diff -u pkgsrc/security/keepassxc/options.mk:1.1 pkgsrc/security/keepassxc/options.mk:1.2
--- pkgsrc/security/keepassxc/options.mk:1.1 Mon Jun 26 11:46:13 2023
+++ pkgsrc/security/keepassxc/options.mk Sun Aug 25 06:19:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/06/26 11:46:13 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:19:11 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.keepassxc
PKG_SUPPORTED_OPTIONS= yubikey
@@ -7,9 +7,9 @@ PKG_SUGGESTED_OPTIONS= #
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Myubikey)
-CMAKE_ARGS+= -DWITH_XC_YUBIKEY=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_YUBIKEY=ON
.include "../../devel/libusb1/buildlink3.mk"
.include "../../security/pcsc-lite/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_XC_YUBIKEY=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_YUBIKEY=OFF
.endif
Index: pkgsrc/security/lastpass-cli/Makefile
diff -u pkgsrc/security/lastpass-cli/Makefile:1.31 pkgsrc/security/lastpass-cli/Makefile:1.32
--- pkgsrc/security/lastpass-cli/Makefile:1.31 Thu Aug 22 17:56:04 2024
+++ pkgsrc/security/lastpass-cli/Makefile Sun Aug 25 06:19:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2024/08/22 17:56:04 vins Exp $
+# $NetBSD: Makefile,v 1.32 2024/08/25 06:19:11 wiz Exp $
DISTNAME= lastpass-cli-1.6.0
CATEGORIES= security
@@ -19,7 +19,7 @@ USE_TOOLS= bash:test pkg-config
REPLACE_BASH+= test/askpass-wrong.sh test/askpass.sh \
test/assert.sh test/include.sh test/tests
-CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${SSLBASE}
+CMAKE_CONFIGURE_ARGS= -DOPENSSL_ROOT_DIR=${SSLBASE}
INSTALL_TARGET= install install-doc
TEST_TARGET= lpass-test test
Index: pkgsrc/security/libdecaf/Makefile
diff -u pkgsrc/security/libdecaf/Makefile:1.6 pkgsrc/security/libdecaf/Makefile:1.7
--- pkgsrc/security/libdecaf/Makefile:1.6 Mon Aug 14 05:25:10 2023
+++ pkgsrc/security/libdecaf/Makefile Sun Aug 25 06:19:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/08/14 05:25:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2024/08/25 06:19:12 wiz Exp $
PKGNAME= libdecaf-1.0.2
PKGREVISION= 1
@@ -14,7 +14,7 @@ LICENSE= mit
USE_CMAKE= yes
USE_LANGUAGES= c99 c++11
-CMAKE_ARGS+= -DENABLE_TESTS=YES
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TESTS=YES
# These are required to prevent build breakage when tests are enabled
# This is probably due to the auto-generated headers clobbering with
Index: pkgsrc/security/libfido2/Makefile
diff -u pkgsrc/security/libfido2/Makefile:1.15 pkgsrc/security/libfido2/Makefile:1.16
--- pkgsrc/security/libfido2/Makefile:1.15 Fri Jun 14 15:12:46 2024
+++ pkgsrc/security/libfido2/Makefile Sun Aug 25 06:19:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2024/06/14 15:12:46 adam Exp $
+# $NetBSD: Makefile,v 1.16 2024/08/25 06:19:12 wiz Exp $
DISTNAME= libfido2-1.15.0
CATEGORIES= security devel
@@ -25,8 +25,8 @@ BROKEN_EXCEPT_ON_PLATFORM+= SunOS-*-*
USE_LANGUAGES= c
USE_TOOLS+= pkg-config mandoc
-CMAKE_ARGS+= -DBUILD_EXAMPLES=OFF
-CMAKE_ARGS.NetBSD+= -DBASE_LIBRARIES:STRING=usbhid
+CMAKE_CONFIGURE_ARGS+= -DBUILD_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS.NetBSD+= -DBASE_LIBRARIES:STRING=usbhid
TEST_TARGET= test
CHECK_PORTABILITY_SKIP+= misc/hooks
Index: pkgsrc/security/libnitrokey/Makefile
diff -u pkgsrc/security/libnitrokey/Makefile:1.6 pkgsrc/security/libnitrokey/Makefile:1.7
--- pkgsrc/security/libnitrokey/Makefile:1.6 Sun Oct 29 22:19:17 2023
+++ pkgsrc/security/libnitrokey/Makefile Sun Aug 25 06:19:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/10/29 22:19:17 adam Exp $
+# $NetBSD: Makefile,v 1.7 2024/08/25 06:19:12 wiz Exp $
DISTNAME= libnitrokey-3.8
PKGREVISION= 3
@@ -22,11 +22,11 @@ USE_TOOLS+= pkg-config
# 1. require a connected Nitrokey
# 2. may kill data on your Nitrokey
# hence the main testsuite is disabled
-CMAKE_ARGS+= -DCOMPILE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCOMPILE_TESTS=OFF
-CMAKE_ARGS+= -DHIDAPI_LIBUSB_INCLUDEDIR=${BUILDLINK_PREFIX.libhidapi}/include/hidapi/
-CMAKE_ARGS+= -DHIDAPI_LIBUSB_LIBDIR=${BUILDLINK_PREFIX.libhidapi}/lib/
-CMAKE_ARGS+= -DCMAKE_INSTALL_UDEVRULESDIR=${PREFIX}/lib/udev/rules.d/
+CMAKE_CONFIGURE_ARGS+= -DHIDAPI_LIBUSB_INCLUDEDIR=${BUILDLINK_PREFIX.libhidapi}/include/hidapi/
+CMAKE_CONFIGURE_ARGS+= -DHIDAPI_LIBUSB_LIBDIR=${BUILDLINK_PREFIX.libhidapi}/lib/
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_UDEVRULESDIR=${PREFIX}/lib/udev/rules.d/
TEST_TARGET= test
Index: pkgsrc/security/libnitrokey/options.mk
diff -u pkgsrc/security/libnitrokey/options.mk:1.1 pkgsrc/security/libnitrokey/options.mk:1.2
--- pkgsrc/security/libnitrokey/options.mk:1.1 Thu Apr 27 22:02:33 2023
+++ pkgsrc/security/libnitrokey/options.mk Sun Aug 25 06:19:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/04/27 22:02:33 nikita Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:19:12 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libnitrokey
@@ -14,6 +14,6 @@ DEPENDS+= graphviz-[0-9]*:../../graphics
.if ${PKG_OPTIONS:Mtests}
# These tests do not require any device to be connected
-CMAKE_ARGS+= -DCOMPILE_OFFLINE_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILE_OFFLINE_TESTS=ON
TEST_DEPENDS+= catch2-[0-9]*:../../devel/catch2
.endif
Index: pkgsrc/security/libssh/Makefile
diff -u pkgsrc/security/libssh/Makefile:1.49 pkgsrc/security/libssh/Makefile:1.50
--- pkgsrc/security/libssh/Makefile:1.49 Mon Dec 18 17:07:25 2023
+++ pkgsrc/security/libssh/Makefile Sun Aug 25 06:19:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2023/12/18 17:07:25 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2024/08/25 06:19:12 wiz Exp $
#
# history: upstream renamed 0.11 to 0.1.1;
# we have to use the old-style convention so that version compares work.
@@ -19,8 +19,8 @@ USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE+= libssh.pc.cmake
TEST_TARGET= test
-CMAKE_ARGS+= -DUNIT_TESTING=ON
-CMAKE_ARGS+= -DWITH_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DUNIT_TESTING=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_EXAMPLES=OFF
LDFLAGS.SunOS+= -lnsl -lsocket
Index: pkgsrc/security/libssh/options.mk
diff -u pkgsrc/security/libssh/options.mk:1.6 pkgsrc/security/libssh/options.mk:1.7
--- pkgsrc/security/libssh/options.mk:1.6 Tue Jun 13 17:54:44 2023
+++ pkgsrc/security/libssh/options.mk Sun Aug 25 06:19:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2023/06/13 17:54:44 schmonz Exp $
+# $NetBSD: options.mk,v 1.7 2024/08/25 06:19:12 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libssh
PKG_SUPPORTED_OPTIONS= gssapi
@@ -9,19 +9,19 @@ PKG_SUGGESTED_OPTIONS= gssapi openssl
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mgssapi)
-CMAKE_ARGS+= -DWITH_GSSAPI:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_GSSAPI:BOOL=ON
.include "../../mk/krb5.buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_GSSAPI:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_GSSAPI:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mopenssl)
-CMAKE_ARGS+= -DWITH_GCRYPT:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_GCRYPT:BOOL=OFF
.include "../../security/openssl/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mlibgcrypt)
BUILDLINK_API_DEPENDS.libgcrypt+= libgcrypt>=1.4
-CMAKE_ARGS+= -DWITH_GCRYPT:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_GCRYPT:BOOL=ON
.include "../../security/libgcrypt/buildlink3.mk"
.endif
Index: pkgsrc/security/lxqt-sudo/Makefile
diff -u pkgsrc/security/lxqt-sudo/Makefile:1.32 pkgsrc/security/lxqt-sudo/Makefile:1.33
--- pkgsrc/security/lxqt-sudo/Makefile:1.32 Tue Aug 20 06:13:23 2024
+++ pkgsrc/security/lxqt-sudo/Makefile Sun Aug 25 06:19:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2024/08/20 06:13:23 pin Exp $
+# $NetBSD: Makefile,v 1.33 2024/08/25 06:19:12 wiz Exp $
DISTNAME= lxqt-sudo-2.0.0
CATEGORIES= security
@@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v2.1
USE_TOOLS+= pkg-config perl
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DMSK_INSTALL_INCLUDES=/include
+CMAKE_CONFIGURE_ARGS+= -DMSK_INSTALL_INCLUDES=/include
TOOL_DEPENDS+= lxqt-build-tools>=2.0.0:../../devel/lxqt-build-tools
TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
Index: pkgsrc/security/mbedtls/Makefile
diff -u pkgsrc/security/mbedtls/Makefile:1.29 pkgsrc/security/mbedtls/Makefile:1.30
--- pkgsrc/security/mbedtls/Makefile:1.29 Thu Aug 15 17:37:25 2024
+++ pkgsrc/security/mbedtls/Makefile Sun Aug 25 06:19:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2024/08/15 17:37:25 tsutsui Exp $
+# $NetBSD: Makefile,v 1.30 2024/08/25 06:19:12 wiz Exp $
DISTNAME= mbedtls-2.28.8
CATEGORIES= security
@@ -19,14 +19,14 @@ USE_CC_FEATURES= c99
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DUSE_SHARED_MBEDTLS_LIBRARY=ON
-CMAKE_ARGS+= -DENABLE_PROGRAMS=ON
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DUSE_SHARED_MBEDTLS_LIBRARY=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PROGRAMS=ON
# Fails to build full suite on NetBSD due to strange tricks with stdout
-CMAKE_ARGS+= -DENABLE_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TESTING=OFF
-CMAKE_ARGS+= -DMBEDTLS_FATAL_WARNINGS=OFF
+CMAKE_CONFIGURE_ARGS+= -DMBEDTLS_FATAL_WARNINGS=OFF
MAKE_ENV+= RANLIB=${RANLIB:Q}
Index: pkgsrc/security/mbedtls/options.mk
diff -u pkgsrc/security/mbedtls/options.mk:1.4 pkgsrc/security/mbedtls/options.mk:1.5
--- pkgsrc/security/mbedtls/options.mk:1.4 Tue Jul 7 11:16:10 2020
+++ pkgsrc/security/mbedtls/options.mk Sun Aug 25 06:19:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2020/07/07 11:16:10 nia Exp $
+# $NetBSD: options.mk,v 1.5 2024/08/25 06:19:12 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mbedtls
PKG_SUPPORTED_OPTIONS= zlib
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS=
.if !empty(PKG_OPTIONS:Mzlib)
. include "../../devel/zlib/buildlink3.mk"
-CMAKE_ARGS+= -DENABLE_ZLIB_SUPPORT=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ZLIB_SUPPORT=ON
.else
-CMAKE_ARGS+= -DENABLE_ZLIB_SUPPORT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ZLIB_SUPPORT=OFF
.endif
Index: pkgsrc/security/mbedtls3/Makefile
diff -u pkgsrc/security/mbedtls3/Makefile:1.5 pkgsrc/security/mbedtls3/Makefile:1.6
--- pkgsrc/security/mbedtls3/Makefile:1.5 Mon Aug 14 05:25:10 2023
+++ pkgsrc/security/mbedtls3/Makefile Sun Aug 25 06:19:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/08/14 05:25:10 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2024/08/25 06:19:12 wiz Exp $
DISTNAME= mbedtls-3.4.0
PKGNAME= ${DISTNAME:S/mbedtls/mbedtls3/}
@@ -22,14 +22,14 @@ USE_TOOLS+= pkg-config
GCC_REQD+= 4.4
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DUSE_SHARED_MBEDTLS_LIBRARY=ON
-CMAKE_ARGS+= -DENABLE_PROGRAMS=ON
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DUSE_SHARED_MBEDTLS_LIBRARY=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PROGRAMS=ON
# Fails to build full suite on NetBSD due to strange tricks with stdout
-CMAKE_ARGS+= -DENABLE_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TESTING=OFF
-CMAKE_ARGS+= -DMBEDTLS_FATAL_WARNINGS=OFF
+CMAKE_CONFIGURE_ARGS+= -DMBEDTLS_FATAL_WARNINGS=OFF
MAKE_ENV+= RANLIB=${RANLIB:Q}
Index: pkgsrc/security/polkit-qt/Makefile
diff -u pkgsrc/security/polkit-qt/Makefile:1.42 pkgsrc/security/polkit-qt/Makefile:1.43
--- pkgsrc/security/polkit-qt/Makefile:1.42 Sun Nov 12 13:23:25 2023
+++ pkgsrc/security/polkit-qt/Makefile Sun Aug 25 06:19:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2023/11/12 13:23:25 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2024/08/25 06:19:12 wiz Exp $
DISTNAME= polkit-qt-1-0.112.0
PKGNAME= ${DISTNAME:S/-qt-1-/-qt-/}
@@ -17,7 +17,7 @@ TOOL_DEPENDS+= automoc4>=0.9.87:../../de
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DUSE_QT4=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_QT4=ON
PKGCONFIG_OVERRIDE+= polkit-qt-1.pc.cmake polkit-qt-agent-1.pc.cmake
PKGCONFIG_OVERRIDE+= polkit-qt-core-1.pc.cmake polkit-qt-gui-1.pc.cmake polkit-qt-1.pc.cmake
Index: pkgsrc/security/polkit-qt6/Makefile
diff -u pkgsrc/security/polkit-qt6/Makefile:1.2 pkgsrc/security/polkit-qt6/Makefile:1.3
--- pkgsrc/security/polkit-qt6/Makefile:1.2 Wed May 29 16:34:19 2024
+++ pkgsrc/security/polkit-qt6/Makefile Sun Aug 25 06:19:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2024/05/29 16:34:19 adam Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:19:13 wiz Exp $
DISTNAME= polkit-qt-1-0.200.0
PKGNAME= ${DISTNAME:S/-qt-1-/-qt6-/}
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/polkit-qt-1-v0.200.0-
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DQT_MAJOR_VERSION=6
+CMAKE_CONFIGURE_ARGS+= -DQT_MAJOR_VERSION=6
PKGCONFIG_OVERRIDE+= polkit-qt6-1.pc.cmake polkit-qt6-agent-1.pc.cmake
PKGCONFIG_OVERRIDE+= polkit-qt6-core-1.pc.cmake polkit-qt6-gui-1.pc.cmake
Index: pkgsrc/security/qca2/Makefile
diff -u pkgsrc/security/qca2/Makefile:1.48 pkgsrc/security/qca2/Makefile:1.49
--- pkgsrc/security/qca2/Makefile:1.48 Sun Nov 12 13:23:26 2023
+++ pkgsrc/security/qca2/Makefile Sun Aug 25 06:19:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2023/11/12 13:23:26 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2024/08/25 06:19:13 wiz Exp $
PKGNAME= qca2-${DISTNAME:C/.*-//}
PKGREVISION= 7
@@ -11,9 +11,9 @@ DEPENDS+= mozilla-rootcerts-[0-9]*:../..
INSTALLATION_DIRS= lib/pkgconfig
-CMAKE_ARGS+= -DBUILD_PLUGINS=none
-CMAKE_ARGS+= -DQT4_BUILD=ON
-CMAKE_ARGS+= -DQCA_MAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGINS=none
+CMAKE_CONFIGURE_ARGS+= -DQT4_BUILD=ON
+CMAKE_CONFIGURE_ARGS+= -DQCA_MAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
PKGCONFIG_OVERRIDE= lib/pkgconfig/qca2.pc
PKGCONFIG_OVERRIDE_STAGE= post-configure
Index: pkgsrc/security/qca2/Makefile.common
diff -u pkgsrc/security/qca2/Makefile.common:1.4 pkgsrc/security/qca2/Makefile.common:1.5
--- pkgsrc/security/qca2/Makefile.common:1.4 Sat Feb 8 16:58:08 2020
+++ pkgsrc/security/qca2/Makefile.common Sun Aug 25 06:19:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2020/02/08 16:58:08 nia Exp $
+# $NetBSD: Makefile.common,v 1.5 2024/08/25 06:19:13 wiz Exp $
DISTNAME= qca-2.2.1
CATEGORIES= security
@@ -17,9 +17,9 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++
# install under qt4 prefix to not clash with qca 1.x
-CMAKE_ARGS+= -DQCA_INSTALL_IN_QT_PREFIX=ON
-CMAKE_ARGS+= -DOSX_FRAMEWORK=OFF
-CMAKE_ARGS+= -DBUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DQCA_INSTALL_IN_QT_PREFIX=ON
+CMAKE_CONFIGURE_ARGS+= -DOSX_FRAMEWORK=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=OFF
SUBST_CLASSES+= certs
SUBST_STAGE.certs= pre-configure
Index: pkgsrc/security/qca2-gnupg/Makefile
diff -u pkgsrc/security/qca2-gnupg/Makefile:1.32 pkgsrc/security/qca2-gnupg/Makefile:1.33
--- pkgsrc/security/qca2-gnupg/Makefile:1.32 Sun Nov 12 13:23:26 2023
+++ pkgsrc/security/qca2-gnupg/Makefile Sun Aug 25 06:19:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2023/11/12 13:23:26 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2024/08/25 06:19:13 wiz Exp $
PKGNAME= qca2-gnupg-${DISTNAME:C/.*-//}
PKGREVISION= 7
@@ -11,10 +11,10 @@ DEPENDS+= gnupg2-[0-9]*:../../security/g
BUILD_DIRS= plugins/qca-gnupg
-CMAKE_ARGS+= -DQT4_BUILD=ON
-CMAKE_ARGS+= -DBUILD_PLUGINS=gnupg
-CMAKE_ARGS+= -DBUILD_TOOLS=OFF
-CMAKE_ARGS+= -DINST_QCA_LIB_NAME=-lqca
+CMAKE_CONFIGURE_ARGS+= -DQT4_BUILD=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGINS=gnupg
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TOOLS=OFF
+CMAKE_CONFIGURE_ARGS+= -DINST_QCA_LIB_NAME=-lqca
SUBST_CLASSES+= libname
SUBST_STAGE.libname= pre-configure
Index: pkgsrc/security/qca2-ossl/Makefile
diff -u pkgsrc/security/qca2-ossl/Makefile:1.45 pkgsrc/security/qca2-ossl/Makefile:1.46
--- pkgsrc/security/qca2-ossl/Makefile:1.45 Sun Nov 12 13:23:26 2023
+++ pkgsrc/security/qca2-ossl/Makefile Sun Aug 25 06:19:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2023/11/12 13:23:26 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2024/08/25 06:19:13 wiz Exp $
PKGNAME= qca2-ossl-${DISTNAME:C/.*-//}
PKGREVISION= 7
@@ -9,10 +9,10 @@ COMMENT= Cross-platform crypto API for Q
BUILD_DIRS= plugins/qca-ossl
-CMAKE_ARGS+= -DQT4_BUILD=ON
-CMAKE_ARGS+= -DBUILD_PLUGINS=ossl
-CMAKE_ARGS+= -DBUILD_TOOLS=OFF
-CMAKE_ARGS+= -DINST_QCA_LIB_NAME=-lqca
+CMAKE_CONFIGURE_ARGS+= -DQT4_BUILD=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGINS=ossl
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TOOLS=OFF
+CMAKE_CONFIGURE_ARGS+= -DINST_QCA_LIB_NAME=-lqca
SUBST_CLASSES+= libname
SUBST_STAGE.libname= pre-configure
Index: pkgsrc/security/qca2-qt5/Makefile
diff -u pkgsrc/security/qca2-qt5/Makefile:1.30 pkgsrc/security/qca2-qt5/Makefile:1.31
--- pkgsrc/security/qca2-qt5/Makefile:1.30 Wed May 29 16:34:19 2024
+++ pkgsrc/security/qca2-qt5/Makefile Sun Aug 25 06:19:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2024/05/29 16:34:19 adam Exp $
+# $NetBSD: Makefile,v 1.31 2024/08/25 06:19:13 wiz Exp $
PKGNAME= qca2-qt5-${DISTNAME:C/.*-//}
PKGREVISION= 1
@@ -11,8 +11,8 @@ DEPENDS+= mozilla-rootcerts-[0-9]*:../..
INSTALLATION_DIRS= lib/pkgconfig
-CMAKE_ARGS+= -DBUILD_PLUGINS=none
-CMAKE_ARGS+= -DQCA_MAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGINS=none
+CMAKE_CONFIGURE_ARGS+= -DQCA_MAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
PKGCONFIG_OVERRIDE= lib/pkgconfig/qca2-qt5.pc
PKGCONFIG_OVERRIDE_STAGE= post-configure
Index: pkgsrc/security/qca2-qt5/Makefile.common
diff -u pkgsrc/security/qca2-qt5/Makefile.common:1.4 pkgsrc/security/qca2-qt5/Makefile.common:1.5
--- pkgsrc/security/qca2-qt5/Makefile.common:1.4 Sun Jun 9 21:02:56 2024
+++ pkgsrc/security/qca2-qt5/Makefile.common Sun Aug 25 06:19:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2024/06/09 21:02:56 markd Exp $
+# $NetBSD: Makefile.common,v 1.5 2024/08/25 06:19:13 wiz Exp $
#
# used by security/qca2-qt5-gnupg/Makefile
# used by security/qca2-qt5-ossl/Makefile
@@ -20,9 +20,9 @@ DISTINFO_FILE= ${.CURDIR}/../../security
USE_LANGUAGES= c c++
# install under qt5 prefix to not clash with qca 1.x
-CMAKE_ARGS+= -DQCA_INSTALL_IN_QT_PREFIX=ON
-CMAKE_ARGS+= -DOSX_FRAMEWORK=OFF
-CMAKE_ARGS+= -DBUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DQCA_INSTALL_IN_QT_PREFIX=ON
+CMAKE_CONFIGURE_ARGS+= -DOSX_FRAMEWORK=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=OFF
SUBST_CLASSES+= certs
SUBST_STAGE.certs= pre-configure
Index: pkgsrc/security/qca2-qt5-gnupg/Makefile
diff -u pkgsrc/security/qca2-qt5-gnupg/Makefile:1.32 pkgsrc/security/qca2-qt5-gnupg/Makefile:1.33
--- pkgsrc/security/qca2-qt5-gnupg/Makefile:1.32 Sun Jun 9 21:02:56 2024
+++ pkgsrc/security/qca2-qt5-gnupg/Makefile Sun Aug 25 06:19:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2024/06/09 21:02:56 markd Exp $
+# $NetBSD: Makefile,v 1.33 2024/08/25 06:19:13 wiz Exp $
PKGNAME= qca2-qt5-gnupg-${DISTNAME:C/.*-//}
PKGREVISION= 1
@@ -11,9 +11,9 @@ BUILD_DIRS= plugins/qca-gnupg
DEPENDS+= gnupg2-[0-9]*:../../security/gnupg2
-CMAKE_ARGS+= -DBUILD_PLUGINS=gnupg
-CMAKE_ARGS+= -DBUILD_TOOLS=OFF
-CMAKE_ARGS+= -DINST_QCA_LIB_NAME=-lqca-qt5
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGINS=gnupg
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TOOLS=OFF
+CMAKE_CONFIGURE_ARGS+= -DINST_QCA_LIB_NAME=-lqca-qt5
SUBST_CLASSES+= libname
SUBST_STAGE.libname= pre-configure
Index: pkgsrc/security/qca2-qt5-ossl/Makefile
diff -u pkgsrc/security/qca2-qt5-ossl/Makefile:1.32 pkgsrc/security/qca2-qt5-ossl/Makefile:1.33
--- pkgsrc/security/qca2-qt5-ossl/Makefile:1.32 Sun Jun 9 21:02:56 2024
+++ pkgsrc/security/qca2-qt5-ossl/Makefile Sun Aug 25 06:19:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2024/06/09 21:02:56 markd Exp $
+# $NetBSD: Makefile,v 1.33 2024/08/25 06:19:13 wiz Exp $
PKGNAME= qca2-qt5-ossl-${DISTNAME:C/.*-//}
PKGREVISION= 1
@@ -9,9 +9,9 @@ BUILD_DIRS= plugins/qca-ossl
.include "../../security/qca2-qt5/Makefile.common"
-CMAKE_ARGS+= -DBUILD_PLUGINS=ossl
-CMAKE_ARGS+= -DBUILD_TOOLS=OFF
-CMAKE_ARGS+= -DINST_QCA_LIB_NAME=-lqca-qt5
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGINS=ossl
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TOOLS=OFF
+CMAKE_CONFIGURE_ARGS+= -DINST_QCA_LIB_NAME=-lqca-qt5
SUBST_CLASSES+= libname
SUBST_STAGE.libname= pre-configure
Index: pkgsrc/security/qca2-qt6/Makefile
diff -u pkgsrc/security/qca2-qt6/Makefile:1.2 pkgsrc/security/qca2-qt6/Makefile:1.3
--- pkgsrc/security/qca2-qt6/Makefile:1.2 Wed May 29 16:34:19 2024
+++ pkgsrc/security/qca2-qt6/Makefile Sun Aug 25 06:19:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2024/05/29 16:34:19 adam Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:19:13 wiz Exp $
PKGNAME= qca2-qt6-${DISTNAME:C/.*-//}
PKGREVISION= 1
@@ -11,9 +11,9 @@ DEPENDS+= mozilla-rootcerts-[0-9]*:../..
INSTALLATION_DIRS= lib/pkgconfig
-CMAKE_ARGS+= -DQT6=ON
-CMAKE_ARGS+= -DBUILD_PLUGINS=none
-CMAKE_ARGS+= -DQCA_MAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DQT6=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGINS=none
+CMAKE_CONFIGURE_ARGS+= -DQCA_MAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
.include "../../devel/qt6-qt5compat/buildlink3.mk"
.include "../../x11/qt6-qtbase/buildlink3.mk"
Index: pkgsrc/security/zoneminder/Makefile
diff -u pkgsrc/security/zoneminder/Makefile:1.71 pkgsrc/security/zoneminder/Makefile:1.72
--- pkgsrc/security/zoneminder/Makefile:1.71 Wed May 29 16:34:21 2024
+++ pkgsrc/security/zoneminder/Makefile Sun Aug 25 06:19:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2024/05/29 16:34:21 adam Exp $
+# $NetBSD: Makefile,v 1.72 2024/08/25 06:19:14 wiz Exp $
#VERSION= 1.36.7
VERSION= 1.30.5
@@ -67,7 +67,7 @@ DEPENDS+= p5-libwww-[0-9]*:../../www/p5-
# turned into cmake, once we are at a zoneminder version that does not
# support autoconf (which maybe we are at already!).
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CMAKE_ARGS+= -DZM_CONFIG_DIR=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DZM_CONFIG_DIR=${PKG_SYSCONFDIR}
ZM_HTTPD_ROOT= share/zoneminder/htdocs
PLIST_SUBST+= ZM_HTTPD_ROOT=${ZM_HTTPD_ROOT:Q}
@@ -85,22 +85,22 @@ INSTALLATION_DIRS+= libexec/zoneminder $
BUILD_DEFS+= VARBASE
CONFIGURE_ARGS+= --with-webdir=${PREFIX}/${ZM_HTTPD_ROOT:Q}
-CMAKE_ARGS+= -DZM_WEBDIR=${PREFIX}/${ZM_HTTPD_ROOT:Q}
+CMAKE_CONFIGURE_ARGS+= -DZM_WEBDIR=${PREFIX}/${ZM_HTTPD_ROOT:Q}
CONFIGURE_ARGS+= --with-cgidir=${PREFIX}/${ZM_HTTPD_CGIBIN:Q}
-CMAKE_ARGS+= -DZM_CGIDIR=${PREFIX}/${ZM_HTTPD_CGIBIN:Q}
+CMAKE_CONFIGURE_ARGS+= -DZM_CGIDIR=${PREFIX}/${ZM_HTTPD_CGIBIN:Q}
CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client}
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
-CMAKE_ARGS+= -DZM_RUNDIR=${VARBASE}/run/zm
-CMAKE_ARGS+= -DZM_SOCKDIR=${VARBASE}/run/zm
-CMAKE_ARGS+= -DZM_TMPDIR=${VARBASE}/tmp/zm
-CMAKE_ARGS+= -DZM_LOGDIR=${VARBASE}/log/zm
+CMAKE_CONFIGURE_ARGS+= -DZM_RUNDIR=${VARBASE}/run/zm
+CMAKE_CONFIGURE_ARGS+= -DZM_SOCKDIR=${VARBASE}/run/zm
+CMAKE_CONFIGURE_ARGS+= -DZM_TMPDIR=${VARBASE}/tmp/zm
+CMAKE_CONFIGURE_ARGS+= -DZM_LOGDIR=${VARBASE}/log/zm
# PolicyKit doesn't actually seem to be necessary. This hack disables
# configure's hunt for PolicyKit, but has no other apparent ill effects.
# cmake needs an almost identical hack - though resorting to patching might
# be safer.
CONFIGURE_ENV+= POLKIT_CFLAGS=" " POLKIT_LIBS=" "
-CMAKE_ARGS+= -DPOLKIT_LIBRARIES=" " -DPOLKIT_INCLUDE_DIR=" "
+CMAKE_CONFIGURE_ARGS+= -DPOLKIT_LIBRARIES=" " -DPOLKIT_INCLUDE_DIR=" "
PTHREAD_AUTO_VARS= yes
.include "../../mk/pthread.buildlink3.mk"
@@ -118,8 +118,8 @@ SOEXT= so
.endif
.for lib in AVFORMAT AVCODEC AVDEVICE AVUTIL SWSCALE
-CMAKE_ARGS+= -D${lib}_INCLUDE_DIR=${BUILDLINK_PREFIX.ffmpeg2}/include/ffmpeg2
-CMAKE_ARGS+= -D${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg2}/lib/ffmpeg2/lib${lib:tl}.${SOEXT}
+CMAKE_CONFIGURE_ARGS+= -D${lib}_INCLUDE_DIR=${BUILDLINK_PREFIX.ffmpeg2}/include/ffmpeg2
+CMAKE_CONFIGURE_ARGS+= -D${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg2}/lib/ffmpeg2/lib${lib:tl}.${SOEXT}
.endfor
# The backtrace requires Linux's unportable <execinfo.h> header.
@@ -138,10 +138,10 @@ CFLAGS+= -D__STDC_CONSTANT_MACROS
# Since MySQL uses openssl, use the same library instead of defaulting to
# gnutls.
CONFIGURE_ENV+= ZM_SSL_LIB=openssl
-CMAKE_ARGS+= -DGNUTLS_LIBRARIES=""
+CMAKE_CONFIGURE_ARGS+= -DGNUTLS_LIBRARIES=""
# Make sure cmake doesn't think libgcrypt is available (We have OpenSSL)
-CMAKE_ARGS+= -DGCRYPT_LIBRARIES=""
+CMAKE_CONFIGURE_ARGS+= -DGCRYPT_LIBRARIES=""
# Control where run-time state (PID file and sockets) get stored.
# Default is "/var/run/zm", but we want to conform to VARBASE.
@@ -166,9 +166,9 @@ BUILD_DEFS+= APACHE_USER APACHE_GROUP
MAKE_DIRS_PERMS+= ${VARBASE}/run/zm ${REAL_ROOT_USER} ${APACHE_GROUP} 775
CONFIGURE_ARGS+= --with-webuser=${APACHE_USER}
-CMAKE_ARGS+= -DZM_WEB_USER=${APACHE_USER}
+CMAKE_CONFIGURE_ARGS+= -DZM_WEB_USER=${APACHE_USER}
CONFIGURE_ARGS+= --with-webgroup=${APACHE_GROUP}
-CMAKE_ARGS+= -DZM_WEB_GROUP=${APACHE_GROUP}
+CMAKE_CONFIGURE_ARGS+= -DZM_WEB_GROUP=${APACHE_GROUP}
# If we're using Apache we're going to need PHP, and PHP extensions.
.include "../../lang/php/phpversion.mk"
@@ -185,7 +185,7 @@ OWN_DIRS_PERMS+= ${ZM_CACHE} ${REAL_ROOT
OWN_DIRS_PERMS+= ${ZM_CACHE}/temp ${REAL_ROOT_USER} ${APACHE_GROUP} 775
OWN_DIRS_PERMS+= ${ZM_CACHE}/images ${REAL_ROOT_USER} ${APACHE_GROUP} 775
OWN_DIRS_PERMS+= ${ZM_CACHE}/events ${REAL_ROOT_USER} ${APACHE_GROUP} 775
-CMAKE_ARGS+= -DZM_CONTENTDIR=${ZM_CACHE}
+CMAKE_CONFIGURE_ARGS+= -DZM_CONTENTDIR=${ZM_CACHE}
# ZoneMinder scripts needing Perl $PATH patching AND interpreter patching
ZM_REPLACE_PERL+= scripts/zmaudit.pl.in
@@ -292,7 +292,7 @@ PERL5_REQD+= 5.6.0
#PERL5_CONFIGURE_DIRS+= ${WRKSRC}/onvif/modules
#PERL5_PACKLIST= auto/ZoneMinder/.packlist
#PERL5_PACKLIST+= auto/ONVIF/.packlist
-#CMAKE_ARGS+= -DZM_PERL_MM_PARMS="INSTALLDIRS=vendor"
+#CMAKE_CONFIGURE_ARGS+= -DZM_PERL_MM_PARMS="INSTALLDIRS=vendor"
#.include "../../lang/perl5/module.mk"
#post-configure: perl5-configure
Index: pkgsrc/shells/fish/Makefile
diff -u pkgsrc/shells/fish/Makefile:1.52 pkgsrc/shells/fish/Makefile:1.53
--- pkgsrc/shells/fish/Makefile:1.52 Tue Apr 2 14:56:47 2024
+++ pkgsrc/shells/fish/Makefile Sun Aug 25 06:19:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2024/04/02 14:56:47 ktnb Exp $
+# $NetBSD: Makefile,v 1.53 2024/08/25 06:19:14 wiz Exp $
DISTNAME= fish-3.7.1
CATEGORIES= shells
@@ -14,9 +14,9 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES+= c c++
USE_TOOLS+= msgfmt
-CMAKE_ARGS+= -DIntl_INCLUDE_DIR=${PREFIX}/include
-CMAKE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR}
-CMAKE_ARGS+= -DBUILD_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DIntl_INCLUDE_DIR=${PREFIX}/include
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCS=OFF
PKG_SHELL= bin/fish
Index: pkgsrc/sysutils/WCMCommander/Makefile
diff -u pkgsrc/sysutils/WCMCommander/Makefile:1.8 pkgsrc/sysutils/WCMCommander/Makefile:1.9
--- pkgsrc/sysutils/WCMCommander/Makefile:1.8 Sun Nov 12 13:23:28 2023
+++ pkgsrc/sysutils/WCMCommander/Makefile Sun Aug 25 06:19:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/11/12 13:23:28 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2024/08/25 06:19:14 wiz Exp $
DISTNAME= WCMCommander-0.20.0
PKGREVISION= 5
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-/-relea
USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
-CMAKE_ARGS+= -DWITH_SMBCLIENT:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SMBCLIENT:BOOL=OFF
# Needs gnu for alloca builtin
FORCE_CXX_STD= gnu++11
Index: pkgsrc/sysutils/bareos/Makefile.common
diff -u pkgsrc/sysutils/bareos/Makefile.common:1.6 pkgsrc/sysutils/bareos/Makefile.common:1.7
--- pkgsrc/sysutils/bareos/Makefile.common:1.6 Fri Jan 13 11:50:37 2023
+++ pkgsrc/sysutils/bareos/Makefile.common Sun Aug 25 06:19:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2023/01/13 11:50:37 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.7 2024/08/25 06:19:14 wiz Exp $
# used by sysutils/bareos-clientonly/Makefile
GITHUB_PROJECT= bareos
@@ -69,23 +69,23 @@ CXXFLAGS+= -DBAREOS_JOBLOG_MESSAGE=\\\"'
CXXFLAGS+= -DBAREOS_SERVICES_MESSAGE=\\\"'pkgsrc-compiled binaries are UNSUPPORTED by bareos.com (https://www.bareos.com).\\n'\\\"
# cmake arguments
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
-CMAKE_ARGS+= -DCMAKE_STAGING_PREFIX=${BUILDLINK_DIR}
-CMAKE_ARGS+= -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-CMAKE_ARGS+= -Dconfigtemplatedir=${PREFIX}/${CONFIG_TEMPLATE_PATH}
-CMAKE_ARGS+= -Dworkingdir=${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working
-CMAKE_ARGS+= -Dsubsysdir=${VARBASE}/db/${PKG_SYSCONFSUBDIR}
-CMAKE_ARGS+= -Dbsrdir=${VARBASE}/db/${PKG_SYSCONFSUBDIR}/bsr
-CMAKE_ARGS+= -Dlogdir=${BAREOS_LOGDIR}
-CMAKE_ARGS+= -Dlibdir=${BAREOS_LIBDIR}
-CMAKE_ARGS+= -Dpiddir=${BAREOS_PIDDIR}
-CMAKE_ARGS+= -Darchivedir=${VARBASE}/db/${PKG_SYSCONFSUBDIR}/storage
-CMAKE_ARGS+= -Ddir-user=${BAREOS_DIR_USER}
-CMAKE_ARGS+= -Ddir-group=${BAREOS_GROUP}
-CMAKE_ARGS+= -Dsd-user=${BAREOS_SD_USER}
-CMAKE_ARGS+= -Dsd-group=${BAREOS_GROUP}
-CMAKE_ARGS+= -Dfd-user=${REAL_ROOT_USER}
-CMAKE_ARGS+= -Dfd-group=${BAREOS_GROUP}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_STAGING_PREFIX=${BUILDLINK_DIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+CMAKE_CONFIGURE_ARGS+= -Dconfigtemplatedir=${PREFIX}/${CONFIG_TEMPLATE_PATH}
+CMAKE_CONFIGURE_ARGS+= -Dworkingdir=${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working
+CMAKE_CONFIGURE_ARGS+= -Dsubsysdir=${VARBASE}/db/${PKG_SYSCONFSUBDIR}
+CMAKE_CONFIGURE_ARGS+= -Dbsrdir=${VARBASE}/db/${PKG_SYSCONFSUBDIR}/bsr
+CMAKE_CONFIGURE_ARGS+= -Dlogdir=${BAREOS_LOGDIR}
+CMAKE_CONFIGURE_ARGS+= -Dlibdir=${BAREOS_LIBDIR}
+CMAKE_CONFIGURE_ARGS+= -Dpiddir=${BAREOS_PIDDIR}
+CMAKE_CONFIGURE_ARGS+= -Darchivedir=${VARBASE}/db/${PKG_SYSCONFSUBDIR}/storage
+CMAKE_CONFIGURE_ARGS+= -Ddir-user=${BAREOS_DIR_USER}
+CMAKE_CONFIGURE_ARGS+= -Ddir-group=${BAREOS_GROUP}
+CMAKE_CONFIGURE_ARGS+= -Dsd-user=${BAREOS_SD_USER}
+CMAKE_CONFIGURE_ARGS+= -Dsd-group=${BAREOS_GROUP}
+CMAKE_CONFIGURE_ARGS+= -Dfd-user=${REAL_ROOT_USER}
+CMAKE_CONFIGURE_ARGS+= -Dfd-group=${BAREOS_GROUP}
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/sysutils/bareos/options.mk
diff -u pkgsrc/sysutils/bareos/options.mk:1.1 pkgsrc/sysutils/bareos/options.mk:1.2
--- pkgsrc/sysutils/bareos/options.mk:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/options.mk Sun Aug 25 06:19:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/07/28 06:36:29 kardel Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:19:14 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.bareos
PKG_SUPPORTED_OPTIONS= scsi-crypto
@@ -10,15 +10,15 @@ PKG_SUGGESTED_OPTIONS= catalog-pgsql
.if !empty(PKG_OPTIONS:Mcatalog-sqlite3)
. include "../../databases/sqlite3/buildlink3.mk"
-CMAKE_ARGS+= -Dsqlite3=yes
+CMAKE_CONFIGURE_ARGS+= -Dsqlite3=yes
.elif !empty(PKG_OPTIONS:Mcatalog-pgsql)
. include "../../mk/pgsql.buildlink3.mk"
-CMAKE_ARGS+= -Dpostgresql=yes
+CMAKE_CONFIGURE_ARGS+= -Dpostgresql=yes
.elif !empty(PKG_OPTIONS:Mcatalog-mysql)
. include "../../mk/mysql.buildlink3.mk"
-CMAKE_ARGS+= -Dmysql=yes
+CMAKE_CONFIGURE_ARGS+= -Dmysql=yes
.endif
.if !empty(PKG_OPTIONS:Mscsi-crypto)
-CMAKE_ARGS+= -Dscsi-crypto=yes
+CMAKE_CONFIGURE_ARGS+= -Dscsi-crypto=yes
.endif
Index: pkgsrc/sysutils/bareos-clientonly/Makefile
diff -u pkgsrc/sysutils/bareos-clientonly/Makefile:1.4 pkgsrc/sysutils/bareos-clientonly/Makefile:1.5
--- pkgsrc/sysutils/bareos-clientonly/Makefile:1.4 Tue Oct 24 22:11:04 2023
+++ pkgsrc/sysutils/bareos-clientonly/Makefile Sun Aug 25 06:19:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/10/24 22:11:04 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2024/08/25 06:19:14 wiz Exp $
COMMENT= Backup Archiving REcovery Open Sourced - client
PKGREVISION= 1
@@ -7,8 +7,8 @@ CONFLICTS= bareos-[0-9]* bacula-[0-9]*
.include "../../sysutils/bareos/Makefile.common"
-CMAKE_ARGS?=
-CMAKE_ARGS+= -Dclient-only=true
+CMAKE_CONFIGURE_ARGS?=
+CMAKE_CONFIGURE_ARGS+= -Dclient-only=true
RCD_SCRIPTS= bareos-fd
Index: pkgsrc/sysutils/cdrkit/Makefile
diff -u pkgsrc/sysutils/cdrkit/Makefile:1.19 pkgsrc/sysutils/cdrkit/Makefile:1.20
--- pkgsrc/sysutils/cdrkit/Makefile:1.19 Tue Jun 28 11:35:54 2022
+++ pkgsrc/sysutils/cdrkit/Makefile Sun Aug 25 06:19:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/06/28 11:35:54 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2024/08/25 06:19:14 wiz Exp $
#
DISTNAME= cdrkit-1.1.9
@@ -15,7 +15,7 @@ CONFLICTS= cdrtools-[0-9]*
USE_CMAKE= yes
USE_TOOLS+= perl:run
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DMANSUBDIR=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DMANSUBDIR=${PKGMANDIR}
REPLACE_PERL= 3rd-party/dirsplit/dirsplit
Index: pkgsrc/sysutils/dfc/Makefile
diff -u pkgsrc/sysutils/dfc/Makefile:1.5 pkgsrc/sysutils/dfc/Makefile:1.6
--- pkgsrc/sysutils/dfc/Makefile:1.5 Sun Oct 11 21:43:26 2020
+++ pkgsrc/sysutils/dfc/Makefile Sun Aug 25 06:19:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/10/11 21:43:26 kim Exp $
+# $NetBSD: Makefile,v 1.6 2024/08/25 06:19:14 wiz Exp $
DISTNAME= dfc-3.1.1
PKGREVISION= 1
@@ -12,8 +12,8 @@ COMMENT= Display file system space usage
LICENSE= modified-bsd
USE_CMAKE= yes
-CMAKE_ARGS+= -DMAN_PATH=${PREFIX}/${PKGMANDIR}
-CMAKE_ARGS+= -DSYSCONFDIR=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DMAN_PATH=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DSYSCONFDIR=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/dfc
INSTALLATION_DIRS= ${EGDIR}
@@ -21,8 +21,8 @@ MAKE_DIRS= ${PKG_SYSCONFDIR}/xdg
OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/dfc
CONF_FILES= ${EGDIR}/dfcrc ${PKG_SYSCONFDIR}/xdg/dfc/dfcrc
USE_PKGLOCALEDIR= yes
-CMAKE_ARGS+= -DLOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
-CMAKE_ARGS+= -DNLS_ENABLED=true
+CMAKE_CONFIGURE_ARGS+= -DLOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
+CMAKE_CONFIGURE_ARGS+= -DNLS_ENABLED=true
post-install:
${INSTALL_DATA} ${DESTDIR}${PKG_SYSCONFDIR}/xdg/dfc/dfcrc ${DESTDIR}${EGDIR}
Index: pkgsrc/sysutils/fluent-bit/Makefile
diff -u pkgsrc/sysutils/fluent-bit/Makefile:1.4 pkgsrc/sysutils/fluent-bit/Makefile:1.5
--- pkgsrc/sysutils/fluent-bit/Makefile:1.4 Fri Jun 28 17:37:23 2024
+++ pkgsrc/sysutils/fluent-bit/Makefile Sun Aug 25 06:19:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/06/28 17:37:23 adam Exp $
+# $NetBSD: Makefile,v 1.5 2024/08/25 06:19:14 wiz Exp $
DISTNAME= fluent-bit-0.13.2
CATEGORIES= sysutils
@@ -15,8 +15,8 @@ USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
USE_FEATURES+= strnlen
-CMAKE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR}
-CMAKE_ARGS+= -DEGDIR:PATH=${EGDIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DEGDIR:PATH=${EGDIR}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
CONF_FILES= ${EGDIR}/fluent-bit.conf \
Index: pkgsrc/sysutils/strigi/Makefile
diff -u pkgsrc/sysutils/strigi/Makefile:1.100 pkgsrc/sysutils/strigi/Makefile:1.101
--- pkgsrc/sysutils/strigi/Makefile:1.100 Wed May 29 16:34:32 2024
+++ pkgsrc/sysutils/strigi/Makefile Sun Aug 25 06:19:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2024/05/29 16:34:32 adam Exp $
+# $NetBSD: Makefile,v 1.101 2024/08/25 06:19:15 wiz Exp $
DISTNAME= strigi-0.7.8
PKGREVISION= 57
@@ -34,12 +34,12 @@ LDFLAGS.Linux+= -lclucene-shared
CFLAGS.SunOS+= -DCMAKE_HAVE_PTHREAD_CREATE
LDFLAGS.SunOS+= -mimpure-text -lrt -lsocket -lclucene-shared
-CMAKE_ARGS+= -DENABLE_EXIV2=OFF
-CMAKE_ARGS+= -DENABLE_FFMPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_EXIV2=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_FFMPEG=OFF
.if !empty(RT_LIB_SCHED)
# these use sched_setscheduler
-CMAKE_ARGS+= -Dstrigidaemon_LIBS=${RT_LIB_SCHED}
-CMAKE_ARGS+= -Dtest_LIBS=${RT_LIB_SCHED}
+CMAKE_CONFIGURE_ARGS+= -Dstrigidaemon_LIBS=${RT_LIB_SCHED}
+CMAKE_CONFIGURE_ARGS+= -Dtest_LIBS=${RT_LIB_SCHED}
.endif
pre-configure:
Index: pkgsrc/textproc/PEGTL/Makefile
diff -u pkgsrc/textproc/PEGTL/Makefile:1.1 pkgsrc/textproc/PEGTL/Makefile:1.2
--- pkgsrc/textproc/PEGTL/Makefile:1.1 Tue May 4 14:19:51 2021
+++ pkgsrc/textproc/PEGTL/Makefile Sun Aug 25 06:19:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/05/04 14:19:51 prlw1 Exp $
+# $NetBSD: Makefile,v 1.2 2024/08/25 06:19:15 wiz Exp $
DISTNAME= PEGTL-2.8.3
CATEGORIES= textproc
@@ -13,8 +13,8 @@ LICENSE= mit
USE_LANGUAGES= c++11
USE_CMAKE= yes
-CMAKE_ARGS+= -DPEGTL_BUILD_EXAMPLES=no
-CMAKE_ARGS+= -DPEGTL_BUILD_TESTS=no
-CMAKE_ARGS+= -DPEGTL_BUILD_TESTS=no
+CMAKE_CONFIGURE_ARGS+= -DPEGTL_BUILD_EXAMPLES=no
+CMAKE_CONFIGURE_ARGS+= -DPEGTL_BUILD_TESTS=no
+CMAKE_CONFIGURE_ARGS+= -DPEGTL_BUILD_TESTS=no
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/cJSON/Makefile
diff -u pkgsrc/textproc/cJSON/Makefile:1.5 pkgsrc/textproc/cJSON/Makefile:1.6
--- pkgsrc/textproc/cJSON/Makefile:1.5 Mon May 13 14:22:16 2024
+++ pkgsrc/textproc/cJSON/Makefile Sun Aug 25 06:19:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2024/05/13 14:22:16 adam Exp $
+# $NetBSD: Makefile,v 1.6 2024/08/25 06:19:15 wiz Exp $
DISTNAME= cJSON-1.7.18
CATEGORIES= textproc
@@ -10,9 +10,9 @@ HOMEPAGE= https://github.com/DaveGamble/
COMMENT= Ultralightweight JSON parser in ANSI C
LICENSE= mit
-CMAKE_ARGS+= -DENABLE_CJSON_UTILS=ON
-CMAKE_ARGS+= -DENABLE_CUSTOM_COMPILER_FLAGS=OFF
-CMAKE_ARGS+= -DBUILD_SHARED_AND_STATIC_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CJSON_UTILS=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CUSTOM_COMPILER_FLAGS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_AND_STATIC_LIBS=ON
TEST_TARGET= test
TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
# For Darwin
Index: pkgsrc/textproc/fmtlib/Makefile
diff -u pkgsrc/textproc/fmtlib/Makefile:1.19 pkgsrc/textproc/fmtlib/Makefile:1.20
--- pkgsrc/textproc/fmtlib/Makefile:1.19 Sat Jul 20 18:52:16 2024
+++ pkgsrc/textproc/fmtlib/Makefile Sun Aug 25 06:19:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/07/20 18:52:16 adam Exp $
+# $NetBSD: Makefile,v 1.20 2024/08/25 06:19:15 wiz Exp $
DISTNAME= fmt-11.0.2
PKGNAME= ${DISTNAME:S/fmt/fmtlib/}
@@ -19,7 +19,7 @@ TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/${
TEST_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
TEST_TARGET= test
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_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.21 pkgsrc/textproc/json-c/Makefile:1.22
--- pkgsrc/textproc/json-c/Makefile:1.21 Thu Aug 24 09:23:14 2023
+++ pkgsrc/textproc/json-c/Makefile Sun Aug 25 06:19:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2023/08/24 09:23:14 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2024/08/25 06:19:15 wiz Exp $
DISTNAME= json-c-0.17
CATEGORIES= textproc
@@ -9,8 +9,8 @@ HOMEPAGE= https://github.com/json-c/json
COMMENT= JSON library in C
LICENSE= mit
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DDISABLE_WERROR=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DDISABLE_WERROR=ON
PKGCONFIG_OVERRIDE+= json-c.pc.in
Index: pkgsrc/textproc/json-schema/Makefile
diff -u pkgsrc/textproc/json-schema/Makefile:1.10 pkgsrc/textproc/json-schema/Makefile:1.11
--- pkgsrc/textproc/json-schema/Makefile:1.10 Tue Jan 24 18:36:34 2023
+++ pkgsrc/textproc/json-schema/Makefile Sun Aug 25 06:19:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/01/24 18:36:34 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2024/08/25 06:19:15 wiz Exp $
DISTNAME= json-schema-1.3
PKGREVISION= 3
@@ -14,7 +14,7 @@ LICENSE= modified-bsd
USE_LANGUAGES= c c++
USE_TOOLS+= perl:test pkg-config
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
TEST_TARGET= test
.include "../../devel/cmake/build.mk"
Index: pkgsrc/textproc/jsoncpp/Makefile
diff -u pkgsrc/textproc/jsoncpp/Makefile:1.17 pkgsrc/textproc/jsoncpp/Makefile:1.18
--- pkgsrc/textproc/jsoncpp/Makefile:1.17 Tue Jan 24 18:36:34 2023
+++ pkgsrc/textproc/jsoncpp/Makefile Sun Aug 25 06:19:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2023/01/24 18:36:34 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2024/08/25 06:19:15 wiz Exp $
DISTNAME= jsoncpp-1.9.5
CATEGORIES= textproc
@@ -10,9 +10,9 @@ COMMENT= JSON reader and writer in C++
LICENSE= public-domain OR mit
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_STATIC_LIBS=OFF
-CMAKE_ARGS+= -DBUILD_OBJECT_LIBS=OFF
-CMAKE_ARGS+= -DJSONCPP_WITH_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_STATIC_LIBS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_OBJECT_LIBS=OFF
+CMAKE_CONFIGURE_ARGS+= -DJSONCPP_WITH_TESTS=OFF
PKGCONFIG_OVERRIDE= pkg-config/jsoncpp.pc.in
.include "../../devel/cmake/build.mk"
Index: pkgsrc/textproc/libclucene/Makefile
diff -u pkgsrc/textproc/libclucene/Makefile:1.38 pkgsrc/textproc/libclucene/Makefile:1.39
--- pkgsrc/textproc/libclucene/Makefile:1.38 Fri Dec 29 18:24:59 2023
+++ pkgsrc/textproc/libclucene/Makefile Sun Aug 25 06:19:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2023/12/29 18:24:59 adam Exp $
+# $NetBSD: Makefile,v 1.39 2024/08/25 06:19:15 wiz Exp $
DISTNAME= clucene-core-2.3.3.4
PKGNAME= lib${DISTNAME:S/-core-/-/}
@@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v2.1 OR apache-2.0
PKGCONFIG_OVERRIDE+= libclucene-core.pc.in
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_CONTRIBS_LIB=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_CONTRIBS_LIB=ON
USE_LIBTOOL= yes
.include "../../devel/cmake/build.mk"
Index: pkgsrc/textproc/libcue/Makefile
diff -u pkgsrc/textproc/libcue/Makefile:1.2 pkgsrc/textproc/libcue/Makefile:1.3
--- pkgsrc/textproc/libcue/Makefile:1.2 Mon Oct 9 17:35:38 2023
+++ pkgsrc/textproc/libcue/Makefile Sun Aug 25 06:19:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/10/09 17:35:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2024/08/25 06:19:16 wiz Exp $
DISTNAME= libcue-2.2.1
PKGREVISION= 1
@@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2
USE_CMAKE= yes
USE_TOOLS+= flex bison
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
PKGCONFIG_OVERRIDE+= libcue.pc.in
Index: pkgsrc/textproc/libkolabxml/Makefile
diff -u pkgsrc/textproc/libkolabxml/Makefile:1.15 pkgsrc/textproc/libkolabxml/Makefile:1.16
--- pkgsrc/textproc/libkolabxml/Makefile:1.15 Wed May 29 16:34:37 2024
+++ pkgsrc/textproc/libkolabxml/Makefile Sun Aug 25 06:19:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2024/05/29 16:34:37 adam Exp $
+# $NetBSD: Makefile,v 1.16 2024/08/25 06:19:16 wiz Exp $
DISTNAME= libkolabxml-1.1.6
PKGREVISION= 14
@@ -14,7 +14,7 @@ USE_LANGUAGES= c c++
USE_CMAKE= yes
USE_TOOLS+= gmake
-CMAKE_ARGS+= -DBUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=OFF
SUBST_CLASSES+= pathes
SUBST_STAGE.pathes= post-install
Index: pkgsrc/textproc/libyaml/Makefile
diff -u pkgsrc/textproc/libyaml/Makefile:1.18 pkgsrc/textproc/libyaml/Makefile:1.19
--- pkgsrc/textproc/libyaml/Makefile:1.18 Tue Jan 24 18:36:35 2023
+++ pkgsrc/textproc/libyaml/Makefile Sun Aug 25 06:19:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/01/24 18:36:35 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2024/08/25 06:19:16 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
-#CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
#.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/lua-rapidjson/Makefile
diff -u pkgsrc/textproc/lua-rapidjson/Makefile:1.4 pkgsrc/textproc/lua-rapidjson/Makefile:1.5
--- pkgsrc/textproc/lua-rapidjson/Makefile:1.4 Tue Jul 18 18:47:53 2023
+++ pkgsrc/textproc/lua-rapidjson/Makefile Sun Aug 25 06:19:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/07/18 18:47:53 nia Exp $
+# $NetBSD: Makefile,v 1.5 2024/08/25 06:19:16 wiz Exp $
DISTNAME= lua-rapidjson-0.7.1
PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/^lua-//1}
@@ -19,7 +19,7 @@ LUA_USE_BUSTED= yes
TEST_DEPENDS+= ${LUA_PKGPREFIX}-utf8-[0-9]*:../../textproc/lua-utf8
-CMAKE_ARGS+= -DLUA_RAPIDJSON_VERSION=${PKGVERSION}
+CMAKE_CONFIGURE_ARGS+= -DLUA_RAPIDJSON_VERSION=${PKGVERSION}
USE_CXX_FEATURES+= c++11
Index: pkgsrc/textproc/lucene++/Makefile
diff -u pkgsrc/textproc/lucene++/Makefile:1.23 pkgsrc/textproc/lucene++/Makefile:1.24
--- pkgsrc/textproc/lucene++/Makefile:1.23 Sun Apr 21 17:28:32 2024
+++ pkgsrc/textproc/lucene++/Makefile Sun Aug 25 06:19:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2024/04/21 17:28:32 adam Exp $
+# $NetBSD: Makefile,v 1.24 2024/08/25 06:19:16 wiz Exp $
DISTNAME= lucene++-3.0.9
CATEGORIES= textproc
@@ -13,8 +13,8 @@ LICENSE= gnu-lgpl-v3 OR apache-2.0
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DENABLE_DEMO=OFF
-CMAKE_ARGS+= -DENABLE_TEST=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEMO=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TEST=OFF
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/cmake/build.mk"
Index: pkgsrc/textproc/multimarkdown/Makefile
diff -u pkgsrc/textproc/multimarkdown/Makefile:1.20 pkgsrc/textproc/multimarkdown/Makefile:1.21
--- pkgsrc/textproc/multimarkdown/Makefile:1.20 Wed May 29 16:34:38 2024
+++ pkgsrc/textproc/multimarkdown/Makefile Sun Aug 25 06:19:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2024/05/29 16:34:38 adam Exp $
+# $NetBSD: Makefile,v 1.21 2024/08/25 06:19:16 wiz Exp $
DISTNAME= multimarkdown-6.5.2
MASTER_SITES= ${MASTER_SITE_GITHUB:=fletcher/}
@@ -19,7 +19,7 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/nlohmann-json/options.mk
diff -u pkgsrc/textproc/nlohmann-json/options.mk:1.1 pkgsrc/textproc/nlohmann-json/options.mk:1.2
--- pkgsrc/textproc/nlohmann-json/options.mk:1.1 Tue Nov 21 17:37:52 2023
+++ pkgsrc/textproc/nlohmann-json/options.mk Sun Aug 25 06:19:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/11/21 17:37:52 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:19:16 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.nlohmann-json
@@ -13,7 +13,7 @@ PLIST_VARS+= tests
# FIXME: A small number of tests assume that WRKSRC is a git checkout.
PLIST.tests= yes
TEST_TARGET= test
-CMAKE_ARGS+= -DJSON_BuildTests=ON
+CMAKE_CONFIGURE_ARGS+= -DJSON_BuildTests=ON
.else
-CMAKE_ARGS+= -DJSON_BuildTests=OFF
+CMAKE_CONFIGURE_ARGS+= -DJSON_BuildTests=OFF
.endif
Index: pkgsrc/textproc/nuspell/Makefile
diff -u pkgsrc/textproc/nuspell/Makefile:1.7 pkgsrc/textproc/nuspell/Makefile:1.8
--- pkgsrc/textproc/nuspell/Makefile:1.7 Wed May 29 16:34:38 2024
+++ pkgsrc/textproc/nuspell/Makefile Sun Aug 25 06:19:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2024/05/29 16:34:38 adam Exp $
+# $NetBSD: Makefile,v 1.8 2024/08/25 06:19:16 wiz Exp $
DISTNAME= nuspell-5.1.4
PKGREVISION= 1
@@ -17,7 +17,7 @@ USE_LANGUAGES= c c++
USE_CXX_FEATURES+= c++17 charconv filesystem
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release
PKGCONFIG_OVERRIDE+= nuspell.pc.in
Index: pkgsrc/textproc/pugixml/Makefile
diff -u pkgsrc/textproc/pugixml/Makefile:1.15 pkgsrc/textproc/pugixml/Makefile:1.16
--- pkgsrc/textproc/pugixml/Makefile:1.15 Sun Oct 1 16:57:45 2023
+++ pkgsrc/textproc/pugixml/Makefile Sun Aug 25 06:19:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/10/01 16:57:45 adam Exp $
+# $NetBSD: Makefile,v 1.16 2024/08/25 06:19:17 wiz Exp $
DISTNAME= pugixml-1.14
CATEGORIES= textproc
@@ -12,7 +12,7 @@ LICENSE= mit
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_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.10 pkgsrc/textproc/rapidjson/Makefile:1.11
--- pkgsrc/textproc/rapidjson/Makefile:1.10 Tue Jun 18 10:06:21 2024
+++ pkgsrc/textproc/rapidjson/Makefile Sun Aug 25 06:19:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2024/06/18 10:06:21 markd Exp $
+# $NetBSD: Makefile,v 1.11 2024/08/25 06:19:17 wiz Exp $
DISTNAME= rapidjson-1.1.0
PKGREVISION= 2
@@ -15,8 +15,8 @@ USE_LANGUAGES= c++
USE_CXX_FEATURES= c++11
#TEST_TARGET= test
-CMAKE_ARGS+= -DRAPIDJSON_BUILD_TESTS=OFF
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+CMAKE_CONFIGURE_ARGS+= -DRAPIDJSON_BUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
PKGCONFIG_OVERRIDE+= RapidJSON.pc.in
BUILDLINK_TRANSFORM+= rm:-march=native rm:-Werror
Index: pkgsrc/textproc/uriparser/Makefile
diff -u pkgsrc/textproc/uriparser/Makefile:1.18 pkgsrc/textproc/uriparser/Makefile:1.19
--- pkgsrc/textproc/uriparser/Makefile:1.18 Mon May 6 05:49:28 2024
+++ pkgsrc/textproc/uriparser/Makefile Sun Aug 25 06:19:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2024/05/06 05:49:28 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2024/08/25 06:19:17 wiz Exp $
DISTNAME= uriparser-0.9.8
CATEGORIES= textproc
@@ -14,7 +14,7 @@ LICENSE= modified-bsd
USE_FEATURES= snprintf
PKGCONFIG_OVERRIDE+= liburiparser.pc.in
-CMAKE_ARGS+= -DURIPARSER_BUILD_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DURIPARSER_BUILD_DOCS=OFF
# reallocarray etc
CFLAGS.NetBSD+= -D_OPENBSD_SOURCE
Index: pkgsrc/textproc/uriparser/options.mk
diff -u pkgsrc/textproc/uriparser/options.mk:1.2 pkgsrc/textproc/uriparser/options.mk:1.3
--- pkgsrc/textproc/uriparser/options.mk:1.2 Thu Jul 20 09:46:34 2023
+++ pkgsrc/textproc/uriparser/options.mk Sun Aug 25 06:19:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/07/20 09:46:34 nia Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:19:17 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.uriparser
@@ -15,9 +15,9 @@ PKG_SUPPORTED_OPTIONS= tests
# with older C++ compilers.
#
TEST_TARGET= test
-CMAKE_ARGS+= -DURIPARSER_BUILD_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DURIPARSER_BUILD_TESTS=ON
USE_LANGUAGES= c c++14
. include "../../devel/googletest/buildlink3.mk"
.else
-CMAKE_ARGS+= -DURIPARSER_BUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DURIPARSER_BUILD_TESTS=OFF
.endif
Index: pkgsrc/textproc/utf8-cpp/Makefile
diff -u pkgsrc/textproc/utf8-cpp/Makefile:1.11 pkgsrc/textproc/utf8-cpp/Makefile:1.12
--- pkgsrc/textproc/utf8-cpp/Makefile:1.11 Mon Jan 1 09:08:40 2024
+++ pkgsrc/textproc/utf8-cpp/Makefile Sun Aug 25 06:19:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2024/01/01 09:08:40 adam Exp $
+# $NetBSD: Makefile,v 1.12 2024/08/25 06:19:17 wiz Exp $
DISTNAME= utf8-cpp-4.0.5
CATEGORIES= textproc
@@ -12,8 +12,8 @@ COMMENT= UTF-8 header library for C++
LICENSE= boost-license
USE_LANGUAGES= c++
-CMAKE_ARGS+= -DUTF8_SAMPLES=OFF
-CMAKE_ARGS+= -DUTF8_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DUTF8_SAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DUTF8_TESTS=OFF
.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/yaml-cpp/Makefile
diff -u pkgsrc/textproc/yaml-cpp/Makefile:1.12 pkgsrc/textproc/yaml-cpp/Makefile:1.13
--- pkgsrc/textproc/yaml-cpp/Makefile:1.12 Wed Aug 23 08:05:02 2023
+++ pkgsrc/textproc/yaml-cpp/Makefile Sun Aug 25 06:19:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/08/23 08:05:02 adam Exp $
+# $NetBSD: Makefile,v 1.13 2024/08/25 06:19:17 wiz Exp $
DISTNAME= yaml-cpp-0.8.0
CATEGORIES= textproc
@@ -13,8 +13,8 @@ LICENSE= mit
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DYAML_BUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DYAML_CPP_BUILD_TESTS=OFF # issue 539
+CMAKE_CONFIGURE_ARGS+= -DYAML_BUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DYAML_CPP_BUILD_TESTS=OFF # issue 539
USE_CXX_FEATURES+= c++11
Index: pkgsrc/time/taskwarrior/Makefile
diff -u pkgsrc/time/taskwarrior/Makefile:1.23 pkgsrc/time/taskwarrior/Makefile:1.24
--- pkgsrc/time/taskwarrior/Makefile:1.23 Wed May 29 16:34:44 2024
+++ pkgsrc/time/taskwarrior/Makefile Sun Aug 25 06:19:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2024/05/29 16:34:44 adam Exp $
+# $NetBSD: Makefile,v 1.24 2024/08/25 06:19:17 wiz Exp $
#
DISTNAME= task-2.6.2
@@ -19,9 +19,9 @@ USE_CXX_FEATURES+= c++17
INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
-CMAKE_ARGS+= -DTASK_MAN1DIR=${PREFIX}/${PKGMANDIR}/man1
-CMAKE_ARGS+= -DTASK_MAN5DIR=${PREFIX}/${PKGMANDIR}/man5
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=release
+CMAKE_CONFIGURE_ARGS+= -DTASK_MAN1DIR=${PREFIX}/${PKGMANDIR}/man1
+CMAKE_CONFIGURE_ARGS+= -DTASK_MAN5DIR=${PREFIX}/${PKGMANDIR}/man5
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=release
LDFLAGS.SunOS+= -lsocket -lnsl
Index: pkgsrc/wm/awesome/Makefile
diff -u pkgsrc/wm/awesome/Makefile:1.95 pkgsrc/wm/awesome/Makefile:1.96
--- pkgsrc/wm/awesome/Makefile:1.95 Sun Apr 7 07:35:07 2024
+++ pkgsrc/wm/awesome/Makefile Sun Aug 25 06:19:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2024/04/07 07:35:07 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2024/08/25 06:19:17 wiz Exp $
DISTNAME= awesome-4.3
PKGREVISION= 16
@@ -31,12 +31,12 @@ LUA_VERSIONS_ACCEPTED= 53 52 51
.include "../../lang/lua/luaversion.mk"
-CMAKE_ARGS+= -DCOMPRESS_MANPAGES=${MANZ:Q}
-CMAKE_ARGS+= -DAWESOME_MAN_PATH=${PREFIX}/${PKGMANDIR}
-CMAKE_ARGS+= -DOVERRIDE_VERSION=${PKGVERSION_NOREV}
-CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR}
-CMAKE_ARGS+= -DXDG_CONFIG_DIR=${PKG_SYSCONFBASEDIR}/xdg
-CMAKE_ARGS+= -DGENERATE_DOC=OFF
+CMAKE_CONFIGURE_ARGS+= -DCOMPRESS_MANPAGES=${MANZ:Q}
+CMAKE_CONFIGURE_ARGS+= -DAWESOME_MAN_PATH=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DOVERRIDE_VERSION=${PKGVERSION_NOREV}
+CMAKE_CONFIGURE_ARGS+= -DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR}
+CMAKE_CONFIGURE_ARGS+= -DXDG_CONFIG_DIR=${PKG_SYSCONFBASEDIR}/xdg
+CMAKE_CONFIGURE_ARGS+= -DGENERATE_DOC=OFF
EGDIR= ${PREFIX}/share/examples/awesome
CONF_FILES= ${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua
Index: pkgsrc/wm/awesome/options.mk
diff -u pkgsrc/wm/awesome/options.mk:1.3 pkgsrc/wm/awesome/options.mk:1.4
--- pkgsrc/wm/awesome/options.mk:1.3 Wed Jul 17 22:08:58 2019
+++ pkgsrc/wm/awesome/options.mk Sun Aug 25 06:19:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/07/17 22:08:58 nia Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/25 06:19:17 wiz Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.awesome
@@ -10,10 +10,10 @@ PKG_SUPPORTED_OPTIONS= dbus debug
### DBus support
###
.if !empty(PKG_OPTIONS:Mdbus)
-CMAKE_ARGS+= -DWITH_DBUS=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_DBUS=ON
. include "../../sysutils/dbus/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_DBUS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_DBUS=OFF
.endif
###
Index: pkgsrc/wm/ctwm/Makefile
diff -u pkgsrc/wm/ctwm/Makefile:1.43 pkgsrc/wm/ctwm/Makefile:1.44
--- pkgsrc/wm/ctwm/Makefile:1.43 Wed Oct 4 16:58:57 2023
+++ pkgsrc/wm/ctwm/Makefile Sun Aug 25 06:19:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2023/10/04 16:58:57 rhialto Exp $
+# $NetBSD: Makefile,v 1.44 2024/08/25 06:19:17 wiz Exp $
#
DISTNAME= ctwm-4.1.0
@@ -28,8 +28,8 @@ AUTO_MKDIRS= yes
CFLAGS.SunOS+= -D__EXTENSIONS__
# If M4_CMD is not set, it is autodetected as ${WRKDIR}/.tools/bin/m4
-CMAKE_ARGS+= -DM4_CMD=${TOOLS_PATH.gm4}
-CMAKE_ARGS+= -DMANDIR=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DM4_CMD=${TOOLS_PATH.gm4}
+CMAKE_CONFIGURE_ARGS+= -DMANDIR=${PREFIX}/${PKGMANDIR}
CMAKE_ARG_PATH= ${WRKSRC}
CONFIGURE_DIRS= build
@@ -55,13 +55,13 @@ pre-install:
#TOOL_DEPENDS+= dblatex-[0-9]*:../../textproc/dblatex
# but for consistent builds, we disable them entirely.
-CMAKE_ARGS+= -DASCIIDOCTOR=
-CMAKE_ARGS+= -DASCIIDOC=
-CMAKE_ARGS+= -DA2X=
-CMAKE_ARGS+= -DXMLTO=
-CMAKE_ARGS+= -DDBLATEX=
+CMAKE_CONFIGURE_ARGS+= -DASCIIDOCTOR=
+CMAKE_CONFIGURE_ARGS+= -DASCIIDOC=
+CMAKE_CONFIGURE_ARGS+= -DA2X=
+CMAKE_CONFIGURE_ARGS+= -DXMLTO=
+CMAKE_CONFIGURE_ARGS+= -DDBLATEX=
# disable upstream use of ctfconvert due to gcc12
-CMAKE_ARGS+= -DCTFCONVERT=0
+CMAKE_CONFIGURE_ARGS+= -DCTFCONVERT=0
.include "../../mk/jpeg.buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
Index: pkgsrc/wm/obconf-qt/Makefile
diff -u pkgsrc/wm/obconf-qt/Makefile:1.33 pkgsrc/wm/obconf-qt/Makefile:1.34
--- pkgsrc/wm/obconf-qt/Makefile:1.33 Tue Aug 20 06:17:49 2024
+++ pkgsrc/wm/obconf-qt/Makefile Sun Aug 25 06:19:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2024/08/20 06:17:49 pin Exp $
+# $NetBSD: Makefile,v 1.34 2024/08/25 06:19:18 wiz Exp $
DISTNAME= obconf-qt-0.16.4
PKGREVISION= 4
@@ -15,7 +15,7 @@ LICENSE= gnu-gpl-v2
USE_TOOLS+= pkg-config perl
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_PREFIX_PATH:PATH=${PREFIX}/qt6
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_PREFIX_PATH:PATH=${PREFIX}/qt6
TOOL_DEPENDS+= lxqt-build-tools>=2.0.0:../../devel/lxqt-build-tools
TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
Index: pkgsrc/wm/pekwm/Makefile
diff -u pkgsrc/wm/pekwm/Makefile:1.68 pkgsrc/wm/pekwm/Makefile:1.69
--- pkgsrc/wm/pekwm/Makefile:1.68 Sun Apr 7 07:35:10 2024
+++ pkgsrc/wm/pekwm/Makefile Sun Aug 25 06:19:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2024/04/07 07:35:10 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2024/08/25 06:19:18 wiz Exp $
DISTNAME= pekwm-0.3.0
PKGREVISION= 3
@@ -14,10 +14,10 @@ LICENSE= gnu-gpl-v2
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/share/examples
-CMAKE_ARGS+= -DAWK=${AWK}
-CMAKE_ARGS+= -DSED=${SED}
-CMAKE_ARGS+= -DSH=${SH}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/share/examples
+CMAKE_CONFIGURE_ARGS+= -DAWK=${AWK}
+CMAKE_CONFIGURE_ARGS+= -DSED=${SED}
+CMAKE_CONFIGURE_ARGS+= -DSH=${SH}
CMAKE_ARG_PATH= ${WRKSRC}
.include "../../mk/jpeg.buildlink3.mk"
Index: pkgsrc/www/cppcms/Makefile
diff -u pkgsrc/www/cppcms/Makefile:1.41 pkgsrc/www/cppcms/Makefile:1.42
--- pkgsrc/www/cppcms/Makefile:1.41 Mon Jun 3 13:23:11 2024
+++ pkgsrc/www/cppcms/Makefile Sun Aug 25 06:19:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2024/06/03 13:23:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2024/08/25 06:19:18 wiz Exp $
DISTNAME= cppcms-1.2.1
PKGREVISION= 5
@@ -17,7 +17,7 @@ USE_CMAKE= yes
PYTHON_VERSIONS_ACCEPTED= 27
-CMAKE_ARGS+= -DPYTHON=${PYTHONBIN} -DDISABLE_GCRYPT=yes
+CMAKE_CONFIGURE_ARGS+= -DPYTHON=${PYTHONBIN} -DDISABLE_GCRYPT=yes
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
Index: pkgsrc/www/h2o/Makefile
diff -u pkgsrc/www/h2o/Makefile:1.27 pkgsrc/www/h2o/Makefile:1.28
--- pkgsrc/www/h2o/Makefile:1.27 Tue Oct 24 22:11:27 2023
+++ pkgsrc/www/h2o/Makefile Sun Aug 25 06:19:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2023/10/24 22:11:27 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2024/08/25 06:19:18 wiz Exp $
DISTNAME= h2o-2.2.6
PKGREVISION= 4
@@ -17,10 +17,10 @@ USE_TOOLS+= perl:run pkg-config
PKGCONFIG_OVERRIDE+= libh2o-evloop.pc.in
PKGCONFIG_OVERRIDE+= libh2o.pc.in
-CMAKE_ARGS+= -DWITH_BUNDLED_SSL=off
+CMAKE_CONFIGURE_ARGS+= -DWITH_BUNDLED_SSL=off
# TODO: make it an option
-CMAKE_ARGS+= -DWITH_MRUBY=off
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=on
+CMAKE_CONFIGURE_ARGS+= -DWITH_MRUBY=off
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=on
# error: 'for' loop initial declarations are only allowed in C99 mode
FORCE_C_STD= c99
Index: pkgsrc/www/libwebsockets/Makefile
diff -u pkgsrc/www/libwebsockets/Makefile:1.6 pkgsrc/www/libwebsockets/Makefile:1.7
--- pkgsrc/www/libwebsockets/Makefile:1.6 Sat Feb 10 11:01:38 2024
+++ pkgsrc/www/libwebsockets/Makefile Sun Aug 25 06:19:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2024/02/10 11:01:38 adam Exp $
+# $NetBSD: Makefile,v 1.7 2024/08/25 06:19:18 wiz Exp $
DISTNAME= libwebsockets-4.3.3
CATEGORIES= www
@@ -13,17 +13,17 @@ LICENSE= mit
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DLWS_WITH_LIBUV=ON
+CMAKE_CONFIGURE_ARGS+= -DLWS_WITH_LIBUV=ON
# Not building from a git checkout, so this is broken.
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
-CMAKE_ARGS+= -DLWS_WITHOUT_TESTAPPS=ON
+CMAKE_CONFIGURE_ARGS+= -DLWS_WITHOUT_TESTAPPS=ON
# Attempts to modify /etc during configure
-CMAKE_ARGS+= -DLWS_WITHOUT_TEST_SERVER=ON
-CMAKE_ARGS+= -DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON
-CMAKE_ARGS+= -DLWS_WITHOUT_TEST_PING=ON
-CMAKE_ARGS+= -DLWS_WITHOUT_TEST_CLIENT=ON
+CMAKE_CONFIGURE_ARGS+= -DLWS_WITHOUT_TEST_SERVER=ON
+CMAKE_CONFIGURE_ARGS+= -DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON
+CMAKE_CONFIGURE_ARGS+= -DLWS_WITHOUT_TEST_PING=ON
+CMAKE_CONFIGURE_ARGS+= -DLWS_WITHOUT_TEST_CLIENT=ON
PKGCONFIG_OVERRIDE_STAGE= pre-install
PKGCONFIG_OVERRIDE+= libwebsockets.pc
Index: pkgsrc/www/otter-browser/Makefile
diff -u pkgsrc/www/otter-browser/Makefile:1.64 pkgsrc/www/otter-browser/Makefile:1.65
--- pkgsrc/www/otter-browser/Makefile:1.64 Wed May 29 16:34:54 2024
+++ pkgsrc/www/otter-browser/Makefile Sun Aug 25 06:19:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2024/05/29 16:34:54 adam Exp $
+# $NetBSD: Makefile,v 1.65 2024/08/25 06:19:18 wiz Exp $
DISTNAME= otter-browser-1.0.03
PKGREVISION= 13
@@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v3
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DENABLE_QTWEBENGINE=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QTWEBENGINE=OFF
NOT_PAX_MPROTECT_SAFE+= bin/otter-browser
Index: pkgsrc/www/tidy/Makefile
diff -u pkgsrc/www/tidy/Makefile:1.58 pkgsrc/www/tidy/Makefile:1.59
--- pkgsrc/www/tidy/Makefile:1.58 Tue Jun 6 12:42:51 2023
+++ pkgsrc/www/tidy/Makefile Sun Aug 25 06:19:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2023/06/06 12:42:51 riastradh Exp $
+# $NetBSD: Makefile,v 1.59 2024/08/25 06:19:18 wiz Exp $
DISTNAME= tidy-html5-5.8.0
PKGNAME= ${DISTNAME:S/-html5//}
@@ -19,8 +19,8 @@ PKGCONFIG_OVERRIDE= tidy.pc.cmake.in
GCC_REQD+= 4.4
-CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH=${PKGMANDIR}/man1
-CMAKE_ARGS+= -DINCLUDE_INSTALL_DIR:PATH=include/tidy
+CMAKE_CONFIGURE_ARGS+= -DMAN_INSTALL_DIR:PATH=${PKGMANDIR}/man1
+CMAKE_CONFIGURE_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.261 pkgsrc/www/webkit-gtk/Makefile:1.262
--- pkgsrc/www/webkit-gtk/Makefile:1.261 Tue Jun 25 12:09:38 2024
+++ pkgsrc/www/webkit-gtk/Makefile Sun Aug 25 06:19:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.261 2024/06/25 12:09:38 mef Exp $
+# $NetBSD: Makefile,v 1.262 2024/08/25 06:19:18 wiz Exp $
DISTNAME= webkitgtk-2.36.8
PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
@@ -30,23 +30,23 @@ PKGCONFIG_OVERRIDE+= Source/JavaScriptCo
PKGCONFIG_OVERRIDE+= Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
PKGCONFIG_OVERRIDE+= Source/WebKit/gtk/webkit2gtk.pc.in
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DPORT=GTK
-CMAKE_ARGS+= -DENABLE_X11_TARGET=ON
-CMAKE_ARGS+= -DENABLE_MINIBROWSER=ON
-CMAKE_ARGS+= -DENABLE_GAMEPAD=OFF
-CMAKE_ARGS+= -DENABLE_GEOLOCATION=OFF
-CMAKE_ARGS+= -DENABLE_INTROSPECTION=ON
-CMAKE_ARGS+= -DENABLE_JOURNALD_LOG=OFF
-CMAKE_ARGS+= -DENABLE_BUBBLEWRAP_SANDBOX=OFF
-CMAKE_ARGS+= -DUSE_GSTREAMER_GL=OFF
-CMAKE_ARGS+= -DUSE_LIBHYPHEN=OFF
-CMAKE_ARGS+= -DUSE_OPENJPEG=OFF
-CMAKE_ARGS+= -DUSE_SOUP2=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DPORT=GTK
+CMAKE_CONFIGURE_ARGS+= -DENABLE_X11_TARGET=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MINIBROWSER=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GAMEPAD=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GEOLOCATION=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_INTROSPECTION=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_JOURNALD_LOG=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_BUBBLEWRAP_SANDBOX=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_GSTREAMER_GL=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_LIBHYPHEN=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_OPENJPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_SOUP2=ON
.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64*}
-CMAKE_ARGS+= -DAVOID_INT128=ON
+CMAKE_CONFIGURE_ARGS+= -DAVOID_INT128=ON
.endif
REPLACE_PERL+= Source/JavaScriptCore/Scripts/*.pl
@@ -106,12 +106,12 @@ SUBST_MESSAGE.python= Fixing path to pyt
.include "../../lang/ruby/rubyversion.mk"
.include "../../lang/ruby/replace.mk"
TOOL_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
-CMAKE_ARGS+= -DRUBY_EXECUTABLE=${RUBY}
+CMAKE_CONFIGURE_ARGS+= -DRUBY_EXECUTABLE=${RUBY}
PYTHON_FOR_BUILD_ONLY= yes
.include "../../lang/python/batteries-included.mk"
.include "../../lang/python/application.mk"
-CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
CXXFLAGS.SunOS+= -fpermissive
Index: pkgsrc/www/webkit-gtk/options.mk
diff -u pkgsrc/www/webkit-gtk/options.mk:1.24 pkgsrc/www/webkit-gtk/options.mk:1.25
--- pkgsrc/www/webkit-gtk/options.mk:1.24 Sun Jan 21 00:53:46 2024
+++ pkgsrc/www/webkit-gtk/options.mk Sun Aug 25 06:19:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2024/01/21 00:53:46 nikita Exp $
+# $NetBSD: options.mk,v 1.25 2024/08/25 06:19:18 wiz Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk
@@ -35,48 +35,48 @@ PKG_SUGGESTED_OPTIONS+= webkit-jit
# JIT support
#
.if !empty(PKG_OPTIONS:Mwebkit-jit)
-CMAKE_ARGS+= -DENABLE_JIT=ON
-CMAKE_ARGS+= -DENABLE_C_LOOP=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_JIT=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_C_LOOP=OFF
.else
-CMAKE_ARGS+= -DENABLE_JIT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_JIT=OFF
.endif
#
# OpenGL support: enable support for GLX, WebGL and accelerated compositing
#
.if !empty(PKG_OPTIONS:Mopengl)
-CMAKE_ARGS+= -DUSE_OPENGL_OR_ES=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_OPENGL_OR_ES=ON
.else
-CMAKE_ARGS+= -DUSE_OPENGL_OR_ES=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_OPENGL_OR_ES=OFF
.endif
#
# Spellcheck support using enchant
#
.if !empty(PKG_OPTIONS:Menchant)
-CMAKE_ARGS+= -DENABLE_SPELLCHECK=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SPELLCHECK=ON
.include "../../textproc/enchant2/buildlink3.mk"
.else
-CMAKE_ARGS+= -DENABLE_SPELLCHECK=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SPELLCHECK=OFF
.endif
#
# Debug build
#
.if !empty(PKG_OPTIONS:Mdebug)
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
.include "../../lang/ruby/buildlink3.mk"
.else
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
.endif
#
# Wayland display server support
#
.if !empty(PKG_OPTIONS:Mwayland)
-CMAKE_ARGS+= -DENABLE_WAYLAND_TARGET=ON
-CMAKE_ARGS+= -DUSE_WPE_RENDERER=OFF # TODO
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WAYLAND_TARGET=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_WPE_RENDERER=OFF # TODO
.include "../../devel/wayland/buildlink3.mk"
.else
-CMAKE_ARGS+= -DENABLE_WAYLAND_TARGET=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WAYLAND_TARGET=OFF
.endif
Index: pkgsrc/x11/kactivities/Makefile
diff -u pkgsrc/x11/kactivities/Makefile:1.75 pkgsrc/x11/kactivities/Makefile:1.76
--- pkgsrc/x11/kactivities/Makefile:1.75 Wed May 29 16:35:00 2024
+++ pkgsrc/x11/kactivities/Makefile Sun Aug 25 06:19:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2024/05/29 16:35:00 adam Exp $
+# $NetBSD: Makefile,v 1.76 2024/08/25 06:19:19 wiz Exp $
DISTNAME= kactivities-4.13.3
PKGREVISION= 41
@@ -14,10 +14,10 @@ DISTINFO_FILE= ${.CURDIR}/../../x11/libk
USE_CXX_FEATURES+= c++11
-CMAKE_ARGS+= -DWITH_NepomukCore:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_NepomukCore:BOOL=OFF
# The default MACOSX_DEPLOYMENT_TARGET is incompatible with the C++11 tests.
-CMAKE_ARGS.Darwin+= -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_VERSION}
+CMAKE_CONFIGURE_ARGS.Darwin+= -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_VERSION}
INSTALLATION_DIRS= bin
Index: pkgsrc/x11/kde-runtime4/Makefile
diff -u pkgsrc/x11/kde-runtime4/Makefile:1.163 pkgsrc/x11/kde-runtime4/Makefile:1.164
--- pkgsrc/x11/kde-runtime4/Makefile:1.163 Fri Aug 9 09:42:39 2024
+++ pkgsrc/x11/kde-runtime4/Makefile Sun Aug 25 06:19:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.163 2024/08/09 09:42:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.164 2024/08/25 06:19:19 wiz Exp $
DISTNAME= kde-runtime-15.12.0
PKGNAME= ${DISTNAME:S/-1/4-1/}
@@ -10,16 +10,16 @@ MASTER_SITES= ${MASTER_SITE_KDE:=applica
.include "../../meta-pkgs/kde4/Makefile.kde4"
# BUILD_MAKE_FLAGS+= VERBOSE=1
-CMAKE_ARGS+= -DWITH_LibSSH:BOOL=OFF
-CMAKE_ARGS+= -DBUILD_khelpcenter=OFF
-CMAKE_ARGS+= -DBUILD_drkonqi=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_LibSSH:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_khelpcenter=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_drkonqi=OFF
.include "../../mk/bsd.prefs.mk"
-CMAKE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
+CMAKE_CONFIGURE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
.if ${OPSYS} == "Darwin"
-CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.dylib
+CMAKE_CONFIGURE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.dylib
.else
-CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
+CMAKE_CONFIGURE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
.endif
#DEPENDS+= htdig>=3.2.0:../../www/htdig
Index: pkgsrc/x11/kde-runtime4/options.mk
diff -u pkgsrc/x11/kde-runtime4/options.mk:1.6 pkgsrc/x11/kde-runtime4/options.mk:1.7
--- pkgsrc/x11/kde-runtime4/options.mk:1.6 Wed Apr 7 20:49:15 2021
+++ pkgsrc/x11/kde-runtime4/options.mk Sun Aug 25 06:19:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2021/04/07 20:49:15 markd Exp $
+# $NetBSD: options.mk,v 1.7 2024/08/25 06:19:19 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.kde-runtime4
PKG_SUPPORTED_OPTIONS= samba alsa pulseaudio
@@ -11,19 +11,19 @@ PKG_SUGGESTED_OPTIONS.Linux+= alsa
PLIST_VARS+= smb
.if !empty(PKG_OPTIONS:Msamba)
.include "../../net/samba/buildlink3.mk"
-#CMAKE_ARGS+= -DSAMBA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.samba}/include
-#CMAKE_ARGS+= -DSAMBA_LIBRARIES:FILEPATH=${BUILDLINK_PREFIX.samba}/lib/samba
+#CMAKE_CONFIGURE_ARGS+= -DSAMBA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.samba}/include
+#CMAKE_CONFIGURE_ARGS+= -DSAMBA_LIBRARIES:FILEPATH=${BUILDLINK_PREFIX.samba}/lib/samba
PLIST.smb= yes
.endif
.if !empty(PKG_OPTIONS:Malsa)
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ALSA=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
.endif
Index: pkgsrc/x11/kde-workspace4/Makefile
diff -u pkgsrc/x11/kde-workspace4/Makefile:1.118 pkgsrc/x11/kde-workspace4/Makefile:1.119
--- pkgsrc/x11/kde-workspace4/Makefile:1.118 Mon Aug 19 07:00:46 2024
+++ pkgsrc/x11/kde-workspace4/Makefile Sun Aug 25 06:19:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2024/08/19 07:00:46 wiz Exp $
+# $NetBSD: Makefile,v 1.119 2024/08/25 06:19:19 wiz Exp $
DISTNAME= kde-workspace-4.11.22
PKGNAME= ${DISTNAME:S/-4/4-4/}
@@ -17,11 +17,11 @@ SITES.NetBSD-flag-1.0.png= ${MASTER_SITE
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-CMAKE_ARGS+= -DKDE4_BUILD_TESTS:BOOL=OFF
-CMAKE_ARGS+= -DWITH_NepomukCore:BOOL=OFF
-CMAKE_ARGS+= -DWITH_Soprano:BOOL=OFF
-CMAKE_ARGS+= -DWITH_Wayland:BOOL=OFF
-CMAKE_ARGS+= -DWITH_libgps:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DKDE4_BUILD_TESTS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_NepomukCore:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_Soprano:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_Wayland:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_libgps:BOOL=OFF
# BUILD_MAKE_FLAGS+= VERBOSE=1
@@ -116,8 +116,8 @@ RT_LIB_SCHED= rt
.else
RT_LIB_SCHED= # empty
.endif
-CMAKE_ARGS+= -DRT_LIB_SCHED=${RT_LIB_SCHED}
-CMAKE_ARGS+= -DWITH_Xmms:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DRT_LIB_SCHED=${RT_LIB_SCHED}
+CMAKE_CONFIGURE_ARGS+= -DWITH_Xmms:BOOL=OFF
# genkdmconf wont install faces if using destdir so do it ourselves
INSTALLATION_DIRS+= share/kde/apps/kdm/faces
Index: pkgsrc/x11/kdelibs4/Makefile
diff -u pkgsrc/x11/kdelibs4/Makefile:1.144 pkgsrc/x11/kdelibs4/Makefile:1.145
--- pkgsrc/x11/kdelibs4/Makefile:1.144 Wed May 29 16:35:01 2024
+++ pkgsrc/x11/kdelibs4/Makefile Sun Aug 25 06:19:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.144 2024/05/29 16:35:01 adam Exp $
+# $NetBSD: Makefile,v 1.145 2024/08/25 06:19:19 wiz Exp $
DISTNAME= kdelibs-4.14.38
PKGNAME= ${DISTNAME:S/-4/4-4/}
@@ -16,19 +16,19 @@ MASTER_SITES= ${MASTER_SITE_KDE:=applica
CONFLICTS= kdelibs-[0-9]*
# BUILD_MAKE_FLAGS+= VERBOSE=1
-#CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDELibsDependencies.cmake
CMAKE_DEPENDENCIES_REWRITE+= _KDE_build/KDELibsDependenciesInternal.cmake
CMAKE_MODULE_PATH_OVERRIDE+= kjsembed/qtonly/CMakeLists.txt
-CMAKE_ARGS+= -DKDE_DISTRIBUTION_TEXT:STRING="NetBSD pkgsrc"
-CMAKE_ARGS+= -DWITH_Avahi:BOOL=off
-CMAKE_ARGS+= -DWITH_Soprano:BOOL=off
-CMAKE_ARGS+= -DWITH_SharedDesktopOntologies:BOOL=off
+CMAKE_CONFIGURE_ARGS+= -DKDE_DISTRIBUTION_TEXT:STRING="NetBSD pkgsrc"
+CMAKE_CONFIGURE_ARGS+= -DWITH_Avahi:BOOL=off
+CMAKE_CONFIGURE_ARGS+= -DWITH_Soprano:BOOL=off
+CMAKE_CONFIGURE_ARGS+= -DWITH_SharedDesktopOntologies:BOOL=off
-CMAKE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
-CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
+CMAKE_CONFIGURE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
+CMAKE_CONFIGURE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/menus
CONF_FILES+= ${PREFIX}/share/examples/kdelibs4/applications.menu \
Index: pkgsrc/x11/libfm-qt/Makefile
diff -u pkgsrc/x11/libfm-qt/Makefile:1.38 pkgsrc/x11/libfm-qt/Makefile:1.39
--- pkgsrc/x11/libfm-qt/Makefile:1.38 Tue Aug 20 06:19:03 2024
+++ pkgsrc/x11/libfm-qt/Makefile Sun Aug 25 06:19:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2024/08/20 06:19:03 pin Exp $
+# $NetBSD: Makefile,v 1.39 2024/08/25 06:19:19 wiz Exp $
DISTNAME= libfm-qt-2.0.2
CATEGORIES= x11
@@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v2.1 AND modified-bsd
USE_TOOLS+= pkg-config perl
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_PREFIX_PATH:PATH=${PREFIX}/qt6
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_PREFIX_PATH:PATH=${PREFIX}/qt6
PKG_SYSCONFSUBDIR= xdg
Index: pkgsrc/x11/libkactivities4/Makefile
diff -u pkgsrc/x11/libkactivities4/Makefile:1.41 pkgsrc/x11/libkactivities4/Makefile:1.42
--- pkgsrc/x11/libkactivities4/Makefile:1.41 Fri Jun 7 13:46:29 2024
+++ pkgsrc/x11/libkactivities4/Makefile Sun Aug 25 06:19:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2024/06/07 13:46:29 gdt Exp $
+# $NetBSD: Makefile,v 1.42 2024/08/25 06:19:19 wiz Exp $
DISTNAME= kactivities-4.13.3
PKGNAME= libkactivities4-4.13.3
@@ -13,10 +13,10 @@ CONFLICTS+= kactivities<4.13.3nb4
USE_CXX_FEATURES+= c++11
-CMAKE_ARGS+= -DWITH_NepomukCore:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_NepomukCore:BOOL=OFF
# The default MACOSX_DEPLOYMENT_TARGET is incompatible with the C++11 tests.
-CMAKE_ARGS.Darwin+= -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_VERSION}
+CMAKE_CONFIGURE_ARGS.Darwin+= -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_VERSION}
PKGCONFIG_OVERRIDE+= lib/libkactivities.pc.cmake
Index: pkgsrc/x11/lxqt-config/Makefile
diff -u pkgsrc/x11/lxqt-config/Makefile:1.38 pkgsrc/x11/lxqt-config/Makefile:1.39
--- pkgsrc/x11/lxqt-config/Makefile:1.38 Tue Aug 20 06:21:10 2024
+++ pkgsrc/x11/lxqt-config/Makefile Sun Aug 25 06:19:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2024/08/20 06:21:10 pin Exp $
+# $NetBSD: Makefile,v 1.39 2024/08/25 06:19:19 wiz Exp $
DISTNAME= lxqt-config-2.0.0
CATEGORIES= x11
@@ -15,7 +15,7 @@ USE_TOOLS+= pkg-config perl
USE_LANGUAGES= c c++
# Requires xorg-libinput, which we lack in pkgsrc.
-CMAKE_ARGS+= -DWITH_TOUCHPAD=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_TOUCHPAD=OFF
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/x11/lxqt-panel/Makefile
diff -u pkgsrc/x11/lxqt-panel/Makefile:1.49 pkgsrc/x11/lxqt-panel/Makefile:1.50
--- pkgsrc/x11/lxqt-panel/Makefile:1.49 Tue Aug 20 06:22:44 2024
+++ pkgsrc/x11/lxqt-panel/Makefile Sun Aug 25 06:19:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2024/08/20 06:22:44 pin Exp $
+# $NetBSD: Makefile,v 1.50 2024/08/25 06:19:19 wiz Exp $
DISTNAME= lxqt-panel-2.0.1
CATEGORIES= x11
@@ -15,14 +15,14 @@ USE_TOOLS+= pkg-config perl
USE_LANGUAGES= c c++
# Requires libsensors, unavailable in pkgsrc
-CMAKE_ARGS+= -DSENSORS_PLUGIN=No
+CMAKE_CONFIGURE_ARGS+= -DSENSORS_PLUGIN=No
# Requires sysstat-qt6, unavailable in pkgsrc
-CMAKE_ARGS+= -DSYSSTAT_PLUGIN=No
+CMAKE_CONFIGURE_ARGS+= -DSYSSTAT_PLUGIN=No
# Appear non-functional on NetBSD currently.
-CMAKE_ARGS+= -DCPULOAD_PLUGIN=No
-CMAKE_ARGS+= -DMOUNT_PLUGIN=No
+CMAKE_CONFIGURE_ARGS+= -DCPULOAD_PLUGIN=No
+CMAKE_CONFIGURE_ARGS+= -DMOUNT_PLUGIN=No
AUTOSTART_CONF= share/examples/autostart
PANEL_CONF= share/examples/lxqt
Index: pkgsrc/x11/lxqt-panel/options.mk
diff -u pkgsrc/x11/lxqt-panel/options.mk:1.2 pkgsrc/x11/lxqt-panel/options.mk:1.3
--- pkgsrc/x11/lxqt-panel/options.mk:1.2 Wed Oct 18 23:03:49 2023
+++ pkgsrc/x11/lxqt-panel/options.mk Sun Aug 25 06:19:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/10/18 23:03:49 bacon Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:19:19 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.lxqt-panel
PKG_SUPPORTED_OPTIONS= alsa pulseaudio
@@ -8,15 +8,15 @@ PKG_SUGGESTED_OPTIONS.NetBSD= pulseaudio
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CMAKE_ARGS+= -DVOLUME_USE_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DVOLUME_USE_ALSA=ON
. include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DVOLUME_USE_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DVOLUME_USE_ALSA=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -DVOLUME_USE_PULSEAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DVOLUME_USE_PULSEAUDIO=ON
. include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DVOLUME_USE_PULSEAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DVOLUME_USE_PULSEAUDIO=OFF
.endif
Index: pkgsrc/x11/lxqt-session/options.mk
diff -u pkgsrc/x11/lxqt-session/options.mk:1.1 pkgsrc/x11/lxqt-session/options.mk:1.2
--- pkgsrc/x11/lxqt-session/options.mk:1.1 Sat Jul 22 08:46:23 2023
+++ pkgsrc/x11/lxqt-session/options.mk Sun Aug 25 06:19:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/07/22 08:46:23 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/25 06:19:20 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.lxqt-session
PKG_SUPPORTED_OPTIONS= udev
@@ -8,5 +8,5 @@ PKG_SUPPORTED_OPTIONS= udev
.if !empty(PKG_OPTIONS:Mudev)
. include "../../sysutils/libudev/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_LIBUDEV=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_LIBUDEV=OFF
.endif
Index: pkgsrc/x11/maim/Makefile
diff -u pkgsrc/x11/maim/Makefile:1.21 pkgsrc/x11/maim/Makefile:1.22
--- pkgsrc/x11/maim/Makefile:1.21 Thu Jun 27 14:50:26 2024
+++ pkgsrc/x11/maim/Makefile Sun Aug 25 06:19:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2024/06/27 14:50:26 ktnb Exp $
+# $NetBSD: Makefile,v 1.22 2024/08/25 06:19:20 wiz Exp $
DISTNAME= maim-5.8.0
CATEGORIES= x11
@@ -15,7 +15,7 @@ USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
FORCE_CXX_STD= c++17
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
.include "../../graphics/glm/buildlink3.mk"
.include "../../graphics/libwebp/buildlink3.mk"
Index: pkgsrc/x11/qt4-tools/buildlink3.mk
diff -u pkgsrc/x11/qt4-tools/buildlink3.mk:1.45 pkgsrc/x11/qt4-tools/buildlink3.mk:1.46
--- pkgsrc/x11/qt4-tools/buildlink3.mk:1.45 Sun Nov 12 13:24:23 2023
+++ pkgsrc/x11/qt4-tools/buildlink3.mk Sun Aug 25 06:19:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.45 2023/11/12 13:24:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.46 2024/08/25 06:19:20 wiz Exp $
BUILDLINK_TREE+= qt4-tools
@@ -16,8 +16,8 @@ CONFIGURE_ENV+= UIC="${QTDIR}/bin/uic"
MAKE_ENV+= UIC="${QTDIR}/bin/uic"
CONFIGURE_ENV+= QMAKE="${QTDIR}/bin/qmake"
MAKE_ENV+= QMAKE="${QTDIR}/bin/qmake"
-CMAKE_ARGS+= -DQT_UIC_EXECUTABLE=${QTDIR}/bin/uic
-CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE=${QTDIR}/bin/qmake
+CMAKE_CONFIGURE_ARGS+= -DQT_UIC_EXECUTABLE=${QTDIR}/bin/uic
+CMAKE_CONFIGURE_ARGS+= -DQT_QMAKE_EXECUTABLE=${QTDIR}/bin/qmake
# the way the spec files are currently instealled via pkgsrc, they
# are all identical anyway, so just pick one and point to it.
Index: pkgsrc/x11/qt5-qtwebkit/Makefile
diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.123 pkgsrc/x11/qt5-qtwebkit/Makefile:1.124
--- pkgsrc/x11/qt5-qtwebkit/Makefile:1.123 Wed May 29 16:35:13 2024
+++ pkgsrc/x11/qt5-qtwebkit/Makefile Sun Aug 25 06:19:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2024/05/29 16:35:13 adam Exp $
+# $NetBSD: Makefile,v 1.124 2024/08/25 06:19:20 wiz Exp $
QTWKVERSION= 5.212.0-alpha4
DISTNAME= qtwebkit-${QTWKVERSION}
@@ -28,18 +28,18 @@ TEST_TARGET= test
# Source/JavaScriptCore/offlineasm/parser.rb:587:in `block in parseSequence': undefined method `=~'
RUBY_VERSIONS_ACCEPTED= 31
-CMAKE_ARGS+= -DPORT=Qt
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DENABLE_API_TESTS=OFF
-CMAKE_ARGS+= -DENABLE_TOOLS=OFF
-CMAKE_ARGS+= -DKDE_INSTALL_LIBEXECDIR=${QTDIR}/libexec
-CMAKE_ARGS+= -DSHARED_CORE=ON
-CMAKE_ARGS+= -DUSE_LD_GOLD=OFF
-CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC=ON
+CMAKE_CONFIGURE_ARGS+= -DPORT=Qt
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DENABLE_API_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TOOLS=OFF
+CMAKE_CONFIGURE_ARGS+= -DKDE_INSTALL_LIBEXECDIR=${QTDIR}/libexec
+CMAKE_CONFIGURE_ARGS+= -DSHARED_CORE=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_LD_GOLD=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_MALLOC=ON
# for Darwin
-CMAKE_ARGS+= -DMACOS_BUILD_FRAMEWORKS=OFF
-CMAKE_ARGS+= -DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF
-CMAKE_ARGS+= -DMACOS_USE_SYSTEM_ICU=OFF
+CMAKE_CONFIGURE_ARGS+= -DMACOS_BUILD_FRAMEWORKS=OFF
+CMAKE_CONFIGURE_ARGS+= -DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF
+CMAKE_CONFIGURE_ARGS+= -DMACOS_USE_SYSTEM_ICU=OFF
UNLIMIT_RESOURCES+= cputime
@@ -75,7 +75,7 @@ LDFLAGS+= -Wl,--no-keep-memory
.endif
.if ${OPSYS} == "SunOS"
-CMAKE_ARGS+= -DUSE_LINKER_VERSION_SCRIPT=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_LINKER_VERSION_SCRIPT=OFF
LDFLAGS+= -lsocket -lnsl
.endif
Index: pkgsrc/x11/qterminal/Makefile
diff -u pkgsrc/x11/qterminal/Makefile:1.34 pkgsrc/x11/qterminal/Makefile:1.35
--- pkgsrc/x11/qterminal/Makefile:1.34 Tue Aug 20 06:24:47 2024
+++ pkgsrc/x11/qterminal/Makefile Sun Aug 25 06:19:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2024/08/20 06:24:47 pin Exp $
+# $NetBSD: Makefile,v 1.35 2024/08/25 06:19:20 wiz Exp $
DISTNAME= qterminal-2.0.1
CATEGORIES= x11
@@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2
USE_TOOLS+= pkg-config perl
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_PREFIX_PATH:PATH=${PREFIX}/qt6
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_PREFIX_PATH:PATH=${PREFIX}/qt6
TOOL_DEPENDS+= lxqt-build-tools>=2.0.0:../../devel/lxqt-build-tools
TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
Index: pkgsrc/x11/read-edid/Makefile
diff -u pkgsrc/x11/read-edid/Makefile:1.1 pkgsrc/x11/read-edid/Makefile:1.2
--- pkgsrc/x11/read-edid/Makefile:1.1 Sat Apr 22 00:58:05 2023
+++ pkgsrc/x11/read-edid/Makefile Sun Aug 25 06:19:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2023/04/22 00:58:05 manu Exp $
+# $NetBSD: Makefile,v 1.2 2024/08/25 06:19:20 wiz Exp $
DISTNAME= read-edid-3.0.2
CATEGORIES= x11
@@ -11,8 +11,8 @@ LICENSE= 2-clause-bsd
USE_LANGUAGES+= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DCLASSICBUILD=OFF
-CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DCLASSICBUILD=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}${PKGMANDIR}
CONFIGURE_ENV+= X86_LIBRARY=/usr/lib/libx86_64.so
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/slim/options.mk
diff -u pkgsrc/x11/slim/options.mk:1.2 pkgsrc/x11/slim/options.mk:1.3
--- pkgsrc/x11/slim/options.mk:1.2 Tue Jun 22 08:29:36 2021
+++ pkgsrc/x11/slim/options.mk Sun Aug 25 06:19:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2021/06/22 08:29:36 nia Exp $
+# $NetBSD: options.mk,v 1.3 2024/08/25 06:19:20 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.slim
PKG_SUPPORTED_OPTIONS= consolekit
@@ -11,7 +11,7 @@ PKG_SUGGESTED_OPTIONS=
#
.if !empty(PKG_OPTIONS:Mconsolekit)
.include "../../sysutils/consolekit/buildlink3.mk"
-CMAKE_ARGS= -DUSE_CONSOLEKIT:Bool=Yes
+CMAKE_CONFIGURE_ARGS= -DUSE_CONSOLEKIT:Bool=Yes
.else
-CMAKE_ARGS= -DUSE_CONSOLEKIT:Bool=No
+CMAKE_CONFIGURE_ARGS= -DUSE_CONSOLEKIT:Bool=No
.endif
Index: pkgsrc/x11/slop/Makefile
diff -u pkgsrc/x11/slop/Makefile:1.19 pkgsrc/x11/slop/Makefile:1.20
--- pkgsrc/x11/slop/Makefile:1.19 Sun Jun 2 14:30:01 2024
+++ pkgsrc/x11/slop/Makefile Sun Aug 25 06:19:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/06/02 14:30:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2024/08/25 06:19:20 wiz Exp $
DISTNAME= slop-7.5
PKGREVISION= 9
@@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
FORCE_CXX_STD= c++17
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
.include "../../graphics/glew/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
Index: pkgsrc/x11/tint2/Makefile
diff -u pkgsrc/x11/tint2/Makefile:1.77 pkgsrc/x11/tint2/Makefile:1.78
--- pkgsrc/x11/tint2/Makefile:1.77 Wed May 29 16:35:15 2024
+++ pkgsrc/x11/tint2/Makefile Sun Aug 25 06:19:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2024/05/29 16:35:15 adam Exp $
+# $NetBSD: Makefile,v 1.78 2024/08/25 06:19:21 wiz Exp $
DISTNAME= tint2-v17.0.2
PKGNAME= ${DISTNAME:S/-v/-/}
@@ -28,8 +28,8 @@ OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/tint2
CONF_FILES= ${PREFIX}/share/examples/tint2/tint2rc \
${PKG_SYSCONFDIR}/xdg/tint2/tint2rc
-CMAKE_ARGS.Linux= -DENABLE_BATTERY=ON
-CMAKE_ARGS.*= -DENABLE_BATTERY=OFF
+CMAKE_CONFIGURE_ARGS.Linux= -DENABLE_BATTERY=ON
+CMAKE_CONFIGURE_ARGS.*= -DENABLE_BATTERY=OFF
CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
CFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int32_t=uint32_t -Du_int64_t=uint64_t
Index: pkgsrc/x11/wxGTK32/Makefile
diff -u pkgsrc/x11/wxGTK32/Makefile:1.43 pkgsrc/x11/wxGTK32/Makefile:1.44
--- pkgsrc/x11/wxGTK32/Makefile:1.43 Sun Jul 7 12:07:06 2024
+++ pkgsrc/x11/wxGTK32/Makefile Sun Aug 25 06:19:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2024/07/07 12:07:06 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2024/08/25 06:19:21 wiz Exp $
DISTNAME= wxWidgets-3.2.5
PKGNAME= ${DISTNAME:S/wxWidgets/wxGTK32/}
@@ -49,11 +49,11 @@ PKG_SUPPORTED_OPTIONS= cmake
PLIST_SRC+= PLIST.cmake
-CMAKE_ARGS+= -DCMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON
-CMAKE_ARGS+= -DCMAKE_INSTALL_BINDIR:PATH=libexec/wx-3.2
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_BINDIR:PATH=libexec/wx-3.2
. if ${OPSYS} != "Linux"
# https://github.com/wxWidgets/wxWidgets/issues/22646
-CMAKE_ARGS+= -DwxUSE_JOYSTICK:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DwxUSE_JOYSTICK:BOOL=OFF
. endif
SUBST_CLASSES+= unwrap
Index: pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile
diff -u pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile:1.59 pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile:1.60
--- pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile:1.59 Sun Apr 7 07:35:32 2024
+++ pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile Sun Aug 25 06:19:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2024/04/07 07:35:32 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2024/08/25 06:19:21 wiz Exp $
VERSION= 2.8.3
DISTNAME= xfce4-whiskermenu-plugin-${VERSION}
@@ -18,9 +18,9 @@ USE_TOOLS+= gmake pkg-config msgfmt perl
# AccountsService is an optional dependency; the version in pkgsrc is too old
# at present.
-CMAKE_ARGS+= -DENABLE_ACCOUNTS_SERVICE=No
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ACCOUNTS_SERVICE=No
# Wayland support not relevant yet.
-CMAKE_ARGS+= -DENABLE_GTK_LAYER_SHELL=No
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GTK_LAYER_SHELL=No
BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--as-needed
BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-O1
Index: pkgsrc/x11/xss-lock/Makefile
diff -u pkgsrc/x11/xss-lock/Makefile:1.6 pkgsrc/x11/xss-lock/Makefile:1.7
--- pkgsrc/x11/xss-lock/Makefile:1.6 Thu Aug 1 18:50:45 2024
+++ pkgsrc/x11/xss-lock/Makefile Sun Aug 25 06:19:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2024/08/01 18:50:45 vins Exp $
+# $NetBSD: Makefile,v 1.7 2024/08/25 06:19:21 wiz Exp $
DISTNAME= 1e158fb20108
PKGNAME= xss-lock-0.3.0
@@ -28,8 +28,8 @@ SUBST_FILES.doc= doc/CMakeLists.txt
SUBST_SED.doc= -e 's,rst2man.py,rst2man-${PYVERSSUFFIX},g'
USE_CMAKE= yes
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
WRKSRC= ${WRKDIR}/raymonad-xss-lock-${DISTNAME}
Home |
Main Index |
Thread Index |
Old Index