diff options
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index b74a75b2db41..06e8f3521332 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1493,11 +1493,13 @@ QA_ENV+= USESSHAREDMIMEINFO=yes # Loading features .for f in ${USES} -_f=${f:C/\:.*//g} -.if ${_f} != ${f} -${_f}_ARGS:= ${f:C/^[^\:]*\://g} +_f:= ${f:C/\:.*//} +.if !defined(${_f}_ARGS) +${_f}_ARGS:= ${f:C/^[^\:]*(\:|\$)//:S/,/ /g} .endif -.include "${USESDIR}/${_f}.mk" +.endfor +.for f in ${USES} +.include "${USESDIR}/${f:C/\:.*//}.mk" .endfor .if defined(USE_BZIP2) @@ -1917,11 +1919,13 @@ USE_SUBMAKE= yes # Loading features .for f in ${_USES_POST} -_f=${f:C/\:.*//g} -.if ${_f} != ${f} -${_f}_ARGS:= ${f:C/^[^\:]*\://g} +_f:= ${f:C/\:.*//} +.if !defined(${_f}_ARGS) +${_f}_ARGS:= ${f:C/^[^\:]*(\:|\$)//:S/,/ /g} .endif -.include "${USESDIR}/${_f}.mk" +.endfor +.for f in ${_USES_POST} +.include "${USESDIR}/${f:C/\:.*//}.mk" .endfor .if defined(USE_XORG) |