From e06c42072e0f4239c65261e649c862ae033ea7db Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 25 Feb 2007 08:05:22 +0000
Subject: [PATCH] Minor Bugfix ============ If a user were to specify
 /var/db/pkg/foo-1.2/ on the command line, the old code already failed, but by
 telling people that it's ok to do that now, I exposed one more place this
 needed to be fixed. Take the opportunity to fix this in a more thorough way.

---
 ports-mgmt/portmaster/Makefile               |  2 +-
 ports-mgmt/portmaster/files/portmaster.sh.in | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile
index 04d480d7a7db..10e8400cfb3c 100644
--- a/ports-mgmt/portmaster/Makefile
+++ b/ports-mgmt/portmaster/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	portmaster
-PORTVERSION=	1.13
+PORTVERSION=	1.14
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/ports-mgmt/portmaster/files/portmaster.sh.in b/ports-mgmt/portmaster/files/portmaster.sh.in
index a71d1a2e32a3..5eacbe3d7e6e 100644
--- a/ports-mgmt/portmaster/files/portmaster.sh.in
+++ b/ports-mgmt/portmaster/files/portmaster.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Local version: 1.151
+# Local version: 1.152
 # $FreeBSD$
 
 # Copyright (c) 2005-2007 Douglas Barton, All rights reserved
@@ -1191,20 +1191,19 @@ fi
 
 # Exercised in the common case of not using -p option
 case "$portdir" in
-'')	case "$1" in
+'')	argv=${1%/}
+	case "$argv" in
 	'')	test -z "$UPDATE_REQ_BYS" && usage ;;
-	${pd}/*)	portdir="${1#$pd/}" ;;
-	/*)	upg_port="${1##*/}" ;;
+	${pd}/*)	portdir="${argv#$pd/}" ;;
+	/*)	upg_port="${argv##*/}" ;;
 	\.)	portdir="${PWD##*/ports/}" ;;
-	*)	if [ -d "${pd}/${1}" ]; then
-			portdir=$1
+	*)	if [ -d "${pd}/${argv}" ]; then
+			portdir=$argv
 		else
-			upg_port=$1
+			upg_port=$argv
 		fi
 		;;
 	esac
-	portdir=${portdir%/}
-	upg_port=${upg_port%/}
 esac
 
 case "$upg_port" in