- Update to 0.93

- Add new knobs WITH_GTK2 and WITH_REMOTE_INTERFACE
- Give maintainership to submitter

PR:		ports/54624
Submitted by:	clayton rollins <crollins666@hotmail.com>
Approved by:	maintainer

4 files changed, 105 insertions, 9 deletions

diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 6764cdb5a39..cf87b996405 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -5,22 +5,103 @@
 # $FreeBSD$
 #
 
+#
+# A quick note on configurable make symbols:
+#
+# RUN_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.
+#
+# WITH_GTK2: Configure and build for gtk2.
+#
+# WITH_REMOTE_INTERFACE: Configure and build with experimental telnet-based
+#	remote interface.
+#
+# 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.
+#
+
 PORTNAME=	gtk-gnutella
-PORTVERSION=	0.91.1
+PORTVERSION=	0.93
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://gtk-gnutella.sourceforge.net/download/ \
+		ftp://gtk-gnutella.sourceforge.net/pub/gtk-gnutella/
 MASTER_SITE_SUBDIR=	${PORTNAME}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	roman@xpert.com
+MAINTAINER=	crollins666@hotmail.com
 COMMENT=	GTK based Gnutella client
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
+MAN1=		gtk-gnutella.1
 
+USE_PERL5=	yes
 USE_X_PREFIX=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk12
-GNU_CONFIGURE=	yes
+USE_GNOME=	libxml2
+USE_REINPLACE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_SCRIPT=	Configure
+CONFIGURE_ARGS=		-Dyacc='bison -y' -Dofficial='true' -Dprefix=${PREFIX}
+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/'
+
+.if exists(/bin/sleep)
+SLEEP=		/bin/sleep 3
+.endif
+
+.if !defined(RUN_INTERACTIVE)
+CONFIGURE_ARGS+=-d -e
+.endif
+
+.if defined(WITH_GTK2)
+CONFIGURE_ARGS+=	-Dgtkversion=2
+USE_GNOME+=		gtk20
+.else
+CONFIGURE_ARGS+=	-Dgtkversion=1
+USE_GNOME+=		gtk12
+.endif
+
+.if defined(WITH_REMOTE_INTERFACE)
+CONFIGURE_ARGS+=	-Dremotectrl=true
+.endif
+
+.if defined(DEBUG)
+CONFIGURE_ARGS+=	-Doptimize=-g
+.endif
+
+pre-fetch:
+.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
+	@${ECHO} ''
+	@${ECHO} '        ===> NOTICE <==='
+	@${ECHO} ''
+	@${ECHO} 'You may use the following make options.'
+	@${ECHO} 'See the Makefile for complete descriptions.'
+	@${ECHO} ''
+	@${ECHO} 'RUN_INTERACTIVE:	Use Configure in interactive mode.'
+	@${ECHO} ''
+	@${ECHO} 'WITH_GTK2:		Build with gtk2 frontend.'
+	@${ECHO} ''
+	@${ECHO} 'WITH_REMOTE_INTERFACE:	Enable telnet-based remote interface.'
+	@${ECHO} ''
+	@${ECHO} 'DEBUG:			Build with debugging symbols.'
+	@${ECHO} ''
+	@${SLEEP}
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's| icuuc | |' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
-CONFIGURE_ARGS=	--enable-no-rfc1918
+post-install:
+	@${ECHO} 'Installing compressed man page in man/man1/'
+	@${CP} ${WRKSRC}/src/gtk-gnutella.man ${WRKSRC}/src/gtk-gnutella.1
+	@${INSTALL_MAN} ${WRKSRC}/src/gtk-gnutella.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/net-p2p/gtk-gnutella/distinfo b/net-p2p/gtk-gnutella/distinfo
index f542eecb496..06c43c5def8 100644
--- a/net-p2p/gtk-gnutella/distinfo
+++ b/net-p2p/gtk-gnutella/distinfo
@@ -1 +1 @@
-MD5 (gtk-gnutella-0.91.1.tar.gz) = bd00261511cd38326357085050423a39
+MD5 (gtk-gnutella-0.93.tar.bz2) = 78d099392a61064ca30fac84c888550b
diff --git a/net-p2p/gtk-gnutella/pkg-descr b/net-p2p/gtk-gnutella/pkg-descr
index 7de6a9838b5..0f278738c73 100644
--- a/net-p2p/gtk-gnutella/pkg-descr
+++ b/net-p2p/gtk-gnutella/pkg-descr
@@ -1,9 +1,12 @@
 GTK based Gnutella client which supports the standard Gnutella operations.
 
 Search, download, file sharing, bandwidth limiting, host caching, as well
-as some basic statistics.
+as some basic statistics. Now with enhanced features, such as PARQ queueing,
+PFSP, push-proxies, and others, making it a stable and fully functional
+graphical gnutella client for *nix systems.
 
 An excellent way to find that hidden file on the internet that you know exists
 but standard search engines do not seem to carry.
 
 WWW: http://gtk-gnutella.sourceforge.net/
+IRC: #gtk-gnutella on freenode.net
diff --git a/net-p2p/gtk-gnutella/pkg-plist b/net-p2p/gtk-gnutella/pkg-plist
index 8dd64e607c9..624db176fdf 100644
--- a/net-p2p/gtk-gnutella/pkg-plist
+++ b/net-p2p/gtk-gnutella/pkg-plist
@@ -1,17 +1,29 @@
 bin/gtk-gnutella
+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/download.xpm
 share/gtk-gnutella/pixmaps/exit.xpm
 share/gtk-gnutella/pixmaps/filter.xpm
 share/gtk-gnutella/pixmaps/firewall.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/thaw.xpm
+share/gtk-gnutella/pixmaps/ultra.xpm
+share/gtk-gnutella/pixmaps/upload.xpm
+share/locale/es/LC_MESSAGES/gtk-gnutella.mo
+share/locale/fr/LC_MESSAGES/gtk-gnutella.mo
+share/locale/nl/LC_MESSAGES/gtk-gnutella.mo
 @dirrm share/gtk-gnutella/pixmaps
 @dirrm share/gtk-gnutella