Update to 1.1 from wip by maintainer. Tested on NetBSD current and Linux.

3 files changed, 47 insertions, 40 deletions

diff --git a/devel/bzr-svn/Makefile b/devel/bzr-svn/Makefile
index e63a572b96b..078e70faf40 100644
--- a/devel/bzr-svn/Makefile
+++ b/devel/bzr-svn/Makefile
@@ -1,31 +1,31 @@
-# $NetBSD: Makefile,v 1.18 2011/07/22 14:17:37 obache Exp $
+# $NetBSD: Makefile,v 1.19 2011/11/27 13:38:40 cheusov Exp $
 
 DISTNAME=	bzr-svn-${VER}
 CATEGORIES=	devel scm
-MASTER_SITES=	http://launchpad.net/bzr-svn/1.0/${VER}/+download/
+MASTER_SITES=	http://launchpad.net/bzr-svn/1.1/${VER}/+download/
 MASTER_SITES+=	http://samba.org/~jelmer/bzr/
-VER=		1.0.2
+VER=		1.1.1
 
-MAINTAINER=	jan.m.danielsson@gmail.com
+MAINTAINER=	ddeus.pkgsrc@mailnull.com
 HOMEPAGE=	http://bazaar-vcs.org/BzrForeignBranches/Subversion
 COMMENT=	Foreign Subversion repository support for Bazaar
 LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+PYTHON_PATCH_SCRIPTS= info.py wiki.py
+# Only this python versions are supported, see:
+# http://doc.bazaar.canonical.com/bzr.dev/en/whats-new/whats-new-in-2.4.html
+PYTHON_VERSIONS_ACCEPTED=	27 26
 
-DEPENDS+=	bzr>=2.0:../../devel/bzr
-DEPENDS+=	${PYPKGPREFIX}-subvertpy>=0.6.1:../../devel/py-subvertpy
+DEPENDS+=	${PYPKGPREFIX}-subvertpy>=0.8.8:../../devel/py-subvertpy
 
 .include "../../lang/python/pyversion.mk"
 
-.if ${PYVERSSUFFIX} == "2.4"
-DEPENDS=	${PYPKGPREFIX}-sqlite2>=2.3.5:../../databases/py-sqlite2
-.else
 DEPENDS=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-.endif
 
 # for make test
 USE_TOOLS+=	gmake
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 # NOTE: This must run in a UTF-8 locale, e.g. LC_TYPE=en_US.utf8 make test
 #TEST_DEPENDS+=	${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
@@ -33,5 +33,6 @@ USE_TOOLS+=	gmake
 #TEST_TARGET=	check-verbose
 
 .include "../../devel/bzr/plugin.mk"
+.include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bzr-svn/PLIST b/devel/bzr-svn/PLIST
index b3eae36b91b..02a4ecc49e1 100644
--- a/devel/bzr-svn/PLIST
+++ b/devel/bzr-svn/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.10 2011/07/22 14:17:37 obache Exp $
-${PYSITELIB}/bzr_svn-${PKGVERSION}-py2.6.egg-info
+@comment $NetBSD: PLIST,v 1.11 2011/11/27 13:38:40 cheusov Exp $
+${PYSITELIB}/bzr_svn-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info
 ${PYSITELIB}/bzrlib/plugins/svn/__init__.py
 ${PYSITELIB}/bzrlib/plugins/svn/__init__.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/__init__.pyo
@@ -45,12 +45,15 @@ ${PYSITELIB}/bzrlib/plugins/svn/errors.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/fetch.py
 ${PYSITELIB}/bzrlib/plugins/svn/fetch.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/fetch.pyo
+${PYSITELIB}/bzrlib/plugins/svn/filegraph.py
+${PYSITELIB}/bzrlib/plugins/svn/filegraph.pyc
+${PYSITELIB}/bzrlib/plugins/svn/filegraph.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/fileids.py
 ${PYSITELIB}/bzrlib/plugins/svn/fileids.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/fileids.pyo
