Update to 2.5.0. Request by maintainer.

   List of changes is too big to place here, see
   doc/en/release-notes/bzr-2.5.txt

4 files changed, 115 insertions, 41 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index b53e123a783..255829097de 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.54 2012/03/16 04:31:15 obache Exp $
+# $NetBSD: Makefile,v 1.55 2012/03/16 20:53:45 cheusov Exp $
 
 DISTNAME=		bzr-${VER}
 PKGREVISION=		1
 CATEGORIES=		devel scm
 MASTER_SITES=		http://launchpad.net/bzr/${VER:R}/${VER}/+download/
-VER=			2.4.2
+VER=			2.5.0
 
 MAINTAINER=		ddeus.pkgsrc@mailnull.com
 HOMEPAGE=		http://bazaar-vcs.org/
diff --git a/devel/bzr/PLIST b/devel/bzr/PLIST
index 1a19656aa5c..4d1861a2e03 100644
--- a/devel/bzr/PLIST
+++ b/devel/bzr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2011/11/27 13:31:23 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.35 2012/03/16 20:53:45 cheusov Exp $
 bin/bzr
 ${PYSITELIB}/bzrlib/__init__.py
 ${PYSITELIB}/bzrlib/__init__.pyc
@@ -113,6 +113,9 @@ ${PYSITELIB}/bzrlib/bundle/serializer/v09.pyo
 ${PYSITELIB}/bzrlib/bundle/serializer/v4.py
 ${PYSITELIB}/bzrlib/bundle/serializer/v4.pyc
 ${PYSITELIB}/bzrlib/bundle/serializer/v4.pyo
+${PYSITELIB}/bzrlib/bzr_distutils.py
+${PYSITELIB}/bzrlib/bzr_distutils.pyc
+${PYSITELIB}/bzrlib/bzr_distutils.pyo
 ${PYSITELIB}/bzrlib/bzrdir.py
 ${PYSITELIB}/bzrlib/bzrdir.pyc
 ${PYSITELIB}/bzrlib/bzrdir.pyo
@@ -232,6 +235,9 @@ ${PYSITELIB}/bzrlib/email_message.pyo
 ${PYSITELIB}/bzrlib/errors.py
 ${PYSITELIB}/bzrlib/errors.pyc
 ${PYSITELIB}/bzrlib/errors.pyo
+${PYSITELIB}/bzrlib/estimate_compressed_size.py
+${PYSITELIB}/bzrlib/estimate_compressed_size.pyc
+${PYSITELIB}/bzrlib/estimate_compressed_size.pyo
 ${PYSITELIB}/bzrlib/export/__init__.py
 ${PYSITELIB}/bzrlib/export/__init__.pyc
 ${PYSITELIB}/bzrlib/export/__init__.pyo
@@ -256,6 +262,9 @@ ${PYSITELIB}/bzrlib/fetch.pyo
 ${PYSITELIB}/bzrlib/fifo_cache.py
 ${PYSITELIB}/bzrlib/fifo_cache.pyc
 ${PYSITELIB}/bzrlib/fifo_cache.pyo
+${PYSITELIB}/bzrlib/filter_tree.py
+${PYSITELIB}/bzrlib/filter_tree.pyc
+${PYSITELIB}/bzrlib/filter_tree.pyo
 ${PYSITELIB}/bzrlib/filters/__init__.py
 ${PYSITELIB}/bzrlib/filters/__init__.pyc
 ${PYSITELIB}/bzrlib/filters/__init__.pyo
@@ -296,10 +305,10 @@ ${PYSITELIB}/bzrlib/help_topics/en/content-filters.txt
 ${PYSITELIB}/bzrlib/help_topics/en/debug-flags.txt
 ${PYSITELIB}/bzrlib/help_topics/en/diverged-branches.txt
 ${PYSITELIB}/bzrlib/help_topics/en/eol.txt
-${PYSITELIB}/bzrlib/help_topics/en/location-alias.txt
 ${PYSITELIB}/bzrlib/help_topics/en/log-formats.txt
 ${PYSITELIB}/bzrlib/help_topics/en/patterns.txt
 ${PYSITELIB}/bzrlib/help_topics/en/rules.txt
