- Update to 1.1.1

This release contains a number of improvements over previous
releases. We recommend that everyone using earlier versions of the
server upgrade to obtain the bug fixes and feates that this
version supplies. It's new features include:
   o Updated dictionaries (as always),
   o Digest authentication updates,
   o Net-SNMP compatibility fixes,
   o Bug fixes for multiple platforms (64-bit architectures, *BSD),
   o Security fixes for EAP-MSCHAPv2,
   o Miscellaneous other fixes

PR:		ports/95033
Submitted by:	Ivan Lago <ivan.lago@ifom-ieo-campus.it>

12 files changed, 112 insertions, 164 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 5d9b7bd4fe68..3d61882d60a3 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	freeradius
-PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTVERSION=	1.1.1
+PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		http://freeradius.portal-to-web.de/
@@ -22,8 +22,7 @@ LOGDIR?=	/var/log
 CONFLICTS=	gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
 
 USE_RC_SUBR=	radiusd.sh
-USE_AUTOTOOLS=	libltdl:15
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_OPENSSL=	yes
@@ -35,7 +34,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \
 		--with-large-files --without-rlm_sql_unixodbc \
 		--without-rlm_sql_oracle --without-rlm_sql_iodbc \
 		--without-rlm_sql_db2
-MAKE_ARGS+=	LDFLAGS=-L${LOCALBASE}/lib
+MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
@@ -50,7 +49,7 @@ OPTIONS=	KERBEROS	"With Kerberos support" off \
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
-CFLAGS+=	-fPIC
+CONFIGURE_ARGS+=	--with-pic
 .endif
 
 .if defined(WITH_HEIMDAL) && !defined(WITH_KERBEROS)
@@ -127,11 +126,6 @@ PLIST_SUB+=	RLMPERL="@comment "
 PLIST_SUB+=	RLMPERL=""
 .endif
 
-.if ${ARCH} == "amd64"
-CONFIGURE_ARGS+=	--with-pic
-CFLAGS+=	-fPIC
-.endif
-
 INSTALLS_SHLIB=	yes
 
 MAN1=		radclient.1 radeapclient.1 radlast.1 radtest.1 radwho.1 \
@@ -173,22 +167,14 @@ DICTS=		dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \
 
 post-patch:
 	@${RM} ${WRKSRC}/doc/Makefile.orig
+.if ${OSVERSION} < 500000
+	@${REINPLACE_CMD} -e 's/-DNO_OPENSSL//' ${WRKSRC}/configure
+.endif
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/raddb ${DATADIR} ${EXAMPLESDIR}
 .for dict in ${DICTS}
 	${INSTALL_DATA} ${WRKSRC}/share/${dict} ${DATADIR}/${dict}
 .endfor
-.ifdef(WITH_MYSQL)
-	${INSTALL_DATA} \
-	${WRKSRC}/src/modules/rlm_sql/drivers/rlm_sql_mysql/db_mysql.sql \
-	${EXAMPLESDIR}/db_mysql.sql
-.endif
-
-.ifdef(WITH_PGSQL)
-	${INSTALL_DATA} \
-	${WRKSRC}/src/modules/rlm_sql/drivers/rlm_sql_postgresql/db_postgresql.sql \
-	${EXAMPLESDIR}/db_postgresql.sql
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index e7c1417796a8..0b82c3cfe6d4 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,3 +1,2 @@
-MD5 (freeradius-1.1.0.tar.gz) = e04ec8a07b8c8dc96e28ef7fdce261e7
-SHA256 (freeradius-1.1.0.tar.gz) = d8710cdf66fdab458d8df6f8d5ab84a5c4b7d2343817bc940927de915c0f31c4
-SIZE (freeradius-1.1.0.tar.gz) = 2351660
+MD5 (freeradius-1.1.1.tar.gz) = b38b24f6352090fdb571b9e8da52e12e
+SIZE (freeradius-1.1.1.tar.gz) = 2358196
diff --git a/net/freeradius/files/patch-Make.inc.in b/net/freeradius/files/patch-Make.inc.in
index 7174d585d5bf..e5e0f3d23341 100644
--- a/net/freeradius/files/patch-Make.inc.in
+++ b/net/freeradius/files/patch-Make.inc.in
@@ -1,11 +1,11 @@
---- Make.inc.in.orig	Sat Feb 19 14:33:58 2005
-+++ Make.inc.in	Sat Feb 19 14:33:07 2005
+--- Make.inc.in.orig	Mon Mar 27 15:03:38 2006
++++ Make.inc.in	Mon Mar 27 15:03:55 2006
 @@ -25,7 +25,7 @@
  CC		= @CC@
  RANLIB		= @RANLIB@
  INCLUDE		= 
 -CFLAGS		= $(INCLUDE) @CFLAGS@ @LFS_CFLAGS@
 +CFLAGS		= $(INCLUDE) @CFLAGS@ @CPPFLAGS@ @LFS_CFLAGS@
