From 230dc7f1b2f355de41b1b261e51bbe6b8a63eeaf Mon Sep 17 00:00:00 2001
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Tue, 21 Aug 2007 18:21:26 +0000
Subject: Fix building with radiusclient.

PR:		115687
---
 mail/exim/Makefile                              |  8 ++++----
 mail/exim/files/patch-src::auths::call_radius.c | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 mail/exim/files/patch-src::auths::call_radius.c

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index fc072b12d76c..e81ca455f287 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -407,10 +407,10 @@ SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,-lradius,' \
 		-e 's,^\# (RADIUS_CONFIG_FILE=).*,\1/etc/radius.conf,' \
 		-e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADLIB,'
 .elif ${WITH_RADIUS_TYPE:L} == radiusclient
-LIB_DEPENDS+=	radiusclient.0:${PORTSDIR}/net/radiusclient
-SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,-L${LOCALBASE}/lib -lradiusclient,' \
-		-e 's,^\# (RADIUS_CONFIG_FILE=).*,\1${LOCALBASE}/etc/radiusclient.conf,' \
-		-e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADIUSCLIENT,'
+LIB_DEPENDS+=	radiusclient-ng.2:${PORTSDIR}/net/radiusclient
+SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,-L${LOCALBASE}/lib -lradiusclient-ng,' \
+		-e 's,^\# (RADIUS_CONFIG_FILE=).*,\1${LOCALBASE}/radiusclient-ng/radiusclient.conf,' \
+		-e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADIUSCLIENTNEW,'
 .else
 IGNORE=		the variable WITH_RADIUS_TYPE must be either RADLIB or RADIUSCLIENT
 .endif
diff --git a/mail/exim/files/patch-src::auths::call_radius.c b/mail/exim/files/patch-src::auths::call_radius.c
new file mode 100644
index 000000000000..59c14cc2b725
--- /dev/null
+++ b/mail/exim/files/patch-src::auths::call_radius.c
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- src/auths/call_radius.c
++++ src/auths/call_radius.c
+@@ -38,7 +38,11 @@
+   #if !defined(RADIUS_LIB_RADIUSCLIENT) && !defined(RADIUS_LIB_RADIUSCLIENTNEW)
+   #define RADIUS_LIB_RADIUSCLIENT
+   #endif
++  #if !defined(RADIUS_LIB_RADIUSCLIENTNEW)
+   #include <radiusclient.h>
++  #else
++  #include <radiusclient-ng.h>
++  #endif
+ #endif
+ 
+ 
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0