4 files changed, 72 insertions, 72 deletions

diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index a457fde43935..42b9ac82e89e 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -9,13 +9,10 @@
 #	FreeBSD guidelines, this mode is useful if you have problems with the
 #	default Configure.
 #
-# WITH_X11: Disable this to build a headless version of Gtk-Gnutella. The
-#       resulting executable won't use or depend on any Gtk version and
-#       Gtk-Gnutella can only be controlled through the remote shell.
-#       Use with caution!
-#
-# WITH_GTK2: Enable to configure and build with GTK 2, disable to configure and
-#       build with GTK 1.2. Will be ignored if WITH_X11 is disabled!
+# WITH_GUI: Disable this to build a headless version of Gtk-Gnutella.
+#       Therefore, monitoring of operations for Gtk-Gnutella will have to be
+#       done without relying on any GUI, and the configuration is done via
+#       files only.
 #
 # WITH_TLS: Enable support for scrambling GNet connections. Currently supported
 #       only by Gtk-Gnutella.
@@ -39,34 +36,38 @@
 #
 
 PORTNAME=	gtk-gnutella
-PORTVERSION=	0.96.9
-PORTREVISION=	2
+PORTVERSION=	0.98.4
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK based Gnutella client
 
-USE_PERL5=	yes
+LICENSE=	GPLv2 # (or later)
+
+OPTIONS_DEFINE=	GUI TLS NLS IPV6 DBUS SQLITE DEBUG PORTABILITY
+OPTIONS_DEFAULT=GUI TLS
+PORTABILITY_DESC=	Use the PATH variable at run-time
+
+ONLY_FOR_ARCHS=	i386 amd64
+
 USE_BZIP2=	yes
+USE_GNOME=	glib20 libxml2
+USE_PERL5=	yes
 USE_BISON=	build
-MAKE_JOBS_UNSAFE=	yes
-USE_GNOME=	libxml2 glib20
-INSTALL_TARGET=	install install.man
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	-O -Dyacc='bison -y' -Dprefix=${PREFIX} \
-		-Dprivlib=${PREFIX}/share/gtk-gnutella \
-		-Dsysman=${PREFIX}/man/man1 -Dlocale=${PREFIX}/share/locale \
-		-Dcc='${CC}' -Dccflags='${CFLAGS} -I${LOCALBASE}/include' \
+		-Dprivlib=${DATADIR} -Dsysman=${MANPREFIX}/man/man1 \
+		-Dlocale=${PREFIX}/share/locale -Dcc='${CC}' \
+		-Dccflags='${CFLAGS} -I${LOCALBASE}/include' \
 		-Doptimize='undef'
-ONLY_FOR_ARCHS=	i386 amd64
+INSTALL_TARGET=	install install.man
+MAKE_JOBS_UNSAFE=	yes
 
-MAN1=		gtk-gnutella.1
+PLIST_SUB=	ARCH="${ARCH}"
 
-OPTIONS_DEFINE=	X11 GTK2 GNUTLS NLS IPV6 DBUS SQLITE DEBUG PORTABILITY
-OPTIONS_DEFAULT=	X11 GTK2 GNUTLS
-PORTABILITY_DESC=	Use the PATH variable at run-time
+MAN1=		gtk-gnutella.1
 
 .include <bsd.port.options.mk>
 
@@ -80,15 +81,9 @@ CONFIGURE_ARGS+=	-D optimize=-g  -D official=false
 CONFIGURE_ARGS+=	-D official=true
 .endif
 
-.if ${PORT_OPTIONS:MX11}
-USE_XORG=		x11
-.if ${PORT_OPTIONS:MGTK2}
-CONFIGURE_ARGS+=	-D gtkversion=2
+.if ${PORT_OPTIONS:MGUI}
 USE_GNOME+=		gtk20
-.else
-CONFIGURE_ARGS+=	-D gtkversion=1
-USE_GNOME+=		gtk12
-.endif
+CONFIGURE_ARGS+=	-D gtkversion=2
 .else
 CONFIGURE_ARGS+=	-D d_headless
 .endif
@@ -97,39 +92,29 @@ CONFIGURE_ARGS+=	-D d_headless
 CONFIGURE_ARGS+=	-D d_portable
 .endif
 
-.if ${PORT_OPTIONS:MGNUTLS}
+.if ${PORT_OPTIONS:MTLS}
 LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=	-U d_gnutls
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-CONFIGURE_ARGS+=	-D d_nls
 USE_GETTEXT=		yes
-PLIST_FILES=		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/hu/LC_MESSAGES/gtk-gnutella.mo \
-			share/locale/it/LC_MESSAGES/gtk-gnutella.mo \
-			share/locale/ja/LC_MESSAGES/gtk-gnutella.mo \
-			share/locale/nb/LC_MESSAGES/gtk-gnutella.mo \
-			share/locale/nl/LC_MESSAGES/gtk-gnutella.mo \
-			share/locale/tr/LC_MESSAGES/gtk-gnutella.mo \
-			share/locale/uk/LC_MESSAGES/gtk-gnutella.mo \
-			share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo
+CONFIGURE_ARGS+=	-D d_nls
+PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	-U d_nls
+PLIST_SUB+=		NLS="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MIPB6}
+.if empty(PORT_OPTIONS:MIPV6)
 CONFIGURE_ARGS+=	-D ipv6=false
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=		dbus:${PORTSDIR}/devel/dbus
 .else
-CONFIGURE_ARGS+=	-D dbus=false
+CONFIGURE_ARGS+=	-U d_dbus
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
@@ -138,16 +123,4 @@ USE_SQLITE=		yes
 CONFIGURE_ARGS+=	-U d_sqlite
 .endif
 
