pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/bulk GNU tar on netbsd-1-6 doesn't grok "-T -" at t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/808bf282155d
branches:  trunk
changeset: 469581:808bf282155d
user:      grant <grant%pkgsrc.org@localhost>
date:      Wed Feb 25 09:05:40 2004 +0000

description:
GNU tar on netbsd-1-6 doesn't grok "-T -" at the end, but pax-as-tar
does, so rearrange the arguments so that "-f -" is always at the end.
noted by krister@.

while I'm here, make sure we use the same tar(1) program pkgsrc does.

diffstat:

 mk/bulk/post-build |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 24b99edb1785 -r 808bf282155d mk/bulk/post-build
--- a/mk/bulk/post-build        Wed Feb 25 08:43:30 2004 +0000
+++ b/mk/bulk/post-build        Wed Feb 25 09:05:40 2004 +0000
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.35 2004/02/15 06:17:10 grant Exp $
+# $NetBSD: post-build,v 1.36 2004/02/25 09:05:40 grant Exp $
 #
 # Collect stuff after a pkg bulk build
 #
@@ -53,6 +53,7 @@
 chomp($LOCALBASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=LOCALBASE )`);
 chomp($X11BASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=X11BASE )`);
 chomp($FIND=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=FIND )`);
+chomp($GTAR=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=GTAR )`);
 $dtfile=basename($DEPENDSTREEFILE);
 $depfile=basename($DEPENDSFILE);
 $supfile=basename($SUPPORTSFILE);
@@ -84,7 +85,7 @@
 
 # Copy over the output from the build process
 chdir($USR_PKGSRC);
-system("find . -name $BROKENFILE -print | tar plcf - -T - | (cd $FTP; tar plxf -)");
+system("find . -name $BROKENFILE -print | $GTAR -T - -plcf - | (cd $FTP; $GTAR -plxf -)");
 
 # Copy over the cache files used during the build
 foreach my $f ($DEPENDSTREEFILE, $DEPENDSFILE, $SUPPORTSFILE, $INDEXFILE, $ORDERFILE) {
@@ -139,7 +140,7 @@
 
        if (scalar(@leftovers)) {
                # Store leftovers, for easier identification:
-               system("tar plcf - -T $leftovers_txt | (cd leftovers-${arch}; tar plxf -)");
+               system("$GTAR -T $leftovers_txt -plcf - | (cd leftovers-${arch}; $GTAR -plxf -)");
        }
 
        # Add links to leftover list:



Home | Main Index | Thread Index | Old Index