From owner-svn-ports-all@freebsd.org  Mon Oct 22 12:06:41 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 45164FF9A71;
 Mon, 22 Oct 2018 12:06:41 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id EF9F4770D0;
 Mon, 22 Oct 2018 12:06:40 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA8E11C12C;
 Mon, 22 Oct 2018 12:06:40 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9MC6eEd036583;
 Mon, 22 Oct 2018 12:06:40 GMT (envelope-from se@FreeBSD.org)
Received: (from se@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9MC6eeM036581;
 Mon, 22 Oct 2018 12:06:40 GMT (envelope-from se@FreeBSD.org)
Message-Id: <201810221206.w9MC6eeM036581@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org
 using -f
From: Stefan Esser <se@FreeBSD.org>
Date: Mon, 22 Oct 2018 12:06:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r482743 - in head/ports-mgmt/portmaster: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: se
X-SVN-Commit-Paths: in head/ports-mgmt/portmaster: . files
X-SVN-Commit-Revision: 482743
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Oct 2018 12:06:41 -0000

Author: se
Date: Mon Oct 22 12:06:40 2018
New Revision: 482743
URL: https://svnweb.freebsd.org/changeset/ports/482743

Log:
  Fix upgrades of moved ports.

Modified:
  head/ports-mgmt/portmaster/Makefile
  head/ports-mgmt/portmaster/files/patch-portmaster

Modified: head/ports-mgmt/portmaster/Makefile
==============================================================================
--- head/ports-mgmt/portmaster/Makefile	Mon Oct 22 11:32:12 2018	(r482742)
+++ head/ports-mgmt/portmaster/Makefile	Mon Oct 22 12:06:40 2018	(r482743)
@@ -2,7 +2,7 @@
 
 PORTNAME=	portmaster
 PORTVERSION=	3.19
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	se@FreeBSD.org

Modified: head/ports-mgmt/portmaster/files/patch-portmaster
==============================================================================
--- head/ports-mgmt/portmaster/files/patch-portmaster	Mon Oct 22 11:32:12 2018	(r482742)
+++ head/ports-mgmt/portmaster/files/patch-portmaster	Mon Oct 22 12:06:40 2018	(r482743)
@@ -693,15 +693,22 @@
  		if [ "$?" -eq 1 ]; then
  			echo ''
  			echo "===>>> The second argument to -o can be a package name,"
-@@ -3142,8 +3169,9 @@ iport_from_pkgname () {
+@@ -3133,6 +3160,7 @@ if [ -z "$PM_INDEX_ONLY" ] && ! pm_isdir_pd "$portdir"
+ 	pm_isdir_pd "$moved_npd" || no_valid_port
  
+ 	[ "$$" -eq "$PM_PARENT_PID" ] && parent_exit
++	[ -z "$upg_port" ] && upg_port="$portdir"
+ 	exec "$program" $ARGS -o $moved_npd $upg_port
+ 	# NOT REACHED
+ fi
+@@ -3142,8 +3170,8 @@ iport_from_pkgname () {
+ 
  	dir=$(dir_part $1)
  	flavor=$(flavor_part $1)
 -	pkgname=$(FLAVOR=$flavor make -C "$pd/$dir" -V PKGNAME) || return 1
 -	pkg info -x "^${pkgname%-*}"'-[^-]*' 2>/dev/null
 +	pkgname=$(FLAVOR=$flavor pm_make -C "$pd/$dir" -V PKGNAME) &&
 +		$PKG_CMD query "%n-%v" "${pkgname%-*}"
-+#	$PKG_CMD info -xC "^${pkgname%-*}\$" 2>/dev/null
  }
  
  if [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ]; then