From owner-svn-ports-all@FreeBSD.ORG  Mon Jan 13 07:28:32 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8DC161C3;
 Mon, 13 Jan 2014 07:28:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7A1A21B47;
 Mon, 13 Jan 2014 07:28:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0D7SWhl051540;
 Mon, 13 Jan 2014 07:28:32 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0D7SWFs051538;
 Mon, 13 Jan 2014 07:28:32 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401130728.s0D7SWFs051538@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 13 Jan 2014 07:28:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339573 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jan 2014 07:28:32 -0000

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