diff options
| author | erh <erh> | 2004-11-05 19:41:16 +0000 |
|---|---|---|
| committer | erh <erh> | 2004-11-05 19:41:16 +0000 |
| commit | 7cef73588981af7ecfebc6b5360c37d8b613d236 (patch) | |
| tree | ca130e99b746a81eae8809214225e136fe13da2d /pkgtools | |
| parent | 8a83aaa01376b5acfb19090d170f4882e5ced213 (diff) | |
| download | pkgsrc-7cef73588981af7ecfebc6b5360c37d8b613d236.tar.gz | |
Fix the sed command that processes the +CONTENTS file so packages that
don't contain "@comment $NetBSD" lines still work correctly. Also fix
handling of magic "@comment Symlink:" lines. Bump version to 1.6.5
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_tarup/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkg_tarup/files/pkg_tarup | 20 |
2 files changed, 18 insertions, 6 deletions
diff --git a/pkgtools/pkg_tarup/Makefile b/pkgtools/pkg_tarup/Makefile index 2b41e5a25e5..5a2e2cb0d78 100644 --- a/pkgtools/pkg_tarup/Makefile +++ b/pkgtools/pkg_tarup/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.24 2004/10/29 14:51:41 tv Exp $ +# $NetBSD: Makefile,v 1.25 2004/11/05 19:41:16 erh Exp $ -DISTNAME= pkg_tarup-1.6.4 +DISTNAME= pkg_tarup-1.6.5 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkg_tarup/files/pkg_tarup b/pkgtools/pkg_tarup/files/pkg_tarup index 526a47e221f..95893f16f7e 100644 --- a/pkgtools/pkg_tarup/files/pkg_tarup +++ b/pkgtools/pkg_tarup/files/pkg_tarup @@ -1,6 +1,6 @@ #! @SH@ # -# $Id: pkg_tarup,v 1.18 2004/10/29 14:51:41 tv Exp $ +# $Id: pkg_tarup,v 1.19 2004/11/05 19:41:16 erh Exp $ # # Tar up installed package # @@ -92,10 +92,22 @@ create_package() check_and_add -n "${PKG_DBDIR}/${PKG}/+PRESERVE" PLIST=/tmp/+CONTENTS.$$ - ${SED} -n \ + + # This sed command trims out all of the following: + # md5 magic comments, symlink magic comments + # lines starting with @blddep, @pkgdep, @pkgcfl, @name, @mtree + # @cwd lines that refer to the current directory "@cwd ." + # @ignore and any line immediately following it + ${SED} \ -e '/^@comment MD5:/d' \ - -e '/^@cwd \.$/,$d' \ - -e '/\$NetBSD/,$p' \ + -e '/^@comment Symlink:/d' \ + -e '/^@blddep/d' \ + -e '/^@pkgdep/d' \ + -e '/^@pkgcfl/d' \ + -e '/^@name/d' \ + -e '/^@mtree/d' \ + -e '/^@cwd \.$/d' \ + -e '/^@ignore/,/^.*$/d' \ <"${PKG_DBDIR}/${PKG}/+CONTENTS" >"${PLIST}" # Duplicate first @cwd (work around pkg_create "feature" ...) |