+${PYSITELIB}/bzrlib/help_topics/en/url-special-chars.txt
 ${PYSITELIB}/bzrlib/hooks.py
 ${PYSITELIB}/bzrlib/hooks.pyc
 ${PYSITELIB}/bzrlib/hooks.pyo
@@ -513,6 +522,18 @@ ${PYSITELIB}/bzrlib/plugins/news_merge/tests/__init__.pyo
 ${PYSITELIB}/bzrlib/plugins/news_merge/tests/test_news_merge.py
 ${PYSITELIB}/bzrlib/plugins/news_merge/tests/test_news_merge.pyc
 ${PYSITELIB}/bzrlib/plugins/news_merge/tests/test_news_merge.pyo
+${PYSITELIB}/bzrlib/plugins/po_merge/__init__.py
+${PYSITELIB}/bzrlib/plugins/po_merge/__init__.pyc
+${PYSITELIB}/bzrlib/plugins/po_merge/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/po_merge/po_merge.py
+${PYSITELIB}/bzrlib/plugins/po_merge/po_merge.pyc
+${PYSITELIB}/bzrlib/plugins/po_merge/po_merge.pyo
+${PYSITELIB}/bzrlib/plugins/po_merge/tests/__init__.py
+${PYSITELIB}/bzrlib/plugins/po_merge/tests/__init__.pyc
+${PYSITELIB}/bzrlib/plugins/po_merge/tests/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/po_merge/tests/test_po_merge.py
+${PYSITELIB}/bzrlib/plugins/po_merge/tests/test_po_merge.pyc
+${PYSITELIB}/bzrlib/plugins/po_merge/tests/test_po_merge.pyo
 ${PYSITELIB}/bzrlib/plugins/weave_fmt/__init__.py
 ${PYSITELIB}/bzrlib/plugins/weave_fmt/__init__.pyc
 ${PYSITELIB}/bzrlib/plugins/weave_fmt/__init__.pyo
@@ -648,6 +669,9 @@ ${PYSITELIB}/bzrlib/smart/request.pyo
 ${PYSITELIB}/bzrlib/smart/server.py
 ${PYSITELIB}/bzrlib/smart/server.pyc
 ${PYSITELIB}/bzrlib/smart/server.pyo
+${PYSITELIB}/bzrlib/smart/signals.py
+${PYSITELIB}/bzrlib/smart/signals.pyc
+${PYSITELIB}/bzrlib/smart/signals.pyo
 ${PYSITELIB}/bzrlib/smart/vfs.py
 ${PYSITELIB}/bzrlib/smart/vfs.pyc
 ${PYSITELIB}/bzrlib/smart/vfs.pyo
@@ -720,6 +744,9 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_bound_branches.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_branch.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_branch.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_branch.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_branches.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_branches.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_branches.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_break_lock.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_break_lock.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_break_lock.pyo
@@ -774,6 +801,9 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_exceptions.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_export.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_export.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_export.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_export_pot.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_export_pot.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_export_pot.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_filesystem_cicp.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_filesystem_cicp.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_filesystem_cicp.pyo
@@ -834,6 +864,9 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_merge_directive.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_missing.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_missing.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_missing.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_mkdir.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_mkdir.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_mkdir.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_modified.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_modified.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_modified.pyo
@@ -918,6 +951,9 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_serve.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_shared_repository.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_shared_repository.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_shared_repository.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_shell_complete.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_shell_complete.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_shell_complete.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_shelve.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_shelve.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_shelve.pyo
@@ -1215,6 +1251,9 @@ ${PYSITELIB}/bzrlib/tests/per_intertree/__init__.pyo
 ${PYSITELIB}/bzrlib/tests/per_intertree/test_compare.py
 ${PYSITELIB}/bzrlib/tests/per_intertree/test_compare.pyc
 ${PYSITELIB}/bzrlib/tests/per_intertree/test_compare.pyo