+ CPPFLAGS	= @CPPFLAGS@
  LIBPREFIX	= @LIBPREFIX@
  EXEEXT		= @EXEEXT@ 
- 
diff --git a/net/freeradius/files/patch-doc::Makefile b/net/freeradius/files/patch-doc::Makefile
index a465b2500691..251c70382085 100644
--- a/net/freeradius/files/patch-doc::Makefile
+++ b/net/freeradius/files/patch-doc::Makefile
@@ -1,21 +1,18 @@
---- doc/Makefile.orig	Sat Aug 13 00:41:24 2005
-+++ doc/Makefile	Wed Oct  5 10:57:06 2005
-@@ -17,14 +17,16 @@
+--- doc/Makefile.orig	Mon Mar 27 15:12:40 2006
++++ doc/Makefile	Mon Mar 27 15:13:06 2006
+@@ -17,6 +17,7 @@
  	@rm -f *~
  
  install:
 +ifndef NOPORTDOCS
  	$(INSTALL) -d -m 755 $(R)$(datadir)/doc
--	$(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)
-+	$(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius
+ 	$(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius
  	for file in *[!~]; do \
- 		if [ -f $$file -a $$file != Makefile ]; then \
--			$(INSTALL) -m 644 $$file $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION); \
-+			$(INSTALL) -m 644 $$file $(R)$(datadir)/doc/freeradius; \
+@@ -25,6 +26,7 @@
  		fi; \
  	done
  	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
 +endif
  
- common:
- 	@for dir in $(SUBDIRS); do \
+ common: $(SUBDIRS)
+ 
diff --git a/net/freeradius/files/patch-doc::rfc::Makefile b/net/freeradius/files/patch-doc::rfc::Makefile
deleted file mode 100644
index cce186e1c302..000000000000
--- a/net/freeradius/files/patch-doc::rfc::Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/rfc/Makefile.orig	Thu Nov 20 14:42:52 2003
-+++ doc/rfc/Makefile	Thu Nov 20 14:43:03 2003
-@@ -16,7 +16,7 @@
- 	rm -f refs rfc*.html *~ .rewrite index.html
- 
- install:
--	$(INSTALL) -d -m 755	$(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)/rfc
-+	$(INSTALL) -d -m 755	$(R)$(datadir)/doc/freeradius/rfc
- 	for i in `ls -1 *.txt *.html`; do \
--		$(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)/rfc; \
-+		$(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius/rfc; \
- 	done
diff --git a/net/freeradius/files/patch-src-lib-dict.c b/net/freeradius/files/patch-src-lib-dict.c
deleted file mode 100644
index ace7044307be..000000000000
--- a/net/freeradius/files/patch-src-lib-dict.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/dict.c.orig	Mon Feb  6 10:15:41 2006
-+++ src/lib/dict.c	Mon Feb  6 10:16:07 2006
-@@ -1207,7 +1207,7 @@
- 	if (!name) return NULL;
- 
- 	hash = dict_hashname(name);
--	hash = lrad_hash_update(&attr, sizeof(&attr), hash);
-+	hash = lrad_hash_update(&attr, sizeof(attr), hash);
- 
- 	return lrad_hash_table_finddata(values_byname, hash);
- }
diff --git a/net/freeradius/files/patch-src-main-Makefile.in b/net/freeradius/files/patch-src-main-Makefile.in
index 0b318acd4128..f29f4e45b9bf 100644
--- a/net/freeradius/files/patch-src-main-Makefile.in
+++ b/net/freeradius/files/patch-src-main-Makefile.in
@@ -1,45 +1,45 @@
---- src/main/Makefile.in.orig	Fri Jun 10 04:35:36 2005
-+++ src/main/Makefile.in	Sat Jun 18 11:06:37 2005
-@@ -14,7 +14,7 @@
+--- src/main/Makefile.in.orig	Mon Mar 27 15:22:33 2006
++++ src/main/Makefile.in	Mon Mar 27 15:27:58 2006
+@@ -19,6 +19,7 @@
  CFLAGS		+= -DHOSTINFO=\"${HOSTINFO}\"
- CFLAGS          += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
- CFLAGS          += $(SNMP_INCLUDE) 
--LDFLAGS		+= -L../lib
-+LDFLAGS_MAIN	= -L../lib $(LDFLAGS)
- MODULE_LIBS	= $(STATIC_MODULES)
- MODULE_OBJS	=
+ CFLAGS		+= -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
+ CFLAGS		+= $(SNMP_INCLUDE)
++LDFLAGS_MAIN   	= -L../lib $(LDFLAGS)
  VFLAGS		= -DRADIUSD_MAJOR_VERSION=$(RADIUSD_MAJOR_VERSION)
-@@ -52,7 +52,7 @@
+ VFLAGS		+= -DRADIUSD_MINOR_VERSION=$(RADIUSD_MINOR_VERSION)
+ MODULE_LIBS	= $(STATIC_MODULES)
+@@ -60,9 +61,9 @@
  
- radiusd: $(SERVER_OBJS) ../lib/libradius.a $(MODULE_OBJS)
+ radiusd: $(SERVER_OBJS) $(MODULE_OBJS) ../lib/libradius.la
  	$(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \
--		$(CFLAGS) $(LDFLAGS) -o $@ \
-+		$(CFLAGS) $(LDFLAGS_MAIN) -o $@ \
- 		$(SERVER_OBJS) $(LCRYPT) $(MODULE_LIBS) $(LIBS) \
- 		$(PTHREADLIB) $(LIBLTDL) $(LCRYPT)
+-		$(LDFLAGS) $(LINK_MODE) -o $@ $(SERVER_OBJS)      \
++		$(CFLAGS) $(LDFLAGS_MAIN) $(LINK_MODE) -o $@ $(SERVER_OBJS) \
+ 		$(MODULE_LIBS) $(LIBS) $(SNMP_LIBS) $(PTHREADLIB) \
+-		$(LIBLTDL)
++		$(LIBLTDL) $(LCRYPT)
+ 
+ radiusd.lo: radiusd.c ../include/request_list.h ../include/modules.h ../include/modcall.h ../include/modpriv.h
+ 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radiusd.c
+@@ -141,19 +142,19 @@
+ 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radclient.c
  
-@@ -123,13 +123,13 @@
- 	$(CC) $(CFLAGS) -o radius_snmp.o -c radius_snmp.c
+ radclient: radclient.lo ../lib/libradius.la
+-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radclient radclient.lo $(LIBS)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS_MAIN) $(LINK_MODE) -o radclient radclient.lo $(LIBS)
  
- radclient: radclient.o ../lib/libradius.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -o radclient radclient.o $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS_MAIN) -o radclient radclient.o $(LIBS)
+ radrelay.lo: radrelay.c $(INCLUDES)
+ 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radrelay.c
  
