4 files changed, 36 insertions, 40 deletions

diff --git a/dns/gresolver/Makefile b/dns/gresolver/Makefile
index bde717ace5c7..423d2823397b 100644
--- a/dns/gresolver/Makefile
+++ b/dns/gresolver/Makefile
@@ -5,43 +5,31 @@
 # $FreeBSD$
 #
 
-PORTNAME=		gresolver
-PORTVERSION=		0.0.3
-PORTREVISION=		2
-CATEGORIES=		dns
-MASTER_SITES=		http://jodrell.net/files/gresolver/
+PORTNAME=	gresolver
+PORTVERSION=	0.0.4
+CATEGORIES=	dns
+MASTER_SITES=	http://jodrell.net/files/gresolver/
 
-MAINTAINER=		jylefort@FreeBSD.org
-COMMENT=		A graphical DNS query tool using GTK+
+MAINTAINER=	jylefort@FreeBSD.org
+COMMENT=	A graphical DNS query tool using GTK+
 
-USE_GCC=	4.0
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext \
+		${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
+		${SITE_PERL}/${PERL_ARCH}/Gtk2/GladeXML.pm:${PORTSDIR}/x11-toolkits/p5-Glade2 \
+		${SITE_PERL}/Net/IPv6Addr.pm:${PORTSDIR}/net-mgmt/p5-Net-IPv6Addr
 
-RUN_DEPENDS=		${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext \
-			${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-			${SITE_PERL}/${PERL_ARCH}/Gtk2/GladeXML.pm:${PORTSDIR}/x11-toolkits/p5-Glade2 \
-			${SITE_PERL}/Net/IPv6Addr.pm:${PORTSDIR}/net-mgmt/p5-Net-IPv6Addr
+USE_X_PREFIX=	yes
 
-USE_X_PREFIX=		yes
-NO_BUILD=		yes
-USE_REINPLACE=		yes
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${SED} -e \
-		's|share/pixmaps|share/gnome/pixmaps| ; \
-		 s|@PREFIX@|${PREFIX}|' \
-		${WRKSRC}/gresolver.pl > ${WRKSRC}/gresolver
-	@${REINPLACE_CMD} -e 's|Icon=gresolver|&.png|' ${WRKSRC}/gresolver.desktop
+do-build:
+	@${SED} -e 's|@PREFIX@|${PREFIX}|' ${WRKSRC}/gresolver.pl > ${WRKSRC}/gresolver
 
 do-install:
-	${MKDIR} ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/gresolver ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/gnome/applications
-	${INSTALL_DATA} ${WRKSRC}/gresolver.desktop ${PREFIX}/share/gnome/applications
-	${MKDIR} ${PREFIX}/share/gnome/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/gresolver.png ${PREFIX}/share/gnome/pixmaps
-	${MKDIR} ${PREFIX}/share/gresolver
-	${INSTALL_DATA} ${WRKSRC}/gresolver.glade ${PREFIX}/share/gresolver
-
-.include <bsd.port.post.mk>
+	${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/gresolver.desktop ${PREFIX}/share/applications
+	${MKDIR} ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/gresolver.png ${PREFIX}/share/pixmaps
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/gresolver.glade ${DATADIR}
+
+.include <bsd.port.mk>
diff --git a/dns/gresolver/distinfo b/dns/gresolver/distinfo
index 865b08ba4c45..12cf842627b1 100644
--- a/dns/gresolver/distinfo
+++ b/dns/gresolver/distinfo
@@ -1,2 +1,2 @@
-MD5 (gresolver-0.0.3.tar.gz) = 0ca649f8cd10c1223007fac4c22e88a3
-SIZE (gresolver-0.0.3.tar.gz) = 20987
+MD5 (gresolver-0.0.4.tar.gz) = d7d030320b0fef6a941b740d24428780
+SIZE (gresolver-0.0.4.tar.gz) = 22473
diff --git a/dns/gresolver/files/patch-gresolver.desktop b/dns/gresolver/files/patch-gresolver.desktop
new file mode 100644
index 000000000000..3469c575c40f
--- /dev/null
+++ b/dns/gresolver/files/patch-gresolver.desktop
@@ -0,0 +1,10 @@
+--- gresolver.desktop.orig	Tue Sep  6 16:57:31 2005
++++ gresolver.desktop	Tue Sep  6 16:57:35 2005
+@@ -3,7 +3,6 @@
+ Version=1.0
+ Type=Application
+ Exec=gresolver
+-TryExec=
+ X-GNOME-DocPath=
+ Terminal=false
+ StartupNotify=true
diff --git a/dns/gresolver/pkg-plist b/dns/gresolver/pkg-plist
index f1b7a392a425..4afc90458954 100644
--- a/dns/gresolver/pkg-plist
+++ b/dns/gresolver/pkg-plist
@@ -1,8 +1,6 @@
 bin/gresolver
-share/gnome/applications/gresolver.desktop
-share/gnome/pixmaps/gresolver.png
+share/applications/gresolver.desktop
+share/pixmaps/gresolver.png
 %%DATADIR%%/gresolver.glade
 @dirrm %%DATADIR%%
-@unexec rmdir %D/share/gnome/applications 2>/dev/null || true
-@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
+@unexec rmdir %D/share/applications 2>/dev/null || true