From owner-svn-src-user@FreeBSD.ORG  Tue Nov  9 05:28:07 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 98BB1106564A;
	Tue,  9 Nov 2010 05:28:07 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 87F1A8FC1B;
	Tue,  9 Nov 2010 05:28:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oA95S7Ve085109;
	Tue, 9 Nov 2010 05:28:07 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA95S7Va085107;
	Tue, 9 Nov 2010 05:28:07 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201011090528.oA95S7Va085107@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 9 Nov 2010 05:28:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215029 - user/dougb/portmaster
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Nov 2010 05:28:07 -0000

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