aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2010-01-07 23:55:10 +0800
committerpav <pav@FreeBSD.org>2010-01-07 23:55:10 +0800
commit8e63922e75762b222efdbc0ace13c1970cf8f105 (patch)
tree7bedf22e61f6559e31b5778dc0a355779b69143d /Mk
parent0024f45158639110594a4f3d46603e1e29aa1fc5 (diff)
downloadfreebsd-ports-graphics-8e63922e75762b222efdbc0ace13c1970cf8f105.tar.gz
freebsd-ports-graphics-8e63922e75762b222efdbc0ace13c1970cf8f105.tar.zst
freebsd-ports-graphics-8e63922e75762b222efdbc0ace13c1970cf8f105.zip
- Use full path in depobj for archivers/unzip when USE_ZIP variable is set
9-CURRENT introduced unzip command to the base system. Unfortunately it is not fully compatible with the archivers/unzip implementation and non-trivial amount of ports fail to build when using it. Thus we will keep using archivers/unzip for unzipping source in Ports Collection until someone volunteer to fix all individual ports. Two most common problems with base unzip are: * extracting files without +x flag (some ports rely to execute unzipped configure scripts, for example) * different semantics of CR/LF conversion Error logs of failed port builds with in-base unzip can be made available on request to portmgr@. With hat: portmgr
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.port.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index a636c3c3536..e8c12733268 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1693,7 +1693,7 @@ MANCOMPRESSED?= no
.if defined(PATCHFILES)
.if ${PATCHFILES:M*.zip}x != x
-PATCH_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
+PATCH_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
.endif
.endif
@@ -1726,7 +1726,7 @@ LIB32DIR= lib
PLIST_SUB+= LIB32DIR=${LIB32DIR}
.if defined(USE_ZIP)
-EXTRACT_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
.endif
.if defined(USE_MAKESELF)
EXTRACT_DEPENDS+= unmakeself:${PORTSDIR}/archivers/unmakeself