Changes 0.96.1:

Bug fixes:
- Fixed issue when browse host is the only search in the list.
- Reset download buffers on incomplete writes.
- Fixed ever-growing sidebar at each relaunch under GTK1.
- Fixed misdetection of chunk completion, causing undue abortion of downloads.
- Was wrongly showing the source download speed twice in download status.
- Range column was sometimes inexact in downloads.

Improvements:
 - Print PFS indication for actively queued entries as well.
 - Take buffered data into account when showing download progress.
 - Downloads now show how many HTTP requests were made on the same connection.
 - Try to reposition the main window correctly.

Configuration Changes:
 - Minimum connection timeout is set to 15 seconds.
 - Default for "maximum % of slots / vendor" raised to 90.

4 files changed, 42 insertions, 22 deletions

diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index ce4d8afe5ac..43b6d7a71ee 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2006/04/22 17:32:34 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2006/05/12 20:43:54 adam Exp $
 
-DISTNAME=	gtk-gnutella-0.96
-PKGREVISION=	4
+DISTNAME=	gtk-gnutella-0.96.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtk-gnutella/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,20 +13,22 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./Configure
-CONFIGURE_ARGS+=	-d -e -r -s \
-			-D prefix=${PREFIX:Q} \
-			-D privlib="${PREFIX}/share/gtk-gnutella" \
-			-D sysman="${PREFIX}/man" \
-			-D locale="${PREFIX}/${PKGLOCALEDIR}/locale" \
-			-D cc=${CC:Q} \
-			-D ccflags="${CFLAGS:Unone}" \
-			-D gtkversion=2 \
-			-D yacc="yacc" \
-			-D official="true" \
-			-U optimize
+CONFIGURE_ARGS+=	-d -e -r -s
+CONFIGURE_ARGS+=	-D prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	-D privlib="${PREFIX}/share/gtk-gnutella"
+CONFIGURE_ARGS+=	-D sysman="${PREFIX}/man"
+CONFIGURE_ARGS+=	-D locale="${PREFIX}/${PKGLOCALEDIR}/locale"
+CONFIGURE_ARGS+=	-D cc=${CC:Q}
+CONFIGURE_ARGS+=	-D ccflags="${CFLAGS:Unone}"
+CONFIGURE_ARGS+=	-D yacc="yacc"
+CONFIGURE_ARGS+=	-D official="true"
+CONFIGURE_ARGS+=	-U optimize
+
+.include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gtk-gnutella/distinfo b/net/gtk-gnutella/distinfo
index 3d5433d8a6a..2c5dce77e0b 100644
--- a/net/gtk-gnutella/distinfo
+++ b/net/gtk-gnutella/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.22 2006/04/22 17:32:34 joerg Exp $
+$NetBSD: distinfo,v 1.23 2006/05/12 20:43:54 adam Exp $
 
-SHA1 (gtk-gnutella-0.96.tar.bz2) = 29628c5a88d2e2e4167ec85cdc72ca4cf5108b7d
-RMD160 (gtk-gnutella-0.96.tar.bz2) = a7a3cd2560a219a17b55311439520eb29600ee9f
-Size (gtk-gnutella-0.96.tar.bz2) = 2668453 bytes
-SHA1 (patch-aa) = 22cd271b6a4b399f2ceea93ce0ab2b562d84553e
+SHA1 (gtk-gnutella-0.96.1.tar.bz2) = 28540c4e78f4c3513ac15b95228a98d17ace2091
+RMD160 (gtk-gnutella-0.96.1.tar.bz2) = 58fc8eb3aea991e81d96435f11665d6f50ccc1de
+Size (gtk-gnutella-0.96.1.tar.bz2) = 2661487 bytes
+SHA1 (patch-aa) = 16cc12d99624677d81fd1a7746b2afb80db0b570
diff --git a/net/gtk-gnutella/options.mk b/net/gtk-gnutella/options.mk
new file mode 100644
index 00000000000..d89714618d9
--- /dev/null
+++ b/net/gtk-gnutella/options.mk
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2006/05/12 20:43:54 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gtk-gnutella
+PKG_SUPPORTED_OPTIONS=		# empty
+PKG_OPTIONS_OPTIONAL_GROUPS=	gui
+PKG_OPTIONS_GROUP.gui=		gtk1 gtk2
+PKG_SUGGESTED_OPTIONS=		gtk2
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgtk1)
+CONFIGURE_ARGS+=	-D gtkversion=1
+.  include "../../x11/gtk/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk2)
+CONFIGURE_ARGS+=	-D gtkversion=2
+.  include "../../x11/gtk2/buildlink3.mk"
+.endif
diff --git a/net/gtk-gnutella/patches/patch-aa b/net/gtk-gnutella/patches/patch-aa
index e789e5031e3..3bb51733e8a 100644
--- a/net/gtk-gnutella/patches/patch-aa
+++ b/net/gtk-gnutella/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2006/04/22 17:32:34 joerg Exp $
+$NetBSD: patch-aa,v 1.6 2006/05/12 20:43:54 adam Exp $
 
---- Configure.orig	2006-04-22 16:51:13.000000000 +0000
+--- Configure.orig	2006-02-22 17:50:18.000000000 +0100
 +++ Configure
-@@ -4575,6 +4575,11 @@ done'
+@@ -4576,6 +4576,11 @@ done'
  set libintl.h i_libintl
  eval $inhdr