svn commit: r333576 - head/Mk

Baptiste Daroussin bapt at FreeBSD.org
Tue Nov 12 14:56:51 UTC 2013


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/*}


More information about the svn-ports-all mailing list