17 files changed, 17 insertions, 498 deletions
diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index ddad4cee960c..c416ad0e63f5 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bzrtools
 PORTVERSION=	2.6.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpad.net/bzrtools/stable/${PORTVERSION}/+download/
 
diff --git a/devel/bzrtools/pkg-plist b/devel/bzrtools/pkg-plist
index 815984d73418..783243b3633a 100644
--- a/devel/bzrtools/pkg-plist
+++ b/devel/bzrtools/pkg-plist
@@ -64,9 +64,6 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/setup.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/setup.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/setup.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.pyo
diff --git a/devel/py-astroid/Makefile b/devel/py-astroid/Makefile
index 86a669d6ff65..b1ab13ed9c49 100644
--- a/devel/py-astroid/Makefile
+++ b/devel/py-astroid/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	astroid
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	https://bitbucket.org/logilab/astroid/get/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +19,6 @@ WRKSRC=			${WRKDIR}/logilab-astroid-e003574ae51b
 MAKE_ENV=		NO_SETUPTOOLS=1
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	astroid
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/py-astroid/pkg-plist b/devel/py-astroid/pkg-plist
index 41e250704d12..b992ed3aab26 100644
--- a/devel/py-astroid/pkg-plist
+++ b/devel/py-astroid/pkg-plist
@@ -58,9 +58,6 @@
 %%PYTHON_SITELIBDIR%%/astroid/scoped_nodes.py
 %%PYTHON_SITELIBDIR%%/astroid/scoped_nodes.pyc
 %%PYTHON_SITELIBDIR%%/astroid/scoped_nodes.pyo
-%%PYTHON_SITELIBDIR%%/astroid/setup.py
-%%PYTHON_SITELIBDIR%%/astroid/setup.pyc
-%%PYTHON_SITELIBDIR%%/astroid/setup.pyo
 %%PYTHON_SITELIBDIR%%/astroid/test/data/MyPyPa-0.1.0-py2.5.egg
 %%PYTHON_SITELIBDIR%%/astroid/test/data/MyPyPa-0.1.0-py2.5.zip
 %%PYTHON_SITELIBDIR%%/astroid/test/data/SSL1/Connection1.py
diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile
index 85964a13669d..eaa07ce63c2b 100644
--- a/devel/py-logilab-common/Makefile
+++ b/devel/py-logilab-common/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	logilab-common
 PORTVERSION=	0.61.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	LOGILAB/common
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Common low-level libraries shared among logilab projects
 LICENSE=	LGPL20
 
 MAKE_ENV=	NO_SETUPTOOLS=1
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-logilab-common/pkg-plist b/devel/py-logilab-common/pkg-plist
index d4cef9843003..b6b21c857e32 100644
--- a/devel/py-logilab-common/pkg-plist
+++ b/devel/py-logilab-common/pkg-plist
@@ -84,9 +84,6 @@ bin/pytest
 %%PYTHON_SITELIBDIR%%/logilab/common/registry.py
 %%PYTHON_SITELIBDIR%%/logilab/common/registry.pyc
 %%PYTHON_SITELIBDIR%%/logilab/common/registry.pyo
-%%PYTHON_SITELIBDIR%%/logilab/common/setup.py
-%%PYTHON_SITELIBDIR%%/logilab/common/setup.pyc
-%%PYTHON_SITELIBDIR%%/logilab/common/setup.pyo
 %%PYTHON_SITELIBDIR%%/logilab/common/shellutils.py
 %%PYTHON_SITELIBDIR%%/logilab/common/shellutils.pyc
 %%PYTHON_SITELIBDIR%%/logilab/common/shellutils.pyo
diff --git a/devel/pylint/Makefile b/devel/pylint/Makefile
index e964464ebc2a..8c125f0f037a 100644
--- a/devel/pylint/Makefile
+++ b/devel/pylint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pylint
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	LOGILAB
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
@@ -19,10 +20,6 @@ USE_PYDISTUTILS=	yes
 
 OPTIONS_DEFINE=	GUI
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGUI}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-.endif
+GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
 
 .include <bsd.port.mk>
