[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_tarup pkg_tarup-1.7:

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a16c3c9a88ec
branches:  trunk
changeset: 538374:a16c3c9a88ec
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Feb 06 22:39:43 2008 +0000

description:
pkg_tarup-1.7:
Produce the same output as USE_DESTDIR=yes. Most of all reduce magic.
Try to deal with pkgviews for completeness.

diffstat:

 pkgtools/pkg_tarup/Makefile        |   4 ++--
 pkgtools/pkg_tarup/files/pkg_tarup |  33 ++++++++++-----------------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diffs (86 lines):

diff -r 5a397ca0f2c0 -r a16c3c9a88ec pkgtools/pkg_tarup/Makefile
--- a/pkgtools/pkg_tarup/Makefile       Wed Feb 06 20:13:57 2008 +0000
+++ b/pkgtools/pkg_tarup/Makefile       Wed Feb 06 22:39:43 2008 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2007/08/09 14:12:35 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2008/02/06 22:39:43 joerg Exp $
 
-DISTNAME=      pkg_tarup-1.6.6
+DISTNAME=      pkg_tarup-1.7
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 5a397ca0f2c0 -r a16c3c9a88ec pkgtools/pkg_tarup/files/pkg_tarup
--- a/pkgtools/pkg_tarup/files/pkg_tarup        Wed Feb 06 20:13:57 2008 +0000
+++ b/pkgtools/pkg_tarup/files/pkg_tarup        Wed Feb 06 22:39:43 2008 +0000
@@ -1,6 +1,6 @@
 #! @SH@
 #
-# $Id: pkg_tarup,v 1.20 2006/10/29 07:50:27 erh Exp $
+# $Id: pkg_tarup,v 1.21 2008/02/06 22:39:43 joerg Exp $
 #
 # Tar up installed package
 #
@@ -86,9 +86,8 @@
        check_and_add -S "${PKG_DBDIR}/${PKG}/+SIZE_ALL"
        check_and_add -i "${PKG_DBDIR}/${PKG}/+INSTALL"
        check_and_add -k "${PKG_DBDIR}/${PKG}/+DEINSTALL"
-       check_and_add -r "${PKG_DBDIR}/${PKG}/+REQUIRE"
        check_and_add -D "${PKG_DBDIR}/${PKG}/+DISPLAY"
-       check_and_add -m "${PKG_DBDIR}/${PKG}/+MTREE"           #NOTYET#
+       check_and_add -m "${PKG_DBDIR}/${PKG}/+MTREE"
        check_and_add -n "${PKG_DBDIR}/${PKG}/+PRESERVE"
 
        PLIST=/tmp/+CONTENTS.$$
@@ -101,26 +100,12 @@
        ${SED} \
                -e '/^@comment MD5:/d' \
                -e '/^@comment Symlink:/d' \
-               -e '/^@blddep/d' \
-               -e '/^@pkgdep/d' \
-               -e '/^@pkgcfl/d' \
-               -e '/^@name/d' \
                -e '/^@mtree/d' \
-               -e '/^@cwd \.$/d' \
+               -e '/^@cwd/d' \
+               -e '/^@src/d' \
                -e '/^@ignore/,/^.*$/d' \
                <"${PKG_DBDIR}/${PKG}/+CONTENTS" >"${PLIST}"
 
-       # Duplicate first @cwd (work around pkg_create "feature" ...)
-       ${GREP} '^@cwd' "${PLIST}" | ${HEAD} -1 >"${PLIST}.1"
-       if [ -s "${PLIST}.1" ]
-       then
-               ${SED} \
-                  -e "/`cat \"${PLIST}.1\" | ${SED} 's,/,\\\\/,g'`/r${PLIST}.1" \
-                  <"${PLIST}" >"${PLIST}.2"
-               mv "${PLIST}.2" "${PLIST}"
-       fi
-       rm "${PLIST}.1"
-
        # ${ECHO} -----
        # cat $PLIST
        # ${ECHO} -----
@@ -133,16 +118,18 @@
        # here, since we have no way to pass it to pkg_create, but maybe someone
        # will care enough to fix the rest of this.
        PKG_PREFIX=`pkg_info -qp "${PKG}" | ${HEAD} -1 | ${SED} -e's/^@cwd[[:space:]]*//'`
-       PKG_DEPS=`pkg_info -qf "${PKG}" | ${GREP} "^@pkgdep" | ${SED} -e's/^@pkgdep[[:space:]]*//'`
-       PKG_CONFLICT=`pkg_info -qf "${PKG}" | ${GREP} "^@pkgcfl" | ${SED} -e's/^@pkgcfl[[:space:]]*//'`
 
        PKG_ARGS="${PKG_ARGS} -v"
        PKG_ARGS="${PKG_ARGS} -f \"${PLIST}\""
        PKG_ARGS="${PKG_ARGS} -l"
        PKG_ARGS="${PKG_ARGS} -p \"${PKG_PREFIX}\""
-       PKG_ARGS="${PKG_ARGS} -P \"${PKG_DEPS}\""
-       PKG_ARGS="${PKG_ARGS} -C \"${PKG_CONFLICT}\""
+       PKG_ARGS="${PKG_ARGS} -L \"${PKG_PREFIX}\""
+       PKG_ARGS="${PKG_ARGS} -I \"${PKG_PREFIX}\""
        PKG_ARGS="${PKG_ARGS} \"${PKGREPOSITORY}/${PKG}${PKG_SUFX}\""
+       if [ -f "${PKG_DBDIR}/${PKG}/+VIEWS" ]
+       then
+               PKG_ARGS="${PKG_ARGS} -E"
+       fi
        eval pkg_create "${PKG_ARGS}"
 
        rm -f "${PLIST}"