summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam>2000-08-30 18:49:18 +0000
committerjlam <jlam>2000-08-30 18:49:18 +0000
commitaff01099c2a0a88752213eba9c9e37f2cc7583ec (patch)
tree67a69cc3571ec6928a4ba1d1515ba80b56b14eb7 /mk
parent7f0a3a5bbc95943ec2a35688b78e29e567b06eb6 (diff)
downloadpkgsrc-aff01099c2a0a88752213eba9c9e37f2cc7583ec.tar.gz
Use only the first field of the perl5 packlist. Some packlists list the
type of the file and additional information in successive fields of the packlist. Note that this will break if the installed filenames have spaces in them, which I don't think happens, yet.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 8327eef0528..01b7f3c506e 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.555 2000/08/29 18:48:11 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.556 2000/08/30 18:49:18 jlam Exp $
#
# This file is in the public domain.
#
@@ -3166,10 +3166,10 @@ MANZ_EXPRESSION=
PERL5_COMMENT= ( ${ECHO} "@comment The following lines are automatically generated"; \
${ECHO} "@comment from the installed .packlist files." ) >> ${PLIST}
PERL5_PACKLIST_FILES= ( ${CAT} ${PERL5_PACKLIST}; for f in ${PERL5_PACKLIST}; do [ ! -f $$f ] || echo $$f; done ) \
- | ${SED} -e "s,/\./,/,g" -e "s,${PREFIX}/,," \
+ | ${SED} -e "s,[ ].*,," -e "s,/\./,/,g" -e "s,${PREFIX}/,," \
| sort -u >> ${PLIST}
PERL5_PACKLIST_DIRS= ( ${CAT} ${PERL5_PACKLIST}; for f in ${PERL5_PACKLIST}; do [ ! -f $$f ] || echo $$f; done ) \
- | ${SED} -e "s,/\./,/,g" -e "s,${PREFIX}/,," \
+ | ${SED} -e "s,[ ].*,," -e "s,/\./,/,g" -e "s,${PREFIX}/,," \
-e "s,^,@unexec rmdir -p %D/," \
-e "s,/[^/]*$$, 2>/dev/null || true," \
| sort -ur >> ${PLIST}