[pkgsrc/trunk]: pkgsrc/net/ttt Fix prototype implementation mismatch and Drag...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6e6fbe54bfd1
branches:  trunk
changeset: 514243:6e6fbe54bfd1
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Jun 09 11:08:53 2006 +0000

description:
Fix prototype implementation mismatch and DragonFly specific
pcap problem. The former could result in different code for LP64,
so bump revision.

diffstat:

 net/ttt/Makefile         |   4 ++--
 net/ttt/distinfo         |   4 +++-
 net/ttt/patches/patch-ab |  23 +++++++++++++++++++++++
 net/ttt/patches/patch-ac |  16 ++++++++++++++++
 4 files changed, 44 insertions(+), 3 deletions(-)

diffs (74 lines):

diff -r 56c29539f992 -r 6e6fbe54bfd1 net/ttt/Makefile
--- a/net/ttt/Makefile  Fri Jun 09 10:45:54 2006 +0000
+++ b/net/ttt/Makefile  Fri Jun 09 11:08:53 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:10:32 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/06/09 11:08:53 joerg Exp $
 #
 
 DISTNAME=      ttt-1.8.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.csl.sony.co.jp/pub/kjc/
 
diff -r 56c29539f992 -r 6e6fbe54bfd1 net/ttt/distinfo
--- a/net/ttt/distinfo  Fri Jun 09 10:45:54 2006 +0000
+++ b/net/ttt/distinfo  Fri Jun 09 11:08:53 2006 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/10/25 17:21:47 perry Exp $
+$NetBSD: distinfo,v 1.7 2006/06/09 11:08:53 joerg Exp $
 
 SHA1 (ttt-1.8.1.tar.gz) = 4ed6ed74e4f304459ee546d2e614f1dadb0baada
 RMD160 (ttt-1.8.1.tar.gz) = 9ca229376f6403f9a2b38edb94f0bb56af66bbea
 Size (ttt-1.8.1.tar.gz) = 135067 bytes
 SHA1 (patch-aa) = 5ad41dc8079a2ffcfe80e710b28f4ad75a75ce68
+SHA1 (patch-ab) = 0d4c169833f97fab92066b0fabd13e28407a7703
+SHA1 (patch-ac) = f513d90f7c8ef2389aa868d76795a82c91052e86
diff -r 56c29539f992 -r 6e6fbe54bfd1 net/ttt/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ttt/patches/patch-ab  Fri Jun 09 11:08:53 2006 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.3 2006/06/09 11:08:53 joerg Exp $
+
+--- net_names.c.orig   2006-06-09 10:53:04.000000000 +0000
++++ net_names.c
+@@ -125,6 +125,9 @@ static struct pname_tab eth_tab[] = 
+ #define IPPROTO_OSPFIGP               89  /* OSPFIGP */
+ #endif
+ 
++static char *inet6_ntoa(u_int32_t *addr);  /* should be replaced
++                                         by addr2ascii */
++
+ static struct pname_tab ip_tab[] =
+ {
+     { "tcp",  IPPROTO_TCP },          /* tcp */
+@@ -260,8 +263,6 @@ char *net_getname(long type, long *id)
+     case TTTTYPE_IPV6HOST:
+     {
+       u_long tmp[4];
+-      static char *inet6_ntoa(u_long *addr);  /* should be replaced
+-                                                 by addr2ascii */
+       if ((buf = malloc(sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx")))
+           == NULL)
+           fatal_error("get_protoname: no memory\n");
diff -r 56c29539f992 -r 6e6fbe54bfd1 net/ttt/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ttt/patches/patch-ac  Fri Jun 09 11:08:53 2006 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.3 2006/06/09 11:08:53 joerg Exp $
+
+--- net_read.c.orig    2006-06-09 10:58:57.000000000 +0000
++++ net_read.c
+@@ -89,6 +89,11 @@ char copyright[] =
+ #include "bsd_sys_queue.h"
+ #endif
+ 
++#if defined(__DragonFly__) && !defined(BIOCGBLEN)
++/* Ugly hack since pcap.h and net/bpf.h are incompatible */
++#define       BIOCGBLEN       _IOR('B',102, u_int)
++#endif
++
+ /*
+  * The default snapshot length.  This value allows most printers to print
+  * useful information while keeping the amount of unwanted data down.