 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.23 2020/01/18 23:32:39 rillig Exp $
+# $NetBSD: Makefile.common,v 1.24 2020/05/19 13:58:24 joerg Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
 # used by ham/gnuradio-atsc/Makefile
 # used by ham/gnuradio-channels/Makefile
 # used by ham/gnuradio-companion/Makefile
 # used by ham/gnuradio-core/Makefile
 # used by ham/gnuradio-ctrlport/Makefile
 # used by ham/gnuradio-digital/Makefile
 # used by ham/gnuradio-doxygen/Makefile
 # used by ham/gnuradio-dtv/Makefile
 # used by ham/gnuradio-fcd/Makefile
 @@ -114,34 +114,34 @@ CMAKE_ARG_PATH=	../
 SUBST_CLASSES+=		alsa
 SUBST_MESSAGE.alsa=	Arrange the patched line depepending on alsa is in PKG_OPTIONS or not
 SUBST_FILES.alsa+=	gr-audio/lib/CMakeLists.txt
 ## The value of ${ALSA_ENABLED} is either '#' or '' by options.mk.
 SUBST_SED.alsa=		-e 's,@@ALSA@@,${ALSA_ENABLED},'
 SUBST_STAGE.alsa=	pre-configure
 SUBST_CLASSES+=		pyvers
 SUBST_FILES.pyvers=	cmake/Modules/FindSphinx.cmake
 SUBST_MESSAGE.pyvers=	Fix SPHINX_EXECUTABLE NAMES(sphinx-build)
 SUBST_VARS.pyvers+=	PYVERSSUFFIX
 SUBST_STAGE.pyvers=	pre-configure
-# REPLACE_PYTHON is some 600 files
+REPLACE_PYTHON = 	*/*.py */*/*.py */*/*/*.py */*/*/*/*.py */*/*/*/*/*.py \
-.include	"../../ham/gnuradio-core/files/REPLACE_PYTHON"
+			*/*/*/*/*/*/*.py */*/*/*/*/*/*/*.py */*/*/*/*/*/*/*/*.py
 pre-configure:
-	(${MKDIR} ${WRKSRC}/build;)
+	${MKDIR} ${WRKSRC}/build
 do-install:
-	(cd ${WRKSRC}/build; ${GMAKE} DESTDIR=${DESTDIR} install)
+	cd ${WRKSRC}/${BUILD_DIRS} && ${GMAKE} DESTDIR=${DESTDIR} install
 .include	"../../audio/gsm/buildlink3.mk"
 .include	"../../audio/jack/buildlink3.mk"
 .include	"../../audio/portaudio/buildlink3.mk"
 .include	"../../devel/boost-headers/buildlink3.mk"
 .include	"../../devel/boost-libs/buildlink3.mk"
 .include	"../../devel/cppunit/buildlink3.mk"
 # VOLK needs orc.h, so in the common
 .include	"../../devel/orc/buildlink3.mk"
 .include	"../../devel/swig2/buildlink3.mk"
 .include	"../../lang/python/application.mk"

 @@ -1,38 +1,38 @@
-# $NetBSD: options.mk,v 1.5 2019/11/03 19:32:07 rillig Exp $
+# $NetBSD: options.mk,v 1.6 2020/05/19 13:58:24 joerg Exp $
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnuradio
 PKG_SUPPORTED_OPTIONS=	ninja-build filter-design alsa
 # ninja-build is said supported, but not working
 # alas        is said supported, but not good on NetBSD
 # Adding ninja-build to following line (now) stops
 # [164/850] cd /PATH/ham/gnuradio-core/work/gnuradio-3.7.5/build/gr-audio/swig && ""
 # FAILED: cd /PATH/ham/gnuradio-core/work/gnuradio-3.7.5/build/gr-audio/swig && ""
 # : permission denied
 PKG_SUGGESTED_OPTIONS=	filter-design
 .include "../../mk/bsd.options.mk"
 .if !empty(PKG_OPTIONS:Mninja-build)
 CMAKE_ARGS+=	-GNinja
 BUILD_DEPENDS+=	ninja-build-[0-9]*:../../devel/ninja-build
 do-build:
-	(cd ${WRKSRC}/build; ninja)
+	cd ${WRKSRC}/${BUILD_DIRS} && ${PKGSRC_SETENV} ${MAKE_ENV} ninja
 .else
 do-build:
-	(cd ${WRKSRC}/build; ${BUILD_MAKE_CMD})
+	cd ${WRKSRC}/${BUILD_DIRS} && ${BUILD_MAKE_CMD}
 .endif
 .if !empty(PKG_OPTIONS:Mfilter-design)
 # Running gr_filter_design asks for the package
 DEPENDS+=		${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy12
 .endif
 .if !empty(PKG_OPTIONS:Malsa)
 .include	"../../audio/alsa-lib/buildlink3.mk"
 ALSA_ENABLED=
 CONF_FILES+=	${EGDIR}/gr-audio-alsa.conf	${PKG_SYSCONFDIR}/gr-audio-alsa.conf
 PLIST_SRC+=	${PKGDIR}/PLIST.alsa
 .else

 @@ -1,19 +1,21 @@
-# $NetBSD: Makefile,v 1.31 2020/05/06 14:04:41 adam Exp $
+# $NetBSD: Makefile,v 1.32 2020/05/19 13:58:24 joerg Exp $
 PKGNAME=	gnuradio-doxygen-${VERSION}
 PKGREVISION=	4
 COMMENT=	Doxygen documentation of GNU Radio
 BUILD_DIRS=	build/docs
 .include	"../../ham/gnuradio-core/Makefile.common"
 .include	"../../ham/gnuradio-core/Nocore.mk"
 BUILD_DEPENDS+=	doxygen>=1.8.15:../../devel/doxygen
 BUILD_DEPENDS+=	graphviz-[0-9]*:../../graphics/graphviz
 DEPENDS+=	web2c-[0-9]*:../../print/web2c
 # in case those packages are already installed by other requirement..
 DEPENDS+=	texlive-collection-latex-[0-9]*:../../meta-pkgs/texlive-collection-latex
 DEPENDS+=	tex-newunicodechar-[-0-9]*:../../print/tex-newunicodechar
 PYTHON_VERSIONED_DEPENDENCIES=	sphinx:build