summaryrefslogtreecommitdiff
path: root/pkgtools/pkg_comp
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2010-11-13 16:23:22 +0000
committerjmmv <jmmv@pkgsrc.org>2010-11-13 16:23:22 +0000
commita4a4ab26b71a26211ecbd206ac8bbbf92a3c0a06 (patch)
tree8f4fba58bdd4958c6645b83b7fc848e1fd4c0bda /pkgtools/pkg_comp
parent8f716e9ccd2c1e7f0a6de7bde883eb6916fb2436 (diff)
downloadpkgsrc-a4a4ab26b71a26211ecbd206ac8bbbf92a3c0a06.tar.gz
Update to 1.35:
* Fix BUILD_PACKAGES to really support multiple packages. Reported by Ian D. Leroux in private mail.
Diffstat (limited to 'pkgtools/pkg_comp')
-rw-r--r--pkgtools/pkg_comp/Makefile4
-rw-r--r--pkgtools/pkg_comp/files/pkg_comp.sh9
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgtools/pkg_comp/Makefile b/pkgtools/pkg_comp/Makefile
index 6fd7899cf4b..b1341b9c413 100644
--- a/pkgtools/pkg_comp/Makefile
+++ b/pkgtools/pkg_comp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2010/07/20 16:50:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.47 2010/11/13 16:23:22 jmmv Exp $
-DISTNAME= pkg_comp-1.34
+DISTNAME= pkg_comp-1.35
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkg_comp/files/pkg_comp.sh b/pkgtools/pkg_comp/files/pkg_comp.sh
index 74252e32e2e..4deecf1f99d 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.38 2010/07/20 16:50:26 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.39 2010/11/13 16:23:22 jmmv Exp $
#
# pkg_comp - Build packages inside a clean chroot environment
# Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv@NetBSD.org>
@@ -414,8 +414,11 @@ pkg_makeroot()
[ "$nflag" = "no" -a -n "$INSTALL_PACKAGES" ] &&
pkg_install $INSTALL_PACKAGES
- [ "$nflag" = "no" -a -n "$BUILD_PACKAGES" ] &&
- build_and_install $BUILD_PACKAGES
+ if [ "$nflag" = "no" -a -n "$BUILD_PACKAGES" ]; then
+ for pkg in $BUILD_PACKAGES; do
+ build_and_install $pkg
+ done
+ fi
}
# makeroot