CVS commit: pkgsrc/ham

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/ham
From: "Greg Troxel" <gdt%netbsd.org@localhost>
Date: Tue, 20 Aug 2024 17:46:19 +0000

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Aug 20 17:46:19 UTC 2024

Modified Files:
        pkgsrc/ham/gnuradio-channels: Makefile
        pkgsrc/ham/gnuradio-companion: Makefile
        pkgsrc/ham/gnuradio-core: Makefile Makefile.common options.mk
        pkgsrc/ham/gnuradio-ctrlport: Makefile
        pkgsrc/ham/gnuradio-digital: Makefile
        pkgsrc/ham/gnuradio-doxygen: Makefile
        pkgsrc/ham/gnuradio-dtv: Makefile
        pkgsrc/ham/gnuradio-fec: Makefile
        pkgsrc/ham/gnuradio-network: Makefile
        pkgsrc/ham/gnuradio-pdu: Makefile
        pkgsrc/ham/gnuradio-qtgui: Makefile
        pkgsrc/ham/gnuradio-soapy-sdr: Makefile
        pkgsrc/ham/gnuradio-trellis: Makefile
        pkgsrc/ham/gnuradio-uhd: Makefile
        pkgsrc/ham/gnuradio-utils: Makefile
        pkgsrc/ham/gnuradio-video-sdl: Makefile
        pkgsrc/ham/gnuradio-vocoder: Makefile
        pkgsrc/ham/gnuradio-wavelet: Makefile
        pkgsrc/ham/gnuradio-zeromq: Makefile

Log Message:
gnuradio*: USE_CMAKE exorcism

  - change to cmake/build.mk
  - set CMAKE_CONFIGURE_ARGS instead of CMAKE_ARGS
  - stop creating/using a build dir manually and don't override install
  - comment out the "don't use ninja" arm, since that happens
    naturally and the ninja option should be removed

Tested by building meta-pkgs/gnuradio on NetBSD 10.

ok @tnn


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/ham/gnuradio-channels/Makefile
cvs rdiff -u -r1.82 -r1.83 pkgsrc/ham/gnuradio-companion/Makefile
cvs rdiff -u -r1.125 -r1.126 pkgsrc/ham/gnuradio-core/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/ham/gnuradio-core/Makefile.common
cvs rdiff -u -r1.11 -r1.12 pkgsrc/ham/gnuradio-core/options.mk
cvs rdiff -u -r1.64 -r1.65 pkgsrc/ham/gnuradio-ctrlport/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/ham/gnuradio-digital/Makefile
cvs rdiff -u -r1.84 -r1.85 pkgsrc/ham/gnuradio-doxygen/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/ham/gnuradio-dtv/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/ham/gnuradio-fec/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/ham/gnuradio-network/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/ham/gnuradio-pdu/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/ham/gnuradio-qtgui/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/ham/gnuradio-soapy-sdr/Makefile
cvs rdiff -u -r1.82 -r1.83 pkgsrc/ham/gnuradio-trellis/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/ham/gnuradio-uhd/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/ham/gnuradio-utils/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/ham/gnuradio-video-sdl/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/ham/gnuradio-vocoder/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/ham/gnuradio-wavelet/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/ham/gnuradio-zeromq/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/ham/gnuradio-channels/Makefile
diff -u pkgsrc/ham/gnuradio-channels/Makefile:1.63 pkgsrc/ham/gnuradio-channels/Makefile:1.64
--- pkgsrc/ham/gnuradio-channels/Makefile:1.63  Tue Jul 16 10:02:01 2024
+++ pkgsrc/ham/gnuradio-channels/Makefile       Tue Aug 20 17:46:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2024/07/16 10:02:01 prlw1 Exp $
+# $NetBSD: Makefile,v 1.64 2024/08/20 17:46:17 gdt Exp $
 
 PKGNAME=       gnuradio-channels-${VERSION}
 PKGREVISION=   4
