Convert back from PKGVERSION_NOREV to PKGVERSION in PLIST's.

Thanks obache@ for advice.

3 files changed, 18 insertions, 19 deletions

diff --git a/ham/gnuradio-core/Makefile.common b/ham/gnuradio-core/Makefile.common
index 8ed142e1ff8..4e5cadf2613 100644
--- a/ham/gnuradio-core/Makefile.common
+++ b/ham/gnuradio-core/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2014/10/28 06:41:20 mef Exp $
+# $NetBSD: Makefile.common,v 1.5 2014/10/28 16:59:33 mef Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
@@ -53,7 +53,6 @@ PATCHDIR=		${.CURDIR}/../../ham/gnuradio-core/patches
 PYTHON_VERSIONS_INCOMPATIBLE=   33 34 # not yet ported as of 3.3.0
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
-PLIST_SUBST+=	PKGVERSION_NOREV=${PKGVERSION_NOREV}
 PY_PATCHPLIST=	yes
 
 CONFIGURE_DIRS=	build
diff --git a/ham/gnuradio-core/Nocore.mk b/ham/gnuradio-core/Nocore.mk
index 4a169344cb3..83e36eb7f75 100644
--- a/ham/gnuradio-core/Nocore.mk
+++ b/ham/gnuradio-core/Nocore.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Nocore.mk,v 1.3 2014/10/28 06:41:20 mef Exp $
+# $NetBSD: Nocore.mk,v 1.4 2014/10/28 16:59:33 mef Exp $
 # Default list for reducing PLIST
 PLIST_MINUS=	core
 DEPENDS+=	gnuradio-core-[0-9]*:../../ham/gnuradio-core
@@ -14,7 +14,7 @@ post-install:
 	${RM} -f ${WRKDIR}/.PLIST.minus;
 	for i in ${PLIST_MINUS} ; do			\
 	  sed  -e 's,$${PYSITELIB},${PYSITELIB},'	\
-	       -e 's,$${PKGVERSION_NOREV},${PKGVERSION_NOREV},'	\
+	       -e 's,$${PKGVERSION},${PKGVERSION_NOREV},'	\
 	       -e '/^@comment/d'			\
 	       -e '/^@pkgdir/d'				\
 	       ${PKGDIR}/../../ham/gnuradio-$$i/PLIST	\
diff --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST
index 66f9ed4e4cd..909ff2a0fc2 100644
--- a/ham/gnuradio-core/PLIST
+++ b/ham/gnuradio-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2014/10/28 06:41:20 mef Exp $
+@comment $NetBSD: PLIST,v 1.17 2014/10/28 16:59:33 mef Exp $
 bin/gnuradio-config-info
 bin/gr_filter_design
 bin/volk-config-info
@@ -609,19 +609,19 @@ lib/cmake/gnuradio/LibFindMacros.cmake
 lib/cmake/gnuradio/UseSWIG.cmake
 lib/cmake/volk/VolkConfig.cmake
 lib/libgnuradio-analog.so
-lib/libgnuradio-analog.so.${PKGVERSION_NOREV}
+lib/libgnuradio-analog.so.${PKGVERSION}
 lib/libgnuradio-audio.so
-lib/libgnuradio-audio.so.${PKGVERSION_NOREV}
+lib/libgnuradio-audio.so.${PKGVERSION}
 lib/libgnuradio-blocks.so
-lib/libgnuradio-blocks.so.${PKGVERSION_NOREV}
+lib/libgnuradio-blocks.so.${PKGVERSION}
 lib/libgnuradio-fft.so
-lib/libgnuradio-fft.so.${PKGVERSION_NOREV}
+lib/libgnuradio-fft.so.${PKGVERSION}
 lib/libgnuradio-filter.so
-lib/libgnuradio-filter.so.${PKGVERSION_NOREV}
+lib/libgnuradio-filter.so.${PKGVERSION}
 lib/libgnuradio-pmt.so
-lib/libgnuradio-pmt.so.${PKGVERSION_NOREV}
+lib/libgnuradio-pmt.so.${PKGVERSION}
 lib/libgnuradio-runtime.so
-lib/libgnuradio-runtime.so.${PKGVERSION_NOREV}
+lib/libgnuradio-runtime.so.${PKGVERSION}
 lib/libvolk.so
 lib/libvolk.so.0.0.0
 lib/pkgconfig/gnuradio-analog.pc
@@ -871,13 +871,13 @@ ${PYSITELIB}/volk_modtool/cfg.pyo
 ${PYSITELIB}/volk_modtool/volk_modtool_generate.py
 ${PYSITELIB}/volk_modtool/volk_modtool_generate.pyc
 ${PYSITELIB}/volk_modtool/volk_modtool_generate.pyo
-share/doc/gnuradio-${PKGVERSION_NOREV}/README
-share/doc/gnuradio-${PKGVERSION_NOREV}/README.analog
-share/doc/gnuradio-${PKGVERSION_NOREV}/README.audio
-share/doc/gnuradio-${PKGVERSION_NOREV}/README.blocks
-share/doc/gnuradio-${PKGVERSION_NOREV}/README.fft
-share/doc/gnuradio-${PKGVERSION_NOREV}/README.filter
-share/doc/gnuradio-${PKGVERSION_NOREV}/README.hacking
+share/doc/gnuradio-${PKGVERSION}/README
+share/doc/gnuradio-${PKGVERSION}/README.analog
+share/doc/gnuradio-${PKGVERSION}/README.audio
+share/doc/gnuradio-${PKGVERSION}/README.blocks
+share/doc/gnuradio-${PKGVERSION}/README.fft
+share/doc/gnuradio-${PKGVERSION}/README.filter
+share/doc/gnuradio-${PKGVERSION}/README.hacking
 share/examples/gnuradio/conf.d/gnuradio-runtime.conf
 share/examples/gnuradio/conf.d/gr-audio-jack.conf
 share/examples/gnuradio/conf.d/gr-audio-oss.conf