diff --git a/devel/pylint/pkg-plist b/devel/pylint/pkg-plist
index 77318d91d2ec..dc694ba353da 100644
--- a/devel/pylint/pkg-plist
+++ b/devel/pylint/pkg-plist
@@ -108,9 +108,6 @@ bin/symilar
 %%PYTHON_SITELIBDIR%%/pylint/reporters/text.py
 %%PYTHON_SITELIBDIR%%/pylint/reporters/text.pyc
 %%PYTHON_SITELIBDIR%%/pylint/reporters/text.pyo
-%%PYTHON_SITELIBDIR%%/pylint/setup.py
-%%PYTHON_SITELIBDIR%%/pylint/setup.pyc
-%%PYTHON_SITELIBDIR%%/pylint/setup.pyo
 %%PYTHON_SITELIBDIR%%/pylint/test/data/__init__.py
 %%PYTHON_SITELIBDIR%%/pylint/test/data/classes_No_Name.dot
 %%PYTHON_SITELIBDIR%%/pylint/test/data/clientmodule_test.py
diff --git a/devel/qbzr/Makefile b/devel/qbzr/Makefile
index 1de511847d35..d498f33c0b3e 100644
--- a/devel/qbzr/Makefile
+++ b/devel/qbzr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qbzr
 PORTVERSION=	0.23.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpadlibrarian.net/109906138/ \
 		http://www.c-s.li/ports/
@@ -21,9 +21,10 @@ RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_PYTHON=	yes
-USE_QT4=	# empty
+USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+USE_QT4=	# empty
 USES=		gettext
 INSTALLS_ICONS=	yes
 
