[pkgsrc/trunk]: pkgsrc/pkgtools/pbulk pbulk-0.33: Don't try to install/deinst...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b2365e5ae53d
branches:  trunk
changeset: 544418:b2365e5ae53d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jul 14 13:02:00 2008 +0000

description:
pbulk-0.33: Don't try to install/deinstall bootstrap packages.
This allows a destdir build to package bootstrap components.

diffstat:

 pkgtools/pbulk/Makefile                      |   4 ++--
 pkgtools/pbulk/files/pbulk/scripts/pkg-build |  16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diffs (57 lines):

diff -r f63864879ef1 -r b2365e5ae53d pkgtools/pbulk/Makefile
--- a/pkgtools/pbulk/Makefile   Mon Jul 14 12:55:56 2008 +0000
+++ b/pkgtools/pbulk/Makefile   Mon Jul 14 13:02:00 2008 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2008/06/20 11:51:50 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2008/07/14 13:02:00 joerg Exp $
 
-DISTNAME=      pbulk-0.32
+DISTNAME=      pbulk-0.33
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r f63864879ef1 -r b2365e5ae53d pkgtools/pbulk/files/pbulk/scripts/pkg-build
--- a/pkgtools/pbulk/files/pbulk/scripts/pkg-build      Mon Jul 14 12:55:56 2008 +0000
+++ b/pkgtools/pbulk/files/pbulk/scripts/pkg-build      Mon Jul 14 13:02:00 2008 +0000
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: pkg-build,v 1.15 2008/06/12 13:29:27 joerg Exp $
+# $NetBSD: pkg-build,v 1.16 2008/07/14 13:02:00 joerg Exp $
 #
 # Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
 # All rights reserved.
@@ -79,6 +79,10 @@
                ;;
        USE_DESTDIR=*)
                use_destdir=${build_info_line#USE_DESTDIR=}
+               ;;
+       BOOTSTRAP_PKG=*)
+               is_bootstrap=${build_info_line#BOOTSTRAP_PKG=}
+               ;;
        esac
 done
 
@@ -153,7 +157,10 @@
 run_make run_direct package  > ${bulklog}/${pkgname}/package.log 2>&1 || cleanup
 
 # When using DESTDIR build, add the package once to test install rules.
-if [ "$use_destdir" != "no" ]; then
+# This is not done for potential bootstrap packages as they might already
+# be installed.
+if [ "${use_destdir}" != "no" ] && \
+   [ -z "${is_bootstrap}" ]; then
        ${pkg_add_cmd} ${pkgname} \
            > ${bulklog}/${pkgname}/package.log 2>&1 || cleanup
 fi
@@ -163,8 +170,9 @@
 
 # Test uninstall rules. This is not for cross-compiling as the install script
 # is not run in that case anyway. This is also not done for packages marked as
-# uninstallable. The most important example for this is pkg_install itself.
-if [ "$cross_compile" = "no" ] && [ ! -f "${cur_pkgdb}/${pkgname}/+PRESERVE" ]; then
+# part of the bootstrap, those have the preserve flag set.
+if [ "$cross_compile" = "no" ] && \
+   [ -z "${is_bootstrap}" ]; then
        ${pkg_delete} -K ${cur_pkgdb} ${pkgname} > ${bulklog}/${pkgname}/deinstall.log 2>&1
 fi