From 1c42d625e1e47114cab6c43c2d6a17ca23ca2914 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Tue, 26 Feb 2008 13:57:51 +0000
Subject: pbulk-0.28: - don't try to deinstall (and fail) on packages marked
 not for uninstall

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

(limited to 'pkgtools/pbulk')

diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile
index 3f9012aecbc..8616d82f198 100644
--- a/pkgtools/pbulk/Makefile
+++ b/pkgtools/pbulk/Makefile
@@ -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 --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-build b/pkgtools/pbulk/files/pbulk/scripts/pkg-build
index 24f4a8dcd2d..0d42a9378cd 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.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>.
 # All rights reserved.
@@ -162,8 +162,9 @@ fi
 ${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
 
-- 
cgit v1.2.3