-${PYSITELIB}/bzrlib/plugins/svn/format.py
-${PYSITELIB}/bzrlib/plugins/svn/format.pyc
-${PYSITELIB}/bzrlib/plugins/svn/format.pyo
+${PYSITELIB}/bzrlib/plugins/svn/graph.py
+${PYSITELIB}/bzrlib/plugins/svn/graph.pyc
+${PYSITELIB}/bzrlib/plugins/svn/graph.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/info.py
 ${PYSITELIB}/bzrlib/plugins/svn/info.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/info.pyo
@@ -60,9 +63,6 @@ ${PYSITELIB}/bzrlib/plugins/svn/keywords.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/layout/__init__.py
 ${PYSITELIB}/bzrlib/plugins/svn/layout/__init__.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/layout/__init__.pyo
-${PYSITELIB}/bzrlib/plugins/svn/layout/custom.py
-${PYSITELIB}/bzrlib/plugins/svn/layout/custom.pyc
-${PYSITELIB}/bzrlib/plugins/svn/layout/custom.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/layout/guess.py
 ${PYSITELIB}/bzrlib/plugins/svn/layout/guess.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/layout/guess.pyo
@@ -93,15 +93,15 @@ ${PYSITELIB}/bzrlib/plugins/svn/mapping3/scheme.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/mapping4.py
 ${PYSITELIB}/bzrlib/plugins/svn/mapping4.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/mapping4.pyo
+${PYSITELIB}/bzrlib/plugins/svn/metagraph.py
+${PYSITELIB}/bzrlib/plugins/svn/metagraph.pyc
+${PYSITELIB}/bzrlib/plugins/svn/metagraph.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/parents.py
 ${PYSITELIB}/bzrlib/plugins/svn/parents.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/parents.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/push.py
 ${PYSITELIB}/bzrlib/plugins/svn/push.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/push.pyo
-${PYSITELIB}/bzrlib/plugins/svn/pycompat.py
-${PYSITELIB}/bzrlib/plugins/svn/pycompat.pyc
-${PYSITELIB}/bzrlib/plugins/svn/pycompat.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/reconcile.py
 ${PYSITELIB}/bzrlib/plugins/svn/reconcile.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/reconcile.pyo
@@ -135,6 +135,15 @@ ${PYSITELIB}/bzrlib/plugins/svn/tags.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/tests/__init__.py
 ${PYSITELIB}/bzrlib/plugins/svn/tests/__init__.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/tests/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/svn/tests/layout/__init__.py
+${PYSITELIB}/bzrlib/plugins/svn/tests/layout/__init__.pyc
+${PYSITELIB}/bzrlib/plugins/svn/tests/layout/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/svn/tests/layout/test_guess.py
+${PYSITELIB}/bzrlib/plugins/svn/tests/layout/test_guess.pyc
+${PYSITELIB}/bzrlib/plugins/svn/tests/layout/test_guess.pyo
+${PYSITELIB}/bzrlib/plugins/svn/tests/layout/test_standard.py
+${PYSITELIB}/bzrlib/plugins/svn/tests/layout/test_standard.pyc
+${PYSITELIB}/bzrlib/plugins/svn/tests/layout/test_standard.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/tests/mapping3/__init__.py
 ${PYSITELIB}/bzrlib/plugins/svn/tests/mapping3/__init__.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/tests/mapping3/__init__.pyo