diff --git a/devel/qbzr/pkg-plist b/devel/qbzr/pkg-plist
deleted file mode 100644
index 367930072c7d..000000000000
--- a/devel/qbzr/pkg-plist
+++ /dev/null
@@ -1,451 +0,0 @@
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/AUTHORS.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/COPYING.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/NEWS.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/README.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/TODO.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/add.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/add.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/add.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/annotate.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/annotate.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/annotate.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/autocomplete.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/autocomplete.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/autocomplete.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/bind.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/bind.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/bind.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/branch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/branch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/branch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/browse.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/browse.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/browse.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/bugs.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/bugs.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/bugs.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/cat.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/cat.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/cat.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/commands.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/commands.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/commands.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/commit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/commit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/commit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/commit_data.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/commit_data.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/commit_data.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/compatibility.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/compatibility.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/compatibility.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/conditional_dataview.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/conditional_dataview.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/conditional_dataview.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/config.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/config.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/config.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/conflicts.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/conflicts.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/conflicts.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/decorators.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/decorators.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/decorators.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/diff.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/diff.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/diff.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/diff_arg.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/diff_arg.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/diff_arg.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/diffview.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/diffview.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/diffview.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/diffwindow.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/diffwindow.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/diffwindow.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/encoding_selector.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/encoding_selector.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/encoding_selector.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/export.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/export.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/export.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/extra/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/extra/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/extra/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/extra/bugurl.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/extra/bugurl.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/extra/bugurl.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/extra/isignored.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/extra/isignored.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/extra/isignored.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/extra/isversioned.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/extra/isversioned.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/extra/isversioned.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/fake_branch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/fake_branch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/fake_branch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/getnew.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/getnew.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/getnew.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/getupdates.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/getupdates.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/getupdates.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/help.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/help.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/help.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/html_log.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/html_log.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/html_log.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/i18n.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/i18n.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/i18n.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ignore.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ignore.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ignore.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/info.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/info.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/info.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/init.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/init.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/init.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/lazycachedrevloader.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/lazycachedrevloader.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/lazycachedrevloader.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/log.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/log.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/log.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/loggraphviz.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/loggraphviz.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/loggraphviz.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/logmodel.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/logmodel.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/logmodel.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/logwidget.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/logwidget.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/logwidget.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/main.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/main.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/main.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/plugins.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/plugins.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/plugins.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/pull.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/pull.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/pull.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/resources.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/resources.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/resources.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/revert.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/revert.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/revert.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/revisionmessagebrowser.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/revisionmessagebrowser.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/revisionmessagebrowser.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/revisionview.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/revisionview.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/revisionview.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/revtreeview.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/revtreeview.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/revtreeview.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/run.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/run.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/run.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/send.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/send.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/send.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/shelvewindow.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/shelvewindow.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/shelvewindow.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/spellcheck.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/spellcheck.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/spellcheck.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/spellcheck_enchant.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/spellcheck_enchant.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/spellcheck_enchant.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/statuscache.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/statuscache.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/statuscache.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/subprocess.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/subprocess.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/subprocess.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/switch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/switch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/switch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/syntaxhighlighter.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/syntaxhighlighter.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/syntaxhighlighter.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/sysinfo.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/sysinfo.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/sysinfo.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/sysinfo_data.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/sysinfo_data.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/sysinfo_data.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tag.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tag.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tag.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/compatibility.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/compatibility.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/compatibility.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/mock.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/mock.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/mock.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/modeltest.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/modeltest.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/modeltest.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_annotate.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_annotate.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_annotate.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_autocomplete.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_autocomplete.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_autocomplete.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_bugs.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_bugs.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_bugs.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_cat.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_cat.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_cat.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_commit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_commit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_commit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_commit_data.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_commit_data.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_commit_data.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_decorator.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_decorator.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_decorator.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_diffview.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_diffview.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_diffview.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_extdiff.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_extdiff.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_extdiff.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_extra_isignored.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_extra_isignored.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_extra_isignored.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_extra_isversioned.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_extra_isversioned.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_extra_isversioned.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_guidebar.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_guidebar.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_guidebar.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_i18n.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_i18n.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_i18n.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_log.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_log.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_log.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_loggraphviz.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_loggraphviz.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_loggraphviz.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_logmodel.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_logmodel.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_logmodel.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_revisionmessagebrowser.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_revisionmessagebrowser.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_revisionmessagebrowser.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_spellcheck.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_spellcheck.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_spellcheck.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_subprocess.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_subprocess.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_subprocess.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_tree_branch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_tree_branch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_tree_branch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_treewidget.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_treewidget.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_treewidget.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_util.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_util.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests/test_util.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/texteditannotate.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/texteditannotate.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/texteditannotate.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/trace.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/trace.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/trace.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tree_branch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tree_branch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tree_branch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/treewidget.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/treewidget.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/treewidget.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_bookmark.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_bookmark.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_bookmark.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_branch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_branch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_branch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_info.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_info.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_info.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_init.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_init.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_init.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_merge.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_merge.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_merge.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_merge_config.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_merge_config.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_merge_config.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_new_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_new_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_new_tree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_pull.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_pull.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_pull.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_push.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_push.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_push.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_run.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_run.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_run.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_sysinfo.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_sysinfo.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_sysinfo.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_tag.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_tag.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_tag.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_update_branch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_update_branch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_update_branch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_update_checkout.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_update_checkout.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_update_checkout.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_verify_signatures.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_verify_signatures.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/ui_verify_signatures.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/uifactory.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/uifactory.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/uifactory.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/unbind.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/unbind.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/unbind.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/uncommit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/uncommit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/uncommit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/update.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/update.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/update.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/util.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/util.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/util.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/verify_signatures.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/verify_signatures.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/verify_signatures.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/shelve.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/shelve.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/shelve.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/shelvelist.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/shelvelist.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/shelvelist.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/splitters.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/splitters.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/splitters.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/tab_width_selector.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/tab_width_selector.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/tab_width_selector.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/texteditaccessory.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/texteditaccessory.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/texteditaccessory.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/toolbars.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/toolbars.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets/toolbars.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/ar/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/cs/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/da/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/de/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/en/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/en_GB/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/es/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/et/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/fr/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/gl/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/he/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/hu/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/it/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/ja/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/nl/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/pl/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/pt_BR/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/ru/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/sk/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/sl/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/sr/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/sv/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/th/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/tr/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/uk/LC_MESSAGES/qbzr.mo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/setup.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/setup.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/setup.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/uk/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/uk
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/tr/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/tr
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/th/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/th
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/sv/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/sv
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/sr/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/sr
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/sl/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/sl
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/sk/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/sk
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/ru/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/ru
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/pt_BR/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/pt_BR
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/pl/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/pl
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/nl/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/nl
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/ja/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/ja
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/it/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/it
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/hu/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/hu
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/he/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/he
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/gl/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/gl
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/fr/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/fr
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/et/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/et
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/es/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/es
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/en_GB/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/en_GB
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/en/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/en
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/de/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/de
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/da/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/da
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/cs/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/cs
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/ar/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale/ar
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/locale
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/widgets
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/tests
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib/extra
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr/lib
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/qbzr
-@dirrmtry %%PYTHON_SITELIBDIR%%/bzrlib/plugins
-@dirrmtry %%PYTHON_SITELIBDIR%%/bzrlib
diff --git a/ftp/py-ftputil/Makefile b/ftp/py-ftputil/Makefile
index 1d07c9f4c7fd..4bd1f3062dc8 100644
--- a/ftp/py-ftputil/Makefile
+++ b/ftp/py-ftputil/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ftputil
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	ftp python
 MASTER_SITES=	# http://ftputil.sschwarzer.net/trac/attachment/wiki/Download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,13 +11,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	High-level FTP client library
 
