From owner-svn-src-user@FreeBSD.ORG  Tue Mar 29 03:42:47 2011
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 ED3C51065670;
	Tue, 29 Mar 2011 03:42:47 +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 DE3F08FC13;
	Tue, 29 Mar 2011 03:42:47 +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 p2T3gl32015711;
	Tue, 29 Mar 2011 03:42:47 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2T3glCh015709;
	Tue, 29 Mar 2011 03:42:47 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201103290342.p2T3glCh015709@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 29 Mar 2011 03:42:47 +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: r220122 - 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, 29 Mar 2011 03:42:48 -0000

Author: dougb
Date: Tue Mar 29 03:42:47 2011
New Revision: 220122
URL: http://svn.freebsd.org/changeset/base/220122

Log:
  Handle ports specified by origin for --update-if-newer

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Tue Mar 29 01:17:30 2011	(r220121)
+++ user/dougb/portmaster/portmaster	Tue Mar 29 03:42:47 2011	(r220122)
@@ -2599,7 +2599,7 @@ multiport () {
 	# Global
 	PM_MULTI_PORTS=':' ; export PM_MULTI_PORTS
 
-	local port worklist_temp worklist portlist numports origin num
+	local port worklist_temp iport worklist portlist numports origin num
 
 	# Expand globs and check that the directories exist
 	for port in "$@"; do
@@ -2632,12 +2632,19 @@ multiport () {
 		check_interactive $port || continue
 
 		if [ -n "$PM_UPDATE_IF_NEWER" ]; then
-			if check_for_updates multi $port; then
-				if [ -n "$PM_VERBOSE" ]; then
-					echo ''
-					echo "===>>> $port is up to date, skipping"
+			case "$port" in
+			*/*)	iport=`iport_from_origin $port` ;;
+			*)	iport=$port ;;
+			esac
+
+			if [ -n "$iport" ]; then
+				if check_for_updates multi $port; then
+					if [ -n "$PM_VERBOSE" ]; then
+						echo ''
+						echo "===>>> $port is up to date, skipping"
+					fi
+					continue
 				fi
-				continue
 			fi
 		fi