summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2014-03-12 17:19:43 +0800
committerzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2014-03-12 17:19:43 +0800
commit22d5806e55100802c01fce15d176a19f1b9532e9 (patch)
treee9a51e3c01e6c26f1cfb1ca589ab5e78f96084c6
parent3a9e3f1b9f533f25c197af5110fd8122aa523fd2 (diff)
downloadxorg-devel-ports-22d5806e55100802c01fce15d176a19f1b9532e9.tar
xorg-devel-ports-22d5806e55100802c01fce15d176a19f1b9532e9.tar.gz
xorg-devel-ports-22d5806e55100802c01fce15d176a19f1b9532e9.tar.bz2
xorg-devel-ports-22d5806e55100802c01fce15d176a19f1b9532e9.tar.lz
xorg-devel-ports-22d5806e55100802c01fce15d176a19f1b9532e9.tar.xz
xorg-devel-ports-22d5806e55100802c01fce15d176a19f1b9532e9.tar.zst
xorg-devel-ports-22d5806e55100802c01fce15d176a19f1b9532e9.zip
Sync with ports.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1413 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--Mk/bsd.port.mk18
1 files changed, 3 insertions, 15 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 864f04f..571a019 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1,7 +1,7 @@
#-*- tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: head/Mk/bsd.port.mk 347393 2014-03-07 14:41:37Z bapt $
+# $FreeBSD: head/Mk/bsd.port.mk 347863 2014-03-11 07:02:30Z bapt $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -94,8 +94,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# EXTRACT_SUFX - Suffix for archive names
# You never have to set both DISTFILES and EXTRACT_SUFX.
# Default: .tar.bz2 if USE_BZIP2 is set, .lzh if USE_LHA is set,
-# .zip if USE_ZIP is set, .tar.xz if USE_XZ is set, .tar.gz
-# otherwise).
+# .tar.xz if USE_XZ is set, .tar.gz otherwise).
# MASTER_SITES - Primary location(s) for distribution files if not found
# locally. See bsd.sites.mk for common choices for
# MASTER_SITES.
@@ -332,8 +331,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# USE_LHA - If set, this port distfile uses lha for compression
# USE_XZ - If set, this port tarballs use xz (or lzma)
# for compression
-# USE_ZIP - If set, this port distfile uses zip, not tar w/[bg]zip
-# for compression.
# USE_GCC - If set, this port requires this version of gcc, either in
# the system or installed from a port.
# USE_CSTD - Override the default C language standard (gnu89, gnu99)
@@ -812,7 +809,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# For extract:
#
# EXTRACT_CMD - Command for extracting archive: "bzip2" if USE_BZIP2
-# is set, "unzip" if USE_ZIP is set, "gzip" otherwise.
+# is set, "gzip" otherwise.
# EXTRACT_BEFORE_ARGS
# - Arguments to ${EXTRACT_CMD} before filename.
# Default: "-dc"
@@ -1527,8 +1524,6 @@ ${_f}_ARGS:= ${f:C/^[^\:]*\://g}
EXTRACT_SUFX?= .tar.bz2
.elif defined(USE_LHA)
EXTRACT_SUFX?= .lzh
-.elif defined(USE_ZIP)
-EXTRACT_SUFX?= .zip
.elif defined(USE_XZ)
EXTRACT_SUFX?= .tar.xz
.else
@@ -1702,9 +1697,6 @@ PKG_DEPENDS+= ${LOCALBASE}/sbin/pkg:${PORTSDIR}/${PKGNG_ORIGIN}
.if defined(USE_LHA)
EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha
.endif
-.if defined(USE_ZIP)
-EXTRACT_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
-.endif
.if defined(USE_GCC)
.include "${PORTSDIR}/Mk/bsd.gcc.mk"
@@ -2173,10 +2165,6 @@ TAR?= /usr/bin/tar
EXTRACT_CMD?= ${LHA_CMD}
EXTRACT_BEFORE_ARGS?= xfqw=${WRKDIR}
EXTRACT_AFTER_ARGS?=
-.elif defined(USE_ZIP)
-EXTRACT_CMD?= ${UNZIP_CMD}
-EXTRACT_BEFORE_ARGS?= -qo
-EXTRACT_AFTER_ARGS?= -d ${WRKDIR}
.else
EXTRACT_CMD?= ${TAR}
EXTRACT_BEFORE_ARGS?= -xf