From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 12 21:50:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 C44928E6 for ; Sun, 12 Jan 2014 21:50:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 9288D13AB for ; Sun, 12 Jan 2014 21:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s0CLo0rL092231 for ; Sun, 12 Jan 2014 21:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id s0CLo0OB092229; Sun, 12 Jan 2014 21:50:00 GMT (envelope-from gnats) Resent-Date: Sun, 12 Jan 2014 21:50:00 GMT Resent-Message-Id: <201401122150.s0CLo0OB092229@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Christian Weisgerber 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 B1DF764C for ; Sun, 12 Jan 2014 21:42:55 +0000 (UTC) Received: from mail-in-09.arcor-online.net (mail-in-09.arcor-online.net [151.189.21.49]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 64EA91375 for ; Sun, 12 Jan 2014 21:42:55 +0000 (UTC) Received: from mail-in-11-z2.arcor-online.net (mail-in-11-z2.arcor-online.net [151.189.8.28]) by mx.arcor.de (Postfix) with ESMTP id 3F14019871D for ; Sun, 12 Jan 2014 22:42:53 +0100 (CET) Received: from mail-in-04.arcor-online.net (mail-in-04.arcor-online.net [151.189.21.44]) by mail-in-11-z2.arcor-online.net (Postfix) with ESMTP id 378737FE9A4 for ; Sun, 12 Jan 2014 22:42:53 +0100 (CET) Received: from lorvorc.mips.inka.de (dslb-094-217-104-055.pools.arcor-ip.net [94.217.104.55]) by mail-in-04.arcor-online.net (Postfix) with ESMTPS id EE7F0AA7F2 for ; Sun, 12 Jan 2014 22:42:52 +0100 (CET) Received: from lorvorc.mips.inka.de (localhost [127.0.0.1]) by lorvorc.mips.inka.de (8.14.7/8.14.7) with ESMTP id s0CLgqoC007642 for ; Sun, 12 Jan 2014 22:42:52 +0100 (CET) (envelope-from naddy@lorvorc.mips.inka.de) Received: (from naddy@localhost) by lorvorc.mips.inka.de (8.14.7/8.14.7/Submit) id s0CLgqjH007641; Sun, 12 Jan 2014 22:42:52 +0100 (CET) (envelope-from naddy) Message-Id: <201401122142.s0CLgqjH007641@lorvorc.mips.inka.de> Date: Sun, 12 Jan 2014 22:42:52 +0100 (CET) From: Christian Weisgerber To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/185725: bsd.port.mk: xz-related fix and cleanup X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Christian Weisgerber List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 21:50:00 -0000 >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: