5 files changed, 101 insertions, 54 deletions

diff --git a/devel/d-feet/Makefile b/devel/d-feet/Makefile
index 026e2ace0854..efae109140e3 100644
--- a/devel/d-feet/Makefile
+++ b/devel/d-feet/Makefile
@@ -2,19 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	d-feet
-PORTVERSION=	0.1.12
-PORTREVISION=	1
+PORTVERSION=	0.3.10
 CATEGORIES=	devel
-MASTER_SITES=	GNOME/sources/d-feet/0.1
+MASTER_SITES=	GNOME
 
 MAINTAINER=	thinker@codemud.net
-COMMENT=	D-Feet is a D-Bus debugger written in PyGtk+ by John (J5) Palmieri
+COMMENT=	D-Feet is a D-Bus debugger python introspection by John (J5) Palmieri
 
-RUN_DEPENDS=	\
-	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/_gtk.so:${PORTSDIR}/x11-toolkits/py-gtk2 \
-	${PYTHON_SITELIBDIR}/dbus/bus.py:${PORTSDIR}/devel/py-dbus
+BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
-USES=		python
-USE_PYTHON=	distutils autoplist
+USES=		gettext gmake gnome perl5 pkgconfig python tar:xz
+USE_GNOME=	gtk30 intlhack introspection:build libxml2:build libwnck3
+GNU_CONFIGURE=	yes
+USE_PERL5=	build
+INSTALLS_ICONS=	yes
+
+GLIB_SCHEMAS=	org.gnome.d-feet.gschema.xml
+
+# testsuite needs bin/pep8
+CONFIGURE_ARGS+=--disable-tests
 
 .include <bsd.port.mk>
