3 files changed, 43 insertions, 7 deletions

diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index a1ab15e99c64..61d6940e3a0f 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -24,8 +24,7 @@
 #
 
 PORTNAME=	gtk-gnutella
-PORTVERSION=	0.95.4
-PORTREVISION=	1
+DISTVERSION=	0.96b
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://gtk-gnutella.sourceforge.net/download/ \
@@ -47,16 +46,24 @@ CONFIGURE_ARGS=	-Dyacc='bison -y' -Dofficial='true' -Dprefix=${PREFIX} \
 		-Dprivlib=${PREFIX}/share/gtk-gnutella \
 		-Dsysman=${PREFIX}/man/man1 -Dlocale=${PREFIX}/share/locale \
 		-Dcc='${CC}' -Dccflags='${CFLAGS} -I${LOCALBASE}/include' \
-		-Doptimize='undef' -Dlibpth='/usr/lib ${LOCALBASE}/lib'
+		-Doptimize='undef' -Dlibpth='/usr/lib ${LOCALBASE}/lib' \
+		-Dd_enablenls='define'
 
 MAN1=		gtk-gnutella.1
 
-OPTIONS=	DEBUG "Build with debugging symbols" off \
-		GTK2 "Build with gtk2 frontend" on \
+OPTIONS=	GTK2 "Build with gtk2 frontend" on \
+		TLS "enable GNU TLS encryption support" off \
+		IPV6 "enable IPv6 support" off \
+		DBUS "enable DBUS support" off \
+		DEBUG "Build with debugging symbols" off \
 		PORTABILITY "Use the PATH variable at run-time" off
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+BROKEN=		"Does not compile"
+.endif
+
 .if !defined(INTERACTIVE_CONFIGURE)
 CONFIGURE_ARGS+=	-d -e
 .endif
@@ -77,4 +84,20 @@ USE_GNOME+=		gtk12
 CONFIGURE_ARGS+=	-Dd_portable=true
 .endif
 
+.if defined(WITH_TLS)
+LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
+.else
+CONFIGURE_ARGS+=	-Dd_gnutls=undef
+.endif
+
+.if !defined(WITH_IPV6)
+CONFIGURE_ARGS+=	-D ipv6=false
+.endif
+
+.if defined(WITH_DBUS)
+LIB_DEPENDS+=		dbus:${PORTSDIR}/devel/dbus
+.else
+CONFIGURE_ARGS+=	-D dbus=false
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/net-p2p/gtk-gnutella/distinfo b/net-p2p/gtk-gnutella/distinfo
index 49b49a98e54f..7308287548a0 100644
--- a/net-p2p/gtk-gnutella/distinfo
+++ b/net-p2p/gtk-gnutella/distinfo
@@ -1,2 +1,3 @@
-MD5 (gtk-gnutella-0.95.4.tar.bz2) = 4e6ea65149100c882f9b2c4ff7ca8dc1
-SIZE (gtk-gnutella-0.95.4.tar.bz2) = 2337832
+MD5 (gtk-gnutella-0.96b.tar.bz2) = 5ecd6baa91a19250217fd6911c6a932f
+SHA256 (gtk-gnutella-0.96b.tar.bz2) = 7190cd2098744e99c88c3d423cb1718fb449ebd88dc217c42adbccab13db56b7
+SIZE (gtk-gnutella-0.96b.tar.bz2) = 2570856
diff --git a/net-p2p/gtk-gnutella/pkg-plist b/net-p2p/gtk-gnutella/pkg-plist
index ef4e913e8e2d..6346d1147d2f 100644
--- a/net-p2p/gtk-gnutella/pkg-plist
+++ b/net-p2p/gtk-gnutella/pkg-plist
@@ -1,14 +1,20 @@
 bin/gtk-gnutella
 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%%/en/FAQ
+%%DATADIR%%/el/FAQ
+%%DATADIR%%/ja/FAQ
 %%DATADIR%%/pixmaps/arrow_down.xpm
 %%DATADIR%%/pixmaps/arrow_up.xpm
 %%DATADIR%%/pixmaps/booklib.xpm
 %%DATADIR%%/pixmaps/booksha.xpm
 %%DATADIR%%/pixmaps/bookshav.xpm
+%%DATADIR%%/pixmaps/chip.xpm
 %%DATADIR%%/pixmaps/clanbomber_red.xpm
 %%DATADIR%%/pixmaps/clanbomber_yellow.xpm
 %%DATADIR%%/pixmaps/download.xpm
@@ -36,11 +42,17 @@ share/applications/gtk-gnutella.desktop
 share/pixmaps/gtk-gnutella.png
 share/pixmaps/gtk-gnutella.svg
 share/locale/de/LC_MESSAGES/gtk-gnutella.mo
+share/locale/el/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
+share/locale/uk/LC_MESSAGES/gtk-gnutella.mo
+share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo
 @unexec rmdir %D/share/applications 2>/dev/null || true
 @dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/el
+@dirrm %%DATADIR%%/en
+@dirrm %%DATADIR%%/ja
 @dirrm %%DATADIR%%