@@ -174,6 +183,9 @@ ${PYSITELIB}/bzrlib/plugins/svn/tests/test_checkout.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_commit.py
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_commit.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_commit.pyo
+${PYSITELIB}/bzrlib/plugins/svn/tests/test_commit_ids.py
+${PYSITELIB}/bzrlib/plugins/svn/tests/test_commit_ids.pyc
+${PYSITELIB}/bzrlib/plugins/svn/tests/test_commit_ids.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_config.py
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_config.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_config.pyo
@@ -192,24 +204,24 @@ ${PYSITELIB}/bzrlib/plugins/svn/tests/test_fileids.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_keywords.py
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_keywords.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_keywords.pyo
-${PYSITELIB}/bzrlib/plugins/svn/tests/test_layout.py
-${PYSITELIB}/bzrlib/plugins/svn/tests/test_layout.pyc
-${PYSITELIB}/bzrlib/plugins/svn/tests/test_layout.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_logwalker.py
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_logwalker.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_logwalker.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_mapping.py
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_mapping.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_mapping.pyo
+${PYSITELIB}/bzrlib/plugins/svn/tests/test_metagraph.py
+${PYSITELIB}/bzrlib/plugins/svn/tests/test_metagraph.pyc
+${PYSITELIB}/bzrlib/plugins/svn/tests/test_metagraph.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_parents.py
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_parents.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_parents.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_push.py
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_push.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_push.pyo
-${PYSITELIB}/bzrlib/plugins/svn/tests/test_radir.py
-${PYSITELIB}/bzrlib/plugins/svn/tests/test_radir.pyc
-${PYSITELIB}/bzrlib/plugins/svn/tests/test_radir.pyo
+${PYSITELIB}/bzrlib/plugins/svn/tests/test_remote.py
+${PYSITELIB}/bzrlib/plugins/svn/tests/test_remote.pyc
+${PYSITELIB}/bzrlib/plugins/svn/tests/test_remote.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_repository.py
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_repository.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_repository.pyo
@@ -219,6 +231,9 @@ ${PYSITELIB}/bzrlib/plugins/svn/tests/test_revmeta.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_revspec.py
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_revspec.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_revspec.pyo
+${PYSITELIB}/bzrlib/plugins/svn/tests/test_send.py
+${PYSITELIB}/bzrlib/plugins/svn/tests/test_send.pyc
+${PYSITELIB}/bzrlib/plugins/svn/tests/test_send.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_svk.py
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_svk.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_svk.pyo
@@ -228,12 +243,6 @@ ${PYSITELIB}/bzrlib/plugins/svn/tests/test_transport.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_tree.py
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_tree.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_tree.pyo
-${PYSITELIB}/bzrlib/plugins/svn/tests/test_upgrade.py
-${PYSITELIB}/bzrlib/plugins/svn/tests/test_upgrade.pyc
-${PYSITELIB}/bzrlib/plugins/svn/tests/test_upgrade.pyo
-${PYSITELIB}/bzrlib/plugins/svn/tests/test_versionedfiles.py
-${PYSITELIB}/bzrlib/plugins/svn/tests/test_versionedfiles.pyc
-${PYSITELIB}/bzrlib/plugins/svn/tests/test_versionedfiles.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_workingtree.py
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_workingtree.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/tests/test_workingtree.pyo
@@ -246,9 +255,6 @@ ${PYSITELIB}/bzrlib/plugins/svn/tree.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/util.py
 ${PYSITELIB}/bzrlib/plugins/svn/util.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/util.pyo
-${PYSITELIB}/bzrlib/plugins/svn/versionedfiles.py
-${PYSITELIB}/bzrlib/plugins/svn/versionedfiles.pyc
-${PYSITELIB}/bzrlib/plugins/svn/versionedfiles.pyo
 ${PYSITELIB}/bzrlib/plugins/svn/wiki.py
 ${PYSITELIB}/bzrlib/plugins/svn/wiki.pyc
 ${PYSITELIB}/bzrlib/plugins/svn/wiki.pyo
diff --git a/devel/bzr-svn/distinfo b/devel/bzr-svn/distinfo
index 2493264327c..7bcbf19645f 100644
--- a/devel/bzr-svn/distinfo
+++ b/devel/bzr-svn/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2011/07/22 14:17:37 obache Exp $
+$NetBSD: distinfo,v 1.14 2011/11/27 13:38:40 cheusov Exp $
 
-SHA1 (bzr-svn-1.0.2.tar.gz) = 7438c2be443fbfeab9bc88c582b4a1f46effecb1
-RMD160 (bzr-svn-1.0.2.tar.gz) = 996e96ac3cab3efa5f12baa34b68c265361cc153
-Size (bzr-svn-1.0.2.tar.gz) = 251988 bytes
+SHA1 (bzr-svn-1.1.1.tar.gz) = eb2f13ec2fd078bf4590a0002a842279f6b13187
+RMD160 (bzr-svn-1.1.1.tar.gz) = fb009de7e6c13ecfc6686716b0383d47af2d2760
+Size (bzr-svn-1.1.1.tar.gz) = 292162 bytes