5 files changed, 15 insertions, 29 deletions

diff --git a/games/gretools/Makefile b/games/gretools/Makefile
index 4c3af01871fd..dad14cc9ba16 100644
--- a/games/gretools/Makefile
+++ b/games/gretools/Makefile
@@ -6,22 +6,23 @@
 #
 
 PORTNAME=	gretools
-PORTVERSION=	1.2.2
-CATEGORIES=	games
-MASTER_SITES=	http://theory.cs.iitm.ernet.in/~arvindn/gretools/${PORTVERSION:R}/
+PORTVERSION=	1.2.4
+CATEGORIES=	games gnome
+MASTER_SITES=	http://theory.cs.iitm.ernet.in/~arvindn/gretools/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTVERSION:R}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GTK2 vocabulary builder
+COMMENT=	GNOME vocabulary builder
 
 USE_X_PREFIX=	yes
+USE_GNOME=	gnomehack gnomeprefix gnometarget pygnome2
 USE_PYTHON=	yes
-USE_GNOME=	gnomehack gnometarget gnomeprefix pygnome2
-GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|/usr/bin/python|${PYTHON_CMD}|" \
-		${WRKSRC}/${PORTNAME}.in
+	@${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g ; \
+		 s|@prefix@/share/|@datadir@/|g' ${WRKSRC}/gretools.in
 
 .include <bsd.port.mk>
diff --git a/games/gretools/distinfo b/games/gretools/distinfo
index c484f7b7e5f7..ac8f220f19b1 100644
--- a/games/gretools/distinfo
+++ b/games/gretools/distinfo
@@ -1,2 +1,2 @@
-MD5 (gretools-1.2.2.tar.gz) = 04920070cdabbab895f87d4a2ec938d0
-SIZE (gretools-1.2.2.tar.gz) = 282474
+MD5 (gretools-1.2.4.tar.gz) = 7cd66bae8301df9cd2f4a871d50d6a6b
+SIZE (gretools-1.2.4.tar.gz) = 284002
diff --git a/games/gretools/files/patch-gretools.in b/games/gretools/files/patch-gretools.in
deleted file mode 100644
index c0fc5a0f1aad..000000000000
--- a/games/gretools/files/patch-gretools.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- gretools.in.orig	Fri Jan 16 13:41:40 2004
-+++ gretools.in	Fri Jan 16 13:42:23 2004
-@@ -10,9 +10,9 @@
- gretools.prefix_dir = "@prefix@"
- gretools.package_name = "@PACKAGE@"
- gretools.package_version = "@VERSION@"
--gretools.glade_dir = "@prefix@/share/gretools/glade"
--gretools.wordlist_dir = "@prefix@/share/gretools/lists"
--gretools.image_dir = "@prefix@/share/pixmaps"
-+gretools.glade_dir = "@prefix@/share/gnome/gretools/glade"
-+gretools.wordlist_dir = "@prefix@/share/gnome/gretools/lists"
-+gretools.image_dir = "@prefix@/share/gnome/pixmaps"
- 
- 
- gretools.Gui()
diff --git a/games/gretools/pkg-descr b/games/gretools/pkg-descr
index adb74c578f33..6f1df11074eb 100644
--- a/games/gretools/pkg-descr
+++ b/games/gretools/pkg-descr
@@ -1,4 +1,4 @@
-Gretools is a GTK2 vocabulary tutor. Its wordlist is comprised of about
-4000 words, and it has a synonym quiz and a word-guessing game.
+Gretools is a vocabulary building tool for GNOME. Its wordlist is comprised
+of about 4000 words, and it has a synonym quiz and a word-guessing game.
 
 WWW: http://theory.cs.iitm.ernet.in/~arvindn/gretools/
diff --git a/games/gretools/pkg-plist b/games/gretools/pkg-plist
index 588ad10792a4..c0c52665ee0a 100644
--- a/games/gretools/pkg-plist
+++ b/games/gretools/pkg-plist
@@ -4,11 +4,11 @@ bin/gretools
 %%PYTHON_SITELIBDIR%%/gretools/gretools.pyc
 %%PYTHON_SITELIBDIR%%/gretools/gretools.pyo
 share/gnome/applications/gretools.desktop
+share/gnome/gretools/glade/gretools.glade
+share/gnome/gretools/lists/default.wl
 share/gnome/help/gretools/C/figures/gretools_start_window.png
 share/gnome/help/gretools/C/gretools.xml
 share/gnome/help/gretools/C/legal.xml
-share/gnome/gretools/glade/gretools.glade
-share/gnome/gretools/lists/default.wl
 share/gnome/omf/gretools/gretools-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gretools/gretools-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gretools.png