Changes 0.80:

* deletion of unattached GDL added.
* Polish translation update by Emil.
* fix UADDR list redisplay problem.
* fix a crash of dc_gui2_stat when there is nothing to display.
* add upload stat to dc_gui2_stat (only DCTC v0.85.9 provides upload logs).
* fix a user display problem. If a user entering the hub is already created
  (used by GDL, upload, share list, ...), he was not displayed in the user
  clist.
* Fix incorrect global stat values occuring when multiple 'done' files are
  loaded.
* Bittorrent tab is handled by an external program: dc_gui2_bt
* To ease development of future external program, most of the configuration is
* now store in gconf instead gnome_config.
* dc_gui2 command line parameters are back (dc_gui2 --help for the list).
* update .spec file to support fedora (based on Sammy Atmadja modification).

6 files changed, 73 insertions, 37 deletions

diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index 04823973ed4..a7774d625f5 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,39 +1,41 @@
-# $NetBSD: Makefile,v 1.47 2010/01/18 09:59:19 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.48 2010/06/02 13:08:22 adam Exp $
 
-DISTNAME=	dc_gui2-0.75
-PKGREVISION=	26
+DISTNAME=	dc_gui2-0.80
 CATEGORIES=	net
-MASTER_SITES=	http://ac2i.homelinux.com/dctc/ 
+MASTER_SITES=	http://ac2i.homelinux.com/dctc/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ac2i.homelinux.com/dctc/
 COMMENT=	Graphical user interface for DCTC
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	dctc>=0.85.4:../../net/dctc
+DEPENDS+=	dctc>=0.85.9:../../net/dctc
 
-GNU_CONFIGURE=		YES
-USE_PKGLOCALEDIR=	YES
-CONFIGURE_ARGS+=	--enable-manual-db-detect
+BDB_ACCEPTED=		db4 db5
+USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config msgfmt
-USE_LIBTOOL=		YES
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-manual-db-detect
 
 UNLIMIT_RESOURCES+=	datasize
 
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.db4}/include/db4
-CPPFLAGS+=	-DNO_PRINTF_LOCALE
+CPPFLAGS+=		-I${BDBBASE}/include/${BDB_TYPE}
+CPPFLAGS+=		-DNO_PRINTF_LOCALE
+BUILDLINK_TRANSFORM+=	l:db4:${BDB_TYPE}
 
 post-configure:
-	@${ECHO} '#ifndef MSG_NOSIGNAL' >> ${WRKSRC}/config.h
-	@${ECHO} '# define MSG_NOSIGNAL 0' >> ${WRKSRC}/config.h
-	@${ECHO} '#endif' >> ${WRKSRC}/config.h
-	@sleep 5
-	@${TOUCH} ${WRKSRC}/stamp-h ${WRKSRC}/stamp-h.in
+	${ECHO} '#ifndef MSG_NOSIGNAL' >> ${WRKSRC}/config.h
+	${ECHO} '# define MSG_NOSIGNAL 0' >> ${WRKSRC}/config.h
+	${ECHO} '#endif' >> ${WRKSRC}/config.h
+	${TOUCH} ${WRKSRC}/stamp-h ${WRKSRC}/stamp-h.in
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/dc_gui2/PLIST b/net/dc_gui2/PLIST
index 54f30592649..3c836f3923a 100644
--- a/net/dc_gui2/PLIST
+++ b/net/dc_gui2/PLIST
@@ -1,6 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:00:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/06/02 13:08:22 adam Exp $
+bin/bt2dc_gui2
+bin/bt2dc_gui2_prelaunch
 bin/cmd2dc_gui2
 bin/dc_gui2
+bin/dc_gui2_bt
+bin/dc_gui2_stat
+bin/dc_gui2_unattached_gdl
 share/applications/dc_gui2.desktop
 share/gnome/help/dc_gui/C/chat.html
 share/gnome/help/dc_gui/C/chat.png
@@ -22,7 +27,17 @@ share/gnome/help/dc_gui/C/startup.png
 share/gnome/help/dc_gui/C/user_file_list.html
 share/gnome/help/dc_gui/C/user_file_list.png
 share/locale/fr/LC_MESSAGES/dc_gui2.mo
+share/locale/fr/LC_MESSAGES/dc_gui2_bt.mo
+share/locale/fr/LC_MESSAGES/dc_gui2_stat.mo
+share/locale/fr/LC_MESSAGES/dc_gui2_unattached_gdl.mo
 share/locale/nl/LC_MESSAGES/dc_gui2.mo
+share/locale/nl/LC_MESSAGES/dc_gui2_bt.mo
+share/locale/nl/LC_MESSAGES/dc_gui2_stat.mo
+share/locale/nl/LC_MESSAGES/dc_gui2_unattached_gdl.mo
+share/locale/pl/LC_MESSAGES/dc_gui2.mo
+share/locale/pl/LC_MESSAGES/dc_gui2_bt.mo
+share/locale/pl/LC_MESSAGES/dc_gui2_stat.mo
+share/locale/pl/LC_MESSAGES/dc_gui2_unattached_gdl.mo
 share/pixmaps/dc_gui2.xpm
 share/pixmaps/dc_gui2/icon_kill.xpm
 @pkgdir share/gnome/help/dc_gui/C/images
