20 files changed, 55 insertions, 42 deletions

diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index d038e5db5a96..9ab682cff857 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		kicad
 DISTVERSION=    r${BZR_SRC_REV}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		cad
 DIST_SUBDIR=		${PORTNAME}
 MASTER_SITES=   ${MASTER_SITE_LOCAL}
@@ -85,7 +85,7 @@ BZR_DOC_REV!=        bzr revno lp:~kicad-developers/kicad/doc
 # pkg_add /usr/ports/pkg_amd64/All/kicad-devel*
 
 FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion
-FETCH_DEPENDS+= bzr:${PORTSDIR}/devel/bazaar-ng
+FETCH_DEPENDS+= bzr:${PORTSDIR}/devel/bzr
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
diff --git a/devel/bzr-builder/Makefile b/devel/bzr-builder/Makefile
index 34607001da91..63d07a54e8b4 100644
--- a/devel/bzr-builder/Makefile
+++ b/devel/bzr-builder/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzr-builder
 PORTVERSION=	0.7.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpadlibrarian.net/100761063/ \
 		http://www.c-s.li/ports/
@@ -16,8 +17,8 @@ COMMENT=	A bzr plugin to construct a bzr branch based on a "recipe"
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
+BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/bzr-colo/Makefile b/devel/bzr-colo/Makefile
index 670e1c061e9d..78ae89101b20 100644
--- a/devel/bzr-colo/Makefile
+++ b/devel/bzr-colo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzr-colo
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/91504187/ \
 		http://www.c-s.li/ports/
@@ -16,8 +17,8 @@ COMMENT=	Plugin for bzr to support colocated branches
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
+BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_PYTHON=	yes
diff --git a/devel/bzr-explorer/Makefile b/devel/bzr-explorer/Makefile
index f628aaa3bc61..20d01f201951 100644
--- a/devel/bzr-explorer/Makefile
+++ b/devel/bzr-explorer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bzr-explorer
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/93535508/ \
 		http://www.c-s.li/ports/
@@ -17,9 +17,9 @@ COMMENT=	Desktop application for using bzr
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
+BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bzrlib/plugins/qbzr/__init__.py:${PORTSDIR}/devel/qbzr \
-		bzr:${PORTSDIR}/devel/bazaar-ng
+		bzr:${PORTSDIR}/devel/bzr
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/devel/bzr-externals/Makefile b/devel/bzr-externals/Makefile
index a91a96366e48..8768f57aab55 100644
--- a/devel/bzr-externals/Makefile
+++ b/devel/bzr-externals/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzr-externals
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpadlibrarian.net/91495699/ \
 		http://www.c-s.li/ports/
@@ -16,8 +17,8 @@ COMMENT=	Support external branches like svn:externals
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
+BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 WRKSRC=		${WRKDIR}/externals
 
diff --git a/devel/bzr-git/Makefile b/devel/bzr-git/Makefile
index d35869e5b19e..e8c379e3ad0a 100644
--- a/devel/bzr-git/Makefile
+++ b/devel/bzr-git/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzr-git
 PORTVERSION=	0.6.8
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/98666746/ \
 		http://www.c-s.li/ports/
@@ -16,8 +17,8 @@ COMMENT=	Plugin for bzr to work with git trees
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng \
+BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr \
 		py*-dulwich>=0.8.0:${PORTSDIR}/devel/dulwich \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 
diff --git a/devel/bzr-grep/Makefile b/devel/bzr-grep/Makefile
index bc6cf0ef517b..fb6f8de962ee 100644
--- a/devel/bzr-grep/Makefile
+++ b/devel/bzr-grep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bzr-grep
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpadlibrarian.net/49936719/ \
 		http://www.c-s.li/ports/
@@ -15,8 +15,8 @@ MASTER_SITES=	http://launchpadlibrarian.net/49936719/ \
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Bazaar plugin to grep files
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
+BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 LICENSE=	GPLv2
 
diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile
index 1e7a04962fe9..fa9ba3b019c9 100644
--- a/devel/bzr-gtk/Makefile
+++ b/devel/bzr-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bzr-gtk
 PORTVERSION=	0.100.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpadlibrarian.net/65442805/ \
 		http://www.c-s.li/ports/
@@ -15,8 +15,8 @@ MASTER_SITES=	http://launchpadlibrarian.net/65442805/ \
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	GTK interface to Bazaar-NG VCS
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng \
+BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr \
 		${PYTHON_SITELIBDIR}/cairo:${PORTSDIR}/graphics/py-cairo
 
 LICENSE=	GPLv2
diff --git a/devel/bzr-loom/Makefile b/devel/bzr-loom/Makefile
index 40a5baafb72f..a331b25541bc 100644
--- a/devel/bzr-loom/Makefile
+++ b/devel/bzr-loom/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzr-loom
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpadlibrarian.net/94514373/ \
 		http://www.c-s.li/ports/
@@ -16,8 +17,8 @@ COMMENT=	Bazaar plugin to assist in developing focused patches
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
+BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/bzr-pipeline/Makefile b/devel/bzr-pipeline/Makefile
index 34d18e59ce81..c3bb0ed44dfb 100644
--- a/devel/bzr-pipeline/Makefile
+++ b/devel/bzr-pipeline/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzr-pipeline
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpadlibrarian.net/90476867/ \
 		http://www.c-s.li/ports/
@@ -16,8 +17,8 @@ COMMENT=	Bzr tools for working with a sequence of branches
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
+BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
diff --git a/devel/bzr-rewrite/Makefile b/devel/bzr-rewrite/Makefile
index 64ff6622b818..492031541dd3 100644
--- a/devel/bzr-rewrite/Makefile
+++ b/devel/bzr-rewrite/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzr-rewrite
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpadlibrarian.net/65470418/ \
 		http://www.c-s.li/ports/
@@ -14,8 +15,8 @@ MASTER_SITES=	http://launchpadlibrarian.net/65470418/ \
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	A bzr plugin that provides rewriting existing revisions
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
+BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 LICENSE=	GPLv2
 
diff --git a/devel/bzr-scmproj/Makefile b/devel/bzr-scmproj/Makefile
index db0bf0254f0f..de2cb6bd8901 100644
--- a/devel/bzr-scmproj/Makefile
+++ b/devel/bzr-scmproj/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzr-scmproj
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpadlibrarian.net/101701273/ \
 		http://www.c-s.li/ports/
@@ -16,8 +17,8 @@ COMMENT=	Organise and manage a collection of bzr branches
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
+BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
diff --git a/devel/bzr-stats/Makefile b/devel/bzr-stats/Makefile
index a76ca8edc2a2..3f24c696543e 100644
--- a/devel/bzr-stats/Makefile
+++ b/devel/bzr-stats/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzr-stats
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpadlibrarian.net/65203347/ \
 		http://www.c-s.li/ports/
@@ -14,8 +15,8 @@ MASTER_SITES=	http://launchpadlibrarian.net/65203347/ \
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Simple statistics plugin for bzr
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
+BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 LICENSE=	GPLv2
 
diff --git a/devel/bzr-svn/Makefile b/devel/bzr-svn/Makefile
index bb6ff297a8de..834ba5fc8c69 100644
--- a/devel/bzr-svn/Makefile
+++ b/devel/bzr-svn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzr-svn
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/102178824/ \
 		http://www.c-s.li/ports/
