3 files changed, 52 insertions, 26 deletions

diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 70d8728fcb65..44cb2214d0fe 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -8,9 +8,10 @@
 #
 # A quick note on configurable make symbols:
 #
-# WITH_INTERACTIVE: Launches Configure in it's default mode, which is *very*
-#	interactive. Disabled here by default to conform to FreeBSD guidelines,
-#	this mode is useful if you have problems with the default Configure.
+# INTERACTIVE_CONFIGURE: Launches Configure in it's default mode,
+#	which is *very* interactive. Disabled here by default to conform to
+#	FreeBSD guidelines, this mode is useful if you have problems with the
+#	default Configure.
 #
 # WITH_GTK2: Configure and build for gtk2.
 #
@@ -18,17 +19,15 @@
 #	at a cost in performance. Useful if you intend to move the executable
 #	to multiple machines.
 #
-# WITH_DEBUG: Compile with debugging symbols. Useful if you intend to make a bug
-#	report.
+# WITH_DEBUG: Compile with debugging symbols. Useful if you intend to make
+#	a bug report.
 #
-# Note that unicode support is currently unavailable for this platform. This
-# package requires a working ICU installation to achieve this, which doesn't
-# work here, and produces a broken executable.
+# WITHOUT_ICU: Don't compile with unicode support via the ICU library.
+#	Note that ICU versions previous to 2.6 may not work correctly.
 #
 
 PORTNAME=	gtk-gnutella
-PORTVERSION=	0.93.3
-PORTREVISION=	1
+PORTVERSION=	0.93.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://gtk-gnutella.sourceforge.net/download/ \
@@ -39,14 +38,11 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	crollins666@hotmail.com
 COMMENT=	GTK based Gnutella client
 
-MAN1=		gtk-gnutella.1
-
 USE_PERL5=	yes
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_BISON=	yes
 USE_GNOME=	libxml2
-USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-Dyacc='bison -y' -Dofficial='true' -Dprefix=${PREFIX}
@@ -54,15 +50,21 @@ CONFIGURE_ARGS+=	-Dbindir=${PREFIX}/bin -Dprivlib=${PREFIX}/share/gtk-gnutella
 CONFIGURE_ARGS+=	-Dsysman=${PREFIX}/man/man1 -Dlocale=${PREFIX}/share/locale
 CONFIGURE_ARGS+=	-Dccflags='${CFLAGS} -I${LOCALBASE}/include/'
 
-OPTIONS=	DEBUG "Build with debugging symbols" off\
+MAN1=		gtk-gnutella.1
+
+OPTIONS=	DEBUG "Build with debugging symbols" off \
 		GTK2 "Build with gtk2 frontend" off \
-		INTERACTIVE "Use Configure in interactive mode" off \
+		ICU "Enable non-roman charset support" on \
 		PORTABILITY "Use the PATH variable at run-time" off
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITH_INTERACTIVE)
-CONFIGURE_ARGS+=-d -e
+.if !defined(INTERACTIVE_CONFIGURE)
+CONFIGURE_ARGS+=	-d -e
+.endif
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	-Doptimize=-g  -Uofficial=
 .endif
 
 .if defined(WITH_GTK2)
@@ -73,16 +75,16 @@ CONFIGURE_ARGS+=	-Dgtkversion=1
 USE_GNOME+=		gtk12
 .endif
 
-.if defined(WITH_PORTABILITY)
-CONFIGURE_ARGS+=	-Dd_portable=true
-.endif
+.if !defined(WITHOUT_ICU)
+LIB_DEPENDS+=		icuuc:${PORTSDIR}/devel/icu2
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	-Doptimize=-g  -Uofficial=
+# Add threading to the ld flags; icuuc requires these by default
+CONFIGURE_ARGS+=	-Dldflags=${PTHREAD_LIBS}
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's| icuuc | |' ${WRKSRC}/${CONFIGURE_SCRIPT}
+.if defined(WITH_PORTABILITY)
+CONFIGURE_ARGS+=	-Dd_portable=true
+.endif
 
 post-install:
 	@${ECHO} 'Installing compressed man page in man/man1/'
diff --git a/net-p2p/gtk-gnutella/distinfo b/net-p2p/gtk-gnutella/distinfo
index c6054ed79c47..145ef4e82971 100644
--- a/net-p2p/gtk-gnutella/distinfo
+++ b/net-p2p/gtk-gnutella/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk-gnutella-0.93.3.tar.bz2) = 34e357c768e6bbecd267d04b95e9c380
-SIZE (gtk-gnutella-0.93.3.tar.bz2) = 1279197
+MD5 (gtk-gnutella-0.93.4.tar.bz2) = d7eac5792b01694ddcb5969030ec9bbb
+SIZE (gtk-gnutella-0.93.4.tar.bz2) = 1284961
diff --git a/net-p2p/gtk-gnutella/files/patch-Configure b/net-p2p/gtk-gnutella/files/patch-Configure
new file mode 100644
index 000000000000..56095a7cace6
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/patch-Configure
@@ -0,0 +1,24 @@
+--- Configure.orig	Wed Jun  9 01:49:22 2004
++++ Configure	Sat Jun 12 16:48:17 2004
+@@ -3874,8 +3874,8 @@
+ $rm -f t.c
+
+ : see if ucnv_open_2_6 exists
+-set ucnv_open_2_6 d_ucnv_open_2_6
+-eval $inlibc
++: set ucnv_open_2_6 d_ucnv_open_2_6
++: eval $inlibc
+
+ : check whether we have a working ICU library
+ echo " "
+@@ -3883,8 +3883,8 @@
+ case " $libs " in
+ *" -licuuc "*)
+ 	has_icu=y
+-	case "$i_uni_putil$d_ucnv_open_2_6" in
+-	"$define$define")
++	case "$i_uni_putil" in
++	"$define")
+ 		echo "Your ICU library is workable." >&4
+ 		val="$define"
+ 		;;