Lines 1-6
Link Here
|
1 |
--- portmaster.orig 2018-01-14 21:53:23 UTC |
1 |
--- portmaster.orig 2019-08-16 17:15:36 UTC |
2 |
+++ portmaster |
2 |
+++ portmaster |
3 |
@@ -7,10 +7,12 @@ trap trap_exit INT |
3 |
@@ -7,9 +7,11 @@ trap trap_exit INT |
4 |
|
4 |
|
5 |
umask 022 |
5 |
umask 022 |
6 |
|
6 |
|
Lines 10-21
Link Here
|
10 |
+progcmd="$0" # actual invocation of this program for search in ps output |
10 |
+progcmd="$0" # actual invocation of this program for search in ps output |
11 |
+progname="${0##*/}" # program name in messages |
11 |
+progname="${0##*/}" # program name in messages |
12 |
+program="$(realpath $0 || echo $0)" # full path to program for recursive calls |
12 |
+program="$(realpath $0 || echo $0)" # full path to program for recursive calls |
|
|
13 |
+ |
14 |
+PKG_CMD="/usr/local/sbin/pkg-static" |
13 |
|
15 |
|
14 |
+PKG_CMD="/usr/local/sbin/pkg-static" |
|
|
15 |
+ |
16 |
# Initialize crucial values for the parent, and export them for the children |
16 |
# Initialize crucial values for the parent, and export them for the children |
17 |
if [ -z "$PM_PARENT_PID" ]; then |
17 |
if [ -z "$PM_PARENT_PID" ]; then |
18 |
PM_PARENT_PID=$$ |
|
|
19 |
@@ -45,7 +47,7 @@ if [ -z "$PM_PARENT_PID" ]; then |
18 |
@@ -45,7 +47,7 @@ if [ -z "$PM_PARENT_PID" ]; then |
20 |
my_environment=`set` |
19 |
my_environment=`set` |
21 |
|
20 |
|
Lines 171-177
Link Here
|
171 |
|
170 |
|
172 |
case "$pkgname" in bsdpan-*) return 3 ;; esac |
171 |
case "$pkgname" in bsdpan-*) return 3 ;; esac |
173 |
|
172 |
|
174 |
@@ -728,7 +754,7 @@ while getopts 'BCDFGHKLPRabde:fghilm:nop:r:stvwx:y' CO |
173 |
@@ -728,7 +754,7 @@ while getopts 'BCDFGHKLPRabde:fghilm:nop |
175 |
o) REPLACE_ORIGIN=oopt ;; # -o should take a parameter and $OPTARG should be assigned here |
174 |
o) REPLACE_ORIGIN=oopt ;; # -o should take a parameter and $OPTARG should be assigned here |
176 |
p) fail 'The -p option has been deprecated' ;; |
175 |
p) fail 'The -p option has been deprecated' ;; |
177 |
r) PM_URB=ropt |
176 |
r) PM_URB=ropt |
Lines 180-186
Link Here
|
180 |
glob_dirs=$OPTARG |
179 |
glob_dirs=$OPTARG |
181 |
else |
180 |
else |
182 |
case "$OPTARG" in */*) fail 'The argument to -r must be a package name, or a glob pattern' ;; esac |
181 |
case "$OPTARG" in */*) fail 'The argument to -r must be a package name, or a glob pattern' ;; esac |
183 |
@@ -789,6 +815,7 @@ if [ -n "$ALWAYS_SCRUB_DISTFILES" -a -n "$DONT_SCRUB_D |
182 |
@@ -789,6 +815,7 @@ if [ -n "$ALWAYS_SCRUB_DISTFILES" -a -n |
184 |
fail "The -d and -D options are mutually exclusive" |
183 |
fail "The -d and -D options are mutually exclusive" |
185 |
fi |
184 |
fi |
186 |
|
185 |
|
Lines 364-372
Link Here
|
364 |
|
363 |
|
365 |
exit 0 |
364 |
exit 0 |
366 |
fi |
365 |
fi |
367 |
@@ -1502,7 +1513,7 @@ check_for_updates () { |
366 |
@@ -1424,7 +1435,9 @@ fi |
|
|
367 |
check_state () { |
368 |
# Global: state |
369 |
local state_set |
370 |
- |
371 |
+ if [ "$PM_MAKE_ARGS" = "-DTRYBROKEN" ];then |
372 |
+ state_set=1; |
373 |
+ else |
374 |
if egrep -ql '^(FORBIDDEN|BROKEN|IGNORE)' Makefile; then |
375 |
for state in FORBIDDEN BROKEN IGNORE; do |
376 |
state_set=`pm_make -V $state` |
377 |
@@ -1435,6 +1448,7 @@ check_state () { |
378 |
fi |
379 |
done |
368 |
fi |
380 |
fi |
|
|
381 |
+ fi |
382 |
return 0 |
383 |
} |
369 |
|
384 |
|
|
|
385 |
@@ -1502,7 +1516,7 @@ check_for_updates () { |
386 |
fi |
387 |
|
370 |
if [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ] && pm_isdir "$pd/$origin"; then |
388 |
if [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ] && pm_isdir "$pd/$origin"; then |
371 |
- if ! pm_cd $pd/$origin; then |
389 |
- if ! pm_cd $pd/$origin; then |
372 |
+ if ! pm_cd $pd/$origin; then # <se> cannot happen - see pm_isdir test above |
390 |
+ if ! pm_cd $pd/$origin; then # <se> cannot happen - see pm_isdir test above |
Lines 373-379
Link Here
|
373 |
if pm_islocked "$iport"; then |
391 |
if pm_islocked "$iport"; then |
374 |
echo " ===>>> Warning: Unable to cd to $pd/$origin" |
392 |
echo " ===>>> Warning: Unable to cd to $pd/$origin" |
375 |
echo " ===>>> Continuing due to $pdb/$iport/+IGNOREME" |
393 |
echo " ===>>> Continuing due to $pdb/$iport/+IGNOREME" |
376 |
@@ -1545,7 +1556,7 @@ check_for_updates () { |
394 |
@@ -1545,7 +1559,7 @@ check_for_updates () { |
377 |
unset port_ver |
395 |
unset port_ver |
378 |
fi |
396 |
fi |
379 |
else |
397 |
else |
Lines 382-388
Link Here
|
382 |
\<) do_update=upd_lt ;; |
400 |
\<) do_update=upd_lt ;; |
383 |
=) ;; # Can be reached if same version with different options |
401 |
=) ;; # Can be reached if same version with different options |
384 |
\>) if [ -n "$PM_VERBOSE" ]; then |
402 |
\>) if [ -n "$PM_VERBOSE" ]; then |
385 |
@@ -1628,7 +1639,7 @@ pm_pkg_create () { |
403 |
@@ -1628,7 +1642,7 @@ pm_pkg_create () { |
386 |
fi |
404 |
fi |
387 |
|
405 |
|
388 |
pm_cd $pkgdir || fail "Cannot cd into $pkgdir to create a package" |
406 |
pm_cd $pkgdir || fail "Cannot cd into $pkgdir to create a package" |
Lines 391-397
Link Here
|
391 |
if [ "$1" = "$pbu" ]; then |
409 |
if [ "$1" = "$pbu" ]; then |
392 |
if [ -n "$BACKUP" ]; then |
410 |
if [ -n "$BACKUP" ]; then |
393 |
echo " ===>>> Package saved to $1" ; echo '' |
411 |
echo " ===>>> Package saved to $1" ; echo '' |
394 |
@@ -1980,7 +1991,7 @@ if [ -n "$LIST" -o -n "$LIST_PLUS" ]; then |
412 |
@@ -1980,7 +1994,7 @@ if [ -n "$LIST" -o -n "$LIST_PLUS" ]; th |
395 |
fi |
413 |
fi |
396 |
|
414 |
|
397 |
if [ -n "$EXPUNGE" ]; then |
415 |
if [ -n "$EXPUNGE" ]; then |
Lines 400-406
Link Here
|
400 |
find_glob_dirs $EXPUNGE |
418 |
find_glob_dirs $EXPUNGE |
401 |
case $? in |
419 |
case $? in |
402 |
1) fail "No such port: $EXPUNGE" ;; |
420 |
1) fail "No such port: $EXPUNGE" ;; |
403 |
@@ -1992,7 +2003,7 @@ if [ -n "$EXPUNGE" ]; then |
421 |
@@ -1992,7 +2006,7 @@ if [ -n "$EXPUNGE" ]; then |
404 |
fi |
422 |
fi |
405 |
|
423 |
|
406 |
origin=`origin_from_pdb $EXPUNGE` |
424 |
origin=`origin_from_pdb $EXPUNGE` |
Lines 409-415
Link Here
|
409 |
if [ -n "$deplist" ]; then |
427 |
if [ -n "$deplist" ]; then |
410 |
echo "===>>> Warning: Ports with dependencies on ${EXPUNGE}:" |
428 |
echo "===>>> Warning: Ports with dependencies on ${EXPUNGE}:" |
411 |
echo "$deplist" | sed 's/^/ /' |
429 |
echo "$deplist" | sed 's/^/ /' |
412 |
@@ -2020,7 +2031,7 @@ fi |
430 |
@@ -2020,7 +2034,7 @@ fi |
413 |
if [ -n "$CLEAN_STALE" ]; then |
431 |
if [ -n "$CLEAN_STALE" ]; then |
414 |
[ -z "$no_del_list" ] && export no_del_list=':' |
432 |
[ -z "$no_del_list" ] && export no_del_list=':' |
415 |
|
433 |
|
Lines 418-424
Link Here
|
418 |
for file in $stale_ports; do |
436 |
for file in $stale_ports; do |
419 |
iport="${file%/+REQUIRED_BY}" ; iport=${iport#$pdb/} |
437 |
iport="${file%/+REQUIRED_BY}" ; iport=${iport#$pdb/} |
420 |
|
438 |
|
421 |
@@ -2040,7 +2051,7 @@ if [ -n "$CLEAN_STALE" ]; then |
439 |
@@ -2040,7 +2054,7 @@ if [ -n "$CLEAN_STALE" ]; then |
422 |
continue |
440 |
continue |
423 |
fi |
441 |
fi |
424 |
|
442 |
|
Lines 427-433
Link Here
|
427 |
|
445 |
|
428 |
get_answer_yn n "\t===>>> ${iport} is no longer depended on, delete" |
446 |
get_answer_yn n "\t===>>> ${iport} is no longer depended on, delete" |
429 |
case "$?" in |
447 |
case "$?" in |
430 |
@@ -2073,7 +2084,7 @@ check_restart_and_udf () { |
448 |
@@ -2073,7 +2087,7 @@ check_restart_and_udf () { |
431 |
# to go out to the disk if we don't have to. |
449 |
# to go out to the disk if we don't have to. |
432 |
[ -z "$RESTART" ] && return 1 |
450 |
[ -z "$RESTART" ] && return 1 |
433 |
|
451 |
|
Lines 436-442
Link Here
|
436 |
return 1 |
454 |
return 1 |
437 |
else |
455 |
else |
438 |
already_done $1 |
456 |
already_done $1 |
439 |
@@ -2175,26 +2186,32 @@ update_pm_nu () { |
457 |
@@ -2175,26 +2189,32 @@ update_pm_nu () { |
440 |
} |
458 |
} |
441 |
|
459 |
|
442 |
update_build_l () { |
460 |
update_build_l () { |
Lines 474-480
Link Here
|
474 |
\<) build_l="${build_l}\tUpgrade $iport to $new_port\n" ;; |
492 |
\<) build_l="${build_l}\tUpgrade $iport to $new_port\n" ;; |
475 |
=) build_l="${build_l}\tRe-install $iport\n" ;; |
493 |
=) build_l="${build_l}\tRe-install $iport\n" ;; |
476 |
\>) build_l="${build_l}\tDowngrade $iport to $new_port\n" ;; |
494 |
\>) build_l="${build_l}\tDowngrade $iport to $new_port\n" ;; |
477 |
@@ -2203,8 +2220,9 @@ update_build_l () { |
495 |
@@ -2203,8 +2223,9 @@ update_build_l () { |
478 |
} |
496 |
} |
479 |
|
497 |
|
480 |
update_port () { |
498 |
update_port () { |
Lines 485-491
Link Here
|
485 |
if [ -n "$2" ]; then |
503 |
if [ -n "$2" ]; then |
486 |
echo "===>>> Launching child to update $1 to $2" |
504 |
echo "===>>> Launching child to update $1 to $2" |
487 |
else |
505 |
else |
488 |
@@ -2300,7 +2318,7 @@ make_dep_list () { |
506 |
@@ -2300,7 +2321,7 @@ make_dep_list () { |
489 |
fail "make_dep_list: Unsupported option '$dep_type'" |
507 |
fail "make_dep_list: Unsupported option '$dep_type'" |
490 |
esac |
508 |
esac |
491 |
done |
509 |
done |
Lines 494-500
Link Here
|
494 |
} |
512 |
} |
495 |
|
513 |
|
496 |
gen_dep_list () { |
514 |
gen_dep_list () { |
497 |
@@ -2368,15 +2386,17 @@ dependency_check () { |
515 |
@@ -2368,15 +2389,17 @@ dependency_check () { |
498 |
rundeps=`gen_dep_list run-depends-list` |
516 |
rundeps=`gen_dep_list run-depends-list` |
499 |
|
517 |
|
500 |
for dep in $d_port_list; do |
518 |
for dep in $d_port_list; do |
Lines 515-521
Link Here
|
515 |
rundep_list="$rundep_list $varname" |
533 |
rundep_list="$rundep_list $varname" |
516 |
eval $varname=\"$portdir \$$varname\" |
534 |
eval $varname=\"$portdir \$$varname\" |
517 |
eval ${varname}_p=$dep |
535 |
eval ${varname}_p=$dep |
518 |
@@ -2409,7 +2429,10 @@ dependency_check () { |
536 |
@@ -2409,7 +2432,10 @@ dependency_check () { |
519 |
|
537 |
|
520 |
# Do not export, for THIS parent process only |
538 |
# Do not export, for THIS parent process only |
521 |
[ -n "$PM_FIRST_PASS" ] && doing_dep_check=doing_dep_check |
539 |
[ -n "$PM_FIRST_PASS" ] && doing_dep_check=doing_dep_check |
Lines 527-533
Link Here
|
527 |
origin="${d_port#$pd/}" |
545 |
origin="${d_port#$pd/}" |
528 |
if [ -n "$SHOW_WORK" ]; then |
546 |
if [ -n "$SHOW_WORK" ]; then |
529 |
iport=`iport_from_origin $origin` |
547 |
iport=`iport_from_origin $origin` |
530 |
@@ -2429,23 +2452,17 @@ dependency_check () { |
548 |
@@ -2429,23 +2455,17 @@ dependency_check () { |
531 |
[ -z "$PM_URB_UP" ] && |
549 |
[ -z "$PM_URB_UP" ] && |
532 |
case "$CUR_DEPS" in *:${origin}:*) continue ;; esac |
550 |
case "$CUR_DEPS" in *:${origin}:*) continue ;; esac |
533 |
|
551 |
|
Lines 556-562
Link Here
|
556 |
if [ -n "$confl_p" ]; then |
574 |
if [ -n "$confl_p" ]; then |
557 |
confl_p=${confl_p%% *} |
575 |
confl_p=${confl_p%% *} |
558 |
d_port="$pd/`origin_from_pdb $confl_p`" |
576 |
d_port="$pd/`origin_from_pdb $confl_p`" |
559 |
@@ -2498,7 +2515,11 @@ dependency_check () { |
577 |
@@ -2498,7 +2518,11 @@ dependency_check () { |
560 |
check_for_updates $iport $origin || fail 'Update failed' |
578 |
check_for_updates $iport $origin || fail 'Update failed' |
561 |
else |
579 |
else |
562 |
check_interactive $origin || continue |
580 |
check_interactive $origin || continue |
Lines 569-575
Link Here
|
569 |
fi |
587 |
fi |
570 |
done |
588 |
done |
571 |
[ -n "$PM_FIRST_PASS" ] && unset doing_dep_check |
589 |
[ -n "$PM_FIRST_PASS" ] && unset doing_dep_check |
572 |
@@ -2587,7 +2608,7 @@ post_first_pass () { |
590 |
@@ -2587,7 +2611,7 @@ post_first_pass () { |
573 |
done |
591 |
done |
574 |
|
592 |
|
575 |
for dep in $build_only_dl_g; do |
593 |
for dep in $build_only_dl_g; do |
Lines 578-584
Link Here
|
578 |
[ -n "$PM_DEL_BUILD_ONLY" ] && |
596 |
[ -n "$PM_DEL_BUILD_ONLY" ] && |
579 |
iport_from_origin ${dep#$pd/} >/dev/null && continue |
597 |
iport_from_origin ${dep#$pd/} >/dev/null && continue |
580 |
temp_bodlg="$temp_bodlg $dep" |
598 |
temp_bodlg="$temp_bodlg $dep" |
581 |
@@ -2629,7 +2650,7 @@ urb_update () { |
599 |
@@ -2629,7 +2653,7 @@ urb_update () { |
582 |
case " $PM_URB_ORIGINS" in *" $req_by_o "*) continue ;; esac |
600 |
case " $PM_URB_ORIGINS" in *" $req_by_o "*) continue ;; esac |
583 |
PM_URB_LIST="${PM_URB_LIST} ${req_by}" |
601 |
PM_URB_LIST="${PM_URB_LIST} ${req_by}" |
584 |
done <<-EOF |
602 |
done <<-EOF |
Lines 587-593
Link Here
|
587 |
EOF |
605 |
EOF |
588 |
done |
606 |
done |
589 |
|
607 |
|
590 |
@@ -2642,7 +2663,7 @@ urb_update () { |
608 |
@@ -2642,7 +2666,7 @@ urb_update () { |
591 |
|
609 |
|
592 |
for req_by in $PM_URB_LIST; do |
610 |
for req_by in $PM_URB_LIST; do |
593 |
# Probably not needed, but JIC |
611 |
# Probably not needed, but JIC |
Lines 596-602
Link Here
|
596 |
|
614 |
|
597 |
pm_v "===>>> $req_by depends on $PM_URB_IPORTS" |
615 |
pm_v "===>>> $req_by depends on $PM_URB_IPORTS" |
598 |
|
616 |
|
599 |
@@ -2683,7 +2704,7 @@ multiport () { |
617 |
@@ -2683,7 +2707,7 @@ multiport () { |
600 |
else |
618 |
else |
601 |
fail "$pd/${port} does not exist" |
619 |
fail "$pd/${port} does not exist" |
602 |
fi ;; |
620 |
fi ;; |
Lines 605-611
Link Here
|
605 |
worklist_temp="$worklist_temp $port" |
623 |
worklist_temp="$worklist_temp $port" |
606 |
else |
624 |
else |
607 |
find_glob_dirs $port |
625 |
find_glob_dirs $port |
608 |
@@ -2773,8 +2794,8 @@ multiport () { |
626 |
@@ -2773,8 +2797,8 @@ multiport () { |
609 |
|
627 |
|
610 |
num=$(( $num + 1 )) |
628 |
num=$(( $num + 1 )) |
611 |
init_term_printf "$port ${num}/${numports}" |
629 |
init_term_printf "$port ${num}/${numports}" |
Lines 616-622
Link Here
|
616 |
[ -n "$update_failed" ] && fail "Update for $port failed" |
634 |
[ -n "$update_failed" ] && fail "Update for $port failed" |
617 |
|
635 |
|
618 |
case "$PM_NEEDS_UPDATE" in |
636 |
case "$PM_NEEDS_UPDATE" in |
619 |
@@ -2803,7 +2824,7 @@ multiport () { |
637 |
@@ -2803,7 +2827,7 @@ multiport () { |
620 |
*/*) origin=$port ;; |
638 |
*/*) origin=$port ;; |
621 |
*) # If an installed version does not exist at this |
639 |
*) # If an installed version does not exist at this |
622 |
# point it probably got updated as a dependency |
640 |
# point it probably got updated as a dependency |
Lines 625-631
Link Here
|
625 |
numports=$(( $numports - 1 )) |
643 |
numports=$(( $numports - 1 )) |
626 |
continue |
644 |
continue |
627 |
fi |
645 |
fi |
628 |
@@ -2823,7 +2844,7 @@ multiport () { |
646 |
@@ -2823,7 +2847,7 @@ multiport () { |
629 |
num=$(( $num + 1 )) |
647 |
num=$(( $num + 1 )) |
630 |
init_term_printf "$port ${num}/${numports}" |
648 |
init_term_printf "$port ${num}/${numports}" |
631 |
("$program" $ARGS $port) || update_failed=update_failed |
649 |
("$program" $ARGS $port) || update_failed=update_failed |
Lines 634-640
Link Here
|
634 |
[ -n "$update_failed" ] && fail "Update for $port failed" |
652 |
[ -n "$update_failed" ] && fail "Update for $port failed" |
635 |
done |
653 |
done |
636 |
|
654 |
|
637 |
@@ -3029,8 +3050,12 @@ no_valid_port () { |
655 |
@@ -3029,8 +3053,12 @@ no_valid_port () { |
638 |
echo "===>>> Try $progname --help" ; echo '' ; safe_exit 1 |
656 |
echo "===>>> Try $progname --help" ; echo '' ; safe_exit 1 |
639 |
} |
657 |
} |
640 |
|
658 |
|
Lines 647-653
Link Here
|
647 |
export_flavor $(flavor_part $portdir) |
665 |
export_flavor $(flavor_part $portdir) |
648 |
[ -n "$portdir" ] && { argv=$portdir ; unset portdir; } |
666 |
[ -n "$portdir" ] && { argv=$portdir ; unset portdir; } |
649 |
argv=${argv:-$1} ; argv=${argv%/} ; argv=`globstrip $argv` |
667 |
argv=${argv:-$1} ; argv=${argv%/} ; argv=`globstrip $argv` |
650 |
@@ -3048,7 +3073,7 @@ if [ -z "$REPLACE_ORIGIN" ]; then |
668 |
@@ -3048,7 +3076,7 @@ if [ -z "$REPLACE_ORIGIN" ]; then |
651 |
*) echo '' ; no_valid_port ;; |
669 |
*) echo '' ; no_valid_port ;; |
652 |
esac |
670 |
esac |
653 |
done ;; |
671 |
done ;; |
Lines 656-662
Link Here
|
656 |
esac |
674 |
esac |
657 |
|
675 |
|
658 |
if [ -z "$portdir" -a -z "$upg_port" ]; then |
676 |
if [ -z "$portdir" -a -z "$upg_port" ]; then |
659 |
@@ -3061,9 +3086,11 @@ if [ -z "$REPLACE_ORIGIN" ]; then |
677 |
@@ -3061,9 +3089,11 @@ if [ -z "$REPLACE_ORIGIN" ]; then |
660 |
unset glob_dirs |
678 |
unset glob_dirs |
661 |
fi |
679 |
fi |
662 |
unset argv |
680 |
unset argv |
Lines 669-675
Link Here
|
669 |
if [ -z "$PM_INDEX_ONLY" ]; then |
687 |
if [ -z "$PM_INDEX_ONLY" ]; then |
670 |
pm_isdir_pd "$portdir" ] || missing=missing |
688 |
pm_isdir_pd "$portdir" ] || missing=missing |
671 |
else |
689 |
else |
672 |
@@ -3076,12 +3103,12 @@ else |
690 |
@@ -3076,12 +3106,12 @@ else |
673 |
echo '' ; no_valid_port |
691 |
echo '' ; no_valid_port |
674 |
fi |
692 |
fi |
675 |
|
693 |
|
Lines 684-690
Link Here
|
684 |
ro_upg_port=$arg2 |
702 |
ro_upg_port=$arg2 |
685 |
else |
703 |
else |
686 |
find_glob_dirs $arg2 && ro_upg_port=${glob_dirs#$pdb/} |
704 |
find_glob_dirs $arg2 && ro_upg_port=${glob_dirs#$pdb/} |
687 |
@@ -3097,7 +3124,7 @@ else |
705 |
@@ -3097,7 +3127,7 @@ else |
688 |
unset arg2 |
706 |
unset arg2 |
689 |
|
707 |
|
690 |
if [ -z "$ro_upg_port" ]; then |
708 |
if [ -z "$ro_upg_port" ]; then |
Lines 693-699
Link Here
|
693 |
if [ "$?" -eq 1 ]; then |
711 |
if [ "$?" -eq 1 ]; then |
694 |
echo '' |
712 |
echo '' |
695 |
echo "===>>> The second argument to -o can be a package name," |
713 |
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" |
714 |
@@ -3133,6 +3163,7 @@ if [ -z "$PM_INDEX_ONLY" ] && ! pm_isdir |
697 |
pm_isdir_pd "$moved_npd" || no_valid_port |
715 |
pm_isdir_pd "$moved_npd" || no_valid_port |
698 |
|
716 |
|
699 |
[ "$$" -eq "$PM_PARENT_PID" ] && parent_exit |
717 |
[ "$$" -eq "$PM_PARENT_PID" ] && parent_exit |
Lines 701-707
Link Here
|
701 |
exec "$program" $ARGS -o $moved_npd $upg_port |
719 |
exec "$program" $ARGS -o $moved_npd $upg_port |
702 |
# NOT REACHED |
720 |
# NOT REACHED |
703 |
fi |
721 |
fi |
704 |
@@ -3142,8 +3170,8 @@ iport_from_pkgname () { |
722 |
@@ -3142,8 +3173,8 @@ iport_from_pkgname () { |
705 |
|
723 |
|
706 |
dir=$(dir_part $1) |
724 |
dir=$(dir_part $1) |
707 |
flavor=$(flavor_part $1) |
725 |
flavor=$(flavor_part $1) |
Lines 712-718
Link Here
|
712 |
} |
730 |
} |
713 |
|
731 |
|
714 |
if [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ]; then |
732 |
if [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ]; then |
715 |
@@ -3229,11 +3257,14 @@ if [ -n "$PM_FIRST_PASS" -a -z "$FETCH_ONLY" ]; then |
733 |
@@ -3229,11 +3260,14 @@ if [ -n "$PM_FIRST_PASS" -a -z "$FETCH_O |
716 |
fi |
734 |
fi |
717 |
fi |
735 |
fi |
718 |
|
736 |
|
Lines 728-734
Link Here
|
728 |
# Do these things first time through |
746 |
# 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 |
747 |
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 |
748 |
# Do not start this in the background until we are sure we are going to proceed |
731 |
@@ -3389,7 +3420,7 @@ fetch_package () { |
749 |
@@ -3389,7 +3423,7 @@ fetch_package () { |
732 |
export ppd |
750 |
export ppd |
733 |
fi |
751 |
fi |
734 |
|
752 |
|
Lines 737-743
Link Here
|
737 |
|
755 |
|
738 |
if [ -z "$FETCH_ARGS" ]; then |
756 |
if [ -z "$FETCH_ARGS" ]; then |
739 |
FETCH_ARGS=`pm_make -f/usr/share/mk/bsd.port.mk -V FETCH_ARGS 2>/dev/null` |
757 |
FETCH_ARGS=`pm_make -f/usr/share/mk/bsd.port.mk -V FETCH_ARGS 2>/dev/null` |
740 |
@@ -3533,7 +3564,7 @@ notnewer () { |
758 |
@@ -3533,7 +3567,7 @@ notnewer () { |
741 |
pm_v "===>>> Available package ($latest_pv) matches the current version" |
759 |
pm_v "===>>> Available package ($latest_pv) matches the current version" |
742 |
elif [ -n "$latest_pv" -a -n "$PM_PACKAGES_NEWER" ]; then |
760 |
elif [ -n "$latest_pv" -a -n "$PM_PACKAGES_NEWER" ]; then |
743 |
if [ -n "$upg_port" ]; then |
761 |
if [ -n "$upg_port" ]; then |
Lines 746-752
Link Here
|
746 |
\<) use_package=up_newer |
764 |
\<) use_package=up_newer |
747 |
pm_v "===>>> Available package ($latest_pv)" |
765 |
pm_v "===>>> Available package ($latest_pv)" |
748 |
pm_v " is newer than installed ($upg_port)" ;; |
766 |
pm_v " is newer than installed ($upg_port)" ;; |
749 |
@@ -3549,7 +3580,7 @@ notnewer () { |
767 |
@@ -3549,7 +3583,7 @@ notnewer () { |
750 |
pm_v "===>>> There is a package available ($latest_pv)" |
768 |
pm_v "===>>> There is a package available ($latest_pv)" |
751 |
fi |
769 |
fi |
752 |
elif [ -n "$latest_pv" ]; then |
770 |
elif [ -n "$latest_pv" ]; then |
Lines 755-761
Link Here
|
755 |
\<) # Could happen if ports tree is out of date |
773 |
\<) # Could happen if ports tree is out of date |
756 |
use_package=up_old_tree |
774 |
use_package=up_old_tree |
757 |
pm_v "===>>> Available package ($latest_pv)" |
775 |
pm_v "===>>> Available package ($latest_pv)" |
758 |
@@ -3632,19 +3663,27 @@ if [ -z "$use_package" ]; then |
776 |
@@ -3632,19 +3666,27 @@ if [ -z "$use_package" ]; then |
759 |
|
777 |
|
760 |
# Return flavor for named pkg (must be executed in port directory!) |
778 |
# Return flavor for named pkg (must be executed in port directory!) |
761 |
pkg_flavor () { |
779 |
pkg_flavor () { |
Lines 785-791
Link Here
|
785 |
else |
803 |
else |
786 |
[ -z "$local_package" ] && { |
804 |
[ -z "$local_package" ] && { |
787 |
fetch_package $latest_pv || fail "Fetch for ${latest_pv}.txz failed"; } |
805 |
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 |
806 |
@@ -3665,7 +3707,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" |
789 |
grep -v ^$LOCALBASE_COMPAT > $pm_mktemp_file |
807 |
grep -v ^$LOCALBASE_COMPAT > $pm_mktemp_file |
790 |
|
808 |
|
791 |
unset temp |
809 |
unset temp |
Lines 794-800
Link Here
|
794 |
sort - $pm_mktemp_file | uniq -d`; do |
812 |
sort - $pm_mktemp_file | uniq -d`; do |
795 |
temp="${temp}$file " |
813 |
temp="${temp}$file " |
796 |
done |
814 |
done |
797 |
@@ -3688,7 +3727,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F |
815 |
@@ -3688,7 +3730,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" |
798 |
|
816 |
|
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??? |
817 |
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 |
818 |
# Delete any existing versions of the old port |
Lines 803-809
Link Here
|
803 |
pm_sv "Running pkg delete for $ro_upg_port" |
821 |
pm_sv "Running pkg delete for $ro_upg_port" |
804 |
pm_pkg_delete_s $ro_upg_port |
822 |
pm_pkg_delete_s $ro_upg_port |
805 |
fi |
823 |
fi |
806 |
@@ -3710,7 +3749,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F |
824 |
@@ -3710,7 +3752,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" |
807 |
|
825 |
|
808 |
# If $ro_upg_port was non-automatic, keep its state |
826 |
# If $ro_upg_port was non-automatic, keep its state |
809 |
if [ "${np_orphan:-1}" -eq 1 ]; then |
827 |
if [ "${np_orphan:-1}" -eq 1 ]; then |
Lines 812-818
Link Here
|
812 |
fi |
830 |
fi |
813 |
pm_sv "Running pkg delete for $upg_port" |
831 |
pm_sv "Running pkg delete for $upg_port" |
814 |
pm_pkg_delete_s $upg_port |
832 |
pm_pkg_delete_s $upg_port |
815 |
@@ -3776,7 +3815,7 @@ else |
833 |
@@ -3776,7 +3818,7 @@ else |
816 |
[ -n "$local_package" ] && ppd=${LOCAL_PACKAGEDIR}/All |
834 |
[ -n "$local_package" ] && ppd=${LOCAL_PACKAGEDIR}/All |
817 |
|
835 |
|
818 |
echo "===>>> Installing package from: ${ppd}/${latest_pv}.txz" |
836 |
echo "===>>> Installing package from: ${ppd}/${latest_pv}.txz" |
Lines 821-827
Link Here
|
821 |
if [ -n "$PM_DELETE_PACKAGES" ]; then |
839 |
if [ -n "$PM_DELETE_PACKAGES" ]; then |
822 |
pm_v "===>>> Deleting ${latest_pv}.txz" |
840 |
pm_v "===>>> Deleting ${latest_pv}.txz" |
823 |
pm_unlink_s ${ppd}/${latest_pv}.txz |
841 |
pm_unlink_s ${ppd}/${latest_pv}.txz |
824 |
@@ -3801,14 +3840,14 @@ echo '' |
842 |
@@ -3801,14 +3843,14 @@ echo '' |
825 |
temp=`find $LOCALBASE_COMPAT -type d -empty 2>/dev/null` |
843 |
temp=`find $LOCALBASE_COMPAT -type d -empty 2>/dev/null` |
826 |
if [ -z "$temp" ] && pm_isdir "$LOCALBASE_COMPAT"; then |
844 |
if [ -z "$temp" ] && pm_isdir "$LOCALBASE_COMPAT"; then |
827 |
unset files |
845 |
unset files |
Lines 838-844
Link Here
|
838 |
$PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null |
856 |
$PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null |
839 |
fi |
857 |
fi |
840 |
unset temp file files |
858 |
unset temp file files |
841 |
@@ -3876,14 +3915,18 @@ if [ -n "$MAKE_PACKAGE" ]; then |
859 |
@@ -3876,14 +3918,18 @@ if [ -n "$MAKE_PACKAGE" ]; then |
842 |
fi |
860 |
fi |
843 |
|
861 |
|
844 |
if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then |
862 |
if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then |
Lines 860-866
Link Here
|
860 |
fi |
878 |
fi |
861 |
|
879 |
|
862 |
|
880 |
|
863 |
@@ -3903,7 +3946,7 @@ if [ "$$" -ne "$PM_PARENT_PID" -o -n "$PM_URB" ]; then |
881 |
@@ -3903,7 +3949,7 @@ if [ "$$" -ne "$PM_PARENT_PID" -o -n "$P |
864 |
fi |
882 |
fi |
865 |
|
883 |
|
866 |
INSTALLED_LIST="${INSTALLED_LIST}\t${ilist}\n" |
884 |
INSTALLED_LIST="${INSTALLED_LIST}\t${ilist}\n" |