@@ -7,9 +7,9 @@ COMMENT=        Signal processing blocks to sim
 .include "../../ham/gnuradio-core/Makefile.common"
 .include "../../ham/gnuradio-core/Nocore.mk"
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_CHANNELS=ON
-CMAKE_ARGS+=   -DENABLE_GRC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_CHANNELS=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
 
 PLIST_MINUS+=  companion
 

Index: pkgsrc/ham/gnuradio-companion/Makefile
diff -u pkgsrc/ham/gnuradio-companion/Makefile:1.82 pkgsrc/ham/gnuradio-companion/Makefile:1.83
--- pkgsrc/ham/gnuradio-companion/Makefile:1.82 Tue Jul 16 10:02:01 2024
+++ pkgsrc/ham/gnuradio-companion/Makefile      Tue Aug 20 17:46:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2024/07/16 10:02:01 prlw1 Exp $
+# $NetBSD: Makefile,v 1.83 2024/08/20 17:46:17 gdt Exp $
 
 PKGNAME=       gnuradio-companion-${VERSION}
 PKGREVISION=   4
@@ -13,8 +13,8 @@ REPLACE_BASH= grc/scripts/freedesktop/gr
 .include "../../ham/gnuradio-core/Nocore.mk"
 
 # gnuradio-companion
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GRC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
 
 ICON_THEMES=   yes
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

Index: pkgsrc/ham/gnuradio-core/Makefile
diff -u pkgsrc/ham/gnuradio-core/Makefile:1.125 pkgsrc/ham/gnuradio-core/Makefile:1.126
--- pkgsrc/ham/gnuradio-core/Makefile:1.125     Tue Jul 16 10:02:01 2024
+++ pkgsrc/ham/gnuradio-core/Makefile   Tue Aug 20 17:46:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.125 2024/07/16 10:02:01 prlw1 Exp $
+# $NetBSD: Makefile,v 1.126 2024/08/20 17:46:17 gdt Exp $
 
 PKGNAME=       gnuradio-core-${VERSION}
 PKGREVISION=   4
@@ -19,7 +19,7 @@ PLIST_SRC=    ${PKGDIR}/PLIST ${PKGDIR}/PLI
 .endif
 
 # set default as minimum
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
 
 # Take care CONF_FILES stuff (The same code in Nocore.mk)
 #post-install:

Index: pkgsrc/ham/gnuradio-core/Makefile.common
diff -u pkgsrc/ham/gnuradio-core/Makefile.common:1.51 pkgsrc/ham/gnuradio-core/Makefile.common:1.52
--- pkgsrc/ham/gnuradio-core/Makefile.common:1.51       Tue Nov 14 13:58:35 2023
+++ pkgsrc/ham/gnuradio-core/Makefile.common    Tue Aug 20 17:46:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.51 2023/11/14 13:58:35 wiz Exp $
+# $NetBSD: Makefile.common,v 1.52 2024/08/20 17:46:17 gdt Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
@@ -36,11 +36,12 @@ MAINTAINER?=        pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE?=     https://www.gnu.org/software/gnuradio/
 LICENSE=       gnu-gpl-v3
 
-USE_CMAKE=     yes
 USE_LANGUAGES= c c++
+USE_CXX_FEATURES+=     c++20
+
 USE_TOOLS=     gmake perl pkg-config
 
-USE_CXX_FEATURES+=     c++20
+.include "../../devel/cmake/build.mk"
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -74,8 +75,6 @@ PLIST_SUBST+= PYSITELIB=${PYSITELIB}
 PLIST_SUBST+=  PKGVER_MICRO=${PKGVER_MICRO}
 PY_PATCHPLIST= yes
 
-CONFIGURE_DIRS=        build
-
 EGDIR=                 share/gnuradio/examples
 PKG_SYSCONFSUBDIR=     gnuradio/conf.d
 
@@ -88,37 +87,36 @@ CXXFLAGS.SunOS+=    -pthreads
 
 INSTALLATION_DIRS+=    ${EGDIR}
 