diff --git a/devel/d-feet/distinfo b/devel/d-feet/distinfo
index 84c1beae634c..a27944d68aca 100644
--- a/devel/d-feet/distinfo
+++ b/devel/d-feet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (d-feet-0.1.12.tar.gz) = 5bc22e952ee164d5a82be466be48375718d2df2e2e817204a8ab3e0325f1e688
-SIZE (d-feet-0.1.12.tar.gz) = 38791
+SHA256 (d-feet-0.3.10.tar.xz) = 88f0df5fcb862387ff3d1793873c5eb368c3e4db0bbd82ea65f748cbf70a6359
+SIZE (d-feet-0.3.10.tar.xz) = 179500
diff --git a/devel/d-feet/files/patch-d-feet b/devel/d-feet/files/patch-d-feet
deleted file mode 100644
index 44ca2111aacd..000000000000
--- a/devel/d-feet/files/patch-d-feet
+++ /dev/null
@@ -1,33 +0,0 @@
---- d-feet.orig	2010-09-11 16:31:34.000000000 +0800
-+++ d-feet	2010-09-11 18:08:06.000000000 +0800
-@@ -14,6 +14,7 @@
- 
- import os, sys
- import optparse
-+from pkg_resources import Requirement, resource_filename
- 
- parser = optparse.OptionParser(usage="%prog [options] [project-file]")
- 
-@@ -27,15 +28,17 @@
-     ENV_PATHS = {"DFEET_DATA_PATH" : "ui/",
-                  "DFEET_IMAGE_PATH" : "ui/",
-                  "DFEET_LOCALE_PATH" : "locale/",
--                 "DFEET_HELP_PATH" : "/usr/share/gnome/dfeet/"
-+                 "DFEET_HELP_PATH" : "/usr/local/share/gnome/dfeet/"
-                 }
-     
- 
- else:
--    ENV_PATHS = {"DFEET_DATA_PATH" : "/usr/share/dfeet/",
--                 "DFEET_IMAGE_PATH" : "/usr/share/dfeet/pixmaps/",
--                 "DFEET_LOCALE_PATH" : "/usr/share/locale/",
--                 "DFEET_HELP_PATH" : "/usr/share/gnome/dfeet/"
-+    req = Requirement.parse("d-feet")
-+    
-+    ENV_PATHS = {"DFEET_DATA_PATH" : resource_filename(req, "share/dfeet/"),
-+                 "DFEET_IMAGE_PATH" : resource_filename(req, "share/dfeet/pixmaps/"),
-+                 "DFEET_LOCALE_PATH" : resource_filename(req, "share/locale/"),
-+                 "DFEET_HELP_PATH" : resource_filename(req, "share/gnome/dfeet/")
-                 }
- 
- #must set variables before importing Globals because it requires them
diff --git a/devel/d-feet/files/patch-setup.py b/devel/d-feet/files/patch-setup.py
deleted file mode 100644
index c46c38877aaf..000000000000
--- a/devel/d-feet/files/patch-setup.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- setup.py.orig	2010-09-11 16:27:38.000000000 +0800
-+++ setup.py	2010-09-11 17:54:40.000000000 +0800
-@@ -58,6 +58,7 @@
-     platforms='linux',
-     scripts=['d-feet'],
-     packages=['dfeet', 'dfeet/_ui'],
-+    zip_safe=False,
-     data_files=[
-         ('share/dfeet', glob.glob("ui/*.ui")),
-         ('share/icons/hicolor/16x16/apps', glob.glob("icons/16x16/*.png")),
diff --git a/devel/d-feet/pkg-plist b/devel/d-feet/pkg-plist
new file mode 100644
index 000000000000..460538fc2f19
--- /dev/null
+++ b/devel/d-feet/pkg-plist
@@ -0,0 +1,85 @@
+bin/d-feet
+%%PYTHON_SITELIBDIR%%/dfeet/__init__.py
+%%PYTHON_SITELIBDIR%%/dfeet/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dfeet/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dfeet/addconnectiondialog.py
+%%PYTHON_SITELIBDIR%%/dfeet/addconnectiondialog.pyc
+%%PYTHON_SITELIBDIR%%/dfeet/addconnectiondialog.pyo
+%%PYTHON_SITELIBDIR%%/dfeet/application.py
+%%PYTHON_SITELIBDIR%%/dfeet/application.pyc
+%%PYTHON_SITELIBDIR%%/dfeet/application.pyo
+%%PYTHON_SITELIBDIR%%/dfeet/bus_watch.py
+%%PYTHON_SITELIBDIR%%/dfeet/bus_watch.pyc
+%%PYTHON_SITELIBDIR%%/dfeet/bus_watch.pyo
+%%PYTHON_SITELIBDIR%%/dfeet/dbus_utils.py
+%%PYTHON_SITELIBDIR%%/dfeet/dbus_utils.pyc
+%%PYTHON_SITELIBDIR%%/dfeet/dbus_utils.pyo
+%%PYTHON_SITELIBDIR%%/dfeet/executemethoddialog.py
+%%PYTHON_SITELIBDIR%%/dfeet/executemethoddialog.pyc
+%%PYTHON_SITELIBDIR%%/dfeet/executemethoddialog.pyo
+%%PYTHON_SITELIBDIR%%/dfeet/introspection.py
+%%PYTHON_SITELIBDIR%%/dfeet/introspection.pyc
+%%PYTHON_SITELIBDIR%%/dfeet/introspection.pyo
+%%PYTHON_SITELIBDIR%%/dfeet/introspection_helper.py
+%%PYTHON_SITELIBDIR%%/dfeet/introspection_helper.pyc
+%%PYTHON_SITELIBDIR%%/dfeet/introspection_helper.pyo
+%%PYTHON_SITELIBDIR%%/dfeet/settings.py
+%%PYTHON_SITELIBDIR%%/dfeet/settings.pyc
+%%PYTHON_SITELIBDIR%%/dfeet/settings.pyo
+%%PYTHON_SITELIBDIR%%/dfeet/uiloader.py
+%%PYTHON_SITELIBDIR%%/dfeet/uiloader.pyc
+%%PYTHON_SITELIBDIR%%/dfeet/uiloader.pyo
+%%PYTHON_SITELIBDIR%%/dfeet/window.py
+%%PYTHON_SITELIBDIR%%/dfeet/window.pyc
+%%PYTHON_SITELIBDIR%%/dfeet/window.pyo
+%%PYTHON_SITELIBDIR%%/dfeet/wnck_utils.py
+%%PYTHON_SITELIBDIR%%/dfeet/wnck_utils.pyc
+%%PYTHON_SITELIBDIR%%/dfeet/wnck_utils.pyo
+share/appdata/d-feet.appdata.xml
+share/applications/d-feet.desktop
+%%DATADIR%%/ui/addconnectiondialog.ui
+%%DATADIR%%/ui/app-menu.ui
+%%DATADIR%%/ui/bus.ui
+%%DATADIR%%/ui/executedialog.ui
+%%DATADIR%%/ui/introspection.ui
+%%DATADIR%%/ui/mainwindow.ui
+share/help/C/d-feet/basics.page
+share/help/C/d-feet/figures/icon.png
+share/help/C/d-feet/index.page
+share/icons/HighContrast/scalable/apps/d-feet.svg
+share/icons/hicolor/16x16/apps/d-feet.png
+share/icons/hicolor/16x16/apps/dfeet-icon-default-service.png
+share/icons/hicolor/16x16/apps/dfeet-method-category.png
+share/icons/hicolor/16x16/apps/dfeet-method.png
+share/icons/hicolor/16x16/apps/dfeet-object.png
+share/icons/hicolor/16x16/apps/dfeet-property-category.png
+share/icons/hicolor/16x16/apps/dfeet-property.png
+share/icons/hicolor/16x16/apps/dfeet-signal-category.png
+share/icons/hicolor/16x16/apps/dfeet-signal.png
+share/icons/hicolor/24x24/apps/d-feet.png
+share/icons/hicolor/256x256/apps/d-feet.png
+share/icons/hicolor/32x32/apps/d-feet.png
+share/icons/hicolor/48x48/apps/d-feet.png
+share/icons/hicolor/scalable/apps/d-feet.svg
+share/locale/bs/LC_MESSAGES/d-feet.mo
+share/locale/cs/LC_MESSAGES/d-feet.mo
+share/locale/da/LC_MESSAGES/d-feet.mo
+share/locale/de/LC_MESSAGES/d-feet.mo
+share/locale/el/LC_MESSAGES/d-feet.mo
+share/locale/es/LC_MESSAGES/d-feet.mo
+share/locale/fi/LC_MESSAGES/d-feet.mo
+share/locale/fr/LC_MESSAGES/d-feet.mo
+share/locale/gl/LC_MESSAGES/d-feet.mo
+share/locale/hu/LC_MESSAGES/d-feet.mo
+share/locale/id/LC_MESSAGES/d-feet.mo
+share/locale/lv/LC_MESSAGES/d-feet.mo
+share/locale/pl/LC_MESSAGES/d-feet.mo
+share/locale/pt/LC_MESSAGES/d-feet.mo
+share/locale/pt_BR/LC_MESSAGES/d-feet.mo
+share/locale/ru/LC_MESSAGES/d-feet.mo
+share/locale/sl/LC_MESSAGES/d-feet.mo
+share/locale/sr/LC_MESSAGES/d-feet.mo
+share/locale/sr@latin/LC_MESSAGES/d-feet.mo
+share/locale/sv/LC_MESSAGES/d-feet.mo
+share/locale/tr/LC_MESSAGES/d-feet.mo
+share/locale/zh_CN/LC_MESSAGES/d-feet.mo