Lines 1-4
Link Here
|
1 |
--- portmaster.orig 2018-01-14 21:53:23 UTC |
1 |
--- portmaster.orig 2020-01-19 06:16:11 UTC |
2 |
+++ portmaster |
2 |
+++ portmaster |
3 |
@@ -7,10 +7,12 @@ trap trap_exit INT |
3 |
@@ -7,10 +7,12 @@ trap trap_exit INT |
4 |
|
4 |
|
Lines 207-217
Link Here
|
207 |
#=============== Begin functions relevant to --features and main =============== |
207 |
#=============== Begin functions relevant to --features and main =============== |
208 |
|
208 |
|
209 |
# find installed port for given origin (with optional @flavor) in the pkg DB |
209 |
# find installed port for given origin (with optional @flavor) in the pkg DB |
210 |
@@ -938,11 +968,11 @@ iport_from_origin () { |
210 |
@@ -937,12 +967,18 @@ iport_from_origin () { |
|
|
211 |
local origin flavor pkgname_l pkgname pkgflavor |
211 |
|
212 |
|
212 |
origin=$(dir_part "$1") |
213 |
origin=$(dir_part "$1") |
213 |
flavor=$(flavor_part "$1") |
214 |
- flavor=$(flavor_part "$1") |
214 |
- pkgname_l=$(echo $(pkg query '%n-%v' $origin)) || return 1 |
215 |
- pkgname_l=$(echo $(pkg query '%n-%v' $origin)) || return 1 |
|
|
216 |
+ if [ "${1}" != "${origin}" ] ; then |
217 |
+ flavor=$(flavor_part "$1") |
218 |
+ else |
219 |
+ unset FLAVOR |
220 |
+ flavor=$(pm_make -C "${pd}/${origin}" -V FLAVOR) |
221 |
+ export flavor $flavor |
222 |
+ fi |
215 |
+ pkgname_l=$(echo $($PKG_CMD query '%n-%v' $origin)) || return 1 |
223 |
+ pkgname_l=$(echo $($PKG_CMD query '%n-%v' $origin)) || return 1 |
216 |
# if multiple flavors registered then fall back to $FLAVOR if no flavor has been passed in $1 |
224 |
# if multiple flavors registered then fall back to $FLAVOR if no flavor has been passed in $1 |
217 |
[ "${pkgname_l}" != "${pkgname_l#* }" ] && : ${flavor:=$FLAVOR} |
225 |
[ "${pkgname_l}" != "${pkgname_l#* }" ] && : ${flavor:=$FLAVOR} |
Lines 221-227
Link Here
|
221 |
if [ "$pkgflavor" = "$flavor" ]; then |
229 |
if [ "$pkgflavor" = "$flavor" ]; then |
222 |
echo $pkgname |
230 |
echo $pkgname |
223 |
return 0 |
231 |
return 0 |
224 |
@@ -1002,25 +1032,6 @@ get_answer_yn () { |
232 |
@@ -1002,25 +1038,6 @@ get_answer_yn () { |
225 |
fi |
233 |
fi |
226 |
} |
234 |
} |
227 |
|
235 |
|
Lines 247-253
Link Here
|
247 |
# Find the new origin for moved ports |
255 |
# Find the new origin for moved ports |
248 |
# Set global variable moved_npd on success |
256 |
# Set global variable moved_npd on success |
249 |
# Return values: |
257 |
# Return values: |
250 |
@@ -1056,7 +1067,8 @@ find_moved_port () { |
258 |
@@ -1056,7 +1073,8 @@ find_moved_port () { |
251 |
fi ;; |
259 |
fi ;; |
252 |
${sf}\|*) moved_npd=${moved#*\|} # New port directory |
260 |
${sf}\|*) moved_npd=${moved#*\|} # New port directory |
253 |
moved_npd=${moved_npd%%\|*} |
261 |
moved_npd=${moved_npd%%\|*} |
Lines 257-263
Link Here
|
257 |
echo '' |
265 |
echo '' |
258 |
echo " ===>>> The $sf port moved to $moved_npd" |
266 |
echo " ===>>> The $sf port moved to $moved_npd" |
259 |
echo " ===>>> Reason: ${moved##*|}" |
267 |
echo " ===>>> Reason: ${moved##*|}" |
260 |
@@ -1082,7 +1094,7 @@ find_moved_port () { |
268 |
@@ -1082,7 +1100,7 @@ find_moved_port () { |
261 |
} |
269 |
} |
262 |
|
270 |
|
263 |
all_pkgs_by_origin () { |
271 |
all_pkgs_by_origin () { |
Lines 266-272
Link Here
|
266 |
echo "$namesorigins" |
274 |
echo "$namesorigins" |
267 |
return |
275 |
return |
268 |
} |
276 |
} |
269 |
@@ -1146,11 +1158,10 @@ read_distinfos_all () { |
277 |
@@ -1146,11 +1164,10 @@ read_distinfos_all () { |
270 |
echo '' |
278 |
echo '' |
271 |
|
279 |
|
272 |
for origin in ${pd}/*/*; do |
280 |
for origin in ${pd}/*/*; do |
Lines 279-285
Link Here
|
279 |
|
287 |
|
280 |
if [ -s "${origin}/distinfo" ]; then |
288 |
if [ -s "${origin}/distinfo" ]; then |
281 |
distinfo="${origin}/distinfo" |
289 |
distinfo="${origin}/distinfo" |
282 |
@@ -1181,17 +1192,17 @@ ports_by_category () { |
290 |
@@ -1181,17 +1198,17 @@ ports_by_category () { |
283 |
local pkg |
291 |
local pkg |
284 |
|
292 |
|
285 |
pm_v "===>>> Sorting ports by category" |
293 |
pm_v "===>>> Sorting ports by category" |
Lines 302-308
Link Here
|
302 |
} |
310 |
} |
303 |
|
311 |
|
304 |
delete_empty_dist_subdirs () { |
312 |
delete_empty_dist_subdirs () { |
305 |
@@ -1279,7 +1290,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then |
313 |
@@ -1279,7 +1296,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then |
306 |
for package in `find $PACKAGES -type f | sort`; do |
314 |
for package in `find $PACKAGES -type f | sort`; do |
307 |
pkg_dir=${package##*/} ; pkg_dir=${pkg_dir%\.*} ; echo '' |
315 |
pkg_dir=${package##*/} ; pkg_dir=${pkg_dir%\.*} ; echo '' |
308 |
|
316 |
|
Lines 311-317
Link Here
|
311 |
origin=`tar -O -zxvf $package '+CONTENTS' 2>/dev/null | grep '@comment ORIGIN:'` || |
319 |
origin=`tar -O -zxvf $package '+CONTENTS' 2>/dev/null | grep '@comment ORIGIN:'` || |
312 |
origin=`tar -O -zxvf $package '+MANIFEST' 2>/dev/null | grep '^origin:'` || |
320 |
origin=`tar -O -zxvf $package '+MANIFEST' 2>/dev/null | grep '^origin:'` || |
313 |
fail "Empty origin in $package" |
321 |
fail "Empty origin in $package" |
314 |
@@ -1302,7 +1313,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then |
322 |
@@ -1302,7 +1319,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then |
315 |
if [ -n "$port_ver" ]; then |
323 |
if [ -n "$port_ver" ]; then |
316 |
if [ "$port_ver" = "$pkg_dir" ]; then |
324 |
if [ "$port_ver" = "$pkg_dir" ]; then |
317 |
echo "===>>> ${package##*/} is up to date" |
325 |
echo "===>>> ${package##*/} is up to date" |
Lines 320-326
Link Here
|
320 |
echo " ===>>> $pkg_dir is not installed" |
328 |
echo " ===>>> $pkg_dir is not installed" |
321 |
echo " ===>>> Path: ${package}" |
329 |
echo " ===>>> Path: ${package}" |
322 |
get_answer_yn y "\n\t===>>> Delete stale package: ${package##*/}" |
330 |
get_answer_yn y "\n\t===>>> Delete stale package: ${package##*/}" |
323 |
@@ -1320,7 +1331,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then |
331 |
@@ -1320,7 +1337,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then |
324 |
|
332 |
|
325 |
unset port_ver |
333 |
unset port_ver |
326 |
|
334 |
|
Lines 329-335
Link Here
|
329 |
echo " ===>>> ${package##*/} matches the installed version" |
337 |
echo " ===>>> ${package##*/} matches the installed version" |
330 |
else |
338 |
else |
331 |
echo " ===>>> ${package##*/} is not installed" |
339 |
echo " ===>>> ${package##*/} is not installed" |
332 |
@@ -1362,7 +1373,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then |
340 |
@@ -1362,7 +1379,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then |
333 |
fi # [ -n "$CLEAN_PACKAGES" ] |
341 |
fi # [ -n "$CLEAN_PACKAGES" ] |
334 |
|
342 |
|
335 |
if [ -n "$CHECK_DEPENDS" ]; then |
343 |
if [ -n "$CHECK_DEPENDS" ]; then |
Lines 338-344
Link Here
|
338 |
exit 0 |
346 |
exit 0 |
339 |
fi |
347 |
fi |
340 |
|
348 |
|
341 |
@@ -1377,14 +1388,14 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then |
349 |
@@ -1377,14 +1394,14 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then |
342 |
if ! pm_isdir_pd "$origin"; then |
350 |
if ! pm_isdir_pd "$origin"; then |
343 |
find_moved_port $origin $pkg nonfatal >/dev/null |
351 |
find_moved_port $origin $pkg nonfatal >/dev/null |
344 |
[ -n "$moved_npd" ] || continue |
352 |
[ -n "$moved_npd" ] || continue |
Lines 355-361
Link Here
|
355 |
done <<-EOF |
363 |
done <<-EOF |
356 |
$(all_pkgs_by_origin) |
364 |
$(all_pkgs_by_origin) |
357 |
EOF |
365 |
EOF |
358 |
@@ -1413,7 +1424,7 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then |
366 |
@@ -1413,7 +1430,7 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then |
359 |
fi |
367 |
fi |
360 |
|
368 |
|
361 |
if [ -n "$LIST_ORIGINS" ]; then |
369 |
if [ -n "$LIST_ORIGINS" ]; then |
Lines 364-370
Link Here
|
364 |
|
372 |
|
365 |
exit 0 |
373 |
exit 0 |
366 |
fi |
374 |
fi |
367 |
@@ -1502,7 +1513,7 @@ check_for_updates () { |
375 |
@@ -1502,7 +1519,7 @@ check_for_updates () { |
368 |
fi |
376 |
fi |
369 |
|
377 |
|
370 |
if [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ] && pm_isdir "$pd/$origin"; then |
378 |
if [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ] && pm_isdir "$pd/$origin"; then |
Lines 373-379
Link Here
|
373 |
if pm_islocked "$iport"; then |
381 |
if pm_islocked "$iport"; then |
374 |
echo " ===>>> Warning: Unable to cd to $pd/$origin" |
382 |
echo " ===>>> Warning: Unable to cd to $pd/$origin" |
375 |
echo " ===>>> Continuing due to $pdb/$iport/+IGNOREME" |
383 |
echo " ===>>> Continuing due to $pdb/$iport/+IGNOREME" |
376 |
@@ -1545,7 +1556,7 @@ check_for_updates () { |
384 |
@@ -1545,7 +1562,7 @@ check_for_updates () { |
377 |
unset port_ver |
385 |
unset port_ver |
378 |
fi |
386 |
fi |
379 |
else |
387 |
else |
Lines 382-388
Link Here
|
382 |
\<) do_update=upd_lt ;; |
390 |
\<) do_update=upd_lt ;; |
383 |
=) ;; # Can be reached if same version with different options |
391 |
=) ;; # Can be reached if same version with different options |
384 |
\>) if [ -n "$PM_VERBOSE" ]; then |
392 |
\>) if [ -n "$PM_VERBOSE" ]; then |
385 |
@@ -1628,7 +1639,7 @@ pm_pkg_create () { |
393 |
@@ -1628,7 +1645,7 @@ pm_pkg_create () { |
386 |
fi |
394 |
fi |
387 |
|
395 |
|
388 |
pm_cd $pkgdir || fail "Cannot cd into $pkgdir to create a package" |
396 |
pm_cd $pkgdir || fail "Cannot cd into $pkgdir to create a package" |
Lines 391-397
Link Here
|
391 |
if [ "$1" = "$pbu" ]; then |
399 |
if [ "$1" = "$pbu" ]; then |
392 |
if [ -n "$BACKUP" ]; then |
400 |
if [ -n "$BACKUP" ]; then |
393 |
echo " ===>>> Package saved to $1" ; echo '' |
401 |
echo " ===>>> Package saved to $1" ; echo '' |
394 |
@@ -1980,7 +1991,7 @@ if [ -n "$LIST" -o -n "$LIST_PLUS" ]; then |
402 |
@@ -1980,7 +1997,7 @@ if [ -n "$LIST" -o -n "$LIST_PLUS" ]; then |
395 |
fi |
403 |
fi |
396 |
|
404 |
|
397 |
if [ -n "$EXPUNGE" ]; then |
405 |
if [ -n "$EXPUNGE" ]; then |
Lines 400-406
Link Here
|
400 |
find_glob_dirs $EXPUNGE |
408 |
find_glob_dirs $EXPUNGE |
401 |
case $? in |
409 |
case $? in |
402 |
1) fail "No such port: $EXPUNGE" ;; |
410 |
1) fail "No such port: $EXPUNGE" ;; |
403 |
@@ -1992,7 +2003,7 @@ if [ -n "$EXPUNGE" ]; then |
411 |
@@ -1992,7 +2009,7 @@ if [ -n "$EXPUNGE" ]; then |
404 |
fi |
412 |
fi |
405 |
|
413 |
|
406 |
origin=`origin_from_pdb $EXPUNGE` |
414 |
origin=`origin_from_pdb $EXPUNGE` |
Lines 409-415
Link Here
|
409 |
if [ -n "$deplist" ]; then |
417 |
if [ -n "$deplist" ]; then |
410 |
echo "===>>> Warning: Ports with dependencies on ${EXPUNGE}:" |
418 |
echo "===>>> Warning: Ports with dependencies on ${EXPUNGE}:" |
411 |
echo "$deplist" | sed 's/^/ /' |
419 |
echo "$deplist" | sed 's/^/ /' |
412 |
@@ -2020,7 +2031,7 @@ fi |
420 |
@@ -2020,7 +2037,7 @@ fi |
413 |
if [ -n "$CLEAN_STALE" ]; then |
421 |
if [ -n "$CLEAN_STALE" ]; then |
414 |
[ -z "$no_del_list" ] && export no_del_list=':' |
422 |
[ -z "$no_del_list" ] && export no_del_list=':' |
415 |
|
423 |
|
Lines 418-424
Link Here
|
418 |
for file in $stale_ports; do |
426 |
for file in $stale_ports; do |
419 |
iport="${file%/+REQUIRED_BY}" ; iport=${iport#$pdb/} |
427 |
iport="${file%/+REQUIRED_BY}" ; iport=${iport#$pdb/} |
420 |
|
428 |
|
421 |
@@ -2040,7 +2051,7 @@ if [ -n "$CLEAN_STALE" ]; then |
429 |
@@ -2040,7 +2057,7 @@ if [ -n "$CLEAN_STALE" ]; then |
422 |
continue |
430 |
continue |
423 |
fi |
431 |
fi |
424 |
|
432 |
|
Lines 427-433
Link Here
|
427 |
|
435 |
|
428 |
get_answer_yn n "\t===>>> ${iport} is no longer depended on, delete" |
436 |
get_answer_yn n "\t===>>> ${iport} is no longer depended on, delete" |
429 |
case "$?" in |
437 |
case "$?" in |
430 |
@@ -2073,7 +2084,7 @@ check_restart_and_udf () { |
438 |
@@ -2073,7 +2090,7 @@ check_restart_and_udf () { |
431 |
# to go out to the disk if we don't have to. |
439 |
# to go out to the disk if we don't have to. |
432 |
[ -z "$RESTART" ] && return 1 |
440 |
[ -z "$RESTART" ] && return 1 |
433 |
|
441 |
|
Lines 436-442
Link Here
|
436 |
return 1 |
444 |
return 1 |
437 |
else |
445 |
else |
438 |
already_done $1 |
446 |
already_done $1 |
439 |
@@ -2175,26 +2186,32 @@ update_pm_nu () { |
447 |
@@ -2175,26 +2192,32 @@ update_pm_nu () { |
440 |
} |
448 |
} |
441 |
|
449 |
|
442 |
update_build_l () { |
450 |
update_build_l () { |
Lines 474-480
Link Here
|
474 |
\<) build_l="${build_l}\tUpgrade $iport to $new_port\n" ;; |
482 |
\<) build_l="${build_l}\tUpgrade $iport to $new_port\n" ;; |
475 |
=) build_l="${build_l}\tRe-install $iport\n" ;; |
483 |
=) build_l="${build_l}\tRe-install $iport\n" ;; |
476 |
\>) build_l="${build_l}\tDowngrade $iport to $new_port\n" ;; |
484 |
\>) build_l="${build_l}\tDowngrade $iport to $new_port\n" ;; |
477 |
@@ -2203,8 +2220,9 @@ update_build_l () { |
485 |
@@ -2203,8 +2226,9 @@ update_build_l () { |
478 |
} |
486 |
} |
479 |
|
487 |
|
480 |
update_port () { |
488 |
update_port () { |
Lines 485-491
Link Here
|
485 |
if [ -n "$2" ]; then |
493 |
if [ -n "$2" ]; then |
486 |
echo "===>>> Launching child to update $1 to $2" |
494 |
echo "===>>> Launching child to update $1 to $2" |
487 |
else |
495 |
else |
488 |
@@ -2300,7 +2318,7 @@ make_dep_list () { |
496 |
@@ -2300,7 +2324,7 @@ make_dep_list () { |
489 |
fail "make_dep_list: Unsupported option '$dep_type'" |
497 |
fail "make_dep_list: Unsupported option '$dep_type'" |
490 |
esac |
498 |
esac |
491 |
done |
499 |
done |
Lines 494-500
Link Here
|
494 |
} |
502 |
} |
495 |
|
503 |
|
496 |
gen_dep_list () { |
504 |
gen_dep_list () { |
497 |
@@ -2368,15 +2386,17 @@ dependency_check () { |
505 |
@@ -2368,15 +2392,17 @@ dependency_check () { |
498 |
rundeps=`gen_dep_list run-depends-list` |
506 |
rundeps=`gen_dep_list run-depends-list` |
499 |
|
507 |
|
500 |
for dep in $d_port_list; do |
508 |
for dep in $d_port_list; do |
Lines 515-521
Link Here
|
515 |
rundep_list="$rundep_list $varname" |
523 |
rundep_list="$rundep_list $varname" |
516 |
eval $varname=\"$portdir \$$varname\" |
524 |
eval $varname=\"$portdir \$$varname\" |
517 |
eval ${varname}_p=$dep |
525 |
eval ${varname}_p=$dep |
518 |
@@ -2409,7 +2429,10 @@ dependency_check () { |
526 |
@@ -2409,7 +2435,10 @@ dependency_check () { |
519 |
|
527 |
|
520 |
# Do not export, for THIS parent process only |
528 |
# Do not export, for THIS parent process only |
521 |
[ -n "$PM_FIRST_PASS" ] && doing_dep_check=doing_dep_check |
529 |
[ -n "$PM_FIRST_PASS" ] && doing_dep_check=doing_dep_check |
Lines 527-533
Link Here
|
527 |
origin="${d_port#$pd/}" |
535 |
origin="${d_port#$pd/}" |
528 |
if [ -n "$SHOW_WORK" ]; then |
536 |
if [ -n "$SHOW_WORK" ]; then |
529 |
iport=`iport_from_origin $origin` |
537 |
iport=`iport_from_origin $origin` |
530 |
@@ -2429,23 +2452,17 @@ dependency_check () { |
538 |
@@ -2429,23 +2458,17 @@ dependency_check () { |
531 |
[ -z "$PM_URB_UP" ] && |
539 |
[ -z "$PM_URB_UP" ] && |
532 |
case "$CUR_DEPS" in *:${origin}:*) continue ;; esac |
540 |
case "$CUR_DEPS" in *:${origin}:*) continue ;; esac |
533 |
|
541 |
|
Lines 556-562
Link Here
|
556 |
if [ -n "$confl_p" ]; then |
564 |
if [ -n "$confl_p" ]; then |
557 |
confl_p=${confl_p%% *} |
565 |
confl_p=${confl_p%% *} |
558 |
d_port="$pd/`origin_from_pdb $confl_p`" |
566 |
d_port="$pd/`origin_from_pdb $confl_p`" |
559 |
@@ -2498,7 +2515,11 @@ dependency_check () { |
567 |
@@ -2498,7 +2521,11 @@ dependency_check () { |
560 |
check_for_updates $iport $origin || fail 'Update failed' |
568 |
check_for_updates $iport $origin || fail 'Update failed' |
561 |
else |
569 |
else |
562 |
check_interactive $origin || continue |
570 |
check_interactive $origin || continue |
Lines 569-575
Link Here
|
569 |
fi |
577 |
fi |
570 |
done |
578 |
done |
571 |
[ -n "$PM_FIRST_PASS" ] && unset doing_dep_check |
579 |
[ -n "$PM_FIRST_PASS" ] && unset doing_dep_check |
572 |
@@ -2587,7 +2608,7 @@ post_first_pass () { |
580 |
@@ -2587,7 +2614,7 @@ post_first_pass () { |
573 |
done |
581 |
done |
574 |
|
582 |
|
575 |
for dep in $build_only_dl_g; do |
583 |
for dep in $build_only_dl_g; do |
Lines 578-584
Link Here
|
578 |
[ -n "$PM_DEL_BUILD_ONLY" ] && |
586 |
[ -n "$PM_DEL_BUILD_ONLY" ] && |
579 |
iport_from_origin ${dep#$pd/} >/dev/null && continue |
587 |
iport_from_origin ${dep#$pd/} >/dev/null && continue |
580 |
temp_bodlg="$temp_bodlg $dep" |
588 |
temp_bodlg="$temp_bodlg $dep" |
581 |
@@ -2629,7 +2650,7 @@ urb_update () { |
589 |
@@ -2629,7 +2656,7 @@ urb_update () { |
582 |
case " $PM_URB_ORIGINS" in *" $req_by_o "*) continue ;; esac |
590 |
case " $PM_URB_ORIGINS" in *" $req_by_o "*) continue ;; esac |
583 |
PM_URB_LIST="${PM_URB_LIST} ${req_by}" |
591 |
PM_URB_LIST="${PM_URB_LIST} ${req_by}" |
584 |
done <<-EOF |
592 |
done <<-EOF |
Lines 587-593
Link Here
|
587 |
EOF |
595 |
EOF |
588 |
done |
596 |
done |
589 |
|
597 |
|
590 |
@@ -2642,7 +2663,7 @@ urb_update () { |
598 |
@@ -2642,7 +2669,7 @@ urb_update () { |
591 |
|
599 |
|
592 |
for req_by in $PM_URB_LIST; do |
600 |
for req_by in $PM_URB_LIST; do |
593 |
# Probably not needed, but JIC |
601 |
# Probably not needed, but JIC |
Lines 596-602
Link Here
|
596 |
|
604 |
|
597 |
pm_v "===>>> $req_by depends on $PM_URB_IPORTS" |
605 |
pm_v "===>>> $req_by depends on $PM_URB_IPORTS" |
598 |
|
606 |
|
599 |
@@ -2683,7 +2704,7 @@ multiport () { |
607 |
@@ -2683,7 +2710,7 @@ multiport () { |
600 |
else |
608 |
else |
601 |
fail "$pd/${port} does not exist" |
609 |
fail "$pd/${port} does not exist" |
602 |
fi ;; |
610 |
fi ;; |
Lines 605-611
Link Here
|
605 |
worklist_temp="$worklist_temp $port" |
613 |
worklist_temp="$worklist_temp $port" |
606 |
else |
614 |
else |
607 |
find_glob_dirs $port |
615 |
find_glob_dirs $port |
608 |
@@ -2773,8 +2794,8 @@ multiport () { |
616 |
@@ -2773,8 +2800,8 @@ multiport () { |
609 |
|
617 |
|
610 |
num=$(( $num + 1 )) |
618 |
num=$(( $num + 1 )) |
611 |
init_term_printf "$port ${num}/${numports}" |
619 |
init_term_printf "$port ${num}/${numports}" |
Lines 616-622
Link Here
|
616 |
[ -n "$update_failed" ] && fail "Update for $port failed" |
624 |
[ -n "$update_failed" ] && fail "Update for $port failed" |
617 |
|
625 |
|
618 |
case "$PM_NEEDS_UPDATE" in |
626 |
case "$PM_NEEDS_UPDATE" in |
619 |
@@ -2803,7 +2824,7 @@ multiport () { |
627 |
@@ -2803,7 +2830,7 @@ multiport () { |
620 |
*/*) origin=$port ;; |
628 |
*/*) origin=$port ;; |
621 |
*) # If an installed version does not exist at this |
629 |
*) # If an installed version does not exist at this |
622 |
# point it probably got updated as a dependency |
630 |
# point it probably got updated as a dependency |
Lines 625-631
Link Here
|
625 |
numports=$(( $numports - 1 )) |
633 |
numports=$(( $numports - 1 )) |
626 |
continue |
634 |
continue |
627 |
fi |
635 |
fi |
628 |
@@ -2823,7 +2844,7 @@ multiport () { |
636 |
@@ -2823,7 +2850,7 @@ multiport () { |
629 |
num=$(( $num + 1 )) |
637 |
num=$(( $num + 1 )) |
630 |
init_term_printf "$port ${num}/${numports}" |
638 |
init_term_printf "$port ${num}/${numports}" |
631 |
("$program" $ARGS $port) || update_failed=update_failed |
639 |
("$program" $ARGS $port) || update_failed=update_failed |
Lines 634-640
Link Here
|
634 |
[ -n "$update_failed" ] && fail "Update for $port failed" |
642 |
[ -n "$update_failed" ] && fail "Update for $port failed" |
635 |
done |
643 |
done |
636 |
|
644 |
|
637 |
@@ -3029,8 +3050,12 @@ no_valid_port () { |
645 |
@@ -3029,8 +3056,12 @@ no_valid_port () { |
638 |
echo "===>>> Try $progname --help" ; echo '' ; safe_exit 1 |
646 |
echo "===>>> Try $progname --help" ; echo '' ; safe_exit 1 |
639 |
} |
647 |
} |
640 |
|
648 |
|
Lines 647-653
Link Here
|
647 |
export_flavor $(flavor_part $portdir) |
655 |
export_flavor $(flavor_part $portdir) |
648 |
[ -n "$portdir" ] && { argv=$portdir ; unset portdir; } |
656 |
[ -n "$portdir" ] && { argv=$portdir ; unset portdir; } |
649 |
argv=${argv:-$1} ; argv=${argv%/} ; argv=`globstrip $argv` |
657 |
argv=${argv:-$1} ; argv=${argv%/} ; argv=`globstrip $argv` |
650 |
@@ -3048,7 +3073,7 @@ if [ -z "$REPLACE_ORIGIN" ]; then |
658 |
@@ -3048,7 +3079,7 @@ if [ -z "$REPLACE_ORIGIN" ]; then |
651 |
*) echo '' ; no_valid_port ;; |
659 |
*) echo '' ; no_valid_port ;; |
652 |
esac |
660 |
esac |
653 |
done ;; |
661 |
done ;; |
Lines 656-662
Link Here
|
656 |
esac |
664 |
esac |
657 |
|
665 |
|
658 |
if [ -z "$portdir" -a -z "$upg_port" ]; then |
666 |
if [ -z "$portdir" -a -z "$upg_port" ]; then |
659 |
@@ -3061,9 +3086,11 @@ if [ -z "$REPLACE_ORIGIN" ]; then |
667 |
@@ -3061,9 +3092,11 @@ if [ -z "$REPLACE_ORIGIN" ]; then |
660 |
unset glob_dirs |
668 |
unset glob_dirs |
661 |
fi |
669 |
fi |
662 |
unset argv |
670 |
unset argv |
Lines 669-675
Link Here
|
669 |
if [ -z "$PM_INDEX_ONLY" ]; then |
677 |
if [ -z "$PM_INDEX_ONLY" ]; then |
670 |
pm_isdir_pd "$portdir" ] || missing=missing |
678 |
pm_isdir_pd "$portdir" ] || missing=missing |
671 |
else |
679 |
else |
672 |
@@ -3076,12 +3103,12 @@ else |
680 |
@@ -3076,12 +3109,12 @@ else |
673 |
echo '' ; no_valid_port |
681 |
echo '' ; no_valid_port |
674 |
fi |
682 |
fi |
675 |
|
683 |
|
Lines 684-690
Link Here
|
684 |
ro_upg_port=$arg2 |
692 |
ro_upg_port=$arg2 |
685 |
else |
693 |
else |
686 |
find_glob_dirs $arg2 && ro_upg_port=${glob_dirs#$pdb/} |
694 |
find_glob_dirs $arg2 && ro_upg_port=${glob_dirs#$pdb/} |
687 |
@@ -3097,7 +3124,7 @@ else |
695 |
@@ -3097,7 +3130,7 @@ else |
688 |
unset arg2 |
696 |
unset arg2 |
689 |
|
697 |
|
690 |
if [ -z "$ro_upg_port" ]; then |
698 |
if [ -z "$ro_upg_port" ]; then |
Lines 693-699
Link Here
|
693 |
if [ "$?" -eq 1 ]; then |
701 |
if [ "$?" -eq 1 ]; then |
694 |
echo '' |
702 |
echo '' |
695 |
echo "===>>> The second argument to -o can be a package name," |
703 |
echo "===>>> The second argument to -o can be a package name," |
696 |
@@ -3133,6 +3160,7 @@ if [ -z "$PM_INDEX_ONLY" ] && ! pm_isdir_pd "$portdir" |
704 |
@@ -3133,6 +3166,7 @@ if [ -z "$PM_INDEX_ONLY" ] && ! pm_isdir_pd "$portdir" |
697 |
pm_isdir_pd "$moved_npd" || no_valid_port |
705 |
pm_isdir_pd "$moved_npd" || no_valid_port |
698 |
|
706 |
|
699 |
[ "$$" -eq "$PM_PARENT_PID" ] && parent_exit |
707 |
[ "$$" -eq "$PM_PARENT_PID" ] && parent_exit |
Lines 701-707
Link Here
|
701 |
exec "$program" $ARGS -o $moved_npd $upg_port |
709 |
exec "$program" $ARGS -o $moved_npd $upg_port |
702 |
# NOT REACHED |
710 |
# NOT REACHED |
703 |
fi |
711 |
fi |
704 |
@@ -3142,8 +3170,8 @@ iport_from_pkgname () { |
712 |
@@ -3142,8 +3176,8 @@ iport_from_pkgname () { |
705 |
|
713 |
|
706 |
dir=$(dir_part $1) |
714 |
dir=$(dir_part $1) |
707 |
flavor=$(flavor_part $1) |
715 |
flavor=$(flavor_part $1) |
Lines 712-718
Link Here
|
712 |
} |
720 |
} |
713 |
|
721 |
|
714 |
if [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ]; then |
722 |
if [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ]; then |
715 |
@@ -3229,11 +3257,14 @@ if [ -n "$PM_FIRST_PASS" -a -z "$FETCH_ONLY" ]; then |
723 |
@@ -3229,11 +3263,14 @@ if [ -n "$PM_FIRST_PASS" -a -z "$FETCH_ONLY" ]; then |
716 |
fi |
724 |
fi |
717 |
fi |
725 |
fi |
718 |
|
726 |
|
Lines 728-734
Link Here
|
728 |
# Do these things first time through |
736 |
# Do these things first time through |
729 |
if [ -z "$PM_INDEX_ONLY" -a -z "$PM_BUILDING" -a -z "$SHOW_WORK" -a -z "$NO_ACTION" ]; then |
737 |
if [ -z "$PM_INDEX_ONLY" -a -z "$PM_BUILDING" -a -z "$SHOW_WORK" -a -z "$NO_ACTION" ]; then |
730 |
# Do not start this in the background until we are sure we are going to proceed |
738 |
# Do not start this in the background until we are sure we are going to proceed |
731 |
@@ -3389,7 +3420,7 @@ fetch_package () { |
739 |
@@ -3389,7 +3426,7 @@ fetch_package () { |
732 |
export ppd |
740 |
export ppd |
733 |
fi |
741 |
fi |
734 |
|
742 |
|
Lines 737-743
Link Here
|
737 |
|
745 |
|
738 |
if [ -z "$FETCH_ARGS" ]; then |
746 |
if [ -z "$FETCH_ARGS" ]; then |
739 |
FETCH_ARGS=`pm_make -f/usr/share/mk/bsd.port.mk -V FETCH_ARGS 2>/dev/null` |
747 |
FETCH_ARGS=`pm_make -f/usr/share/mk/bsd.port.mk -V FETCH_ARGS 2>/dev/null` |
740 |
@@ -3533,7 +3564,7 @@ notnewer () { |
748 |
@@ -3533,7 +3570,7 @@ notnewer () { |
741 |
pm_v "===>>> Available package ($latest_pv) matches the current version" |
749 |
pm_v "===>>> Available package ($latest_pv) matches the current version" |
742 |
elif [ -n "$latest_pv" -a -n "$PM_PACKAGES_NEWER" ]; then |
750 |
elif [ -n "$latest_pv" -a -n "$PM_PACKAGES_NEWER" ]; then |
743 |
if [ -n "$upg_port" ]; then |
751 |
if [ -n "$upg_port" ]; then |
Lines 746-752
Link Here
|
746 |
\<) use_package=up_newer |
754 |
\<) use_package=up_newer |
747 |
pm_v "===>>> Available package ($latest_pv)" |
755 |
pm_v "===>>> Available package ($latest_pv)" |
748 |
pm_v " is newer than installed ($upg_port)" ;; |
756 |
pm_v " is newer than installed ($upg_port)" ;; |
749 |
@@ -3549,7 +3580,7 @@ notnewer () { |
757 |
@@ -3549,7 +3586,7 @@ notnewer () { |
750 |
pm_v "===>>> There is a package available ($latest_pv)" |
758 |
pm_v "===>>> There is a package available ($latest_pv)" |
751 |
fi |
759 |
fi |
752 |
elif [ -n "$latest_pv" ]; then |
760 |
elif [ -n "$latest_pv" ]; then |
Lines 755-761
Link Here
|
755 |
\<) # Could happen if ports tree is out of date |
763 |
\<) # Could happen if ports tree is out of date |
756 |
use_package=up_old_tree |
764 |
use_package=up_old_tree |
757 |
pm_v "===>>> Available package ($latest_pv)" |
765 |
pm_v "===>>> Available package ($latest_pv)" |
758 |
@@ -3632,19 +3663,27 @@ if [ -z "$use_package" ]; then |
766 |
@@ -3632,19 +3669,27 @@ if [ -z "$use_package" ]; then |
759 |
|
767 |
|
760 |
# Return flavor for named pkg (must be executed in port directory!) |
768 |
# Return flavor for named pkg (must be executed in port directory!) |
761 |
pkg_flavor () { |
769 |
pkg_flavor () { |
Lines 785-791
Link Here
|
785 |
else |
793 |
else |
786 |
[ -z "$local_package" ] && { |
794 |
[ -z "$local_package" ] && { |
787 |
fetch_package $latest_pv || fail "Fetch for ${latest_pv}.txz failed"; } |
795 |
fetch_package $latest_pv || fail "Fetch for ${latest_pv}.txz failed"; } |
788 |
@@ -3665,7 +3704,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F |
796 |
@@ -3665,7 +3710,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F |
789 |
grep -v ^$LOCALBASE_COMPAT > $pm_mktemp_file |
797 |
grep -v ^$LOCALBASE_COMPAT > $pm_mktemp_file |
790 |
|
798 |
|
791 |
unset temp |
799 |
unset temp |
Lines 794-800
Link Here
|
794 |
sort - $pm_mktemp_file | uniq -d`; do |
802 |
sort - $pm_mktemp_file | uniq -d`; do |
795 |
temp="${temp}$file " |
803 |
temp="${temp}$file " |
796 |
done |
804 |
done |
797 |
@@ -3688,7 +3727,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F |
805 |
@@ -3688,7 +3733,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F |
798 |
|
806 |
|
799 |
if [ -n "$REPLACE_ORIGIN" -a -n "$ro_upg_port" ]; then # <se> not always true for port moved to flavored version with no version update??? |
807 |
if [ -n "$REPLACE_ORIGIN" -a -n "$ro_upg_port" ]; then # <se> not always true for port moved to flavored version with no version update??? |
800 |
# Delete any existing versions of the old port |
808 |
# Delete any existing versions of the old port |
Lines 803-809
Link Here
|
803 |
pm_sv "Running pkg delete for $ro_upg_port" |
811 |
pm_sv "Running pkg delete for $ro_upg_port" |
804 |
pm_pkg_delete_s $ro_upg_port |
812 |
pm_pkg_delete_s $ro_upg_port |
805 |
fi |
813 |
fi |
806 |
@@ -3710,7 +3749,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F |
814 |
@@ -3710,7 +3755,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F |
807 |
|
815 |
|
808 |
# If $ro_upg_port was non-automatic, keep its state |
816 |
# If $ro_upg_port was non-automatic, keep its state |
809 |
if [ "${np_orphan:-1}" -eq 1 ]; then |
817 |
if [ "${np_orphan:-1}" -eq 1 ]; then |
Lines 812-818
Link Here
|
812 |
fi |
820 |
fi |
813 |
pm_sv "Running pkg delete for $upg_port" |
821 |
pm_sv "Running pkg delete for $upg_port" |
814 |
pm_pkg_delete_s $upg_port |
822 |
pm_pkg_delete_s $upg_port |
815 |
@@ -3776,7 +3815,7 @@ else |
823 |
@@ -3776,7 +3821,7 @@ else |
816 |
[ -n "$local_package" ] && ppd=${LOCAL_PACKAGEDIR}/All |
824 |
[ -n "$local_package" ] && ppd=${LOCAL_PACKAGEDIR}/All |
817 |
|
825 |
|
818 |
echo "===>>> Installing package from: ${ppd}/${latest_pv}.txz" |
826 |
echo "===>>> Installing package from: ${ppd}/${latest_pv}.txz" |
Lines 821-827
Link Here
|
821 |
if [ -n "$PM_DELETE_PACKAGES" ]; then |
829 |
if [ -n "$PM_DELETE_PACKAGES" ]; then |
822 |
pm_v "===>>> Deleting ${latest_pv}.txz" |
830 |
pm_v "===>>> Deleting ${latest_pv}.txz" |
823 |
pm_unlink_s ${ppd}/${latest_pv}.txz |
831 |
pm_unlink_s ${ppd}/${latest_pv}.txz |
824 |
@@ -3801,14 +3840,14 @@ echo '' |
832 |
@@ -3801,14 +3846,14 @@ echo '' |
825 |
temp=`find $LOCALBASE_COMPAT -type d -empty 2>/dev/null` |
833 |
temp=`find $LOCALBASE_COMPAT -type d -empty 2>/dev/null` |
826 |
if [ -z "$temp" ] && pm_isdir "$LOCALBASE_COMPAT"; then |
834 |
if [ -z "$temp" ] && pm_isdir "$LOCALBASE_COMPAT"; then |
827 |
unset files |
835 |
unset files |
Lines 838-844
Link Here
|
838 |
$PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null |
846 |
$PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null |
839 |
fi |
847 |
fi |
840 |
unset temp file files |
848 |
unset temp file files |
841 |
@@ -3876,14 +3915,18 @@ if [ -n "$MAKE_PACKAGE" ]; then |
849 |
@@ -3876,14 +3921,18 @@ if [ -n "$MAKE_PACKAGE" ]; then |
842 |
fi |
850 |
fi |
843 |
|
851 |
|
844 |
if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then |
852 |
if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then |
Lines 860-866
Link Here
|
860 |
fi |
868 |
fi |
861 |
|
869 |
|
862 |
|
870 |
|
863 |
@@ -3903,7 +3946,7 @@ if [ "$$" -ne "$PM_PARENT_PID" -o -n "$PM_URB" ]; then |
871 |
@@ -3903,7 +3952,7 @@ if [ "$$" -ne "$PM_PARENT_PID" -o -n "$PM_URB" ]; then |
864 |
fi |
872 |
fi |
865 |
|
873 |
|
866 |
INSTALLED_LIST="${INSTALLED_LIST}\t${ilist}\n" |
874 |
INSTALLED_LIST="${INSTALLED_LIST}\t${ilist}\n" |