- Update to 0.9.10

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

5 files changed, 56 insertions, 23 deletions

diff --git a/net/openradius/Makefile b/net/openradius/Makefile
index 8efd35869373..906e32a00455 100644
--- a/net/openradius/Makefile
+++ b/net/openradius/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openradius
-PORTVERSION=	0.9.9
-PORTREVISION=	1
+PORTVERSION=	0.9.10
 CATEGORIES=	net
 MASTER_SITES=	http://www.xs4all.nl/~evbergen/openradius/download/ \
 		http://www.mirrors.wiretapped.net/security/authentication/radius/openradius/
@@ -34,6 +33,18 @@ PLIST_SUB+=	LDAP="@comment "
 .endif
 
 post-install:
+# Configuration, copy over to sample files
+	${MKDIR} ${PREFIX}/etc/${PORTNAME}
+.for FILE in dictionary behaviour configuration
+	${INSTALL_DATA} ${WRKSRC}/etc/${FILE} \
+		${PREFIX}/etc/${PORTNAME}/${FILE}.sample
+.endfor
+# Copy over legacy config files to sample
+	${MKDIR} ${PREFIX}/etc/${PORTNAME}/legacy
+.for FILE in clients nases realms users
+	${INSTALL_DATA} ${WRKSRC}/etc/legacy/${FILE} \
+		${PREFIX}/etc/${PORTNAME}/legacy/${FILE}.sample
+.endfor
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net/openradius/distinfo b/net/openradius/distinfo
index 66ad4e96d56c..ed70da3fcfa0 100644
--- a/net/openradius/distinfo
+++ b/net/openradius/distinfo
@@ -1,2 +1,2 @@
-MD5 (openradius-0.9.9.tar.gz) = ab7fbbf7a9f1d95306d3f5a58859ca22
-SIZE (openradius-0.9.9.tar.gz) = 218559
+MD5 (openradius-0.9.10.tar.gz) = 73ef55461c7fff738045c4d964a8c669
+SIZE (openradius-0.9.10.tar.gz) = 231504
diff --git a/net/openradius/files/patch-ETCRules.mk b/net/openradius/files/patch-ETCRules.mk
new file mode 100644
index 000000000000..b8d850c83fd5
--- /dev/null
+++ b/net/openradius/files/patch-ETCRules.mk
@@ -0,0 +1,13 @@
+--- etc/Rules.mk.orig	Thu Mar 31 10:50:37 2005
++++ etc/Rules.mk	Thu Mar 31 10:50:29 2005
+@@ -11,9 +11,7 @@
+ 
+ CMD_INSTETC	:= $(CMD_INSTETC) \
+ 		   $(INST) $(d)/subdicts/* -m 644 -d $(DIR_ETC)/subdicts \
+-			   $(d)/modules/* -m 644 -d $(DIR_ETC)/modules \
+-			   $(d)/legacy/* -m 640 -d $(DIR_ETC)/legacy ;
+-
++			   $(d)/modules/* -m 644 -d $(DIR_ETC)/modules ;
+ 
+ # Standard things
+ 
diff --git a/net/openradius/files/patch-Rules.mk b/net/openradius/files/patch-Rules.mk
new file mode 100644
index 000000000000..718e523747fc
--- /dev/null
+++ b/net/openradius/files/patch-Rules.mk
@@ -0,0 +1,15 @@
+--- Rules.mk.orig	Thu Mar 31 10:55:15 2005
++++ Rules.mk	Thu Mar 31 10:55:43 2005
+@@ -69,12 +69,7 @@
+ 		$(CMD_INSTBIN)
+ 		$(INST) $(TGT_SBIN) -m 750 -d $(DIR_SBIN)
+ 		$(CMD_INSTSBIN)
+-ifeq ($(wildcard $(DIR_ETC)/*),)
+-		$(INST) $(TGT_ETC) -m 644 -d $(DIR_ETC)
+ 		$(CMD_INSTETC)
+-else
+-		@echo Configuration directory $(DIR_ETC) already present -- skipping
+-endif
+ 		$(INST) $(TGT_LIB) -m 750 -d $(DIR_LIB)
+ 		$(CMD_INSTLIB)
+ 		@echo
diff --git a/net/openradius/pkg-plist b/net/openradius/pkg-plist
index a8e963f8580c..06ebca7f484d 100644
--- a/net/openradius/pkg-plist
+++ b/net/openradius/pkg-plist
@@ -1,38 +1,32 @@
-etc/openradius/behaviour
-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/behaviour.sample
+etc/openradius/configuration.sample
+etc/openradius/dictionary.sample
 
-etc/openradius/legacy/clients
-etc/openradius/legacy/users
-etc/openradius/legacy/realms
+etc/openradius/legacy/clients.sample
+etc/openradius/legacy/nases.sample
+etc/openradius/legacy/users.sample
+etc/openradius/legacy/realms.sample
 @dirrm etc/openradius/legacy
 
 etc/openradius/modules/radldap.attrmap
 @dirrm etc/openradius/modules
 
+etc/openradius/subdicts/dict.ascend
 etc/openradius/subdicts/dict.cisco
+etc/openradius/subdicts/dict.erx
+etc/openradius/subdicts/dict.garderos
 etc/openradius/subdicts/dict.internal
 etc/openradius/subdicts/dict.microsoft
+etc/openradius/subdicts/dict.nomadix
 etc/openradius/subdicts/dict.rfc2869
 etc/openradius/subdicts/dict.stdacct
 etc/openradius/subdicts/dict.stdauth
 etc/openradius/subdicts/dict.str-ldap
+etc/openradius/subdicts/dict.tnova
 etc/openradius/subdicts/dict.tunnel
 etc/openradius/subdicts/dict.usr
 etc/openradius/subdicts/dict.vendors
-etc/openradius/subdicts/dict.ascend
+etc/openradius/subdicts/dict.wispr
 @dirrm etc/openradius/subdicts
 
 @dirrm etc/openradius