-USE_PYTHON=	yes
+USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 
-.if !defined(NOPORTDOCS)
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 PORTDOC_FILES=	README.html README.txt ftputil.html ftputil.txt ftputil_ru_utf8.txt
-.endif
 
 .include <bsd.port.pre.mk>
 
@@ -26,11 +25,9 @@ do-fetch:
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/ftp/py-ftputil/pkg-plist b/ftp/py-ftputil/pkg-plist
index 4cc9e7beab4a..98a93a7b47f4 100644
--- a/ftp/py-ftputil/pkg-plist
+++ b/ftp/py-ftputil/pkg-plist
@@ -1,6 +1,3 @@
-%%PYTHON_LIBDIR%%/site-packages/ftputil/setup.py
-%%PYTHON_LIBDIR%%/site-packages/ftputil/setup.pyc
-%%PYTHON_LIBDIR%%/site-packages/ftputil/setup.pyo
 %%PYTHON_SITELIBDIR%%/ftputil/__init__.py
 %%PYTHON_SITELIBDIR%%/ftputil/__init__.pyc
 %%PYTHON_SITELIBDIR%%/ftputil/__init__.pyo
diff --git a/graphics/py-editobj/Makefile b/graphics/py-editobj/Makefile
index 9fc588b554eb..61aaf8c9fdb0 100644
--- a/graphics/py-editobj/Makefile
+++ b/graphics/py-editobj/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	editobj
 PORTVERSION=	0.5.7
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	http://download.gna.org/songwrite/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-editobj/pkg-plist b/graphics/py-editobj/pkg-plist
index ab1b907fe48d..93ced8cc02ca 100644
--- a/graphics/py-editobj/pkg-plist
+++ b/graphics/py-editobj/pkg-plist
@@ -6,7 +6,6 @@
 %%PYTHON_SITELIBDIR%%/editobj/eventobj.py
 %%PYTHON_SITELIBDIR%%/editobj/main.py
 %%PYTHON_SITELIBDIR%%/editobj/observe.py
-%%PYTHON_SITELIBDIR%%/editobj/setup.py
 %%PYTHON_SITELIBDIR%%/editobj/treewidget.py
 %%PYTHON_SITELIBDIR%%/editobj/__init__.pyc
 %%PYTHON_SITELIBDIR%%/editobj/cancel.pyc
