Subject: Re: pkg/24072: bsd.pkg.mk makes package CONTENTS differently and breaks pkg_tarup
To: None <netbsd-bugs@netbsd.org>
From: Geoff Wing <gcw@pobox.com>
List: netbsd-bugs
Date: 04/06/2004 12:05:50
gcw@primenet.com.au typed:
: bsd.pkg.mk (1.1333?) now adds info files to CONTENTS before adding the
: PLIST. pkg_tarup relies on the ``$NetBSD'' tag in PLIST as the
: starting point for finding the filelist so all info files are skipped.
pkg_tarup hack. A reorder of bsd.pkg.mk (if possible) might be nicer.
--- pkg_tarup.org 2003-12-12 14:20:40.000000000 +1100
+++ pkg_tarup 2004-04-06 12:03:04.000000000 +1000
@@ -77,8 +77,12 @@
sed -n \
-e '/^@comment MD5:/d' \
-e '/^@cwd \.$/,$d' \
+ -e '/^info\//d'\
-e '/\$NetBSD/,$p' \
<${PKG_DBDIR}/${PKG}/+CONTENTS >$PLIST
+ sed -n \
+ -e '/^info\//p' \
+ <${PKG_DBDIR}/${PKG}/+CONTENTS >>$PLIST
# Duplicate first @cwd (work around pkg_create "feature" ...)
grep '^@cwd' $PLIST | ${HEAD} -1 >$PLIST.1