5 files changed, 25 insertions, 29 deletions

diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 20d8a6deba2e..0f7205a55b1b 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -43,8 +43,7 @@
 #
 
 PORTNAME=	gtk-gnutella
-PORTVERSION=	0.96.3
-PORTREVISION=	6
+PORTVERSION=	0.96.4
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -113,8 +112,9 @@ CONFIGURE_ARGS+=	-U d_gnutls
 .endif
 
 .if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	-U d_enablenls
+CONFIGURE_ARGS+=	-U d_nls
 .else
+CONFIGURE_ARGS+=	-D d_nls
 LIB_DEPENDS+=		intl:${PORTSDIR}/devel/gettext
 PLIST_FILES=		share/locale/de/LC_MESSAGES/gtk-gnutella.mo \
 			share/locale/el/LC_MESSAGES/gtk-gnutella.mo \
diff --git a/net-p2p/gtk-gnutella/distinfo b/net-p2p/gtk-gnutella/distinfo
index 78db33e86b7c..fbd010cdc838 100644
--- a/net-p2p/gtk-gnutella/distinfo
+++ b/net-p2p/gtk-gnutella/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtk-gnutella-0.96.3.tar.bz2) = c6952037a10ea6d5ac5649e7b75f9d15
-SHA256 (gtk-gnutella-0.96.3.tar.bz2) = 6079661ffeb78ae480cf37cf9954d0c437d415363aa4133268b732700b52be80
-SIZE (gtk-gnutella-0.96.3.tar.bz2) = 2845172
+MD5 (gtk-gnutella-0.96.4.tar.bz2) = 1125412cd94b3f834e5d7746ade1edb1
+SHA256 (gtk-gnutella-0.96.4.tar.bz2) = 543ead5b650cb18cecd8148b7683f2fb057d26c665ac74214714c2caa7baa726
+SIZE (gtk-gnutella-0.96.4.tar.bz2) = 6879974
diff --git a/net-p2p/gtk-gnutella/files/patch-Configure b/net-p2p/gtk-gnutella/files/patch-Configure
new file mode 100644
index 000000000000..902efd07d18b
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/patch-Configure
@@ -0,0 +1,14 @@
+--- Configure	Thu Oct 18 17:02:36 2007
++++ Configure	Thu Oct 18 17:03:04 2007
+@@ -8678,11 +8678,6 @@
+ 	$aptget 'ADVICE: Run "apt-get install zlib1g-dev".' >&4
+ fi
+ 
+-if [ "$iconv" != yes ]; then
+-	bailout=yes
+-	echo 'ERROR: Cannot find iconv(). Library or header files might be missing.' >&4
+-fi
+-
+ if [ "$frontend" != none ]; then
+ case "$d_gtk" in
+ "$undef")
diff --git a/net-p2p/gtk-gnutella/files/patch-bsched b/net-p2p/gtk-gnutella/files/patch-bsched
deleted file mode 100644
index 081842f8c6f5..000000000000
--- a/net-p2p/gtk-gnutella/files/patch-bsched
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/core/bsched.c	Fri Nov 10 00:01:26 2006
-+++ src/core/bsched.c	Tue Nov 14 12:19:18 2006
-@@ -1591,16 +1591,11 @@
- 	 */
- 
- 	{
--		off_t written;
--		int flags = 0;
-+		off_t written = 0;
- 
--#if defined(SF_NODISKIO)
--		flags |= SF_NODISKIO;
--#endif	/* SF_NODISKIO */
--		
--		r = sendfile(in_fd, out_fd, start, amount, NULL, &written, flags);
-+		r = sendfile(in_fd, out_fd, start, amount, NULL, &written, 0);
- 		if ((ssize_t) -1 == r) {
--			if (is_temporary_error(errno) || EBUSY == errno)
-+			if (is_temporary_error(errno))
- 				r = written > 0 ? (ssize_t) written : (ssize_t) -1;
- 		} else {
- 			r = amount;			/* Everything written, but returns 0 if OK */
diff --git a/net-p2p/gtk-gnutella/pkg-plist b/net-p2p/gtk-gnutella/pkg-plist
index 36ea8f6007e1..f61234d0de58 100644
--- a/net-p2p/gtk-gnutella/pkg-plist
+++ b/net-p2p/gtk-gnutella/pkg-plist
@@ -3,9 +3,10 @@ share/applications/gtk-gnutella.desktop
 %%DATADIR%%/bogons.txt
 %%DATADIR%%/favicon.png
 %%DATADIR%%/geo-ip.txt
-%%DATADIR%%/gwcache.boot
 %%DATADIR%%/hostiles.txt
 %%DATADIR%%/robots.txt
+%%DATADIR%%/spam.txt
+%%DATADIR%%/spam_sha1.txt
 %%DATADIR%%/en/FAQ
 %%DATADIR%%/el/FAQ
 %%DATADIR%%/ja/FAQ
@@ -14,6 +15,7 @@ share/applications/gtk-gnutella.desktop
 %%DATADIR%%/pixmaps/booklib.xpm
 %%DATADIR%%/pixmaps/booksha.xpm
 %%DATADIR%%/pixmaps/bookshav.xpm
+%%DATADIR%%/pixmaps/booktth.xpm
 %%DATADIR%%/pixmaps/chip.xpm
 %%DATADIR%%/pixmaps/clanbomber_red.xpm
 %%DATADIR%%/pixmaps/clanbomber_yellow.xpm
@@ -27,6 +29,8 @@ share/applications/gtk-gnutella.desktop
 %%DATADIR%%/pixmaps/firewall_udp_punchable.xpm
 %%DATADIR%%/pixmaps/freeze.xpm
 %%DATADIR%%/pixmaps/icon.xpm
+%%DATADIR%%/pixmaps/icon.16x16.xpm
+%%DATADIR%%/pixmaps/icon.32x32.xpm
 %%DATADIR%%/pixmaps/leaf.xpm
 %%DATADIR%%/pixmaps/legacy.xpm
 %%DATADIR%%/pixmaps/magnet.16x16.png