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 /Mk | |
| parent | 81215f7fb03620d52b441a5714e6af1fb655c743 (diff) | |
| download | freebsd-ports-graphics-1ca518c98321627ea34bdaae84c439a2f0df0cdf.tar.gz freebsd-ports-graphics-1ca518c98321627ea34bdaae84c439a2f0df0cdf.tar.zst freebsd-ports-graphics-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 'Mk')
| -rw-r--r-- | Mk/bsd.gecko.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 76523453f82..29c05c0efa5 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -528,7 +528,7 @@ PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall PKGINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-install.in PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-deinstall.in -EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ +EXTRACT_AFTER_ARGS?= --exclude */CVS/* \ --exclude */macbuild/* \ --exclude */package/* \ --exclude mozilla*/gc/boehm diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 5df5c541f26..8cb64a31ed2 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2282,18 +2282,12 @@ EXTRACT_CMD?= ${UNMAKESELF_CMD} EXTRACT_BEFORE_ARGS?= EXTRACT_AFTER_ARGS?= .else -EXTRACT_BEFORE_ARGS?= -dc +EXTRACT_CMD?= ${TAR} +EXTRACT_BEFORE_ARGS?= -xf .if defined(EXTRACT_PRESERVE_OWNERSHIP) -EXTRACT_AFTER_ARGS?= | ${TAR} -xf - -.else -EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --no-same-owner --no-same-permissions -.endif -.if defined(USE_BZIP2) -EXTRACT_CMD?= ${BZIP2_CMD} -.elif defined(USE_XZ) -EXTRACT_CMD?= ${XZ_CMD} +EXTRACT_AFTER_ARGS?= .else -EXTRACT_CMD?= ${GZIP_CMD} +EXTRACT_AFTER_ARGS?= --no-same-owner --no-same-permissions .endif .endif |