Update to 0.95.4

PR:		ports/84410
Submitted by:	maintainer

3 files changed, 42 insertions, 38 deletions

diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index dd13c9f1005..0749f8626d2 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -24,7 +24,7 @@
 #
 
 PORTNAME=	gtk-gnutella
-PORTVERSION=	0.95.3
+PORTVERSION=	0.95.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://gtk-gnutella.sourceforge.net/download/ \
diff --git a/net-p2p/gtk-gnutella/distinfo b/net-p2p/gtk-gnutella/distinfo
index 2ab5c8a3290..49b49a98e54 100644
--- a/net-p2p/gtk-gnutella/distinfo
+++ b/net-p2p/gtk-gnutella/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk-gnutella-0.95.3.tar.bz2) = bde94b95622f895294bffac8cecbe67a
-SIZE (gtk-gnutella-0.95.3.tar.bz2) = 2306819
+MD5 (gtk-gnutella-0.95.4.tar.bz2) = 4e6ea65149100c882f9b2c4ff7ca8dc1
+SIZE (gtk-gnutella-0.95.4.tar.bz2) = 2337832
diff --git a/net-p2p/gtk-gnutella/pkg-plist b/net-p2p/gtk-gnutella/pkg-plist
index b024fd7ae71..ef4e913e8e2 100644
--- a/net-p2p/gtk-gnutella/pkg-plist
+++ b/net-p2p/gtk-gnutella/pkg-plist
@@ -1,42 +1,46 @@
 bin/gtk-gnutella
-share/gtk-gnutella/bogons.txt
-share/gtk-gnutella/geo-ip.txt
-share/gtk-gnutella/gwcache.boot
-share/gtk-gnutella/hostiles.txt
-share/gtk-gnutella/pixmaps/arrow_down.xpm
-share/gtk-gnutella/pixmaps/arrow_up.xpm
-share/gtk-gnutella/pixmaps/booklib.xpm
-share/gtk-gnutella/pixmaps/booksha.xpm
-share/gtk-gnutella/pixmaps/bookshav.xpm
-share/gtk-gnutella/pixmaps/clanbomber_red.xpm
-share/gtk-gnutella/pixmaps/clanbomber_yellow.xpm
-share/gtk-gnutella/pixmaps/download.xpm
-share/gtk-gnutella/pixmaps/exit.xpm
-share/gtk-gnutella/pixmaps/filter.xpm
-share/gtk-gnutella/pixmaps/firewall.xpm
-share/gtk-gnutella/pixmaps/firewall_punchable.xpm
-share/gtk-gnutella/pixmaps/firewall_tcp.xpm
-share/gtk-gnutella/pixmaps/firewall_udp.xpm
-share/gtk-gnutella/pixmaps/firewall_udp_punchable.xpm
-share/gtk-gnutella/pixmaps/freeze.xpm
-share/gtk-gnutella/pixmaps/icon.xpm
-share/gtk-gnutella/pixmaps/leaf.xpm
-share/gtk-gnutella/pixmaps/legacy.xpm
-share/gtk-gnutella/pixmaps/no_firewall.xpm
-share/gtk-gnutella/pixmaps/offline.xpm
-share/gtk-gnutella/pixmaps/online.xpm
-share/gtk-gnutella/pixmaps/save.xpm
-share/gtk-gnutella/pixmaps/smallserver.xpm
-share/gtk-gnutella/pixmaps/stock_form-time-field-16.xpm
-share/gtk-gnutella/pixmaps/thaw.xpm
-share/gtk-gnutella/pixmaps/ultra.xpm
-share/gtk-gnutella/pixmaps/upload.xpm
-share/gtk-gnutella/pixmaps/warning.xpm
+share/applications/gtk-gnutella.desktop
+%%DATADIR%%/bogons.txt
+%%DATADIR%%/geo-ip.txt
+%%DATADIR%%/gwcache.boot
+%%DATADIR%%/hostiles.txt
+%%DATADIR%%/pixmaps/arrow_down.xpm
+%%DATADIR%%/pixmaps/arrow_up.xpm
+%%DATADIR%%/pixmaps/booklib.xpm
+%%DATADIR%%/pixmaps/booksha.xpm
+%%DATADIR%%/pixmaps/bookshav.xpm
+%%DATADIR%%/pixmaps/clanbomber_red.xpm
+%%DATADIR%%/pixmaps/clanbomber_yellow.xpm
+%%DATADIR%%/pixmaps/download.xpm
+%%DATADIR%%/pixmaps/exit.xpm
+%%DATADIR%%/pixmaps/filter.xpm
+%%DATADIR%%/pixmaps/firewall.xpm
+%%DATADIR%%/pixmaps/firewall_punchable.xpm
+%%DATADIR%%/pixmaps/firewall_tcp.xpm
+%%DATADIR%%/pixmaps/firewall_udp.xpm
+%%DATADIR%%/pixmaps/firewall_udp_punchable.xpm
+%%DATADIR%%/pixmaps/freeze.xpm
+%%DATADIR%%/pixmaps/icon.xpm
+%%DATADIR%%/pixmaps/leaf.xpm
+%%DATADIR%%/pixmaps/legacy.xpm
+%%DATADIR%%/pixmaps/no_firewall.xpm
+%%DATADIR%%/pixmaps/offline.xpm
+%%DATADIR%%/pixmaps/online.xpm
+%%DATADIR%%/pixmaps/save.xpm
+%%DATADIR%%/pixmaps/smallserver.xpm
+%%DATADIR%%/pixmaps/stock_form-time-field-16.xpm
+%%DATADIR%%/pixmaps/thaw.xpm
+%%DATADIR%%/pixmaps/ultra.xpm
+%%DATADIR%%/pixmaps/upload.xpm
+%%DATADIR%%/pixmaps/warning.xpm
+share/pixmaps/gtk-gnutella.png
+share/pixmaps/gtk-gnutella.svg
 share/locale/de/LC_MESSAGES/gtk-gnutella.mo
 share/locale/es/LC_MESSAGES/gtk-gnutella.mo
 share/locale/fr/LC_MESSAGES/gtk-gnutella.mo
 share/locale/ja/LC_MESSAGES/gtk-gnutella.mo
 share/locale/nl/LC_MESSAGES/gtk-gnutella.mo
 share/locale/hu/LC_MESSAGES/gtk-gnutella.mo
-@dirrm share/gtk-gnutella/pixmaps
-@dirrm share/gtk-gnutella
+@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%