diff options
| author | jlam <jlam@pkgsrc.org> | 2000-09-01 18:20:06 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2000-09-01 18:20:06 +0000 |
| commit | 0ed02cc12b4c5c573ab54a7ad4bdc980a49eec09 (patch) | |
| tree | 9b9947ce7e2b54be43ceed1fdc3f46a6d81bdefd /mk | |
| parent | 40fa4b36238fe67bff4474a18ef3166db0fc22c5 (diff) | |
| download | pkgsrc-0ed02cc12b4c5c573ab54a7ad4bdc980a49eec09.tar.gz | |
Fix broken MANZ handling in PERL5_PACKLIST case. Closes PR#10930 with fix
provided by Hubert Feyrer <feyrer@rfhs8012.fh-regensburg.de>.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 89a2b48ce24..9710ee7c9b9 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.560 2000/09/01 13:48:51 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.561 2000/09/01 18:20:06 jlam Exp $ # # This file is in the public domain. # @@ -3157,15 +3157,15 @@ MANZ_EXPRESSION= .if defined(PERL5_PACKLIST) PERL5_COMMENT= ( ${ECHO} "@comment The following lines are automatically generated"; \ - ${ECHO} "@comment from the installed .packlist files." ) >> ${PLIST} + ${ECHO} "@comment from the installed .packlist files." ) PERL5_PACKLIST_FILES= ( ${CAT} ${PERL5_PACKLIST}; for f in ${PERL5_PACKLIST}; do [ ! -f $$f ] || echo $$f; done ) \ | ${SED} -e "s,[ ].*,," -e "s,/\./,/,g" -e "s,${PREFIX}/,," \ - | sort -u >> ${PLIST} + | sort -u PERL5_PACKLIST_DIRS= ( ${CAT} ${PERL5_PACKLIST}; for f in ${PERL5_PACKLIST}; do [ ! -f $$f ] || echo $$f; done ) \ | ${SED} -e "s,[ ].*,," -e "s,/\./,/,g" -e "s,${PREFIX}/,," \ -e "s,^,@unexec rmdir -p %D/," \ -e "s,/[^/]*$$, 2>/dev/null || true," \ - | sort -ur >> ${PLIST} + | sort -ur PERL5_GENERATE_PLIST= ${PERL5_COMMENT}; \ ${PERL5_PACKLIST_FILES}; \ ${PERL5_PACKLIST_DIRS} @@ -3180,13 +3180,13 @@ ${PLIST}: ${PLIST_SRC} ${ECHO} "No ${PKGDIR}/PLIST or ${PKGDIR}/PLIST-{mi,md.shared,md.static}" ; \ ${ECHO} "Please set PLIST_SRC in the package Makefile.";\ else \ - ${CAT} ${PLIST_SRC} | \ + ( ${CAT} ${PLIST_SRC}; \ + ${PERL5_GENERATE_PLIST} ) | \ ${MANZ_NAWK_CMD} \ ${IMAKE_MAN_CMD} \ ${SED} ${MANZ_EXPRESSION} \ ${PLIST_SUBST:S/=/}!/:S/$/!g/:S/^/ -e s!\\\${/}\ > ${PLIST}; \ - ${PERL5_GENERATE_PLIST}; \ fi # generate ${DESCR} from ${DESCR_SRC} by: |