Update to 1.14:

- Add the AUTO_TARGET variable.  This specifies the BUILD_TARGET used during
  an automated build of packages (i.e., pkg_comp auto), so that one can use
  'bin-install'.  Suggested by gavan@.
- Fix minor bug so that a libkver package is built during makeroot.

3 files changed, 31 insertions, 14 deletions

diff --git a/pkgtools/pkg_comp/Makefile b/pkgtools/pkg_comp/Makefile
index 5d75240f632..07b5ce9e8be 100644
--- a/pkgtools/pkg_comp/Makefile
+++ b/pkgtools/pkg_comp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2004/01/06 19:49:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/08 14:06:15 jmmv Exp $
 
-DISTNAME=	pkg_comp-1.13
+DISTNAME=	pkg_comp-1.14
 WRKSRC=		${WRKDIR}
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
diff --git a/pkgtools/pkg_comp/files/pkg_comp.8 b/pkgtools/pkg_comp/files/pkg_comp.8
index bb1b28527f3..f695e4e98ce 100644
--- a/pkgtools/pkg_comp/files/pkg_comp.8
+++ b/pkgtools/pkg_comp/files/pkg_comp.8
@@ -1,7 +1,7 @@
-.\" $NetBSD: pkg_comp.8,v 1.16 2003/12/19 09:51:55 jmmv Exp $
+.\" $NetBSD: pkg_comp.8,v 1.17 2004/01/08 14:06:15 jmmv Exp $
 .\"
 .\" pkg_comp - Build packages inside a clean chroot environment
-.\" Copyright (c) 2002, 2003, Julio M. Merino Vidal <jmmv@NetBSD.org>
+.\" Copyright (c) 2002, 2003, 2004 Julio M. Merino Vidal <jmmv@NetBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd December 19, 2003
+.Dd January 8, 2004
 .Dt PKG_COMP 8
 .Os
 .Sh NAME
@@ -133,13 +133,26 @@ variables.
 The default values shown here are those written in the template when
 issuing a maketemplate.
 .Bl -tag -width indent
+.It AUTO_TARGET
+The pkgsrc target to use when building packages in an automated fashion
+(using the
+.Ql auto
+target).
+Should be set to
+.Ql package
+or
+.Ql bin-install ,
+as other values are useless.
+Defaults to
+.Ql package .
 .It BUILD_TARGET
-The target to use when building packages.
+The pkgsrc target to use when building packages.
 It can contain any target supported by the pkgsrc system, but
 reasonable values are:
-.Ql install
+.Ql install ,
+.Ql package
 and
-.Ql package .
+.Ql bin-install .
 Defaults to
 .Ql package .
 .It COPYROOTCFG
@@ -404,9 +417,11 @@ Remove the entire chroot tree.
 You should do it with this target because it
 will take care to umount needed mount points.
 .It auto
-This executes several targets automatically, setting
+This executes several targets automatically, using
+.Sy AUTO_TARGET
+as
 .Sy BUILD_TARGET
-to package.
+during the build.
 The order is: makeroot, build and removeroot.
 This is useful to create binary packages of several pkgsrc and their
 dependencies automatically.
diff --git a/pkgtools/pkg_comp/files/pkg_comp.sh b/pkgtools/pkg_comp/files/pkg_comp.sh
index 36d3a75cf9b..162fd58fbea 100644
--- a/pkgtools/pkg_comp/files/pkg_comp.sh
+++ b/pkgtools/pkg_comp/files/pkg_comp.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pkg_comp.sh,v 1.14 2004/01/03 10:45:50 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.15 2004/01/08 14:06:15 jmmv Exp $
 #
 # pkg_comp - Build packages inside a clean chroot environment
 # Copyright (c) 2002, 2003, 2004 Julio M. Merino Vidal <jmmv@NetBSD.org>
@@ -47,7 +47,8 @@ _TEMPLATE_VARS="DESTDIR ROOTSHELL COPYROOTCFG BUILD_TARGET DISTRIBDIR SETS \
                 SETS_X11 USE_XPKGWEDGE REAL_SRC REAL_SRC_OPTS REAL_PKGSRC \
                 REAL_PKGSRC_OPTS REAL_DISTFILES REAL_DISTFILES_OPTS \
                 REAL_PACKAGES REAL_PACKAGES_OPTS REAL_PKGVULNDIR \
-                NETBSD_RELEASE MOUNT_SCRIPT UMOUNT_SCRIPT SYNC_UMOUNT"
+                NETBSD_RELEASE MOUNT_SCRIPT UMOUNT_SCRIPT SYNC_UMOUNT \
+                AUTO_TARGET"
 
 env_clean()
 {
@@ -85,6 +86,7 @@ env_setdefaults()
     : ${DESTDIR:=/var/chroot/pkg_comp/default}
     : ${ROOTSHELL:=/bin/ksh}
     : ${COPYROOTCFG:=no}
+    : ${AUTO_TARGET:=package}
     : ${BUILD_TARGET:=package}
     : ${DISTRIBDIR:=/var/pub/NetBSD}
     : ${SETS:=base.tgz comp.tgz etc.tgz text.tgz}
@@ -401,7 +403,7 @@ pkg_makeroot()
     fi
 
     if [ "$NETBSD_RELEASE" != "no" ]; then
-        BUILD_TARGET=install pkg_build pkgtools/libkver
+        pkg_build pkgtools/libkver
         echo "LD_PRELOAD=${LOCALBASE}/lib/libkver.so; export LD_PRELOAD" >> $DESTDIR/etc/shrc
         echo "setenv LD_PRELOAD ${LOCALBASE}/lib/libkver.so" >> $DESTDIR/etc/csh.login
         echo "setenv LD_PRELOAD ${LOCALBASE}/lib/libkver.so" >> $DESTDIR/etc/csh.cshrc
@@ -767,7 +769,7 @@ case "$target" in
         ;;
     auto)
         readconf
-        BUILD_TARGET="package"
+        BUILD_TARGET="${AUTO_TARGET}"
         if [ -z "$REAL_PACKAGES" ]; then
             err "this is useless without REAL_PACKAGES"
         fi