3 files changed, 65 insertions, 43 deletions

diff --git a/editors/gwrite/Makefile b/editors/gwrite/Makefile
index 03604c6f2965..64803d841dec 100644
--- a/editors/gwrite/Makefile
+++ b/editors/gwrite/Makefile
@@ -5,29 +5,28 @@
 # $FreeBSD$
 #
 
-PORTNAME=		gwrite
-PORTVERSION=		0.3.0
-CATEGORIES=		editors python
-MASTER_SITES=		GOOGLE_CODE
+PORTNAME=	gwrite
+PORTVERSION=	0.5.1
+CATEGORIES=	editors python
+MASTER_SITES=	GOOGLE_CODE
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		A simple HTML format editor
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A simple HTML format editor
 
-BUILD_DEPENDS=		pygtk-demo:${PORTSDIR}/x11-toolkits/py-gtk2 \
-			${PYTHON_PKGNAMEPREFIX}distutils-extra>=2.15:${PORTSDIR}/devel/py-distutils-extra \
-			${PYTHON_SITELIBDIR}/webkit/__init__.py:${PORTSDIR}/www/py-webkitgtk \
-			${PYTHON_SITELIBDIR}/jswebkit.so:${PORTSDIR}/www/py-jswebkit \
-			${LOCALBASE}/bin/intltool-update:${PORTSDIR}/textproc/intltool
-RUN_DEPENDS=		${BUILD_DEPENDS} \
-			${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
-			${LOCALBASE}/share/icons/Tango/index.theme:${PORTSDIR}/x11-themes/icons-tango \
-			wvHtml:${PORTSDIR}/textproc/wv
+LICENSE=	LGPL3 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-PLIST_SUB=		PYTHON_VER=${PYTHON_VER}
-PROJECTHOST=		gwrite
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}distutils-extra>=2.15:${PORTSDIR}/devel/py-distutils-extra \
+		intltool-update:${PORTSDIR}/textproc/intltool \
+		${PYTHON_PKGNAMEPREFIX}jswebkit>=0:${PORTSDIR}/www/py-jswebkit \
+		${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:${PORTSDIR}/www/py-webkitgtk
+RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
+		wvHtml:${PORTSDIR}/textproc/wv \
+		${PYTHON_PKGNAMEPREFIX}jswebkit>=0:${PORTSDIR}/www/py-jswebkit \
+		${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:${PORTSDIR}/www/py-webkitgtk
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_NOEGGINFO=	yes
+USE_GNOME=	pygtk2
+USE_PYTHON=	yes
+USE_PYDISTUTILS=yes
 
 .include <bsd.port.mk>
diff --git a/editors/gwrite/distinfo b/editors/gwrite/distinfo
index b7c9eee663a8..56703d71219b 100644
--- a/editors/gwrite/distinfo
+++ b/editors/gwrite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gwrite-0.3.0.tar.gz) = a245f03a5929643e6135ac7d90b796d64945fe448609c5d2de0b43c6390240db
-SIZE (gwrite-0.3.0.tar.gz) = 43406
+SHA256 (gwrite-0.5.1.tar.gz) = dc07c69297a8c1d2bc7921e3a832c0aaeacdf2cf6d3c6b13f19faa26f3d88df5
+SIZE (gwrite-0.5.1.tar.gz) = 56338
diff --git a/editors/gwrite/pkg-plist b/editors/gwrite/pkg-plist
index 5b071d4d1ce4..5bd273c03ca3 100644
--- a/editors/gwrite/pkg-plist
+++ b/editors/gwrite/pkg-plist
@@ -1,34 +1,57 @@
 bin/gwrite
-%%PYTHON_SITELIBDIR%%/gwrite/gtkdialogs.py
 %%PYTHON_SITELIBDIR%%/gwrite/__init__.py
-%%PYTHON_SITELIBDIR%%/gwrite/config.py
-%%PYTHON_SITELIBDIR%%/gwrite/gtklatex.py
-%%PYTHON_SITELIBDIR%%/gwrite/gwrite.py
-%%PYTHON_SITELIBDIR%%/gwrite/i18n.py
-%%PYTHON_SITELIBDIR%%/gwrite/webkitlinkview.py
-%%PYTHON_SITELIBDIR%%/gwrite/docfilter.py
-%%PYTHON_SITELIBDIR%%/gwrite/webkitedit.py
-%%PYTHON_SITELIBDIR%%/gwrite/gtkdialogs.pyc
 %%PYTHON_SITELIBDIR%%/gwrite/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gwrite/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gwrite/config.py
 %%PYTHON_SITELIBDIR%%/gwrite/config.pyc
-%%PYTHON_SITELIBDIR%%/gwrite/gtklatex.pyc
-%%PYTHON_SITELIBDIR%%/gwrite/gwrite.pyc
-%%PYTHON_SITELIBDIR%%/gwrite/i18n.pyc
-%%PYTHON_SITELIBDIR%%/gwrite/webkitlinkview.pyc
+%%PYTHON_SITELIBDIR%%/gwrite/config.pyo
+%%PYTHON_SITELIBDIR%%/gwrite/docfilter.py
 %%PYTHON_SITELIBDIR%%/gwrite/docfilter.pyc
-%%PYTHON_SITELIBDIR%%/gwrite/webkitedit.pyc
+%%PYTHON_SITELIBDIR%%/gwrite/docfilter.pyo
+%%PYTHON_SITELIBDIR%%/gwrite/gtkdialogs.py
+%%PYTHON_SITELIBDIR%%/gwrite/gtkdialogs.pyc
 %%PYTHON_SITELIBDIR%%/gwrite/gtkdialogs.pyo
-%%PYTHON_SITELIBDIR%%/gwrite/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gwrite/config.pyo
+%%PYTHON_SITELIBDIR%%/gwrite/gtklatex.py
+%%PYTHON_SITELIBDIR%%/gwrite/gtklatex.pyc
 %%PYTHON_SITELIBDIR%%/gwrite/gtklatex.pyo
+%%PYTHON_SITELIBDIR%%/gwrite/gwrite.py
+%%PYTHON_SITELIBDIR%%/gwrite/gwrite.pyc
 %%PYTHON_SITELIBDIR%%/gwrite/gwrite.pyo
+%%PYTHON_SITELIBDIR%%/gwrite/i18n.py
+%%PYTHON_SITELIBDIR%%/gwrite/i18n.pyc
 %%PYTHON_SITELIBDIR%%/gwrite/i18n.pyo
-%%PYTHON_SITELIBDIR%%/gwrite/webkitlinkview.pyo
-%%PYTHON_SITELIBDIR%%/gwrite/docfilter.pyo
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_font-size.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_insert-header.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_insert-rule.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_insert-table.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_insert_image.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_insert_section.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_line-spacing-1.5.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_line-spacing-1.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_line-spacing-2.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_link.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_list-insert-unnumbered.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_list_bullet.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_list_enum-off.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_list_enum-restart.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_list_enum.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_subscript.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_superscript.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_text-monospaced.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_text-quickedit.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_text_color_hilight.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_tools-hyphenation.png
+%%PYTHON_SITELIBDIR%%/gwrite/icons/stock_view-html-source.png
+%%PYTHON_SITELIBDIR%%/gwrite/webkitedit.py
+%%PYTHON_SITELIBDIR%%/gwrite/webkitedit.pyc
 %%PYTHON_SITELIBDIR%%/gwrite/webkitedit.pyo
-%%PYTHON_SITELIBDIR%%/gwrite-0.0.2-py%%PYTHON_VER%%.egg-info
+%%PYTHON_SITELIBDIR%%/gwrite/webkitlinkview.py
+%%PYTHON_SITELIBDIR%%/gwrite/webkitlinkview.pyc
+%%PYTHON_SITELIBDIR%%/gwrite/webkitlinkview.pyo
+share/applications/gwrite.desktop
+share/locale/fr/LC_MESSAGES/gwrite.mo
 share/locale/zh_CN/LC_MESSAGES/gwrite.mo
 share/pixmaps/gwrite.png
-share/applications/gwrite.desktop
-@dirrm share/applications
+@dirrmtry share/applications
+@dirrm %%PYTHON_SITELIBDIR%%/gwrite/icons
 @dirrm %%PYTHON_SITELIBDIR%%/gwrite