@@ -16,7 +15,6 @@
 %%PYTHON_SITELIBDIR%%/editobj/eventobj.pyc
 %%PYTHON_SITELIBDIR%%/editobj/main.pyc
 %%PYTHON_SITELIBDIR%%/editobj/observe.pyc
-%%PYTHON_SITELIBDIR%%/editobj/setup.pyc
 %%PYTHON_SITELIBDIR%%/editobj/treewidget.pyc
 %%PYTHON_SITELIBDIR%%/editobj/__init__.pyo
 %%PYTHON_SITELIBDIR%%/editobj/cancel.pyo
@@ -26,7 +24,6 @@
 %%PYTHON_SITELIBDIR%%/editobj/eventobj.pyo
 %%PYTHON_SITELIBDIR%%/editobj/main.pyo
 %%PYTHON_SITELIBDIR%%/editobj/observe.pyo
-%%PYTHON_SITELIBDIR%%/editobj/setup.pyo
 %%PYTHON_SITELIBDIR%%/editobj/treewidget.pyo
 %%PYTHON_SITELIBDIR%%/editobj/icons/folder.pgm
 %%PYTHON_SITELIBDIR%%/editobj/icons/minus.pgm
diff --git a/math/py-bitvector/Makefile b/math/py-bitvector/Makefile
index 5f5a93e8e413..82be6717dd48 100644
--- a/math/py-bitvector/Makefile
+++ b/math/py-bitvector/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bitvector
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,21 +22,16 @@ PORTDOCS=	README BitVector-${PORTVERSION}.html
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/BitVector.py \
 		%%PYTHON_SITELIBDIR%%/BitVector.pyc \
-		%%PYTHON_SITELIBDIR%%/BitVector.pyo \
-		%%PYTHON_LIBDIR%%/site-packages/setup.py \
-		%%PYTHON_LIBDIR%%/site-packages/setup.pyc \
-		%%PYTHON_LIBDIR%%/site-packages/setup.pyo
+		%%PYTHON_SITELIBDIR%%/BitVector.pyo
 
 post-extract:
 	@${RM} -f ${WRKSRC}/test.py
 
-.if !defined(NOPORTDOCS)
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.endif
 
 regression-test:
 	@(cd ${WRKSRC}/TestBitVector && ${PYTHON_CMD} Test.py)
diff --git a/net-p2p/py-py2play/Makefile b/net-p2p/py-py2play/Makefile
index 1d52ec2484de..f6d8e0125b2a 100644
--- a/net-p2p/py-py2play/Makefile
+++ b/net-p2p/py-py2play/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	py2play
 PORTVERSION=	0.1.10
+PORTREVISION=	1
 CATEGORIES=	net-p2p python
 MASTER_SITES=	http://download.gna.org/slune/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,13 +21,9 @@ PYDISTUTILS_PKGNAME=	Py2Play
 EXAMPLESDIR=	${PREFIX}/share/examples/py-py2play
 
 post-install:
-.ifndef NOPORTEXAMPLES
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/startdemo ${STAGEDIR}${EXAMPLESDIR}
-.endif
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net-p2p/py-py2play/pkg-plist b/net-p2p/py-py2play/pkg-plist
index 4a4fe277e883..ff0362775353 100644
--- a/net-p2p/py-py2play/pkg-plist
+++ b/net-p2p/py-py2play/pkg-plist
@@ -1,6 +1,3 @@
-%%PYTHON_LIBDIR%%/site-packages/py2play/setup.py
-%%PYTHON_LIBDIR%%/site-packages/py2play/setup.pyc
-%%PYTHON_LIBDIR%%/site-packages/py2play/setup.pyo
 %%PYTHON_SITELIBDIR%%/py2play/__init__.py
 %%PYTHON_SITELIBDIR%%/py2play/action.py
 %%PYTHON_SITELIBDIR%%/py2play/character.py