svn commit: r541336 - head/Mk/Scripts
Mathieu Arnold
mat at FreeBSD.org
Mon Jul 6 11:10:17 UTC 2020
Author: mat
Date: Mon Jul 6 11:10:16 2020
New Revision: 541336
URL: https://svnweb.freebsd.org/changeset/ports/541336
Log:
Fix overlays when using flavors.
Move FLAVOR processing before the overlays processing so that flavors
can be used with overlays.
PR: 247741
Submitted by: mikael
Modified:
head/Mk/Scripts/do-depends.sh (contents, props changed)
Modified: head/Mk/Scripts/do-depends.sh
==============================================================================
--- head/Mk/Scripts/do-depends.sh Mon Jul 6 10:51:46 2020 (r541335)
+++ head/Mk/Scripts/do-depends.sh Mon Jul 6 11:10:16 2020 (r541336)
@@ -124,6 +124,14 @@ for _line in ${dp_RAWDEPENDS} ; do
fi
case "${origin}" in
+ *@*/*) ;; # Ignore @ in the path which would not be a flavor
+ *@*)
+ export FLAVOR="${origin##*@}"
+ origin=${origin%@*}
+ ;;
+ esac
+
+ case "${origin}" in
/*) ;;
*)
for overlay in ${dp_OVERLAYS} ${PORTSDIR}; do
@@ -133,13 +141,6 @@ for _line in ${dp_RAWDEPENDS} ; do
fi
done
origin="${orig}"
- ;;
- esac
- case "${origin}" in
- *@*/*) ;; # Ignore @ in the path which would not be a flavor
- *@*)
- export FLAVOR="${origin##*@}"
- origin=${origin%@*}
;;
esac
More information about the svn-ports-all
mailing list