- Upgrade to 0.90

PR:		ports/115916
Submitted by:	maintainer (Matthew D. Fuller)

4 files changed, 83 insertions, 77 deletions

diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index 7dde16f2bf4e..27caf9047997 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bzrtools
-PORTVERSION=	0.18.0
+PORTVERSION=	0.90.0
 CATEGORIES=	devel
 MASTER_SITES=	http://panoramicfeedback.com/opensource/
 
diff --git a/devel/bzrtools/distinfo b/devel/bzrtools/distinfo
index b2aa1c9cf892..2a056e02d9d7 100644
--- a/devel/bzrtools/distinfo
+++ b/devel/bzrtools/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzrtools-0.18.0.tar.gz) = 557bfa1aeb3f0090fdac1651f5271bce
-SHA256 (bzrtools-0.18.0.tar.gz) = c376103aeddb03bbc92a2bafea2380d50392f7e39c8b38c57a0b60c3dbdcb31e
-SIZE (bzrtools-0.18.0.tar.gz) = 78015
+MD5 (bzrtools-0.90.0.tar.gz) = da7e97a4fd02a6b95cabfe5e187687ca
+SHA256 (bzrtools-0.90.0.tar.gz) = 014dd5f973875bfd6cdc47b0e67c271401c659904a7f3ab6ff946d5ca987fc20
+SIZE (bzrtools-0.90.0.tar.gz) = 81944
diff --git a/devel/bzrtools/files/patch-shelf.py b/devel/bzrtools/files/patch-shelf.py
index ff6074c90542..79fa40b83d67 100644
--- a/devel/bzrtools/files/patch-shelf.py
+++ b/devel/bzrtools/files/patch-shelf.py
@@ -1,11 +1,11 @@
---- shelf.py.bak	Tue Feb 27 16:17:33 2007
-+++ shelf.py	Tue Feb 27 16:40:17 2007
+--- shelf.py.orig	Tue Aug 14 19:01:41 2007
++++ shelf.py	Mon Aug 20 17:16:40 2007
 @@ -250,7 +250,7 @@
          if reverse:
              args.append('-R')
          if dry_run:
 -            args.append('--dry-run')
 +            args.append('--check')
-             stdout = stderr = subprocess.PIPE
+             stderr = subprocess.PIPE
          else:
-             stdout = stderr = None
+             stderr = None
diff --git a/devel/bzrtools/pkg-plist b/devel/bzrtools/pkg-plist
index f6e30faea856..22e554d1c274 100644
--- a/devel/bzrtools/pkg-plist
+++ b/devel/bzrtools/pkg-plist
@@ -1,110 +1,116 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/baz_import.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/baz_import.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/baz_import.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branch_mark.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branch_mark.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branch_mark.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branches.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branches.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branches.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branchhistory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branchhistory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branchhistory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/bzrtools.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/bzrtools.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/bzrtools.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/cbranch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/cbranch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/cbranch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/clean_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/clean_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/clean_tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/colordiff.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/colordiff.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/colordiff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/command.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/command.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/command.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/dotgraph.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/dotgraph.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/dotgraph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/errors.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/errors.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/errors.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fai.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fai.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fai.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fetch_ghosts.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fetch_ghosts.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fetch_ghosts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/graph.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/graph.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/hunk_selector.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/hunk_selector.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/hunk_selector.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patchsource.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patchsource.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patchsource.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/progress.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/progress.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/progress.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/release.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/release.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/release.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shell.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shell.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shell.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/show_paths.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/show_paths.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/show_paths.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/switch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/switch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/switch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/test.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/upstream_import.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/userinteractor.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/zap.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/test.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/test.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/blackbox.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/clean_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/is_clean.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/shelf_tests.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/test_baz_import.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/upstream_import.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/blackbox.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/clean_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/is_clean.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/shelf_tests.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/test_baz_import.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/upstream_import.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/blackbox.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/blackbox.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/blackbox.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/clean_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/clean_tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/clean_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/is_clean.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/is_clean.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/is_clean.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/shelf_tests.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/shelf_tests.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/shelf_tests.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/test_baz_import.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/test_baz_import.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/test_baz_import.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/upstream_import.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/upstream_import.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/upstream_import.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/baz_import.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branch_mark.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branches.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branchhistory.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/bzrtools.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/cbranch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/clean_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/colordiff.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/dotgraph.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/errors.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fai.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fetch_ghosts.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/graph.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/hunk_selector.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patchsource.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/progress.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/release.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shell.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/show_paths.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/switch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/test.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/upstream_import.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/upstream_import.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/userinteractor.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/zap.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/baz_import.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branch_mark.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branches.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branchhistory.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/bzrtools.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/cbranch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/clean_tree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/colordiff.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/dotgraph.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/errors.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fai.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fetch_ghosts.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/graph.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/hunk_selector.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patchsource.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/progress.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/release.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shell.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/show_paths.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/switch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/test.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/upstream_import.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/userinteractor.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/userinteractor.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/userinteractor.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/version.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/version.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/version.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/zap.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/zap.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/zap.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools