CVS commit: pkgsrc/ham/gr-osmosdr

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Mar  5 18:29:29 UTC 2025

Modified Files:
        pkgsrc/ham/gr-osmosdr: Makefile PLIST

Log Message:
ham/gr-osmosdr: Catch up with probably setuptools changes

This failed to build because PLIST has .pyc/.pyo, and now only .py is
installed.  I'm guessing that's due to changes in python tooling, and
that it's not wrong to not install compiled files.  Observed on NetBSD
10 amd64 with up-to-date pkgsrc HEAD.

Drop REPLACE_PYTHON because the build system does it already, so the
pkgsrc workaround is not needed.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/ham/gr-osmosdr/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/ham/gr-osmosdr/PLIST

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

Modified files:

Index: pkgsrc/ham/gr-osmosdr/Makefile
diff -u pkgsrc/ham/gr-osmosdr/Makefile:1.61 pkgsrc/ham/gr-osmosdr/Makefile:1.62
--- pkgsrc/ham/gr-osmosdr/Makefile:1.61 Wed Feb 12 06:45:14 2025
+++ pkgsrc/ham/gr-osmosdr/Makefile      Wed Mar  5 18:29:29 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2025/02/12 06:45:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.62 2025/03/05 18:29:29 gdt Exp $
 
 DISTNAME=      gr-osmosdr-0.2.6
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    ham
 # main git repo doesn't allow snapshots to be downloaded
 #MASTER_SITES= https://git.osmocom.org/gr-osmosdr/snapshot/
@@ -16,9 +16,10 @@ LICENSE=     gnu-gpl-v2
 # for docs/doxygen/update_pydoc.py
 TOOL_DEPENDS+=         ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
-USE_CXX_FEATURES=      c++11 filesystem
 USE_LANGUAGES=         c c++
+USE_CXX_FEATURES=      c++11 filesystem
 
+.include "../../devel/cmake/build.mk"
 # Suppress warning for developer
 CMAKE_CONFIGURE_ARGS+= -Wno-dev
 # TODO: make it PKG_OPTION
@@ -27,12 +28,9 @@ CMAKE_CONFIGURE_ARGS+=       -Dpybind11_DIR=${
 
 PLIST_SUBST+=  PYSITELIB=${PYSITELIB}
 
-REPLACE_PYTHON+=               apps/osmocom_siggen_base.py
-
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/cmake/build.mk"
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../devel/orc/buildlink3.mk"
 .include "../../devel/py-pybind11/buildlink3.mk"

Index: pkgsrc/ham/gr-osmosdr/PLIST
diff -u pkgsrc/ham/gr-osmosdr/PLIST:1.3 pkgsrc/ham/gr-osmosdr/PLIST:1.4
--- pkgsrc/ham/gr-osmosdr/PLIST:1.3     Wed Apr  7 16:14:09 2021
+++ pkgsrc/ham/gr-osmosdr/PLIST Wed Mar  5 18:29:29 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2021/04/07 16:14:09 tnn Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/03/05 18:29:29 gdt Exp $
 bin/osmocom_fft
 bin/osmocom_siggen_nogui
 include/osmosdr/api.h
@@ -15,11 +15,7 @@ lib/libgnuradio-osmosdr.so
 lib/libgnuradio-osmosdr.so.0.2.0
 lib/libgnuradio-osmosdr.so.0.2.0.0
 ${PYSITELIB}/osmosdr/__init__.py
-${PYSITELIB}/osmosdr/__init__.pyc
-${PYSITELIB}/osmosdr/__init__.pyo
 ${PYSITELIB}/osmosdr/osmocom_siggen_base.py
-${PYSITELIB}/osmosdr/osmocom_siggen_base.pyc
-${PYSITELIB}/osmosdr/osmocom_siggen_base.pyo
 ${PYSITELIB}/osmosdr/osmosdr_python.so
 share/gnuradio/grc/blocks/osmosdr_sink.block.yml
 share/gnuradio/grc/blocks/osmosdr_source.block.yml