3 files changed, 25 insertions, 13 deletions
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 272fb695813f..55b1b69e11fe 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/
 DISTNAME=	bzr-${PORTVERSION}
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 0ac37e53385c..101602a444e3 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-1.0.tar.gz) = b71c7920a157bb508284ad77abcedf94
-SHA256 (bzr-1.0.tar.gz) = a6308bf3755630c0012ff2f0aa0fa4713b8527e8a3e629346951666590465cf9
-SIZE (bzr-1.0.tar.gz) = 3381194
+MD5 (bzr-1.1.tar.gz) = 10e9aed1c63227a5cb12f00b03d4ac37
+SHA256 (bzr-1.1.tar.gz) = ece3273c6e090828394f6f8606575e424c3f8182a2c3d796ef5e880c50e1f3e2
+SIZE (bzr-1.1.tar.gz) = 3425781
diff --git a/devel/bzr/pkg-plist b/devel/bzr/pkg-plist
index da43c8a30569..9141e99d6888 100644
--- a/devel/bzr/pkg-plist
+++ b/devel/bzr/pkg-plist
@@ -241,9 +241,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/help.py
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/help_topics.py
-%%PYTHON_SITELIBDIR%%/bzrlib/help_topics.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/help_topics.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/help_topics/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/help_topics/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/help_topics/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/authentication.txt
+%%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/configuration.txt
+%%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/conflicts.txt
+%%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/hooks.txt
 %%PYTHON_SITELIBDIR%%/bzrlib/hooks.py
 %%PYTHON_SITELIBDIR%%/bzrlib/hooks.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/hooks.pyo
@@ -496,12 +500,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/HttpServer.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/HttpServer.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/HttpServer.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyo
@@ -838,6 +836,12 @@ bin/bzr
 %%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/http_server.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/http_server.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/http_server.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/http_utils.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/http_utils.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/http_utils.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
@@ -1057,6 +1061,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_implementations.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_implementations.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_implementations.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyo
@@ -1650,6 +1657,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/format_custom.py
+%%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/format_custom.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/format_custom.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/format_python.py
 %%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/format_python.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/format_python.pyo
@@ -1699,6 +1709,8 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc/api
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/export
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/help_topics
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad
 @dirrmtry %%PYTHON_SITELIBDIR%%/bzrlib/plugins
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/repofmt