bulkdir was an old configuration variable and replaced with bulklog

in the example config. Catch up in the scripts as well.
Create the log directory first for limited bulk builds.

Bump to pbulk-0.5.

3 files changed, 17 insertions, 16 deletions

diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile
index 74c160b51e7..61b82b260ad 100644
--- a/pkgtools/pbulk/Makefile
+++ b/pkgtools/pbulk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2007/06/29 22:43:26 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2007/07/16 19:25:25 joerg Exp $
 
-DISTNAME=	pbulk-0.4
+DISTNAME=	pbulk-0.5
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-build b/pkgtools/pbulk/files/pbulk/scripts/pkg-build
index 597860decff..10dbce01cbd 100755
--- a/pkgtools/pbulk/files/pbulk/scripts/pkg-build
+++ b/pkgtools/pbulk/files/pbulk/scripts/pkg-build
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: pkg-build,v 1.1.1.1 2007/06/19 19:49:59 joerg Exp $
+# $NetBSD: pkg-build,v 1.2 2007/07/16 19:25:25 joerg Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
@@ -42,7 +42,7 @@ run_make() {
 		BATCH=1 \
 		DEPENDS_TARGET=/nonexistent \
 		${MAKE_FLAGS} \
-		WRKLOG=${bulkdir}/${pkgname}/work.log
+		WRKLOG=${bulklog}/${pkgname}/work.log
 
 }
 
@@ -73,30 +73,30 @@ rm -rf ${prefix} ${pkgdb} ${varbase}/qmail 2> /dev/null || true
 [ -n "${bootstrapkit}" ] &&  tar xzf ${bootstrapkit} -C /
 
 # Output directory
-mkdir -p ${bulkdir}/${pkgname}
+mkdir -p ${bulklog}/${pkgname}
 
 # Go to target directory
 cd ${pkgsrc}/${pkgdir}
 # Clean build area, just in case
-${make} clean > ${bulkdir}/${pkgname}/pre-clean.log 2>&1
+${make} clean > ${bulklog}/${pkgname}/pre-clean.log 2>&1
 # Install all dependencies the package said it would need
 if [ ! -z "$dependencies" ]; then
-	PKG_PATH=${packages}/All ${pkg_add} $dependencies > ${bulkdir}/${pkgname}/depends.log 2>&1
+	PKG_PATH=${packages}/All ${pkg_add} $dependencies > ${bulklog}/${pkgname}/depends.log 2>&1
 fi
 # Build package, create a separate log file for each major phase
-run_make checksum  > ${bulkdir}/${pkgname}/checksum.log 2>&1 || cleanup
-run_make configure  > ${bulkdir}/${pkgname}/configure.log 2>&1 || cleanup
-run_make all  > ${bulkdir}/${pkgname}/build.log 2>&1 || cleanup
-run_make install  > ${bulkdir}/${pkgname}/install.log 2>&1 || cleanup
-run_make package  > ${bulkdir}/${pkgname}/package.log 2>&1 || cleanup
+run_make checksum  > ${bulklog}/${pkgname}/checksum.log 2>&1 || cleanup
+run_make configure  > ${bulklog}/${pkgname}/configure.log 2>&1 || cleanup
+run_make all  > ${bulklog}/${pkgname}/build.log 2>&1 || cleanup
+run_make install  > ${bulklog}/${pkgname}/install.log 2>&1 || cleanup
+run_make package  > ${bulklog}/${pkgname}/package.log 2>&1 || cleanup
 # Clean build area
-${make} clean > ${bulkdir}/${pkgname}/clean.log 2>&1
+${make} clean > ${bulklog}/${pkgname}/clean.log 2>&1
 # Test uninstall rules
-${pkg_delete} ${pkgname} > ${bulkdir}/${pkgname}/deinstall.log 2>&1
+${pkg_delete} ${pkgname} > ${bulklog}/${pkgname}/deinstall.log 2>&1
 
 # Comment the following out if you want to test all deinstall scripts.
 # This is quite expensive and mostly redundant, so it is disabled by default.
 #${pkg_delete} -r \* > /dev/null 2>&1 || true
 
 # Cleanup build logs on success
-rm -R ${bulkdir}/${pkgname}
+rm -R ${bulklog}/${pkgname}
diff --git a/pkgtools/pbulk/files/pbulk/scripts/scan b/pkgtools/pbulk/files/pbulk/scripts/scan
index e7b27b36cd9..fe7e91bd46d 100755
--- a/pkgtools/pbulk/files/pbulk/scripts/scan
+++ b/pkgtools/pbulk/files/pbulk/scripts/scan
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: scan,v 1.1.1.1 2007/06/19 19:49:59 joerg Exp $
+# $NetBSD: scan,v 1.2 2007/07/16 19:25:25 joerg Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
@@ -52,6 +52,7 @@ if [ -z "${limited_list}" ]; then
 	${presolve} -v ${loc}/pscan > ${loc}/presolve 2> ${loc}/presolve.log
 else
 	initial=1
+	mkdir -p ${loc}
 	cp "${limited_list}" ${loc}/missing
 
 	while [ -s ${loc}/missing ]; do