diff options
| author | Norikatsu Shigemura <nork@FreeBSD.org> | 2006-01-03 16:57:46 +0000 |
|---|---|---|
| committer | Norikatsu Shigemura <nork@FreeBSD.org> | 2006-01-03 16:57:46 +0000 |
| commit | 879e335dc35efc2cae25db42a10737da69adb6f1 (patch) | |
| tree | 2c89f0e98398ec7a144a1de559f9345f7b765812 /ports-mgmt/portupgrade | |
| parent | Update to 1.3.0 release. (diff) | |
Update to 2.0.1.
* 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.
PR: ports/91272
Submitted by: KOMATSU Shinichiro <koma2@lovepeers.org> (maintainer)
Notes
Notes:
svn path=/head/; revision=152671
Diffstat (limited to 'ports-mgmt/portupgrade')
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 4 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/distinfo | 6 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-lib-portsdb.rb | 16 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/pkg-plist | 1 |
4 files changed, 6 insertions, 21 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index c4ec8d5e9e33..bf0fdbc7e68d 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -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 --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo index 207b6494a34c..f75a9934a097 100644 --- a/ports-mgmt/portupgrade/distinfo +++ b/ports-mgmt/portupgrade/distinfo @@ -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 --git a/ports-mgmt/portupgrade/files/patch-lib-portsdb.rb b/ports-mgmt/portupgrade/files/patch-lib-portsdb.rb deleted file mode 100644 index 2a7d989170ae..000000000000 --- a/ports-mgmt/portupgrade/files/patch-lib-portsdb.rb +++ /dev/null @@ -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 --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist index 04bfc7e22267..03dffce2b2fa 100644 --- a/ports-mgmt/portupgrade/pkg-plist +++ b/ports-mgmt/portupgrade/pkg-plist @@ -37,5 +37,6 @@ share/zsh/site-functions/_pkgtools %%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 |