svn commit: r215029 - user/dougb/portmaster

[Doug Barton]

Author: dougb
Date: Tue Nov  9 05:28:07 2010
New Revision: 215029
URL: http://svn.freebsd.org/changeset/base/215029

Log:
  In usage() fill in $pd if it's empty (which it will be for -h|--help)
  
  Give a more helpful error message for -o when the port to be replaced
  isn't installed or listed as a dependency

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Tue Nov  9 02:53:24 2010	(r215028)
+++ user/dougb/portmaster/portmaster	Tue Nov  9 05:28:07 2010	(r215029)
@@ -264,6 +264,10 @@ safe_exit () {
 }
 
 usage () {
+	local pd
+
+	[ -z "$pd" ] && pd=/usr/ports
+
 	version
 	echo ''
 	echo 'Usage:'
@@ -2900,6 +2904,9 @@ else
 			echo ''
 			echo "===>>> The second argument to -o can be a port in $pdb,"
 			echo "       or a port directory from $pd"
+			echo ''
+			echo "       $ro_opd does not seem to be installed,"
+			echo '       or listed as a dependency'
 			echo '' ; no_valid_port
 		fi
 	fi