From owner-svn-ports-all@FreeBSD.ORG Tue Nov 12 14:56:51 2013 Return-Path: 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 22DE1C4A; Tue, 12 Nov 2013 14:56:51 +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 12F7D227D; Tue, 12 Nov 2013 14:56:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rACEuoJJ078535; Tue, 12 Nov 2013 14:56:50 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rACEuoaT078534; Tue, 12 Nov 2013 14:56:50 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201311121456.rACEuoaT078534@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 12 Nov 2013 14:56:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333576 - 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.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Nov 2013 14:56:51 -0000 Author: bapt Date: Tue Nov 12 14:56:50 2013 New Revision: 333576 URL: http://svnweb.freebsd.org/changeset/ports/333576 Log: Define EXTRACT_SUFX at the very end of the pre section to allow defining extract suffix from inside bsd.*.mk and USES Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Tue Nov 12 14:50:02 2013 (r333575) +++ head/Mk/bsd.port.mk Tue Nov 12 14:56:50 2013 (r333576) @@ -1360,19 +1360,6 @@ ETCDIR?= ${PREFIX}/etc/${PORTNAME} .include "${PORTSDIR}/Mk/bsd.xorg.mk" .endif -.if defined(USE_BZIP2) -EXTRACT_SUFX?= .tar.bz2 -.elif defined(USE_LHA) -EXTRACT_SUFX?= .lzh -.elif defined(USE_ZIP) -EXTRACT_SUFX?= .zip -.elif defined(USE_XZ) -EXTRACT_SUFX?= .tar.xz -.elif defined(USE_MAKESELF) -EXTRACT_SUFX?= .run -.else -EXTRACT_SUFX?= .tar.gz -.endif PACKAGES?= ${PORTSDIR}/packages TEMPLATES?= ${PORTSDIR}/Templates @@ -1513,6 +1500,20 @@ ${_f}_ARGS:= ${f:C/^[^\:]*\://g} .include "${USESDIR}/${_f}.mk" .endfor +.if defined(USE_BZIP2) +EXTRACT_SUFX?= .tar.bz2 +.elif defined(USE_LHA) +EXTRACT_SUFX?= .lzh +.elif defined(USE_ZIP) +EXTRACT_SUFX?= .zip +.elif defined(USE_XZ) +EXTRACT_SUFX?= .tar.xz +.elif defined(USE_MAKESELF) +EXTRACT_SUFX?= .run +.else +EXTRACT_SUFX?= .tar.gz +.endif + # You can force skipping these test by defining IGNORE_PATH_CHECKS .if !defined(IGNORE_PATH_CHECKS) .if ! ${PREFIX:M/*}