From a4de18e4c300e61144848092eb5779d792c85c30 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Tue, 12 Nov 2013 14:56:50 +0000 Subject: Define EXTRACT_SUFX at the very end of the pre section to allow defining extract suffix from inside bsd.*.mk and USES --- Mk/bsd.port.mk | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'Mk/bsd.port.mk') diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index cc72e1f4084a..fe0721e42403 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -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/*} -- cgit v1.2.3