+${PYSITELIB}/bzrlib/tests/per_intertree/test_file_content_matches.py
+${PYSITELIB}/bzrlib/tests/per_intertree/test_file_content_matches.pyc
+${PYSITELIB}/bzrlib/tests/per_intertree/test_file_content_matches.pyo
 ${PYSITELIB}/bzrlib/tests/per_inventory/__init__.py
 ${PYSITELIB}/bzrlib/tests/per_inventory/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/per_inventory/__init__.pyo
@@ -1257,9 +1296,6 @@ ${PYSITELIB}/bzrlib/tests/per_repository/test_fetch.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_file_graph.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_file_graph.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_file_graph.pyo
-${PYSITELIB}/bzrlib/tests/per_repository/test_fileid_involved.py
-${PYSITELIB}/bzrlib/tests/per_repository/test_fileid_involved.pyc
-${PYSITELIB}/bzrlib/tests/per_repository/test_fileid_involved.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_get_parent_map.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_get_parent_map.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_get_parent_map.pyo
@@ -1275,9 +1311,6 @@ ${PYSITELIB}/bzrlib/tests/per_repository/test_iter_reverse_revision_history.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_locking.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_locking.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_locking.pyo
-${PYSITELIB}/bzrlib/tests/per_repository/test_merge_directive.py
-${PYSITELIB}/bzrlib/tests/per_repository/test_merge_directive.pyc
-${PYSITELIB}/bzrlib/tests/per_repository/test_merge_directive.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_pack.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_pack.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_pack.pyo
@@ -1293,6 +1326,9 @@ ${PYSITELIB}/bzrlib/tests/per_repository/test_repository.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_revision.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_revision.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_revision.pyo
+${PYSITELIB}/bzrlib/tests/per_repository/test_signatures.py
+${PYSITELIB}/bzrlib/tests/per_repository/test_signatures.pyc
+${PYSITELIB}/bzrlib/tests/per_repository/test_signatures.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_statistics.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_statistics.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_statistics.pyo
@@ -1377,12 +1413,21 @@ ${PYSITELIB}/bzrlib/tests/per_repository_vf/test_check_reconcile.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository_vf/test_fetch.py
 ${PYSITELIB}/bzrlib/tests/per_repository_vf/test_fetch.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository_vf/test_fetch.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_fileid_involved.py
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_fileid_involved.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_fileid_involved.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository_vf/test_find_text_key_references.py
 ${PYSITELIB}/bzrlib/tests/per_repository_vf/test_find_text_key_references.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository_vf/test_find_text_key_references.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_merge_directive.py
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_merge_directive.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_merge_directive.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository_vf/test_reconcile.py
 ${PYSITELIB}/bzrlib/tests/per_repository_vf/test_reconcile.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository_vf/test_reconcile.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_refresh_data.py
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_refresh_data.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_refresh_data.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository_vf/test_repository.py
 ${PYSITELIB}/bzrlib/tests/per_repository_vf/test_repository.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository_vf/test_repository.pyo
@@ -1741,6 +1786,9 @@ ${PYSITELIB}/bzrlib/tests/test_eol_filters.pyo
 ${PYSITELIB}/bzrlib/tests/test_errors.py
 ${PYSITELIB}/bzrlib/tests/test_errors.pyc
 ${PYSITELIB}/bzrlib/tests/test_errors.pyo
+${PYSITELIB}/bzrlib/tests/test_estimate_compressed_size.py
+${PYSITELIB}/bzrlib/tests/test_estimate_compressed_size.pyc
+${PYSITELIB}/bzrlib/tests/test_estimate_compressed_size.pyo
 ${PYSITELIB}/bzrlib/tests/test_export.py
 ${PYSITELIB}/bzrlib/tests/test_export.pyc
 ${PYSITELIB}/bzrlib/tests/test_export.pyo
@@ -1750,12 +1798,18 @@ ${PYSITELIB}/bzrlib/tests/test_export_pot.pyo
 ${PYSITELIB}/bzrlib/tests/test_extract.py
 ${PYSITELIB}/bzrlib/tests/test_extract.pyc
 ${PYSITELIB}/bzrlib/tests/test_extract.pyo
