From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 3 16:50:09 2006 Return-Path: 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 4C68B16A44B for ; Tue, 3 Jan 2006 16:50:09 +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 3932F43D5E for ; Tue, 3 Jan 2006 16:50:08 +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 k03Go8Jr041099 for ; Tue, 3 Jan 2006 16:50:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k03Go8Yc041098; Tue, 3 Jan 2006 16:50:08 GMT (envelope-from gnats) Resent-Date: Tue, 3 Jan 2006 16:50:08 GMT Resent-Message-Id: <200601031650.k03Go8Yc041098@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KOMATSU Shinichiro Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7443216A41F for ; Tue, 3 Jan 2006 16:44:06 +0000 (GMT) (envelope-from koma2@timedia.co.jp) Received: from timedia.co.jp (nurikabe.timedia.co.jp [218.225.123.151]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3CF743D55 for ; Tue, 3 Jan 2006 16:44:04 +0000 (GMT) (envelope-from koma2@timedia.co.jp) Received: by koma2-45.wins.timedia.co.jp (Postfix, from userid 1000) id 49BF81160C; Wed, 4 Jan 2006 01:44:01 +0900 (JST) Message-Id: <20060103164401.49BF81160C@koma2-45.wins.timedia.co.jp> Date: Wed, 4 Jan 2006 01:44:01 +0900 (JST) From: KOMATSU Shinichiro To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/91272: sysutils/portupgrade: Update to 2.0.1. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: KOMATSU Shinichiro List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jan 2006 16:50:09 -0000 >Number: 91272 >Category: ports >Synopsis: sysutils/portupgrade: Update to 2.0.1. >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jan 03 16:50:07 GMT 2006 >Closed-Date: >Last-Modified: >Originator: KOMATSU Shinichiro >Release: FreeBSD 5.4-RELEASE-p8 i386 >Organization: >Environment: FreeBSD 5.4-RELEASE-p8 i386 >Description: portupgrade-2.0.1 has been released. * portversion(1) also reads MOVED and trace origin change, and, when invoked with "-v", displays the new origin. Example: % portversion -v screen screen-4.0.2_2 < needs updating (port has 4.0.2_3) (=> 'sysutils/screen') * Add "--ignore-moved" to portupgrade(1) and portversion(1). When invoked with this option, both programs totally ignore MOVED. If you encounter strange behaviour of these programs, try this out. * Add IGNORE_MOVED option to pkgtools.conf. This can be used to selectively ignore MOVED by pkgs. See pkgtools.conf.sample for details. * Keep the order of MOVED entries, and do not trace back to old entries. Previously, when encounters the following entries, editors/emacs|editors/emacs19|2004-03-20|emacs 19.x moved to a non-default port location editors/emacs21|editors/emacs|2004-03-20|emacs 21.x moved to default port location portupgrade traces as "editors/emacs21" -> "editors/emacs" -> "editors/emacs19". I thought this behavior should not be what we want to, so added this change. >How-To-Repeat: >Fix: diff --exclude=CVS --exclude=*.log* -urN portupgrade.old/Makefile portupgrade/Makefile --- portupgrade.old/Makefile Tue Jan 3 01:20:56 2006 +++ portupgrade/Makefile Wed Jan 4 01:27:43 2006 @@ -6,8 +6,8 @@ # PORTNAME= portupgrade -PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTVERSION= 2.0.1 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= http://dists.lovepeers.org/distfiles/portupgrade/ diff --exclude=CVS --exclude=*.log* -urN portupgrade.old/distinfo portupgrade/distinfo --- portupgrade.old/distinfo Mon Jan 2 00:43:35 2006 +++ portupgrade/distinfo Wed Jan 4 01:32:52 2006 @@ -1,3 +1,3 @@ -MD5 (pkgtools-2.0.0.tar.bz2) = 95b496794b27ee6b4ca3308ca7c738b1 -SHA256 (pkgtools-2.0.0.tar.bz2) = adab18918dff6190a9a29035e77521975a2acd4359754309548c026416d21aa0 -SIZE (pkgtools-2.0.0.tar.bz2) = 106316 +MD5 (pkgtools-2.0.1.tar.bz2) = 807d87a5512b91951a10689e856da055 +SHA256 (pkgtools-2.0.1.tar.bz2) = 5a4c1cb1c3b2cea0bee48faa4a25f0ae4ebe3a597384294ef2f1bdb9e27e5882 +SIZE (pkgtools-2.0.1.tar.bz2) = 107654 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 Mon Jan 2 20:03:25 2006 +++ portupgrade/files/patch-lib-portsdb.rb Thu Jan 1 09:00:00 1970 @@ -1,16 +0,0 @@ ---- lib/portsdb.rb.orig Mon Jan 2 21:58:23 2006 -+++ lib/portsdb.rb Mon Jan 2 21:58:55 2006 -@@ -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 diff --exclude=CVS --exclude=*.log* -urN portupgrade.old/pkg-plist portupgrade/pkg-plist --- portupgrade.old/pkg-plist Sat Feb 7 17:56:58 2004 +++ portupgrade/pkg-plist Wed Jan 4 01:33:07 2006 @@ -37,5 +37,6 @@ %%PORTDOCS%%@dirrm share/examples/pkgtools/tcsh %%PORTDOCS%%@dirrm share/examples/pkgtools %%PORTDOCS%%share/doc/pkgtools/ChangeLog +%%PORTDOCS%%share/doc/pkgtools/NEWS %%PORTDOCS%%share/doc/pkgtools/README %%PORTDOCS%%@dirrm share/doc/pkgtools >Release-Note: >Audit-Trail: >Unformatted: