 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: pkg_comp.sh,v 1.37 2010/04/15 09:42:45 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.38 2010/07/20 16:50:26 jmmv Exp $
+#
 # pkg_comp - Build packages inside a clean chroot environment
 # Copyright (c) 2002, 2003, 2004, 2005 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
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in
 #    the documentation and/or other materials provided with the
 #    distribution.
 @@ -523,27 +523,26 @@ makeroot()
     echo "setenv PKG_DBDIR \"${PKG_DBDIR}\"" >> ${DESTDIR}/etc/csh.cshrc
     cp /etc/resolv.conf $DESTDIR/etc/resolv.conf
     makeroot_mkconf
     echo "PKG_DBDIR=${PKG_DBDIR}" >> ${DESTDIR}/etc/pkg_install.conf
     # From now on, filesystems may be mounted, so we need to trap
     # signals to umount them.
     trap "echo \"*** Process aborted ***\" ; fsumount ; exit 1" INT QUIT
     makeroot_libkver
     [ "$Nflag" = "no" ] && makeroot_digest
     if [ "$USE_GCC3" = "yes" -a "$Nflag" = "no" ]; then
         if [ -z "`echo $BUILD_PACKAGES $INSTALL_PACKAGES | grep gcc3`" ]; then
             AVOID_GCC3=yes build_and_install lang/gcc3
         fi
     fi
     makeroot_x11
     if [ -n "${MAKEROOT_HOOKS}" ]; then
         echo "Executing makeroot hooks."
         for h in ${MAKEROOT_HOOKS}; do
             ${h} ${DESTDIR} makeroot
 @@ -599,37 +598,26 @@ CXXFLAGS += $CXXFLAGS
 .endif
 EOF
     else
         cat >>$file <<EOF
 CFLAGS += $CFLAGS
 CPPFLAGS += $CPPFLAGS
 CXXFLAGS += $CXXFLAGS
 .endif # BSD_PKG_MK
 EOF
     fi
+}
 # makeroot_digest
 #   Ensure digest is always installed, specially because PKGSRC_COMPILER
 #   may contain 'ccache' or 'distcc'.
 makeroot_digest()
     ( PKGSRC_COMPILER=gcc; export PKGSRC_COMPILER; \
       build_and_install pkgtools/digest )
 # makeroot_libkver
+#
 #   If NETBSD_RELEASE is set to a version string, installs libkver
 #   inside the sandbox and configures it.
+#
 makeroot_libkver()
+{
     local prefix script statfile
     if [ "$NETBSD_RELEASE" != "no" ]; then
         _BUILD_TARGET="$BUILD_TARGET"
         BUILD_TARGET="standalone-install"
         build_and_install pkgtools/libkver
 @@ -715,27 +703,27 @@ pkg_build()
     # Check if all packages exist
     invalid=""
     for p in $pkgs; do
         if [ ! -d $REAL_PKGSRC/$p ]; then
             invalid="$invalid $p"
         fi
     done
     if [ -n "$invalid" ]; then
         err "invalid packages:$invalid"
     fi
     # Build them
     fsmount
-    check_pkg_install    # executes copy_vulnerabilities too
+    copy_vulnerabilities
     failed=""
     for p in $pkgs; do
         echo "PKG_COMP ==> Building and installing $p"
         prefix=$(mktemp $DESTDIR/pkg_comp/tmp/pkg_comp-XXXXXX)
         rm $prefix
         script="$prefix.sh"
         statfile="$prefix.stat"
         init_script $script
         cat >> $script <<EOF
 cd /usr/pkgsrc/$p
 make $BUILD_TARGET
 if [ \$? != 0 ]; then
     touch /pkg_comp/tmp/`basename $statfile`
 @@ -753,56 +741,26 @@ EOF
             mv ${_BUILD_RESUME}.new ${_BUILD_RESUME}
         fi
     done
     fsumount
     if [ -n "$failed" ]; then
         echo "PKG_COMP ==> Build error summary"
         echo "Build failed for:"
         for p in $failed; do
             echo "    $p"
         done
     fi
+}
 # check_pkg_install
 #   Ensure that the version of pkg_install inside the sandbox is new
 #   enough to work with pkgsrc.  If not, rebuild it.
 check_pkg_install()
     local script
     copy_vulnerabilities
     # We assume filesystems are mounted!
     echo "PKG_COMP ==> Checking if pkg_install is up to date"
     script=$(mktemp $DESTDIR/pkg_comp/tmp/pkg_comp-XXXXXX).sh
     init_script $script
     cat >> $script <<EOF
 cd /usr/pkgsrc/pkgtools/pkg_comp
 fail=\$(make show-var VARNAME=PKG_FAIL_REASON)
 if echo \$fail | grep "package tools installed on this system are out of date" >/dev/null; then
     echo "PKG_COMP ==> pkg_install is out of date; rebuilding"
     cd /usr/pkgsrc/pkgtools/pkg_install
     make && make install && make clean
 fi
 EOF
     chmod +x $script
     chroot $DESTDIR /pkg_comp/tmp/`basename $script`
     rm $script
 # build_and_install pkg
+#
 #   Builds a package and ensures it gets installed.  The use of destdir to
 #   build packages may cause a package to get built but not installed,
 #   which is not OK for this script.  This is for internal usage only.
+#
 build_and_install()
+{
     pkg=${1}
     fsmount
     if pkg_build ${pkg}; then
         script=$(mktemp ${DESTDIR}/pkg_comp/tmp/pkg_comp-XXXXXX).sh
         init_script ${script}

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.45 2010/04/15 09:42:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.46 2010/07/20 16:50:25 jmmv Exp $
-DISTNAME=	pkg_comp-1.33
+DISTNAME=	pkg_comp-1.34
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	jmmv@NetBSD.org
 COMMENT=	Build packages inside a chroot jail
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 ONLY_FOR_PLATFORM=	NetBSD-*-*
 WRKSRC=		${WRKDIR}