diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-04-29 08:57:12 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-04-29 08:57:12 +0000 |
| commit | 5271da855f0c5946ff1f3aa58fbe806871df2f87 (patch) | |
| tree | 526d65e6697f1e03c06ab0d0f901688aa2c4e18d /sysutils | |
| parent | Update to 2.035. (diff) | |
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
Notes
Notes:
svn path=/head/; revision=316786
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/fatback/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/ksysguardd/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/linux-afaapps/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/lsof/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/qzeitgeist/Makefile | 2 |
5 files changed, 7 insertions, 14 deletions
diff --git a/sysutils/fatback/Makefile b/sysutils/fatback/Makefile index daf17d52a908..585faa38dc7d 100644 --- a/sysutils/fatback/Makefile +++ b/sysutils/fatback/Makefile @@ -15,9 +15,8 @@ MAKE_JOBS_SAFE= yes MAN1= fatback.1 INFO= fatback-manual -EXTRACT_AFTER_ARGS+= |${TAR} -xpf - \ - --exclude 'getopt*' \ - --exclude 'set[yl].c' +EXTRACT_AFTER_ARGS= --exclude 'getopt*' \ + --exclude 'set[yl].c' OPTIONS_DEFINE= DOCS diff --git a/sysutils/ksysguardd/Makefile b/sysutils/ksysguardd/Makefile index 3b7454b648b6..3a4d7add9369 100644 --- a/sysutils/ksysguardd/Makefile +++ b/sysutils/ksysguardd/Makefile @@ -19,10 +19,9 @@ CMAKE_ARGS+= -DBIN_INSTALL_DIR:STRING="${PREFIX}/bin" \ -DSYSCONF_INSTALL_DIR:STRING="${PREFIX}/etc" MAKE_JOBS_SAFE= yes -EXTRACT_AFTER_ARGS= | ${TAR} -xf - \ - '${DISTNAME}/ksysguard/${PORTNAME}' \ - '${DISTNAME}/ksysguard/example/${PORTNAME}rc' \ - '${DISTNAME}/ksysguard/gui/SignalIDs.h' +EXTRACT_AFTER_ARGS= '${DISTNAME}/ksysguard/${PORTNAME}' \ + '${DISTNAME}/ksysguard/example/${PORTNAME}rc' \ + '${DISTNAME}/ksysguard/gui/SignalIDs.h' WRKSRC= ${WRKDIR}/${DISTNAME}/ksysguard/${PORTNAME} diff --git a/sysutils/linux-afaapps/Makefile b/sysutils/linux-afaapps/Makefile index be686c1339d0..bf022e706fe1 100644 --- a/sysutils/linux-afaapps/Makefile +++ b/sysutils/linux-afaapps/Makefile @@ -21,11 +21,6 @@ ONLY_FOR_ARCHS= i386 amd64 BRANDELF_FILES= usr/sbin/afacli SRC_DISTFILES= # empty, no sources available -EXTRACT_CMD= ${GZIP_CMD} -EXTRACT_BEFORE_ARGS= -dc -EXTRACT_AFTER_ARGS= | ${TAR} -xf - -EXTRACT_SUFX= .tar.gz - RPMFILE= ${PORTNAME}-${PORTVERSION}-2.${LINUX_RPM_ARCH}.rpm .include <bsd.port.pre.mk> diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index 3c5592b536fc..9553e0927672 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -63,7 +63,7 @@ post-extract: ${ECHO} "($$EXPMD5 != $$CALCMD5)" ; \ exit 1 ; \ fi ; \ - ${CAT} ${SRCBALL_NAME}.tar ${EXTRACT_AFTER_ARGS} \ + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${SRCBALL_NAME}.tar ${EXTRACT_AFTER_ARGS} \ ) @( cd ${WRKSRC} ; ${ECHO_CMD} "y" | ./Inventory || exit 1 ) .endif diff --git a/sysutils/qzeitgeist/Makefile b/sysutils/qzeitgeist/Makefile index 6e5ecfeea716..b0e49bb3c7cb 100644 --- a/sysutils/qzeitgeist/Makefile +++ b/sysutils/qzeitgeist/Makefile @@ -33,7 +33,7 @@ USE_LDCONFIG= yes ZEITGEIST_VERSION= 0.8.2 post-extract: - @(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} \ + @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ ${_DISTDIR}/zeitgeist-${ZEITGEIST_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}) cd ${WRKDIR}/zeitgeist-${ZEITGEIST_VERSION} && \ ${CP} zeitgeist/datamodel.py \ |