diff options
author | bapt <bapt@FreeBSD.org> | 2013-04-29 16:57:12 +0800 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2013-04-29 16:57:12 +0800 |
commit | 1ca518c98321627ea34bdaae84c439a2f0df0cdf (patch) | |
tree | 526d65e6697f1e03c06ab0d0f901688aa2c4e18d /graphics | |
parent | 81215f7fb03620d52b441a5714e6af1fb655c743 (diff) | |
download | freebsd-ports-gnome-1ca518c98321627ea34bdaae84c439a2f0df0cdf.tar.gz freebsd-ports-gnome-1ca518c98321627ea34bdaae84c439a2f0df0cdf.tar.zst freebsd-ports-gnome-1ca518c98321627ea34bdaae84c439a2f0df0cdf.zip |
Rely on bsdtar to autodetermine the format of the distfiles when possible
For a while now bsdtar is able to autotermine compression and archive format.
Let's then use tar directly instead of piping to tar.
Now USE_BZIP2 and USE_XZ only set EXTRACT_SUFX to the right format
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/jbig2dec/Makefile | 2 | ||||
-rw-r--r-- | graphics/libimg/Makefile | 8 | ||||
-rw-r--r-- | graphics/nip2/Makefile | 2 | ||||
-rw-r--r-- | graphics/qt4-iconengines/Makefile | 1 | ||||
-rw-r--r-- | graphics/qt4-imageformats/Makefile | 1 | ||||
-rw-r--r-- | graphics/qt4-pixeltool/Makefile | 1 | ||||
-rw-r--r-- | graphics/qt4-svg/Makefile | 1 | ||||
-rw-r--r-- | graphics/s10sh/Makefile | 2 | ||||
-rw-r--r-- | graphics/sane-backends/Makefile | 2 | ||||
-rw-r--r-- | graphics/vips/Makefile | 2 | ||||
-rw-r--r-- | graphics/xmandel/Makefile | 6 |
11 files changed, 8 insertions, 20 deletions
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 |