 @@ -1,14 +1,14 @@
-.\" $NetBSD: pkg_comp.8,v 1.36 2012/02/27 22:42:27 jmmv Exp $
+.\" $NetBSD: pkg_comp.8,v 1.37 2012/05/19 10:54:39 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. Neither the name of The NetBSD Foundation nor the names of its
 .\"    contributors may be used to endorse or promote products derived
 .\"    from this software without specific prior written permission.
 .\" 3. Neither the name of author nor the names of its contributors may
 @@ -17,27 +17,27 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 27, 2012
+.Dd May 11, 2012
 .Dt PKG_COMP 8
 .Os
 .Sh NAME
 .Nm pkg_comp
 .Nd build packages inside a sandbox
 .Sh SYNOPSIS
 .Nm
 .Oo Fl Po
 .Cm c Ns \&| Ns Cm C
 .Pc
 .Ar conf_file
 .Oc
 .Op Fl Nn
 @@ -224,26 +224,36 @@ This is useful to add special items to t
 Defaults to nothing.
 .It INSTALL_PACKAGES
 A list of packages to automatically install after the
 .Sy makeroot
 and before installing
 .Sy BUILD_PACKAGES .
 These are also installed within the sandbox created by the
 .Sy auto
 target, but before anything is built.
 Each name must be the full package name, including the tgz suffix.
 Packages are searched inside
 .Pa $REAL_PACKAGES/All .
 Defaults to nothing.
 .It GENERATE_PKG_SUMMARY
 If set to
 .Sq yes ,
 generate a new
 .Pa $REAL_PACKAGES/pkg_summary.gz
 file at the end of every package build by both the
 .Sq auto
 and
 .Sq build
 targets.
 .It LOCALBASE
 Where binary packages get installed.
 Defaults to
 .Pa /usr/pkg .
 .It MKCONF_VARS
 A list of variable names that will be appended to the generated
 .Pa /etc/mk.conf
 file, together with their values set in the configuration file.
 Its default value contains all variables listed here.
 .It NETBSD_RELEASE
 Specifies which version number of
 .Nx
 is installed inside the chroot.

 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: pkg_comp.sh,v 1.40 2012/02/27 22:42:27 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.41 2012/05/19 10:54:40 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.
 @@ -41,27 +41,27 @@ ProgName="`basename $0`"
 # as they require special handling.
 _MKCONF_VARS="WRKDIR_BASENAME MKOBJDIRS BSDSRCDIR WRKOBJDIR DISTDIR PACKAGES \
               PKG_DEVELOPER CLEANDEPENDS LOCALBASE PKG_SYSCONFBASE \
               CFLAGS CPPFLAGS CXXFLAGS USE_AUDIT_PACKAGES PKGVULNDIR \
               USE_XPKGWEDGE PKGSRC_COMPILER \
               LIBKVER_STANDALONE_PREFIX PKG_DBDIR"
 _TEMPLATE_VARS="DESTDIR ROOTSHELL COPYROOTCFG BUILD_TARGET DISTRIBDIR SETS \
                 SETS_X11 REAL_SRC REAL_SRC_OPTS REAL_PKGSRC \
                 REAL_PKGSRC_OPTS REAL_DISTFILES REAL_DISTFILES_OPTS \
                 REAL_PACKAGES REAL_PACKAGES_OPTS REAL_PKGVULNDIR \
                 NETBSD_RELEASE MAKEROOT_HOOKS MOUNT_HOOKS UMOUNT_HOOKS \
                 SYNC_UMOUNT AUTO_TARGET AUTO_PACKAGES BUILD_PACKAGES \
-                REAL_CCACHE LIBKVER_STANDALONE_PREFIX"
+                REAL_CCACHE LIBKVER_STANDALONE_PREFIX GENERATE_PKG_SUMMARY"
 _BUILD_RESUME=
 # env_clean
+#
 #   Sets all variables that may appear in the config file to the null
 #   string, so that we know the environment is in a consistent state.
