Tue May 10 16:54:05 2016 UTC ()
Restore print-PLIST @pkgdir functionality.  This was lost in the @dirrm
cleanup as the implicit print action was removed.


(jperkin)
diff -r1.29 -r1.30 pkgsrc/mk/plist/print-plist.mk
cvs diff -r1.29 -r1.30 pkgsrc/mk/plist/print-plist.mk (expand / switch to unified diff)

--- pkgsrc/mk/plist/print-plist.mk 2016/05/04 11:17:41 1.29
+++ pkgsrc/mk/plist/print-plist.mk 2016/05/10 16:54:05 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: print-plist.mk,v 1.29 2016/05/04 11:17:41 jperkin Exp $ 1# $NetBSD: print-plist.mk,v 1.30 2016/05/10 16:54:05 jperkin Exp $
2 2
3### 3###
4### Automatic PLIST generation 4### Automatic PLIST generation
5### - files & symlinks first 5### - files & symlinks first
6### - empty directories are handled properly 6### - empty directories are handled properly
7### - dirs from mtree files are excluded 7### - dirs from mtree files are excluded
8### - substitute for platform or package specifics substrings 8### - substitute for platform or package specifics substrings
9### 9###
10### Usage: 10### Usage:
11### - make install 11### - make install
12### - make print-PLIST | brain >PLIST 12### - make print-PLIST | brain >PLIST
13### 13###
14 14
@@ -129,23 +129,24 @@ print-PLIST: @@ -129,23 +129,24 @@ print-PLIST:
129 /^man\// { sub("\\.gz$$", ""); } \ 129 /^man\// { sub("\\.gz$$", ""); } \
130 { print $$0; }' 130 { print $$0; }'
131 ${RUN}\ 131 ${RUN}\
132 for i in `${_PRINT_PLIST_DIRS_CMD} \ 132 for i in `${_PRINT_PLIST_DIRS_CMD} \
133 | ${SORT} -r \ 133 | ${SORT} -r \
134 | ${AWK} ' \ 134 | ${AWK} ' \
135 /emul\/linux\/proc/ { next; } \ 135 /emul\/linux\/proc/ { next; } \
136 /${DESTDIR:S|/|\\/|g:S/+/\\\\+/g}${PREFIX:S|/|\\/|g}\/\.$$/ { next; } \ 136 /${DESTDIR:S|/|\\/|g:S/+/\\\\+/g}${PREFIX:S|/|\\/|g}\/\.$$/ { next; } \
137 /${PKG_DBDIR:S|/|\\/|g}\// { next; } \ 137 /${PKG_DBDIR:S|/|\\/|g}\// { next; } \
138 { sub("${DESTDIR:S/+/\\\\\\+/g}${PREFIX}/\\\\./", ""); } \ 138 { sub("${DESTDIR:S/+/\\\\\\+/g}${PREFIX}/\\\\./", ""); } \
139 { sub("^${PKGINFODIR}/", "info/"); } \ 139 { sub("^${PKGINFODIR}/", "info/"); } \
140 { sub("^${PKGMANDIR}/", "man/"); } \ 140 { sub("^${PKGMANDIR}/", "man/"); } \
141 /^${PKG_DBDIR:S|^${PREFIX}/||:S|/|\\/|g}(\/|$$)/ { next; } \ 141 /^${PKG_DBDIR:S|^${PREFIX}/||:S|/|\\/|g}(\/|$$)/ { next; } \
142 /^${PKGINFODIR:S|/|\\/|g}$$/ { next; }'` ; \ 142 /^${PKGINFODIR:S|/|\\/|g}$$/ { next; } \
 143 { print $$0; }'` ; \
143 do \ 144 do \
144 if [ `${LS} -la ${DESTDIR}${PREFIX}/$$i | ${WC} -l` = 3 ]; then \ 145 if [ `${LS} -la ${DESTDIR}${PREFIX}/$$i | ${WC} -l` = 3 ]; then \
145 ${ECHO} @pkgdir $$i | ${AWK} ' \ 146 ${ECHO} @pkgdir $$i | ${AWK} ' \
146 ${PRINT_PLIST_AWK} \ 147 ${PRINT_PLIST_AWK} \
147 { print $$0; }' ; \ 148 { print $$0; }' ; \
148 fi ; \ 149 fi ; \
149 done \ 150 done \
150 | ${AWK} '${_PRINT_PLIST_AWK_SUBST} { print $$0; }' 151 | ${AWK} '${_PRINT_PLIST_AWK_SUBST} { print $$0; }'
151.endif # target(print-PLIST) 152.endif # target(print-PLIST)