3 files changed, 7 insertions, 24 deletions

diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index 749a9331b7b8..e59f22dfb7e3 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bzrtools
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.0
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://code.launchpad.net/bzrtools/stable/${PORTVERSION}/+download/
@@ -17,8 +17,7 @@ COMMENT=	Extensions to devel/bazaar-ng
 RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bazaar-ng
 
 OPTIONS=	GRAPHVIZ "Enable graphviz for graph-ancestry" on \
-		RSYNC    "Enable rsync for rspush" on \
-		BAZ      "Enable baz-import" off
+		RSYNC    "Enable rsync for rspush" on
 
 WRKSRC=	${WRKDIR}/bzrtools
 USE_PYTHON=	2.4+
@@ -27,16 +26,12 @@ PYDISTUTILS_PKGNAME=	BzrTools
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GRAPHVIZ)
+.if !defined(WITHOUT_GRAPHVIZ)
 RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
 .endif
 
-.if defined(WITH_RSYNC)
+.if !defined(WITHOUT_RSYNC)
 RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsync
 .endif
 
-.if defined(WITH_BAZ)
-RUN_DEPENDS+=	baz:${PORTSDIR}/devel/bazaar
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/devel/bzrtools/distinfo b/devel/bzrtools/distinfo
index fbbca3d26282..29ed32d40f83 100644
--- a/devel/bzrtools/distinfo
+++ b/devel/bzrtools/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzrtools-1.5.0.tar.gz) = 35648241d1857086a57860b31026b5e8
-SHA256 (bzrtools-1.5.0.tar.gz) = 5f3ebbc032338ffaa6967074f121a48627b3cf70142a06d3fd680e2f35c4a452
-SIZE (bzrtools-1.5.0.tar.gz) = 83739
+MD5 (bzrtools-1.6.0.tar.gz) = 82c5b96fd996bede6ed92759ef28a108
+SHA256 (bzrtools-1.6.0.tar.gz) = 6bc37df5b8f402d5f73e411f0e3b0b700f7f991266411fc5e2e3801354eab714
+SIZE (bzrtools-1.6.0.tar.gz) = 67962
diff --git a/devel/bzrtools/pkg-plist b/devel/bzrtools/pkg-plist
index 1331fdfeb2a3..8e436824f4ff 100644
--- a/devel/bzrtools/pkg-plist
+++ b/devel/bzrtools/pkg-plist
@@ -1,12 +1,6 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/baz_helper.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/baz_helper.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/baz_helper.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/baz_import.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/baz_import.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/baz_import.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branches.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branches.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branches.pyo
@@ -70,9 +64,6 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shell.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shell.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shell.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/show_paths.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/show_paths.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/show_paths.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.pyo
@@ -94,9 +85,6 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/shelf_tests.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/shelf_tests.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/shelf_tests.pyo
-%%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_cbranch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/test_cbranch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/tests/test_cbranch.pyo