+#
 env_clean()
+{
     MKCONF_VARS=""
     TEMPLATE_VARS=""
     for var in ${_MKCONF_VARS} ${_TEMPLATE_VARS}; do
 @@ -116,26 +116,27 @@ env_setdefaults()
     : ${REAL_PKGSRC_OPTS:=-t null -o ro}
     : ${REAL_DISTFILES:=/usr/pkgsrc/distfiles}
     : ${REAL_DISTFILES_OPTS:=-t null -o rw}
     : ${REAL_PACKAGES:=/usr/pkgsrc/packages}
     : ${REAL_PACKAGES_OPTS:=-t null -o rw}
     : ${REAL_PKGVULNDIR:=/usr/pkgsrc/distfiles}
     : ${NETBSD_RELEASE:=no}
     : ${LIBKVER_STANDALONE_PREFIX:=/libkver}
     : ${MAKEROOT_HOOKS:=}
     : ${MOUNT_HOOKS:=}
     : ${UMOUNT_HOOKS:=}
     : ${SYNC_UMOUNT:=no}
     : ${REAL_CCACHE:=}
     : ${GENERATE_PKG_SUMMARY:=yes}
     if [ -n "${MAKE_PACKAGES}" ]; then
         warn "MAKE_PACKAGES is deprecated; use {AUTO,BUILD}_PACKAGES instead."
         : ${AUTO_PACKAGES:=${MAKE_PACKAGES}}
         : ${BUILD_PACKAGES:=${MAKE_PACKAGES}}
     fi
     if [ -n "${MOUNT_SCRIPT}" ]; then
         warn "MOUNT_SCRIPT is deprecated; use MOUNT_HOOKS instead."
         : ${MOUNT_HOOKS:=${MOUNT_SCRIPT}}
     fi
     if [ -n "${UMOUNT_SCRIPT}" ]; then
 @@ -678,26 +679,38 @@ pkg_auto()
         makeroot
         [ "$nflag" = "no" -a -n "$INSTALL_PACKAGES" ] &&
             pkg_install $INSTALL_PACKAGES
         echo ${pkgs} | tr ' ' '\n' > ${rfile}
     fi
     checkroot
     _BUILD_RESUME=${rfile} BUILD_TARGET=${target} pkg_build ${pkgs}
     pkg_removeroot
+}
 # generate_pkg_summary directory
+#
 #    Generates a pkg_summary.gz file in the specified directory.
 generate_pkg_summary()
+{
     local directory="${1}"; shift
     echo "PKG_COMP ==> Generating pkg_summary.tgz"
     for pkg in "${directory}"/*.tgz; do pkg_info -X "${pkg}"; done \
         | gzip -c >"${directory}"/pkg_summary.gz
+}
 # ----------------------------------------------------------------------
 # build target
 # ----------------------------------------------------------------------
 # pkg_build pkgs
+#
 #   The build target.  Also used as a helper function within this script
 #   to build several packages when needed.
+#
 pkg_build()
+{
     local failed invalid p pkgs script statfile
 @@ -743,26 +756,29 @@ EOF
         elif [ -n "${_BUILD_RESUME}" ]; then
             grep -v "^${p}\$" < ${_BUILD_RESUME} > ${_BUILD_RESUME}.new
             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
     if [ "${GENERATE_PKG_SUMMARY}" = yes ]; then
         generate_pkg_summary "${REAL_PACKAGES}/All"
     fi
+}
 # find_pkg name
+#
 #   Checks if the given package exists and outputs its path within pkgsrc.
 #   Outputs nothing if the package is not found.
 find_pkg()
+{
     local name="${1}"
     case "${name}" in
     */*)
         if [ -d "${REAL_PKGSRC}/${name}" ]; then

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.48 2012/02/27 22:42:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.49 2012/05/19 10:54:39 jmmv Exp $
-DISTNAME=	pkg_comp-1.36
+DISTNAME=	pkg_comp-1.37
 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}