From owner-freebsd-ports-bugs@FreeBSD.ORG  Mon Jan  2 10:50:08 2006
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
X-Original-To: freebsd-ports-bugs@hub.freebsd.org
Delivered-To: freebsd-ports-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4BE2016A41F
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Mon,  2 Jan 2006 10:50:08 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7406543D66
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Mon,  2 Jan 2006 10:50:07 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k02Ao70R035859
	for <freebsd-ports-bugs@freefall.freebsd.org>;
	Mon, 2 Jan 2006 10:50:07 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k02Ao7Xc035858;
	Mon, 2 Jan 2006 10:50:07 GMT (envelope-from gnats)
Date: Mon, 2 Jan 2006 10:50:07 GMT
Message-Id: <200601021050.k02Ao7Xc035858@freefall.freebsd.org>
To: freebsd-ports-bugs@FreeBSD.org
From: KOMATSU Shinichiro <koma2@lovepeers.org>
Cc: 
Subject: Re: ports/91209: Problem with portupgrade 2.0
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: KOMATSU Shinichiro <koma2@lovepeers.org>
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jan 2006 10:50:08 -0000

The following reply was made to PR ports/91209; it has been noted by GNATS.

From: KOMATSU Shinichiro <koma2@lovepeers.org>
To: bug-followup@FreeBSD.org,derwood@naebunny.net,edwin@FreeBSD.org
Cc:  
Subject: Re: ports/91209: Problem with portupgrade 2.0
Date: Mon,  2 Jan 2006 19:49:25 +0900 (JST)

 Thank you for reporting. I also discovered this problem a few hours ago.
 
 The source of this trouble is that the following line exists in MOVED,
 
     lang/php4|lang/php4|2003-05-22|re-separated from www/mod_php4
 
 where "moved from" and "moved to" is the same,
 but portupgrade does not check this case and infinite loop occurs.
 
 Fix to this problem will be in the next portupgrade release,
 but in the meanwhile, whould you commit the following patch, please?
 
 Thanks.
 
 
 diff --exclude=CVS --exclude=*.log* -urN portupgrade.old/Makefile portupgrade/Makefile
 --- portupgrade.old/Makefile	Mon Jan  2 00:43:35 2006
 +++ portupgrade/Makefile	Mon Jan  2 19:32:09 2006
 @@ -7,7 +7,7 @@
  
  PORTNAME=	portupgrade
  PORTVERSION=	2.0.0
 -PORTREVISION=	0
 +PORTREVISION=	1
  PORTEPOCH=	1
  CATEGORIES=	sysutils
  MASTER_SITES=	http://dists.lovepeers.org/distfiles/portupgrade/
 diff --exclude=CVS --exclude=*.log* -urN portupgrade.old/files/patch-lib-portsdb.rb portupgrade/files/patch-lib-portsdb.rb
 --- portupgrade.old/files/patch-lib-portsdb.rb	Thu Jan  1 09:00:00 1970
 +++ portupgrade/files/patch-lib-portsdb.rb	Mon Jan  2 19:31:29 2006
 @@ -0,0 +1,18 @@
 +Index: lib/portsdb.rb
 +===================================================================
 +--- lib/portsdb.rb	(revision 54)
 ++++ lib/portsdb.rb	(revision 59)
 +@@ -87,8 +87,11 @@
 +       while true
 + 	if moved = @moved[me]
 + 	  t << moved
 +-	  me = moved.to
 +-	  break if me.nil?
 ++	  if me.nil? or me == moved.to
 ++	    break
 ++	  else
 ++	    me = moved.to
 ++	  end
 + 	else
 + 	  break
 + 	end