Fri Jan 30 15:02:23 2015 UTC ()
Fix another problem on PLIST for gnuradio-*.
Add PLIST.oss to be anonther removing PLIST other than gnuradio-core packages.
(One more, move the line location of comment lines next to the line to explain)


(mef)
diff -r1.5 -r1.6 pkgsrc/ham/gnuradio-core/Nocore.mk
cvs diff -r1.5 -r1.6 pkgsrc/ham/gnuradio-core/Nocore.mk (expand / switch to unified diff)

--- pkgsrc/ham/gnuradio-core/Nocore.mk 2015/01/27 06:03:17 1.5
+++ pkgsrc/ham/gnuradio-core/Nocore.mk 2015/01/30 15:02:23 1.6
@@ -1,27 +1,30 @@ @@ -1,27 +1,30 @@
1# $NetBSD: Nocore.mk,v 1.5 2015/01/27 06:03:17 dbj Exp $ 1# $NetBSD: Nocore.mk,v 1.6 2015/01/30 15:02:23 mef Exp $
 2
 3DEPENDS+= gnuradio-core-[0-9]*:../../ham/gnuradio-core
 4
2# Default list for reducing PLIST 5# Default list for reducing PLIST
 6# gnuradio-* names to be common (to get the list to reduce)
3PLIST_MINUS= core 7PLIST_MINUS= core
4DEPENDS+= gnuradio-core-[0-9]*:../../ham/gnuradio-core 
5 8
6# Remove the same files gnuradio-core installs 9# Remove the same files gnuradio-core installs
7# Do a part of PLIST_SUBST and remove non real file listings 10# Do a part of PLIST_SUBST and remove non real file listings
8#.if empty(PKGBASE:Mgnuradio-core) && !empty(PLIST_MINUS) 11#.if empty(PKGBASE:Mgnuradio-core) && !empty(PLIST_MINUS)
9post-install: 12post-install:
10# Take care CONF_FILES stuff 13# Take care CONF_FILES stuff
11 ${MV} ${DESTDIR}${PREFIX}/etc/gnuradio/conf.d/* \ 14 ${MV} ${DESTDIR}${PREFIX}/etc/gnuradio/conf.d/* \
12 ${DESTDIR}${PREFIX}/${EGDIR}/ 15 ${DESTDIR}${PREFIX}/${EGDIR}/
13 for i in ${PLIST_MINUS} ; do \ 16 for i in ${PLIST_MINUS} ; do \
14 for p in PLIST PLIST.${OPSYS} ; do \ 17 for p in PLIST PLIST.oss PLIST.${OPSYS} ; do \
15 f="${PKGDIR}/../../ham/gnuradio-$${i}/$${p}"; \ 18 f="${PKGDIR}/../../ham/gnuradio-$${i}/$${p}"; \
16 if [ -f "$${f}" ]; then \ 19 if [ -f "$${f}" ]; then \
17 ${SED} -e 's,$${PYSITELIB},${PYSITELIB},' \ 20 ${SED} -e 's,$${PYSITELIB},${PYSITELIB},' \
18 -e 's,$${PKGVERSION},${PKGVERSION_NOREV},' \ 21 -e 's,$${PKGVERSION},${PKGVERSION_NOREV},' \
19 -e '/^@comment/d' \ 22 -e '/^@comment/d' \
20 -e '/^@pkgdir/d' \ 23 -e '/^@pkgdir/d' \
21 "$${f}"; \ 24 "$${f}"; \
22 fi \ 25 fi \
23 done \ 26 done \
24 done \ 27 done \
25 | ${AWK} ${_PLIST_SHLIB_AWK} \ 28 | ${AWK} ${_PLIST_SHLIB_AWK} \
26 > ${WRKDIR}/.PLIST.minus; 29 > ${WRKDIR}/.PLIST.minus;
27 (cd ${WRKDIR}/.destdir/${PREFIX}; \ 30 (cd ${WRKDIR}/.destdir/${PREFIX}; \