- radclient.o: radclient.c $(INCLUDES)
- 	$(CC) $(CFLAGS) -c radclient.c
+ radrelay: radrelay.lo mainconfig.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo ../lib/libradius.la
+-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radrelay radrelay.lo mainconfig.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo $(LIBS)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS_MAIN) $(LINK_MODE) -o radrelay radrelay.lo mainconfig.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo $(LIBS)
  
- radrelay: radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o ../lib/libradius.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -o radrelay radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS_MAIN) -o radrelay radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS)
+ radwho.lo: radwho.c $(INCLUDES)
+ 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radwho.c
  
- radrelay.o: radrelay.c $(INCLUDES)
- 	$(CC) $(CFLAGS) -c radrelay.c
-@@ -138,7 +138,7 @@
- 	$(CC) $(CFLAGS) -c radwho.c
+ radwho: radwho.lo util.lo log.lo conffile.lo ../lib/libradius.la
+-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radwho radwho.lo util.lo log.lo conffile.lo $(LIBS)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS_MAIN) $(LINK_MODE) -o radwho radwho.lo util.lo log.lo conffile.lo $(LIBS)
  
- radwho: radwho.o util.o log.o conffile.o ../lib/libradius.a
--	$(CC) $(LDFLAGS) -o radwho radwho.o util.o log.o conffile.o $(LIBS) $(LCRYPT)
-+	$(CC) $(LDFLAGS_MAIN) -o radwho radwho.o util.o log.o conffile.o $(LIBS) $(LCRYPT)
  
  clean:
