Change the way USES is handled:

- Loop over USES twice, once to define all *_ARGS variables and once to
  include Uses/*.mk.  This allows all Uses/*.mk to examine arguments given
  to other USES entries.
- Always define *_ARGS (possibly empty) and replace commas with spaces.

Similar for _USES_POST.

Adjust all Uses/*.mk:
- defined(u_ARGS) becomes !empty(u_ARGS)
- Eliminate helper variables like _*_ARGS=${*_ARGS:C/,/ /g}
- Some Uses/*.mk used ":" as argument separator instead of ",", but no port
  used this form
- Uses/cran.mk: remove unused variable VALID_ARGS and USES+=fortran which
  has no effect
- Uses/twisted.mk: simplify handling of the case where neither "build" nor
  "run" arguments have been specified

PR:		193931
Exp-run by:	antoine
Approved by:	portmgr (antoine)

1 files changed, 2 insertions, 5 deletions

diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk
index 91bcfba46fc4..067e3556b03e 100644
--- a/Mk/Uses/autoreconf.mk
+++ b/Mk/Uses/autoreconf.mk
@@ -53,7 +53,6 @@
 .if !defined(_INCLUDE_USES_AUTORECONF_MK)
 _INCLUDE_USES_AUTORECONF_MK=	yes
 _USES_POST+=		autoreconf
-autoreconf_ARGS:=	${autoreconf_ARGS}
 
 BUILD_DEPENDS+=	autoconf-2.69:${PORTSDIR}/devel/autoconf \
 		autoheader-2.69:${PORTSDIR}/devel/autoconf \
@@ -61,13 +60,11 @@ BUILD_DEPENDS+=	autoconf-2.69:${PORTSDIR}/devel/autoconf \
 		aclocal-1.14:${PORTSDIR}/devel/automake \
 		automake-1.14:${PORTSDIR}/devel/automake
 
-# Depend on autopoint if USES contains gettext* but not gettext:run
-.if ${USES:Mgettext} || (${USES:Mgettext\:*} && empty(USES:Mgettext\:run))
+.if ${USES:Mgettext} && empty(gettext_ARGS:Mrun)
 BUILD_DEPENDS+=	autopoint:${PORTSDIR}/devel/gettext
 .endif
 
-# Depend on libtoolize if USES contains libtool* but not libtool:build
-.if ${USES:Mlibtool} || (${USES:Mlibtool\:*} && empty(USES:Mlibtool\:*build*))
+.if ${USES:Mlibtool} && empty(libtool_ARGS:Mbuild)
 BUILD_DEPENDS+=	libtoolize:${PORTSDIR}/devel/libtool
 .endif