+++ portmaster

+++ portmaster

@@ -7,10 +7,12 @@ trap trap_exit INT

@@ -7,10 +7,12 @@ trap trap_exit INT

 	exit 0

 	exit 0

 fi

 fi

 	fi

 	fi

 	if [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ] && pm_isdir "$pd/$origin"; then

 	if [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ] && pm_isdir "$pd/$origin"; then

-		if ! pm_cd $pd/$origin; then

-		if ! pm_cd $pd/$origin; then

+		if ! pm_cd $pd/$origin; then # <se> cannot happen - see pm_isdir test above

+		if ! pm_cd $pd/$origin; then # <se> cannot happen - see pm_isdir test above

 			if pm_islocked "$iport"; then

 			if pm_islocked "$iport"; then

 				echo "	===>>> Warning: Unable to cd to $pd/$origin"

 				echo "	===>>> Warning: Unable to cd to $pd/$origin"

 				echo "	===>>> Continuing due to $pdb/$iport/+IGNOREME"

 				echo "	===>>> Continuing due to $pdb/$iport/+IGNOREME"

 				unset port_ver

 				unset port_ver

 			fi

 			fi

 		else

 		else

 			\<)	do_update=upd_lt ;;

 			\<)	do_update=upd_lt ;;

 			=)	;;	# Can be reached if same version with different options

 			=)	;;	# Can be reached if same version with different options

 			\>)	if [ -n "$PM_VERBOSE" ]; then

 			\>)	if [ -n "$PM_VERBOSE" ]; then

 	fi

 	fi

 	pm_cd $pkgdir || fail "Cannot cd into $pkgdir to create a package"

 	pm_cd $pkgdir || fail "Cannot cd into $pkgdir to create a package"

 		if [ "$1" = "$pbu" ]; then

 		if [ "$1" = "$pbu" ]; then

 			if [ -n "$BACKUP" ]; then

 			if [ -n "$BACKUP" ]; then

 				echo "	===>>> Package saved to $1" ; echo ''

 				echo "	===>>> Package saved to $1" ; echo ''

 fi

 fi

 if [ -n "$EXPUNGE" ]; then

 if [ -n "$EXPUNGE" ]; then

 		find_glob_dirs $EXPUNGE

 		find_glob_dirs $EXPUNGE

 		case $? in

 		case $? in

 		1)	fail "No such port: $EXPUNGE" ;;

 		1)	fail "No such port: $EXPUNGE" ;;

 	fi

 	fi

 	origin=`origin_from_pdb $EXPUNGE`

 	origin=`origin_from_pdb $EXPUNGE`

 	if [ -n "$deplist" ]; then

 	if [ -n "$deplist" ]; then

 		echo "===>>> Warning: Ports with dependencies on ${EXPUNGE}:"

 		echo "===>>> Warning: Ports with dependencies on ${EXPUNGE}:"

 		echo "$deplist" | sed 's/^/	/'

 		echo "$deplist" | sed 's/^/	/'

 if [ -n "$CLEAN_STALE" ]; then

 if [ -n "$CLEAN_STALE" ]; then

 	[ -z "$no_del_list" ] && export no_del_list=':'

 	[ -z "$no_del_list" ] && export no_del_list=':'

 	for file in $stale_ports; do

 	for file in $stale_ports; do

 		iport="${file%/+REQUIRED_BY}" ; iport=${iport#$pdb/}

 		iport="${file%/+REQUIRED_BY}" ; iport=${iport#$pdb/}

 			continue

 			continue

 		fi

 		fi

 		get_answer_yn n "\t===>>> ${iport} is no longer depended on, delete"

 		get_answer_yn n "\t===>>> ${iport} is no longer depended on, delete"

 		case "$?" in

 		case "$?" in

 	# to go out to the disk if we don't have to.

 	# to go out to the disk if we don't have to.

 	[ -z "$RESTART" ] && return 1

 	[ -z "$RESTART" ] && return 1

 		return 1

 		return 1

 	else

 	else

 		already_done $1

 		already_done $1

 }

 }

 update_build_l () {

 update_build_l () {

 	\<)	build_l="${build_l}\tUpgrade $iport to $new_port\n" ;;

 	\<)	build_l="${build_l}\tUpgrade $iport to $new_port\n" ;;

 	=)	build_l="${build_l}\tRe-install $iport\n" ;;

 	=)	build_l="${build_l}\tRe-install $iport\n" ;;

 	\>)	build_l="${build_l}\tDowngrade $iport to $new_port\n" ;;

 	\>)	build_l="${build_l}\tDowngrade $iport to $new_port\n" ;;

 }

 }

 update_port () {

 update_port () {

 	if [ -n "$2" ]; then

 	if [ -n "$2" ]; then

 		echo "===>>> Launching child to update $1 to $2"

 		echo "===>>> Launching child to update $1 to $2"

 	else

 	else

 			fail "make_dep_list: Unsupported option '$dep_type'"

 			fail "make_dep_list: Unsupported option '$dep_type'"

 		esac

 		esac

 	done

 	done

 }

 }

 gen_dep_list () {

 gen_dep_list () {

 		rundeps=`gen_dep_list run-depends-list`

 		rundeps=`gen_dep_list run-depends-list`

 		for dep in $d_port_list; do

 		for dep in $d_port_list; do

 				rundep_list="$rundep_list $varname"

 				rundep_list="$rundep_list $varname"

 				eval $varname=\"$portdir \$$varname\"

 				eval $varname=\"$portdir \$$varname\"

 				eval ${varname}_p=$dep

 				eval ${varname}_p=$dep

 	# Do not export, for THIS parent process only

 	# Do not export, for THIS parent process only

 	[ -n "$PM_FIRST_PASS" ] && doing_dep_check=doing_dep_check

 	[ -n "$PM_FIRST_PASS" ] && doing_dep_check=doing_dep_check

 		origin="${d_port#$pd/}"

 		origin="${d_port#$pd/}"

 		if [ -n "$SHOW_WORK" ]; then

 		if [ -n "$SHOW_WORK" ]; then

 			iport=`iport_from_origin $origin`

 			iport=`iport_from_origin $origin`

 		[ -z "$PM_URB_UP" ] &&

 		[ -z "$PM_URB_UP" ] &&

 			case "$CUR_DEPS" in *:${origin}:*) continue ;; esac

 			case "$CUR_DEPS" in *:${origin}:*) continue ;; esac

 				if [ -n "$confl_p" ]; then

 				if [ -n "$confl_p" ]; then

 					confl_p=${confl_p%% *}

 					confl_p=${confl_p%% *}

 					d_port="$pd/`origin_from_pdb $confl_p`"

 					d_port="$pd/`origin_from_pdb $confl_p`"

 			check_for_updates $iport $origin || fail 'Update failed'

 			check_for_updates $iport $origin || fail 'Update failed'

 		else

 		else

 			check_interactive $origin || continue

 			check_interactive $origin || continue

 		fi

 		fi

 	done

 	done

 	[ -n "$PM_FIRST_PASS" ] && unset doing_dep_check

 	[ -n "$PM_FIRST_PASS" ] && unset doing_dep_check

 		done

 		done

 		for dep in $build_only_dl_g; do

 		for dep in $build_only_dl_g; do

 			[ -n "$PM_DEL_BUILD_ONLY" ] &&

 			[ -n "$PM_DEL_BUILD_ONLY" ] &&

 				iport_from_origin ${dep#$pd/} >/dev/null && continue

 				iport_from_origin ${dep#$pd/} >/dev/null && continue

 			temp_bodlg="$temp_bodlg $dep"

 			temp_bodlg="$temp_bodlg $dep"

 			case " $PM_URB_ORIGINS" in *" $req_by_o "*) continue ;; esac

 			case " $PM_URB_ORIGINS" in *" $req_by_o "*) continue ;; esac

 			PM_URB_LIST="${PM_URB_LIST} ${req_by}"

 			PM_URB_LIST="${PM_URB_LIST} ${req_by}"

 		done <<-EOF

 		done <<-EOF

 		EOF

 		EOF

 	done

 	done

 	for req_by in $PM_URB_LIST; do

 	for req_by in $PM_URB_LIST; do

 		# Probably not needed, but JIC

 		# Probably not needed, but JIC

 		pm_v "===>>> $req_by depends on $PM_URB_IPORTS"

 		pm_v "===>>> $req_by depends on $PM_URB_IPORTS"

 			else

 			else

 				fail "$pd/${port} does not exist"

 				fail "$pd/${port} does not exist"

 			fi ;;

 			fi ;;

 				worklist_temp="$worklist_temp $port"

 				worklist_temp="$worklist_temp $port"

 			else

 			else

 				find_glob_dirs $port

 				find_glob_dirs $port

 		num=$(( $num + 1 ))

 		num=$(( $num + 1 ))

 		init_term_printf "$port ${num}/${numports}"

 		init_term_printf "$port ${num}/${numports}"

 		[ -n "$update_failed" ] && fail "Update for $port failed"

 		[ -n "$update_failed" ] && fail "Update for $port failed"

 		case "$PM_NEEDS_UPDATE" in

 		case "$PM_NEEDS_UPDATE" in

 		*/*)	origin=$port ;;

 		*/*)	origin=$port ;;

 		*)	# If an installed version does not exist at this

 		*)	# If an installed version does not exist at this

 			# point it probably got updated as a dependency

 			# point it probably got updated as a dependency

 				numports=$(( $numports - 1 ))

 				numports=$(( $numports - 1 ))

 				continue

 				continue

 			fi

 			fi

 		num=$(( $num + 1 ))

 		num=$(( $num + 1 ))

 		init_term_printf "$port ${num}/${numports}"

 		init_term_printf "$port ${num}/${numports}"

 		("$program" $ARGS $port) || update_failed=update_failed

 		("$program" $ARGS $port) || update_failed=update_failed

 		[ -n "$update_failed" ] && fail "Update for $port failed"

 		[ -n "$update_failed" ] && fail "Update for $port failed"

 	done

 	done

 	echo "===>>> Try $progname --help" ; echo '' ; safe_exit 1

 	echo "===>>> Try $progname --help" ; echo '' ; safe_exit 1

 }

 }

 	export_flavor $(flavor_part $portdir)

 	export_flavor $(flavor_part $portdir)

 	[ -n "$portdir" ] && { argv=$portdir ; unset portdir; }

 	[ -n "$portdir" ] && { argv=$portdir ; unset portdir; }

 	argv=${argv:-$1} ; argv=${argv%/} ; argv=`globstrip $argv`

 	argv=${argv:-$1} ; argv=${argv%/} ; argv=`globstrip $argv`

 			*)	echo '' ; no_valid_port ;;

 			*)	echo '' ; no_valid_port ;;

 			esac

 			esac

 		done ;;

 		done ;;

 	esac

 	esac

 	if [ -z "$portdir" -a -z "$upg_port" ]; then

 	if [ -z "$portdir" -a -z "$upg_port" ]; then

 		unset glob_dirs

 		unset glob_dirs

 	fi

 	fi

 	unset argv

 	unset argv

 	if [ -z "$PM_INDEX_ONLY" ]; then

 	if [ -z "$PM_INDEX_ONLY" ]; then

 		pm_isdir_pd "$portdir" ] || missing=missing

 		pm_isdir_pd "$portdir" ] || missing=missing

 	else

 	else

 		echo '' ; no_valid_port

 		echo '' ; no_valid_port

 	fi

 	fi

 			ro_upg_port=$arg2

 			ro_upg_port=$arg2

 		else

 		else

 			find_glob_dirs $arg2 && ro_upg_port=${glob_dirs#$pdb/}

 			find_glob_dirs $arg2 && ro_upg_port=${glob_dirs#$pdb/}

 	unset arg2

 	unset arg2

 	if [ -z "$ro_upg_port" ]; then

 	if [ -z "$ro_upg_port" ]; then

 		if [ "$?" -eq 1 ]; then

 		if [ "$?" -eq 1 ]; then

 			echo ''

 			echo ''

 			echo "===>>> The second argument to -o can be a package name,"

 			echo "===>>> The second argument to -o can be a package name,"

 	pm_isdir_pd "$moved_npd" || no_valid_port

 	pm_isdir_pd "$moved_npd" || no_valid_port

 	[ "$$" -eq "$PM_PARENT_PID" ] && parent_exit

 	[ "$$" -eq "$PM_PARENT_PID" ] && parent_exit

 	exec "$program" $ARGS -o $moved_npd $upg_port

 	exec "$program" $ARGS -o $moved_npd $upg_port

 	# NOT REACHED

 	# NOT REACHED

 fi

 fi

 	dir=$(dir_part $1)

 	dir=$(dir_part $1)

 	flavor=$(flavor_part $1)

 	flavor=$(flavor_part $1)

 }

 }

 if [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ]; then

 if [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ]; then

 		fi

 		fi

 	fi

 	fi

 # Do these things first time through

 # Do these things first time through

 if [ -z "$PM_INDEX_ONLY" -a -z "$PM_BUILDING" -a -z "$SHOW_WORK" -a -z "$NO_ACTION" ]; then

 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

 	# Do not start this in the background until we are sure we are going to proceed

 		export ppd

 		export ppd

 	fi

 	fi

 	if [ -z "$FETCH_ARGS" ]; then

 	if [ -z "$FETCH_ARGS" ]; then

 		FETCH_ARGS=`pm_make -f/usr/share/mk/bsd.port.mk -V FETCH_ARGS 2>/dev/null`

 		FETCH_ARGS=`pm_make -f/usr/share/mk/bsd.port.mk -V FETCH_ARGS 2>/dev/null`

 		pm_v "===>>> Available package ($latest_pv) matches the current version"

 		pm_v "===>>> Available package ($latest_pv) matches the current version"

 	elif [ -n "$latest_pv" -a -n "$PM_PACKAGES_NEWER" ]; then

 	elif [ -n "$latest_pv" -a -n "$PM_PACKAGES_NEWER" ]; then

 		if [ -n "$upg_port" ]; then

 		if [ -n "$upg_port" ]; then

 			\<)	use_package=up_newer

 			\<)	use_package=up_newer

 				pm_v "===>>> Available package ($latest_pv)"

 				pm_v "===>>> Available package ($latest_pv)"

 				pm_v "       is newer than installed ($upg_port)" ;;

 				pm_v "       is newer than installed ($upg_port)" ;;

 			pm_v "===>>> There is a package available ($latest_pv)"

 			pm_v "===>>> There is a package available ($latest_pv)"

 		fi

 		fi

 	elif [ -n "$latest_pv" ]; then

 	elif [ -n "$latest_pv" ]; then

 		\<)	# Could happen if ports tree is out of date

 		\<)	# Could happen if ports tree is out of date

 			use_package=up_old_tree

 			use_package=up_old_tree

 			pm_v "===>>> Available package ($latest_pv)"

 			pm_v "===>>> Available package ($latest_pv)"

 # Return flavor for named pkg (must be executed in port directory!)

 # Return flavor for named pkg (must be executed in port directory!)

 pkg_flavor () {

 pkg_flavor () {

 else

 else

 	[ -z "$local_package" ] && {

 	[ -z "$local_package" ] && {

 		fetch_package $latest_pv || fail "Fetch for ${latest_pv}.txz failed"; }

 		fetch_package $latest_pv || fail "Fetch for ${latest_pv}.txz failed"; }

 		    grep -v ^$LOCALBASE_COMPAT > $pm_mktemp_file

 		    grep -v ^$LOCALBASE_COMPAT > $pm_mktemp_file

 		unset temp

 		unset temp

 		    sort - $pm_mktemp_file | uniq -d`; do

 		    sort - $pm_mktemp_file | uniq -d`; do

 			temp="${temp}$file "

 			temp="${temp}$file "

 		done

 		done

 	if [ -n "$REPLACE_ORIGIN" -a -n "$ro_upg_port" ]; then # <se> not always true for port moved to flavored version with no version update???

 	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

 		# Delete any existing versions of the old port

 		pm_sv "Running pkg delete for $ro_upg_port"

 		pm_sv "Running pkg delete for $ro_upg_port"

 		pm_pkg_delete_s $ro_upg_port

 		pm_pkg_delete_s $ro_upg_port

 	fi

 	fi

 		# If $ro_upg_port was non-automatic, keep its state

 		# If $ro_upg_port was non-automatic, keep its state

 		if [ "${np_orphan:-1}" -eq 1 ]; then

 		if [ "${np_orphan:-1}" -eq 1 ]; then

 		fi

 		fi

 		pm_sv "Running pkg delete for $upg_port"

 		pm_sv "Running pkg delete for $upg_port"

 		pm_pkg_delete_s $upg_port

 		pm_pkg_delete_s $upg_port

 	[ -n "$local_package" ] && ppd=${LOCAL_PACKAGEDIR}/All

 	[ -n "$local_package" ] && ppd=${LOCAL_PACKAGEDIR}/All

 	echo "===>>> Installing package from: ${ppd}/${latest_pv}.txz"

 	echo "===>>> Installing package from: ${ppd}/${latest_pv}.txz"

 		if [ -n "$PM_DELETE_PACKAGES" ]; then

 		if [ -n "$PM_DELETE_PACKAGES" ]; then

 			pm_v "===>>> Deleting ${latest_pv}.txz"

 			pm_v "===>>> Deleting ${latest_pv}.txz"

 			pm_unlink_s ${ppd}/${latest_pv}.txz

 			pm_unlink_s ${ppd}/${latest_pv}.txz

 temp=`find $LOCALBASE_COMPAT -type d -empty 2>/dev/null`

 temp=`find $LOCALBASE_COMPAT -type d -empty 2>/dev/null`

 if [ -z "$temp" ] && pm_isdir "$LOCALBASE_COMPAT"; then

 if [ -z "$temp" ] && pm_isdir "$LOCALBASE_COMPAT"; then

 	unset files

 	unset files

 		$PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null

 		$PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null

 	fi

 	fi

 	unset temp file files

 	unset temp file files

 fi

 fi

 if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then

 if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then

 fi

 fi

 fi

 fi

 INSTALLED_LIST="${INSTALLED_LIST}\t${ilist}\n"

 INSTALLED_LIST="${INSTALLED_LIST}\t${ilist}\n"