@@ -16,9 +17,9 @@ COMMENT=	Plugin for bzr to work with svn
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS+=	bzr:${PORTSDIR}/devel/bazaar-ng
+BUILD_DEPENDS+=	bzr:${PORTSDIR}/devel/bzr
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/subvertpy/__init__.py:${PORTSDIR}/devel/py-subvertpy \
-		bzr:${PORTSDIR}/devel/bazaar-ng
+		bzr:${PORTSDIR}/devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_PYTHON=	2.5+
diff --git a/devel/bzr-upload/Makefile b/devel/bzr-upload/Makefile
index 8d0386e34630..d85aab820588 100644
--- a/devel/bzr-upload/Makefile
+++ b/devel/bzr-upload/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzr-upload
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpadlibrarian.net/96912507/ \
 		http://www.c-s.li/ports/
@@ -16,7 +17,7 @@ COMMENT=	Bzr plugin to incrementally upload changes to a dumb server
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
+BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index a6c062a02035..cb1dafc5a5ff 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	bzrtools
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/90479443/
 
 MAINTAINER=	fullermd@over-yonder.net
-COMMENT=	Extensions to devel/bazaar-ng
+COMMENT=	Extensions to devel/bzr
 
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
+RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 OPTIONS=	GRAPHVIZ "Enable graphviz for graph-ancestry" off \
 		RSYNC    "Enable rsync for rspush" on
diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile
index 5761498dc9e7..6c335103a2e6 100644
--- a/devel/cvs2svn/Makefile
+++ b/devel/cvs2svn/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	cvs2svn
 PORTVERSION=	2.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/ \
 		LOCAL/glarkin
@@ -41,7 +41,7 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/git:${PORTSDIR}/devel/git
 .endif
 
 .if defined(WITH_BAZAAR)
-RUN_DEPENDS+=	${LOCALBASE}/bin/bzr:${PORTSDIR}/devel/bazaar-ng
+RUN_DEPENDS+=	${LOCALBASE}/bin/bzr:${PORTSDIR}/devel/bzr
 .endif
 
 MAN1=		cvs2svn.1 \
diff --git a/devel/qbzr/Makefile b/devel/qbzr/Makefile
index bc73e8a3ff7b..8f56214163f4 100644
--- a/devel/qbzr/Makefile
+++ b/devel/qbzr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qbzr
 PORTVERSION=	0.22.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpadlibrarian.net/93533531/ \
 		http://www.c-s.li/ports/
@@ -17,11 +17,11 @@ COMMENT=	Qt interface for bzr
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng \
+BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr \
 		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4 \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:${PORTSDIR}/textproc/py-pygments \
 		${PYTHON_PKGNAMEPREFIX}enchant>=0:${PORTSDIR}/textproc/py-enchant
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
+RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/editors/zim/Makefile b/editors/zim/Makefile
index b1f89cc87442..9c36c6fca0bf 100644
--- a/editors/zim/Makefile
+++ b/editors/zim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zim
 PORTVERSION=	0.56
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors python
 MASTER_SITES=	http://www.zim-wiki.org/downloads/
 
@@ -56,7 +56,7 @@ RUN_DEPENDS+=	scrot:${PORTSDIR}/graphics/scrot
 RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
 .endif
 .if defined(WITH_BZR)
-RUN_DEPENDS+=	bzr:${PORTSDIR}/devel/bazaar-ng
+RUN_DEPENDS+=	bzr:${PORTSDIR}/devel/bzr
 .endif
 .if defined(WITH_GIT)
 RUN_DEPENDS+=	git:${PORTSDIR}/devel/git
diff --git a/www/trac-bzr/Makefile b/www/trac-bzr/Makefile
index c9958737b4d8..77f9c688b70d 100644
--- a/www/trac-bzr/Makefile
+++ b/www/trac-bzr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzr
 PORTVERSION=	20110228
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://home.tiscali.cz/~cz210552/bsdports/tarballs/
 PKGNAMEPREFIX=	trac-
@@ -18,7 +19,7 @@ COMMENT=	Bazaar-NG plugin for Trac
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac bzr:${PORTSDIR}/devel/bazaar-ng
+RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac bzr:${PORTSDIR}/devel/bzr
 
 USE_PYTHON=		2.5+
 USE_PYDISTUTILS=	yes