Changes 0.85.9:

* 'done' log file contains upload log.
* fix the incorrect information sent to the UI when uploading a file bigger than
  2GB (only the display is buggy, the transfer works).
* update .spec file to support fedora (based on Sammy Atmadja modification).

6 files changed, 53 insertions, 41 deletions

diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index e5a788a5197..815a932e408 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -1,37 +1,41 @@
-# $NetBSD: Makefile,v 1.39 2009/04/30 20:59:15 zafer Exp $
-#
+# $NetBSD: Makefile,v 1.40 2010/06/02 13:07:12 adam Exp $
 
-DISTNAME=	dctc-0.85.4
-PKGREVISION=	6
+DISTNAME=	dctc-0.85.9
 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=	Direct Connect clone (Direct Connect Text Client)
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--enable-manual-db-detect
+BDB_ACCEPTED=		db4 db5
+USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake perl:run pkg-config
-USE_LIBTOOL=		YES
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-manual-db-detect
+CONFIGURE_ENV+=		BDB_TYPE=${BDB_TYPE}
 
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.db4}/include/db4
+CPPFLAGS+=		-I${BDBBASE}/include/${BDB_TYPE}
+BUILDLINK_TRANSFORM+=	l:db4:${BDB_TYPE}
 
 SUBST_CLASSES+=		inethack
+SUBST_STAGE.inethack=	post-patch
 SUBST_FILES.inethack=	src/dc_manage.c src/dc_manage_master.c
 SUBST_FILES.inethack+=	src/main.c src/main_master.c src/var.h
 SUBST_SED.inethack+=	-e 's,\(G_.*LOCK.*(\)inet_ntoa,\1my_inet_ntoa,g'
-SUBST_STAGE.inethack=	post-patch
 
 post-configure:
-	@${TOUCH} ${WRKSRC:Q}/stamp-h.in ${WRKSRC:Q}/config.h.in
-	@${TOUCH} ${WRKSRC:Q}/config.status ${WRKSRC:Q}/stamp-h
-	@${ECHO} '#ifndef MSG_NOSIGNAL' >> ${WRKSRC:Q}/config.h
-	@${ECHO} '# define MSG_NOSIGNAL 0' >> ${WRKSRC:Q}/config.h
-	@${ECHO} '#endif' >> ${WRKSRC:Q}/config.h
+	${TOUCH} ${WRKSRC}/stamp-h.in ${WRKSRC}/config.h.in
+	${TOUCH} ${WRKSRC}/config.status ${WRKSRC}/stamp-h
+	${ECHO} '#ifndef MSG_NOSIGNAL' >> ${WRKSRC}/config.h
+	${ECHO} '# define MSG_NOSIGNAL 0' >> ${WRKSRC}/config.h
+	${ECHO} '#endif' >> ${WRKSRC}/config.h
 
-.include "../../databases/db4/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/dctc/distinfo b/net/dctc/distinfo
index 3659fd876b1..4bee32e552e 100644
--- a/net/dctc/distinfo
+++ b/net/dctc/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.20 2007/12/16 21:18:42 rillig Exp $
+$NetBSD: distinfo,v 1.21 2010/06/02 13:07:12 adam Exp $
 
-SHA1 (dctc-0.85.4.tar.gz) = 8422f041ccd398fcabb032a6ece9f2f50d827bb7
-RMD160 (dctc-0.85.4.tar.gz) = ded2d6e8f8de47c50ef689d0c49f6b3bcc2439f6
-Size (dctc-0.85.4.tar.gz) = 493733 bytes
-SHA1 (patch-aa) = 62cae1e95c3422cb8b184cd8ee13989073b9fc06
-SHA1 (patch-ab) = 4a28cc7d9e2a22c52ad319bbda0893d70fd000be
-SHA1 (patch-ac) = 289a7ac4b296dd29ac3938ec3a6c8d7d1413500b
+SHA1 (dctc-0.85.9.tar.gz) = 4d68d394ea2429f645073f22805eca31e87e345c
+RMD160 (dctc-0.85.9.tar.gz) = dde07b6802e5a421a86fcb83480cdc720b2985b6
+Size (dctc-0.85.9.tar.gz) = 506477 bytes
+SHA1 (patch-aa) = de989aee03c726e78f2fdf10edf3708d6aca75f5
+SHA1 (patch-ab) = 98fd1bfbf5c9abc5fdace74042b69bb76f24749b
+SHA1 (patch-ac) = 09685fd019e89d1a6568262a8a3032ca61b9c9a0
 SHA1 (patch-ad) = ce699efbc6d009146a909e2ffac83435fdb2932e
