svn commit: r524227 - in head/ports-mgmt/portmaster: . files
Stefan Esser
se at FreeBSD.org
Sun Jan 26 18:19:01 UTC 2020
Author: se
Date: Sun Jan 26 18:19:00 2020
New Revision: 524227
URL: https://svnweb.freebsd.org/changeset/ports/524227
Log:
Add option --try-broken
This option makes portmaster try to build ports that are marked as
BROKEN or IGNORE.
Passing this option implies the "-m -DTRYBROKEN" option.
The change is inspired by (but not based on) the patch suggested by
Walter Schwarzenfeld.
PR: 235793
Reported by: Yasuhiro KIMURA
Approved by: antoine (implicit)
Modified:
head/ports-mgmt/portmaster/Makefile
head/ports-mgmt/portmaster/files/patch-files_portmaster.8
head/ports-mgmt/portmaster/files/patch-portmaster
Modified: head/ports-mgmt/portmaster/Makefile
==============================================================================
--- head/ports-mgmt/portmaster/Makefile Sun Jan 26 17:53:56 2020 (r524226)
+++ head/ports-mgmt/portmaster/Makefile Sun Jan 26 18:19:00 2020 (r524227)
@@ -2,7 +2,7 @@
PORTNAME= portmaster
PORTVERSION= 3.19
-PORTREVISION= 20
+PORTREVISION= 21
CATEGORIES= ports-mgmt
MAINTAINER= se at FreeBSD.org
Modified: head/ports-mgmt/portmaster/files/patch-files_portmaster.8
==============================================================================
--- head/ports-mgmt/portmaster/files/patch-files_portmaster.8 Sun Jan 26 17:53:56 2020 (r524226)
+++ head/ports-mgmt/portmaster/files/patch-files_portmaster.8 Sun Jan 26 18:19:00 2020 (r524227)
@@ -8,7 +8,15 @@
.Op Fl -local-packagedir=<path>
.Op Fl -packages-local
.Op Fl -delete-packages
-@@ -380,7 +381,7 @@ do not update the xterm title bar
+@@ -47,6 +48,7 @@ Common Flags:
+ .Op Sy --index|--index-first|--index-only
+ .Op Fl m Ar arguments for make
+ .Op Fl x Ar glob pattern to exclude from building
++.Op Fl -try-broken
+ .Nm
+ .Op Common Flags
+ .Ar full name of port directory in /var/db/pkg
+@@ -380,7 +382,7 @@ do not update the xterm title bar
.It Fl -no-index-fetch
skip fetching the INDEX file
.It Fl -index
@@ -17,7 +25,7 @@
.It Fl -index-first
use the INDEX for status, but double-check with the port
.It Fl -index-only
-@@ -416,8 +417,14 @@ use package if newer than installed even if the packag
+@@ -416,8 +418,14 @@ use package if newer than installed even if the packag
the latest according to the ports tree
.It Fl -always-fetch
fetch package even if it already exists locally
@@ -33,3 +41,12 @@
which can take a long time for large packages.
Supported formats are: tar, tgz, tbz, and txz (from fastest to slowest).
.It Fl -local-packagedir=<path>
+@@ -453,6 +461,8 @@ check all ports, update as necessary
+ .It Fl -show-work
+ show what dependent ports are, and are not installed (implies
+ .Fl t ) .
++.It Fl -try-broken
++do not skip ports marked as BROKEN or IGNORED and invoke the make command with -DTRYBROKEN.
+ .It Fl o Ar <new port dir in /usr/ports> <installed port>
+ replace the installed port with a port from a different origin
+ .It [-R] Fl r Ar name/glob of port directory in /var/db/pkg
Modified: head/ports-mgmt/portmaster/files/patch-portmaster
==============================================================================
--- head/ports-mgmt/portmaster/files/patch-portmaster Sun Jan 26 17:53:56 2020 (r524226)
+++ head/ports-mgmt/portmaster/files/patch-portmaster Sun Jan 26 18:19:00 2020 (r524227)
@@ -121,7 +121,25 @@
pm_sv () { [ -n "$PM_SU_VERBOSE" ] && echo -e "===>>> SU $*"; }
# Do this here so we can have a reasonably good guess.
-@@ -549,7 +550,7 @@ find_glob_dirs () {
+@@ -433,6 +434,8 @@ usage () {
+ echo ''
+ echo "$progname --list-origins"
+ echo ''
++ echo "$progname --try-broken"
++ echo ''
+ echo "$progname [--force-config|-G] [-P|-PP] [-aftv] -F"
+ echo ''
+ echo "$progname [-n|y] [-b] [-D|d] -e <name/glob of a single port in $pdb>"
+@@ -513,6 +516,8 @@ usage () {
+ echo '-n answer no to all user prompts for the features below'
+ echo '-y answer yes to all user prompts for the features below'
+ echo ''
++ echo '--try-broken do not skip ports marked as broken'
++ echo ''
+ echo '[-n|y] [-b] [-D|d] -e expunge one port via pkg delete, and remove its distfiles'
+ echo '[-n|y] [-b] [-D|d] -s clean out stale ports that used to be depended on'
+ echo ''
+@@ -549,7 +554,7 @@ find_glob_dirs () {
pattern=`globstrip $1`
@@ -130,7 +148,7 @@
case "$glob_dirs" in
# Match a newline in multiple responses from find
*'
-@@ -562,12 +563,37 @@ find_glob_dirs () {
+@@ -562,12 +567,37 @@ find_glob_dirs () {
return 1
}
@@ -171,7 +189,22 @@
case "$pkgname" in bsdpan-*) return 3 ;; esac
-@@ -728,7 +754,7 @@ while getopts 'BCDFGHKLPRabde:fghilm:nop:r:stvwx:y' CO
+@@ -684,6 +714,7 @@ for var in "$@" ; do
+ --list-origins) LIST_ORIGINS=list_origins ;;
+ --show-work) SHOW_WORK=show ; PM_THOROUGH=thorough ;;
+ --force-config) export PM_FORCE_CONFIG=pm_force_config ;;
++ --try-broken) TRY_BROKEN=try_broken; PM_MAKE_ARGS="$PM_MAKE_ARGS -DTRYBROKEN" ;;
+ --*) echo "Illegal option $var" ; echo ''
+ echo "===>>> Try $progname --help"; exit 1 ;;
+ *) newopts="$newopts $var" ;;
+@@ -722,13 +753,13 @@ while getopts 'BCDFGHKLPRabde:fghilm:nop:r:stvwx:y' CO
+ h) usage 0 ;;
+ i) INTERACTIVE_UPDATE=iopt; ARGS="-i $ARGS" ;;
+ l) LIST=lopt ;;
+- m) export PM_MAKE_ARGS=$OPTARG # For 'make checksum'
++ m) export PM_MAKE_ARGS="$PM_MAKE_ARGS $OPTARG" # For 'make checksum'
+ ARGS="-m $PM_MAKE_ARGS $ARGS" ;;
+ n) NO_ACTION=nopt; ARGS="-n $ARGS" ;;
o) REPLACE_ORIGIN=oopt ;; # -o should take a parameter and $OPTARG should be assigned here
p) fail 'The -p option has been deprecated' ;;
r) PM_URB=ropt
@@ -180,7 +213,7 @@
glob_dirs=$OPTARG
else
case "$OPTARG" in */*) fail 'The argument to -r must be a package name, or a glob pattern' ;; esac
-@@ -789,6 +815,7 @@ if [ -n "$ALWAYS_SCRUB_DISTFILES" -a -n "$DONT_SCRUB_D
+@@ -789,6 +820,7 @@ if [ -n "$ALWAYS_SCRUB_DISTFILES" -a -n "$DONT_SCRUB_D
fail "The -d and -D options are mutually exclusive"
fi
@@ -188,7 +221,7 @@
[ -n "$PM_NO_MAKE_CONFIG" -a -n "$PM_FORCE_CONFIG" ] && unset PM_NO_MAKE_CONFIG
if [ -n "$LIST" -o -n "$LIST_PLUS" ]; then
-@@ -875,7 +902,7 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then
+@@ -875,7 +907,7 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then
fi
unset INDEXFILE INDEXDIR
@@ -197,7 +230,7 @@
export PM_INDEX_PORTS
if [ -z "$pd" -o "$pd" != /usr/ports ]; then
-@@ -927,6 +954,9 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then
+@@ -927,6 +959,9 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then
fi
fi # [ "$$" -eq "$PM_PARENT_PID" ]
@@ -207,7 +240,7 @@
#=============== Begin functions relevant to --features and main ===============
# find installed port for given origin (with optional @flavor) in the pkg DB
-@@ -938,11 +968,15 @@ iport_from_origin () {
+@@ -938,11 +973,15 @@ iport_from_origin () {
origin=$(dir_part "$1")
flavor=$(flavor_part "$1")
@@ -225,7 +258,7 @@
if [ "$pkgflavor" = "$flavor" ]; then
echo $pkgname
return 0
-@@ -1002,25 +1036,6 @@ get_answer_yn () {
+@@ -1002,25 +1041,6 @@ get_answer_yn () {
fi
}
@@ -251,7 +284,7 @@
# Find the new origin for moved ports
# Set global variable moved_npd on success
# Return values:
-@@ -1056,7 +1071,8 @@ find_moved_port () {
+@@ -1056,7 +1076,8 @@ find_moved_port () {
fi ;;
${sf}\|*) moved_npd=${moved#*\|} # New port directory
moved_npd=${moved_npd%%\|*}
@@ -261,7 +294,7 @@
echo ''
echo " ===>>> The $sf port moved to $moved_npd"
echo " ===>>> Reason: ${moved##*|}"
-@@ -1082,7 +1098,7 @@ find_moved_port () {
+@@ -1082,7 +1103,7 @@ find_moved_port () {
}
all_pkgs_by_origin () {
@@ -270,7 +303,7 @@
echo "$namesorigins"
return
}
-@@ -1146,11 +1162,10 @@ read_distinfos_all () {
+@@ -1146,11 +1167,10 @@ read_distinfos_all () {
echo ''
for origin in ${pd}/*/*; do
@@ -283,7 +316,7 @@
if [ -s "${origin}/distinfo" ]; then
distinfo="${origin}/distinfo"
-@@ -1181,17 +1196,17 @@ ports_by_category () {
+@@ -1181,17 +1201,17 @@ ports_by_category () {
local pkg
pm_v "===>>> Sorting ports by category"
@@ -306,7 +339,7 @@
}
delete_empty_dist_subdirs () {
-@@ -1279,7 +1294,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then
+@@ -1279,7 +1299,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then
for package in `find $PACKAGES -type f | sort`; do
pkg_dir=${package##*/} ; pkg_dir=${pkg_dir%\.*} ; echo ''
@@ -315,7 +348,7 @@
origin=`tar -O -zxvf $package '+CONTENTS' 2>/dev/null | grep '@comment ORIGIN:'` ||
origin=`tar -O -zxvf $package '+MANIFEST' 2>/dev/null | grep '^origin:'` ||
fail "Empty origin in $package"
-@@ -1302,7 +1317,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then
+@@ -1302,7 +1322,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then
if [ -n "$port_ver" ]; then
if [ "$port_ver" = "$pkg_dir" ]; then
echo "===>>> ${package##*/} is up to date"
@@ -324,7 +357,7 @@
echo " ===>>> $pkg_dir is not installed"
echo " ===>>> Path: ${package}"
get_answer_yn y "\n\t===>>> Delete stale package: ${package##*/}"
-@@ -1320,7 +1335,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then
+@@ -1320,7 +1340,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then
unset port_ver
@@ -333,7 +366,7 @@
echo " ===>>> ${package##*/} matches the installed version"
else
echo " ===>>> ${package##*/} is not installed"
-@@ -1362,7 +1377,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then
+@@ -1362,7 +1382,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then
fi # [ -n "$CLEAN_PACKAGES" ]
if [ -n "$CHECK_DEPENDS" ]; then
@@ -342,7 +375,7 @@
exit 0
fi
-@@ -1377,14 +1392,14 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then
+@@ -1377,14 +1397,14 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then
if ! pm_isdir_pd "$origin"; then
find_moved_port $origin $pkg nonfatal >/dev/null
[ -n "$moved_npd" ] || continue
@@ -359,7 +392,7 @@
done <<-EOF
$(all_pkgs_by_origin)
EOF
-@@ -1413,7 +1428,7 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then
+@@ -1413,7 +1433,7 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then
fi
if [ -n "$LIST_ORIGINS" ]; then
@@ -368,7 +401,21 @@
exit 0
fi
-@@ -1502,7 +1517,7 @@ check_for_updates () {
+@@ -1423,10 +1443,11 @@ fi
+
+ check_state () {
+ # Global: state
+- local state_set
++ local state_set makevars
+
++ [ -z "$TRY_BROKEN" ] && makevars="FORBIDDEN BROKEN IGNORE" || makevars="FORBIDDEN"
+ if egrep -ql '^(FORBIDDEN|BROKEN|IGNORE)' Makefile; then
+- for state in FORBIDDEN BROKEN IGNORE; do
++ for state in $makevars; do
+ state_set=`pm_make -V $state`
+ if [ -n "$state_set" ]; then
+ echo " ===>>> This port is marked $state"
+@@ -1502,7 +1523,7 @@ check_for_updates () {
fi
if [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ] && pm_isdir "$pd/$origin"; then
@@ -377,7 +424,7 @@
if pm_islocked "$iport"; then
echo " ===>>> Warning: Unable to cd to $pd/$origin"
echo " ===>>> Continuing due to $pdb/$iport/+IGNOREME"
-@@ -1545,7 +1560,7 @@ check_for_updates () {
+@@ -1545,7 +1566,7 @@ check_for_updates () {
unset port_ver
fi
else
@@ -386,7 +433,7 @@
\<) do_update=upd_lt ;;
=) ;; # Can be reached if same version with different options
\>) if [ -n "$PM_VERBOSE" ]; then
-@@ -1628,7 +1643,7 @@ pm_pkg_create () {
+@@ -1628,7 +1649,7 @@ pm_pkg_create () {
fi
pm_cd $pkgdir || fail "Cannot cd into $pkgdir to create a package"
@@ -395,7 +442,7 @@
if [ "$1" = "$pbu" ]; then
if [ -n "$BACKUP" ]; then
echo " ===>>> Package saved to $1" ; echo ''
-@@ -1980,7 +1995,7 @@ if [ -n "$LIST" -o -n "$LIST_PLUS" ]; then
+@@ -1980,7 +2001,7 @@ if [ -n "$LIST" -o -n "$LIST_PLUS" ]; then
fi
if [ -n "$EXPUNGE" ]; then
@@ -404,7 +451,7 @@
find_glob_dirs $EXPUNGE
case $? in
1) fail "No such port: $EXPUNGE" ;;
-@@ -1992,7 +2007,7 @@ if [ -n "$EXPUNGE" ]; then
+@@ -1992,7 +2013,7 @@ if [ -n "$EXPUNGE" ]; then
fi
origin=`origin_from_pdb $EXPUNGE`
@@ -413,7 +460,7 @@
if [ -n "$deplist" ]; then
echo "===>>> Warning: Ports with dependencies on ${EXPUNGE}:"
echo "$deplist" | sed 's/^/ /'
-@@ -2020,7 +2035,7 @@ fi
+@@ -2020,7 +2041,7 @@ fi
if [ -n "$CLEAN_STALE" ]; then
[ -z "$no_del_list" ] && export no_del_list=':'
@@ -422,7 +469,7 @@
for file in $stale_ports; do
iport="${file%/+REQUIRED_BY}" ; iport=${iport#$pdb/}
-@@ -2040,7 +2055,7 @@ if [ -n "$CLEAN_STALE" ]; then
+@@ -2040,7 +2061,7 @@ if [ -n "$CLEAN_STALE" ]; then
continue
fi
@@ -431,7 +478,7 @@
get_answer_yn n "\t===>>> ${iport} is no longer depended on, delete"
case "$?" in
-@@ -2073,7 +2088,7 @@ check_restart_and_udf () {
+@@ -2073,7 +2094,7 @@ check_restart_and_udf () {
# to go out to the disk if we don't have to.
[ -z "$RESTART" ] && return 1
@@ -440,7 +487,7 @@
return 1
else
already_done $1
-@@ -2175,26 +2190,32 @@ update_pm_nu () {
+@@ -2175,26 +2196,32 @@ update_pm_nu () {
}
update_build_l () {
@@ -478,7 +525,7 @@
\<) build_l="${build_l}\tUpgrade $iport to $new_port\n" ;;
=) build_l="${build_l}\tRe-install $iport\n" ;;
\>) build_l="${build_l}\tDowngrade $iport to $new_port\n" ;;
-@@ -2203,8 +2224,9 @@ update_build_l () {
+@@ -2203,8 +2230,9 @@ update_build_l () {
}
update_port () {
@@ -489,7 +536,7 @@
if [ -n "$2" ]; then
echo "===>>> Launching child to update $1 to $2"
else
-@@ -2300,7 +2322,7 @@ make_dep_list () {
+@@ -2300,7 +2328,7 @@ make_dep_list () {
fail "make_dep_list: Unsupported option '$dep_type'"
esac
done
@@ -498,7 +545,7 @@
}
gen_dep_list () {
-@@ -2368,15 +2390,17 @@ dependency_check () {
+@@ -2368,15 +2396,17 @@ dependency_check () {
rundeps=`gen_dep_list run-depends-list`
for dep in $d_port_list; do
@@ -519,7 +566,7 @@
rundep_list="$rundep_list $varname"
eval $varname=\"$portdir \$$varname\"
eval ${varname}_p=$dep
-@@ -2409,7 +2433,10 @@ dependency_check () {
+@@ -2409,7 +2439,10 @@ dependency_check () {
# Do not export, for THIS parent process only
[ -n "$PM_FIRST_PASS" ] && doing_dep_check=doing_dep_check
@@ -531,7 +578,7 @@
origin="${d_port#$pd/}"
if [ -n "$SHOW_WORK" ]; then
iport=`iport_from_origin $origin`
-@@ -2429,23 +2456,17 @@ dependency_check () {
+@@ -2429,23 +2462,17 @@ dependency_check () {
[ -z "$PM_URB_UP" ] &&
case "$CUR_DEPS" in *:${origin}:*) continue ;; esac
@@ -560,7 +607,7 @@
if [ -n "$confl_p" ]; then
confl_p=${confl_p%% *}
d_port="$pd/`origin_from_pdb $confl_p`"
-@@ -2498,7 +2519,11 @@ dependency_check () {
+@@ -2498,7 +2525,11 @@ dependency_check () {
check_for_updates $iport $origin || fail 'Update failed'
else
check_interactive $origin || continue
@@ -573,7 +620,7 @@
fi
done
[ -n "$PM_FIRST_PASS" ] && unset doing_dep_check
-@@ -2587,7 +2612,7 @@ post_first_pass () {
+@@ -2587,7 +2618,7 @@ post_first_pass () {
done
for dep in $build_only_dl_g; do
@@ -582,7 +629,7 @@
[ -n "$PM_DEL_BUILD_ONLY" ] &&
iport_from_origin ${dep#$pd/} >/dev/null && continue
temp_bodlg="$temp_bodlg $dep"
-@@ -2629,7 +2654,7 @@ urb_update () {
+@@ -2629,7 +2660,7 @@ urb_update () {
case " $PM_URB_ORIGINS" in *" $req_by_o "*) continue ;; esac
PM_URB_LIST="${PM_URB_LIST} ${req_by}"
done <<-EOF
@@ -591,7 +638,7 @@
EOF
done
-@@ -2642,7 +2667,7 @@ urb_update () {
+@@ -2642,7 +2673,7 @@ urb_update () {
for req_by in $PM_URB_LIST; do
# Probably not needed, but JIC
@@ -600,7 +647,7 @@
pm_v "===>>> $req_by depends on $PM_URB_IPORTS"
-@@ -2683,7 +2708,7 @@ multiport () {
+@@ -2683,7 +2714,7 @@ multiport () {
else
fail "$pd/${port} does not exist"
fi ;;
@@ -609,7 +656,7 @@
worklist_temp="$worklist_temp $port"
else
find_glob_dirs $port
-@@ -2773,8 +2798,8 @@ multiport () {
+@@ -2773,8 +2804,8 @@ multiport () {
num=$(( $num + 1 ))
init_term_printf "$port ${num}/${numports}"
@@ -620,7 +667,7 @@
[ -n "$update_failed" ] && fail "Update for $port failed"
case "$PM_NEEDS_UPDATE" in
-@@ -2803,7 +2828,7 @@ multiport () {
+@@ -2803,7 +2834,7 @@ multiport () {
*/*) origin=$port ;;
*) # If an installed version does not exist at this
# point it probably got updated as a dependency
@@ -629,7 +676,7 @@
numports=$(( $numports - 1 ))
continue
fi
-@@ -2823,7 +2848,7 @@ multiport () {
+@@ -2823,7 +2854,7 @@ multiport () {
num=$(( $num + 1 ))
init_term_printf "$port ${num}/${numports}"
("$program" $ARGS $port) || update_failed=update_failed
@@ -638,7 +685,7 @@
[ -n "$update_failed" ] && fail "Update for $port failed"
done
-@@ -3029,8 +3054,12 @@ no_valid_port () {
+@@ -3029,8 +3060,12 @@ no_valid_port () {
echo "===>>> Try $progname --help" ; echo '' ; safe_exit 1
}
@@ -651,7 +698,7 @@
export_flavor $(flavor_part $portdir)
[ -n "$portdir" ] && { argv=$portdir ; unset portdir; }
argv=${argv:-$1} ; argv=${argv%/} ; argv=`globstrip $argv`
-@@ -3048,7 +3077,7 @@ if [ -z "$REPLACE_ORIGIN" ]; then
+@@ -3048,7 +3083,7 @@ if [ -z "$REPLACE_ORIGIN" ]; then
*) echo '' ; no_valid_port ;;
esac
done ;;
@@ -660,7 +707,7 @@
esac
if [ -z "$portdir" -a -z "$upg_port" ]; then
-@@ -3061,9 +3090,11 @@ if [ -z "$REPLACE_ORIGIN" ]; then
+@@ -3061,9 +3096,11 @@ if [ -z "$REPLACE_ORIGIN" ]; then
unset glob_dirs
fi
unset argv
@@ -673,7 +720,7 @@
if [ -z "$PM_INDEX_ONLY" ]; then
pm_isdir_pd "$portdir" ] || missing=missing
else
-@@ -3076,12 +3107,12 @@ else
+@@ -3076,12 +3113,12 @@ else
echo '' ; no_valid_port
fi
@@ -688,7 +735,7 @@
ro_upg_port=$arg2
else
find_glob_dirs $arg2 && ro_upg_port=${glob_dirs#$pdb/}
-@@ -3097,7 +3128,7 @@ else
+@@ -3097,7 +3134,7 @@ else
unset arg2
if [ -z "$ro_upg_port" ]; then
@@ -697,7 +744,7 @@
if [ "$?" -eq 1 ]; then
echo ''
echo "===>>> The second argument to -o can be a package name,"
-@@ -3133,6 +3164,7 @@ if [ -z "$PM_INDEX_ONLY" ] && ! pm_isdir_pd "$portdir"
+@@ -3133,6 +3170,7 @@ if [ -z "$PM_INDEX_ONLY" ] && ! pm_isdir_pd "$portdir"
pm_isdir_pd "$moved_npd" || no_valid_port
[ "$$" -eq "$PM_PARENT_PID" ] && parent_exit
@@ -705,7 +752,7 @@
exec "$program" $ARGS -o $moved_npd $upg_port
# NOT REACHED
fi
-@@ -3142,8 +3174,8 @@ iport_from_pkgname () {
+@@ -3142,8 +3180,8 @@ iport_from_pkgname () {
dir=$(dir_part $1)
flavor=$(flavor_part $1)
@@ -716,7 +763,7 @@
}
if [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ]; then
-@@ -3229,11 +3261,14 @@ if [ -n "$PM_FIRST_PASS" -a -z "$FETCH_ONLY" ]; then
+@@ -3229,11 +3267,14 @@ if [ -n "$PM_FIRST_PASS" -a -z "$FETCH_ONLY" ]; then
fi
fi
@@ -732,7 +779,7 @@
# Do these things first time through
if [ -z "$PM_INDEX_ONLY" -a -z "$PM_BUILDING" -a -z "$SHOW_WORK" -a -z "$NO_ACTION" ]; then
# Do not start this in the background until we are sure we are going to proceed
-@@ -3389,7 +3424,7 @@ fetch_package () {
+@@ -3389,7 +3430,7 @@ fetch_package () {
export ppd
fi
@@ -741,7 +788,7 @@
if [ -z "$FETCH_ARGS" ]; then
FETCH_ARGS=`pm_make -f/usr/share/mk/bsd.port.mk -V FETCH_ARGS 2>/dev/null`
-@@ -3533,7 +3568,7 @@ notnewer () {
+@@ -3533,7 +3574,7 @@ notnewer () {
pm_v "===>>> Available package ($latest_pv) matches the current version"
elif [ -n "$latest_pv" -a -n "$PM_PACKAGES_NEWER" ]; then
if [ -n "$upg_port" ]; then
@@ -750,7 +797,7 @@
\<) use_package=up_newer
pm_v "===>>> Available package ($latest_pv)"
pm_v " is newer than installed ($upg_port)" ;;
-@@ -3549,7 +3584,7 @@ notnewer () {
+@@ -3549,7 +3590,7 @@ notnewer () {
pm_v "===>>> There is a package available ($latest_pv)"
fi
elif [ -n "$latest_pv" ]; then
@@ -759,7 +806,7 @@
\<) # Could happen if ports tree is out of date
use_package=up_old_tree
pm_v "===>>> Available package ($latest_pv)"
-@@ -3632,19 +3667,27 @@ if [ -z "$use_package" ]; then
+@@ -3632,19 +3673,27 @@ if [ -z "$use_package" ]; then
# Return flavor for named pkg (must be executed in port directory!)
pkg_flavor () {
@@ -789,7 +836,7 @@
else
[ -z "$local_package" ] && {
fetch_package $latest_pv || fail "Fetch for ${latest_pv}.txz failed"; }
-@@ -3665,7 +3708,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F
+@@ -3665,7 +3714,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F
grep -v ^$LOCALBASE_COMPAT > $pm_mktemp_file
unset temp
@@ -798,7 +845,7 @@
sort - $pm_mktemp_file | uniq -d`; do
temp="${temp}$file "
done
-@@ -3688,7 +3731,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F
+@@ -3688,7 +3737,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F
if [ -n "$REPLACE_ORIGIN" -a -n "$ro_upg_port" ]; then # <se> not always true for port moved to flavored version with no version update???
# Delete any existing versions of the old port
@@ -807,7 +854,7 @@
pm_sv "Running pkg delete for $ro_upg_port"
pm_pkg_delete_s $ro_upg_port
fi
-@@ -3710,7 +3753,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F
+@@ -3710,7 +3759,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F
# If $ro_upg_port was non-automatic, keep its state
if [ "${np_orphan:-1}" -eq 1 ]; then
@@ -816,7 +863,7 @@
fi
pm_sv "Running pkg delete for $upg_port"
pm_pkg_delete_s $upg_port
-@@ -3776,7 +3819,7 @@ else
+@@ -3776,7 +3825,7 @@ else
[ -n "$local_package" ] && ppd=${LOCAL_PACKAGEDIR}/All
echo "===>>> Installing package from: ${ppd}/${latest_pv}.txz"
@@ -825,7 +872,7 @@
if [ -n "$PM_DELETE_PACKAGES" ]; then
pm_v "===>>> Deleting ${latest_pv}.txz"
pm_unlink_s ${ppd}/${latest_pv}.txz
-@@ -3801,14 +3844,14 @@ echo ''
+@@ -3801,14 +3850,14 @@ echo ''
temp=`find $LOCALBASE_COMPAT -type d -empty 2>/dev/null`
if [ -z "$temp" ] && pm_isdir "$LOCALBASE_COMPAT"; then
unset files
@@ -842,7 +889,7 @@
$PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null
fi
unset temp file files
-@@ -3876,14 +3919,18 @@ if [ -n "$MAKE_PACKAGE" ]; then
+@@ -3876,14 +3925,18 @@ if [ -n "$MAKE_PACKAGE" ]; then
fi
if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then
@@ -864,7 +911,7 @@
fi
-@@ -3903,7 +3950,7 @@ if [ "$$" -ne "$PM_PARENT_PID" -o -n "$PM_URB" ]; then
+@@ -3903,7 +3956,7 @@ if [ "$$" -ne "$PM_PARENT_PID" -o -n "$PM_URB" ]; then
fi
INSTALLED_LIST="${INSTALLED_LIST}\t${ilist}\n"
More information about the svn-ports-all
mailing list