From e9321f3a236270750898d0298dd82314969770f3 Mon Sep 17 00:00:00 2001
From: hasso <hasso>
Date: Tue, 7 Apr 2009 17:58:19 +0000
Subject: Make it build on FreeBSD and DragonFly.

---
 net/irrd/distinfo         |  3 ++-
 net/irrd/patches/patch-ad | 22 ++++++++++++++++++++++
 net/ttt/distinfo          |  3 ++-
 net/ttt/patches/patch-ad  | 30 ++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 net/irrd/patches/patch-ad
 create mode 100644 net/ttt/patches/patch-ad

(limited to 'net')

diff --git a/net/irrd/distinfo b/net/irrd/distinfo
index b539af1a14b..8abe2c5f13f 100644
--- a/net/irrd/distinfo
+++ b/net/irrd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2006/07/05 21:39:42 wiz Exp $
+$NetBSD: distinfo,v 1.12 2009/04/07 17:58:19 hasso Exp $
 
 SHA1 (irrd2.2.8.tgz) = cfaf5fb6e4abdd2bce8de0233231dd2514c5d111
 RMD160 (irrd2.2.8.tgz) = 74688380c6cdcc8ddaa5ebf8705c10922f02fb8b
@@ -6,3 +6,4 @@ Size (irrd2.2.8.tgz) = 693852 bytes
 SHA1 (patch-aa) = 3059131bad8df2071ae64ea5e9d0c6f858a7ae2e
 SHA1 (patch-ab) = d9172a35b907dbaac24ef7b72fcce05310d674bd
 SHA1 (patch-ac) = 5ea304aad5a2b3a2e835e63ac58ebbb83f12a5c3
+SHA1 (patch-ad) = 313a1d44c4623123f7c2a37ff2740887fa32bdb2
diff --git a/net/irrd/patches/patch-ad b/net/irrd/patches/patch-ad
new file mode 100644
index 00000000000..495939e9323
--- /dev/null
+++ b/net/irrd/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.3 2009/04/07 17:58:19 hasso Exp $
+
+--- lib/mrt/prefix.c.orig
++++ lib/mrt/prefix.c
+@@ -5,7 +5,7 @@
+ #include <mrt.h>
+ #include <netdb.h>
+ 
+-#ifndef __GLIBC__
++#if !defined(__GLIBC__) && !(defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)) && !(defined(__DragonFly__) && (__DragonFly_version + 0 >= 200202))
+ #ifdef __osf__
+ 
+ /* apparently, OSF's gethostby{name,addr}_r's are different, broken, and
+@@ -40,7 +40,7 @@ struct hostent  *gethostbyaddr_r
+       For the time being, this part tries to convert Linux glibc 2.X
+       gethostXX_r into Solaris's that we use to code MRT. -- masaki
+     */
+-#if __GLIBC__ >= 2
++#if (__GLIBC__ >= 2) || (defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)) || (defined(__DragonFly__) && (__DragonFly_version + 0 >= 200202))
+    /* Glibc 2.X
+ 
+     int gethostbyname_r (const char *name, struct hostent *result_buf, 
diff --git a/net/ttt/distinfo b/net/ttt/distinfo
index 3db381a8a1d..001a05a9883 100644
--- a/net/ttt/distinfo
+++ b/net/ttt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2007/09/07 13:53:44 obache Exp $
+$NetBSD: distinfo,v 1.9 2009/04/07 18:03:14 hasso Exp $
 
 SHA1 (ttt-1.8.2.tar.gz) = 8b52a1e90de17202c22f062f44025b7ae0e21454
 RMD160 (ttt-1.8.2.tar.gz) = 8f1877904087d9260e61e76f869196111de585c0
@@ -6,3 +6,4 @@ Size (ttt-1.8.2.tar.gz) = 138877 bytes
 SHA1 (patch-aa) = 6d119e544ef3ae578b70c5d13a032f2a1529dde5
 SHA1 (patch-ab) = 4ced63fabf7c4d7360fc3f1a249fb08256b1a745
 SHA1 (patch-ac) = f513d90f7c8ef2389aa868d76795a82c91052e86
+SHA1 (patch-ad) = 40ad417dfb240240468513258132bcc64f510273
diff --git a/net/ttt/patches/patch-ad b/net/ttt/patches/patch-ad
new file mode 100644
index 00000000000..9e382677c0d
--- /dev/null
+++ b/net/ttt/patches/patch-ad
@@ -0,0 +1,30 @@
+$NetBSD: patch-ad,v 1.1 2009/04/07 18:03:14 hasso Exp $
+
+--- node.c.orig
++++ node.c
+@@ -89,7 +89,9 @@ struct t_node *b_getnext(struct t_node *
+ static int b_collectgarbage(int tab_no);
+ static int b_countfree(int tab_no);
+ static struct t_node *b_getfree(int tab_no);
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
+ static int fls(int i);
++#endif
+ #ifdef IPV6
+ static int node_comp_id(long *a, long *b);
+ #endif
+@@ -598,6 +600,7 @@ static struct t_node *b_getfree(int tab_
+     return np;
+ }
+ 
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
+ /* fls - find last set bit  --- reverse function of vax ffs */
+ static int fls(int i)
+ {
+@@ -623,6 +626,7 @@ static int fls(int i)
+     assert(0);
+     return 0;
+ }
++#endif
+ 
+ static int node_comp_id(long *a, long *b)
+ {
-- 
cgit v1.2.3