-# --------       R E S E T  CMAKE_ARGS  H E R E  -------------
-CMAKE_ARGS=
+# --------       R E S E T  CMAKE_CONFIGURE_ARGS  H E R E  -------------
+CMAKE_CONFIGURE_ARGS=
 
-CMAKE_ARGS+=   -DENABLE_GNURADIO_RUNTIME=ON
-CMAKE_ARGS+=   -DENABLE_GR_ANALOG=ON
-CMAKE_ARGS+=   -DENABLE_GR_AUDIO=ON
-CMAKE_ARGS+=   -DENABLE_GR_BLOCKS=ON
-CMAKE_ARGS+=   -DENABLE_GR_FFT=ON
-CMAKE_ARGS+=   -DENABLE_GR_FILTER=ON
-CMAKE_ARGS+=   -DENABLE_PYTHON=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GNURADIO_RUNTIME=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_ANALOG=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_AUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_BLOCKS=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_FFT=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_FILTER=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PYTHON=ON
 
-CMAKE_ARGS+=   -DLIB_SUFFIX=""
+CMAKE_CONFIGURE_ARGS+= -DLIB_SUFFIX=""
 
 # Default setting (for pkgsrc)
-CMAKE_ARGS+=   -Wno-dev
-CMAKE_ARGS+=   -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
-CMAKE_ARGS+=   -DCMAKE_INCLUDE_PATH=${PREFIX}/include/portaudio2
-CMAKE_ARGS+=   -DCMAKE_LIBRARY_PATH=${PREFIX}/lib/portaudio2
-CMAKE_ARGS+=   -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
-CMAKE_ARGS+=   -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
-CMAKE_ARGS+=   -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INCLUDE_PATH=${PREFIX}/include/portaudio2
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_LIBRARY_PATH=${PREFIX}/lib/portaudio2
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
+CMAKE_CONFIGURE_ARGS+= -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
 
-CMAKE_ARGS+=   -DGR_LIBRARY_DIR=${PREFIX}/lib
-CMAKE_ARGS+=   -DGR_PREFSDIR=${PREFIX}/share/gnuradio/examples/
+CMAKE_CONFIGURE_ARGS+= -DGR_LIBRARY_DIR=${PREFIX}/lib
+CMAKE_CONFIGURE_ARGS+= -DGR_PREFSDIR=${PREFIX}/share/gnuradio/examples/
 
 # adhoc setup not to pick non default version (say python3.6)
 # at configure
-#CMAKE_ARGS+=  -DPYTHON_EXECUTABLE=${PREFIX}/bin/python${PYVERSSUFFIX}
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_EXECUTABLE=${PREFIX}/bin/python${PYVERSSUFFIX}
 
-CMAKE_ARGS+=   -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
-CMAKE_ARG_PATH=        ../
+CMAKE_CONFIGURE_ARGS+= -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
 
 .include "options.mk"
 