-.if ${ARCH} == i386
-PLIST_SUB+=	I386=""
-.else
-PLIST_SUB+=	I386="@comment "
-.endif
-
-.if ${ARCH} == amd64
-PLIST_SUB+=	AMD64=""
-.else
-PLIST_SUB+=	AMD64="@comment "
-.endif
-
 .include <bsd.port.mk>
diff --git a/net-p2p/gtk-gnutella/distinfo b/net-p2p/gtk-gnutella/distinfo
index 266d4c78fb1e..f67d64d5ea46 100644
--- a/net-p2p/gtk-gnutella/distinfo
+++ b/net-p2p/gtk-gnutella/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtk-gnutella-0.96.9.tar.bz2) = b2f5a5eaa28fb02920d55f6942ad4583402e0cb02e88344a045cf25b62c99c9f
-SIZE (gtk-gnutella-0.96.9.tar.bz2) = 16669486
+SHA256 (gtk-gnutella-0.98.4.tar.bz2) = c4cac5707ece44a92e4b0387e309ca334be348a81e44c2db7f4c9946a8a58fb5
+SIZE (gtk-gnutella-0.98.4.tar.bz2) = 19078172
diff --git a/net-p2p/gtk-gnutella/files/patch-src__common.h b/net-p2p/gtk-gnutella/files/patch-src__common.h
new file mode 100644
index 000000000000..6d5fd540f0d2
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/patch-src__common.h
@@ -0,0 +1,11 @@
+--- src/common.h.orig	2012-11-12 01:29:34.000000000 +0900
++++ src/common.h	2012-12-05 16:43:09.000000000 +0900
+@@ -756,7 +756,7 @@
+  * warnings on a wrong __asm__ statement with glib 1.2.  This version
+  * should be as efficient as the one defined by glib.
+  */
+-#if HAS_GCC(4, 0)
++#if HAS_GCC(4, 0) && !defined(__FreeBSD__)
+ #define GUINT32_SWAP(x_) \
+ 	(IS_CONSTANT(x_) ? GUINT32_SWAP_CONSTANT(x_) : __builtin_bswap32(x_))
+ #else
diff --git a/net-p2p/gtk-gnutella/pkg-plist b/net-p2p/gtk-gnutella/pkg-plist
index aa361a75f3d8..ebf84498e21d 100644
--- a/net-p2p/gtk-gnutella/pkg-plist
+++ b/net-p2p/gtk-gnutella/pkg-plist
@@ -1,17 +1,15 @@
 bin/gtk-gnutella
 share/applications/gtk-gnutella.desktop
+%%DATADIR%%/%%ARCH%%-freebsd/gtk-gnutella.nm
 %%DATADIR%%/bogons.txt
+%%DATADIR%%/el/FAQ
+%%DATADIR%%/en/FAQ
 %%DATADIR%%/favicon.png
+%%DATADIR%%/fr/FAQ
 %%DATADIR%%/geo-ip.txt
+%%DATADIR%%/geo-ipv6.txt
 %%DATADIR%%/hostiles.txt
-%%DATADIR%%/robots.txt
-%%DATADIR%%/spam.txt
-%%DATADIR%%/spam_sha1.txt
-%%DATADIR%%/en/FAQ
-%%DATADIR%%/el/FAQ
 %%DATADIR%%/ja/FAQ
-%%I386%%%%DATADIR%%/i386-freebsd/gtk-gnutella.nm
-%%AMD64%%%%DATADIR%%/amd64-freebsd/gtk-gnutella.nm
 %%DATADIR%%/pixmaps/arrow_down.xpm
 %%DATADIR%%/pixmaps/arrow_up.xpm
 %%DATADIR%%/pixmaps/booklib.xpm
@@ -39,9 +37,11 @@ share/applications/gtk-gnutella.desktop
 %%DATADIR%%/pixmaps/magnet.16x16.png
 %%DATADIR%%/pixmaps/magnet.32x32.png
 %%DATADIR%%/pixmaps/magnet.64x64.png
+%%DATADIR%%/pixmaps/natpmp.xpm
 %%DATADIR%%/pixmaps/no_firewall.xpm
 %%DATADIR%%/pixmaps/offline.xpm
 %%DATADIR%%/pixmaps/online.xpm
+%%DATADIR%%/pixmaps/pause.xpm
 %%DATADIR%%/pixmaps/save.xpm
 %%DATADIR%%/pixmaps/smallserver.xpm
 %%DATADIR%%/pixmaps/star-black.xpm
@@ -59,14 +59,30 @@ share/applications/gtk-gnutella.desktop
 %%DATADIR%%/pixmaps/upnp-unusable.xpm
 %%DATADIR%%/pixmaps/upnp.xpm
 %%DATADIR%%/pixmaps/warning.xpm
+%%DATADIR%%/robots.txt
+%%DATADIR%%/spam.txt
+%%DATADIR%%/spam_sha1.txt
+%%DATADIR%%/tr/FAQ
+%%NLS%%share/locale/de/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/el/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo
 share/pixmaps/gtk-gnutella.png
 share/pixmaps/gtk-gnutella.svg
-@dirrmtry bin
-@dirrmtry share/applications
-%%I386%%@dirrm %%DATADIR%%/i386-freebsd
-%%AMD64%%@dirrm %%DATADIR%%/amd64-freebsd
+@dirrm %%DATADIR%%/tr
 @dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/el
-@dirrm %%DATADIR%%/en
 @dirrm %%DATADIR%%/ja
+@dirrm %%DATADIR%%/fr
+@dirrm %%DATADIR%%/en
+@dirrm %%DATADIR%%/el
+@dirrm %%DATADIR%%/%%ARCH%%-freebsd
 @dirrm %%DATADIR%%
+@dirrmtry share/applications