Sat Jun 15 17:54:22 2019 UTC ()
gnuradio-core: py-scipy -> py-scipy12; bump revision


(adam)
diff -r1.64 -r1.65 pkgsrc/ham/gnuradio-core/Makefile
diff -r1.3 -r1.4 pkgsrc/ham/gnuradio-core/options.mk
cvs diff -r1.64 -r1.65 pkgsrc/ham/gnuradio-core/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/gnuradio-core/Makefile 2018/12/13 19:52:02 1.64
+++ pkgsrc/ham/gnuradio-core/Makefile 2019/06/15 17:54:22 1.65
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.64 2018/12/13 19:52:02 adam Exp $ 1# $NetBSD: Makefile,v 1.65 2019/06/15 17:54:22 adam Exp $
2 2
3PKGNAME= gnuradio-core-${VERSION} 3PKGNAME= gnuradio-core-${VERSION}
4PKGREVISION= 3 4PKGREVISION= 4
5COMMENT= Core part of GNU Radio, all others need this 5COMMENT= Core part of GNU Radio, all others need this
6 6
7PLIST_MINUS= # empty 7PLIST_MINUS= # empty
8.include "Makefile.common" 8.include "Makefile.common"
9 9
10#CONF_FILES+= ${EGDIR}/gnuradio-runtime.conf ${PKG_SYSCONFDIR}/gnuradio-runtime.conf 10#CONF_FILES+= ${EGDIR}/gnuradio-runtime.conf ${PKG_SYSCONFDIR}/gnuradio-runtime.conf
11#CONF_FILES+= ${EGDIR}/gr-audio-jack.conf ${PKG_SYSCONFDIR}/gr-audio-jack.conf 11#CONF_FILES+= ${EGDIR}/gr-audio-jack.conf ${PKG_SYSCONFDIR}/gr-audio-jack.conf
12#CONF_FILES+= ${EGDIR}/gr-audio-portaudio.conf ${PKG_SYSCONFDIR}/gr-audio-portaudio.conf 12#CONF_FILES+= ${EGDIR}/gr-audio-portaudio.conf ${PKG_SYSCONFDIR}/gr-audio-portaudio.conf
13#CONF_FILES+= ${EGDIR}/gr-audio.conf ${PKG_SYSCONFDIR}/gr-audio.conf 13#CONF_FILES+= ${EGDIR}/gr-audio.conf ${PKG_SYSCONFDIR}/gr-audio.conf
14 14
15.include "../../mk/oss.buildlink3.mk" 15.include "../../mk/oss.buildlink3.mk"
16.if ${OSS_TYPE} != "none" 16.if ${OSS_TYPE} != "none"
17#CONF_FILES+= ${EGDIR}/gr-audio-oss.conf ${PKG_SYSCONFDIR}/gr-audio-oss.conf 17#CONF_FILES+= ${EGDIR}/gr-audio-oss.conf ${PKG_SYSCONFDIR}/gr-audio-oss.conf
cvs diff -r1.3 -r1.4 pkgsrc/ham/gnuradio-core/options.mk (expand / switch to unified diff)

--- pkgsrc/ham/gnuradio-core/options.mk 2015/01/27 06:01:44 1.3
+++ pkgsrc/ham/gnuradio-core/options.mk 2019/06/15 17:54:22 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.3 2015/01/27 06:01:44 dbj Exp $ 1# $NetBSD: options.mk,v 1.4 2019/06/15 17:54:22 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gnuradio 3PKG_OPTIONS_VAR= PKG_OPTIONS.gnuradio
4PKG_SUPPORTED_OPTIONS= ninja-build filter-design alsa 4PKG_SUPPORTED_OPTIONS= ninja-build filter-design alsa
5# ninja-build is said supported, but not working 5# ninja-build is said supported, but not working
6# alas is said supported, but not good on NetBSD 6# alas is said supported, but not good on NetBSD
7 7
8# Adding ninja-build to following line (now) stops 8# Adding ninja-build to following line (now) stops
9# [164/850] cd /PATH/ham/gnuradio-core/work/gnuradio-3.7.5/build/gr-audio/swig && "" 9# [164/850] cd /PATH/ham/gnuradio-core/work/gnuradio-3.7.5/build/gr-audio/swig && ""
10# FAILED: cd /PATH/ham/gnuradio-core/work/gnuradio-3.7.5/build/gr-audio/swig && "" 10# FAILED: cd /PATH/ham/gnuradio-core/work/gnuradio-3.7.5/build/gr-audio/swig && ""
11# : permission denied 11# : permission denied
12 12
13PKG_SUGGESTED_OPTIONS= filter-design 13PKG_SUGGESTED_OPTIONS= filter-design
14 14
@@ -17,25 +17,25 @@ PKG_SUGGESTED_OPTIONS= filter-design @@ -17,25 +17,25 @@ PKG_SUGGESTED_OPTIONS= filter-design
17.if !empty(PKG_OPTIONS:Mninja-build) 17.if !empty(PKG_OPTIONS:Mninja-build)
18CMAKE_ARGS+= -GNinja 18CMAKE_ARGS+= -GNinja
19BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build 19BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
20 20
21do-build: 21do-build:
22 (cd ${WRKSRC}/build; ninja) 22 (cd ${WRKSRC}/build; ninja)
23.else 23.else
24do-build: 24do-build:
25 (cd ${WRKSRC}/build; ${BUILD_MAKE_CMD}) 25 (cd ${WRKSRC}/build; ${BUILD_MAKE_CMD})
26.endif 26.endif
27 27
28.if !empty(PKG_OPTIONS:Mfilter-design) 28.if !empty(PKG_OPTIONS:Mfilter-design)
29# Running gr_filter_design asks for the package 29# Running gr_filter_design asks for the package
30DEPENDS+= ${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy 30DEPENDS+= ${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy12
31.endif 31.endif
32 32
33.if !empty(PKG_OPTIONS:Malsa) 33.if !empty(PKG_OPTIONS:Malsa)
34.include "../../audio/alsa-lib/buildlink3.mk" 34.include "../../audio/alsa-lib/buildlink3.mk"
35ALSA_ENABLED= 35ALSA_ENABLED=
36CONF_FILES+= ${EGDIR}/gr-audio-alsa.conf ${PKG_SYSCONFDIR}/gr-audio-alsa.conf 36CONF_FILES+= ${EGDIR}/gr-audio-alsa.conf ${PKG_SYSCONFDIR}/gr-audio-alsa.conf
37PLIST_SRC+= ${PKGDIR}/PLIST.alsa 37PLIST_SRC+= ${PKGDIR}/PLIST.alsa
38.else 38.else
39# disable ALSA, see patches/patch-gr-audio_lib_CMakeLists.txt 39# disable ALSA, see patches/patch-gr-audio_lib_CMakeLists.txt
40ALSA_ENABLED= \# 40ALSA_ENABLED= \#
41.endif 41.endif