+${PYSITELIB}/bzrlib/tests/test_features.py
+${PYSITELIB}/bzrlib/tests/test_features.pyc
+${PYSITELIB}/bzrlib/tests/test_features.pyo
 ${PYSITELIB}/bzrlib/tests/test_fetch.py
 ${PYSITELIB}/bzrlib/tests/test_fetch.pyc
 ${PYSITELIB}/bzrlib/tests/test_fetch.pyo
 ${PYSITELIB}/bzrlib/tests/test_fifo_cache.py
 ${PYSITELIB}/bzrlib/tests/test_fifo_cache.pyc
 ${PYSITELIB}/bzrlib/tests/test_fifo_cache.pyo
+${PYSITELIB}/bzrlib/tests/test_filter_tree.py
+${PYSITELIB}/bzrlib/tests/test_filter_tree.pyc
+${PYSITELIB}/bzrlib/tests/test_filter_tree.pyo
 ${PYSITELIB}/bzrlib/tests/test_filters.py
 ${PYSITELIB}/bzrlib/tests/test_filters.pyc
 ${PYSITELIB}/bzrlib/tests/test_filters.pyo
@@ -1804,6 +1858,9 @@ ${PYSITELIB}/bzrlib/tests/test_http_response.pyo
 ${PYSITELIB}/bzrlib/tests/test_https_ca_bundle.py
 ${PYSITELIB}/bzrlib/tests/test_https_ca_bundle.pyc
 ${PYSITELIB}/bzrlib/tests/test_https_ca_bundle.pyo
+${PYSITELIB}/bzrlib/tests/test_https_urllib.py
+${PYSITELIB}/bzrlib/tests/test_https_urllib.pyc
+${PYSITELIB}/bzrlib/tests/test_https_urllib.pyo
 ${PYSITELIB}/bzrlib/tests/test_i18n.py
 ${PYSITELIB}/bzrlib/tests/test_i18n.pyc
 ${PYSITELIB}/bzrlib/tests/test_i18n.pyo
@@ -2030,6 +2087,9 @@ ${PYSITELIB}/bzrlib/tests/test_smart_add.pyo
 ${PYSITELIB}/bzrlib/tests/test_smart_request.py
 ${PYSITELIB}/bzrlib/tests/test_smart_request.pyc
 ${PYSITELIB}/bzrlib/tests/test_smart_request.pyo
+${PYSITELIB}/bzrlib/tests/test_smart_signals.py
+${PYSITELIB}/bzrlib/tests/test_smart_signals.pyc
+${PYSITELIB}/bzrlib/tests/test_smart_signals.pyo
 ${PYSITELIB}/bzrlib/tests/test_smart_transport.py
 ${PYSITELIB}/bzrlib/tests/test_smart_transport.pyc
 ${PYSITELIB}/bzrlib/tests/test_smart_transport.pyo
@@ -2120,6 +2180,9 @@ ${PYSITELIB}/bzrlib/tests/test_upgrade.pyo
 ${PYSITELIB}/bzrlib/tests/test_upgrade_stacked.py
 ${PYSITELIB}/bzrlib/tests/test_upgrade_stacked.pyc
 ${PYSITELIB}/bzrlib/tests/test_upgrade_stacked.pyo
+${PYSITELIB}/bzrlib/tests/test_url_policy_open.py
+${PYSITELIB}/bzrlib/tests/test_url_policy_open.pyc
+${PYSITELIB}/bzrlib/tests/test_url_policy_open.pyo
 ${PYSITELIB}/bzrlib/tests/test_urlutils.py
 ${PYSITELIB}/bzrlib/tests/test_urlutils.pyc
 ${PYSITELIB}/bzrlib/tests/test_urlutils.pyo
@@ -2135,6 +2198,9 @@ ${PYSITELIB}/bzrlib/tests/test_version_info.pyo
 ${PYSITELIB}/bzrlib/tests/test_versionedfile.py
 ${PYSITELIB}/bzrlib/tests/test_versionedfile.pyc
 ${PYSITELIB}/bzrlib/tests/test_versionedfile.pyo
