Page MenuHomeFreeBSD

D44410.diff
No OneTemporary

D44410.diff

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1486,13 +1486,13 @@
. endfor
. for f in ${USES}
.undef _usefound
-. for udir in ${OVERLAYS:C,$,/Mk/Uses,} ${USESDIR}
-_usefile= ${udir}/${f:C/\:.*//}.mk
-. if exists(${_usefile}) && !defined(_usefound)
+. if exists(${OVERLAYS:C,$,/Mk/Uses,}/${f:C/\:.*//}.mk) && !defined(_usefound)
_usefound=
-.include "${_usefile}"
-. endif
-. endfor
+.include "${OVERLAYS:C,$,/Mk/Uses,}/${f:C/\:.*//}.mk"
+. elif exists(${USESDIR}/${f:C/\:.*//}.mk) && !defined(_usefound)
+_usefound=
+.include "${USESDIR}/${f:C/\:.*//}.mk"
+. endif
. if !defined(_usefound)
ERROR+= "Unknown USES=${f:C/\:.*//}"
. endif
@@ -1991,13 +1991,13 @@
. endfor
. for f in ${_USES_POST}
.undef _usefound
-. for udir in ${OVERLAYS:C,$,/Mk/Uses,} ${USESDIR}
-_usefile= ${udir}/${f:C/\:.*//}.mk
-. if exists(${_usefile}) && !defined(_usefound)
+. if exists(${OVERLAYS:C,$,/Mk/Uses,}/${f:C/\:.*//}.mk) && !defined(_usefound)
_usefound=
-.include "${_usefile}"
-. endif
-. endfor
+.include "${OVERLAYS:C,$,/Mk/Uses,}/${f:C/\:.*//}.mk"
+. elif exists(${USESDIR}/${f:C/\:.*//}.mk) && !defined(_usefound)
+_usefound=
+.include "${USESDIR}/${f:C/\:.*//}.mk"
+. endif
. if !defined(_usefound)
ERROR+= "Unknown USES=${f:C/\:.*//}"
. endif

File Metadata

Mime Type
text/plain
Expires
Wed, May 27, 2:40 PM (10 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33543308
Default Alt Text
D44410.diff (1 KB)

Event Timeline