6 files changed, 68 insertions, 8 deletions

diff --git a/devel/bazaar-ng/Makefile b/devel/bazaar-ng/Makefile
index eda54d1ce5f7..272fb695813f 100644
--- a/devel/bazaar-ng/Makefile
+++ b/devel/bazaar-ng/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.92
+PORTVERSION=	1.0
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/
 DISTNAME=	bzr-${PORTVERSION}
diff --git a/devel/bazaar-ng/distinfo b/devel/bazaar-ng/distinfo
index 67e678f19172..0ac37e53385c 100644
--- a/devel/bazaar-ng/distinfo
+++ b/devel/bazaar-ng/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-0.92.tar.gz) = f91e760d646660f0f790066ff0526b38
-SHA256 (bzr-0.92.tar.gz) = d0959781e6eb6ceb34fb1305d1fa61d106ad57600578e0090aac0325210e46ac
-SIZE (bzr-0.92.tar.gz) = 1879050
+MD5 (bzr-1.0.tar.gz) = b71c7920a157bb508284ad77abcedf94
+SHA256 (bzr-1.0.tar.gz) = a6308bf3755630c0012ff2f0aa0fa4713b8527e8a3e629346951666590465cf9
+SIZE (bzr-1.0.tar.gz) = 3381194
diff --git a/devel/bazaar-ng/pkg-plist b/devel/bazaar-ng/pkg-plist
index 3a6f64d2295e..da43c8a30569 100644
--- a/devel/bazaar-ng/pkg-plist
+++ b/devel/bazaar-ng/pkg-plist
@@ -295,6 +295,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/log.py
 %%PYTHON_SITELIBDIR%%/bzrlib/log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/log.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/lru_cache.py
+%%PYTHON_SITELIBDIR%%/bzrlib/lru_cache.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/lru_cache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lsprof.py
 %%PYTHON_SITELIBDIR%%/bzrlib/lsprof.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lsprof.pyo
@@ -478,6 +481,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/strace.py
 %%PYTHON_SITELIBDIR%%/bzrlib/strace.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/strace.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/switch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/switch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/switch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyo
@@ -541,6 +547,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat_revision.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat_revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat_revision.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_check.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_check.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_check.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyo
@@ -685,6 +694,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_switch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_switch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_switch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_tags.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_tags.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_tags.pyo
@@ -823,6 +835,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/commands/test_update.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/commands/test_update.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/commands/test_update.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/ftp_server.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/ftp_server.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/ftp_server.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.pyo
@@ -865,6 +880,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/helpers.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/helpers.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/helpers.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test__generate_text_key_index.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test__generate_text_key_index.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test__generate_text_key_index.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.pyo
@@ -883,6 +901,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_find_text_key_references.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_find_text_key_references.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_find_text_key_references.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_has_same_location.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_has_same_location.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_has_same_location.pyo
@@ -1075,6 +1096,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lru_cache.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lru_cache.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lru_cache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lsprof.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lsprof.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lsprof.pyo
@@ -1230,6 +1254,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_subsume.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_subsume.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_subsume.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_switch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_switch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_switch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyo
@@ -1323,6 +1350,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.pyo
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index eda54d1ce5f7..272fb695813f 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.92
+PORTVERSION=	1.0
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/
 DISTNAME=	bzr-${PORTVERSION}
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 67e678f19172..0ac37e53385c 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-0.92.tar.gz) = f91e760d646660f0f790066ff0526b38
-SHA256 (bzr-0.92.tar.gz) = d0959781e6eb6ceb34fb1305d1fa61d106ad57600578e0090aac0325210e46ac
-SIZE (bzr-0.92.tar.gz) = 1879050
+MD5 (bzr-1.0.tar.gz) = b71c7920a157bb508284ad77abcedf94
+SHA256 (bzr-1.0.tar.gz) = a6308bf3755630c0012ff2f0aa0fa4713b8527e8a3e629346951666590465cf9
+SIZE (bzr-1.0.tar.gz) = 3381194
diff --git a/devel/bzr/pkg-plist b/devel/bzr/pkg-plist
index 3a6f64d2295e..da43c8a30569 100644
--- a/devel/bzr/pkg-plist
+++ b/devel/bzr/pkg-plist
@@ -295,6 +295,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/log.py
 %%PYTHON_SITELIBDIR%%/bzrlib/log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/log.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/lru_cache.py
+%%PYTHON_SITELIBDIR%%/bzrlib/lru_cache.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/lru_cache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lsprof.py
 %%PYTHON_SITELIBDIR%%/bzrlib/lsprof.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lsprof.pyo
@@ -478,6 +481,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/strace.py
 %%PYTHON_SITELIBDIR%%/bzrlib/strace.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/strace.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/switch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/switch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/switch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyo
@@ -541,6 +547,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat_revision.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat_revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat_revision.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_check.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_check.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_check.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyo
@@ -685,6 +694,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_switch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_switch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_switch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_tags.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_tags.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_tags.pyo
@@ -823,6 +835,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/commands/test_update.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/commands/test_update.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/commands/test_update.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/ftp_server.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/ftp_server.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/ftp_server.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.pyo
@@ -865,6 +880,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/helpers.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/helpers.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/helpers.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test__generate_text_key_index.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test__generate_text_key_index.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test__generate_text_key_index.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.pyo
@@ -883,6 +901,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_find_text_key_references.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_find_text_key_references.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_find_text_key_references.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_has_same_location.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_has_same_location.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_has_same_location.pyo
@@ -1075,6 +1096,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lru_cache.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lru_cache.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lru_cache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lsprof.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lsprof.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lsprof.pyo
@@ -1230,6 +1254,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_subsume.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_subsume.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_subsume.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_switch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_switch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_switch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyo
@@ -1323,6 +1350,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.pyo