+${PYSITELIB}/bzrlib/tests/test_vf_search.py
+${PYSITELIB}/bzrlib/tests/test_vf_search.pyc
+${PYSITELIB}/bzrlib/tests/test_vf_search.pyo
 ${PYSITELIB}/bzrlib/tests/test_weave.py
 ${PYSITELIB}/bzrlib/tests/test_weave.pyc
 ${PYSITELIB}/bzrlib/tests/test_weave.pyo
@@ -2291,6 +2357,9 @@ ${PYSITELIB}/bzrlib/uncommit.pyo
 ${PYSITELIB}/bzrlib/upgrade.py
 ${PYSITELIB}/bzrlib/upgrade.pyc
 ${PYSITELIB}/bzrlib/upgrade.pyo
+${PYSITELIB}/bzrlib/url_policy_open.py
+${PYSITELIB}/bzrlib/url_policy_open.pyc
+${PYSITELIB}/bzrlib/url_policy_open.pyo
 ${PYSITELIB}/bzrlib/urlutils.py
 ${PYSITELIB}/bzrlib/urlutils.pyc
 ${PYSITELIB}/bzrlib/urlutils.pyo
@@ -2309,27 +2378,6 @@ ${PYSITELIB}/bzrlib/util/configobj/__init__.pyo
 ${PYSITELIB}/bzrlib/util/configobj/configobj.py
 ${PYSITELIB}/bzrlib/util/configobj/configobj.pyc
 ${PYSITELIB}/bzrlib/util/configobj/configobj.pyo
-${PYSITELIB}/bzrlib/util/effbot/__init__.py
-${PYSITELIB}/bzrlib/util/effbot/__init__.pyc
-${PYSITELIB}/bzrlib/util/effbot/__init__.pyo
-${PYSITELIB}/bzrlib/util/effbot/org/__init__.py
-${PYSITELIB}/bzrlib/util/effbot/org/__init__.pyc
-${PYSITELIB}/bzrlib/util/effbot/org/__init__.pyo
-${PYSITELIB}/bzrlib/util/effbot/org/gzip_consumer.py
-${PYSITELIB}/bzrlib/util/effbot/org/gzip_consumer.pyc
-${PYSITELIB}/bzrlib/util/effbot/org/gzip_consumer.pyo
-${PYSITELIB}/bzrlib/util/effbot/org/http_client.py
-${PYSITELIB}/bzrlib/util/effbot/org/http_client.pyc
-${PYSITELIB}/bzrlib/util/effbot/org/http_client.pyo
-${PYSITELIB}/bzrlib/util/effbot/org/http_manager.py
-${PYSITELIB}/bzrlib/util/effbot/org/http_manager.pyc
-${PYSITELIB}/bzrlib/util/effbot/org/http_manager.pyo
-${PYSITELIB}/bzrlib/util/elementtree/ElementTree.py
-${PYSITELIB}/bzrlib/util/elementtree/ElementTree.pyc
-${PYSITELIB}/bzrlib/util/elementtree/ElementTree.pyo
-${PYSITELIB}/bzrlib/util/elementtree/__init__.py
-${PYSITELIB}/bzrlib/util/elementtree/__init__.pyc
-${PYSITELIB}/bzrlib/util/elementtree/__init__.pyo
 ${PYSITELIB}/bzrlib/util/simplemapi.py
 ${PYSITELIB}/bzrlib/util/simplemapi.pyc
 ${PYSITELIB}/bzrlib/util/simplemapi.pyo
@@ -2357,6 +2405,9 @@ ${PYSITELIB}/bzrlib/versionedfile.pyo
 ${PYSITELIB}/bzrlib/vf_repository.py
 ${PYSITELIB}/bzrlib/vf_repository.pyc
 ${PYSITELIB}/bzrlib/vf_repository.pyo
+${PYSITELIB}/bzrlib/vf_search.py
+${PYSITELIB}/bzrlib/vf_search.pyc
+${PYSITELIB}/bzrlib/vf_search.pyo
 ${PYSITELIB}/bzrlib/views.py
 ${PYSITELIB}/bzrlib/views.pyc
 ${PYSITELIB}/bzrlib/views.pyo
