From c7617a10fbb8f62ab0060fdb749011d7fa1f3669 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 13 Jan 2014 07:28:31 +0000
Subject: [PATCH] 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
---
 Mk/bsd.commands.mk | 5 +----
 Mk/bsd.port.mk     | 3 ---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Mk/bsd.commands.mk b/Mk/bsd.commands.mk
index 3da333dbf329..3d3406f37f07 100644
--- a/Mk/bsd.commands.mk
+++ b/Mk/bsd.commands.mk
@@ -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
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 7d7f9808fdf2..b62415495fc7 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1701,9 +1701,6 @@ EXTRACT_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
 .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