pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2006Q3]: pkgsrc/mk/bulk Pullup ticket 1840 - requested by dmcm...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e5f92195a364
branches:  pkgsrc-2006Q3
changeset: 519106:e5f92195a364
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Oct 07 02:30:53 2006 +0000

description:
Pullup ticket 1840 - requested by dmcmahill
portability fix for bulk build script

   Module Name:         pkgsrc
   Committed By:        dmcmahill
   Date:                Mon Oct  2 16:37:22 UTC 2006

   Modified Files:
        pkgsrc/mk/bulk: pre-build

   Log Message:
   Change the quoting to let this work with solaris-2.9 /bin/sh.

   The particular /bin/sh bug that was biting here is

      "${x}"/*/*/"$y"

   doesn't expand the *'s if $y starts with a "." which, unfortunately, it
   does.  Using

      "${x}"/*/*/$y

   works correctly.

diffstat:

 mk/bulk/pre-build |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 9809aaaef0da -r e5f92195a364 mk/bulk/pre-build
--- a/mk/bulk/pre-build Wed Oct 04 12:05:26 2006 +0000
+++ b/mk/bulk/pre-build Sat Oct 07 02:30:53 2006 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-build,v 1.60 2006/02/12 05:00:33 rillig Exp $
+# $NetBSD: pre-build,v 1.60.6.1 2006/10/07 02:30:53 salo Exp $
 #
 # Clean up system to be ready for bulk pkg build
 #
@@ -165,7 +165,7 @@
 # Clean up state files
 cd "${USR_PKGSRC}"
 echo "pre-build> Cleaning up leftover state files from previous runs"
-rm -f "${BULKFILESDIR}"/*/*/"$BROKENF" "${BULKFILESDIR}"/*/*/"$BRKWRKLOG" "${BULKFILESDIR}"/*/*/"$BLDLOG"
+rm -f "${BULKFILESDIR}"/*/*/$BROKENF "${BULKFILESDIR}"/*/*/$BRKWRKLOG "${BULKFILESDIR}"/*/*/$BLDLOG
 rm -f "${BULKFILESDIR}/$BROKENF" "${BULKFILESDIR}/$BRKWRKLOG" "${BULKFILESDIR}/$BLDLOG" "$STARTFILE"
 
 



Home | Main Index | Thread Index | Old Index