Index: Mk/bsd.gecko.mk =================================================================== --- Mk/bsd.gecko.mk (revision 316777) +++ Mk/bsd.gecko.mk (working copy) @@ -528,7 +528,7 @@ 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 Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk (revision 316777) +++ Mk/bsd.port.mk (working copy) @@ -2282,20 +2282,14 @@ 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 - +EXTRACT_AFTER_ARGS?= .else -EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --no-same-owner --no-same-permissions +EXTRACT_AFTER_ARGS?= --no-same-owner --no-same-permissions .endif -.if defined(USE_BZIP2) -EXTRACT_CMD?= ${BZIP2_CMD} -.elif defined(USE_XZ) -EXTRACT_CMD?= ${XZ_CMD} -.else -EXTRACT_CMD?= ${GZIP_CMD} .endif -.endif # Figure out where the local mtree file is .if !defined(MTREE_FILE) && !defined(NO_MTREE) Index: accessibility/qt4-accessible/Makefile =================================================================== --- accessibility/qt4-accessible/Makefile (revision 316777) +++ accessibility/qt4-accessible/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: astro/wmmoonclock/Makefile =================================================================== --- astro/wmmoonclock/Makefile (revision 316777) +++ astro/wmmoonclock/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: wmMoonClock -# Date created: 14 March 1999 -# Whom: Kris Kennaway -# +# Created by: Kris Kennaway # $FreeBSD$ -# PORTNAME= wmMoonClock PORTVERSION= 1.27 @@ -14,9 +10,6 @@ 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 Index: astro/wmspaceweather/Makefile =================================================================== --- astro/wmspaceweather/Makefile (revision 316777) +++ astro/wmspaceweather/Makefile (working copy) @@ -1,7 +1,4 @@ -# New ports collection makefile for: wmSpaceWeather -# Date created: 16 April 1999 -# Whom: Chris Piazza -# +# Created by: Chris Piazza # $FreeBSD$ PORTNAME= wmspaceweather @@ -21,10 +18,6 @@ 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 Index: audio/timidity++/Makefile =================================================================== --- audio/timidity++/Makefile (revision 316777) +++ audio/timidity++/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: TiMidity++ -# Date created: 27 Feb 1999 -# Whom: Yoichi Asai -# +# Created by: Yoichi Asai # $FreeBSD$ -# PORTNAME= timidity++ PORTVERSION= 2.13.2 @@ -36,7 +32,7 @@ .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 \ Index: cad/verilog-mode.el/Makefile =================================================================== --- cad/verilog-mode.el/Makefile (revision 316777) +++ cad/verilog-mode.el/Makefile (working copy) @@ -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 @@ LICENSE= GPLv3 # (or later) +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= > ${PORTNAME} NO_WRKSUBDIR= yes Index: chinese/qt4-codecs-cn/Makefile =================================================================== --- chinese/qt4-codecs-cn/Makefile (revision 316777) +++ chinese/qt4-codecs-cn/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: chinese/qt4-codecs-tw/Makefile =================================================================== --- chinese/qt4-codecs-tw/Makefile (revision 316777) +++ chinese/qt4-codecs-tw/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: databases/p5-GDBM/Makefile =================================================================== --- databases/p5-GDBM/Makefile (revision 316777) +++ databases/p5-GDBM/Makefile (working copy) @@ -1,11 +1,5 @@ -# New ports collection makefile for: p5-GDBM -# Date created: Nov 9 1999 -# Whom: Nick Sayer -# -# Heavy input from eivind@freebsd.org -# +# Created by: Nick Sayer # $FreeBSD$ -# PORTNAME= GDBM PORTVERSION= 1.14 @@ -21,7 +15,7 @@ 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 Index: databases/pydbdesigner/Makefile =================================================================== --- databases/pydbdesigner/Makefile (revision 316777) +++ databases/pydbdesigner/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: pydbdesigner -# Date created: 2003-01-02 -# Whom: Alan Eldridge -# +# Created by: Alan Eldridge # $FreeBSD$ -# PORTNAME= pydbdesigner PORTVERSION= 0.1.4.1 @@ -14,7 +10,7 @@ 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 Index: databases/qt-mysql-plugin/Makefile =================================================================== --- databases/qt-mysql-plugin/Makefile (revision 316777) +++ databases/qt-mysql-plugin/Makefile (working copy) @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-mysql-plugin -# Date created: 20 April 2003 -# Whom: Kay Lehmann -# +# Created by: Kay Lehmann # $FreeBSD$ -# PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 @@ -28,8 +23,7 @@ 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}" \ Index: databases/qt-odbc-plugin/Makefile =================================================================== --- databases/qt-odbc-plugin/Makefile (revision 316777) +++ databases/qt-odbc-plugin/Makefile (working copy) @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-odbc-plugin -# Date created: 31 December 2003 -# Whom: Michael Nottebrock -# +# Created by: Michael Nottebrock # $FreeBSD$ -# PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 @@ -29,8 +24,8 @@ 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}" \ Index: databases/qt-pgsql-plugin/Makefile =================================================================== --- databases/qt-pgsql-plugin/Makefile (revision 316777) +++ databases/qt-pgsql-plugin/Makefile (working copy) @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-pgsql-plugin -# Date created: 5 August 2003 -# Whom: Lauri Watts -# +# Created by: Lauri Watts # $FreeBSD$ -# PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 @@ -28,8 +23,8 @@ 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}" \ Index: databases/qt-sqlite-plugin/Makefile =================================================================== --- databases/qt-sqlite-plugin/Makefile (revision 316777) +++ databases/qt-sqlite-plugin/Makefile (working copy) @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-sqlite-plugin -# Date created: 27 February 2004 -# Whom: Michael Nottebrock -# +# Created by: Michael Nottebrock # $FreeBSD$ -# PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 @@ -28,8 +23,8 @@ 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}" \ Index: databases/qt4-ibase-plugin/Makefile =================================================================== --- databases/qt4-ibase-plugin/Makefile (revision 316777) +++ databases/qt4-ibase-plugin/Makefile (working copy) @@ -18,10 +18,9 @@ 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}" \ Index: databases/qt4-mysql-plugin/Makefile =================================================================== --- databases/qt4-mysql-plugin/Makefile (revision 316777) +++ databases/qt4-mysql-plugin/Makefile (working copy) @@ -18,9 +18,8 @@ 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}" \ Index: databases/qt4-odbc-plugin/Makefile =================================================================== --- databases/qt4-odbc-plugin/Makefile (revision 316777) +++ databases/qt4-odbc-plugin/Makefile (working copy) @@ -19,9 +19,8 @@ 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}" \ Index: databases/qt4-pgsql-plugin/Makefile =================================================================== --- databases/qt4-pgsql-plugin/Makefile (revision 316777) +++ databases/qt4-pgsql-plugin/Makefile (working copy) @@ -18,9 +18,8 @@ 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}" \ Index: databases/qt4-sql/Makefile =================================================================== --- databases/qt4-sql/Makefile (revision 316777) +++ databases/qt4-sql/Makefile (working copy) @@ -30,7 +30,6 @@ 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 Index: databases/qt4-sqlite-plugin/Makefile =================================================================== --- databases/qt4-sqlite-plugin/Makefile (revision 316777) +++ databases/qt4-sqlite-plugin/Makefile (working copy) @@ -19,10 +19,9 @@ 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}" \ Index: databases/qt4-sqlite3-plugin/Makefile =================================================================== --- databases/qt4-sqlite3-plugin/Makefile (revision 316777) +++ databases/qt4-sqlite3-plugin/Makefile (working copy) @@ -20,10 +20,9 @@ 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}" \ Index: databases/sqlite2/Makefile =================================================================== --- databases/sqlite2/Makefile (revision 316777) +++ databases/sqlite2/Makefile (working copy) @@ -22,7 +22,7 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}2 -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude CVS +EXTRACT_AFTER_ARGS= --exclude CVS OPTIONS_DEFINE= TCL THREADS DOCS Index: devel/dbus-qt4/Makefile =================================================================== --- devel/dbus-qt4/Makefile (revision 316777) +++ devel/dbus-qt4/Makefile (working copy) @@ -32,7 +32,6 @@ 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 Index: devel/doxygen/Makefile =================================================================== --- devel/doxygen/Makefile (revision 316777) +++ devel/doxygen/Makefile (working copy) @@ -29,10 +29,9 @@ 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 Index: devel/dparser/Makefile =================================================================== --- devel/dparser/Makefile (revision 316777) +++ devel/dparser/Makefile (working copy) @@ -15,7 +15,7 @@ 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} Index: devel/gcvs/Makefile =================================================================== --- devel/gcvs/Makefile (revision 316777) +++ devel/gcvs/Makefile (working copy) @@ -26,8 +26,7 @@ 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' \ Index: devel/gdb/Makefile =================================================================== --- devel/gdb/Makefile (revision 316777) +++ devel/gdb/Makefile (working copy) @@ -25,8 +25,7 @@ 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 Index: devel/gdb66/Makefile =================================================================== --- devel/gdb66/Makefile (revision 316777) +++ devel/gdb66/Makefile (working copy) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: GDB 6 -# Date created: 30 March 2001 -# Whom: David O'Brien -# +# Created by: David O'Brien # $FreeBSD$ -# PORTNAME= gdb PORTVERSION= 6.6 @@ -38,7 +33,7 @@ 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 Index: devel/qmake/Makefile =================================================================== --- devel/qmake/Makefile (revision 316777) +++ devel/qmake/Makefile (working copy) @@ -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 @@ USE_BZIP2= yes -EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ +EXTRACT_AFTER_ARGS= \ '${DISTNAME}/mkspecs' \ '${DISTNAME}/src/*/*.h' '${DISTNAME}/qmake' \ '${DISTNAME}/src/tools' Index: devel/qmake4/Makefile =================================================================== --- devel/qmake4/Makefile (revision 316777) +++ devel/qmake4/Makefile (working copy) @@ -19,7 +19,7 @@ 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' \ Index: devel/qt4-assistant/Makefile =================================================================== --- devel/qt4-assistant/Makefile (revision 316777) +++ devel/qt4-assistant/Makefile (working copy) @@ -34,7 +34,6 @@ 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 Index: devel/qt4-corelib/Makefile =================================================================== --- devel/qt4-corelib/Makefile (revision 316777) +++ devel/qt4-corelib/Makefile (working copy) @@ -36,7 +36,6 @@ 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 Index: devel/qt4-declarative/Makefile =================================================================== --- devel/qt4-declarative/Makefile (revision 316777) +++ devel/qt4-declarative/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: devel/qt4-designer/Makefile =================================================================== --- devel/qt4-designer/Makefile (revision 316777) +++ devel/qt4-designer/Makefile (working copy) @@ -36,7 +36,6 @@ 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 Index: devel/qt4-help/Makefile =================================================================== --- devel/qt4-help/Makefile (revision 316777) +++ devel/qt4-help/Makefile (working copy) @@ -31,7 +31,6 @@ 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 Index: devel/qt4-help-tools/Makefile =================================================================== --- devel/qt4-help-tools/Makefile (revision 316777) +++ devel/qt4-help-tools/Makefile (working copy) @@ -32,7 +32,6 @@ 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 Index: devel/qt4-linguist/Makefile =================================================================== --- devel/qt4-linguist/Makefile (revision 316777) +++ devel/qt4-linguist/Makefile (working copy) @@ -34,7 +34,6 @@ 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 Index: devel/qt4-makeqpf/Makefile =================================================================== --- devel/qt4-makeqpf/Makefile (revision 316777) +++ devel/qt4-makeqpf/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: devel/qt4-moc/Makefile =================================================================== --- devel/qt4-moc/Makefile (revision 316777) +++ devel/qt4-moc/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: devel/qt4-porting/Makefile =================================================================== --- devel/qt4-porting/Makefile (revision 316777) +++ devel/qt4-porting/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: devel/qt4-qdbusviewer/Makefile =================================================================== --- devel/qt4-qdbusviewer/Makefile (revision 316777) +++ devel/qt4-qdbusviewer/Makefile (working copy) @@ -36,7 +36,6 @@ 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 Index: devel/qt4-qdoc3/Makefile =================================================================== --- devel/qt4-qdoc3/Makefile (revision 316777) +++ devel/qt4-qdoc3/Makefile (working copy) @@ -23,7 +23,6 @@ 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 Index: devel/qt4-qmlviewer/Makefile =================================================================== --- devel/qt4-qmlviewer/Makefile (revision 316777) +++ devel/qt4-qmlviewer/Makefile (working copy) @@ -35,7 +35,6 @@ 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 Index: devel/qt4-qt3support/Makefile =================================================================== --- devel/qt4-qt3support/Makefile (revision 316777) +++ devel/qt4-qt3support/Makefile (working copy) @@ -30,7 +30,6 @@ 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 Index: devel/qt4-qtestlib/Makefile =================================================================== --- devel/qt4-qtestlib/Makefile (revision 316777) +++ devel/qt4-qtestlib/Makefile (working copy) @@ -30,7 +30,6 @@ 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 Index: devel/qt4-qvfb/Makefile =================================================================== --- devel/qt4-qvfb/Makefile (revision 316777) +++ devel/qt4-qvfb/Makefile (working copy) @@ -34,7 +34,6 @@ 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 Index: devel/qt4-rcc/Makefile =================================================================== --- devel/qt4-rcc/Makefile (revision 316777) +++ devel/qt4-rcc/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: devel/qt4-script/Makefile =================================================================== --- devel/qt4-script/Makefile (revision 316777) +++ devel/qt4-script/Makefile (working copy) @@ -30,7 +30,6 @@ 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 Index: devel/qt4-scripttools/Makefile =================================================================== --- devel/qt4-scripttools/Makefile (revision 316777) +++ devel/qt4-scripttools/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: devel/qt4-uic/Makefile =================================================================== --- devel/qt4-uic/Makefile (revision 316777) +++ devel/qt4-uic/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: devel/qt4-uic3/Makefile =================================================================== --- devel/qt4-uic3/Makefile (revision 316777) +++ devel/qt4-uic3/Makefile (working copy) @@ -28,7 +28,6 @@ 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 Index: devel/qtcreator/Makefile =================================================================== --- devel/qtcreator/Makefile (revision 316777) +++ devel/qtcreator/Makefile (working copy) @@ -37,7 +37,6 @@ 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 Index: editors/elvis/Makefile =================================================================== --- editors/elvis/Makefile (revision 316777) +++ editors/elvis/Makefile (working copy) @@ -12,7 +12,7 @@ LICENSE= ART10 -EXTRACT_AFTER_ARGS= | ${TAR} --exclude guiwin32 -xf - +EXTRACT_AFTER_ARGS= --exclude guiwin32 HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix="${PREFIX}" Index: editors/lazarus/Makefile.common =================================================================== --- editors/lazarus/Makefile.common (revision 316777) +++ editors/lazarus/Makefile.common (working copy) @@ -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 Index: editors/libreoffice/Makefile.common =================================================================== --- editors/libreoffice/Makefile.common (revision 316777) +++ editors/libreoffice/Makefile.common (working copy) @@ -61,7 +61,7 @@ .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}; \ Index: emulators/linux_base-fc4/Makefile =================================================================== --- emulators/linux_base-fc4/Makefile (revision 316777) +++ emulators/linux_base-fc4/Makefile (working copy) @@ -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 @@ 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 Index: emulators/mupen64-base/Makefile.common =================================================================== --- emulators/mupen64-base/Makefile.common (revision 316777) +++ emulators/mupen64-base/Makefile.common (working copy) @@ -4,7 +4,7 @@ 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 @@ 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 @@ 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} Index: emulators/mupen64plus-core/Makefile.common =================================================================== --- emulators/mupen64plus-core/Makefile.common (revision 316777) +++ emulators/mupen64plus-core/Makefile.common (working copy) @@ -5,7 +5,7 @@ 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" Index: emulators/mupen64plus-rsp-z64/Makefile =================================================================== --- emulators/mupen64plus-rsp-z64/Makefile (revision 316777) +++ emulators/mupen64plus-rsp-z64/Makefile (working copy) @@ -19,7 +19,7 @@ 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} Index: emulators/mupen64plus-video-arachnoid/Makefile =================================================================== --- emulators/mupen64plus-video-arachnoid/Makefile (revision 316777) +++ emulators/mupen64plus-video-arachnoid/Makefile (working copy) @@ -19,7 +19,7 @@ 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} Index: emulators/mupen64plus-video-glide64/Makefile =================================================================== --- emulators/mupen64plus-video-glide64/Makefile (revision 316777) +++ emulators/mupen64plus-video-glide64/Makefile (working copy) @@ -19,7 +19,7 @@ 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} Index: emulators/mupen64plus-video-z64/Makefile =================================================================== --- emulators/mupen64plus-video-z64/Makefile (revision 316777) +++ emulators/mupen64plus-video-z64/Makefile (working copy) @@ -19,7 +19,7 @@ CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib -EXTRACT_AFTER_ARGS= | ${TAR} -xf - +EXTRACT_AFTER_FLAGS= # BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC= ${WRKDIR} Index: emulators/x48/Makefile =================================================================== --- emulators/x48/Makefile (revision 316777) +++ emulators/x48/Makefile (working copy) @@ -35,7 +35,7 @@ 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} \ Index: games/alienarena/Makefile =================================================================== --- games/alienarena/Makefile (revision 316777) +++ games/alienarena/Makefile (working copy) @@ -28,7 +28,7 @@ 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}" Index: games/bogged/Makefile =================================================================== --- games/bogged/Makefile (revision 316777) +++ games/bogged/Makefile (working copy) @@ -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 Index: games/crossfire-server/Makefile =================================================================== --- games/crossfire-server/Makefile (revision 316777) +++ games/crossfire-server/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: crossfire-server -# Date created: Jan 30, 2002 -# Whom: Jasper Jongmans -# +# Created by: Jasper Jongmans # $FreeBSD$ -# PORTNAME= crossfire PORTVERSION= 1.70.0 @@ -40,7 +36,7 @@ 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 Index: games/fretsonfire/Makefile =================================================================== --- games/fretsonfire/Makefile (revision 316777) +++ games/fretsonfire/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fretsonfire -# Date created: 2006-09-01 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTNAME= fretsonfire PORTVERSION= 1.3.110 @@ -27,7 +23,7 @@ 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}" Index: games/fretsonfire-data/Makefile =================================================================== --- games/fretsonfire-data/Makefile (revision 316777) +++ games/fretsonfire-data/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fretsonfire-data -# Date created: 2006-10-02 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTNAME= data PORTVERSION= 1.3.110 @@ -21,7 +17,7 @@ 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} Index: games/linux-warsow/Makefile =================================================================== --- games/linux-warsow/Makefile (revision 316777) +++ games/linux-warsow/Makefile (working copy) @@ -1,6 +1,4 @@ -# New ports collection makefile for: warsow -# Date created: 2005-11-12 -# Whom: Jose Alonso Cardenas Marquez +# Created by: Jose Alonso Cardenas Marquez # # $FreeBSD$ # @@ -37,7 +35,7 @@ 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" \ Index: games/palomino/Makefile =================================================================== --- games/palomino/Makefile (revision 316777) +++ games/palomino/Makefile (working copy) @@ -62,18 +62,6 @@ 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' Index: graphics/jbig2dec/Makefile =================================================================== --- graphics/jbig2dec/Makefile (revision 316777) +++ graphics/jbig2dec/Makefile (working copy) @@ -24,7 +24,7 @@ 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 Index: graphics/libimg/Makefile =================================================================== --- graphics/libimg/Makefile (revision 316777) +++ graphics/libimg/Makefile (working copy) @@ -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_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/*' Index: graphics/nip2/Makefile =================================================================== --- graphics/nip2/Makefile (revision 316777) +++ graphics/nip2/Makefile (working copy) @@ -25,7 +25,7 @@ # 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 \ Index: graphics/qt4-iconengines/Makefile =================================================================== --- graphics/qt4-iconengines/Makefile (revision 316777) +++ graphics/qt4-iconengines/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: graphics/qt4-imageformats/Makefile =================================================================== --- graphics/qt4-imageformats/Makefile (revision 316777) +++ graphics/qt4-imageformats/Makefile (working copy) @@ -35,7 +35,6 @@ 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 Index: graphics/qt4-pixeltool/Makefile =================================================================== --- graphics/qt4-pixeltool/Makefile (revision 316777) +++ graphics/qt4-pixeltool/Makefile (working copy) @@ -34,7 +34,6 @@ 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 Index: graphics/qt4-svg/Makefile =================================================================== --- graphics/qt4-svg/Makefile (revision 316777) +++ graphics/qt4-svg/Makefile (working copy) @@ -30,7 +30,6 @@ 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 Index: graphics/s10sh/Makefile =================================================================== --- graphics/s10sh/Makefile (revision 316777) +++ graphics/s10sh/Makefile (working copy) @@ -12,7 +12,7 @@ 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 Index: graphics/sane-backends/Makefile =================================================================== --- graphics/sane-backends/Makefile (revision 316777) +++ graphics/sane-backends/Makefile (working copy) @@ -105,7 +105,7 @@ 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| ; \ Index: graphics/vips/Makefile =================================================================== --- graphics/vips/Makefile (revision 316777) +++ graphics/vips/Makefile (working copy) @@ -41,7 +41,7 @@ # 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} Index: graphics/xmandel/Makefile =================================================================== --- graphics/xmandel/Makefile (revision 316777) +++ graphics/xmandel/Makefile (working copy) @@ -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 Index: japanese/gskk/Makefile =================================================================== --- japanese/gskk/Makefile (revision 316777) +++ japanese/gskk/Makefile (working copy) @@ -1,10 +1,5 @@ -# New ports collection makefile for: gskk -# Date created: 7 Mar 2005 -# Whom: Hajimu UMEMOTO - -# +# Created by: Hajimu UMEMOTO # $FreeBSD$ -# PORTNAME= gskk PORTVERSION= 20041208 @@ -21,6 +16,8 @@ NO_WRKSUBDIR= yes +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= > ${PORTNAME}.t PLIST_FILES= share/canna/dic/canna/dics.dir.${PORTNAME} \ Index: japanese/qt4-codecs-jp/Makefile =================================================================== --- japanese/qt4-codecs-jp/Makefile (revision 316777) +++ japanese/qt4-codecs-jp/Makefile (working copy) @@ -30,7 +30,6 @@ 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 Index: japanese/yc.el/Makefile =================================================================== --- japanese/yc.el/Makefile (revision 316777) +++ japanese/yc.el/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: yc.el -# Date created: 1999/12/05 -# Whom: HONDA Yasuhiro -# +# Created by: HONDA Yasuhiro # $FreeBSD$ -# PORTNAME= yc.el PORTVERSION= 5.2.1 @@ -17,6 +13,8 @@ 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 Index: java/eclipse/Makefile =================================================================== --- java/eclipse/Makefile (revision 316777) +++ java/eclipse/Makefile (working copy) @@ -155,9 +155,9 @@ .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 @@ @${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/ Index: java/eclipse-devel/Makefile =================================================================== --- java/eclipse-devel/Makefile (revision 316777) +++ java/eclipse-devel/Makefile (working copy) @@ -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 @@ @${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 Index: java/icedtea-web/Makefile =================================================================== --- java/icedtea-web/Makefile (revision 316777) +++ java/icedtea-web/Makefile (working copy) @@ -26,6 +26,8 @@ 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 Index: java/openjdk6/Makefile =================================================================== --- java/openjdk6/Makefile (revision 316777) +++ java/openjdk6/Makefile (working copy) @@ -155,10 +155,6 @@ 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 .if ${PORT_OPTIONS:MIPV6} Index: korean/qt4-codecs-kr/Makefile =================================================================== --- korean/qt4-codecs-kr/Makefile (revision 316777) +++ korean/qt4-codecs-kr/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: lang/fpc/Makefile.units =================================================================== --- lang/fpc/Makefile.units (revision 316777) +++ lang/fpc/Makefile.units (working copy) @@ -14,7 +14,7 @@ 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} \ Index: lang/icc/Makefile =================================================================== --- lang/icc/Makefile (revision 316777) +++ lang/icc/Makefile (working copy) @@ -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 @@ .include -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 \ Index: lang/ifc/Makefile =================================================================== --- lang/ifc/Makefile (revision 316777) +++ lang/ifc/Makefile (working copy) @@ -37,8 +37,7 @@ .include -EXTRACT_AFTER_ARGS= | tar -xf - \ - --exclude intel-iidb\*.rpm \ +EXTRACT_AFTER_ARGS= --exclude intel-iidb\*.rpm \ --exclude \*ia64.rpm \ --exclude chklic.64 \ --exclude flexlm64 Index: lang/php5/Makefile.ext =================================================================== --- lang/php5/Makefile.ext (revision 316777) +++ lang/php5/Makefile.ext (working copy) @@ -11,7 +11,7 @@ PATCHDIR= ${.CURDIR}/files PLIST= ${NONEXISTENT} -EXTRACT_AFTER_ARGS?= | ${TAR} -xf - ${EXTSUBDIR} +EXTRACT_AFTER_ARGS?= ${EXTSUBDIR} .if ${PHP_MODNAME} == "bcmath" CONFIGURE_ARGS+=--enable-bcmath Index: lang/php53/Makefile.ext =================================================================== --- lang/php53/Makefile.ext (revision 316777) +++ lang/php53/Makefile.ext (working copy) @@ -11,7 +11,7 @@ PATCHDIR= ${.CURDIR}/files PLIST= ${NONEXISTENT} -EXTRACT_AFTER_ARGS?= | ${TAR} -xf - ${EXTSUBDIR} +EXTRACT_AFTER_ARGS?= ${EXTSUBDIR} .if ${PHP_MODNAME} == "bcmath" CONFIGURE_ARGS+=--enable-bcmath Index: lang/spidermonkey17/Makefile =================================================================== --- lang/spidermonkey17/Makefile (revision 316777) +++ lang/spidermonkey17/Makefile (working copy) @@ -42,8 +42,7 @@ 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 Index: mail/exim/Makefile =================================================================== --- mail/exim/Makefile (revision 316777) +++ mail/exim/Makefile (working copy) @@ -522,10 +522,10 @@ 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 Index: mail/filtermail/Makefile =================================================================== --- mail/filtermail/Makefile (revision 316777) +++ mail/filtermail/Makefile (working copy) @@ -24,6 +24,8 @@ # 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} Index: mail/mb2md/Makefile =================================================================== --- mail/mb2md/Makefile (revision 316777) +++ mail/mb2md/Makefile (working copy) @@ -14,7 +14,8 @@ 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 Index: mail/milter-callback/Makefile =================================================================== --- mail/milter-callback/Makefile (revision 316777) +++ mail/milter-callback/Makefile (working copy) @@ -22,10 +22,6 @@ 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 Index: mail/msgconvert/Makefile =================================================================== --- mail/msgconvert/Makefile (revision 316777) +++ mail/msgconvert/Makefile (working copy) @@ -21,6 +21,8 @@ USE_BZIP2= yes USE_PERL5= yes +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= > ${PORTNAME}.pl do-install: Index: mail/x-face-e21/Makefile =================================================================== --- mail/x-face-e21/Makefile (revision 316777) +++ mail/x-face-e21/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: x-face-e21 -# Date created: 10 September 2009 -# Whom: Hajimu UMEMOTO -# +# Created by: Hajimu UMEMOTO # $FreeBSD$ -# PORTNAME= x-face-e21 PORTVERSION= 20070306 @@ -23,6 +19,8 @@ .include NO_WRKSUBDIR= yes +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= > ${DISTNAME} PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME} \ Index: math/linux-relview/Makefile =================================================================== --- math/linux-relview/Makefile (revision 316777) +++ math/linux-relview/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: relview -# Date created: October 24 2002 -# Whom: Michael Ebert -# +# Created by: Michael Ebert # $FreeBSD$ -# PORTNAME= relview PORTVERSION= 7.0.2 @@ -21,6 +17,8 @@ USE_LINUX_APPS= gtk xorglibs NO_WRKSUBDIR= yes +EXTRACT_CMD= ${GZIP_CMD} +EXTRACT_BEFORE_ARGS= -dc EXTRACT_AFTER_ARGS= > ${DISTNAME} NO_BUILD= yes Index: misc/qt4-doc/Makefile =================================================================== --- misc/qt4-doc/Makefile (revision 316777) +++ misc/qt4-doc/Makefile (working copy) @@ -13,7 +13,7 @@ QT_DIST= yes NO_BUILD= yes -EXTRACT_AFTER_ARGS=| ${TAR} -xf - '${DISTNAME}/doc' +EXTRACT_AFTER_ARGS= '${DISTNAME}/doc' DOCSDIR= ${PREFIX}/share/doc/qt4 Index: misc/qt4-l10n/Makefile =================================================================== --- misc/qt4-l10n/Makefile (revision 316777) +++ misc/qt4-l10n/Makefile (working copy) @@ -12,7 +12,7 @@ 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 Index: misc/qt4-qtconfig/Makefile =================================================================== --- misc/qt4-qtconfig/Makefile (revision 316777) +++ misc/qt4-qtconfig/Makefile (working copy) @@ -37,7 +37,6 @@ 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 Index: misc/qt4-qtdemo/Makefile =================================================================== --- misc/qt4-qtdemo/Makefile (revision 316777) +++ misc/qt4-qtdemo/Makefile (working copy) @@ -34,7 +34,6 @@ 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 Index: multimedia/aegisub/Makefile =================================================================== --- multimedia/aegisub/Makefile (revision 316777) +++ multimedia/aegisub/Makefile (working copy) @@ -142,7 +142,7 @@ 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 Index: multimedia/qt4-multimedia/Makefile =================================================================== --- multimedia/qt4-multimedia/Makefile (revision 316777) +++ multimedia/qt4-multimedia/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: net/minidlna/Makefile =================================================================== --- net/minidlna/Makefile (revision 316777) +++ net/minidlna/Makefile (working copy) @@ -23,7 +23,7 @@ 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 Index: net/qt4-network/Makefile =================================================================== --- net/qt4-network/Makefile (revision 316777) +++ net/qt4-network/Makefile (working copy) @@ -33,7 +33,6 @@ 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 Index: net/sendsms/Makefile =================================================================== --- net/sendsms/Makefile (revision 316777) +++ net/sendsms/Makefile (working copy) @@ -1,8 +1,4 @@ -# New ports collection makefile for: www/sendsms -# Date created: 2005-12-17 -# Whom: Ion-Mihai "IOnut" Tetcu -# -# $Tecnik: ports/www/sendsms/Makefile,v 1.3 2006/05/12 12:15:34 itetcu Exp $ +# Created by: Ion-Mihai "IOnut" Tetcu # $FreeBSD$ PORTNAME= sendsms @@ -16,6 +12,8 @@ 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 Index: net/serviio/Makefile =================================================================== --- net/serviio/Makefile (revision 316777) +++ net/serviio/Makefile (working copy) @@ -21,7 +21,7 @@ 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 Index: net/smm++/Makefile =================================================================== --- net/smm++/Makefile (revision 316777) +++ net/smm++/Makefile (working copy) @@ -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 @@ 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 Index: net/udt/Makefile =================================================================== --- net/udt/Makefile (revision 316777) +++ net/udt/Makefile (working copy) @@ -14,7 +14,7 @@ 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 Index: ports-mgmt/dialog4ports/Makefile =================================================================== --- ports-mgmt/dialog4ports/Makefile (revision 316777) +++ ports-mgmt/dialog4ports/Makefile (working copy) @@ -38,8 +38,6 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ ${DIALOGNAME}.tgz:dialog DIALOGNAME= dialog-1.1-20120706 -EXTRACT_CMD= ${CAT} -EXTRACT_BEFORE_ARGS= MAKE_ENV+= DIALOGSOURCES=${WRKDIR}/${DIALOGNAME} Index: ports-mgmt/managepkg/Makefile =================================================================== --- ports-mgmt/managepkg/Makefile (revision 316777) +++ ports-mgmt/managepkg/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: managepkg -# Date created: 2005-09-04 -# Whom: Andreas Fehlner -# +# Created by: Andreas Fehlner # $FreeBSD$ -# PORTNAME= managepkg PORTVERSION= 1.1 @@ -17,7 +13,9 @@ 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 Index: portuguese/hunspell/Makefile =================================================================== --- portuguese/hunspell/Makefile (revision 316777) +++ portuguese/hunspell/Makefile (working copy) @@ -14,10 +14,6 @@ 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} Index: print/detex/Makefile =================================================================== --- print/detex/Makefile (revision 316777) +++ print/detex/Makefile (working copy) @@ -10,10 +10,6 @@ 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 Index: print/foo2zjs/Makefile =================================================================== --- print/foo2zjs/Makefile (revision 316777) +++ print/foo2zjs/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: foo2zjs -# Date created: 2006-03-17 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTNAME= foo2zjs PORTVERSION= 20110609 @@ -112,7 +108,6 @@ 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 Index: print/ghostscript8/Makefile =================================================================== --- print/ghostscript8/Makefile (revision 316777) +++ print/ghostscript8/Makefile (working copy) @@ -14,7 +14,7 @@ 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 Index: print/ghostscript9/Makefile =================================================================== --- print/ghostscript9/Makefile (revision 316777) +++ print/ghostscript9/Makefile (working copy) @@ -13,7 +13,7 @@ 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 Index: security/burpsuite/Makefile =================================================================== --- security/burpsuite/Makefile (revision 316777) +++ security/burpsuite/Makefile (working copy) @@ -12,7 +12,6 @@ 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 Index: security/fuzzdb/Makefile =================================================================== --- security/fuzzdb/Makefile (revision 316777) +++ security/fuzzdb/Makefile (working copy) @@ -11,7 +11,7 @@ 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 Index: security/nss/Makefile =================================================================== --- security/nss/Makefile (revision 316777) +++ security/nss/Makefile (working copy) @@ -35,8 +35,7 @@ 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 \ Index: security/opieprint/Makefile =================================================================== --- security/opieprint/Makefile (revision 316777) +++ security/opieprint/Makefile (working copy) @@ -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 @@ PLIST_FILES= bin/opieprint +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME} post-patch: Index: sysutils/fatback/Makefile =================================================================== --- sysutils/fatback/Makefile (revision 316777) +++ sysutils/fatback/Makefile (working copy) @@ -15,9 +15,8 @@ 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 Index: sysutils/ksysguardd/Makefile =================================================================== --- sysutils/ksysguardd/Makefile (revision 316777) +++ sysutils/ksysguardd/Makefile (working copy) @@ -19,10 +19,9 @@ -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} Index: sysutils/linux-afaapps/Makefile =================================================================== --- sysutils/linux-afaapps/Makefile (revision 316777) +++ sysutils/linux-afaapps/Makefile (working copy) @@ -21,11 +21,6 @@ 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 Index: sysutils/lsof/Makefile =================================================================== --- sysutils/lsof/Makefile (revision 316777) +++ sysutils/lsof/Makefile (working copy) @@ -63,7 +63,7 @@ ${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 Index: sysutils/qzeitgeist/Makefile =================================================================== --- sysutils/qzeitgeist/Makefile (revision 316777) +++ sysutils/qzeitgeist/Makefile (working copy) @@ -33,7 +33,7 @@ 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 \ Index: textproc/2bsd-diff/Makefile =================================================================== --- textproc/2bsd-diff/Makefile (revision 316777) +++ textproc/2bsd-diff/Makefile (working copy) @@ -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 @@ 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 Index: textproc/htmldoc/Makefile =================================================================== --- textproc/htmldoc/Makefile (revision 316777) +++ textproc/htmldoc/Makefile (working copy) @@ -27,7 +27,7 @@ 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: Index: textproc/libextractor/Makefile =================================================================== --- textproc/libextractor/Makefile (revision 316777) +++ textproc/libextractor/Makefile (working copy) @@ -22,7 +22,7 @@ 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 Index: textproc/qt4-clucene/Makefile =================================================================== --- textproc/qt4-clucene/Makefile (revision 316777) +++ textproc/qt4-clucene/Makefile (working copy) @@ -30,7 +30,6 @@ 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 Index: textproc/qt4-xml/Makefile =================================================================== --- textproc/qt4-xml/Makefile (revision 316777) +++ textproc/qt4-xml/Makefile (working copy) @@ -30,7 +30,6 @@ 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 Index: textproc/qt4-xmlpatterns/Makefile =================================================================== --- textproc/qt4-xmlpatterns/Makefile (revision 316777) +++ textproc/qt4-xmlpatterns/Makefile (working copy) @@ -30,7 +30,6 @@ 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 Index: textproc/qt4-xmlpatterns-tool/Makefile =================================================================== --- textproc/qt4-xmlpatterns-tool/Makefile (revision 316777) +++ textproc/qt4-xmlpatterns-tool/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: textproc/re_graph/Makefile =================================================================== --- textproc/re_graph/Makefile (revision 316777) +++ textproc/re_graph/Makefile (working copy) @@ -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 @@ 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 Index: textproc/sphinxsearch/Makefile =================================================================== --- textproc/sphinxsearch/Makefile (revision 316777) +++ textproc/sphinxsearch/Makefile (working copy) @@ -158,7 +158,7 @@ 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 Index: www/cadaver/Makefile =================================================================== --- www/cadaver/Makefile (revision 316777) +++ www/cadaver/Makefile (working copy) @@ -29,7 +29,7 @@ # 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]' \ Index: www/cgi-lib.pl/Makefile =================================================================== --- www/cgi-lib.pl/Makefile (revision 316777) +++ www/cgi-lib.pl/Makefile (working copy) @@ -20,6 +20,8 @@ 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} Index: www/jmeter/Makefile =================================================================== --- www/jmeter/Makefile (revision 316777) +++ www/jmeter/Makefile (working copy) @@ -48,7 +48,7 @@ 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' Index: www/qt4-webkit/Makefile =================================================================== --- www/qt4-webkit/Makefile (revision 316777) +++ www/qt4-webkit/Makefile (working copy) @@ -33,7 +33,6 @@ 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 Index: www/ump/Makefile =================================================================== --- www/ump/Makefile (revision 316777) +++ www/ump/Makefile (working copy) @@ -45,7 +45,7 @@ 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 Index: x11/qt4-graphicssystems-opengl/Makefile =================================================================== --- x11/qt4-graphicssystems-opengl/Makefile (revision 316777) +++ x11/qt4-graphicssystems-opengl/Makefile (working copy) @@ -31,7 +31,6 @@ 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 Index: x11/qt4-inputmethods/Makefile =================================================================== --- x11/qt4-inputmethods/Makefile (revision 316777) +++ x11/qt4-inputmethods/Makefile (working copy) @@ -29,7 +29,6 @@ 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 Index: x11/qt4-opengl/Makefile =================================================================== --- x11/qt4-opengl/Makefile (revision 316777) +++ x11/qt4-opengl/Makefile (working copy) @@ -33,7 +33,6 @@ 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 Index: x11-fonts/etlfonts/Makefile =================================================================== --- x11-fonts/etlfonts/Makefile (revision 316777) +++ x11-fonts/etlfonts/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: etlfonts-noncjk -# Date created: 3 Nov 1996 -# Whom: Mita Yoshio -# +# Created by: Mita Yoshio # $FreeBSD$ -# PORTNAME= etlfonts-noncjk PORTVERSION= 1.0 @@ -20,9 +16,6 @@ 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: Index: x11-fonts/mkbold/Makefile =================================================================== --- x11-fonts/mkbold/Makefile (revision 316777) +++ x11-fonts/mkbold/Makefile (working copy) @@ -19,6 +19,8 @@ PLIST_FILES= bin/mkbold USE_PERL5= yes +EXTRACT_CMD= ${GZCAT} +EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= > ${WRKSRC}/mkbold NO_WRKSUBDIR= yes NO_BUILD= yes Index: x11-fonts/mkitalic/Makefile =================================================================== --- x11-fonts/mkitalic/Makefile (revision 316777) +++ x11-fonts/mkitalic/Makefile (working copy) @@ -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 @@ PLIST_FILES= bin/mkitalic USE_PERL5= yes +EXTRACT_CMD= ${BZCAT} +EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= > ${WRKSRC}/mkitalic NO_WRKSUBDIR= yes USE_BZIP2= yes Index: x11-fonts/suxus/Makefile =================================================================== --- x11-fonts/suxus/Makefile (revision 316777) +++ x11-fonts/suxus/Makefile (working copy) @@ -23,7 +23,7 @@ @${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 Index: x11-themes/kde4-icons-oxygen/Makefile =================================================================== --- x11-themes/kde4-icons-oxygen/Makefile (revision 316777) +++ x11-themes/kde4-icons-oxygen/Makefile (working copy) @@ -16,6 +16,6 @@ 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 Index: x11-toolkits/easygtk/Makefile =================================================================== --- x11-toolkits/easygtk/Makefile (revision 316777) +++ x11-toolkits/easygtk/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: easygtk -# Date created: 3 January 2001 -# Whom: Maxim Sobolev -# +# Created by: Maxim Sobolev # $FreeBSD$ -# PORTNAME= easygtk PORTVERSION= 1.2 @@ -16,9 +12,6 @@ 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 Index: x11-toolkits/qt33/Makefile =================================================================== --- x11-toolkits/qt33/Makefile (revision 316777) +++ x11-toolkits/qt33/Makefile (working copy) @@ -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 @@ 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]*' \ Index: x11-toolkits/qt4-gui/Makefile =================================================================== --- x11-toolkits/qt4-gui/Makefile (revision 316777) +++ x11-toolkits/qt4-gui/Makefile (working copy) @@ -38,7 +38,6 @@ 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