Add DragonFly support. Fix va_arg integer promotion problem, bump

revision for that.

4 files changed, 41 insertions, 3 deletions

diff --git a/net/gated/Makefile b/net/gated/Makefile
index 364151f714b..50c85415419 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2006/04/22 09:22:12 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2006/06/01 22:40:19 joerg Exp $
 
 DISTNAME=       gated-3-5-11
 PKGNAME=        gated-3.5.11
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.rge.com/pub/networking/gated/ \
 		http://www.zcu.cz/ftp/pub/security/merit/gated/ \
@@ -28,6 +28,8 @@ BUILD_TARGET=	gated
 post-extract:
 	@${SED} -e 's#@PREFIX@#${PREFIX}#' <${FILESDIR}/configuration \
 	    >${WRKSRC}/src/configs/netbsd
+	@${SED} -e 's#@PREFIX@#${PREFIX}#' <${FILESDIR}/configuration \
+	    >${WRKSRC}/src/configs/dragonfly
 
 do-configure:
 	cd ${WRKSRC}/src; 						\
diff --git a/net/gated/distinfo b/net/gated/distinfo
index 6cf5b2f67b5..9504b21cfdd 100644
--- a/net/gated/distinfo
+++ b/net/gated/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 12:13:46 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/06/01 22:40:19 joerg Exp $
 
 SHA1 (gated-3-5-11.tar.gz) = a6abdc59beb881dee06c9433b690fa6eab99fe07
 RMD160 (gated-3-5-11.tar.gz) = 16624c1e2229fb783dd3bbc5759945e5e368c1f3
@@ -11,3 +11,5 @@ SHA1 (patch-af) = 3b27a9b1e13533f4dd6dc6c2dc7d23c0a3ae725e
 SHA1 (patch-ag) = 375e91f1e04995ef4f7d3f7dcc592d90901fa21c
 SHA1 (patch-ah) = b1ebbf21e0bf8978503ff4b40f5019c02a2d619a
 SHA1 (patch-ai) = 93d75b6132bcd0d79c075a53c9fb121571464fc9
+SHA1 (patch-aj) = d8aab039599d1cf152d8bb39bba629c4d5d37c66
+SHA1 (patch-ak) = 04857d0be869480812138b059e303f6a3aac00e7
diff --git a/net/gated/patches/patch-aj b/net/gated/patches/patch-aj
new file mode 100644
index 00000000000..6f8cd5b8082
--- /dev/null
+++ b/net/gated/patches/patch-aj
@@ -0,0 +1,21 @@
+$NetBSD: patch-aj,v 1.1 2006/06/01 22:40:19 joerg Exp $
+
+--- src/configs/dragonfly.orig	2004-07-10 22:21:01.000000000 +0200
++++ src/configs/dragonfly
+@@ -11,8 +11,8 @@ mantype bsd42
+ 
+ cc	cc
+ #cflags -g
+-cwflags -W -Wreturn-type -Wcast-qual -Wpointer-arith -Wwrite-strings -Wswitch -Wshadow
+-cflags	-O -g
++#cwflags -W -Wreturn-type -Wcast-qual -Wpointer-arith -Wwrite-strings -Wswitch -Wshadow
++cflags	-O -g -DUSE_MMAP
+ 
+ ldflags -lkvm
+ 
+@@ -40,4 +40,4 @@ path_pid	/var/run/%s.pid
+ path_version	/var/run/%s.version
+ path_unix	/netbsd
+ 
+-protocols	bgp egp hello icmp rip ospf iso slsp isis rdisc
++protocols	bgp egp icmp rip ospf slsp rdisc
diff --git a/net/gated/patches/patch-ak b/net/gated/patches/patch-ak
new file mode 100644
index 00000000000..105facf0500
--- /dev/null
+++ b/net/gated/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2006/06/01 22:40:19 joerg Exp $
+
+--- src/str.c.orig	2006-06-01 22:35:58.000000000 +0000
++++ src/str.c
+@@ -226,7 +226,7 @@ static char sccsid[] = "@(#)doprnt.c	5.3
+ 
+ #define	ARG() \
+ 	_ulong = flags&LONGINT ? va_arg(ap, long) : \
+-	    flags&SHORTINT ? va_arg(ap, short) : va_arg(ap, int);
++	    flags&SHORTINT ? va_arg(ap, int) : va_arg(ap, int);
+ 
+ #define	todigit(c)	((c) - '0')
+ #define	tochar(n)	((n) + '0')