 @@ -1,14 +1,14 @@
-.\" $NetBSD: pkg_comp.8,v 1.35 2010/04/15 09:42:45 jmmv Exp $
+.\" $NetBSD: pkg_comp.8,v 1.36 2012/02/27 22:42:27 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 April 15, 2010
+.Dd February 27, 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
 @@ -145,45 +145,55 @@ Alternatively you can specify any pathna
 with the argument of the
 .Fl C
 option.
 .Pp
 Configuration files are simple shell scripts that define
 variables.
 The default values shown here are those written in the template when
 issuing a maketemplate.
 .Bl -tag -width indent
 .It AUTO_PACKAGES
 A list of packages to automatically build during the
 .Sy auto
 target.
-A package is in the form section/name, like misc/colorls.
+A package is in the form
 .Sq section/name ,
 like
 .Sq misc/colorls ,
 or a plain name like
 .Sq colorls .
 Defaults to nothing.
 .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_PACKAGES
 A list of packages to automatically build after the
 .Sy makeroot
 target.
-A package is in the form section/name, like misc/colorls.
+A package is in the form
 .Sq section/name ,
 like
 .Sq misc/colorls ,
 or a plain name like
 .Sq colorls .
 Defaults to nothing.
 .It BUILD_TARGET
 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 package
 and
 .Ql bin-install .
 Defaults to
 .Ql package .
 .It COPYROOTCFG
 If set to
 @@ -465,28 +475,28 @@ should do (as in make).
 The following list describes all supported targets,
 in the logical order you should call them.
 .Bl -tag -width indent
 .It maketemplate
 Create a sample
 .Ar conf_file .
 You should edit it after the creation as you will probably want to change
 the default configuration, specially paths.
 .It makeroot
 Create the chroot environment, based on the specs of the configuration file.
 This step is required before trying any other, except maketemplate.
 .It build
 Builds the specified packages inside the chroot.
-You need to pass their names as relative paths inside pkgsrc, like
+You can pass the package names as a relative path within pkgsrc or as the
-.Pa pkgtools/pkg_comp .
+basename of the package directory (i.e. omitting the directory name).
 .It install
 Install the specified binary packages into the chroot.
 Package names can contain globs.
 The package files will be taken from within
 .Sy REAL_PACKAGES .
 .It chroot
 Enters the chroot environment.
 If no arguments are given,
 .Va ROOTSHELL
 is executed, otherwise whatever you typed.
 If the first argument begins with a word prefixed by
 .Li pkg_ ,
 then the

 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: pkg_comp.sh,v 1.39 2010/11/13 16:23:22 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.40 2012/02/27 22:42:27 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.
 @@ -691,33 +691,34 @@ pkg_auto()
 # ----------------------------------------------------------------------
 # 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
-    pkgs="$*"
+    pkgs=
     invalid=
-    # Check if all packages exist
+    for pkg in "${@}"; do
-    invalid=""
+        local match="$(find_pkg "${pkg}")"
-    for p in $pkgs; do
+        if [ -z "${match}" ]; then
-        if [ ! -d $REAL_PKGSRC/$p ]; then
+            invalid="${invalid} ${pkg}"
-            invalid="$invalid $p"
+        else
             pkgs="${pkgs} ${match}"
         fi
     done
     if [ -n "$invalid" ]; then
         err "invalid packages:$invalid"
     fi
     # Build them
     fsmount
     copy_vulnerabilities
     failed=""
     for p in $pkgs; do
         echo "PKG_COMP ==> Building and installing $p"
         prefix=$(mktemp $DESTDIR/pkg_comp/tmp/pkg_comp-XXXXXX)
 @@ -744,26 +745,52 @@ 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
+}
 # 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
             echo "${name}"
         else
             :  # Not found; output nothing.
         fi
         ;;
     *)
         local match="$(cd "${REAL_PKGSRC}" && echo */"${name}")"
         if [ -d "${REAL_PKGSRC}/${match}" ]; then
             echo "${match}"
         else
             :  # Not found; output nothing.
         fi
     esac
+}
 # 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.47 2010/11/13 16:23:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.48 2012/02/27 22:42:26 jmmv Exp $
-DISTNAME=	pkg_comp-1.35
+DISTNAME=	pkg_comp-1.36
 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}