From 3ef8e44cca9b4f7d2de782e2d125c28872dab60b Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sun, 23 May 2010 16:30:03 +0000
Subject: [PATCH] fix build for gcc4

---
 net/radiusd-cistron/Makefile                    |  4 ++--
 net/radiusd-cistron/patches/patch-src_acct_c    |  8 ++++----
 net/radiusd-cistron/patches/patch-src_radiusd_h | 11 +++++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 net/radiusd-cistron/patches/patch-src_radiusd_h

diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index 0af80b14654..3c47bec78ce 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2008/07/01 16:41:19 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2010/05/23 16:30:03 espie Exp $
 
 COMMENT=	Cistron RADIUS server
 
@@ -24,7 +24,7 @@ WANTLIB=		c
 WRKSRC=		${WRKDIST}/src
 MAKE_FILE=	Makefile.BSD
 MAKE_FLAGS+=	CC="${CC}" LCRYPT="" DBM="-DUSE_DB1" DBMLIBS="" \
-		CFLAGS="${CFLAGS} -DNOSHADOW -DUSE_SYSLOG"
+		CFLAGS="${CFLAGS} -DNOSHADOW -DUSE_SYSLOG -fno-builtin-log"
 FAKE_FLAGS+=	BINDIR='${WRKINST}${PREFIX}/bin' \
 		SBINDIR='${WRKINST}${PREFIX}/sbin' \
 		MANDIR='${WRKINST}${PREFIX}/man' \
diff --git a/net/radiusd-cistron/patches/patch-src_acct_c b/net/radiusd-cistron/patches/patch-src_acct_c
index cb208c8283f..f7a30666b92 100644
--- a/net/radiusd-cistron/patches/patch-src_acct_c
+++ b/net/radiusd-cistron/patches/patch-src_acct_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_acct_c,v 1.6 2004/07/12 13:32:11 danh Exp $
---- src/acct.c.orig	Thu Jul  3 04:09:04 2003
-+++ src/acct.c	Mon Jul 12 08:29:22 2004
-@@ -958,11 +958,11 @@ static int rad_check_ts(struct radutmp *
+$OpenBSD: patch-src_acct_c,v 1.7 2010/05/23 16:30:03 espie Exp $
+--- src/acct.c.orig	Thu Jul  3 10:09:04 2003
++++ src/acct.c	Sat May 22 16:48:14 2010
+@@ -958,11 +958,11 @@ static int rad_check_ts(struct radutmp *ut)
  
  	s = CHECKRAD2;
  	execl(CHECKRAD2, "checkrad", nas->nastype, address, port,
diff --git a/net/radiusd-cistron/patches/patch-src_radiusd_h b/net/radiusd-cistron/patches/patch-src_radiusd_h
new file mode 100644
index 00000000000..3c7e1bf49be
--- /dev/null
+++ b/net/radiusd-cistron/patches/patch-src_radiusd_h
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_radiusd_h,v 1.1 2010/05/23 16:30:03 espie Exp $
+--- src/radiusd.h.orig	Sun May 23 18:28:21 2010
++++ src/radiusd.h	Sun May 23 18:28:35 2010
+@@ -204,7 +204,6 @@ extern char		*radutmp_path;
+ extern char		*radwtmp_path;
+ extern UINT4		expiration_seconds;
+ extern UINT4		warning_seconds;
+-extern int		radius_pid;
+ extern int		use_dbm;
+ extern int		use_dns;
+ extern int		use_wtmp;