(ham/gnuradio-core) sync with proper, tks rilling@. pkglint -F

[Makoto Fujiwara <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Thu Jun 11 05:56:56 2020 +0900
Changeset:	b1048bf4f959f74c6425aaf40abf8370973a5af8

Modified Files:
	gnuradio-core/Makefile.common
	gnuradio-core/Makefile.version
	gnuradio-core/options.mk
	gnuradio-core/replace-python.mk

Log Message:
(ham/gnuradio-core) sync with proper, tks rilling@. pkglint -F

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b1048bf4f959f74c6425aaf40abf8370973a5af8

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

diffstat:
 gnuradio-core/Makefile.common   | 26 ++++++++++++++------------
 gnuradio-core/Makefile.version  |  2 +-
 gnuradio-core/options.mk        |  6 +++---
 gnuradio-core/replace-python.mk |  1 +
 4 files changed, 19 insertions(+), 16 deletions(-)

diffs:
diff --git a/gnuradio-core/Makefile.common b/gnuradio-core/Makefile.common
index 3aa20bb3f6..07cb8d2cd2 100644
--- a/gnuradio-core/Makefile.common
+++ b/gnuradio-core/Makefile.common
@@ -33,16 +33,18 @@
 
 DISTNAME?=	gnuradio-${VERSION}
 CATEGORIES+=	ham
-MASTER_SITES=  http://s3-dist.gnuradio.org/
-MASTER_SITES=  http://gnuradio.org/releases/gnuradio/
+MASTER_SITES=	http://s3-dist.gnuradio.org/
+MASTER_SITES=	http://gnuradio.org/releases/gnuradio/
 
 MAINTAINER?=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE?=	http://www.gnu.org/software/gnuradio/
+HOMEPAGE?=	https://www.gnu.org/software/gnuradio/
 LICENSE=	gnu-gpl-v3
 
-USE_LANGUAGES=	c c++
-USE_TOOLS=	perl gmake cmake pkg-config
-USE_CMAKE=	yes
+USE_LANGUAGES=		c c++
+USE_TOOLS=		perl gmake cmake pkg-config
+USE_CMAKE=		yes
+LDFLAGS.NetBSD+=	-lrt
+
 
 DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah3
 DEPENDS+=	${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
@@ -53,7 +55,7 @@ DEPENDS+=	${PYPKGPREFIX}-qwt-qt4-[0-9]*:../../x11/py-qwt-qt4
 DISTINFO_FILE=		${.CURDIR}/../../wip/gnuradio-core/distinfo
 PATCHDIR=		${.CURDIR}/../../wip/gnuradio-core/patches
 
-PYTHON_VERSIONS_INCOMPATIBLE=    36 37 # not yet ported as of 3.3.0
+PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 3.3.0
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
 PY_PATCHPLIST=	yes
@@ -96,7 +98,7 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
 CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
 CMAKE_ARGS+=	-DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0
 
-CMAKE_ARGS+=	-DGR_LIBRARY_DIR=${PREFIX}/lib
+CMAKE_ARGS+=	-DGR_LIBRARY_DIR=${PREFIX}/lib -lrt
 CMAKE_ARGS+=	-DGR_PREFSDIR=${PREFIX}/share/gnuradio/examples/
 
 # adhoc setup not to pick non default version (say python3.6)
@@ -122,14 +124,14 @@ SUBST_MESSAGE.pyvers=	Fix SPHINX_EXECUTABLE NAMES(sphinx-build)
 SUBST_VARS.pyvers+=	PYVERSSUFFIX
 SUBST_STAGE.pyvers=	pre-configure
 
-# REPLACE_PYTHON is some 600 files
-.include	"../../wip/gnuradio-core/replace-python.mk"
+REPLACE_PYTHON=		*/*.py */*/*.py */*/*/*.py */*/*/*/*.py */*/*/*/*/*.py \
+			*/*/*/*/*/*/*.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"
diff --git a/gnuradio-core/Makefile.version b/gnuradio-core/Makefile.version
index ba9b5418f9..de8f4eca62 100644
--- a/gnuradio-core/Makefile.version
+++ b/gnuradio-core/Makefile.version
@@ -1,3 +1,3 @@
 # $NetBSD: Makefile.version,v 1.13 2019/06/21 16:02:16 mef Exp $
 
-VERSION=        3.8.0.0
+VERSION=	3.8.0.0
diff --git a/gnuradio-core/options.mk b/gnuradio-core/options.mk
index 377649c917..f62c104fb4 100644
--- a/gnuradio-core/options.mk
+++ b/gnuradio-core/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.4 2019/06/15 17:54:22 adam Exp $
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.gnuradio
-PKG_SUPPORTED_OPTIONS=  ninja-build filter-design alsa
+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
 
@@ -10,7 +10,7 @@ PKG_SUPPORTED_OPTIONS=  ninja-build filter-design alsa
 # FAILED: cd /PATH/ham/gnuradio-core/work/gnuradio-3.7.5/build/gr-audio/swig && ""
 # : permission denied
 
-PKG_SUGGESTED_OPTIONS= filter-design
+PKG_SUGGESTED_OPTIONS=	filter-design
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/gnuradio-core/replace-python.mk b/gnuradio-core/replace-python.mk
index c831305bec..92238e86ea 100644
--- a/gnuradio-core/replace-python.mk
+++ b/gnuradio-core/replace-python.mk
@@ -1,3 +1,4 @@
+# $NetBSD$
     -- posi	2019-09-16 23:08:54.343557721 +0900  \
     build/python_compile_helper.py  \
     docs/doxygen/doxyxml/generated/compound.py  \