Date: Mon, 13 Jan 2014 07:28:32 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339573 - head/Mk Message-ID: <201401130728.s0D7SWFs051538@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Jan 13 07:28:31 2014 New Revision: 339573 URL: http://svnweb.freebsd.org/changeset/ports/339573 Log: xz being included in all supported base system, remove code using version from ports while here properly define XSCAT is is used to allow xzed patches. PR: ports/185725 Submitted by: naddy Modified: head/Mk/bsd.commands.mk head/Mk/bsd.port.mk Modified: head/Mk/bsd.commands.mk ============================================================================== --- head/Mk/bsd.commands.mk Mon Jan 13 07:23:43 2014 (r339572) +++ head/Mk/bsd.commands.mk Mon Jan 13 07:28:31 2014 (r339573) @@ -101,11 +101,8 @@ XMKMF?= ${LOCALBASE}/bin/xmkmf YACC?= /usr/bin/yacc XZ?= -Mmax -.if exists(/usr/bin/xz) +XZCAT= /usr/bin/xzcat ${XZ} XZ_CMD?= /usr/bin/xz ${XZ} -.else -XZ_CMD?= ${LOCALBASE}/bin/xz ${XZ} -.endif MD5?= /sbin/md5 SHA256?= /sbin/sha256 Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Jan 13 07:23:43 2014 (r339572) +++ head/Mk/bsd.port.mk Mon Jan 13 07:28:31 2014 (r339573) @@ -1701,9 +1701,6 @@ EXTRACT_DEPENDS+= lha:${PORTSDIR}/archiv .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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401130728.s0D7SWFs051538>