- Update to 0.9.9

  Still broken on 5.x

PR:		ports/73215
Submitted by:	Adam Jette <jettea46@yahoo.com> (maintainer)

4 files changed, 28 insertions, 15 deletions

diff --git a/net/openradius/Makefile b/net/openradius/Makefile
index 4ed588a27f1f..ed2031b40234 100644
--- a/net/openradius/Makefile
+++ b/net/openradius/Makefile
@@ -5,22 +5,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=      openradius
-PORTVERSION=   0.9.7
-PORTREVISION=	1
-CATEGORIES=    net
-MASTER_SITES=  http://www.xs4all.nl/~evbergen/openradius/download/ \
-	       http://www.mirrors.wiretapped.net/security/authentication/radius/openradius/
+PORTNAME=	openradius
+PORTVERSION=	0.9.9
+CATEGORIES=	net
+MASTER_SITES=	http://www.xs4all.nl/~evbergen/openradius/download/ \
+		http://www.mirrors.wiretapped.net/security/authentication/radius/openradius/
 
-MAINTAINER=    jettea46@yahoo.com
-COMMENT=       A RADIUS server with some actual documentation
+MAINTAINER=	jettea46@yahoo.com
+COMMENT=	A RADIUS server with some actual documentation
 
 CONFLICTS=	freeradius-0.* gnu-radius-1.* radiusd-cistron-1.*
-CONFIGURE_ARGS=     --prefix={$PREFIX}
 
-CC ?= gcc
-CXX ?= g++
-USE_GMAKE=     yes
+CC?=		gcc
+CXX?=		g++
+USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/net/openradius/distinfo b/net/openradius/distinfo
index 6abaa9a82125..66ad4e96d56c 100644
--- a/net/openradius/distinfo
+++ b/net/openradius/distinfo
@@ -1,2 +1,2 @@
-MD5 (openradius-0.9.7.tar.gz) = a9c74fe3b572ac8ec512c7b1f630a19f
-SIZE (openradius-0.9.7.tar.gz) = 186022
+MD5 (openradius-0.9.9.tar.gz) = ab7fbbf7a9f1d95306d3f5a58859ca22
+SIZE (openradius-0.9.9.tar.gz) = 218559
diff --git a/net/openradius/pkg-plist b/net/openradius/pkg-plist
index 753939cdbd58..273d4b99eac0 100644
--- a/net/openradius/pkg-plist
+++ b/net/openradius/pkg-plist
@@ -3,17 +3,20 @@ etc/openradius/configuration
 etc/openradius/behaviour.sample-ldap
 etc/openradius/behaviour.sample-ldap-authbind
 etc/openradius/behaviour.sample-mysql
+etc/openradius/behaviour.sample-postgres
 etc/openradius/behaviour.sample-unixpass
 etc/openradius/behaviour.sample-usersfile
 etc/openradius/configuration.sample-ldap
 etc/openradius/configuration.sample-ldap-authbind
 etc/openradius/configuration.sample-mysql
+etc/openradius/configuration.sample-postgres
 etc/openradius/configuration.sample-unixpass
 etc/openradius/configuration.sample-usersfile
 etc/openradius/dictionary
 
 etc/openradius/legacy/clients
 etc/openradius/legacy/users
+etc/openradius/legacy/realms
 @dirrm etc/openradius/legacy
 
 etc/openradius/modules/radldap.attrmap
@@ -29,17 +32,20 @@ etc/openradius/subdicts/dict.str-ldap
 etc/openradius/subdicts/dict.tunnel
 etc/openradius/subdicts/dict.usr
 etc/openradius/subdicts/dict.vendors
+etc/openradius/subdicts/dict.ascend
 @dirrm etc/openradius/subdicts
 
 @dirrm etc/openradius
 
 lib/openradius/ascfile
 lib/openradius/delay
+lib/openradius/radclient
 lib/openradius/radlogger
 lib/openradius/radsql
 lib/openradius/unixpasswd
 @dirrm lib/openradius
 
+bin/ascenddatafilter
 bin/genmd5hexpasswd
 bin/radaccttest
 bin/radclient
diff --git a/net/openradius/scripts/configure b/net/openradius/scripts/configure
index 6ee603c24579..2454fc22bf44 100644
--- a/net/openradius/scripts/configure
+++ b/net/openradius/scripts/configure
@@ -19,6 +19,16 @@ TGT_LIB		+= modules/unixpasswd/unixpasswd
 TGT_LIB		+= modules/radlogger/radlogger
 TGT_LIB		+= modules/delay/delay
 TGT_LIB		+= modules/radsql/radsql
+END
+
+if [ -f $LDAPINCLUDE/usr/local/include/ldap.h ]; then
+cat >> Makefile << END
+TGT_LIB		+= modules/radldap/radldap
+CF_RADLDAP	= -I$LDAPINCLUDE/usr/local/include
+END
+fi
+
+cat >> Makefile << END
 
 ### System compatibility flags, used in some targets' CF_TGT, LF_TGT or LL_TGT
 #
@@ -36,7 +46,6 @@ LL_ALL		=
 
 ### Module-specific build flags
 #
-CF_RADLDAP	= -I$LDAPINCLUDE/openldap
 LF_RADLDAP	= -L$LDAPLIB/usr/local/lib
 LL_RADLDAP	= -lldap -llber