- 	rm -rf *.o *.so *~ $(BINARIES) .libs
diff --git a/net/freeradius/files/patch-src-modules-rlm_otp-otp-state.c b/net/freeradius/files/patch-src-modules-rlm_otp-otp-state.c
deleted file mode 100644
index 4bb9083cb16a..000000000000
--- a/net/freeradius/files/patch-src-modules-rlm_otp-otp-state.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/rlm_otp/otp_state.c.orig	Wed Jan 25 13:35:45 2006
-+++ src/modules/rlm_otp/otp_state.c	Wed Jan 25 15:02:47 2006
-@@ -35,7 +35,7 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <sys/socket.h>
--#if defined(__linux__) || defined(__APPLE__)
-+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(bsdi) || defined(__OpenBSD__)
- #include <sys/un.h>
- #endif
- 
diff --git a/net/freeradius/files/patch-src::modules::rlm_ippool::Makefile.in b/net/freeradius/files/patch-src::modules::rlm_ippool::Makefile.in
deleted file mode 100644
index 236b4b080838..000000000000
--- a/net/freeradius/files/patch-src::modules::rlm_ippool::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/rlm_ippool/Makefile.in.orig	Sat Feb 19 14:57:57 2005
-+++ src/modules/rlm_ippool/Makefile.in	Sat Feb 19 14:58:28 2005
-@@ -9,7 +9,7 @@
- include ../rules.mak
- 
- rlm_ippool_tool: rlm_ippool_tool.o
--	$(LIBTOOL) --mode=link $(CC) $^ $(LIBS) $(RLM_LIBS) -o $@
-+	$(LIBTOOL) --mode=link $(CC) $^ $(LDFLAGS) $(LIBS) $(RLM_LIBS) -o $@
- 
- rlm_ippool_tool.8: rlm_ippool_tool.pod
- 	pod2man --release=" " --date="October 2nd, 2003" --center="FreeRADIUS Daemon" --section=8 rlm_ippool_tool.pod > rlm_ippool_tool.8
diff --git a/net/freeradius/files/patch-src::modules::rlm_sql::rules.mak b/net/freeradius/files/patch-src::modules::rlm_sql::rules.mak
index cc34d6136b6d..3e954bcce06c 100644
--- a/net/freeradius/files/patch-src::modules::rlm_sql::rules.mak
+++ b/net/freeradius/files/patch-src::modules::rlm_sql::rules.mak
@@ -1,11 +1,13 @@
---- src/modules/rlm_sql/drivers/rules.mak.orig	Sat Feb 19 15:07:59 2005
-+++ src/modules/rlm_sql/drivers/rules.mak	Sat Feb 19 15:08:22 2005
-@@ -93,7 +93,7 @@
- $(TARGET).la: $(DYNAMIC_OBJS)
+--- src/modules/rlm_sql/drivers/rules.mak.orig	Mon Mar 27 15:39:02 2006
++++ src/modules/rlm_sql/drivers/rules.mak	Mon Mar 27 15:39:29 2006
+@@ -100,8 +100,8 @@
+ 
+ $(TARGET).la: $(LT_OBJS)
  	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
- 	-module $(LINK_MODE) $(CFLAGS) \
--	$(RLM_SQL_CFLAGS) -o $@ -rpath $(libdir) $^ $(RLM_SQL_LIBS)
-+	$(RLM_SQL_CFLAGS) -o $@ -rpath $(libdir) $^ $(LDFLAGS) $(RLM_SQL_LIBS)
+-	-module $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \
+-	-rpath $(libdir) $^ $(RLM_SQL_LIBS)
++	-module $(LINK_MODE) $(CFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \
++	-rpath $(libdir) $^ $(RLM_SQL_LIBS) $(LDFLAGS)
  
  #######################################################################
  #
diff --git a/net/freeradius/files/patch-src::modules::rules.mak b/net/freeradius/files/patch-src::modules::rules.mak
index b4bb5e2e21d6..c8b92407c6b4 100644
--- a/net/freeradius/files/patch-src::modules::rules.mak
+++ b/net/freeradius/files/patch-src::modules::rules.mak
@@ -1,11 +1,11 @@
---- src/modules/rules.mak.orig	Sun Jul 31 22:48:01 2005
-+++ src/modules/rules.mak	Wed Oct  5 10:57:50 2005
-@@ -96,7 +96,7 @@
+--- src/modules/rules.mak.orig	Mon Mar 27 15:43:04 2006
++++ src/modules/rules.mak	Mon Mar 27 15:44:11 2006
+@@ -112,7 +112,7 @@
  
- $(TARGET).la: $(DYNAMIC_OBJS)
+ $(TARGET).la: $(LT_OBJS)
  	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
--	-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) \
-+	-module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $(RLM_LDFLAGS) \
- 	-o $@ -rpath $(libdir) $^ $(RLM_LIBS) $(LIBS)
+-	-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
++	-module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $(RLM_LDFLAGS) -o $@ \
+ 	-rpath $(libdir) $^ $(top_builddir)/src/lib/libradius.la \
+ 	$(RLM_LIBS) $(LIBS)
  
