|
Lines 54-59
if [ ${missing} -eq 1 ]; then
Link Here
|
| 54 |
existing=$(${dp_PKG_INFO} -aoq|paste -d ' ' -s -) |
58 |
existing=$(${dp_PKG_INFO} -aoq|paste -d ' ' -s -) |
| 55 |
fi |
59 |
fi |
| 56 |
|
60 |
|
|
|
61 |
proc_flv() { |
| 62 |
local f |
| 63 |
|
| 64 |
d=${1} |
| 65 |
case "${d}" in |
| 66 |
*@*/*) |
| 67 |
return 1 # Ignore @ in the path which would not be a flavor |
| 68 |
;; |
| 69 |
*@*) |
| 70 |
f=${d##*@} |
| 71 |
d=${d%@*} |
| 72 |
;; |
| 73 |
*) |
| 74 |
return 1 |
| 75 |
;; |
| 76 |
esac |
| 77 |
if [ -f ${d}/Makefile ]; then |
| 78 |
if [ -n ${f} ]; then |
| 79 |
export FLAVOR=${f} |
| 80 |
fi |
| 81 |
return 0 |
| 82 |
fi |
| 83 |
return 1 |
| 84 |
} |
| 85 |
|
| 57 |
check_dep() { |
86 |
check_dep() { |
| 58 |
local _dep wrkdir show_dep |
87 |
local _dep wrkdir show_dep |
| 59 |
|
88 |
|
|
Lines 65-88
check_dep() {
Link Here
|
| 65 |
IFS=${myifs} |
94 |
IFS=${myifs} |
| 66 |
|
95 |
|
| 67 |
case "${2}" in |
96 |
case "${2}" in |
| 68 |
/*) d=${2} ;; |
97 |
/*) |
| 69 |
*) for overlay in ${dp_OVERLAYS} ${PORTSDIR}; do |
98 |
proc_flv ${2} || true ;; |
| 70 |
d=${overlay}/${2} |
99 |
*) |
| 71 |
f= |
100 |
for overlay in ${dp_OVERLAYS} ${PORTSDIR}; do |
| 72 |
case "${d}" in |
101 |
if proc_flv ${overlay}/${2} |
| 73 |
*@*/*) ;; # Ignore @ in the path which would not be a flavor |
102 |
then |
| 74 |
*@*) |
103 |
break |
| 75 |
f=${d##*@} |
|
|
| 76 |
d=${d%@*} |
| 77 |
;; |
| 78 |
esac |
| 79 |
if [ -f ${d}/Makefile ]; then |
| 80 |
if [ -n $f ]; then |
| 81 |
export FLAVOR=$f |
| 82 |
fi |
104 |
fi |
| 83 |
break |
105 |
done |
| 84 |
fi |
106 |
;; |
| 85 |
done |
|
|
| 86 |
esac |
107 |
esac |
| 87 |
|
108 |
|
| 88 |
if [ ${flavors} -eq 1 -a -n "${FLAVOR:-}" ]; then |
109 |
if [ ${flavors} -eq 1 -a -n "${FLAVOR:-}" ]; then |