pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Change the EXTRACT_USING_PAX defined/undefined option ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/549572ecfec6
branches: trunk
changeset: 493877:549572ecfec6
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon May 16 03:04:44 2005 +0000
description:
Change the EXTRACT_USING_PAX defined/undefined option into a EXTRACT_USING
which can take multiple values -- "pax" or "gtar". The default value
of EXTRACT_USING is "pax", which more closely matches reality since
before, we were using bootstrap "tar" for ${GTAR} and it was actually
pax-as-tar. Also, stop pretending pax-as-tar from the bootstrap kit
or on NetBSD is GNU tar. Lastly, in bsd.pkg.extract.mk, note whether
we need "pax" or "gtar" depending on what we need to extract the
distfiles.
diffstat:
databases/mysql-client/Makefile.common | 6 +++---
databases/mysql4-client/Makefile.common | 6 +++---
devel/boehm-gc/Makefile | 4 ++--
devel/p5-Getopt-Simple/Makefile | 4 ++--
lang/japhar/Makefile | 4 ++--
lang/mzscheme/Makefile | 4 ++--
mk/bsd.pkg.extract.mk | 31 +++++++++++++++++--------------
mk/bsd.pkg.mk | 8 ++++----
mk/defaults/mk.conf | 10 +++++-----
mk/tools/replace.mk | 9 +--------
mk/tools/tools.BSDOS.mk | 3 +--
mk/tools/tools.DragonFly.mk | 3 +--
mk/tools/tools.FreeBSD.mk | 3 +--
mk/tools/tools.NetBSD.mk | 3 +--
mk/tools/tools.OpenBSD.mk | 3 +--
print/ja-ptex-bin/Makefile | 23 ++++++++++-------------
print/ja-ptex-share/Makefile | 25 +++++++++++--------------
print/teTeX-share/Makefile | 11 ++++-------
print/teTeX-sharesrc/Makefile | 12 ++++--------
print/teTeX3-texmf/Makefile | 12 ++++--------
print/teTeX3-texmfsrc/Makefile | 12 ++++--------
sysutils/lsof/Makefile | 8 ++------
www/htdig/Makefile | 9 +++++----
www/p5-HTML-LinkExtractor/Makefile | 5 ++---
www/p5-HTML-Scrubber/Makefile | 4 ++--
25 files changed, 94 insertions(+), 128 deletions(-)
diffs (truncated from 643 to 300 lines):
diff -r eb1a3bd94d23 -r 549572ecfec6 databases/mysql-client/Makefile.common
--- a/databases/mysql-client/Makefile.common Mon May 16 01:32:22 2005 +0000
+++ b/databases/mysql-client/Makefile.common Mon May 16 03:04:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2005/04/11 21:45:12 tv Exp $
+# $NetBSD: Makefile.common,v 1.41 2005/05/16 03:04:44 jlam Exp $
DISTNAME= mysql-4.0.24
CATEGORIES= databases
@@ -9,13 +9,13 @@
MAINTAINER= xtraeme%NetBSD.org@localhost
HOMEPAGE= http://www.mysql.com/
-EXTRACT_USING_PAX= # defined
-
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
+EXTRACT_USING= pax
+
# MYSQL_USER username of the database administrator
# MYSQL_GROUP group of the database administrator
# MYSQL_DATADIR home directory of the database administrator and
diff -r eb1a3bd94d23 -r 549572ecfec6 databases/mysql4-client/Makefile.common
--- a/databases/mysql4-client/Makefile.common Mon May 16 01:32:22 2005 +0000
+++ b/databases/mysql4-client/Makefile.common Mon May 16 03:04:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2005/04/11 21:45:12 tv Exp $
+# $NetBSD: Makefile.common,v 1.37 2005/05/16 03:04:44 jlam Exp $
DISTNAME= mysql-4.1.11
CATEGORIES= databases
@@ -9,13 +9,13 @@
MAINTAINER= xtraeme%NetBSD.org@localhost
HOMEPAGE= http://www.mysql.com/
-EXTRACT_USING_PAX= # defined
-
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
+EXTRACT_USING= pax
+
# MYSQL_USER username of the database administrator
# MYSQL_GROUP group of the database administrator
# MYSQL_DATADIR home directory of the database administrator and
diff -r eb1a3bd94d23 -r 549572ecfec6 devel/boehm-gc/Makefile
--- a/devel/boehm-gc/Makefile Mon May 16 01:32:22 2005 +0000
+++ b/devel/boehm-gc/Makefile Mon May 16 03:04:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.47 2005/05/16 03:04:44 jlam Exp $
DISTNAME= gc6.4
PKGNAME= ${DISTNAME:S/gc/boehm-gc-/}
@@ -28,7 +28,7 @@
CONFIGURE_ARGS+= --disable-threads
.endif
-.if defined(EXTRACT_USING_PAX)
+.if !empty(EXTRACT_USING:Mpax)
EXTRACT_ELEMENTS= -u
.endif
diff -r eb1a3bd94d23 -r 549572ecfec6 devel/p5-Getopt-Simple/Makefile
--- a/devel/p5-Getopt-Simple/Makefile Mon May 16 01:32:22 2005 +0000
+++ b/devel/p5-Getopt-Simple/Makefile Mon May 16 03:04:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:32 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/16 03:04:45 jlam Exp $
DISTNAME= Getopt-Simple-1.48
PKGNAME= p5-${DISTNAME}
@@ -13,7 +13,7 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
-EXTRACT_USING_PAX= # defined
+EXTRACT_USING= pax
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Getopt/Simple/.packlist
diff -r eb1a3bd94d23 -r 549572ecfec6 lang/japhar/Makefile
--- a/lang/japhar/Makefile Mon May 16 01:32:22 2005 +0000
+++ b/lang/japhar/Makefile Mon May 16 03:04:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/11/13 22:04:53 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/16 03:04:45 jlam Exp $
#
DISTNAME= japhar-0.08
@@ -23,6 +23,6 @@
.include "../../mk/bsd.prefs.mk"
# The japhar tar archive uses ././@LongLink GNU tar hacks
-.undef EXTRACT_USING_PAX
+EXTRACT_USING= gtar
.include "../../mk/bsd.pkg.mk"
diff -r eb1a3bd94d23 -r 549572ecfec6 lang/mzscheme/Makefile
--- a/lang/mzscheme/Makefile Mon May 16 01:32:22 2005 +0000
+++ b/lang/mzscheme/Makefile Mon May 16 03:04:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:19:17 agc Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/16 03:04:45 jlam Exp $
DISTNAME= mzscheme-205.src.unix
PKGNAME= mzscheme-205
@@ -14,7 +14,7 @@
WRKSRC= ${WRKDIR}/plt/src
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= ./configure
-EXTRACT_USING_PAX= # defined
+EXTRACT_USING= pax
ONLY_FOR_PLATFORM= NetBSD-*-i386
ONLY_FOR_PLATFORM+= Linux-*-i386
diff -r eb1a3bd94d23 -r 549572ecfec6 mk/bsd.pkg.extract.mk
--- a/mk/bsd.pkg.extract.mk Mon May 16 01:32:22 2005 +0000
+++ b/mk/bsd.pkg.extract.mk Mon May 16 03:04:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.extract.mk,v 1.3 2005/05/15 03:57:21 jlam Exp $
+# $NetBSD: bsd.pkg.extract.mk,v 1.4 2005/05/16 03:04:45 jlam Exp $
#
# This Makefile fragment is included to bsd.pkg.mk and defines the
# relevant variables and targets for the "extract" phase.
@@ -44,11 +44,16 @@
_EXTRACT_SUFFIXES+= .bin
_EXTRACT_SUFFIXES+= .rar
-# If the distfile has a tar.bz2 suffix, use bzcat in preference to gzcat,
-# pulling in the "bzip2" package if necessary. [Note: this is only for
-# the benefit of pre-1.5 NetBSD systems. "gzcat" on newer systems happily
-# decodes bzip2.] Do likewise for ".zip" and ".lha" distfiles.
-#
+.if !empty(EXTRACT_ONLY:M*.tar) || !empty(EXTRACT_ONLY:M*.tar.*) || \
+ !empty(EXTRACT_SUFX:M*.tar) || !empty(EXTRACT_SUFX:M*.tar.*) || \
+ !empty(EXTRACT_ONLY:M*.tbz) || !empty(EXTRACT_ONLY:M*.tgz) || \
+ !empty(EXTRACT_SUFX:M*.tbz) || !empty(EXTRACT_SUFX:M*.tgz)
+. if !empty(EXTRACT_USING:Mgtar)
+PKGSRC_USE_TOOLS+= gtar
+. else
+PKGSRC_USE_TOOLS+= pax
+. endif
+.endif
.if !empty(EXTRACT_ONLY:M*.bz2) || !empty(EXTRACT_ONLY:M*.tbz) || \
!empty(EXTRACT_SUFX:M*.bz2) || !empty(EXTRACT_SUFX:M*.tbz)
. if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
@@ -153,20 +158,18 @@
EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${SH}
.endfor
-# If EXTRACT_USING_PAX is defined, use pax in preference to (GNU) tar.
-#
-.if defined(EXTRACT_USING_PAX)
+.if !empty(EXTRACT_USING:Mgtar)
+_DFLT_EXTRACT_CMD?= ${DECOMPRESS_CMD} $${extract_file} | ${GTAR} -xf - ${EXTRACT_ELEMENTS}
+.else
_DFLT_EXTRACT_CMD?= ${DECOMPRESS_CMD} $${extract_file} | ${PAX} -O -r ${EXTRACT_ELEMENTS}
-.else
-_DFLT_EXTRACT_CMD?= ${DECOMPRESS_CMD} $${extract_file} | ${GTAR} -xf - ${EXTRACT_ELEMENTS}
.endif
.for __suffix__ in ${_EXTRACT_SUFFIXES}
. if !defined(EXTRACT_CMD${__suffix__})
-. if defined(EXTRACT_USING_PAX)
+. if !empty(EXTRACT_USING:Mgtar)
+EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${GTAR} -xf - ${EXTRACT_ELEMENTS}
+. else
EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${PAX} -O -r ${EXTRACT_ELEMENTS}
-. else
-EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${GTAR} -xf - ${EXTRACT_ELEMENTS}
. endif
. endif
.endfor
diff -r eb1a3bd94d23 -r 549572ecfec6 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Mon May 16 01:32:22 2005 +0000
+++ b/mk/bsd.pkg.mk Mon May 16 03:04:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1657 2005/05/16 00:11:50 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1658 2005/05/16 03:07:38 jlam Exp $
#
# This file is in the public domain.
#
@@ -831,9 +831,9 @@
#
PKGSRC_USE_TOOLS+= \
[ awk basename cat chgrp chmod chown cmp cp cut date dirname \
- echo egrep env expr false fgrep file find grep gtar head \
- hostname id install ln ls m4 mkdir mv nice pax pwd rm rmdir sed \
- sh sort tail tar tee test touch tr true tsort wc xargs
+ echo egrep env expr false fgrep file find grep head hostname id \
+ install ln ls m4 mkdir mv nice pax pwd rm rmdir sed sh sort \
+ tail tee test touch tr true tsort wc xargs
.if !defined(NO_MTREE)
PKGSRC_USE_TOOLS+= mtree
diff -r eb1a3bd94d23 -r 549572ecfec6 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf Mon May 16 01:32:22 2005 +0000
+++ b/mk/defaults/mk.conf Mon May 16 03:04:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.40 2005/05/08 13:43:30 dillo Exp $
+# $NetBSD: mk.conf,v 1.41 2005/05/16 03:07:38 jlam Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -507,10 +507,10 @@
# Possible: any combination of packages
# Default: not set
-#EXTRACT_USING_PAX=
-# Use pax(1) to extract archives, rather than GNU tar.
-# Possible: defined, not defined
-# Default: not defined
+EXTRACT_USING?= pax
+# Use the specified tool to extract tar/ustar archives.
+# Possible: pax, gtar
+# Default: pax
#FAILOVER_FETCH=
# Perform a checksum at "make fetch" time. If the checksum doesn't
diff -r eb1a3bd94d23 -r 549572ecfec6 mk/tools/replace.mk
--- a/mk/tools/replace.mk Mon May 16 01:32:22 2005 +0000
+++ b/mk/tools/replace.mk Mon May 16 03:04:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.78 2005/05/15 23:20:38 jlam Exp $
+# $NetBSD: replace.mk,v 1.79 2005/05/16 03:07:38 jlam Exp $
#
# This Makefile fragment handles "replacements" of system-supplied
# tools with pkgsrc versions.
@@ -467,13 +467,6 @@
TOOLS_REAL_CMD.gtar= ${TOOLS_PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar
TOOLS_${_TOOLS_VARNAME.gtar}= ${TOOLS_REAL_CMD.gtar}
. endif
-#
-# The most likely situation is that "gtar" is pax-as-tar, and older
-# versions of it don't understand what to do if they're invoked as
-# "gtar". Explicitly set TOOLS_REAL_CMDLINE.gtar to force a wrapper
-# script to be created.
-#
-TOOLS_REAL_CMDLINE.gtar?= ${TOOLS_REAL_CMDLINE_DFLT.gtar}
.endif
.if !defined(TOOLS_IGNORE.gunzip) && !empty(_USE_TOOLS:Mgunzip)
diff -r eb1a3bd94d23 -r 549572ecfec6 mk/tools/tools.BSDOS.mk
--- a/mk/tools/tools.BSDOS.mk Mon May 16 01:32:22 2005 +0000
+++ b/mk/tools/tools.BSDOS.mk Mon May 16 03:04:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.BSDOS.mk,v 1.10 2005/05/14 21:15:07 jlam Exp $
+# $NetBSD: tools.BSDOS.mk,v 1.11 2005/05/16 03:07:38 jlam Exp $
#
# System-supplied tools for the BSD/OS operating system.
@@ -23,7 +23,6 @@
TOOLS_PLATFORM.file?= /usr/bin/file
TOOLS_PLATFORM.find?= /usr/bin/find
TOOLS_PLATFORM.grep?= /bin/grep
-TOOLS_PLATFORM.gtar?= /bin/tar
TOOLS_PLATFORM.gunzip?= /usr/contrib/bin/gunzip -f
TOOLS_PLATFORM.gzcat?= /usr/contrib/bin/gzcat
TOOLS_PLATFORM.gzip?= /usr/contrib/bin/gzip -nf ${GZIP}
diff -r eb1a3bd94d23 -r 549572ecfec6 mk/tools/tools.DragonFly.mk
--- a/mk/tools/tools.DragonFly.mk Mon May 16 01:32:22 2005 +0000
+++ b/mk/tools/tools.DragonFly.mk Mon May 16 03:04:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.11 2005/05/14 21:15:07 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.12 2005/05/16 03:07:38 jlam Exp $
#
# System-supplied tools for the DragonFly operating system.
@@ -24,7 +24,6 @@
TOOLS_PLATFORM.file?= /usr/bin/file
TOOLS_PLATFORM.find?= /usr/bin/find
TOOLS_PLATFORM.grep?= /usr/bin/grep
-TOOLS_PLATFORM.gtar?= /usr/bin/tar
TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f
TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat
TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
diff -r eb1a3bd94d23 -r 549572ecfec6 mk/tools/tools.FreeBSD.mk
--- a/mk/tools/tools.FreeBSD.mk Mon May 16 01:32:22 2005 +0000
+++ b/mk/tools/tools.FreeBSD.mk Mon May 16 03:04:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.11 2005/05/14 21:15:07 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.12 2005/05/16 03:07:38 jlam Exp $
#
# System-supplied tools for the FreeBSD operating system.
@@ -26,7 +26,6 @@
TOOLS_PLATFORM.file?= /usr/bin/file
TOOLS_PLATFORM.find?= /usr/bin/find
TOOLS_PLATFORM.grep?= /usr/bin/grep
-TOOLS_PLATFORM.gtar?= /usr/bin/tar
TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f
TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat
TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
diff -r eb1a3bd94d23 -r 549572ecfec6 mk/tools/tools.NetBSD.mk
Home |
Main Index |
Thread Index |
Old Index