- #######################################################################
diff --git a/net/freeradius/pkg-plist b/net/freeradius/pkg-plist
index e2a51b096b59..33a412e91ff6 100644
--- a/net/freeradius/pkg-plist
+++ b/net/freeradius/pkg-plist
@@ -11,33 +11,33 @@ bin/rlm_dbm_cat
 bin/rlm_dbm_parser
 bin/rlm_ippool_tool
 bin/smbencrypt
-etc/raddb/certs/demoCA/serial.old
-etc/raddb/certs/demoCA/serial
-etc/raddb/certs/demoCA/index.txt.old
-etc/raddb/certs/demoCA/index.txt
+etc/raddb/acct_users.sample
+etc/raddb/attrs.sample
+etc/raddb/certs/README
+etc/raddb/certs/cert-clt.der
+etc/raddb/certs/cert-clt.p12
+etc/raddb/certs/cert-clt.pem
+etc/raddb/certs/cert-srv.der
+etc/raddb/certs/cert-srv.p12
+etc/raddb/certs/cert-srv.pem
 etc/raddb/certs/demoCA/cacert.pem
-etc/raddb/certs/root.p12
-etc/raddb/certs/root.der
-etc/raddb/certs/random
-etc/raddb/certs/newreq.pem
-etc/raddb/certs/newcert.pem
+etc/raddb/certs/demoCA/index.txt
+etc/raddb/certs/demoCA/index.txt.old
+etc/raddb/certs/demoCA/serial
+etc/raddb/certs/demoCA/serial.old
 etc/raddb/certs/dh
-etc/raddb/certs/cert-srv.pem
-etc/raddb/certs/cert-srv.p12
-etc/raddb/certs/cert-srv.der
-etc/raddb/certs/cert-clt.pem
-etc/raddb/certs/cert-clt.p12
-etc/raddb/certs/cert-clt.der
+etc/raddb/certs/newcert.pem
+etc/raddb/certs/newreq.pem
+etc/raddb/certs/random
+etc/raddb/certs/root.der
+etc/raddb/certs/root.p12
 etc/raddb/certs/root.pem
-etc/raddb/certs/README
-etc/raddb/acct_users.sample
-etc/raddb/attrs.sample
-etc/raddb/clients.sample
 etc/raddb/clients.conf.sample
+etc/raddb/clients.sample
 etc/raddb/dictionary.sample
+etc/raddb/eap.conf.sample
 etc/raddb/example.pl
 etc/raddb/experimental.conf.sample
-etc/raddb/eap.conf.sample
 etc/raddb/hints.sample
 etc/raddb/huntgroups.sample
 etc/raddb/ldap.attrmap.sample
@@ -280,11 +280,6 @@ lib/rlm_sql_log-%%PORTVERSION%%.so
 lib/rlm_sql_log.a
 lib/rlm_sql_log.la
 lib/rlm_sql_log.so
-lib/rlm_sqlcounter-%%PORTVERSION%%.la
-lib/rlm_sqlcounter-%%PORTVERSION%%.so
-lib/rlm_sqlcounter.a
-lib/rlm_sqlcounter.la
-lib/rlm_sqlcounter.so
 %%MYSQL%%lib/rlm_sql_mysql-%%PORTVERSION%%.so
 %%MYSQL%%lib/rlm_sql_mysql.a
 %%MYSQL%%lib/rlm_sql_mysql.la
@@ -293,6 +288,11 @@ lib/rlm_sqlcounter.so
 %%PGSQL%%lib/rlm_sql_postgresql.a
 %%PGSQL%%lib/rlm_sql_postgresql.la
 %%PGSQL%%lib/rlm_sql_postgresql.so
