[Midnightbsd-cvs] mports [19463] trunk/Mk: change behavior to more closely mimick freebsd ports.

Wed Jun 10 18:42:05 EDT 2015

Revision: 19463
          http://svnweb.midnightbsd.org/mports/?rev=19463
Author:   laffer1
Date:     2015-06-10 18:42:05 -0400 (Wed, 10 Jun 2015)
Log Message:
-----------
change behavior to more closely mimick freebsd ports. When using USES, set the extension_ARGS var to whatever is passed in. Then check in extensions for  rather than defined to know when to skip things.

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk
    trunk/Mk/extensions/desktop-file-utils.mk
    trunk/Mk/extensions/gmake.mk
    trunk/Mk/extensions/imake.mk
    trunk/Mk/extensions/pkgconfig.mk
    trunk/Mk/extensions/shared-mime-info.mk
    trunk/Mk/extensions/zip.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================

--- trunk/Mk/bsd.mport.mk	2015-06-10 22:39:57 UTC (rev 19462)
+++ trunk/Mk/bsd.mport.mk	2015-06-10 22:42:05 UTC (rev 19463)
@@ -381,17 +381,16 @@
 
 # Loading features - USES directive
 .for f in ${USES}
-_f=${f:C/\:.*//g}
-USE_${_f:tu}=    yes
-.if ${_f} != ${f}
-${_f}_ARGS:=    ${f:C/^[^\:]*\://g}
-USE_${_f}=      ${_f}_ARGS
+_f:=	${f:C/\:.*//}
+.if !defined(${_f}_ARGS)
+${_f}_ARGS:=	${f:C/^[^\:]*(\:|\$)//:S/,/ /g}
 .endif
-.include "${MPORTEXTENSIONS}/${_f}.mk"
 .endfor
+.for f in ${USES}
+.include "${MPORTEXTENSIONS}/${f:C/\:.*//}.mk"
+.endfor
 
 
-
 .if defined(USE_GCPIO)
 EXTRACT_DEPENDS+=       gcpio:${PORTSDIR}/archivers/gcpio
 .endif
@@ -775,19 +774,19 @@
 #
 .for EXT in ${_ALL_EXT:tu} 
 .	if defined(USE_${EXT}) || defined(USE_${EXT}_RUN) || defined(USE_${EXT}_BUILD) || defined(WANT_${EXT}) || defined(_LOAD_${EXT}_EXT)
-.		include "${PORTSDIR}/Mk/extensions/${EXT:tl}.mk"
+.		include "${MPORTEXTENSIONS}/${EXT:tl}.mk"
 .	endif
 .endfor
 
 # FreeBSD compatibility: Loading features
 .for f in ${_USES_POST}
-_f:=            ${f:C/\:.*//}
+_f:=	${f:C/\:.*//}
 .if !defined(${_f}_ARGS)
-${_f}_ARGS:=    ${f:C/^[^\:]*(\:|\$)//:S/,/ /g}
+${_f}_ARGS:=	${f:C/^[^\:]*(\:|\$)//:S/,/ /g}
 .endif
 .endfor
 .for f in ${_USES_POST}
-.include "${PORTSDIR}/Mk/extensions/${f:C/\:.*//}.mk"
+.include "${MPORTEXTENSIONS}/${f:C/\:.*//}.mk"
 .endfor
 
 .if defined(USE_XORG)

Modified: trunk/Mk/extensions/desktop-file-utils.mk
===================================================================
--- trunk/Mk/extensions/desktop-file-utils.mk	2015-06-10 22:39:57 UTC (rev 19462)
+++ trunk/Mk/extensions/desktop-file-utils.mk	2015-06-10 22:42:05 UTC (rev 19463)
@@ -10,7 +10,7 @@
 .if !defined(_INCLUDE_USES_DESKTOP_FILE_UTILS_MK)
 _INCLUDE_USES_DESKTOP_FILE_UTILS_MK=	yes
 
-.if defined(desktop-file-utils_ARGS)
+.if !empty(desktop-file-utils_ARGS)
 IGNORE=	USES=desktop-file-utils does not require args
 .endif
 

Modified: trunk/Mk/extensions/gmake.mk
===================================================================
--- trunk/Mk/extensions/gmake.mk	2015-06-10 22:39:57 UTC (rev 19462)
+++ trunk/Mk/extensions/gmake.mk	2015-06-10 22:42:05 UTC (rev 19463)
@@ -9,7 +9,7 @@
 .if !defined(_INCLUDE_USES_GMAKE_MK)
 _INCLUDE_USES_GMAKE_MK=	yes
 
-.if defined(gmake_ARGS)
+.if !empty(gmake_ARGS)
 .if ${gmake_ARGS} == lite
 _GMAKE_EXT=	-lite
 .else

Modified: trunk/Mk/extensions/imake.mk
===================================================================
--- trunk/Mk/extensions/imake.mk	2015-06-10 22:39:57 UTC (rev 19462)
+++ trunk/Mk/extensions/imake.mk	2015-06-10 22:42:05 UTC (rev 19463)
@@ -13,9 +13,11 @@
 .if !defined(_INCLUDE_USES_IMAKE_MK)
 _INCLUDE_USES_IMAKE_MK=	yes
 
+.if !empty(imake_ARGS)
 .if ${imake_ARGS:Nnotall:Nenv:Nnoman}
 IGNORE=		USES=imake:${imake_ARGS:S/ /,/g} is not a valid argument
 .endif
+.endif
 
 BUILD_DEPENDS+=		imake:${PORTSDIR}/devel/imake
 
@@ -30,17 +32,17 @@
 MAKE_ENV+=		IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}"
 CONFIGURE_ENV+=		IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}"
 
-.if ! ${imake_ARGS:Mnotall}
+.if empty(imake_ARGS) || ! ${imake_ARGS:Mnotall}
 XMKMF_ARGS+=		-a
 .endif
 
-.if ! ${imake_ARGS:Menv}
+.if empty(imake_ARGS) || ! ${imake_ARGS:Menv}
 .if !target(do-configure)
 do-configure:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS})
 .endif
 
-.if ! ${imake_ARGS:Mnoman}
+.if empty(imake_ARGS) || ! ${imake_ARGS:Mnoman}
 LATE_INSTALL_ARGS=	install.man
 .endif
 

Modified: trunk/Mk/extensions/pkgconfig.mk
===================================================================
--- trunk/Mk/extensions/pkgconfig.mk	2015-06-10 22:39:57 UTC (rev 19462)
+++ trunk/Mk/extensions/pkgconfig.mk	2015-06-10 22:42:05 UTC (rev 19463)
@@ -12,7 +12,7 @@
 
 _PKGCONFIG_DEPENDS=	pkgconf:${PORTSDIR}/devel/pkgconf
 
-.if !defined(pkgconfig_ARGS)
+.if empty(pkgconfig_ARGS)
 pkgconfig_ARGS=	build
 .endif
 

Modified: trunk/Mk/extensions/shared-mime-info.mk
===================================================================
--- trunk/Mk/extensions/shared-mime-info.mk	2015-06-10 22:39:57 UTC (rev 19462)
+++ trunk/Mk/extensions/shared-mime-info.mk	2015-06-10 22:42:05 UTC (rev 19463)
@@ -10,7 +10,7 @@
 .if !defined(_INCLUDE_USES_SHARED_MIME_INFO_MK)
 _INCLUDE_USES_SHARED_MIME_INFO_MK=	yes
 
-.if defined(shared-mime-info_ARGS)
+.if !empty(shared-mime-info_ARGS)
 IGNORE=	USES=shared-mime-info does not require args
 .endif
 

Modified: trunk/Mk/extensions/zip.mk
===================================================================
--- trunk/Mk/extensions/zip.mk	2015-06-10 22:39:57 UTC (rev 19462)
+++ trunk/Mk/extensions/zip.mk	2015-06-10 22:42:05 UTC (rev 19463)
@@ -15,11 +15,11 @@
 EXTRACT_BEFORE_ARGS?=	-qo
 EXTRACT_AFTER_ARGS?=	-d ${WRKDIR}
 
-.if ${zip_ARGS} == infozip
+.if !defined(zip_ARGS) || ${zip_ARGS} == none || ${zip_ARGS}x == x
+EXTRACT_CMD?=		${UNZIP_NATIVE_CMD}
+.elif ${zip_ARGS} == 'infozip'
 EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 EXTRACT_CMD?=		${UNZIP_CMD}
-.elif ${zip_ARGS} == none
-EXTRACT_CMD?=		${UNZIP_NATIVE_CMD}
 .else
 IGNORE=	Incorrect 'USES+=zip:${zip_ARGS}' expecting 'USES+=zip[:infozip]'
 .endif

