[pkgsrc/trunk]: pkgsrc/pkgtools/pbulk pbulk-0.28:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e266ddc8d70e
branches:  trunk
changeset: 539064:e266ddc8d70e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Feb 26 13:57:51 2008 +0000

description:
pbulk-0.28:
- don't try to deinstall (and fail) on packages marked not for uninstall

diffstat:

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

diffs (34 lines):

diff -r a2c5d6911332 -r e266ddc8d70e pkgtools/pbulk/Makefile
--- a/pkgtools/pbulk/Makefile   Tue Feb 26 13:54:31 2008 +0000
+++ b/pkgtools/pbulk/Makefile   Tue Feb 26 13:57:51 2008 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2008/02/07 13:41:26 tnn Exp $
+# $NetBSD: Makefile,v 1.36 2008/02/26 13:57:51 joerg Exp $
 
-DISTNAME=      pbulk-0.27
+DISTNAME=      pbulk-0.28
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r a2c5d6911332 -r e266ddc8d70e pkgtools/pbulk/files/pbulk/scripts/pkg-build
--- a/pkgtools/pbulk/files/pbulk/scripts/pkg-build      Tue Feb 26 13:54:31 2008 +0000
+++ b/pkgtools/pbulk/files/pbulk/scripts/pkg-build      Tue Feb 26 13:57:51 2008 +0000
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: pkg-build,v 1.13 2008/01/29 08:14:44 tnn Exp $
+# $NetBSD: pkg-build,v 1.14 2008/02/26 13:57:51 joerg Exp $
 #
 # Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
 # All rights reserved.
@@ -162,8 +162,9 @@
 ${make} clean > ${bulklog}/${pkgname}/clean.log 2>&1
 
 # Test uninstall rules. This is not for cross-compiling as the install script
-# is not run in that case anyway.
-if [ "$cross_compile" = "no" ]; then
+# 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
        ${pkg_delete} -K ${cur_pkgdb} ${pkgname} > ${bulklog}/${pkgname}/deinstall.log 2>&1
 fi