2 files changed, 6 insertions, 224 deletions

diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile
index 1674a942648b..74f4a6e7ed7c 100644
--- a/devel/bzr-gtk/Makefile
+++ b/devel/bzr-gtk/Makefile
@@ -11,25 +11,23 @@ MASTER_SITES=	http://launchpadlibrarian.net/65442805/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK interface to Bazaar-NG VCS
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr \
-		${PYTHON_SITELIBDIR}/cairo:${PORTSDIR}/graphics/py-cairo
+		${PYTHON_PKGNAMEPREFIX}cairo>=0:${PORTSDIR}/graphics/py-cairo
 
-LICENSE=	GPLv2
 
+USES=		desktop-file-utils
 USE_PYTHON=	yes
 USE_GNOME=	pygtk2
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	GTKSOURCE
 GTKSOURCE_DESC=	GTKSourceview support
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGTKSOURCE}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/gtksourceview.so:${PORTSDIR}/x11-toolkits/py-gnome-desktop
-.endif
+GTKSOURCE_USE=	GNOME=pygnomedesktop
 
 .include <bsd.port.mk>
diff --git a/devel/bzr-gtk/pkg-plist b/devel/bzr-gtk/pkg-plist
deleted file mode 100644
index cba8b769406a..000000000000
--- a/devel/bzr-gtk/pkg-plist
+++ /dev/null
@@ -1,216 +0,0 @@
-bin/bzr-handle-patch
-bin/bzr-notify
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/about.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/about.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/about.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/colormap.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/colormap.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/colormap.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/config.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/config.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/config.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/gannotate.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/gannotate.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/gannotate.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/spanselector.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/spanselector.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/spanselector.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchbox.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchbox.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchbox.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/graphcell.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/graphcell.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/graphcell.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/linegraph.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/linegraph.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/linegraph.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/treemodel.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/treemodel.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/treemodel.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/treeview.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/treeview.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview/treeview.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/checkout.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/checkout.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/checkout.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/commands.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/commands.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/commands.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/commit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/commit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/commit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/conflicts.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/conflicts.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/conflicts.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/dialog.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/dialog.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/dialog.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/diff.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/diff.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/diff.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/errors.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/errors.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/errors.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/history.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/history.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/history.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/info.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/info.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/info.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/initialize.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/initialize.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/initialize.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/keyring.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/keyring.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/keyring.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/lock.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/lock.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/lock.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/loom.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/loom.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/loom.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/merge.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/merge.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/merge.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/mergedirective.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/mergedirective.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/mergedirective.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/missing.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/missing.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/missing.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/nautilus-bzr.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/nautilus-bzr.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/nautilus-bzr.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/notify.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/notify.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/notify.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences/identity.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences/identity.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences/identity.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences/notifications.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences/notifications.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences/notifications.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences/plugins.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences/plugins.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences/plugins.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/push.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/push.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/push.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revbrowser.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revbrowser.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revbrowser.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revidbox.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revidbox.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revidbox.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revisionmenu.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revisionmenu.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revisionmenu.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revisionview.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revisionview.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revisionview.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/seahorse.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/seahorse.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/seahorse.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/search.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/search.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/search.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/status.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/status.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/status.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tags.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tags.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tags.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_annotate_config.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_annotate_config.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_annotate_config.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_commit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_commit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_commit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_diff.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_diff.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_diff.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_history.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_history.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_history.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_linegraph.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_linegraph.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_linegraph.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_revisionview.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_revisionview.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_revisionview.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/ui.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/ui.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/ui.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/branchwin.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/branchwin.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/branchwin.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/window.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/window.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/window.pyo
-share/application-registry/bzr-gtk.applications
-share/applications/bazaar-properties.desktop
-share/applications/bzr-handle-patch.desktop
-share/applications/bzr-notify.desktop
-share/pixmaps/bzr-icon-64.png
-%%DATADIR%%/credits.pickle
-%%DATADIR%%/icons/bug.png
-%%DATADIR%%/icons/bzr-icon-64.png
-%%DATADIR%%/icons/commit.png
-%%DATADIR%%/icons/commit16.png
-%%DATADIR%%/icons/diff.png
-%%DATADIR%%/icons/diff16.png
-%%DATADIR%%/icons/log.png
-%%DATADIR%%/icons/log16.png
-%%DATADIR%%/icons/pull.png
-%%DATADIR%%/icons/pull16.png
-%%DATADIR%%/icons/push.png
-%%DATADIR%%/icons/push16.png
-%%DATADIR%%/icons/refresh.png
-%%DATADIR%%/icons/sign-bad.png
-%%DATADIR%%/icons/sign-ok.png
-%%DATADIR%%/icons/sign-unknown.png
-%%DATADIR%%/icons/sign.png
-%%DATADIR%%/icons/tag-16.png
-share/icons/hicolor/scalable/apps/bzr-panel.svg
-share/icons/hicolor/scalable/emblems/emblem-bzr-added.svg
-share/icons/hicolor/scalable/emblems/emblem-bzr-conflict.svg
-share/icons/hicolor/scalable/emblems/emblem-bzr-controlled.svg
-share/icons/hicolor/scalable/emblems/emblem-bzr-ignored.svg
-share/icons/hicolor/scalable/emblems/emblem-bzr-modified.svg
-share/icons/hicolor/scalable/emblems/emblem-bzr-removed.svg
-@dirrmtry share/icons/hicolor/scalable/emblems
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branchview
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk
-@dirrmtry %%PYTHON_SITELIBDIR%%/bzrlib/plugins
-@dirrmtry %%PYTHON_SITELIBDIR%%/bzrlib