pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_tarup Fix the sed command that processes ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2f244e32ddd8
branches: trunk
changeset: 482972:2f244e32ddd8
user: erh <erh%pkgsrc.org@localhost>
date: Fri Nov 05 19:41:16 2004 +0000
description:
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:
pkgtools/pkg_tarup/Makefile | 4 ++--
pkgtools/pkg_tarup/files/pkg_tarup | 20 ++++++++++++++++----
2 files changed, 18 insertions(+), 6 deletions(-)
diffs (49 lines):
diff -r 419b058def74 -r 2f244e32ddd8 pkgtools/pkg_tarup/Makefile
--- a/pkgtools/pkg_tarup/Makefile Fri Nov 05 19:24:22 2004 +0000
+++ b/pkgtools/pkg_tarup/Makefile Fri Nov 05 19:41:16 2004 +0000
@@ -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 -r 419b058def74 -r 2f244e32ddd8 pkgtools/pkg_tarup/files/pkg_tarup
--- a/pkgtools/pkg_tarup/files/pkg_tarup Fri Nov 05 19:24:22 2004 +0000
+++ b/pkgtools/pkg_tarup/files/pkg_tarup Fri Nov 05 19:41:16 2004 +0000
@@ -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 @@
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" ...)
Home |
Main Index |
Thread Index |
Old Index