-SHA1 (patch-ae) = e5440b8158d5706779e71315f0b011767b7719a7
+SHA1 (patch-ae) = 0065f607212aa307bbf750979d885db600823fc5
 SHA1 (patch-af) = 01048ff12ecca029ee596255d85a3987012a65cf
 SHA1 (patch-ag) = 406d8a21da3e8f7172452eb46a2c0196e87a8156
 SHA1 (patch-ah) = 21e6e0f248bca8835b54bc0588e106395b4485f2
diff --git a/net/dctc/patches/patch-aa b/net/dctc/patches/patch-aa
index 6afd1273b10..afc5cc828fa 100644
--- a/net/dctc/patches/patch-aa
+++ b/net/dctc/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2003/07/22 14:08:23 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2010/06/02 13:07:12 adam Exp $
 
---- src/gdl.c.orig	Mon Jun 30 08:48:47 2003
+--- src/gdl.c.orig	2003-12-28 08:12:38.000000000 +0000
 +++ src/gdl.c
-@@ -740,7 +740,7 @@ static int append_this_range_entry_to_fi
+@@ -748,7 +748,7 @@ static int append_this_range_entry_to_fi
  		}
  		if(have!=want)
  		{
diff --git a/net/dctc/patches/patch-ab b/net/dctc/patches/patch-ab
index a039bbda772..595bd6531f0 100644
--- a/net/dctc/patches/patch-ab
+++ b/net/dctc/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.5 2003/07/15 19:46:15 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2010/06/02 13:07:12 adam Exp $
 
---- configure.orig	Sun Jul 13 23:40:52 2003
+--- configure.orig	2004-01-24 06:30:30.000000000 +0000
 +++ configure
-@@ -9752,6 +9752,7 @@ fi
+@@ -8961,7 +8961,6 @@ gcc 3.0.x (or 2.95.x) *BEFORE* reporting
+ Press return to resume configuration (CTRL-C to abort).
+ ================================================================================
+ EOF
+-	read dummy
+ 	fi
+ fi
+ 
+@@ -9956,6 +9955,7 @@ fi
  							if test "x$HAVE_DB40" = "xyes"; then
  
  								berkeleydb_libs="-ldb4"
diff --git a/net/dctc/patches/patch-ac b/net/dctc/patches/patch-ac
index 5250d51a236..86733bdbc8f 100644
--- a/net/dctc/patches/patch-ac
+++ b/net/dctc/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.8 2006/02/02 20:53:44 rillig Exp $
+$NetBSD: patch-ac,v 1.9 2010/06/02 13:07:12 adam Exp $
 
---- src/keyboard_master.c.orig	Sun Jun 22 10:40:35 2003
+--- src/keyboard_master.c.orig	2004-01-09 18:16:01.000000000 +0000
 +++ src/keyboard_master.c
-@@ -39,8 +39,7 @@
- #include <openssl/md4.h>
+@@ -48,8 +48,7 @@ $Id: keyboard_master.c,v 1.14 2004/01/09
+ 
  #include <glib.h>
  
 -#if !(defined(BSD) && (BSD >= 199103))
@@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.8 2006/02/02 20:53:44 rillig Exp $
         /* union semun is defined by including <sys/sem.h> */
         #else
         /* according to X/OPEN we have to define it ourselves */
-@@ -51,7 +50,6 @@
+@@ -60,7 +59,6 @@ $Id: keyboard_master.c,v 1.14 2004/01/09
                 struct seminfo *__buf;      /* buffer for IPC_INFO */
         };
         #endif
diff --git a/net/dctc/patches/patch-ae b/net/dctc/patches/patch-ae
index d1eff86731a..186758168b0 100644
--- a/net/dctc/patches/patch-ae
+++ b/net/dctc/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.4 2006/02/02 20:53:44 rillig Exp $
+$NetBSD: patch-ae,v 1.5 2010/06/02 13:07:12 adam Exp $
 
---- src/keyboard.c.orig	Sun May 18 08:48:16 2003
-+++ src/keyboard.c	Tue Jun 10 12:04:22 2003
-@@ -39,8 +39,7 @@
- #include <openssl/md4.h>
+--- src/keyboard.c.orig	2004-01-09 18:16:01.000000000 +0000
++++ src/keyboard.c
+@@ -49,8 +49,7 @@ $Id: keyboard.c,v 1.25 2004/01/09 18:16:
+ 
  #include <glib.h>
  
 -#if !(defined(BSD) && (BSD >= 199103))
@@ -12,7 +12,7 @@ $NetBSD: patch-ae,v 1.4 2006/02/02 20:53:44 rillig Exp $
         /* union semun is defined by including <sys/sem.h> */
         #else
         /* according to X/OPEN we have to define it ourselves */
-@@ -51,7 +50,6 @@
+@@ -61,7 +60,6 @@ $Id: keyboard.c,v 1.25 2004/01/09 18:16:
                 struct seminfo *__buf;      /* buffer for IPC_INFO */
         };
         #endif