+lib/rlm_sqlcounter-%%PORTVERSION%%.la
+lib/rlm_sqlcounter-%%PORTVERSION%%.so
+lib/rlm_sqlcounter.a
+lib/rlm_sqlcounter.la
+lib/rlm_sqlcounter.so
 lib/rlm_unix-%%PORTVERSION%%.la
 lib/rlm_unix-%%PORTVERSION%%.so
 lib/rlm_unix.a
@@ -303,16 +303,15 @@ sbin/checkrad
 sbin/radiusd
 sbin/radwatch
 sbin/rc.radiusd
-%%PORTDOCS%%%%DOCSDIR%%/Autz-Type
 %%PORTDOCS%%%%DOCSDIR%%/Acct-Type
+%%PORTDOCS%%%%DOCSDIR%%/Autz-Type
 %%PORTDOCS%%%%DOCSDIR%%/CYGWIN
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/DIFFS
 %%PORTDOCS%%%%DOCSDIR%%/MACOSX
 %%PORTDOCS%%%%DOCSDIR%%/OS2
 %%PORTDOCS%%%%DOCSDIR%%/Post-Auth-Type
-%%PORTDOCS%%%%DOCSDIR%%/RADIUS-LDAP.schema
-%%PORTDOCS%%%%DOCSDIR%%/RADIUS-LDAPv3.schema
+%%PORTDOCS%%%%DOCSDIR%%/RADIUS-LDAP-eDirectory
 %%PORTDOCS%%%%DOCSDIR%%/RADIUS-SQL.schema
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/Session-Type
@@ -325,10 +324,18 @@ sbin/rc.radiusd
 %%PORTDOCS%%%%DOCSDIR%%/coding-methods.txt
 %%PORTDOCS%%%%DOCSDIR%%/configurable_failover
 %%PORTDOCS%%%%DOCSDIR%%/duplicate-users
+%%PORTDOCS%%%%DOCSDIR%%/examples/iplanet.ldif
+%%PORTDOCS%%%%DOCSDIR%%/examples/iplanet.schema
+%%PORTDOCS%%%%DOCSDIR%%/examples/mssql.sql
+%%PORTDOCS%%%%DOCSDIR%%/examples/mysql.sql
+%%PORTDOCS%%%%DOCSDIR%%/examples/openldap.schema
+%%PORTDOCS%%%%DOCSDIR%%/examples/oracle.sql
+%%PORTDOCS%%%%DOCSDIR%%/examples/postgresql.sql
 %%PORTDOCS%%%%DOCSDIR%%/ldap_howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/load-balance.txt
 %%PORTDOCS%%%%DOCSDIR%%/misc-nas
 %%PORTDOCS%%%%DOCSDIR%%/module_interface
+%%PORTDOCS%%%%DOCSDIR%%/mssql
 %%PORTDOCS%%%%DOCSDIR%%/performance-testing
 %%PORTDOCS%%%%DOCSDIR%%/processing_users_file
 %%PORTDOCS%%%%DOCSDIR%%/proxy
@@ -426,6 +433,7 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.gandalf
 %%DATADIR%%/dictionary.garderos
 %%DATADIR%%/dictionary.gemtek
+%%DATADIR%%/dictionary.hp
 %%DATADIR%%/dictionary.ipunplugged
 %%DATADIR%%/dictionary.issanni
 %%DATADIR%%/dictionary.itk
@@ -442,6 +450,7 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.netscreen
 %%DATADIR%%/dictionary.nokia
 %%DATADIR%%/dictionary.nomadix
+%%DATADIR%%/dictionary.nortel
 %%DATADIR%%/dictionary.ntua
 %%DATADIR%%/dictionary.packeteer
 %%DATADIR%%/dictionary.propel
@@ -474,16 +483,16 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.xedia
 %%DATADIR%%/dictionary.xylan
 %%DATADIR%%/dictionary.zyxel
-%%MYSQL%%%%EXAMPLESDIR%%/db_mysql.sql
-%%PGSQL%%%%EXAMPLESDIR%%/db_postgresql.sql
-@dirrm %%DATADIR%%
 @dirrm %%EXAMPLESDIR%%
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/raddb/certs/demoCA
+@dirrm etc/raddb/certs/demoCA   
 @dirrm etc/raddb/certs
-@exec mkdir -p /var/log/raddb
+@exec mkdir -p /var/log/raddb 
 @exec chmod -R og= /var/log/raddb
 @exec mkdir -p /var/run/radiusd
 @unexec rm -fr /var/run/radiusd
 @unexec rmdir %D/etc/raddb 2> /dev/null || echo "You should remove %D/etc/raddb if you don't need it anymore."
+