@@ -2394,3 +2445,26 @@ ${PYSITELIB}/bzrlib/xml_serializer.py
 ${PYSITELIB}/bzrlib/xml_serializer.pyc
 ${PYSITELIB}/bzrlib/xml_serializer.pyo
 man/man1/bzr.1
+share/locale/ar/LC_MESSAGES/bzr.mo
+share/locale/ast/LC_MESSAGES/bzr.mo
+share/locale/bs/LC_MESSAGES/bzr.mo
+share/locale/ca/LC_MESSAGES/bzr.mo
+share/locale/de/LC_MESSAGES/bzr.mo
+share/locale/en_AU/LC_MESSAGES/bzr.mo
+share/locale/en_GB/LC_MESSAGES/bzr.mo
+share/locale/es/LC_MESSAGES/bzr.mo
+share/locale/fo/LC_MESSAGES/bzr.mo
+share/locale/fr/LC_MESSAGES/bzr.mo
+share/locale/gl/LC_MESSAGES/bzr.mo
+share/locale/it/LC_MESSAGES/bzr.mo
+share/locale/ja/LC_MESSAGES/bzr.mo
+share/locale/ms/LC_MESSAGES/bzr.mo
+share/locale/nl/LC_MESSAGES/bzr.mo
+share/locale/oc/LC_MESSAGES/bzr.mo
+share/locale/pl/LC_MESSAGES/bzr.mo
+share/locale/pt_BR/LC_MESSAGES/bzr.mo
+share/locale/ro/LC_MESSAGES/bzr.mo
+share/locale/ru/LC_MESSAGES/bzr.mo
+share/locale/sco/LC_MESSAGES/bzr.mo
+share/locale/tr/LC_MESSAGES/bzr.mo
+share/locale/ug/LC_MESSAGES/bzr.mo
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 0f68d3869b0..ec61f686709 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.38 2011/11/27 13:31:23 cheusov Exp $
+$NetBSD: distinfo,v 1.39 2012/03/16 20:53:45 cheusov Exp $
 
-SHA1 (bzr-2.4.2.tar.gz) = 3663b862dc8fb9729f9aae2427cbab2af9c901ad
-RMD160 (bzr-2.4.2.tar.gz) = 47ecfd1651d10aeea28c0dff3124c637dbbb93ab
-Size (bzr-2.4.2.tar.gz) = 7528721 bytes
-SHA1 (patch-ab) = 2de173e9703e8651cbf5a414c596c697268b27fe
+SHA1 (bzr-2.5.0.tar.gz) = 2eaf6340ffa35db425832419bbd88bb470d22af3
+RMD160 (bzr-2.5.0.tar.gz) = 3581accba3317b6f8b4ae889b0599d9546bb6877
+Size (bzr-2.5.0.tar.gz) = 9910498 bytes
+SHA1 (patch-ab) = a36f29e7100e79ebb0a333871b2b2f681553937a
diff --git a/devel/bzr/patches/patch-ab b/devel/bzr/patches/patch-ab
index 3c7d8aaf961..4b6b1d35ea4 100644
--- a/devel/bzr/patches/patch-ab
+++ b/devel/bzr/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.8 2011/11/27 13:31:23 cheusov Exp $
+$NetBSD: patch-ab,v 1.9 2012/03/16 20:53:46 cheusov Exp $
 
 # Honor PKGMANDIR
---- setup.py.orig	2010-03-24 07:18:08.000000000 +0000
-+++ setup.py
-@@ -709,7 +709,7 @@ else:
+--- setup.py.orig	2012-02-24 11:42:19.000000000 +0100
++++ setup.py	2012-03-13 09:25:47.000000000 +0100
+@@ -761,7 +761,7 @@
      if not 'bdist_egg' in sys.argv:
          # generate and install bzr.1 only with plain install, not the
          # easy_install one
 -        DATA_FILES = [('man/man1', ['bzr.1'])]
 +        DATA_FILES = [(os.getenv('PKGMANDIR', 'man') + '/man1', ['bzr.1'])]
  
+     DATA_FILES = DATA_FILES + I18N_FILES
      # std setup
-     ARGS = {'scripts': ['bzr'],