[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_comp Update to 1.16:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f44c2bf3895f
branches:  trunk
changeset: 468255:f44c2bf3895f
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Wed Feb 11 22:53:18 2004 +0000

description:
Update to 1.16:
- Use WRKDIR_BASENAME instead of OBJMACHINE to get a unique name of object
  directories.  This way, multiple jails can use the same pkgsrc tree with
  write access and get the right obj links.
- Fix COPYROOTCFG.

diffstat:

 pkgtools/pkg_comp/Makefile          |  4 ++--
 pkgtools/pkg_comp/files/pkg_comp.sh |  8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r a27f32c0c3d4 -r f44c2bf3895f pkgtools/pkg_comp/Makefile
--- a/pkgtools/pkg_comp/Makefile        Wed Feb 11 20:38:05 2004 +0000
+++ b/pkgtools/pkg_comp/Makefile        Wed Feb 11 22:53:18 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2004/01/23 09:48:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/02/11 22:53:18 jmmv Exp $
 
-DISTNAME=      pkg_comp-1.15
+DISTNAME=      pkg_comp-1.16
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r a27f32c0c3d4 -r f44c2bf3895f pkgtools/pkg_comp/files/pkg_comp.sh
--- a/pkgtools/pkg_comp/files/pkg_comp.sh       Wed Feb 11 20:38:05 2004 +0000
+++ b/pkgtools/pkg_comp/files/pkg_comp.sh       Wed Feb 11 22:53:18 2004 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pkg_comp.sh,v 1.16 2004/01/23 09:48:53 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.17 2004/02/11 22:53:18 jmmv Exp $
 #
 # pkg_comp - Build packages inside a clean chroot environment
 # Copyright (c) 2002, 2003, 2004 Julio M. Merino Vidal <jmmv%NetBSD.org@localhost>
@@ -39,7 +39,7 @@
 
 # USE_GCC3, CFLAGS, CPPFLAGS and CXXFLAGS are ommited from _MKCONF_VARS
 # as they require special handling.
-_MKCONF_VARS="OBJMACHINE MKOBJDIRS BSDSRCDIR WRKOBJDIR DISTDIR PACKAGES \
+_MKCONF_VARS="WRKDIR_BASENAME MKOBJDIRS BSDSRCDIR WRKOBJDIR DISTDIR PACKAGES \
               PKG_DEVELOPER CLEANDEPENDS LOCALBASE PKG_SYSCONFBASE \
               CFLAGS CPPFLAGS CXXFLAGS USE_AUDIT_PACKAGES PKGVULNDIR \
               USE_XPKGWEDGE"
@@ -79,7 +79,7 @@
     TEMPLATE_VARS="$TEMPLATE_VARS ${_TEMPLATE_VARS}"
 
     # Default values for variables that will be written to mk.conf.
-    : ${OBJMACHINE:=yes}
+    : ${WRKDIR_BASENAME:=default}
     : ${MKOBJDIRS:=yes}
     : ${BSDSRCDIR:=/usr/src}
     : ${WRKOBJDIR:=/pkg_comp/obj/pkgsrc}
@@ -455,7 +455,7 @@
     echo "Setting root's environment..."
     chroot $DESTDIR chpass -s $ROOTSHELL
     if [ "$COPYROOTCFG" = "yes" ]; then
-        cp /root/.* $DESTDIR/root 2>&1 | > /dev/null
+        cp /root/.* $DESTDIR/root >/dev/null 2>&1
     fi
 
     echo "Setting up initial configuration..."