diff --git a/net/dc_gui2/distinfo b/net/dc_gui2/distinfo
index 9ffce71eb11..0a32c2a03c4 100644
--- a/net/dc_gui2/distinfo
+++ b/net/dc_gui2/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/12/05 20:50:44 rillig Exp $
+$NetBSD: distinfo,v 1.5 2010/06/02 13:08:22 adam Exp $
 
-SHA1 (dc_gui2-0.75.tar.gz) = ac99b99e292d1646c8f87e5016762795e6f721b1
-RMD160 (dc_gui2-0.75.tar.gz) = 7851bc5d0d8a941f622d9397c3fcfe7840f7f39e
-Size (dc_gui2-0.75.tar.gz) = 612248 bytes
-SHA1 (patch-aa) = ac14a12d740b030f068b9947f87fc4a29b84313a
-SHA1 (patch-ac) = 5a78d9f28de9b8df1d02c821b39ac14ec00e4622
+SHA1 (dc_gui2-0.80.tar.gz) = 075e512127a0ab6a65295aa989d1f48187575a78
+RMD160 (dc_gui2-0.80.tar.gz) = b3db69c30b7507b183a02f5ce9c847cc7fa0df92
+Size (dc_gui2-0.80.tar.gz) = 1340777 bytes
+SHA1 (patch-aa) = 3aafdb3d244ca6234c21c2f4f7ffc9106ce7d45e
+SHA1 (patch-ac) = 535f1853b4371320fd6c1acc6e6b26b9f832c3f4
 SHA1 (patch-af) = f867979e46a62611d2201a93e26deaf3c08b298e
+SHA1 (patch-ag) = 7748cc2665eda36b00c842f2ca338f59e1d59b0d
diff --git a/net/dc_gui2/patches/patch-aa b/net/dc_gui2/patches/patch-aa
index 3d4fa82c5d9..040418e6728 100644
--- a/net/dc_gui2/patches/patch-aa
+++ b/net/dc_gui2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/06/10 13:21:52 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2010/06/02 13:08:22 adam Exp $
 
---- configure.orig	Tue Jun 10 14:32:15 2003
+--- configure.orig	2004-01-24 06:41:45.000000000 +0000
 +++ configure
-@@ -10490,6 +10490,7 @@
+@@ -11042,6 +11042,7 @@ fi
  
  							if test "x$HAVE_DB40" = "xyes"; then
  
diff --git a/net/dc_gui2/patches/patch-ac b/net/dc_gui2/patches/patch-ac
index eef57c036ca..4db7a96100b 100644
--- a/net/dc_gui2/patches/patch-ac
+++ b/net/dc_gui2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/06/10 13:21:52 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2010/06/02 13:08:22 adam Exp $
 
---- src/callbacks.c.orig	Sun Jun  1 10:02:59 2003
+--- src/callbacks.c.orig	2004-01-21 15:57:32.000000000 +0000
 +++ src/callbacks.c
-@@ -30,7 +30,13 @@
+@@ -30,7 +30,13 @@ $Id: callbacks.c,v 1.65 2004/01/21 15:57
  #include <sys/socket.h>
  #include <sys/un.h>
  #include <math.h>
@@ -16,14 +16,14 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/06/10 13:21:52 wiz Exp $
  #include <fcntl.h>
  #include <signal.h>
  #include <dirent.h>
-@@ -71,6 +77,10 @@
- #include "gtk_helper.h"
- #include "network.h"
- #include "custom_hublist_tree.h"
-+
+@@ -75,6 +81,10 @@ $Id: callbacks.c,v 1.65 2004/01/21 15:57
+ #include "global_user.h"
+ #include "manage_chat.h"
+ 
 +#ifndef MSG_NOSIGNAL
 +#define MSG_NOSIGNAL 0
 +#endif
- 
++
  static void build_start_dl_popup(int from_panel);
  void on_load_selected_share_lists_button_clicked (GtkButton       *button, gpointer         user_data);
+ 
diff --git a/net/dc_gui2/patches/patch-ag b/net/dc_gui2/patches/patch-ag
new file mode 100644
index 00000000000..f7159ea6cf6
--- /dev/null
+++ b/net/dc_gui2/patches/patch-ag
@@ -0,0 +1,18 @@
+$NetBSD: patch-ag,v 1.1 2010/06/02 13:08:22 adam Exp $
+
+--- dc_gui2_stat/src/init_fnc.c.orig	Wed Jul  9 18:20:53 2003
++++ dc_gui2_stat/src/init_fnc.c
+@@ -35,7 +35,13 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
++#ifdef __linux__
+ #include <linux/sem.h>		/* for the value of SEMVMX */
++#else
++#ifndef SEMVMX
++#define SEMVMX  32767           /* semaphore maximum value */
++#endif
++#endif
+ #include <dirent.h>
+ #include <string.h>
+ #include <errno.h>