[pkgsrc/trunk]: pkgsrc/mk/bulk Renamed the "pack" option for _PRESERVE_WRKSRC...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/78827718cb76
branches:  trunk
changeset: 519649:78827718cb76
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Oct 07 06:35:01 2006 +0000

description:
Renamed the "pack" option for _PRESERVE_WRKSRC to "pack-if-failed",
since that's what I really wanted. It's just one day old, so I hope that
nobody has gotten used to it.

diffstat:

 mk/bulk/bsd.bulk-pkg.mk |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r df4d9c580602 -r 78827718cb76 mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Sat Oct 07 06:14:06 2006 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Sat Oct 07 06:35:01 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.bulk-pkg.mk,v 1.123 2006/10/06 09:41:23 rillig Exp $
+#      $NetBSD: bsd.bulk-pkg.mk,v 1.124 2006/10/07 06:35:01 rillig Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -184,8 +184,9 @@
 #
 
 # If this is "yes", the working directory will not be cleaned after building
-# the package. It can also be set to "pack" to save a .tar.gz file of the
-# working directory in BULKFILESDIR instead of keeping the files.
+# the package. It can also be set to "pack-if-failed" to save a .tar.gz
+# file of the working directory in BULKFILESDIR instead of keeping the files,
+# but only if the package failed to build.
 _PRESERVE_WRKDIR?=     no
 
 # create an escaped version of PKGPATH.  We do this because
@@ -535,7 +536,7 @@
                        ${ECHO} " $$nerrors ${PKGPATH}/${BROKENFILE} $$nbrokenby " >> ${BULKFILESDIR:Q}/${BROKENFILE:Q} \
                        ) 2>&1 | ${TEE} -a ${_BROKENFILE:Q}; \
                fi ; \
-               if [ ${_PRESERVE_WRKDIR} = "pack" ]; then               \
+               if [ ${_PRESERVE_WRKDIR} = "pack-if-failed" ] && [ ! -f ${PKGFILE} ]; then \
                        (cd ${WRKDIR}                                   \
                        && ${PAX} -wz -f ${_BULK_PKGLOGDIR}/wrkdir.tar.gz . \
                        ) || ${TRUE};                                   \