@@ -139,12 +137,6 @@ SUBST_VARS.prefix= PREFIX
 REPLACE_PYTHON=                */*.py */*/*.py */*/*/*.py */*/*/*/*.py */*/*/*/*/*.py \
                        */*/*/*/*/*/*.py */*/*/*/*/*/*/*.py */*/*/*/*/*/*/*/*.py
 
-pre-configure:
-       ${MKDIR} ${WRKSRC}/build
-
-do-install:
-       cd ${WRKSRC}/${BUILD_DIRS} && ${GMAKE} DESTDIR=${DESTDIR} ${INSTALL_TARGET}
-
 .include "../../audio/gsm/buildlink3.mk"
 .include "../../audio/jack/buildlink3.mk"
 .include "../../audio/portaudio/buildlink3.mk"

Index: pkgsrc/ham/gnuradio-core/options.mk
diff -u pkgsrc/ham/gnuradio-core/options.mk:1.11 pkgsrc/ham/gnuradio-core/options.mk:1.12
--- pkgsrc/ham/gnuradio-core/options.mk:1.11    Sun Aug 18 11:50:39 2024
+++ pkgsrc/ham/gnuradio-core/options.mk Tue Aug 20 17:46:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2024/08/18 11:50:39 tnn Exp $
+# $NetBSD: options.mk,v 1.12 2024/08/20 17:46:17 gdt Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gnuradio
 PKG_SUPPORTED_OPTIONS= ninja-build filter-design alsa
@@ -21,8 +21,8 @@ TOOL_DEPENDS+=        ninja-build-[0-9]*:../../
 do-build:
        (cd ${WRKSRC}/build; ninja)
 .else
-do-build:
-       (cd ${WRKSRC}/build; ${BUILD_MAKE_CMD})
+#do-build:
+#      (cd ${WRKSRC}/build; ${BUILD_MAKE_CMD})
 .endif
 
 .if !empty(PKG_OPTIONS:Mfilter-design)

Index: pkgsrc/ham/gnuradio-ctrlport/Makefile
diff -u pkgsrc/ham/gnuradio-ctrlport/Makefile:1.64 pkgsrc/ham/gnuradio-ctrlport/Makefile:1.65
--- pkgsrc/ham/gnuradio-ctrlport/Makefile:1.64  Tue Jul 16 10:02:02 2024
+++ pkgsrc/ham/gnuradio-ctrlport/Makefile       Tue Aug 20 17:46:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2024/07/16 10:02:02 prlw1 Exp $
+# $NetBSD: Makefile,v 1.65 2024/08/20 17:46:17 gdt Exp $
 
 PKGNAME=       gnuradio-ctrlport-${VERSION}
 PKGREVISION=   4
@@ -7,7 +7,7 @@ COMMENT=        New set of hooks into GNU Radio
 .include "../../ham/gnuradio-core/Makefile.common"
 .include "../../ham/gnuradio-core/Nocore.mk"
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_CTRLPORT=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_CTRLPORT=ON
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/ham/gnuradio-digital/Makefile
diff -u pkgsrc/ham/gnuradio-digital/Makefile:1.64 pkgsrc/ham/gnuradio-digital/Makefile:1.65
--- pkgsrc/ham/gnuradio-digital/Makefile:1.64   Tue Jul 16 10:02:02 2024
+++ pkgsrc/ham/gnuradio-digital/Makefile        Tue Aug 20 17:46:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2024/07/16 10:02:02 prlw1 Exp $
+# $NetBSD: Makefile,v 1.65 2024/08/20 17:46:17 gdt Exp $
 
 PKGNAME=       gnuradio-digital-${VERSION}
 PKGREVISION=   4
@@ -9,9 +9,9 @@ COMMENT=        Digital related algorithms for 
 # link to libgnuradio-fft.so.${PKGVERSON_NOREV}
 .include "../../ham/gnuradio-core/buildlink3.mk"
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_DIGITAL=ON
-CMAKE_ARGS+=   -DENABLE_GRC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_DIGITAL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
 
 PLIST_MINUS+=  companion
 

Index: pkgsrc/ham/gnuradio-doxygen/Makefile
diff -u pkgsrc/ham/gnuradio-doxygen/Makefile:1.84 pkgsrc/ham/gnuradio-doxygen/Makefile:1.85
--- pkgsrc/ham/gnuradio-doxygen/Makefile:1.84   Tue Jul 16 10:02:02 2024
+++ pkgsrc/ham/gnuradio-doxygen/Makefile        Tue Aug 20 17:46:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2024/07/16 10:02:02 prlw1 Exp $
+# $NetBSD: Makefile,v 1.85 2024/08/20 17:46:17 gdt Exp $
 
 PKGNAME=       gnuradio-doxygen-${VERSION}
 PKGREVISION=   4
@@ -15,8 +15,8 @@ TOOL_DEPENDS+=        tex-xcolor-[0-9]*:../../p
 TOOL_DEPENDS+= texlive-collection-latex-[0-9]*:../../meta-pkgs/texlive-collection-latex
 TOOL_DEPENDS+= web2c-[0-9]*:../../print/web2c
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_DOXYGEN=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DOXYGEN=ON
 
 # Doxygen output is never reproducible.
 PLIST_SRC=     ${WRKDIR}/PLIST.STATIC

Index: pkgsrc/ham/gnuradio-dtv/Makefile
diff -u pkgsrc/ham/gnuradio-dtv/Makefile:1.66 pkgsrc/ham/gnuradio-dtv/Makefile:1.67
--- pkgsrc/ham/gnuradio-dtv/Makefile:1.66       Tue Jul 16 10:02:02 2024
+++ pkgsrc/ham/gnuradio-dtv/Makefile    Tue Aug 20 17:46:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2024/07/16 10:02:02 prlw1 Exp $
+# $NetBSD: Makefile,v 1.67 2024/08/20 17:46:18 gdt Exp $
 
 PKGNAME=       gnuradio-dtv-${VERSION}
 PKGREVISION=   4
@@ -7,10 +7,10 @@ COMMENT=      Various digital television stan
 .include "../../ham/gnuradio-core/Makefile.common"
 .include "../../ham/gnuradio-core/Nocore.mk"
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_DTV=ON
-CMAKE_ARGS+=   -DENABLE_GR_FEC=ON
-CMAKE_ARGS+=   -DENABLE_GRC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_DTV=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_FEC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
 
 PLIST_MINUS+=  fec companion
 

Index: pkgsrc/ham/gnuradio-fec/Makefile
diff -u pkgsrc/ham/gnuradio-fec/Makefile:1.65 pkgsrc/ham/gnuradio-fec/Makefile:1.66
--- pkgsrc/ham/gnuradio-fec/Makefile:1.65       Tue Jul 16 10:02:02 2024
+++ pkgsrc/ham/gnuradio-fec/Makefile    Tue Aug 20 17:46:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2024/07/16 10:02:02 prlw1 Exp $
+# $NetBSD: Makefile,v 1.66 2024/08/20 17:46:18 gdt Exp $
 
 PKGNAME=       gnuradio-fec-${VERSION}
 PKGREVISION=   4
@@ -7,9 +7,9 @@ COMMENT=        Forward Error Correction blocks
 .include "../../ham/gnuradio-core/Makefile.common"
 .include "../../ham/gnuradio-core/Nocore.mk"
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_FEC=ON
-CMAKE_ARGS+=   -DENABLE_GRC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_FEC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
 
 PLIST_MINUS+=  companion
 

Index: pkgsrc/ham/gnuradio-network/Makefile
diff -u pkgsrc/ham/gnuradio-network/Makefile:1.41 pkgsrc/ham/gnuradio-network/Makefile:1.42
--- pkgsrc/ham/gnuradio-network/Makefile:1.41   Tue Jul 16 10:02:02 2024
+++ pkgsrc/ham/gnuradio-network/Makefile        Tue Aug 20 17:46:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2024/07/16 10:02:02 prlw1 Exp $
+# $NetBSD: Makefile,v 1.42 2024/08/20 17:46:18 gdt Exp $
 
 PKGNAME=       gnuradio-network-${VERSION}
 PKGREVISION=   4
@@ -7,9 +7,9 @@ COMMENT=        Network blocks for GNU Radio
 .include "../../ham/gnuradio-core/Makefile.common"
 .include "../../ham/gnuradio-core/Nocore.mk"
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_NETWORK=ON
-CMAKE_ARGS+=   -DENABLE_GRC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_NETWORK=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
 
 PLIST_MINUS+=  companion
 

Index: pkgsrc/ham/gnuradio-pdu/Makefile
diff -u pkgsrc/ham/gnuradio-pdu/Makefile:1.16 pkgsrc/ham/gnuradio-pdu/Makefile:1.17
--- pkgsrc/ham/gnuradio-pdu/Makefile:1.16       Tue Jul 16 10:02:02 2024
+++ pkgsrc/ham/gnuradio-pdu/Makefile    Tue Aug 20 17:46:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2024/07/16 10:02:02 prlw1 Exp $
+# $NetBSD: Makefile,v 1.17 2024/08/20 17:46:18 gdt Exp $
 
 PKGNAME=       gnuradio-pdu-${VERSION}
 PKGREVISION=   4
@@ -9,9 +9,9 @@ COMMENT=        Protocol Data Units for GNU Rad
 # link to libgnuradio-fft.so.${PKGVERSON_NOREV}
 .include "../../ham/gnuradio-core/buildlink3.mk"
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_PDU=ON
-CMAKE_ARGS+=   -DENABLE_GRC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_PDU=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
 
 PLIST_MINUS+=  companion
 

Index: pkgsrc/ham/gnuradio-qtgui/Makefile
diff -u pkgsrc/ham/gnuradio-qtgui/Makefile:1.78 pkgsrc/ham/gnuradio-qtgui/Makefile:1.79
--- pkgsrc/ham/gnuradio-qtgui/Makefile:1.78     Tue Jul 16 10:02:02 2024
+++ pkgsrc/ham/gnuradio-qtgui/Makefile  Tue Aug 20 17:46:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2024/07/16 10:02:02 prlw1 Exp $
+# $NetBSD: Makefile,v 1.79 2024/08/20 17:46:18 gdt Exp $
 
 PKGNAME=       gnuradio-qtgui-${VERSION}
 PKGREVISION=   4
@@ -11,9 +11,9 @@ DEPENDS+=     ${PYPKGPREFIX}-qt5-[0-9]*:../.
 
 #CONF_FILES+=  ${EGDIR}/gr-qtgui.conf  ${PKG_SYSCONFDIR}/gr-qtgui.conf
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_QTGUI=ON
-CMAKE_ARGS+=   -DENABLE_GRC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_QTGUI=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
 
 PLIST_MINUS+=  companion
 

Index: pkgsrc/ham/gnuradio-soapy-sdr/Makefile
diff -u pkgsrc/ham/gnuradio-soapy-sdr/Makefile:1.36 pkgsrc/ham/gnuradio-soapy-sdr/Makefile:1.37
--- pkgsrc/ham/gnuradio-soapy-sdr/Makefile:1.36 Tue Jul 16 10:02:03 2024
+++ pkgsrc/ham/gnuradio-soapy-sdr/Makefile      Tue Aug 20 17:46:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2024/07/16 10:02:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.37 2024/08/20 17:46:18 gdt Exp $
 
 PKGNAME=       gnuradio-soapy-sdr-${VERSION}
 PKGREVISION=   4
@@ -7,9 +7,9 @@ COMMENT=        GNU Radio bindings for SoapySDR
 .include "../../ham/gnuradio-core/Makefile.common"
 .include "../../ham/gnuradio-core/Nocore.mk"
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_SOAPY=ON
-CMAKE_ARGS+=   -DENABLE_GRC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_SOAPY=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
 
 PLIST_MINUS+=  companion
 

Index: pkgsrc/ham/gnuradio-trellis/Makefile
diff -u pkgsrc/ham/gnuradio-trellis/Makefile:1.82 pkgsrc/ham/gnuradio-trellis/Makefile:1.83
--- pkgsrc/ham/gnuradio-trellis/Makefile:1.82   Tue Jul 16 10:02:03 2024
+++ pkgsrc/ham/gnuradio-trellis/Makefile        Tue Aug 20 17:46:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2024/07/16 10:02:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.83 2024/08/20 17:46:18 gdt Exp $
 
 PKGNAME=       gnuradio-trellis-${VERSION}
 PKGREVISION=   4
@@ -7,10 +7,10 @@ COMMENT=      Trellis-based encoding and deco
 .include "../../ham/gnuradio-core/Makefile.common"
 .include "../../ham/gnuradio-core/Nocore.mk"
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_TRELLIS=ON
-CMAKE_ARGS+=   -DENABLE_GR_DIGITAL=ON
-CMAKE_ARGS+=   -DENABLE_GRC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_TRELLIS=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_DIGITAL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
 
 DEPENDS+=      gnuradio-digital-[0-9]*:../../ham/gnuradio-digital
 DEPENDS+=      xmlto-[0-9]*:../../textproc/xmlto

Index: pkgsrc/ham/gnuradio-uhd/Makefile
diff -u pkgsrc/ham/gnuradio-uhd/Makefile:1.66 pkgsrc/ham/gnuradio-uhd/Makefile:1.67
--- pkgsrc/ham/gnuradio-uhd/Makefile:1.66       Tue Jul 16 10:02:03 2024
+++ pkgsrc/ham/gnuradio-uhd/Makefile    Tue Aug 20 17:46:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2024/07/16 10:02:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.67 2024/08/20 17:46:18 gdt Exp $
 
 PKGNAME=       gnuradio-uhd-${VERSION}
 PKGREVISION=   4
@@ -7,10 +7,10 @@ COMMENT=      Uhd-based encoding and decoding
 .include "../../ham/gnuradio-core/Makefile.common"
 .include "../../ham/gnuradio-core/Nocore.mk"
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_UHD=ON
-CMAKE_ARGS+=   -DENABLE_PYTHON=ON
-CMAKE_ARGS+=   -DENABLE_GRC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_UHD=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PYTHON=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
 
 PLIST_MINUS+=  companion
 
@@ -19,8 +19,8 @@ PLIST_MINUS+= companion
 # the .so causes problems on Darwin.  I've also set UHD_DIR in
 # the uhd buildlink3.mk file, so it finds the buildlink header files.
 
-CMAKE_ARGS+=   -DUHD_LIBRARIES=${PREFIX}/lib/libuhd.so
-CMAKE_ARGS+=   -DUHD_INCLUDE_DIRS=${PREFIX}/include/uhd/usrp
+CMAKE_CONFIGURE_ARGS+= -DUHD_LIBRARIES=${PREFIX}/lib/libuhd.so
+CMAKE_CONFIGURE_ARGS+= -DUHD_INCLUDE_DIRS=${PREFIX}/include/uhd/usrp
 .endif
 
 .include "../../ham/uhd/buildlink3.mk"

Index: pkgsrc/ham/gnuradio-utils/Makefile
diff -u pkgsrc/ham/gnuradio-utils/Makefile:1.68 pkgsrc/ham/gnuradio-utils/Makefile:1.69
--- pkgsrc/ham/gnuradio-utils/Makefile:1.68     Tue Jul 16 10:02:03 2024
+++ pkgsrc/ham/gnuradio-utils/Makefile  Tue Aug 20 17:46:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2024/07/16 10:02:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.69 2024/08/20 17:46:19 gdt Exp $
 
 PKGNAME=       gnuradio-utils-${VERSION}
 PKGREVISION=   4
@@ -16,9 +16,9 @@ DEPENDS+=     ${PYPKGPREFIX}-yaml-[0-9]*:../
 
 #CONF_FILES+=  ${EGDIR}/modtool.conf   ${PKG_SYSCONFDIR}/modtool.conf
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_BLOCKTOOL=ON
-CMAKE_ARGS+=   -DENABLE_GR_MODTOOL=ON
-CMAKE_ARGS+=   -DENABLE_GR_UTILS=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_BLOCKTOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_MODTOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_UTILS=ON
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/ham/gnuradio-video-sdl/Makefile
diff -u pkgsrc/ham/gnuradio-video-sdl/Makefile:1.79 pkgsrc/ham/gnuradio-video-sdl/Makefile:1.80
--- pkgsrc/ham/gnuradio-video-sdl/Makefile:1.79 Tue Jul 16 10:02:03 2024
+++ pkgsrc/ham/gnuradio-video-sdl/Makefile      Tue Aug 20 17:46:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2024/07/16 10:02:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.80 2024/08/20 17:46:19 gdt Exp $
 
 PKGNAME=       gnuradio-video-sdl-${VERSION}
 PKGREVISION=   4
@@ -7,10 +7,10 @@ COMMENT=      SDL (Simple DirectMedia Layer) 
 .include "../../ham/gnuradio-core/Makefile.common"
 .include "../../ham/gnuradio-core/Nocore.mk"
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_VIDEO_SDL=ON
-CMAKE_ARGS+=   -DSDL_INCLUDE_DIR=${PREFIX}/include/SDL
-CMAKE_ARGS+=   -DENABLE_GRC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_VIDEO_SDL=ON
+CMAKE_CONFIGURE_ARGS+= -DSDL_INCLUDE_DIR=${PREFIX}/include/SDL
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
 
 PLIST_MINUS+=  companion
 

Index: pkgsrc/ham/gnuradio-vocoder/Makefile
diff -u pkgsrc/ham/gnuradio-vocoder/Makefile:1.64 pkgsrc/ham/gnuradio-vocoder/Makefile:1.65
--- pkgsrc/ham/gnuradio-vocoder/Makefile:1.64   Tue Jul 16 10:02:03 2024
+++ pkgsrc/ham/gnuradio-vocoder/Makefile        Tue Aug 20 17:46:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2024/07/16 10:02:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.65 2024/08/20 17:46:19 gdt Exp $
 
 PKGNAME=       gnuradio-vocoder-${VERSION}
 PKGREVISION=   4
@@ -7,9 +7,9 @@ COMMENT=        All available vocoders in GNU R
 .include "../../ham/gnuradio-core/Makefile.common"
 .include "../../ham/gnuradio-core/Nocore.mk"
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_VOCODER=ON
-CMAKE_ARGS+=   -DENABLE_GRC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_VOCODER=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
 
 PLIST_MINUS+=  companion
 

Index: pkgsrc/ham/gnuradio-wavelet/Makefile
diff -u pkgsrc/ham/gnuradio-wavelet/Makefile:1.63 pkgsrc/ham/gnuradio-wavelet/Makefile:1.64
--- pkgsrc/ham/gnuradio-wavelet/Makefile:1.63   Tue Jul 16 10:02:03 2024
+++ pkgsrc/ham/gnuradio-wavelet/Makefile        Tue Aug 20 17:46:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2024/07/16 10:02:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.64 2024/08/20 17:46:19 gdt Exp $
 
 PKGNAME=       gnuradio-wavelet-${VERSION}
 PKGREVISION=   4
@@ -7,8 +7,8 @@ COMMENT=        Wavelet transform of GNU Radio
 .include "../../ham/gnuradio-core/Makefile.common"
 .include "../../ham/gnuradio-core/Nocore.mk"
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_WAVELET=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_WAVELET=ON
 
 .include "../../math/gsl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/ham/gnuradio-zeromq/Makefile
diff -u pkgsrc/ham/gnuradio-zeromq/Makefile:1.66 pkgsrc/ham/gnuradio-zeromq/Makefile:1.67
--- pkgsrc/ham/gnuradio-zeromq/Makefile:1.66    Tue Jul 16 10:02:03 2024
+++ pkgsrc/ham/gnuradio-zeromq/Makefile Tue Aug 20 17:46:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2024/07/16 10:02:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.67 2024/08/20 17:46:19 gdt Exp $
 
 PKGNAME=       gnuradio-zeromq-${VERSION}
 PKGREVISION=   4
@@ -7,10 +7,10 @@ COMMENT=      All of the zeromq blocks, utili
 .include "../../ham/gnuradio-core/Makefile.common"
 .include "../../ham/gnuradio-core/Nocore.mk"
 
-CMAKE_ARGS+=   -DENABLE_DEFAULT=OFF
-CMAKE_ARGS+=   -DENABLE_GR_ZEROMQ=ON
-CMAKE_ARGS+=   -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
-CMAKE_ARGS+=   -DENABLE_GRC=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_ZEROMQ=ON
+CMAKE_CONFIGURE_ARGS+= -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
 
 PLIST_MINUS+=  companion

Prev by Date: CVS commit: pkgsrc/ham/uhd
Next by Date: CVS commit: pkgsrc/ham/gnuradio-core
Previous by Thread: CVS commit: pkgsrc/ham/uhd
Next by Thread: CVS commit: pkgsrc/ham/gnuradio-core
Indexes:

Home | Main Index | Thread Index | Old Index