diff options
-rw-r--r-- | databases/mysql-client/Makefile.common | 6 | ||||
-rw-r--r-- | databases/mysql4-client/Makefile.common | 6 | ||||
-rw-r--r-- | devel/boehm-gc/Makefile | 4 | ||||
-rw-r--r-- | devel/p5-Getopt-Simple/Makefile | 4 | ||||
-rw-r--r-- | lang/japhar/Makefile | 4 | ||||
-rw-r--r-- | lang/mzscheme/Makefile | 4 | ||||
-rw-r--r-- | mk/bsd.pkg.extract.mk | 31 | ||||
-rw-r--r-- | mk/bsd.pkg.mk | 8 | ||||
-rw-r--r-- | mk/defaults/mk.conf | 10 | ||||
-rw-r--r-- | mk/tools/replace.mk | 9 | ||||
-rw-r--r-- | mk/tools/tools.BSDOS.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.DragonFly.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.FreeBSD.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.NetBSD.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.OpenBSD.mk | 3 | ||||
-rw-r--r-- | print/ja-ptex-bin/Makefile | 23 | ||||
-rw-r--r-- | print/ja-ptex-share/Makefile | 15 | ||||
-rw-r--r-- | print/teTeX-share/Makefile | 11 | ||||
-rw-r--r-- | print/teTeX-sharesrc/Makefile | 12 | ||||
-rw-r--r-- | print/teTeX3-texmf/Makefile | 12 | ||||
-rw-r--r-- | print/teTeX3-texmfsrc/Makefile | 12 | ||||
-rw-r--r-- | sysutils/lsof/Makefile | 8 | ||||
-rw-r--r-- | www/htdig/Makefile | 9 | ||||
-rw-r--r-- | www/p5-HTML-LinkExtractor/Makefile | 5 | ||||
-rw-r--r-- | www/p5-HTML-Scrubber/Makefile | 4 |
25 files changed, 89 insertions, 123 deletions
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index 6fe850e966e..3293e0c5341 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -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 @@ MASTER_SITES= http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.0/ \ MAINTAINER= xtraeme@NetBSD.org 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 --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index a50635bcc55..6b2c2ca2499 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -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 @@ MASTER_SITES= http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/ \ MAINTAINER= xtraeme@NetBSD.org 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 --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile index 930bea97a3f..a27d988cd83 100644 --- a/devel/boehm-gc/Makefile +++ b/devel/boehm-gc/Makefile @@ -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 @@ MAKE_ENV+= COPTS=${CFLAGS:Q} CONFIGURE_ARGS+= --disable-threads .endif -.if defined(EXTRACT_USING_PAX) +.if !empty(EXTRACT_USING:Mpax) EXTRACT_ELEMENTS= -u .endif diff --git a/devel/p5-Getopt-Simple/Makefile b/devel/p5-Getopt-Simple/Makefile index c0d87fa21ec..c011da74fb2 100644 --- a/devel/p5-Getopt-Simple/Makefile +++ b/devel/p5-Getopt-Simple/Makefile @@ -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 @@ COMMENT= Simple Getopt wrapper PKG_INSTALLATION_TYPES= overwrite pkgviews -EXTRACT_USING_PAX= # defined +EXTRACT_USING= pax PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Getopt/Simple/.packlist diff --git a/lang/japhar/Makefile b/lang/japhar/Makefile index 4fd77c618db..c816f7a105d 100644 --- a/lang/japhar/Makefile +++ b/lang/japhar/Makefile @@ -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 @@ INFO_FILES= japhar.info .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 --git a/lang/mzscheme/Makefile b/lang/mzscheme/Makefile index 3d1ff81f426..331c6a40bd3 100644 --- a/lang/mzscheme/Makefile +++ b/lang/mzscheme/Makefile @@ -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 @@ CONFLICTS+= drscheme*:../drscheme 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 --git a/mk/bsd.pkg.extract.mk b/mk/bsd.pkg.extract.mk index 067b289b01a..e6854f857b8 100644 --- a/mk/bsd.pkg.extract.mk +++ b/mk/bsd.pkg.extract.mk @@ -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+= .zoo _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} > `${ 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) -_DFLT_EXTRACT_CMD?= ${DECOMPRESS_CMD} $${extract_file} | ${PAX} -O -r ${EXTRACT_ELEMENTS} -.else +.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} .endif .for __suffix__ in ${_EXTRACT_SUFFIXES} . if !defined(EXTRACT_CMD${__suffix__}) -. if defined(EXTRACT_USING_PAX) -EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${PAX} -O -r ${EXTRACT_ELEMENTS} -. else +. 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} . endif . endif .endfor diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 5db514eb119..53399e70229 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 @@ BUILD_DEFS+= PKG_SYSCONFBASEDIR PKG_SYSCONFDIR # 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 --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 4ab984de23c..446f6350d12 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -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 @@ PATCH_FUZZ_FACTOR?= -F0 # 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 --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 45c6297ddbf..131ae3f6888 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -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_FIND_PREFIX+= TOOLS_PREFIX.gtar=gtar-base 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 --git a/mk/tools/tools.BSDOS.mk b/mk/tools/tools.BSDOS.mk index 1f4a8d8eff3..495db8d7c40 100644 --- a/mk/tools/tools.BSDOS.mk +++ b/mk/tools/tools.BSDOS.mk @@ -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.fgrep?= /bin/fgrep 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 --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk index ba396ef19ac..ca43ae3e798 100644 --- a/mk/tools/tools.DragonFly.mk +++ b/mk/tools/tools.DragonFly.mk @@ -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.fgrep?= /usr/bin/fgrep 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 --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk index bf0fc3b70fe..26f7673fa01 100644 --- a/mk/tools/tools.FreeBSD.mk +++ b/mk/tools/tools.FreeBSD.mk @@ -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.fgrep?= /usr/bin/fgrep 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 --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk index 010f9d0aa8a..6ad7e7cde2f 100644 --- a/mk/tools/tools.NetBSD.mk +++ b/mk/tools/tools.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.NetBSD.mk,v 1.12 2005/05/14 21:15:07 jlam Exp $ +# $NetBSD: tools.NetBSD.mk,v 1.13 2005/05/16 03:07:38 jlam Exp $ # # System-supplied tools for the NetBSD operating system. @@ -30,7 +30,6 @@ TOOLS_PLATFORM.gawk?= ${TOOLS_PLATFORM.awk} .endif TOOLS_PLATFORM.grep?= /usr/bin/grep TOOLS_PLATFORM.gsed?= ${TOOLS_PLATFORM.sed} # GNUish -TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP} diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk index 323e61f2d0d..3b7681b6210 100644 --- a/mk/tools/tools.OpenBSD.mk +++ b/mk/tools/tools.OpenBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.OpenBSD.mk,v 1.10 2005/05/14 21:15:07 jlam Exp $ +# $NetBSD: tools.OpenBSD.mk,v 1.11 2005/05/16 03:07:38 jlam Exp $ # # System-supplied tools for the OpenBSD operating system. @@ -23,7 +23,6 @@ TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep TOOLS_PLATFORM.file?= /usr/bin/file TOOLS_PLATFORM.find?= /usr/bin/find TOOLS_PLATFORM.grep?= /usr/bin/grep -TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP} diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile index be9675f6dd5..f82b0e8711c 100644 --- a/print/ja-ptex-bin/Makefile +++ b/print/ja-ptex-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/16 01:15:32 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/05/16 03:04:45 jlam Exp $ DISTNAME= ptex-src-${PTEX_VERS} PKGNAME= ja-ptex-bin-${PTEX_VERS} @@ -32,9 +32,6 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL PTEX_VERS= 3.1.2 DVIPSK_PATCH_VERS= p1.6 MENDEXK_VERS= 2.5 -.if !defined(EXTRACT_USING_PAX) -PKGSRC_USE_TOOLS+= gtar -.endif DF_TETEX_BIN= tetex-src-${TETEX_BIN_VERS}${EXTRACT_SUFX} DF_DVIPSK_PATCH= dvipsk-jpatch-${DVIPSK_PATCH_VERS}${EXTRACT_SUFX} @@ -62,15 +59,7 @@ pre-extract: fi; post-extract: -.if defined(EXTRACT_USING_PAX) - cd ${WRKDIR_} && \ - ${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_TETEX_BIN} - cd ${WRKSRC}/texk/web2c && \ - ${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} - cd ${WRKSRC}/texk && \ - ${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_DVIPSK_PATCH}; \ - ${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_MENDEXK} -.else +.if !empty(EXTRACT_USING:Mgtar) cd ${WRKDIR_} && \ ${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DF_TETEX_BIN} cd ${WRKSRC}/texk/web2c && \ @@ -78,6 +67,14 @@ post-extract: cd ${WRKSRC}/texk && \ ${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DF_DVIPSK_PATCH}; \ ${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DF_MENDEXK} +.else + cd ${WRKDIR_} && \ + ${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_TETEX_BIN} + cd ${WRKSRC}/texk/web2c && \ + ${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} + cd ${WRKSRC}/texk && \ + ${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_DVIPSK_PATCH}; \ + ${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_MENDEXK} .endif ${SED} -e "s|\$$TEXMF/ptex/plain/||" \ ${LOCALBASE}/share/texmf.local/ptex/plain/base/ptex.tex > \ diff --git a/print/ja-ptex-share/Makefile b/print/ja-ptex-share/Makefile index 066bd159617..4f6f4444c45 100644 --- a/print/ja-ptex-share/Makefile +++ b/print/ja-ptex-share/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/16 01:15:32 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/05/16 03:04:45 jlam Exp $ DISTNAME= ptex-texmf-2.1 PKGNAME= ja-ptex-share-2.1 @@ -25,27 +25,24 @@ DIST_SUBDIR= teTeX NO_CONFIGURE= YES NO_BUILD= YES TEXMFLOCAL= ${PREFIX}/share/texmf.local -.if !defined(EXTRACT_USING_PAX) -PKGSRC_USE_TOOLS+= gtar -.endif do-install: ${INSTALL_DATA_DIR} ${TEXMFLOCAL} -.if defined(EXTRACT_USING_PAX) +.if !empty(EXTRACT_USING:Mgtar) cd ${TEXMFLOCAL} && \ - ${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} + ${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} cd ${TEXMFLOCAL}/fonts && \ for f in jis nmin-ngoth standard morisawa; do \ - ${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/$$f${EXTRACT_SUFX}; \ + ${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/$$f${EXTRACT_SUFX}; \ ${MV} ${TEXMFLOCAL}/fonts/$$f/tfm ${TEXMFLOCAL}/fonts/tfm/$$f;\ ${MV} ${TEXMFLOCAL}/fonts/$$f/vf ${TEXMFLOCAL}/fonts/vf/$$f;\ done .else cd ${TEXMFLOCAL} && \ - ${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} + ${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} cd ${TEXMFLOCAL}/fonts && \ for f in jis nmin-ngoth standard morisawa; do \ - ${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/$$f${EXTRACT_SUFX}; \ + ${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/$$f${EXTRACT_SUFX}; \ ${MV} ${TEXMFLOCAL}/fonts/$$f/tfm ${TEXMFLOCAL}/fonts/tfm/$$f;\ ${MV} ${TEXMFLOCAL}/fonts/$$f/vf ${TEXMFLOCAL}/fonts/vf/$$f;\ done diff --git a/print/teTeX-share/Makefile b/print/teTeX-share/Makefile index c0f30aec004..d0980979fd7 100644 --- a/print/teTeX-share/Makefile +++ b/print/teTeX-share/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/05/16 01:15:33 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/05/16 03:04:45 jlam Exp $ # DISTNAME= tetex-texmf-2.0.2 @@ -24,19 +24,16 @@ NO_CONFIGURE= yes NO_BUILD= yes USE_GNU_TOOLS+= patch -.if !defined(EXTRACT_USING_PAX) -PKGSRC_USE_TOOLS+= gtar -.endif do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/texmf -.if defined(EXTRACT_USING_PAX) +.if !empty(EXTRACT_USING:Mgtar) for i in ${DISTFILES}; do \ - cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/$$i | ${PAX} -O -cr `${CAT} ${FILESDIR}/exclude`; \ + cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/$$i | ${GTAR} -X ${FILESDIR}/exclude -xpf -; \ done .else for i in ${DISTFILES}; do \ - cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/$$i | ${GTAR} -X ${FILESDIR}/exclude -xpf -; \ + cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/$$i | ${PAX} -O -cr `${CAT} ${FILESDIR}/exclude`; \ done .endif cd ${PREFIX}/share/texmf/dvipdfm/config && \ diff --git a/print/teTeX-sharesrc/Makefile b/print/teTeX-sharesrc/Makefile index 92666b8cf24..81679f2460d 100644 --- a/print/teTeX-sharesrc/Makefile +++ b/print/teTeX-sharesrc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/16 01:15:33 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/05/16 03:04:45 jlam Exp $ DISTNAME= tetex-texmfsrc-2.0.2 PKGNAME= teTeX-sharesrc-2.0.2 @@ -20,16 +20,12 @@ NO_CONFIGURE= yes NO_BUILD= yes NO_MTREE= yes -.if !defined(EXTRACT_USING_PAX) -PKGSRC_USE_TOOLS+= gtar -.endif - do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/texmf -.if defined(EXTRACT_USING_PAX) - cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -r -.else +.if !empty(EXTRACT_USING:Mgtar) cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${GTAR} -xpf - +.else + cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -r .endif .include "../../mk/bsd.pkg.mk" diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile index 1af7e7861e2..43f053e3a25 100644 --- a/print/teTeX3-texmf/Makefile +++ b/print/teTeX3-texmf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/16 01:15:33 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/05/16 03:04:45 jlam Exp $ # DISTNAME= tetex-texmf-3.0 @@ -20,16 +20,12 @@ NO_CONFIGURE= yes NO_BUILD= yes USE_GNU_TOOLS+= patch -.if !defined(EXTRACT_USING_PAX) -PKGSRC_USE_TOOLS+= gtar -.endif - do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/texmf -.if defined(EXTRACT_USING_PAX) - cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -cr `${CAT} ${FILESDIR}/exclude` -.else +.if !empty(EXTRACT_USING:Mgtar) cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${GTAR} -X ${FILESDIR}/exclude -xpf - +.else + cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -cr `${CAT} ${FILESDIR}/exclude` .endif cd ${PREFIX}/share/texmf/dvipdfm/config && \ ${PATCH} ${_PATCH_BACKUP_ARG} .orig < ${FILESDIR}/dvipdfm-config.diff && \ diff --git a/print/teTeX3-texmfsrc/Makefile b/print/teTeX3-texmfsrc/Makefile index ef804b68314..3210599a036 100644 --- a/print/teTeX3-texmfsrc/Makefile +++ b/print/teTeX3-texmfsrc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/16 01:15:33 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/05/16 03:04:45 jlam Exp $ # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp # @@ -22,16 +22,12 @@ NO_CONFIGURE= yes NO_BUILD= yes NO_MTREE= yes -.if !defined(EXTRACT_USING_PAX) -PKGSRC_USE_TOOLS+= gtar -.endif - do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/texmf -.if defined(EXTRACT_USING_PAX) - cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -r -.else +.if !empty(EXTRACT_USING:Mgtar) cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${GTAR} -xpf - +.else + cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -r .endif .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index 7d011394f9c..c4ead6c2d30 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2005/05/16 01:15:33 jlam Exp $ +# $NetBSD: Makefile,v 1.84 2005/05/16 03:04:45 jlam Exp $ # DISTNAME= lsof_4.74 @@ -32,10 +32,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews .include "../../mk/bsd.prefs.mk" -.if !defined(EXTRACT_USING_PAX) -PKGSRC_USE_TOOLS+= gtar -.endif - .if ${OPSYS} == "NetBSD" REAL_GROUP= -g kmem .elif ${OPSYS} == "SunOS" @@ -54,7 +50,7 @@ post-extract: ${ECHO} "($$EXPMD5 != $$CALCMD5)" ; \ ${FALSE} ; \ fi ; \ - if [ "X${EXTRACT_USING_PAX}" = "X" ]; then \ + if [ X${EXTRACT_USING} = Xgtar ]; then \ ${GTAR} -xf ${SRCBALL_NAME}.tar; \ else \ ${PAX} -O -r < ${SRCBALL_NAME}.tar; \ diff --git a/www/htdig/Makefile b/www/htdig/Makefile index 583946f7bd9..d311b53c077 100644 --- a/www/htdig/Makefile +++ b/www/htdig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/04/19 00:28:31 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2005/05/16 03:04:45 jlam Exp $ DISTNAME= htdig-3.1.6 PKGREVISION= 3 @@ -41,10 +41,11 @@ CONF_FILES+= ${PREFIX}/share/examples/htdig/htdig.conf \ ${PKG_SYSCONFDIR}/htdig.conf .include "../../mk/bsd.prefs.mk" -.if defined(EXTRACT_USING_PAX) -EXTRACT_ELEMENTS= -c ${DISTNAME}/db* -.else + +.if !empty(EXTRACT_USING:Mgtar) EXTRACT_ELEMENTS= --exclude ${DISTNAME}/db* +.else +EXTRACT_ELEMENTS= -c ${DISTNAME}/db* .endif .include "../../databases/db/buildlink3.mk" diff --git a/www/p5-HTML-LinkExtractor/Makefile b/www/p5-HTML-LinkExtractor/Makefile index 9138d533971..1db92175250 100644 --- a/www/p5-HTML-LinkExtractor/Makefile +++ b/www/p5-HTML-LinkExtractor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:56 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/05/16 03:04:45 jlam Exp $ DISTNAME= HTML-LinkExtractor-0.121 PKGNAME= p5-${DISTNAME} @@ -10,9 +10,8 @@ MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://search.cpan.org/~podmaster/${DISTNAME}/ COMMENT= Extract links from an HTML document -EXTRACT_USING_PAX= # defined - PKG_INSTALLATION_TYPES= overwrite pkgviews +EXTRACT_USING= pax PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/HTML/LinkExtractor/.packlist diff --git a/www/p5-HTML-Scrubber/Makefile b/www/p5-HTML-Scrubber/Makefile index e5db05b4ca5..601111c0f8d 100644 --- a/www/p5-HTML-Scrubber/Makefile +++ b/www/p5-HTML-Scrubber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:56 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/05/16 03:04:45 jlam Exp $ # DISTNAME= HTML-Scrubber-0.08 @@ -14,7 +14,7 @@ DEPENDS+= p5-HTML-Parser>=3:../../www/p5-HTML-Parser USE_LANGUAGES= # empty PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/HTML/Scrubber/.packlist -EXTRACT_USING_PAX= YES +EXTRACT_USING= pax .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" |