Date: Sun, 12 Jan 2014 22:42:52 +0100 (CET) From: Christian Weisgerber <naddy@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/185725: bsd.port.mk: xz-related fix and cleanup Message-ID: <201401122142.s0CLgqjH007641@lorvorc.mips.inka.de> Resent-Message-ID: <201401122150.s0CLo0OB092229@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185725
>Category: ports
>Synopsis: bsd.port.mk: xz-related fix and cleanup
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 12 21:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Christian Weisgerber
>Release: FreeBSD 10.0-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD lorvorc.mips.inka.de 10.0-PRERELEASE FreeBSD 10.0-PRERELEASE #0 r260565: Sun Jan 12 18:45:53 CET 2014 naddy@lorvorc.mips.inka.de:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
(1) bsd.port.mk refers to XZCAT for extracting .xz patch files, but
XZCAT isn't defined anywhere. We need to add XZCAT to bsd.commands.mk.
(2) xz is included in the base system on all supported releases and
I just removed the archivers/xz port. Let's remove the checks and
assume xz is always available.
>How-To-Repeat:
>Fix:
Index: bsd.commands.mk
===================================================================
--- bsd.commands.mk (revision 339548)
+++ bsd.commands.mk (working copy)
@@ -98,15 +98,11 @@
WHICH?= /usr/bin/which
XARGS?= /usr/bin/xargs
XMKMF?= ${LOCALBASE}/bin/xmkmf
+XZ?= -Mmax
+XZCAT?= /usr/bin/xzcat ${XZ}
+XZ_CMD?= /usr/bin/xz ${XZ}
YACC?= /usr/bin/yacc
-XZ?= -Mmax
-.if exists(/usr/bin/xz)
-XZ_CMD?= /usr/bin/xz ${XZ}
-.else
-XZ_CMD?= ${LOCALBASE}/bin/xz ${XZ}
-.endif
-
MD5?= /sbin/md5
SHA256?= /sbin/sha256
Index: bsd.port.mk
===================================================================
--- bsd.port.mk (revision 339548)
+++ bsd.port.mk (working copy)
@@ -1701,9 +1701,6 @@
.if defined(USE_ZIP)
EXTRACT_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
.endif
-.if defined(USE_XZ) && ( (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 )
-EXTRACT_DEPENDS+= ${LOCALBASE}/bin/xz:${PORTSDIR}/archivers/xz
-.endif
.if defined(USE_MAKESELF)
EXTRACT_DEPENDS+= unmakeself:${PORTSDIR}/archivers/unmakeself
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401122142.s0CLgqjH007641>