- Update to 1.3.0

PR:		121947
Submitted by:	Matthew D. Fuller <fullermd@over-yonder.net> (maintainer)

9 files changed, 57 insertions, 29 deletions

diff --git a/devel/bazaar-ng/Makefile b/devel/bazaar-ng/Makefile
index 30715e8248ad..501ca7c31bf0 100644
--- a/devel/bazaar-ng/Makefile
+++ b/devel/bazaar-ng/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/ \
-		https://launchpad.net/bzr/1.2/${PORTVERSION}/+download/
+		https://launchpad.net/bzr/1.3/${PORTVERSION}/+download/
 DISTNAME=	bzr-${PORTVERSION}
 
 MAINTAINER=	fullermd@over-yonder.net
@@ -20,7 +20,6 @@ OPTIONS=	SFTP "Enable Paramiko for SFTP support" on
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	bzr
-PYDISTUTILS_PKGVERSION=	${PORTVERSION}.0
 
 MAN1=		bzr.1
 
diff --git a/devel/bazaar-ng/distinfo b/devel/bazaar-ng/distinfo
index 49b046e600ba..1478fddf511a 100644
--- a/devel/bazaar-ng/distinfo
+++ b/devel/bazaar-ng/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-1.2.tar.gz) = 2134026c411b2183dd35c8427da2e170
-SHA256 (bzr-1.2.tar.gz) = cdbca41b88ee1c3dda1bc3c63d874b0b4a9b7d1b4c543f811c407974c5c34cb5
-SIZE (bzr-1.2.tar.gz) = 3453071
+MD5 (bzr-1.3.tar.gz) = 1af233c6fa0a68851bc6155b2f563c30
+SHA256 (bzr-1.3.tar.gz) = 45ae1d20b8a0cb1d450443d969fb5175b90bc5e6e183a65484936cf8be046b7c
+SIZE (bzr-1.3.tar.gz) = 3477457
diff --git a/devel/bazaar-ng/pkg-plist b/devel/bazaar-ng/pkg-plist
index 19640de53643..764ac0a86228 100644
--- a/devel/bazaar-ng/pkg-plist
+++ b/devel/bazaar-ng/pkg-plist
@@ -188,6 +188,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/directory_service.py
+%%PYTHON_SITELIBDIR%%/bzrlib/directory_service.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/directory_service.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/dirstate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/dirstate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/dirstate.pyo
@@ -362,18 +365,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/account.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/account.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/account.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_indirect.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_indirect.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_indirect.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_directory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_directory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_directory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_registration.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_registration.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_registration.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_account.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_account.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_account.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_indirect.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_indirect.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_indirect.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_directory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_directory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_directory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_service.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_service.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_service.pyo
@@ -578,6 +581,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_hooks.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_hooks.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_hooks.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignore.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignore.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignore.pyo
@@ -1016,6 +1022,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_directory_service.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_directory_service.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_directory_service.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_dirstate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_dirstate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_dirstate.pyo
@@ -1357,6 +1366,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_annotate_iter.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_annotate_iter.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_annotate_iter.pyo
 %%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
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 30715e8248ad..501ca7c31bf0 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/ \
-		https://launchpad.net/bzr/1.2/${PORTVERSION}/+download/
+		https://launchpad.net/bzr/1.3/${PORTVERSION}/+download/
 DISTNAME=	bzr-${PORTVERSION}
 
 MAINTAINER=	fullermd@over-yonder.net
@@ -20,7 +20,6 @@ OPTIONS=	SFTP "Enable Paramiko for SFTP support" on
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	bzr
-PYDISTUTILS_PKGVERSION=	${PORTVERSION}.0
 
 MAN1=		bzr.1
 
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 49b046e600ba..1478fddf511a 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-1.2.tar.gz) = 2134026c411b2183dd35c8427da2e170
-SHA256 (bzr-1.2.tar.gz) = cdbca41b88ee1c3dda1bc3c63d874b0b4a9b7d1b4c543f811c407974c5c34cb5
-SIZE (bzr-1.2.tar.gz) = 3453071
+MD5 (bzr-1.3.tar.gz) = 1af233c6fa0a68851bc6155b2f563c30
+SHA256 (bzr-1.3.tar.gz) = 45ae1d20b8a0cb1d450443d969fb5175b90bc5e6e183a65484936cf8be046b7c
+SIZE (bzr-1.3.tar.gz) = 3477457
diff --git a/devel/bzr/pkg-plist b/devel/bzr/pkg-plist
index 19640de53643..764ac0a86228 100644
--- a/devel/bzr/pkg-plist
+++ b/devel/bzr/pkg-plist
@@ -188,6 +188,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/directory_service.py
+%%PYTHON_SITELIBDIR%%/bzrlib/directory_service.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/directory_service.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/dirstate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/dirstate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/dirstate.pyo
@@ -362,18 +365,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/account.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/account.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/account.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_indirect.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_indirect.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_indirect.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_directory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_directory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_directory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_registration.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_registration.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_registration.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_account.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_account.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_account.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_indirect.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_indirect.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_indirect.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_directory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_directory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_directory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_service.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_service.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_service.pyo
@@ -578,6 +581,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_hooks.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_hooks.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_hooks.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignore.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignore.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignore.pyo
@@ -1016,6 +1022,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_directory_service.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_directory_service.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_directory_service.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_dirstate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_dirstate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_dirstate.pyo
@@ -1357,6 +1366,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_annotate_iter.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_annotate_iter.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_annotate_iter.pyo
 %%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
diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index c34ecf113a5f..445639e6c212 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	bzrtools
-PORTVERSION=	1.2.0
+PORTVERSION=	1.3.0
 CATEGORIES=	devel
-MASTER_SITES=	https://launchpad.net/bzrtools/stable/${PORTVERSION}/+download/
+MASTER_SITES=	https://launchpad.net/bzrtools/trunk/${PORTVERSION}/+download/
 
 MAINTAINER=	fullermd@over-yonder.net
 COMMENT=	Extensions to devel/bazaar-ng
diff --git a/devel/bzrtools/distinfo b/devel/bzrtools/distinfo
index ecdf4b052025..ec1dad63112d 100644
--- a/devel/bzrtools/distinfo
+++ b/devel/bzrtools/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzrtools-1.2.0.tar.gz) = f1f52a18b737d05f7fcc4a8be1b367d2
-SHA256 (bzrtools-1.2.0.tar.gz) = e343baa8ccebe7be332c82b507c4e2798887e020c46fbeec1581c6b6a831fc10
-SIZE (bzrtools-1.2.0.tar.gz) = 79300
+MD5 (bzrtools-1.3.0.tar.gz) = 543d75c063d17c261d2cdb9e2bb533bb
+SHA256 (bzrtools-1.3.0.tar.gz) = 2f18e59f81b1ef88b191fc7d0c220a3833aa42af8bc00a66796559835d254d32
+SIZE (bzrtools-1.3.0.tar.gz) = 80578
diff --git a/devel/bzrtools/pkg-plist b/devel/bzrtools/pkg-plist
index eddbd69419dd..e250edd08296 100644
--- a/devel/bzrtools/pkg-plist
+++ b/devel/bzrtools/pkg-plist
@@ -43,6 +43,9 @@
 %%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/link_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/link_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/link_tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patch.pyo
@@ -91,6 +94,9 @@
 %%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/test_link_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/test_link_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/test_link_tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/test_patch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/test_patch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/test_patch.pyo