diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-04-29 08:57:12 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-04-29 08:57:12 +0000 |
| commit | 5271da855f0c5946ff1f3aa58fbe806871df2f87 (patch) | |
| tree | 526d65e6697f1e03c06ab0d0f901688aa2c4e18d | |
| parent | 8730c99d5ea1ba861dbab3e0dbc07e16826b1a7a (diff) | |
Notes
157 files changed, 177 insertions, 433 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 76523453f823..29c05c0efa57 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -528,7 +528,7 @@ PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall PKGINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-install.in PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-deinstall.in -EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ +EXTRACT_AFTER_ARGS?= --exclude */CVS/* \ --exclude */macbuild/* \ --exclude */package/* \ --exclude mozilla*/gc/boehm diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 5df5c541f26a..8cb64a31ed28 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2282,18 +2282,12 @@ EXTRACT_CMD?= ${UNMAKESELF_CMD} EXTRACT_BEFORE_ARGS?= EXTRACT_AFTER_ARGS?= .else -EXTRACT_BEFORE_ARGS?= -dc +EXTRACT_CMD?= ${TAR} +EXTRACT_BEFORE_ARGS?= -xf .if defined(EXTRACT_PRESERVE_OWNERSHIP) -EXTRACT_AFTER_ARGS?= | ${TAR} -xf - -.else -EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --no-same-owner --no-same-permissions -.endif -.if defined(USE_BZIP2) -EXTRACT_CMD?= ${BZIP2_CMD} -.elif defined(USE_XZ) -EXTRACT_CMD?= ${XZ_CMD} +EXTRACT_AFTER_ARGS?= .else -EXTRACT_CMD?= ${GZIP_CMD} +EXTRACT_AFTER_ARGS?= --no-same-owner --no-same-permissions .endif .endif diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile index e175b668f294..8df0867aa5fe 100644 --- a/accessibility/qt4-accessible/Makefile +++ b/accessibility/qt4-accessible/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/astro/wmmoonclock/Makefile b/astro/wmmoonclock/Makefile index f811d2f575d2..1374f8a88cdc 100644 --- a/astro/wmmoonclock/Makefile +++ b/astro/wmmoonclock/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: wmMoonClock -# Date created: 14 March 1999 -# Whom: Kris Kennaway <kkennawa@physics.adelaide.edu.au> -# +# Created by: Kris Kennaway <kkennawa@physics.adelaide.edu.au> # $FreeBSD$ -# PORTNAME= wmMoonClock PORTVERSION= 1.27 @@ -14,9 +10,6 @@ MASTER_SITES= http://www.dockapps.org/files/14/21/ MAINTAINER= ports@FreeBSD.org COMMENT= Displays the phase of the moon, plus orbital data -# Distfile says it's a .tar.gz but is actually uncompressed -EXTRACT_CMD= ${CAT} -EXTRACT_BEFORE_ARGS= WRKSRC= ${WRKDIR}/${DISTNAME}/Src USE_XORG= xpm diff --git a/astro/wmspaceweather/Makefile b/astro/wmspaceweather/Makefile index fadb387a990f..d7486b2a3c55 100644 --- a/astro/wmspaceweather/Makefile +++ b/astro/wmspaceweather/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: wmSpaceWeather -# Date created: 16 April 1999 -# Whom: Chris Piazza <cpiazza@FreeBSD.org> -# +# Created by: Chris Piazza <cpiazza@FreeBSD.org> # $FreeBSD$ PORTNAME= wmspaceweather @@ -21,10 +18,6 @@ RUN_DEPENDS= p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules WRKSRC= ${WRKDIR}/${DISTNAME}/wmSpaceWeather -# distfile is actually just a tar with suffix .tar.gz: -EXTRACT_CMD= ${CAT} -EXTRACT_BEFORE_ARGS= - USE_XORG= x11 xext xpm ALL_TARGET= clean all MAKE_JOBS_UNSAFE= yes diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile index dbc667cbc9a8..58ab81710ff5 100644 --- a/audio/timidity++/Makefile +++ b/audio/timidity++/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: TiMidity++ -# Date created: 27 Feb 1999 -# Whom: Yoichi Asai <yatt@luna2.org> -# +# Created by: Yoichi Asai <yatt@luna2.org> # $FreeBSD$ -# PORTNAME= timidity++ PORTVERSION= 2.13.2 @@ -36,7 +32,7 @@ TIMID_LIBDIR= lib/timidity .if !defined(PKGNAMESUFFIX) WANT_GNOME= yes -EXTRACT_AFTER_ARGS=| ${TAR} -xpf - --exclude '*/libarc/*' \ +EXTRACT_AFTER_ARGS= --exclude '*/libarc/*' \ --exclude '*/utils/mblock.h' --exclude '*/utils/memb.h' CONFIGURE_ARGS= --enable-interface=ncurses,vt100,server \ diff --git a/cad/verilog-mode.el/Makefile b/cad/verilog-mode.el/Makefile index 07c6d8c9265b..1f5810760781 100644 --- a/cad/verilog-mode.el/Makefile +++ b/cad/verilog-mode.el/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: verilog-mode.el -# Date created: 12 January 2009 -# Whom: stas -# +# Created by: stas # $FreeBSD$ -# PORTNAME= verilog-mode.el PORTVERSION= 801 @@ -18,6 +14,8 @@ COMMENT= Emacs lisp modules for the Verilog language LICENSE= GPLv3 # (or later) +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= > ${PORTNAME} NO_WRKSUBDIR= yes diff --git a/chinese/qt4-codecs-cn/Makefile b/chinese/qt4-codecs-cn/Makefile index ebadf130eca3..55ae52a6b798 100644 --- a/chinese/qt4-codecs-cn/Makefile +++ b/chinese/qt4-codecs-cn/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/chinese/qt4-codecs-tw/Makefile b/chinese/qt4-codecs-tw/Makefile index 3dae2f4701da..0bd5f632c1f6 100644 --- a/chinese/qt4-codecs-tw/Makefile +++ b/chinese/qt4-codecs-tw/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/databases/p5-GDBM/Makefile b/databases/p5-GDBM/Makefile index 3a331c3311ef..dac44fa3e89c 100644 --- a/databases/p5-GDBM/Makefile +++ b/databases/p5-GDBM/Makefile @@ -1,11 +1,5 @@ -# New ports collection makefile for: p5-GDBM -# Date created: Nov 9 1999 -# Whom: Nick Sayer <nsayer@FreeBSD.ORG> -# -# Heavy input from eivind@freebsd.org -# +# Created by: Nick Sayer <nsayer@FreeBSD.ORG> # $FreeBSD$ -# PORTNAME= GDBM PORTVERSION= 1.14 @@ -21,7 +15,7 @@ COMMENT= GNU Data Base Manager (gdbm) interface LIB_DEPENDS= gdbm.4:${PORTSDIR}/databases/gdbm -EXTRACT_AFTER_ARGS= | ${TAR} -xf - ${DISTNAME}/ext/GDBM_File ${DISTNAME}/t/lib +EXTRACT_AFTER_ARGS= ${DISTNAME}/ext/GDBM_File ${DISTNAME}/t/lib CFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_SAFE= yes diff --git a/databases/pydbdesigner/Makefile b/databases/pydbdesigner/Makefile index b9e4e07badee..4c454481e120 100644 --- a/databases/pydbdesigner/Makefile +++ b/databases/pydbdesigner/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: pydbdesigner -# Date created: 2003-01-02 -# Whom: Alan Eldridge <alane@geeksrus.net> -# +# Created by: Alan Eldridge <alane@geeksrus.net> # $FreeBSD$ -# PORTNAME= pydbdesigner PORTVERSION= 0.1.4.1 @@ -14,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= xride@FreeBSD.org COMMENT= Graphical designer for relational databases -EXTRACT_AFTER_ARGS= | ${TAR} --exclude CVS -xf - +EXTRACT_AFTER_ARGS= --exclude CVS USE_PYTHON= 2.2+ USE_WX= 2.4 diff --git a/databases/qt-mysql-plugin/Makefile b/databases/qt-mysql-plugin/Makefile index 769a387ae95d..5cd7ba326df4 100644 --- a/databases/qt-mysql-plugin/Makefile +++ b/databases/qt-mysql-plugin/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-mysql-plugin -# Date created: 20 April 2003 -# Whom: Kay Lehmann <kay_lehmann@web.de> -# +# Created by: Kay Lehmann <kay_lehmann@web.de> # $FreeBSD$ -# PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 @@ -28,8 +23,7 @@ USE_MYSQL= yes USE_BZIP2= yes PLUGIN= plugins/src/sqldrivers/${DB} DRIVER= src/sql/drivers/${DB} -EXTRACT_AFTER_ARGS?=| ${TAR} -xf - ${DISTNAME}/${PLUGIN} \ - ${DISTNAME}/${DRIVER} ${DISTNAME}/src/sql/drivers/cache +EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} ${DISTNAME}/src/sql/drivers/cache MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/databases/qt-odbc-plugin/Makefile b/databases/qt-odbc-plugin/Makefile index 7b495e04618d..479720286027 100644 --- a/databases/qt-odbc-plugin/Makefile +++ b/databases/qt-odbc-plugin/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-odbc-plugin -# Date created: 31 December 2003 -# Whom: Michael Nottebrock <lofi@freebsd.org> -# +# Created by: Michael Nottebrock <lofi@freebsd.org> # $FreeBSD$ -# PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 @@ -29,8 +24,8 @@ EXPIRATION_DATE= 2013-07-01 USE_BZIP2= yes PLUGIN= plugins/src/sqldrivers/${DB} DRIVER= src/sql/drivers/${DB} -EXTRACT_AFTER_ARGS?=| ${TAR} -xf - ${DISTNAME}/${PLUGIN} \ - ${DISTNAME}/${DRIVER} ${DISTNAME}/src/sql/drivers/cache +EXTRACT_AFTER_ARGS?= ${DISTNAME}/${PLUGIN} \ + ${DISTNAME}/${DRIVER} ${DISTNAME}/src/sql/drivers/cache MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/databases/qt-pgsql-plugin/Makefile b/databases/qt-pgsql-plugin/Makefile index 6327a09a7269..49c30880d0fe 100644 --- a/databases/qt-pgsql-plugin/Makefile +++ b/databases/qt-pgsql-plugin/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-pgsql-plugin -# Date created: 5 August 2003 -# Whom: Lauri Watts <lauri@kde.org> -# +# Created by: Lauri Watts <lauri@kde.org> # $FreeBSD$ -# PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 @@ -28,8 +23,8 @@ USE_PGSQL= yes USE_BZIP2= yes PLUGIN= plugins/src/sqldrivers/${DB} DRIVER= src/sql/drivers/${DB} -EXTRACT_AFTER_ARGS?=| ${TAR} -xf - ${DISTNAME}/${PLUGIN} \ - ${DISTNAME}/${DRIVER} ${DISTNAME}/src/sql/drivers/cache +EXTRACT_AFTER_ARGS?= ${DISTNAME}/${PLUGIN} \ + ${DISTNAME}/${DRIVER} ${DISTNAME}/src/sql/drivers/cache MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/databases/qt-sqlite-plugin/Makefile b/databases/qt-sqlite-plugin/Makefile index 996a59db38d3..e757b31cb788 100644 --- a/databases/qt-sqlite-plugin/Makefile +++ b/databases/qt-sqlite-plugin/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-sqlite-plugin -# Date created: 27 February 2004 -# Whom: Michael Nottebrock <lofi@freebsd.org> -# +# Created by: Michael Nottebrock <lofi@freebsd.org> # $FreeBSD$ -# PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 @@ -28,8 +23,8 @@ EXPIRATION_DATE= 2013-07-01 USE_BZIP2= yes PLUGIN= plugins/src/sqldrivers/${DB} DRIVER= src/sql/drivers/${DB} -EXTRACT_AFTER_ARGS?=| ${TAR} -xf - ${DISTNAME}/${PLUGIN} \ - ${DISTNAME}/${DRIVER} ${DISTNAME}/src/sql/drivers/cache +EXTRACT_AFTER_ARGS?= ${DISTNAME}/${PLUGIN} \ + ${DISTNAME}/${DRIVER} ${DISTNAME}/src/sql/drivers/cache MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/databases/qt4-ibase-plugin/Makefile b/databases/qt4-ibase-plugin/Makefile index de16bf155ad4..68be9fb56c66 100644 --- a/databases/qt4-ibase-plugin/Makefile +++ b/databases/qt4-ibase-plugin/Makefile @@ -18,10 +18,9 @@ MAKE_JOBS_SAFE= yes DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} -EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \ - ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \ - ${DISTNAME}/include/QtSql \ - ${DISTNAME}/src/sql/kernel +EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \ + ${DISTNAME}/include/QtSql \ + ${DISTNAME}/src/sql/kernel MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ diff --git a/databases/qt4-mysql-plugin/Makefile b/databases/qt4-mysql-plugin/Makefile index cd42166a81cd..7d8688e7dbc7 100644 --- a/databases/qt4-mysql-plugin/Makefile +++ b/databases/qt4-mysql-plugin/Makefile @@ -18,9 +18,8 @@ MAKE_JOBS_SAFE= yes USE_MYSQL= yes DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} -EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \ - ${DISTNAME}/${DRIVER} \ - ${DISTNAME}/${PLUGIN} +EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} \ + ${DISTNAME}/${PLUGIN} MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile index 0d771853af34..0b4497cc82e4 100644 --- a/databases/qt4-odbc-plugin/Makefile +++ b/databases/qt4-odbc-plugin/Makefile @@ -19,9 +19,8 @@ MAKE_JOBS_SAFE= yes DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} -EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \ - ${DISTNAME}/${DRIVER} \ - ${DISTNAME}/${PLUGIN} +EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} \ + ${DISTNAME}/${PLUGIN} MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile index c83d0386874f..cbdd494888e3 100644 --- a/databases/qt4-pgsql-plugin/Makefile +++ b/databases/qt4-pgsql-plugin/Makefile @@ -18,9 +18,8 @@ MAKE_JOBS_SAFE= yes USE_PGSQL= yes DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} -EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \ - ${DISTNAME}/${DRIVER} \ - ${DISTNAME}/${PLUGIN} +EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} \ + ${DISTNAME}/${PLUGIN} MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile index 36403c57e265..8181f2a07857 100644 --- a/databases/qt4-sql/Makefile +++ b/databases/qt4-sql/Makefile @@ -30,7 +30,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile index 2b70ffa04366..4a7e9e7e6460 100644 --- a/databases/qt4-sqlite-plugin/Makefile +++ b/databases/qt4-sqlite-plugin/Makefile @@ -19,10 +19,9 @@ MAKE_JOBS_SAFE= yes DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} -EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \ - ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \ - ${DISTNAME}/include/QtSql \ - ${DISTNAME}/src/sql/kernel +EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \ + ${DISTNAME}/include/QtSql \ + ${DISTNAME}/src/sql/kernel MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile index c0e5aa98ce6a..a453ab2f6f72 100644 --- a/databases/qt4-sqlite3-plugin/Makefile +++ b/databases/qt4-sqlite3-plugin/Makefile @@ -20,10 +20,9 @@ MAKE_JOBS_SAFE= yes DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} -EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \ - ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \ - ${DISTNAME}/include/QtSql \ - ${DISTNAME}/src/sql/kernel +EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \ + ${DISTNAME}/include/QtSql \ + ${DISTNAME}/src/sql/kernel MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile index 49da7d0de48a..3280ba5c1581 100644 --- a/databases/sqlite2/Makefile +++ b/databases/sqlite2/Makefile @@ -22,7 +22,7 @@ EXAMPLESDIR= ${PREFIX}/share/examples/sqlite2 LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}2 -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude CVS +EXTRACT_AFTER_ARGS= --exclude CVS OPTIONS_DEFINE= TCL THREADS DOCS diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile index 68b5e65709f4..7181bd7b9bac 100644 --- a/devel/dbus-qt4/Makefile +++ b/devel/dbus-qt4/Makefile @@ -32,7 +32,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 71e613dda5fa..1d9b29a7daa2 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -29,10 +29,9 @@ CONFIGURE_ARGS= --prefix ${PREFIX} --perl ${PERL} --make ${GMAKE} \ MAKE_JOBS_UNSAFE= yes REINPLACE_ARGS= -i '' -EXTRACT_AFTER_ARGS=|${TAR} -xpf - \ - --exclude '*/libmd5' \ - --exclude '*/libpng' \ - --exclude '*/tmake' +EXTRACT_AFTER_ARGS= --exclude '*/libmd5' \ + --exclude '*/libpng' \ + --exclude '*/tmake' PLIST= ${WRKDIR}/plist TMPDOCDEST= ${WRKDIR}/tmpdocdest diff --git a/devel/dparser/Makefile b/devel/dparser/Makefile index 661e3e57f99d..a17d13ff4071 100644 --- a/devel/dparser/Makefile +++ b/devel/dparser/Makefile @@ -15,7 +15,7 @@ BOEHM_DESC= Boehm garbage collector support WRKSRC= ${WRKDIR}/d -EXTRACT_AFTER_ARGS= |${TAR} -xf - --exclude "*my*" +EXTRACT_AFTER_ARGS= --exclude "*my*" USE_GMAKE= yes MAKE_ARGS= CC="${CC}" D_OPTIMIZE= PREFIX=${PREFIX} diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile index 1a398c9e0243..4bf6b3b5bafc 100644 --- a/devel/gcvs/Makefile +++ b/devel/gcvs/Makefile @@ -26,8 +26,7 @@ CXXFLAGS:= ${CXXFLAGS:N-std=*:N:} CONFIGURE_ARGS= --with-tclinclude=${TCL_INCLUDEDIR} \ --with-tcllib=${TCL_LIBDIR} MAKE_JOBS_SAFE= yes -EXTRACT_AFTER_ARGS=|${TAR} -xpf - \ - --exclude cvsunix --exclude 'getline.[ch]' --exclude 'getopt*.[ch]' +EXTRACT_AFTER_ARGS= --exclude cvsunix --exclude 'getline.[ch]' --exclude 'getopt*.[ch]' post-patch: ${REINPLACE_CMD} -E '/get(line|opt1?)\.[ch]/d' \ diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index 952048823691..cf68b0447b44 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -25,8 +25,7 @@ CONFIGURE_ARGS= --program-suffix=${PORTVERSION:S/.//g} \ CFLAGS:= ${CFLAGS:C/ +$//} # blanks at EOL creep in sometimes CFLAGS+= -DRL_NO_COMPAT EXCLUDE= dejagnu expect sim texinfo intl -EXTRACT_AFTER_ARGS= | ${TAR} -xf - ${EXCLUDE:S/^/--exclude /} \ - --no-same-owner --no-same-permissions +EXTRACT_AFTER_ARGS= ${EXCLUDE:S/^/--exclude /} VER= ${PORTVERSION:S/.//g} PLIST_SUB= VER=${VER} MAN1= gdb${VER}.1 diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile index d0a89d6e64f6..d7c258d4459c 100644 --- a/devel/gdb66/Makefile +++ b/devel/gdb66/Makefile @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: GDB 6 -# Date created: 30 March 2001 -# Whom: David O'Brien <obrien@NUXI.com> -# +# Created by: David O'Brien <obrien@NUXI.com> # $FreeBSD$ -# PORTNAME= gdb PORTVERSION= 6.6 @@ -38,7 +33,7 @@ CONFIGURE_ARGS= --program-suffix=${PORTVERSION:S/.//g} \ CFLAGS:= ${CFLAGS:C/ +$//} # blanks at EOL creep in sometimes CFLAGS+= -DRL_NO_COMPAT EXCLUDE= dejagnu expect readline sim texinfo intl -EXTRACT_AFTER_ARGS=| ${TAR} -xf - ${EXCLUDE:S/^/--exclude /} +EXTRACT_AFTER_ARGS= ${EXCLUDE:S/^/--exclude /} VER= ${PORTVERSION:S/.//} PLIST_SUB= VER=${VER} MAN1= gdb${VER}.1 diff --git a/devel/qmake/Makefile b/devel/qmake/Makefile index efd85e021b16..f41bb194acb7 100644 --- a/devel/qmake/Makefile +++ b/devel/qmake/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: qmake -# Date created: 2 September 2003 -# Whom: mi@aldan.algebra.com -# +# Created by: mi@aldan.algebra.com # $FreeBSD$ -# PORTNAME= qmake PORTVERSION= 3.3.8 @@ -25,7 +21,7 @@ MAKE_ENV+= FILESDIR="${FILESDIR}" USE_BZIP2= yes -EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ +EXTRACT_AFTER_ARGS= \ '${DISTNAME}/mkspecs' \ '${DISTNAME}/src/*/*.h' '${DISTNAME}/qmake' \ '${DISTNAME}/src/tools' diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile index fc6b9858b794..e7ff9dcd67eb 100644 --- a/devel/qmake4/Makefile +++ b/devel/qmake4/Makefile @@ -19,7 +19,7 @@ MAKE_ENV+= FILESDIR="${FILESDIR}" MAKE_JOBS_SAFE= yes TODAY_CMD= /bin/date +%Y-%m-%d -EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ +EXTRACT_AFTER_ARGS= \ '${DISTNAME}/mkspecs' \ '${DISTNAME}/include/*/*' \ '${DISTNAME}/src/*/*.h' \ diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index f3a59287cb78..d24611823370 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -34,7 +34,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/winmain src/xmlpatterns src/3rdparty/clucene \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index 136d5b5c3e53..997f6a35df01 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -36,7 +36,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-declarative/Makefile b/devel/qt4-declarative/Makefile index d5e26b4ce04e..669e3ce6359a 100644 --- a/devel/qt4-declarative/Makefile +++ b/devel/qt4-declarative/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/xml src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index 72ab07b37982..52c3feee1b50 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -36,7 +36,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/testlib src/winmain src/xmlpatterns src/3rdparty/clucene \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-help-tools/Makefile b/devel/qt4-help-tools/Makefile index 2148ada37f39..7f3fc91d63cc 100644 --- a/devel/qt4-help-tools/Makefile +++ b/devel/qt4-help-tools/Makefile @@ -32,7 +32,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile index d7d6a2b58232..ffb73dad8482 100644 --- a/devel/qt4-help/Makefile +++ b/devel/qt4-help/Makefile @@ -31,7 +31,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile index c45a36a16bb4..6ecbe5f65203 100644 --- a/devel/qt4-linguist/Makefile +++ b/devel/qt4-linguist/Makefile @@ -34,7 +34,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile index 4ebecef7331c..a32f96cd4d65 100644 --- a/devel/qt4-makeqpf/Makefile +++ b/devel/qt4-makeqpf/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile index 1d63c32815d7..9b5122bc2ffb 100644 --- a/devel/qt4-moc/Makefile +++ b/devel/qt4-moc/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile index 6b514fba9346..cfa90746d34f 100644 --- a/devel/qt4-porting/Makefile +++ b/devel/qt4-porting/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile index a17b9839f6d3..c7c5149d2874 100644 --- a/devel/qt4-qdbusviewer/Makefile +++ b/devel/qt4-qdbusviewer/Makefile @@ -36,7 +36,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-qdoc3/Makefile b/devel/qt4-qdoc3/Makefile index 5acdf369dfee..2637f12c7beb 100644 --- a/devel/qt4-qdoc3/Makefile +++ b/devel/qt4-qdoc3/Makefile @@ -23,7 +23,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/opengl src/openvg \ src/s60installs src/s60main src/scripttools src/sql src/svg \ src/testlib src/winmain src/xmlpatterns -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-qmlviewer/Makefile b/devel/qt4-qmlviewer/Makefile index 83653b2a303a..42e00b7ffcba 100644 --- a/devel/qt4-qmlviewer/Makefile +++ b/devel/qt4-qmlviewer/Makefile @@ -35,7 +35,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index f831270cf775..087aff0c3cfd 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -30,7 +30,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile index 0fb491354ec4..48733563a567 100644 --- a/devel/qt4-qtestlib/Makefile +++ b/devel/qt4-qtestlib/Makefile @@ -30,7 +30,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile index 6a564d3e21fc..9e63a617608a 100644 --- a/devel/qt4-qvfb/Makefile +++ b/devel/qt4-qvfb/Makefile @@ -34,7 +34,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile index a1bdde5e1b01..50ee1de841c7 100644 --- a/devel/qt4-rcc/Makefile +++ b/devel/qt4-rcc/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile index d71ea0d7496a..3b21aceb82c9 100644 --- a/devel/qt4-script/Makefile +++ b/devel/qt4-script/Makefile @@ -30,7 +30,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile index 74838658c357..5a42b9163874 100644 --- a/devel/qt4-scripttools/Makefile +++ b/devel/qt4-scripttools/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile index 84c8fc75d755..8c0b8be63474 100644 --- a/devel/qt4-uic/Makefile +++ b/devel/qt4-uic/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile index 3f7f6d88755e..5a988aeb281a 100644 --- a/devel/qt4-uic3/Makefile +++ b/devel/qt4-uic3/Makefile @@ -28,7 +28,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index 5d2a130427b9..6e42a60d79df 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -37,7 +37,6 @@ QMAKE_PRO= ${WRKSRC}/${PORTNAME}.pro QT_DISTNAME= qt-everywhere-opensource-src-${QT4_VERSION} DO_NOT_EXTRACT= config.profiles config.tests demos doc examples lib \ mkspecs tools translations -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${QT_DISTNAME}/${dne}' .endfor diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile index fcffcf6f093e..d8ecb727a059 100644 --- a/editors/elvis/Makefile +++ b/editors/elvis/Makefile @@ -12,7 +12,7 @@ COMMENT= A clone of the ex/vi text editor LICENSE= ART10 -EXTRACT_AFTER_ARGS= | ${TAR} --exclude guiwin32 -xf - +EXTRACT_AFTER_ARGS= --exclude guiwin32 HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix="${PREFIX}" diff --git a/editors/lazarus/Makefile.common b/editors/lazarus/Makefile.common index 6b057f79a280..75ccd6d8f210 100644 --- a/editors/lazarus/Makefile.common +++ b/editors/lazarus/Makefile.common @@ -3,7 +3,7 @@ #USE_BZIP2= yes USE_GMAKE= yes -EXTRACT_AFTER_ARGS= | ${TAR} -xf - ${LCLDIR} ${PORTNAME}/packager/registration \ +EXTRACT_AFTER_ARGS= ${LCLDIR} ${PORTNAME}/packager/registration \ ${PORTNAME}/components/lazutils PATCHDIR= ${.CURDIR}/files FILESDIR= ${.CURDIR}/files diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common index 0d46a97b3b39..c8999c1b205c 100644 --- a/editors/libreoffice/Makefile.common +++ b/editors/libreoffice/Makefile.common @@ -61,7 +61,7 @@ DISTFILES+= ${LO_I18N_FILE}_helppack_${LO_I18N:S/_/-/}${EXTRACT_SUFX} .endif COMMENT?= ${LO_I18N} language pack for ${PORTNAME} -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --strip-components 1 +EXTRACT_AFTER_ARGS= --strip-components 1 post-extract: @${MKDIR} ${WRKSRC}; \ diff --git a/emulators/linux_base-fc4/Makefile b/emulators/linux_base-fc4/Makefile index 67bfa9efdf42..b02aa5ceef60 100644 --- a/emulators/linux_base-fc4/Makefile +++ b/emulators/linux_base-fc4/Makefile @@ -1,10 +1,5 @@ -# New ports collection makefile for: linux_base-fc4 -# Date created: 2006-31-05 -# Whom: bsam@ipt.ru -# based on ports/emulators/linux_base-fc3 by netchild and myself -# +# Created by: bsam@ipt.ru # $FreeBSD$ -# PORTNAME= fc PORTVERSION= 4 @@ -106,14 +101,10 @@ NO_WRKSUBDIR= yes DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} PLIST_SUB= GLIBCVER="2.3.6" -RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio - -EXTRACT_DEPENDS+= ${RPM2CPIO}:${PORTSDIR}/archivers/rpm - EXTRACT_ONLY= ${BIN_DISTFILES} -EXTRACT_CMD?= ${RPM2CPIO} -EXTRACT_BEFORE_ARGS?= -EXTRACT_AFTER_ARGS?= | ${CPIO} -id --quiet +EXTRACT_CMD= ${TAR} +EXTRACT_BEFORE_ARGS= -xf +EXTRACT_AFTER_ARGS= # .include <bsd.port.pre.mk> diff --git a/emulators/mupen64-base/Makefile.common b/emulators/mupen64-base/Makefile.common index 3977fca20f68..51a2773d9e83 100644 --- a/emulators/mupen64-base/Makefile.common +++ b/emulators/mupen64-base/Makefile.common @@ -4,7 +4,7 @@ DISTNAME= ${PORTNAME}_src-${MUPEN64VERSION} PATCHDIR= ${.CURDIR}/files WRKSRC?= ${WRKDIR}/${DISTNAME} -EXTRACT_AFTER_ARGS= | ${TAR} -xf - ${DISTNAME}/Makefile ${DISTNAME}/config.h \ +EXTRACT_AFTER_ARGS= ${DISTNAME}/Makefile ${DISTNAME}/config.h \ ${DISTNAME}/main ${DISTNAME}/plugins .if defined(HAVE_GTK2) @@ -73,7 +73,7 @@ ALL_TARGET= plugins/Glide64.so DISTINFO_FILE= ${.CURDIR}/distinfo DISTNAME= ${PKGNAMESUFFIX:S/-//:S/$/64/}-${PORTVERSION:S/$/.SP8/} -EXTRACT_AFTER_ARGS= | ${TAR} -xf - +EXTRACT_AFTER_ARGS= # EXTRA_PATCHES= # .endif @@ -83,7 +83,7 @@ ALL_TARGET= plugins/tr64gl.so DISTINFO_FILE= ${.CURDIR}/distinfo DISTNAME= ${PKGNAMESUFFIX:S/-//}_ogl_gtk2-${PORTVERSION} -EXTRACT_AFTER_ARGS= | ${TAR} -xf - +EXTRACT_AFTER_ARGS= # EXTRA_PATCHES= # WRKSRC= ${WRKDIR}/${PKGNAMESUFFIX:S/-//}_ogl-${PORTVERSION} diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile index 7098bdb5967d..e965289f3469 100644 --- a/emulators/mupen64plus-core/Makefile +++ b/emulators/mupen64plus-core/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: mupen64plus-core -# Date created: 2008-05-16 -# Whom: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> -# +# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ -# PORTNAME= mupen64plus PORTVERSION?= 1.99.4 diff --git a/emulators/mupen64plus-core/Makefile.common b/emulators/mupen64plus-core/Makefile.common index 3c5c2969a2cd..aca1c2a0fa4d 100644 --- a/emulators/mupen64plus-core/Makefile.common +++ b/emulators/mupen64plus-core/Makefile.common @@ -5,7 +5,7 @@ PATCHDIR= ${.CURDIR}/files BUILD_WRKSRC?= ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC?= ${WRKDIR}/${DISTNAME} -EXTRACT_AFTER_ARGS?= | ${TAR} -xf - "${DISTNAME}/source/${PORTNAME}-core/*" \ +EXTRACT_AFTER_ARGS?= "${DISTNAME}/source/${PORTNAME}-core/*" \ "${DISTNAME}/source/${PORTNAME}${PKGNAMESUFFIX}/*" .if ${PKGNAMESUFFIX} == "-core" diff --git a/emulators/mupen64plus-rsp-z64/Makefile b/emulators/mupen64plus-rsp-z64/Makefile index 4c6950b58322..cbb1c1210e94 100644 --- a/emulators/mupen64plus-rsp-z64/Makefile +++ b/emulators/mupen64plus-rsp-z64/Makefile @@ -19,7 +19,7 @@ OPTIONS_DEFINE= # CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib -EXTRACT_AFTER_ARGS= | ${TAR} -xf - +EXTRACT_AFTER_ARGS= # BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC= ${WRKDIR} diff --git a/emulators/mupen64plus-video-arachnoid/Makefile b/emulators/mupen64plus-video-arachnoid/Makefile index 9e7c3d860916..039d7a3306d2 100644 --- a/emulators/mupen64plus-video-arachnoid/Makefile +++ b/emulators/mupen64plus-video-arachnoid/Makefile @@ -19,7 +19,7 @@ OPTIONS_DEFINE= # CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib -EXTRACT_AFTER_ARGS= | ${TAR} -xf - +EXTRACT_AFTER_ARGS= # BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC= ${WRKDIR} diff --git a/emulators/mupen64plus-video-glide64/Makefile b/emulators/mupen64plus-video-glide64/Makefile index ebedda1784d1..d7418f15d5b4 100644 --- a/emulators/mupen64plus-video-glide64/Makefile +++ b/emulators/mupen64plus-video-glide64/Makefile @@ -19,7 +19,7 @@ OPTIONS_DEFINE= # CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib -EXTRACT_AFTER_ARGS= | ${TAR} -xf - +EXTRACT_AFTER_ARGS= # BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC= ${WRKDIR} diff --git a/emulators/mupen64plus-video-z64/Makefile b/emulators/mupen64plus-video-z64/Makefile index b60b0d58b5bf..e877c2549e7e 100644 --- a/emulators/mupen64plus-video-z64/Makefile +++ b/emulators/mupen64plus-video-z64/Makefile @@ -19,7 +19,7 @@ OPTIONS_DEFINE= # CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib -EXTRACT_AFTER_ARGS= | ${TAR} -xf - +EXTRACT_AFTER_ARGS= # BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC= ${WRKDIR} diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile index 8a9cf9e2e475..9a7d65217576 100644 --- a/emulators/x48/Makefile +++ b/emulators/x48/Makefile @@ -35,7 +35,7 @@ OPTIONS_DEFINE= DOCS post-extract: .SILENT # Extract official HP ROM images for GX/SX - ${CP} ${_DISTDIR}/gxrom-r.bz2 ${WRKSRC} && ${EXTRACT_CMD} \ + ${CP} ${_DISTDIR}/gxrom-r.bz2 ${WRKSRC} && ${BZIP2_CMD} \ -d ${WRKSRC}/gxrom-r.bz2 # The latest SX ROM revision is J, but it does not work with x48, so use E ${CP} ${_DISTDIR}/sxrom-e.bz2 ${WRKSRC} && ${EXTRACT_CMD} \ diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile index 30da704ebbad..c2cace7e6a29 100644 --- a/games/alienarena/Makefile +++ b/games/alienarena/Makefile @@ -28,7 +28,7 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} CONFIGURE_ARGS+=--with-xf86vm \ --with-xf86dga -EXTRACT_AFTER_ARGS= | ${TAR} --exclude "data1" -xf - +EXTRACT_AFTER_ARGS= --exclude "data1" MAKE_ENV= WITH_DATADIR=yes WITH_LIBDIR=yes \ DATADIR="${DATADIR}" LIBDIR="${LIBDIR}" diff --git a/games/bogged/Makefile b/games/bogged/Makefile index 72a43e686ca2..fe9ed665b9d5 100644 --- a/games/bogged/Makefile +++ b/games/bogged/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: bogged -# Date created: 18 May 1998 -# Whom: Andrey Zakhvatov -# +# Created by: Andrey Zakhvatov # $FreeBSD$ -# PORTNAME= bogged PORTVERSION= 1.0.0 diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile index eb25d7bd3240..a2ff4198063b 100644 --- a/games/crossfire-server/Makefile +++ b/games/crossfire-server/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: crossfire-server -# Date created: Jan 30, 2002 -# Whom: Jasper Jongmans <j.jongmans@aprogas.net> -# +# Created by: Jasper Jongmans <j.jongmans@aprogas.net> # $FreeBSD$ -# PORTNAME= crossfire PORTVERSION= 1.70.0 @@ -40,7 +36,7 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} post-extract: - @cd ${WRKDIR} && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} \ + @cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ ${DISTDIR}/${DISTNAME}.maps.tar.bz2 ${EXTRACT_AFTER_ARGS} @${CHMOD} a+x ${WRKSRC}/utils/install-sh diff --git a/games/fretsonfire-data/Makefile b/games/fretsonfire-data/Makefile index 5020c57e0114..d4dfa182848e 100644 --- a/games/fretsonfire-data/Makefile +++ b/games/fretsonfire-data/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: fretsonfire-data -# Date created: 2006-10-02 -# Whom: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> -# +# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ -# PORTNAME= data PORTVERSION= 1.3.110 @@ -21,7 +17,7 @@ DATADIR= share/${PKGNAMEPREFIX:S/-//} RESTRICTED= Only Unreal Voodoo site is allowed to distribute the music WRKSRC= ${WRKDIR}/Frets\ on\ Fire-${PORTVERSION} -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude 'win32' "Frets on Fire-${PORTVERSION}/${PORTNAME}" +EXTRACT_AFTER_ARGS= --exclude 'win32' "Frets on Fire-${PORTVERSION}/${PORTNAME}" do-install: @${MKDIR} ${PREFIX}/${DATADIR} diff --git a/games/fretsonfire/Makefile b/games/fretsonfire/Makefile index 4082ee8d88fe..e3cd848f7664 100644 --- a/games/fretsonfire/Makefile +++ b/games/fretsonfire/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: fretsonfire -# Date created: 2006-09-01 -# Whom: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> -# +# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ -# PORTNAME= fretsonfire PORTVERSION= 1.3.110 @@ -27,7 +23,7 @@ USE_DOS2UNIX= *.txt NO_BUILD= yes DATADIR= share/${PORTNAME} -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude 'data' +EXTRACT_AFTER_ARGS= --exclude 'data' SUB_FILES= pkg-message FretsOnFire SUB_LIST= PROGRAM_DIR="${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}" WRKSRC= "${WRKDIR}/Frets on Fire-${PORTVERSION}" diff --git a/games/linux-warsow/Makefile b/games/linux-warsow/Makefile index 5ca3d9a44613..acf5bd7fc28f 100644 --- a/games/linux-warsow/Makefile +++ b/games/linux-warsow/Makefile @@ -1,6 +1,4 @@ -# New ports collection makefile for: warsow -# Date created: 2005-11-12 -# Whom: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> +# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> # # $FreeBSD$ # @@ -37,7 +35,7 @@ NO_BUILD= yes SUB_FILES= warsow-wrapper wsw_server-wrapper WARSOW_EXTRACT+=${PORTNAME}/basewsw/game${ARCHSUFFIX}.so WARSOW_DIR= ${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME} -EXTRACT_AFTER_ARGS= | ${TAR} -xf - ${WARSOW_EXTRACT} +EXTRACT_AFTER_ARGS= ${WARSOW_EXTRACT} DESKTOP_ENTRIES="Warsow" \ "Shoot cartoon enemies" \ diff --git a/games/palomino/Makefile b/games/palomino/Makefile index 7a312ae52385..bbb63c479843 100644 --- a/games/palomino/Makefile +++ b/games/palomino/Makefile @@ -62,18 +62,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib LIB_DEPENDS+= fltk:${PORTSDIR}/x11-toolkits/fltk .endif -do-extract: - @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKDIR} - @cd ${WRKDIR}; \ - for distfile in ${DISTFILES}; do \ - if ${ECHO_CMD} $$distfile | ${GREP} -q txz$$; then \ - ${XZ_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$distfile ${EXTRACT_AFTER_ARGS}; \ - else \ - ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$distfile ${EXTRACT_AFTER_ARGS}; \ - fi; \ - done - post-patch: @${FIND} ${WRKSRC}/CMakeModules -type f -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' diff --git a/graphics/jbig2dec/Makefile b/graphics/jbig2dec/Makefile index cbb35ee2e2f6..ed3ed0d0de3c 100644 --- a/graphics/jbig2dec/Makefile +++ b/graphics/jbig2dec/Makefile @@ -24,7 +24,7 @@ TESTS_DESC= Download and use test-images for post-build testing MAN1= jbig2dec.1 MAKE_JOBS_SAFE= yes -EXTRACT_AFTER_ARGS+=|${TAR} -xpf - --exclude sha1.h --exclude 'getopt*' +EXTRACT_AFTER_ARGS+= --exclude sha1.h --exclude 'getopt*' LICENSE= GPLv3 diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile index 88309cc61619..0d5be80c5b8c 100644 --- a/graphics/libimg/Makefile +++ b/graphics/libimg/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: img -# Date Created: 20 February 1999 -# Whom: Glenn Johnson -# +# Created by: Glenn Johnson # $FreeBSD$ -# PORTNAME= libimg PORTVERSION= 1.2.4 @@ -35,7 +31,7 @@ MAKE_ENV+= TCL_VER=${TCL_VER} MAKE_JOBS_SAFE= yes # We don't need the bundled libraries: -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude '*/libz/*' \ +EXTRACT_AFTER_ARGS= --exclude '*/libz/*' \ --exclude '*/compat/*' --exclude '*/libtiff/*' \ --exclude '*/libjpeg/*' --exclude '*/libpng/*' diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile index ce8e5f2eae54..6c67b18b4520 100644 --- a/graphics/nip2/Makefile +++ b/graphics/nip2/Makefile @@ -25,7 +25,7 @@ MAKE_JOBS_SAFE= yes # are always installed, regardless of the NOPORTDOCS setting. # The PDF version of the documentation is another story: .if defined(NOPORTDOCS) -EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude nipguide --exclude pdf +EXTRACT_AFTER_ARGS= --exclude nipguide --exclude pdf .endif # Somehow vendor's configure misses these: MAKE_ENV+= UPDATE_MIME_DATABASE=update-mime-database \ diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile index 91241a2fc7e3..b93b0482a4dc 100644 --- a/graphics/qt4-iconengines/Makefile +++ b/graphics/qt4-iconengines/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile index a6f301ae4fe5..c8aceb54529c 100644 --- a/graphics/qt4-imageformats/Makefile +++ b/graphics/qt4-imageformats/Makefile @@ -35,7 +35,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile index 015f0e27771d..f83866c6b507 100644 --- a/graphics/qt4-pixeltool/Makefile +++ b/graphics/qt4-pixeltool/Makefile @@ -34,7 +34,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile index d5eb24830a1e..826b13dcac44 100644 --- a/graphics/qt4-svg/Makefile +++ b/graphics/qt4-svg/Makefile @@ -30,7 +30,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/graphics/s10sh/Makefile b/graphics/s10sh/Makefile index f202f6f3ebb7..3f62d4b54a24 100644 --- a/graphics/s10sh/Makefile +++ b/graphics/s10sh/Makefile @@ -12,7 +12,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= USB/serial userspace driver for the Canon PowerShot digital cameras # Don't extract the libusb bundled with s10sh: -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude '*/libusb*' +EXTRACT_AFTER_ARGS= --exclude '*/libusb*' MAKEFILE= ${FILESDIR}/Makefile.bsd diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index 45e65ba464c7..f2940e19589a 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -105,7 +105,7 @@ CONFIGURE_ENV+= ac_cv_header_cups_cups_h=no post-extract: @((cd ${DISTDIR} && ${CAT} ${DISTFILES:C/:[^:]+$//}) | (cd ${WRKDIR} \ - && ${EXTRACT_CMD} ${EXTRACT_BEFOR_ARGS} ${EXTRACT_AFTER_ARGS})) + && ${EXTRACT_CMD} ${EXTRACT_BEFOR_ARGS} - ${EXTRACT_AFTER_ARGS})) post-patch: @${REINPLACE_CMD} -e '/^for ac_header in/s|libc.h|cups/cups.h| ; \ diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index bbde8111f5d4..f04621cfbe65 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -41,7 +41,7 @@ post-configure: # Don't extract doc/ subdirectory - the simplest way: .ifdef NOPORTDOCS -EXTRACT_AFTER_ARGS= | ${TAR} -xpf - --exclude doc +EXTRACT_AFTER_ARGS= --exclude doc EXTRA_PATCHES= ${FILESDIR}/nodoc-patch .endif PLIST_SUB+= VERSION=${PORTVERSION:R} diff --git a/graphics/xmandel/Makefile b/graphics/xmandel/Makefile index 55383172eff8..6722da6f7d24 100644 --- a/graphics/xmandel/Makefile +++ b/graphics/xmandel/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xmandel -# Date created: 18 October 1996 -# Whom: andreas@marvin.robin.de -# +# Created by: andreas@marvin.robin.de # $FreeBSD$ -# PORTNAME= xmandel PORTVERSION= 1.0 diff --git a/japanese/gskk/Makefile b/japanese/gskk/Makefile index a04757e9c606..86f7cc99e247 100644 --- a/japanese/gskk/Makefile +++ b/japanese/gskk/Makefile @@ -1,10 +1,5 @@ -# New ports collection makefile for: gskk -# Date created: 7 Mar 2005 -# Whom: Hajimu UMEMOTO <ume@FreeBSD.org> - -# +# Created by: Hajimu UMEMOTO <ume@FreeBSD.org> # $FreeBSD$ -# PORTNAME= gskk PORTVERSION= 20041208 @@ -21,6 +16,8 @@ BUILD_DEPENDS= mkbindic:${PORTSDIR}/japanese/canna-server NO_WRKSUBDIR= yes +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= > ${PORTNAME}.t PLIST_FILES= share/canna/dic/canna/dics.dir.${PORTNAME} \ diff --git a/japanese/qt4-codecs-jp/Makefile b/japanese/qt4-codecs-jp/Makefile index bc9c0da95825..fda4d89d6c72 100644 --- a/japanese/qt4-codecs-jp/Makefile +++ b/japanese/qt4-codecs-jp/Makefile @@ -30,7 +30,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile index 5dd5fb397348..ad4f757e4dbc 100644 --- a/japanese/yc.el/Makefile +++ b/japanese/yc.el/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: yc.el -# Date created: 1999/12/05 -# Whom: HONDA Yasuhiro <honda@kashio.info.mie-u.ac.jp> -# +# Created by: HONDA Yasuhiro <honda@kashio.info.mie-u.ac.jp> # $FreeBSD$ -# PORTNAME= yc.el PORTVERSION= 5.2.1 @@ -17,6 +13,8 @@ EXTRACT_SUFX= .gz MAINTAINER= t@nakao.org COMMENT= Yet another Canna client for Emacs/XEmacs +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= > yc.el NO_WRKSUBDIR= yes diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile index bbb10e3cf3a6..f26091f1ddeb 100644 --- a/java/eclipse-devel/Makefile +++ b/java/eclipse-devel/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: eclipse-devel -# Date created: April 9, 2005 -# Whom: various members of freebsd-java -# +# Created by: various members of freebsd-java # $FreeBSD$ -# PORTNAME= eclipse-devel PORTVERSION= 4.2.0 @@ -186,20 +182,20 @@ post-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${BUILD_WRKSRC}/bundles/ .endfor - @(cd ${WRKDIR} && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ANT_SRCFILE} ${EXTRACT_AFTER_ARGS}) + @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ANT_SRCFILE} ${EXTRACT_AFTER_ARGS}) .for f in ${ANT_BUNDLES} @${CP} ${WRKDIR}/apache-ant-${ANT_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/ .endfor @${CP} ${DISTDIR}/${DIST_SUBDIR}/${JUNIT4_SRCFILE} ${BUILD_WRKSRC}/bundles/junit4.jar - @(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${TOMCAT_SRCFILES:Mapache-tomcat*.tar.gz} ${EXTRACT_AFTER_ARGS}) + @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${TOMCAT_SRCFILES:Mapache-tomcat*.tar.gz} ${EXTRACT_AFTER_ARGS}) @${CP} ${DISTDIR}/${DIST_SUBDIR}/${TOMCAT_SRCFILES:M*.jar} ${WRKDIR}/apache-tomcat-${TOMCAT_VERSION}/lib/ .for f in ${TOMCAT_BUNDLES} @${CP} ${WRKDIR}/apache-tomcat-${TOMCAT_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/ .endfor - @(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ECLIPSE_JETTY_SRCFILE} ${EXTRACT_AFTER_ARGS}) + @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ECLIPSE_JETTY_SRCFILE} ${EXTRACT_AFTER_ARGS}) .for f in ${ECLIPSE_JETTY_BUNDLES} @${CP} ${WRKDIR}/jetty-distribution-${ECLIPSE_JETTY_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/ .endfor diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index 6170465eca07..84996e4351a2 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -155,9 +155,9 @@ post-extract: .for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} @${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${BUILD_WRKSRC}/bundles/ .endfor - @(${MKDIR} ${BUILD_WRKSRC}/generatedScripts && cd ${BUILD_WRKSRC}/generatedScripts && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${BUILD_WRKSRC}/${ECLIPSE_GENERATED_BUILDSCRIPTS} ${EXTRACT_AFTER_ARGS}) + @(${MKDIR} ${BUILD_WRKSRC}/generatedScripts && cd ${BUILD_WRKSRC}/generatedScripts && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${BUILD_WRKSRC}/${ECLIPSE_GENERATED_BUILDSCRIPTS} ${EXTRACT_AFTER_ARGS}) - @(cd ${WRKDIR} && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ANT_SRCFILE} ${EXTRACT_AFTER_ARGS}) + @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ANT_SRCFILE} ${EXTRACT_AFTER_ARGS}) .for f in ${ANT_BUNDLES} @${CP} ${WRKDIR}/apache-ant-${ANT_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/ .endfor @@ -167,7 +167,7 @@ post-extract: @${CP} ${WRKDIR}/junit/junit${JUNIT3_VERSION}/junit.jar ${BUILD_WRKSRC}/bundles/ @${CP} ${DISTDIR}/${DIST_SUBDIR}/${JUNIT4_SRCFILE} ${BUILD_WRKSRC}/bundles/junit4.jar - @(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${TOMCAT_SRCFILES:Mapache-tomcat*.tar.gz} ${EXTRACT_AFTER_ARGS}) + @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${TOMCAT_SRCFILES:Mapache-tomcat*.tar.gz} ${EXTRACT_AFTER_ARGS}) @${CP} ${DISTDIR}/${DIST_SUBDIR}/${TOMCAT_SRCFILES:M*.jar} ${WRKDIR}/apache-tomcat-${TOMCAT_VERSION}/lib/ .for f in ${TOMCAT_BUNDLES} @${CP} ${WRKDIR}/apache-tomcat-${TOMCAT_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/ diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile index d4eb53f4fddd..dadaaa21d3fb 100644 --- a/java/icedtea-web/Makefile +++ b/java/icedtea-web/Makefile @@ -26,6 +26,8 @@ USE_XORG= x11 USES= pkgconfig WANT_GNOME= yes +EXTRACT_CMD= ${GZIP_CMD} +EXTRACT_BEFORE_ARGS= -dc EXTRACT_AFTER_ARGS= | ${SETENV} LC_ALL=en_US.UTF-8 ${TAR} -xf - MAN1= itweb-javaws.1 diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index a6f3e490bc36..8f7201e00d30 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -155,10 +155,6 @@ UPDATE_VERSION= 32 ANTVERSION= 1.8.4 ANTFILE= apache-ant-${ANTVERSION}-bin.tar.bz2 -# rely on bsdtar ability to extract .gz, .bz2 and .zip archives -EXTRACT_CMD= ${CAT} -EXTRACT_BEFORE_ARGS= - .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MIPV6} diff --git a/korean/qt4-codecs-kr/Makefile b/korean/qt4-codecs-kr/Makefile index c769bdf354f9..78d80b565e08 100644 --- a/korean/qt4-codecs-kr/Makefile +++ b/korean/qt4-codecs-kr/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units index 3d83adcbf317..9548ed918dd6 100644 --- a/lang/fpc/Makefile.units +++ b/lang/fpc/Makefile.units @@ -14,7 +14,7 @@ UNITEXTRACT_SUFX= .tar.gz UNITNAME= ${UNITPREFIX}${PKGNAMESUFFIX:S/-//}${BUILDNAME:S/^/./}${UNITEXTRACT_SUFX} UNITDIR= lib/fpc/${PORTVERSION}/units/${BUILDNAME} -EXTRACT_AFTER_ARGS= | ${TAR} -xf - ${EXTRACTUNITDIR} +EXTRACT_AFTER_ARGS= ${EXTRACTUNITDIR} OPT=-Ur -CX MAKE_ENV+= PP=${LOCALBASE}/bin/${PPNAME} \ diff --git a/lang/icc/Makefile b/lang/icc/Makefile index 84b398778fc1..a748b54a3efb 100644 --- a/lang/icc/Makefile +++ b/lang/icc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: icc -# Date created: 24.Jan.2002 -# Whom: netchild@FreeBSD.org -# +# Created by: netchild@FreeBSD.org # $FreeBSD$ -# PORTNAME= icc PORTVERSION= 8.1.038 @@ -45,8 +41,7 @@ ICC_SITE= http://www.intel.com/software/products/compilers/ .include <bsd.port.pre.mk> -EXTRACT_AFTER_ARGS= | tar -xf - \ - --exclude cdt-\*.zip \ +EXTRACT_AFTER_ARGS= --exclude cdt-\*.zip \ --exclude eclipse-platform\*.zip \ --exclude intel-icc_ide\*.rpm \ --exclude intel-iidb\*.rpm \ diff --git a/lang/ifc/Makefile b/lang/ifc/Makefile index bc520a50a02b..7f646ef93da8 100644 --- a/lang/ifc/Makefile +++ b/lang/ifc/Makefile @@ -37,8 +37,7 @@ IFC_SITE= http://www.intel.com/software/products/compilers/ .include <bsd.port.pre.mk> -EXTRACT_AFTER_ARGS= | tar -xf - \ - --exclude intel-iidb\*.rpm \ +EXTRACT_AFTER_ARGS= --exclude intel-iidb\*.rpm \ --exclude \*ia64.rpm \ --exclude chklic.64 \ --exclude flexlm64 diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index 24cb5a06dfa8..1d6414dd0d89 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -11,7 +11,7 @@ WRKSRC= ${WRKDIR}/${EXTSUBDIR} PATCHDIR= ${.CURDIR}/files PLIST= ${NONEXISTENT} -EXTRACT_AFTER_ARGS?= | ${TAR} -xf - ${EXTSUBDIR} +EXTRACT_AFTER_ARGS?= ${EXTSUBDIR} .if ${PHP_MODNAME} == "bcmath" CONFIGURE_ARGS+=--enable-bcmath diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext index 506597091cbe..3f07c9719047 100644 --- a/lang/php53/Makefile.ext +++ b/lang/php53/Makefile.ext @@ -11,7 +11,7 @@ WRKSRC= ${WRKDIR}/${EXTSUBDIR} PATCHDIR= ${.CURDIR}/files PLIST= ${NONEXISTENT} -EXTRACT_AFTER_ARGS?= | ${TAR} -xf - ${EXTSUBDIR} +EXTRACT_AFTER_ARGS?= ${EXTSUBDIR} .if ${PHP_MODNAME} == "bcmath" CONFIGURE_ARGS+=--enable-bcmath diff --git a/lang/spidermonkey17/Makefile b/lang/spidermonkey17/Makefile index 23d0c5ed78d9..84ba0948cb25 100644 --- a/lang/spidermonkey17/Makefile +++ b/lang/spidermonkey17/Makefile @@ -42,8 +42,7 @@ JSH= jsapi.h jsarena.h jsarray.h jsatom.h jsautocfg.h jsbool.h \ PLIST_FILES= bin/js lib/libjs.so lib/libjs.so.1 ${JSH:S,^,include/,} WRKSRC= ${WRKDIR}/${SRC_DIR} -EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ - --exclude js/jsd +EXTRACT_AFTER_ARGS= --exclude js/jsd OPTIONS= UTF8 "Enable UTF8 support" Off diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 230ebedc3817..28216005e6d6 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -522,10 +522,10 @@ pre-everything:: post-extract: .if defined(WITH_SA_EXIM) - @cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} + @cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} .endif .if defined(WITH_SO_1024) - @cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/spamooborona1024-src-${SO_1024_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} + @cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/spamooborona1024-src-${SO_1024_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} @cd ${WRKDIR} && ${PATCH} --quiet < ${FILESDIR}/extra-patch-so_1024-delimiter .endif diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile index b1dc0764e204..f14926ae5f69 100644 --- a/mail/filtermail/Makefile +++ b/mail/filtermail/Makefile @@ -24,6 +24,8 @@ LICENSE= GPLv3 # installed by this port from the form *mailfilter* to the form # *filtermail*, and similarly the names in the man pages. # +EXTRACT_CMD= ${GZIP_CMD} +EXTRACT_BEFORE_ARGS= -dc EXTRACT_AFTER_ARGS= | ${SED} 's/[mM][aA][iI][lL][fF][iI][lL][tT][eE][rR]/filtermail/g' | ${TAR} -xf - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/mail/mb2md/Makefile b/mail/mb2md/Makefile index 0e48dae956b3..eb0b309ee8e9 100644 --- a/mail/mb2md/Makefile +++ b/mail/mb2md/Makefile @@ -14,7 +14,8 @@ COMMENT= Converts mbox mailboxes to Maildir RUN_DEPENDS= p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate -EXTRACT_CMD= ${GZIP_CMD} -cd +EXTRACT_CMD= ${GZIP_CMD} +EXTRACT_BEFORE_ARGS= -dc EXTRACT_AFTER_ARGS= > ${WRKDIR}/${PORTNAME} NO_WRKSUBDIR= yes diff --git a/mail/milter-callback/Makefile b/mail/milter-callback/Makefile index 266a375d6fb6..80d423ee4304 100644 --- a/mail/milter-callback/Makefile +++ b/mail/milter-callback/Makefile @@ -22,10 +22,6 @@ MAN8= milter-callback.8 MAKE_ENV+= WITH_SPF=yes -# make sure flat distfile gets extracted in ${WRKSRC} -EXTRACT_AFTER_ARGS= | (${MKDIR} ${WRKSRC}; ${TAR} -xf - --no-same-owner \ - --no-same-permissions -C ${WRKSRC}) - .if ${CC} == "clang" || ${CXX} == "clang++" BROKEN= does not build with clang, uses nested functions .endif diff --git a/mail/msgconvert/Makefile b/mail/msgconvert/Makefile index 948be08a81ff..2401cfdd5d2b 100644 --- a/mail/msgconvert/Makefile +++ b/mail/msgconvert/Makefile @@ -21,6 +21,8 @@ NO_WRKSUBDIR= yes USE_BZIP2= yes USE_PERL5= yes +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= > ${PORTNAME}.pl do-install: diff --git a/mail/x-face-e21/Makefile b/mail/x-face-e21/Makefile index 1bcd2bb3def8..d7e3867a0e07 100644 --- a/mail/x-face-e21/Makefile +++ b/mail/x-face-e21/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: x-face-e21 -# Date created: 10 September 2009 -# Whom: Hajimu UMEMOTO <ume@FreeBSD.org> -# +# Created by: Hajimu UMEMOTO <ume@FreeBSD.org> # $FreeBSD$ -# PORTNAME= x-face-e21 PORTVERSION= 20070306 @@ -23,6 +19,8 @@ USE_EMACS= yes .include <bsd.port.pre.mk> NO_WRKSUBDIR= yes +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= > ${DISTNAME} PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME} \ diff --git a/math/linux-relview/Makefile b/math/linux-relview/Makefile index 219c693a3f20..47a0a2d777f9 100644 --- a/math/linux-relview/Makefile +++ b/math/linux-relview/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: relview -# Date created: October 24 2002 -# Whom: Michael Ebert <ebert@informatik.unibw-muenchen.de> -# +# Created by: Michael Ebert <ebert@informatik.unibw-muenchen.de> # $FreeBSD$ -# PORTNAME= relview PORTVERSION= 7.0.2 @@ -21,6 +17,8 @@ USE_LINUX= yes USE_LINUX_APPS= gtk xorglibs NO_WRKSUBDIR= yes +EXTRACT_CMD= ${GZIP_CMD} +EXTRACT_BEFORE_ARGS= -dc EXTRACT_AFTER_ARGS= > ${DISTNAME} NO_BUILD= yes diff --git a/misc/qt4-doc/Makefile b/misc/qt4-doc/Makefile index cf8941749986..bdffd18a99ca 100644 --- a/misc/qt4-doc/Makefile +++ b/misc/qt4-doc/Makefile @@ -13,7 +13,7 @@ USE_QT4= # empty QT_DIST= yes NO_BUILD= yes -EXTRACT_AFTER_ARGS=| ${TAR} -xf - '${DISTNAME}/doc' +EXTRACT_AFTER_ARGS= '${DISTNAME}/doc' DOCSDIR= ${PREFIX}/share/doc/qt4 diff --git a/misc/qt4-l10n/Makefile b/misc/qt4-l10n/Makefile index 0e57ab9a581e..872fdcad26c7 100644 --- a/misc/qt4-l10n/Makefile +++ b/misc/qt4-l10n/Makefile @@ -12,7 +12,7 @@ USE_QT4= linguist_build QT_DIST= yes QT_NONSTANDARD= yes -EXTRACT_AFTER_ARGS+= | ${TAR} -xf - --include '${DISTNAME}/translations' +EXTRACT_AFTER_ARGS+= --include '${DISTNAME}/translations' do-build: ${LOCALBASE}/bin/lrelease-qt4 ${WRKSRC}/translations/*.ts diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile index eb0b30a5a24a..6b570e8bffc7 100644 --- a/misc/qt4-qtconfig/Makefile +++ b/misc/qt4-qtconfig/Makefile @@ -37,7 +37,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/winmain src/xml src/xmlpatterns src/3rdparty/clucene \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile index 6b75c6550d0c..ddf0cee61d81 100644 --- a/misc/qt4-qtdemo/Makefile +++ b/misc/qt4-qtdemo/Makefile @@ -34,7 +34,6 @@ DO_NOT_EXTRACT= doc mkspecs qmake translations \ src/winmain src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile index a50000254146..6ed8e76176e3 100644 --- a/multimedia/aegisub/Makefile +++ b/multimedia/aegisub/Makefile @@ -142,7 +142,7 @@ _make_jobs= -j${MAKE_JOBS_NUMBER} post-extract: .for i in ${FFMS_DISTFILE} - @(cd ${WRKDIR} && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} \ + @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ ${DISTDIR}/${i} ${EXTRACT_AFTER_ARGS}) .endfor diff --git a/multimedia/qt4-multimedia/Makefile b/multimedia/qt4-multimedia/Makefile index 9b3932a7a07d..9de410f90faf 100644 --- a/multimedia/qt4-multimedia/Makefile +++ b/multimedia/qt4-multimedia/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/net/minidlna/Makefile b/net/minidlna/Makefile index eeb0dd605a5c..dad4620af816 100644 --- a/net/minidlna/Makefile +++ b/net/minidlna/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 \ MAKE_JOBS_SAFE= yes MAKEFILE= ${FILESDIR}/BSDmakefile MAKE_ENV+= FILESDIR="${FILESDIR}" INSTALL_DATA="${INSTALL_DATA}" -EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude getifaddr.c +EXTRACT_AFTER_ARGS=--exclude getifaddr.c PKGMESSAGE= ${WRKSRC}/pkg-message SUB_FILES+= pkg-message diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile index dbaad07a4ad3..a24ab3092c70 100644 --- a/net/qt4-network/Makefile +++ b/net/qt4-network/Makefile @@ -33,7 +33,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/net/sendsms/Makefile b/net/sendsms/Makefile index 1eabf4a7319a..7dd5d7ca164b 100644 --- a/net/sendsms/Makefile +++ b/net/sendsms/Makefile @@ -1,8 +1,4 @@ -# New ports collection makefile for: www/sendsms -# Date created: 2005-12-17 -# Whom: Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com> -# -# $Tecnik: ports/www/sendsms/Makefile,v 1.3 2006/05/12 12:15:34 itetcu Exp $ +# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com> # $FreeBSD$ PORTNAME= sendsms @@ -16,6 +12,8 @@ EXTRACT_SUFX= .gz MAINTAINER= itetcu@FreeBSD.org COMMENT= Simple perl command-line utility to send SMS via from on provider site +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME} PLIST_FILES= bin/sendsms diff --git a/net/serviio/Makefile b/net/serviio/Makefile index 47c5f51713cb..de0f7716eb95 100644 --- a/net/serviio/Makefile +++ b/net/serviio/Makefile @@ -21,7 +21,7 @@ SUB_FILES+= pkg-message serviiod serviio-console USE_RC_SUBR= serviio SUB_LIST+= USER=${USERS} RESTRICTED= License does not allow selling -EXTRACT_AFTER_ARGS=|${TAR} -xf - --exclude junit.jar \ +EXTRACT_AFTER_ARGS=--exclude junit.jar \ --exclude org.restlet.ext.net.jar USERS= dlna diff --git a/net/smm++/Makefile b/net/smm++/Makefile index 4a573cdbbd2a..bf6f05069fbe 100644 --- a/net/smm++/Makefile +++ b/net/smm++/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: tcltutor -# Date created: 16 November 2000 -# Whom: Edwin Groothuis (edwin@mavetju.org) -# +# Created by: Edwin Groothuis (edwin@mavetju.org) # $FreeBSD$ -# PORTNAME= smm++ PORTVERSION= 6.1.1 @@ -23,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libitk.so:${PORTSDIR}/x11-toolkits/itk \ WRKSRC= ${WRKDIR}/smm/Install.unix USE_GMAKE= yes USE_TK= 84+ -EXTRACT_AFTER_ARGS+=|${TAR} -xpf - --exclude CVS +EXTRACT_AFTER_ARGS=--exclude CVS post-patch: ${REINPLACE_CMD} -e 's,itkarray=.*,itkarray=${WISH},' ${WRKSRC}/itk.sh diff --git a/net/udt/Makefile b/net/udt/Makefile index 15deadab711d..18336b713d3e 100644 --- a/net/udt/Makefile +++ b/net/udt/Makefile @@ -14,7 +14,7 @@ PATCH_WRKSRC= ${WRKDIR}/udt${PORTVERSION:R} WRKSRC= ${PATCH_WRKSRC}/src MAKEFILE= ${FILESDIR}/BSDmakefile MAKE_JOBS_SAFE= yes -EXTRACT_AFTER_ARGS= |${TAR} -xpf - --exclude '*md5*' \ +EXTRACT_AFTER_ARGS= --exclude '*md5*' \ --exclude udt${PORTVERSION:R}/win USE_LDCONFIG= yes UDT_APPS= appclient appserver recvfile sendfile test diff --git a/ports-mgmt/dialog4ports/Makefile b/ports-mgmt/dialog4ports/Makefile index df41d4d956a0..ccd073dcffe9 100644 --- a/ports-mgmt/dialog4ports/Makefile +++ b/ports-mgmt/dialog4ports/Makefile @@ -38,8 +38,6 @@ DIALOG4PORTS= ${WRKSRC}/dialog4ports DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ ${DIALOGNAME}.tgz:dialog DIALOGNAME= dialog-1.1-20120706 -EXTRACT_CMD= ${CAT} -EXTRACT_BEFORE_ARGS= MAKE_ENV+= DIALOGSOURCES=${WRKDIR}/${DIALOGNAME} diff --git a/ports-mgmt/managepkg/Makefile b/ports-mgmt/managepkg/Makefile index aeb56f0682a7..e1563f896f33 100644 --- a/ports-mgmt/managepkg/Makefile +++ b/ports-mgmt/managepkg/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: managepkg -# Date created: 2005-09-04 -# Whom: Andreas Fehlner <fehlner@gmx.de> -# +# Created by: Andreas Fehlner <fehlner@gmx.de> # $FreeBSD$ -# PORTNAME= managepkg PORTVERSION= 1.1 @@ -17,7 +13,9 @@ MAINTAINER= fehlner@gmx.de COMMENT= Script for maintaining ports # Any ideas for a better comment? -EXTRACT_AFTER_ARGS= ${DISTDIR}/${DISTFILES} > ${WRKSRC}/${PORTNAME} +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= +EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME} WRKSRC= ${WRKDIR} NO_BUILD= yes PLIST_FILES= sbin/managepkg diff --git a/portuguese/hunspell/Makefile b/portuguese/hunspell/Makefile index 5e7ea2586ee9..228dff77b0b0 100644 --- a/portuguese/hunspell/Makefile +++ b/portuguese/hunspell/Makefile @@ -14,10 +14,6 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= office@FreeBSD.org COMMENT= Portuguese hunspell dictionaries -# rely on bsdtar ability to extract .gz and .zip archives -EXTRACT_CMD= ${CAT} -EXTRACT_BEFORE_ARGS= # empty - NO_BUILD= yes WRKSRC= ${WRKDIR}/hunspell-pt_PT-${PORTVERSION} diff --git a/print/detex/Makefile b/print/detex/Makefile index 07661cfaedbc..fba8fe0ed241 100644 --- a/print/detex/Makefile +++ b/print/detex/Makefile @@ -10,10 +10,6 @@ EXTRACT_SUFX= .tar MAINTAINER= ports@FreeBSD.org COMMENT= Strips TeX/LaTeX codes from a file -EXTRACT_CMD= ${TAR} -EXTRACT_BEFORE_ARGS= -xf -EXTRACT_AFTER_ARGS= #empty - MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DNO_MALLOC_DECL -DHAVE_STRING_H" MAN1= detex.1 PLIST_FILES= bin/detex diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile index 2b7bdb798791..a3af76252a4a 100644 --- a/print/foo2zjs/Makefile +++ b/print/foo2zjs/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: foo2zjs -# Date created: 2006-03-17 -# Whom: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> -# +# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> # $FreeBSD$ -# PORTNAME= foo2zjs PORTVERSION= 20110609 @@ -112,7 +108,6 @@ XML_FILES= driver/foo2hiperc.xml \ printer/Xerox-Phaser_6110.xml \ printer/Xerox-Phaser_6115MFP.xml -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for FILES in ${XML_FILES} EXTRACT_AFTER_ARGS+= --exclude '${FILES}' .endfor diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile index 744e45096989..6430b370802b 100644 --- a/print/ghostscript8/Makefile +++ b/print/ghostscript8/Makefile @@ -14,7 +14,7 @@ PKGNAMESUFFIX= 8 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_AFTER_ARGS= | ${TAR} -xpf - ${EXCLUDE_DIRS:S/^/--exclude /} +EXTRACT_AFTER_ARGS= ${EXCLUDE_DIRS:S/^/--exclude /} MAINTAINER= doceng@FreeBSD.org COMMENT= Ghostscript 8.x PostScript interpreter diff --git a/print/ghostscript9/Makefile b/print/ghostscript9/Makefile index 7f05d55d3a89..aabc9af9efc6 100644 --- a/print/ghostscript9/Makefile +++ b/print/ghostscript9/Makefile @@ -13,7 +13,7 @@ PKGNAMESUFFIX= 9 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_AFTER_ARGS= | ${TAR} -xpf - ${EXCLUDE_DIRS:S/^/--exclude /} +EXTRACT_AFTER_ARGS= ${EXCLUDE_DIRS:S/^/--exclude /} MAINTAINER= doceng@FreeBSD.org COMMENT= Ghostscript 9.x PostScript interpreter diff --git a/security/burpsuite/Makefile b/security/burpsuite/Makefile index 75fc667e0a7b..165536b66a40 100644 --- a/security/burpsuite/Makefile +++ b/security/burpsuite/Makefile @@ -12,7 +12,6 @@ EXTRACT_SUFX= .jar MAINTAINER= sbz@FreeBSD.org COMMENT= Burp Suite is an integrated platform for testing web applications -EXTRACT_CMD= "" USE_JAVA= yes NO_BUILD= yes JAVA_VERSION= 1.7 diff --git a/security/fuzzdb/Makefile b/security/fuzzdb/Makefile index c0e212871575..1eb1b38103c6 100644 --- a/security/fuzzdb/Makefile +++ b/security/fuzzdb/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Comprehensive set of fuzzing patterns NO_BUILD= yes -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude .svn +EXTRACT_AFTER_ARGS= --exclude .svn PORTDOCS= _copyright.txt _readme.txt PORTDIRS= attack-payloads wordlists-misc Discovery \ web-backdoors wordlists-user-passwd regex diff --git a/security/nss/Makefile b/security/nss/Makefile index 94b93a4a50a8..11a962067c0d 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -35,8 +35,7 @@ SUB_LIST= MAJOR_VERSION=${PORTVERSION:R:R} \ DIST= ${WRKSRC:H:H}/dist EXTERNALS= CVS dbm security/nss/lib/zlib nsprpub security/dbm -EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ - ${EXTERNALS:C,^,--exclude ${PORTNAME}-${PORTVERSION}/mozilla/,} +EXTRACT_AFTER_ARGS= ${EXTERNALS:C,^,--exclude ${PORTNAME}-${PORTVERSION}/mozilla/,} INSTALL_BINS= certcgi certutil checkcert cmsutil crlutil derdump makepqg \ mangle modutil ocspclnt oidcalc p7content p7env p7sign \ diff --git a/security/opieprint/Makefile b/security/opieprint/Makefile index 51882385a99c..da79f9cd4398 100644 --- a/security/opieprint/Makefile +++ b/security/opieprint/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: keyprint -# Date created: Sat May 29 02:05:00 PDT 1999 -# Whom: mharo@FreeBSD.org -# +# Created by: mharo@FreeBSD.org # $FreeBSD$ -# PORTNAME= opieprint PORTVERSION= 1.0 @@ -22,6 +18,8 @@ USE_PERL5_RUN= yes PLIST_FILES= bin/opieprint +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME} post-patch: diff --git a/sysutils/fatback/Makefile b/sysutils/fatback/Makefile index daf17d52a908..585faa38dc7d 100644 --- a/sysutils/fatback/Makefile +++ b/sysutils/fatback/Makefile @@ -15,9 +15,8 @@ MAKE_JOBS_SAFE= yes MAN1= fatback.1 INFO= fatback-manual -EXTRACT_AFTER_ARGS+= |${TAR} -xpf - \ - --exclude 'getopt*' \ - --exclude 'set[yl].c' +EXTRACT_AFTER_ARGS= --exclude 'getopt*' \ + --exclude 'set[yl].c' OPTIONS_DEFINE= DOCS diff --git a/sysutils/ksysguardd/Makefile b/sysutils/ksysguardd/Makefile index 3b7454b648b6..3a4d7add9369 100644 --- a/sysutils/ksysguardd/Makefile +++ b/sysutils/ksysguardd/Makefile @@ -19,10 +19,9 @@ CMAKE_ARGS+= -DBIN_INSTALL_DIR:STRING="${PREFIX}/bin" \ -DSYSCONF_INSTALL_DIR:STRING="${PREFIX}/etc" MAKE_JOBS_SAFE= yes -EXTRACT_AFTER_ARGS= | ${TAR} -xf - \ - '${DISTNAME}/ksysguard/${PORTNAME}' \ - '${DISTNAME}/ksysguard/example/${PORTNAME}rc' \ - '${DISTNAME}/ksysguard/gui/SignalIDs.h' +EXTRACT_AFTER_ARGS= '${DISTNAME}/ksysguard/${PORTNAME}' \ + '${DISTNAME}/ksysguard/example/${PORTNAME}rc' \ + '${DISTNAME}/ksysguard/gui/SignalIDs.h' WRKSRC= ${WRKDIR}/${DISTNAME}/ksysguard/${PORTNAME} diff --git a/sysutils/linux-afaapps/Makefile b/sysutils/linux-afaapps/Makefile index be686c1339d0..bf022e706fe1 100644 --- a/sysutils/linux-afaapps/Makefile +++ b/sysutils/linux-afaapps/Makefile @@ -21,11 +21,6 @@ ONLY_FOR_ARCHS= i386 amd64 BRANDELF_FILES= usr/sbin/afacli SRC_DISTFILES= # empty, no sources available -EXTRACT_CMD= ${GZIP_CMD} -EXTRACT_BEFORE_ARGS= -dc -EXTRACT_AFTER_ARGS= | ${TAR} -xf - -EXTRACT_SUFX= .tar.gz - RPMFILE= ${PORTNAME}-${PORTVERSION}-2.${LINUX_RPM_ARCH}.rpm .include <bsd.port.pre.mk> diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index 3c5592b536fc..9553e0927672 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -63,7 +63,7 @@ post-extract: ${ECHO} "($$EXPMD5 != $$CALCMD5)" ; \ exit 1 ; \ fi ; \ - ${CAT} ${SRCBALL_NAME}.tar ${EXTRACT_AFTER_ARGS} \ + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${SRCBALL_NAME}.tar ${EXTRACT_AFTER_ARGS} \ ) @( cd ${WRKSRC} ; ${ECHO_CMD} "y" | ./Inventory || exit 1 ) .endif diff --git a/sysutils/qzeitgeist/Makefile b/sysutils/qzeitgeist/Makefile index 6e5ecfeea716..b0e49bb3c7cb 100644 --- a/sysutils/qzeitgeist/Makefile +++ b/sysutils/qzeitgeist/Makefile @@ -33,7 +33,7 @@ USE_LDCONFIG= yes ZEITGEIST_VERSION= 0.8.2 post-extract: - @(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} \ + @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ ${_DISTDIR}/zeitgeist-${ZEITGEIST_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}) cd ${WRKDIR}/zeitgeist-${ZEITGEIST_VERSION} && \ ${CP} zeitgeist/datamodel.py \ diff --git a/textproc/2bsd-diff/Makefile b/textproc/2bsd-diff/Makefile index 5138a66c08ea..7dfc2b9dba24 100644 --- a/textproc/2bsd-diff/Makefile +++ b/textproc/2bsd-diff/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: 2bsd-diff -# Date created: Mon Mar 17 20:54:03 EST 2003 -# Whom: risner@stdio.com -# +# Created by: risner@stdio.com # $FreeBSD$ -# PORTNAME= diff PORTVERSION= 2.11 @@ -17,7 +13,7 @@ DISTNAME= file8 MAINTAINER= risner@stdio.com COMMENT= 2.11BSD diff utility -EXTRACT_AFTER_ARGS= | ${TAR} -xf - bin/diff man/man1/diff.1 +EXTRACT_AFTER_ARGS= bin/diff man/man1/diff.1 WRKSRC= ${WRKDIR}/bin/diff MAN1= 2diff.1 diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile index 032ad8822524..cf51e8520b46 100644 --- a/textproc/htmldoc/Makefile +++ b/textproc/htmldoc/Makefile @@ -27,7 +27,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-localjpeg --enable-localzlib --enable-localpng WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} EXCLUDE= png jpeg zlib htmldoc/md5* htmldoc/rc4* htmldoc/snprintf* -EXTRACT_AFTER_ARGS=| ${TAR} -xf - ${EXCLUDE:S,^,--exclude ,} +EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} MAN1= htmldoc.1 post-patch: diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile index b2f07617e5c5..21f737cf084c 100644 --- a/textproc/libextractor/Makefile +++ b/textproc/libextractor/Makefile @@ -22,7 +22,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude libltdl +EXTRACT_AFTER_ARGS= --exclude libltdl MAN1= extract.1 MAN3= libextractor.3 diff --git a/textproc/qt4-clucene/Makefile b/textproc/qt4-clucene/Makefile index 59d788fc6133..c559cef68d51 100644 --- a/textproc/qt4-clucene/Makefile +++ b/textproc/qt4-clucene/Makefile @@ -30,7 +30,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/xmlpatterns src/3rdparty/freetype src/3rdparty/libjpeg \ src/3rdparty/libmng src/3rdparty/libpng src/3rdparty/libtiff \ src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile index 60fcdc45dd97..d9ebb917e232 100644 --- a/textproc/qt4-xml/Makefile +++ b/textproc/qt4-xml/Makefile @@ -30,7 +30,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/textproc/qt4-xmlpatterns-tool/Makefile b/textproc/qt4-xmlpatterns-tool/Makefile index 1c59ef10c5c9..916b11a2fb3d 100644 --- a/textproc/qt4-xmlpatterns-tool/Makefile +++ b/textproc/qt4-xmlpatterns-tool/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/textproc/qt4-xmlpatterns/Makefile b/textproc/qt4-xmlpatterns/Makefile index de27356dd6b7..a39442379a03 100644 --- a/textproc/qt4-xmlpatterns/Makefile +++ b/textproc/qt4-xmlpatterns/Makefile @@ -30,7 +30,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/textproc/re_graph/Makefile b/textproc/re_graph/Makefile index 36aa9631cac1..b86040b8120d 100644 --- a/textproc/re_graph/Makefile +++ b/textproc/re_graph/Makefile @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: re_graph -# Date created: Apr 22, 2005 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= re_graph PORTVERSION= 0.2 @@ -21,9 +16,6 @@ RUN_DEPENDS= p5-GD>=0:${PORTSDIR}/graphics/p5-GD \ p5-GD-Arrow>=0:${PORTSDIR}/graphics/p5-GD-Arrow NO_WRKSUBDIR= yes -EXTRACT_CMD= ${TAR} -EXTRACT_BEFORE_ARGS= -xf -EXTRACT_AFTER_ARGS= # empty NO_BUILD= yes USE_PERL5_RUN= yes diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile index c5e140e367e3..0294c319e79d 100644 --- a/textproc/sphinxsearch/Makefile +++ b/textproc/sphinxsearch/Makefile @@ -158,7 +158,7 @@ DOCSRC= ${WRKSRC}/doc post-extract: .if ${PORT_OPTIONS:MLIBSTEMMER} @( cd ${WRKSRC} && \ - ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${LIBSTEMMER_TGZ} \ + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${LIBSTEMMER_TGZ} \ ${EXTRACT_AFTER_ARGS} ) .endif diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile index d48948f479ac..73d4f25248a4 100644 --- a/www/cadaver/Makefile +++ b/www/cadaver/Makefile @@ -29,7 +29,7 @@ PLIST_FILES= bin/cadaver # script breaks if it can not find the Makefile* in them. Exclude # them to be sure, a stray .h is not included instead of what's # found under PREFIX (installed by the neon port): -EXTRACT_AFTER_ARGS= | ${TAR} -xf - \ +EXTRACT_AFTER_ARGS= \ --exclude '${PORTNAME}-${PORTVERSION}/lib/expat/*.[ch]' \ --exclude '${PORTNAME}-${PORTVERSION}/lib/intl/*.[ch]' \ --exclude '${PORTNAME}-${PORTVERSION}/lib/neon/*.[ch]' \ diff --git a/www/cgi-lib.pl/Makefile b/www/cgi-lib.pl/Makefile index da299730aba1..74465b6b03d0 100644 --- a/www/cgi-lib.pl/Makefile +++ b/www/cgi-lib.pl/Makefile @@ -20,6 +20,8 @@ USE_PERL5= YES NO_BUILD= YES NO_WRKSUBDIR= YES PLIST_FILES= %%SITE_PERL%%/cgi-lib.pl +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= > cgi-lib.pl INSTALL_BASE= ${SITE_PERL_REL} diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile index 1e5f842ed4dd..93d2850b1940 100644 --- a/www/jmeter/Makefile +++ b/www/jmeter/Makefile @@ -48,7 +48,7 @@ SUB_FILES= jmeter.sh DATAFILES= bin extras lib # Do not even extract the MS-DOS files nor the JARs, # that are already provided by other ports: -EXTRACT_AFTER_ARGS= |${TAR} -xpf - --exclude '*.bat' --exclude '*.cmd' \ +EXTRACT_AFTER_ARGS= --exclude '*.bat' --exclude '*.cmd' \ ${RUN_DEPENDS:M*.jar*:C|.*/(.+).jar:.*|--exclude '\1-*.jar'|} \ --exclude 'oro-*.jar' diff --git a/www/qt4-webkit/Makefile b/www/qt4-webkit/Makefile index a638e85e8dc0..aca1dbe13d98 100644 --- a/www/qt4-webkit/Makefile +++ b/www/qt4-webkit/Makefile @@ -33,7 +33,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/testlib src/tools src/winmain src/3rdparty/clucene \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/www/ump/Makefile b/www/ump/Makefile index 5b390b71fb7a..a39970e91c73 100644 --- a/www/ump/Makefile +++ b/www/ump/Makefile @@ -45,7 +45,7 @@ EXTRA_PATCHES= ${PORTSDIR}/audio/timidity++/files/* PKGDIR= ${.CURDIR} WRKSRC= ${WRKDIR}/TiMidity++-${TIMIDITY_VERSION} BUILD_WRKSRC= ${WRKSRC}/ump -EXTRACT_AFTER_ARGS= | ${TAR} -xpf - --exclude '*/libarc/*' \ +EXTRACT_AFTER_ARGS= --exclude '*/libarc/*' \ --exclude '*/utils/mblock.h' --exclude '*/utils/memb.h' ALL_TARGET= ump diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile index dd22ccd0320e..f70e7ea8d2b7 100644 --- a/x11-fonts/etlfonts/Makefile +++ b/x11-fonts/etlfonts/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: etlfonts-noncjk -# Date created: 3 Nov 1996 -# Whom: Mita Yoshio <mita@jp.FreeBSD.org> -# +# Created by: Mita Yoshio <mita@jp.FreeBSD.org> # $FreeBSD$ -# PORTNAME= etlfonts-noncjk PORTVERSION= 1.0 @@ -20,9 +16,6 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -EXTRACT_CMD= ${TAR} -EXTRACT_BEFORE_ARGS= -xf -EXTRACT_AFTER_ARGS= # empty USE_XORG= x11 post-extract: diff --git a/x11-fonts/mkbold/Makefile b/x11-fonts/mkbold/Makefile index 5ae56acafc04..ffc9ecdeb31a 100644 --- a/x11-fonts/mkbold/Makefile +++ b/x11-fonts/mkbold/Makefile @@ -19,6 +19,8 @@ CONFLICTS= mkbold-mkitalic-[0-9]* PLIST_FILES= bin/mkbold USE_PERL5= yes +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= > ${WRKSRC}/mkbold NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/x11-fonts/mkitalic/Makefile b/x11-fonts/mkitalic/Makefile index 29f8c8097a1f..502cc7c8b40f 100644 --- a/x11-fonts/mkitalic/Makefile +++ b/x11-fonts/mkitalic/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: mkitalic -# Date created: 6 January 2002 -# Whom: KOMATSU Shinichiro -# +# Created by: KOMATSU Shinichiro # $FreeBSD$ -# PORTNAME= mkitalic PORTVERSION= 1.0 @@ -19,6 +15,8 @@ CONFLICTS= mkbold-mkitalic-[0-9]* PLIST_FILES= bin/mkitalic USE_PERL5= yes +EXTRACT_CMD= ${BZCAT} +EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= > ${WRKSRC}/mkitalic NO_WRKSUBDIR= yes USE_BZIP2= yes diff --git a/x11-fonts/suxus/Makefile b/x11-fonts/suxus/Makefile index 03369a7b4901..e6b5c3fb4d8a 100644 --- a/x11-fonts/suxus/Makefile +++ b/x11-fonts/suxus/Makefile @@ -23,7 +23,7 @@ do-extract: @${MKDIR} ${WRKSRC} @${CP} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-iso-8859-1.bdf.gz ${WRKSRC} @${CP} ${DISTDIR}/${DIST_SUBDIR}/fonts.alias ${WRKSRC} - @${EXTRACT_CMD} -d ${WRKSRC}/${PORTNAME}-iso-8859-1.bdf.gz + @${GZIP_CMD} -d ${WRKSRC}/${PORTNAME}-iso-8859-1.bdf.gz do-build: ${PREFIX}/bin/bdftopcf -t ${WRKSRC}/suxus-iso-8859-1.bdf | ${EXTRACT_CMD} > ${WRKSRC}/suxus-iso-8859-1.pcf.gz diff --git a/x11-themes/kde4-icons-oxygen/Makefile b/x11-themes/kde4-icons-oxygen/Makefile index 9369d195a881..11fe16015f75 100644 --- a/x11-themes/kde4-icons-oxygen/Makefile +++ b/x11-themes/kde4-icons-oxygen/Makefile @@ -16,6 +16,6 @@ USE_XZ= yes USE_KDE4= kdeprefix kdehier USES= cmake:outsource INSTALL_TARGET= install -EXTRACT_AFTER_ARGS+= | ${TAR} -xf - --exclude '${DISTNAME}/scalable' +EXTRACT_AFTER_ARGS= --exclude '${DISTNAME}/scalable' .include <bsd.port.mk> diff --git a/x11-toolkits/easygtk/Makefile b/x11-toolkits/easygtk/Makefile index 8b4857025c96..316f3876e292 100644 --- a/x11-toolkits/easygtk/Makefile +++ b/x11-toolkits/easygtk/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: easygtk -# Date created: 3 January 2001 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# PORTNAME= easygtk PORTVERSION= 1.2 @@ -16,9 +12,6 @@ EXTRACT_SUFX= .tar MAINTAINER= gahr@FreeBSD.org COMMENT= A wrapper library for GTK+ which provides simplified GUI API -EXTRACT_BEFORE_ARGS= # it's intentionally left blank -EXTRACT_CMD= ${CAT} # not quite `extract', but who cares? ;) - WRKSRC= ${WRKDIR}/${PORTNAME} USE_GNOME= gnomelibs diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index 4e39c0a16d2b..9756c134f3da 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-copy -# Date created: 2 November 2001 -# Whom: will@cvs.kde.org -# +# Created by: will@cvs.kde.org # $FreeBSD$ -# PORTNAME= qt PORTVERSION= 3.3.8 @@ -56,7 +51,7 @@ MAKE_ENV?= TMPDIR=${TMPDIR} \ LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH ALL_TARGET= sub-tools -EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ +EXTRACT_AFTER_ARGS= \ --exclude '${DISTNAME}/mkspecs' --exclude '${DISTNAME}/qmake' \ --exclude '${DISTNAME}/examples' --exclude '${DISTNAME}/tutorial' \ --exclude '${DISTNAME}/extensions/nsplugin/src/[^q]*' \ diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index ad0172f87df2..e9c2131e075f 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -38,7 +38,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/x11/qt4-graphicssystems-opengl/Makefile b/x11/qt4-graphicssystems-opengl/Makefile index 34cb8ea9f825..2c104162db26 100644 --- a/x11/qt4-graphicssystems-opengl/Makefile +++ b/x11/qt4-graphicssystems-opengl/Makefile @@ -31,7 +31,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile index db24250f1ee9..ec4e34a7dce9 100644 --- a/x11/qt4-inputmethods/Makefile +++ b/x11/qt4-inputmethods/Makefile @@ -29,7 +29,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile index 5e6bde1b1556..75e747c8039b 100644 --- a/x11/qt4-opengl/Makefile +++ b/x11/qt4-opengl/Makefile @@ -33,7 +33,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor |