Date: Wed, 22 Jan 2020 18:58:13 +0000 (UTC) From: Stefan Esser <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523835 - in head/ports-mgmt/portmaster: . files Message-ID: <202001221858.00MIwDBD096395@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Wed Jan 22 18:58:12 2020 New Revision: 523835 URL: https://svnweb.freebsd.org/changeset/ports/523835 Log: Do not re-build ports unneccessarily The previous patch has not completely fixed the issue, according to some reports (it did on my system and for my set of installed ports). This version contains a further change suggested by Walter Schwarzenfeld. Submitted by: Walter Schwarzenfeld Approved by: antoine (implicit) Modified: head/ports-mgmt/portmaster/Makefile head/ports-mgmt/portmaster/files/patch-portmaster Modified: head/ports-mgmt/portmaster/Makefile ============================================================================== --- head/ports-mgmt/portmaster/Makefile Wed Jan 22 18:48:12 2020 (r523834) +++ head/ports-mgmt/portmaster/Makefile Wed Jan 22 18:58:12 2020 (r523835) @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.19 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org Modified: head/ports-mgmt/portmaster/files/patch-portmaster ============================================================================== --- head/ports-mgmt/portmaster/files/patch-portmaster Wed Jan 22 18:48:12 2020 (r523834) +++ head/ports-mgmt/portmaster/files/patch-portmaster Wed Jan 22 18:58:12 2020 (r523835) @@ -207,12 +207,13 @@ #=============== Begin functions relevant to --features and main =============== # find installed port for given origin (with optional @flavor) in the pkg DB -@@ -938,11 +968,14 @@ iport_from_origin () { +@@ -938,11 +968,15 @@ iport_from_origin () { origin=$(dir_part "$1") flavor=$(flavor_part "$1") - pkgname_l=$(echo $(pkg query '%n-%v' $origin)) || return 1 + if [ -z "$flavor" ]; then ++ unset FLAVOR + flavor=$(pm_make -C "${pd}/${origin}" -V FLAVOR) + fi + pkgname_l=$(echo $($PKG_CMD query '%n-%v' $origin)) || return 1 @@ -224,7 +225,7 @@ if [ "$pkgflavor" = "$flavor" ]; then echo $pkgname return 0 -@@ -1002,25 +1035,6 @@ get_answer_yn () { +@@ -1002,25 +1036,6 @@ get_answer_yn () { fi } @@ -250,7 +251,7 @@ # Find the new origin for moved ports # Set global variable moved_npd on success # Return values: -@@ -1056,7 +1070,8 @@ find_moved_port () { +@@ -1056,7 +1071,8 @@ find_moved_port () { fi ;; ${sf}\|*) moved_npd=${moved#*\|} # New port directory moved_npd=${moved_npd%%\|*} @@ -260,7 +261,7 @@ echo '' echo " ===>>> The $sf port moved to $moved_npd" echo " ===>>> Reason: ${moved##*|}" -@@ -1082,7 +1097,7 @@ find_moved_port () { +@@ -1082,7 +1098,7 @@ find_moved_port () { } all_pkgs_by_origin () { @@ -269,7 +270,7 @@ echo "$namesorigins" return } -@@ -1146,11 +1161,10 @@ read_distinfos_all () { +@@ -1146,11 +1162,10 @@ read_distinfos_all () { echo '' for origin in ${pd}/*/*; do @@ -282,7 +283,7 @@ if [ -s "${origin}/distinfo" ]; then distinfo="${origin}/distinfo" -@@ -1181,17 +1195,17 @@ ports_by_category () { +@@ -1181,17 +1196,17 @@ ports_by_category () { local pkg pm_v "===>>> Sorting ports by category" @@ -305,7 +306,7 @@ } delete_empty_dist_subdirs () { -@@ -1279,7 +1293,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then +@@ -1279,7 +1294,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then for package in `find $PACKAGES -type f | sort`; do pkg_dir=${package##*/} ; pkg_dir=${pkg_dir%\.*} ; echo '' @@ -314,7 +315,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 +1316,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then +@@ -1302,7 +1317,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then if [ -n "$port_ver" ]; then if [ "$port_ver" = "$pkg_dir" ]; then echo "===>>> ${package##*/} is up to date" @@ -323,7 +324,7 @@ echo " ===>>> $pkg_dir is not installed" echo " ===>>> Path: ${package}" get_answer_yn y "\n\t===>>> Delete stale package: ${package##*/}" -@@ -1320,7 +1334,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then +@@ -1320,7 +1335,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then unset port_ver @@ -332,7 +333,7 @@ echo " ===>>> ${package##*/} matches the installed version" else echo " ===>>> ${package##*/} is not installed" -@@ -1362,7 +1376,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then +@@ -1362,7 +1377,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then fi # [ -n "$CLEAN_PACKAGES" ] if [ -n "$CHECK_DEPENDS" ]; then @@ -341,7 +342,7 @@ exit 0 fi -@@ -1377,14 +1391,14 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then +@@ -1377,14 +1392,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 @@ -358,7 +359,7 @@ done <<-EOF $(all_pkgs_by_origin) EOF -@@ -1413,7 +1427,7 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then +@@ -1413,7 +1428,7 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then fi if [ -n "$LIST_ORIGINS" ]; then @@ -367,7 +368,7 @@ exit 0 fi -@@ -1502,7 +1516,7 @@ check_for_updates () { +@@ -1502,7 +1517,7 @@ check_for_updates () { fi if [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ] && pm_isdir "$pd/$origin"; then @@ -376,7 +377,7 @@ if pm_islocked "$iport"; then echo " ===>>> Warning: Unable to cd to $pd/$origin" echo " ===>>> Continuing due to $pdb/$iport/+IGNOREME" -@@ -1545,7 +1559,7 @@ check_for_updates () { +@@ -1545,7 +1560,7 @@ check_for_updates () { unset port_ver fi else @@ -385,7 +386,7 @@ \<) do_update=upd_lt ;; =) ;; # Can be reached if same version with different options \>) if [ -n "$PM_VERBOSE" ]; then -@@ -1628,7 +1642,7 @@ pm_pkg_create () { +@@ -1628,7 +1643,7 @@ pm_pkg_create () { fi pm_cd $pkgdir || fail "Cannot cd into $pkgdir to create a package" @@ -394,7 +395,7 @@ if [ "$1" = "$pbu" ]; then if [ -n "$BACKUP" ]; then echo " ===>>> Package saved to $1" ; echo '' -@@ -1980,7 +1994,7 @@ if [ -n "$LIST" -o -n "$LIST_PLUS" ]; then +@@ -1980,7 +1995,7 @@ if [ -n "$LIST" -o -n "$LIST_PLUS" ]; then fi if [ -n "$EXPUNGE" ]; then @@ -403,7 +404,7 @@ find_glob_dirs $EXPUNGE case $? in 1) fail "No such port: $EXPUNGE" ;; -@@ -1992,7 +2006,7 @@ if [ -n "$EXPUNGE" ]; then +@@ -1992,7 +2007,7 @@ if [ -n "$EXPUNGE" ]; then fi origin=`origin_from_pdb $EXPUNGE` @@ -412,7 +413,7 @@ if [ -n "$deplist" ]; then echo "===>>> Warning: Ports with dependencies on ${EXPUNGE}:" echo "$deplist" | sed 's/^/ /' -@@ -2020,7 +2034,7 @@ fi +@@ -2020,7 +2035,7 @@ fi if [ -n "$CLEAN_STALE" ]; then [ -z "$no_del_list" ] && export no_del_list=':' @@ -421,7 +422,7 @@ for file in $stale_ports; do iport="${file%/+REQUIRED_BY}" ; iport=${iport#$pdb/} -@@ -2040,7 +2054,7 @@ if [ -n "$CLEAN_STALE" ]; then +@@ -2040,7 +2055,7 @@ if [ -n "$CLEAN_STALE" ]; then continue fi @@ -430,7 +431,7 @@ get_answer_yn n "\t===>>> ${iport} is no longer depended on, delete" case "$?" in -@@ -2073,7 +2087,7 @@ check_restart_and_udf () { +@@ -2073,7 +2088,7 @@ check_restart_and_udf () { # to go out to the disk if we don't have to. [ -z "$RESTART" ] && return 1 @@ -439,7 +440,7 @@ return 1 else already_done $1 -@@ -2175,26 +2189,32 @@ update_pm_nu () { +@@ -2175,26 +2190,32 @@ update_pm_nu () { } update_build_l () { @@ -477,7 +478,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 +2223,9 @@ update_build_l () { +@@ -2203,8 +2224,9 @@ update_build_l () { } update_port () { @@ -488,7 +489,7 @@ if [ -n "$2" ]; then echo "===>>> Launching child to update $1 to $2" else -@@ -2300,7 +2321,7 @@ make_dep_list () { +@@ -2300,7 +2322,7 @@ make_dep_list () { fail "make_dep_list: Unsupported option '$dep_type'" esac done @@ -497,7 +498,7 @@ } gen_dep_list () { -@@ -2368,15 +2389,17 @@ dependency_check () { +@@ -2368,15 +2390,17 @@ dependency_check () { rundeps=`gen_dep_list run-depends-list` for dep in $d_port_list; do @@ -518,7 +519,7 @@ rundep_list="$rundep_list $varname" eval $varname=\"$portdir \$$varname\" eval ${varname}_p=$dep -@@ -2409,7 +2432,10 @@ dependency_check () { +@@ -2409,7 +2433,10 @@ dependency_check () { # Do not export, for THIS parent process only [ -n "$PM_FIRST_PASS" ] && doing_dep_check=doing_dep_check @@ -530,7 +531,7 @@ origin="${d_port#$pd/}" if [ -n "$SHOW_WORK" ]; then iport=`iport_from_origin $origin` -@@ -2429,23 +2455,17 @@ dependency_check () { +@@ -2429,23 +2456,17 @@ dependency_check () { [ -z "$PM_URB_UP" ] && case "$CUR_DEPS" in *:${origin}:*) continue ;; esac @@ -559,7 +560,7 @@ if [ -n "$confl_p" ]; then confl_p=${confl_p%% *} d_port="$pd/`origin_from_pdb $confl_p`" -@@ -2498,7 +2518,11 @@ dependency_check () { +@@ -2498,7 +2519,11 @@ dependency_check () { check_for_updates $iport $origin || fail 'Update failed' else check_interactive $origin || continue @@ -572,7 +573,7 @@ fi done [ -n "$PM_FIRST_PASS" ] && unset doing_dep_check -@@ -2587,7 +2611,7 @@ post_first_pass () { +@@ -2587,7 +2612,7 @@ post_first_pass () { done for dep in $build_only_dl_g; do @@ -581,7 +582,7 @@ [ -n "$PM_DEL_BUILD_ONLY" ] && iport_from_origin ${dep#$pd/} >/dev/null && continue temp_bodlg="$temp_bodlg $dep" -@@ -2629,7 +2653,7 @@ urb_update () { +@@ -2629,7 +2654,7 @@ urb_update () { case " $PM_URB_ORIGINS" in *" $req_by_o "*) continue ;; esac PM_URB_LIST="${PM_URB_LIST} ${req_by}" done <<-EOF @@ -590,7 +591,7 @@ EOF done -@@ -2642,7 +2666,7 @@ urb_update () { +@@ -2642,7 +2667,7 @@ urb_update () { for req_by in $PM_URB_LIST; do # Probably not needed, but JIC @@ -599,7 +600,7 @@ pm_v "===>>> $req_by depends on $PM_URB_IPORTS" -@@ -2683,7 +2707,7 @@ multiport () { +@@ -2683,7 +2708,7 @@ multiport () { else fail "$pd/${port} does not exist" fi ;; @@ -608,7 +609,7 @@ worklist_temp="$worklist_temp $port" else find_glob_dirs $port -@@ -2773,8 +2797,8 @@ multiport () { +@@ -2773,8 +2798,8 @@ multiport () { num=$(( $num + 1 )) init_term_printf "$port ${num}/${numports}" @@ -619,7 +620,7 @@ [ -n "$update_failed" ] && fail "Update for $port failed" case "$PM_NEEDS_UPDATE" in -@@ -2803,7 +2827,7 @@ multiport () { +@@ -2803,7 +2828,7 @@ multiport () { */*) origin=$port ;; *) # If an installed version does not exist at this # point it probably got updated as a dependency @@ -628,7 +629,7 @@ numports=$(( $numports - 1 )) continue fi -@@ -2823,7 +2847,7 @@ multiport () { +@@ -2823,7 +2848,7 @@ multiport () { num=$(( $num + 1 )) init_term_printf "$port ${num}/${numports}" ("$program" $ARGS $port) || update_failed=update_failed @@ -637,7 +638,7 @@ [ -n "$update_failed" ] && fail "Update for $port failed" done -@@ -3029,8 +3053,12 @@ no_valid_port () { +@@ -3029,8 +3054,12 @@ no_valid_port () { echo "===>>> Try $progname --help" ; echo '' ; safe_exit 1 } @@ -650,7 +651,7 @@ export_flavor $(flavor_part $portdir) [ -n "$portdir" ] && { argv=$portdir ; unset portdir; } argv=${argv:-$1} ; argv=${argv%/} ; argv=`globstrip $argv` -@@ -3048,7 +3076,7 @@ if [ -z "$REPLACE_ORIGIN" ]; then +@@ -3048,7 +3077,7 @@ if [ -z "$REPLACE_ORIGIN" ]; then *) echo '' ; no_valid_port ;; esac done ;; @@ -659,7 +660,7 @@ esac if [ -z "$portdir" -a -z "$upg_port" ]; then -@@ -3061,9 +3089,11 @@ if [ -z "$REPLACE_ORIGIN" ]; then +@@ -3061,9 +3090,11 @@ if [ -z "$REPLACE_ORIGIN" ]; then unset glob_dirs fi unset argv @@ -672,7 +673,7 @@ if [ -z "$PM_INDEX_ONLY" ]; then pm_isdir_pd "$portdir" ] || missing=missing else -@@ -3076,12 +3106,12 @@ else +@@ -3076,12 +3107,12 @@ else echo '' ; no_valid_port fi @@ -687,7 +688,7 @@ ro_upg_port=$arg2 else find_glob_dirs $arg2 && ro_upg_port=${glob_dirs#$pdb/} -@@ -3097,7 +3127,7 @@ else +@@ -3097,7 +3128,7 @@ else unset arg2 if [ -z "$ro_upg_port" ]; then @@ -696,7 +697,7 @@ if [ "$?" -eq 1 ]; then echo '' echo "===>>> The second argument to -o can be a package name," -@@ -3133,6 +3163,7 @@ if [ -z "$PM_INDEX_ONLY" ] && ! pm_isdir_pd "$portdir" +@@ -3133,6 +3164,7 @@ if [ -z "$PM_INDEX_ONLY" ] && ! pm_isdir_pd "$portdir" pm_isdir_pd "$moved_npd" || no_valid_port [ "$$" -eq "$PM_PARENT_PID" ] && parent_exit @@ -704,7 +705,7 @@ exec "$program" $ARGS -o $moved_npd $upg_port # NOT REACHED fi -@@ -3142,8 +3173,8 @@ iport_from_pkgname () { +@@ -3142,8 +3174,8 @@ iport_from_pkgname () { dir=$(dir_part $1) flavor=$(flavor_part $1) @@ -715,7 +716,7 @@ } if [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ]; then -@@ -3229,11 +3260,14 @@ if [ -n "$PM_FIRST_PASS" -a -z "$FETCH_ONLY" ]; then +@@ -3229,11 +3261,14 @@ if [ -n "$PM_FIRST_PASS" -a -z "$FETCH_ONLY" ]; then fi fi @@ -731,7 +732,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 +3423,7 @@ fetch_package () { +@@ -3389,7 +3424,7 @@ fetch_package () { export ppd fi @@ -740,7 +741,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 +3567,7 @@ notnewer () { +@@ -3533,7 +3568,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 @@ -749,7 +750,7 @@ \<) use_package=up_newer pm_v "===>>> Available package ($latest_pv)" pm_v " is newer than installed ($upg_port)" ;; -@@ -3549,7 +3583,7 @@ notnewer () { +@@ -3549,7 +3584,7 @@ notnewer () { pm_v "===>>> There is a package available ($latest_pv)" fi elif [ -n "$latest_pv" ]; then @@ -758,7 +759,7 @@ \<) # Could happen if ports tree is out of date use_package=up_old_tree pm_v "===>>> Available package ($latest_pv)" -@@ -3632,19 +3666,27 @@ if [ -z "$use_package" ]; then +@@ -3632,19 +3667,27 @@ if [ -z "$use_package" ]; then # Return flavor for named pkg (must be executed in port directory!) pkg_flavor () { @@ -788,7 +789,7 @@ else [ -z "$local_package" ] && { fetch_package $latest_pv || fail "Fetch for ${latest_pv}.txz failed"; } -@@ -3665,7 +3707,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F +@@ -3665,7 +3708,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F grep -v ^$LOCALBASE_COMPAT > $pm_mktemp_file unset temp @@ -797,7 +798,7 @@ sort - $pm_mktemp_file | uniq -d`; do temp="${temp}$file " done -@@ -3688,7 +3730,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F +@@ -3688,7 +3731,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 @@ -806,7 +807,7 @@ pm_sv "Running pkg delete for $ro_upg_port" pm_pkg_delete_s $ro_upg_port fi -@@ -3710,7 +3752,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$F +@@ -3710,7 +3753,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 @@ -815,7 +816,7 @@ fi pm_sv "Running pkg delete for $upg_port" pm_pkg_delete_s $upg_port -@@ -3776,7 +3818,7 @@ else +@@ -3776,7 +3819,7 @@ else [ -n "$local_package" ] && ppd=${LOCAL_PACKAGEDIR}/All echo "===>>> Installing package from: ${ppd}/${latest_pv}.txz" @@ -824,7 +825,7 @@ if [ -n "$PM_DELETE_PACKAGES" ]; then pm_v "===>>> Deleting ${latest_pv}.txz" pm_unlink_s ${ppd}/${latest_pv}.txz -@@ -3801,14 +3843,14 @@ echo '' +@@ -3801,14 +3844,14 @@ echo '' temp=`find $LOCALBASE_COMPAT -type d -empty 2>/dev/null` if [ -z "$temp" ] && pm_isdir "$LOCALBASE_COMPAT"; then unset files @@ -841,7 +842,7 @@ $PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null fi unset temp file files -@@ -3876,14 +3918,18 @@ if [ -n "$MAKE_PACKAGE" ]; then +@@ -3876,14 +3919,18 @@ if [ -n "$MAKE_PACKAGE" ]; then fi if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then @@ -863,7 +864,7 @@ fi -@@ -3903,7 +3949,7 @@ if [ "$$" -ne "$PM_PARENT_PID" -o -n "$PM_URB" ]; then +@@ -3903,7 +3950,7 @@ if [ "$$" -ne "$PM_PARENT_PID" -o -n "$PM_URB" ]; then fi INSTALLED_LIST="${INSTALLED_LIST}\t${ilist}\n"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001221858.00MIwDBD096395>