diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 6b236317ce4..dd6c438c426 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,39 +1,51 @@
-# $OpenBSD: Makefile,v 1.20 2008/12/29 19:17:36 rui Exp $
+# $OpenBSD: Makefile,v 1.21 2010/05/17 16:39:25 sthen Exp $
 
-SHARED_ONLY=		Yes
+SHARED_ONLY=	Yes
+SHARED_LIBS +=  freeradius-radius    4.0      # .0.0
+SHARED_LIBS +=  freeradius-eap       4.0      # .0.0
 
-COMMENT-main=		RADIUS server implementation
-COMMENT-iodbc=		freeradius iodbc rlm addon
-COMMENT-mysql=		freeradius mysql rlm addon
-COMMENT-pgsql=		freeradius pgsql rlm addon
-COMMENT-ldap=		freeradius ldap rlm addon
+COMMENT-main=	RADIUS server implementation
+COMMENT-iodbc=	freeradius iodbc rlm addon
+COMMENT-mysql=	freeradius mysql rlm addon
+COMMENT-pgsql=	freeradius pgsql rlm addon
+COMMENT-ldap=	freeradius ldap rlm addon
 
-V=			2.1.3
-DISTNAME=		freeradius-server-$V
-PKGNAME-main=		freeradius-$V
-PKGNAME-iodbc=		freeradius-iodbc-$V
-PKGNAME-mysql=		freeradius-mysql-$V
-PKGNAME-pgsql=		freeradius-pgsql-$V
-PKGNAME-ldap=		freeradius-ldap-$V
-SHARED_LIBS=		freeradius-eap	3.0 \
-			freeradius-radius 3.0
+V=		2.1.8
+DISTNAME=	freeradius-server-$V
+EXTRACT_SUFX=	.tar.bz2
+
+PKGNAME-main=	freeradius-$V
+PKGNAME-iodbc=	freeradius-iodbc-$V
+PKGNAME-mysql=	freeradius-mysql-$V
+PKGNAME-pgsql=	freeradius-pgsql-$V
+PKGNAME-ldap=	freeradius-ldap-$V
+
+CATEGORIES=	net security
 
-CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.freeradius.org/pub/radius/old/
-EXTRACT_SUFX=	.tar.bz2
 
 HOMEPAGE=	http://www.freeradius.org/
 
 MAINTAINER=	Rui Reis <rui@openbsd.org>
 
-# GPLv2 - LGPLv2
+# GPLv2 - LGPLv2 - OpenSSL exemption
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-CONFIGURE_STYLE=gnu dest
+WANTLIB=	crypto ssl
+WANTLIB-main=	${WANTLIB} c com_err krb5 pcap pthread readline termcap
+
+CONFIGURE_STYLE=autoconf dest
+AUTOCONF_VERSION=2.61
+# we only patch {WRKSRC}/configure.in so there's no need
+# to set AUTOCONF_DIR for the modules
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
+
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--localstatedir='$${DESTDIR}/var' \
 		--with-large-files \
@@ -47,16 +59,14 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--without-rlm_sql_db2 \
 		--without-rlm_sql_unixodbc \
 		--disable-ltdl-install \
-		--with-ltdl-lib=${LOCALBASE}/lib \
-		--with-ltdl-include=${LOCALBASE}/include \
 		--with-rlm-krb5-include-dir=/usr/include/kerberosV 
-	
-NO_REGRESS=	Yes
+
+REGRESS_TARGET=	tests
+REGRESS_DEPENDS=:freeradius-$V:net/freeradius
+REGRESS_IS_INTERACTIVE=Yes # doesn't exit properly
 
 MULTI_PACKAGES=	-main
-
-PSEUDO_FLAVORS=	no_ldap no_mysql no_pgsql no_iodbc
-FLAVOR?=		
+SUBST_VARS+=	V
 
 USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
@@ -65,55 +75,51 @@ BUILD_DEPENDS=	::net/net-snmp
 LIB_DEPENDS=	gdbm.>=3::databases/gdbm \
 		ltdl.>=4::devel/libtool,-ltdl
 
-CFLAGS+=       -I${LOCALBASE}/include
+PSEUDO_FLAVORS=	no_ldap no_mysql no_pgsql no_iodbc
+FLAVOR?=		
 
 .if ${FLAVOR:L:Mno_iodbc}
-CONFIGURE_ARGS+=--without-rlm_sql_iodbc
+CONFIGURE_ARGS+=	--without-rlm_sql_iodbc
 .else
-MULTI_PACKAGES+=-iodbc
-BUILD_DEPENDS+=	::databases/iodbc
-CONFIGURE_ARGS+=--with-rlm_sql_iodbc \
-		--with-iodbc-include-dir='${LOCALBASE}/include' \
-		--with-iodbc-lib-dir='${LOCALBASE}/lib'
+MULTI_PACKAGES+=	-iodbc
+BUILD_DEPENDS+=		::databases/iodbc
+CONFIGURE_ARGS+=	--with-rlm_sql_iodbc
+LIB_DEPENDS-iodbc=	iodbc.>=2::databases/iodbc
+WANTLIB-iodbc=
 .endif
 
 .if ${FLAVOR:L:Mno_ldap}
-CONFIGURE_ARGS+=--without-rlm_ldap
+CONFIGURE_ARGS+=	--without-rlm_ldap
 .else
-MULTI_PACKAGES+=-ldap
-BUILD_DEPENDS+=	:openldap-client-*:databases/openldap
-CONFIGURE_ARGS+=--with-rlm_ldap
+MULTI_PACKAGES+=	-ldap
+BUILD_DEPENDS+=		:openldap-client-*:databases/openldap
+LIB_DEPENDS-ldap=	lber.>=8,ldap_r.>=8:openldap-client-*:databases/openldap \
+			freeradius-radius.>=1::net/freeradius
+WANTLIB-ldap=		${WANTLIB} sasl2 asn1 com_err gssapi krb5
 .endif
 
 .if ${FLAVOR:L:Mno_mysql}
-CONFIGURE_ARGS+=--without-rlm_sql_mysql
+CONFIGURE_ARGS+=	--without-rlm_sql_mysql
 .else
-MULTI_PACKAGES+=-mysql
-BUILD_DEPENDS+=	:mysql-client-*:databases/mysql
-CONFIGURE_ARGS+=--with-rlm_sql_mysql
+MULTI_PACKAGES+=	-mysql
+BUILD_DEPENDS+=		:mysql-client-*:databases/mysql
+LIB_DEPENDS-mysql=	mysqlclient_r.>=16:mysql-client-*:databases/mysql
+WANTLIB-mysql=		${WANTLIB} m pthread z
 .endif
 
 .if ${FLAVOR:L:Mno_pgsql}
-CONFIGURE_ARGS+=--without-rlm_sql_postgresql
+CONFIGURE_ARGS+=	--without-rlm_sql_postgresql
 .else
-MULTI_PACKAGES+=-pgsql
-BUILD_DEPENDS+=	:postgresql-client-*:databases/postgresql
-CONFIGURE_ARGS+=--with-rlm_sql_postgresql \
-		--with-rlm-sql-postgresql-lib-dir=${LOCALBASE}/lib/ \
-		--with-rlm-sql-postgresql-include-dir=${LOCALBASE}/include/postgresql
+MULTI_PACKAGES+=	-pgsql
+BUILD_DEPENDS+=		:postgresql-client-*:databases/postgresql
+CONFIGURE_ARGS+=	--with-rlm-sql-postgresql-include-dir=${LOCALBASE}/include/postgresql
+LIB_DEPENDS-pgsql=	pq.>=2:postgresql-client-*:databases/postgresql
+WANTLIB-pgsql=
 .endif
 
-LIB_DEPENDS-iodbc=	iodbc.>=2::databases/iodbc
-RUN_DEPENDS-iodbc=	::net/freeradius
-LIB_DEPENDS-ldap=	lber.>=8,ldap_r.>=8:openldap-client-*:databases/openldap \
-			freeradius-radius.>=1::net/freeradius
-WANTLIB-ldap=		crypto sasl2 ssl asn1 com_err gssapi krb5
-LIB_DEPENDS-mysql=	mysqlclient_r.>=16:mysql-client-*:databases/mysql
-RUN_DEPENDS-mysql=	::net/freeradius
-WANTLIB-mysql=		crypto m pthread ssl z
-LIB_DEPENDS-pgsql=	pq.>=2:postgresql-client-*:databases/postgresql
-RUN_DEPENDS-pgsql=	::net/freeradius
-WANTLIB-main=		c com_err crypto krb5 pcap pthread readline ssl termcap
+.for i in ${MULTI_PACKAGES:N-main}
+RUN_DEPENDS$i +=	:freeradius-$V:net/freeradius
+.endfor
 
 post-configure:
 	@perl -pi -e 's,/etc/raddb,${SYSCONFDIR}/raddb,g' ${WRKSRC}/man/*/*
@@ -123,5 +129,9 @@ post-install:
     share/examples/freeradius/dictionary share/examples/freeradius/radiusd.conf 
 	@perl -pi -e 's,\$${DESTDIR},,g' ${PREFIX}/$f
 .endfor
+	rm ${PREFIX}/lib/freeradius/*.la ${PREFIX}/lib/freeradius/*.a
+
+pre-regress:
+	perl -pi -e 's,\$${DESTDIR},${DESTDIR},g' ${WRKSRC}/raddb/radiusd.conf
 
 .include <bsd.port.mk>
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index 9366b4b3e53..a8cf579c1c3 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,5 +1,5 @@
-MD5 (freeradius-server-2.1.3.tar.bz2) = 33oj7GMDqJ0BT8xDQYzl5Q==
-RMD160 (freeradius-server-2.1.3.tar.bz2) = n2l8GwqDTcfysPZp3w1rjDea00Y=
-SHA1 (freeradius-server-2.1.3.tar.bz2) = dSvJrXneyXZh6/VFn9UbcI0Pnd0=
-SHA256 (freeradius-server-2.1.3.tar.bz2) = mEz380GN6PKr4eWZgnJkSVzvHSNMzkq+BaBqS2QZ2xo=
-SIZE (freeradius-server-2.1.3.tar.bz2) = 2380451
+MD5 (freeradius-server-2.1.8.tar.bz2) = 0yZSVJC/uic0cdd1YEcfyw==
+RMD160 (freeradius-server-2.1.8.tar.bz2) = mtjhntobfaif3j0ONFoMxrE+uog=
+SHA1 (freeradius-server-2.1.8.tar.bz2) = 8BqK3WK3kAM8yGHVXcDQmkZ4vqw=
+SHA256 (freeradius-server-2.1.8.tar.bz2) = kylgfYCC+NcZe3660jqDxSOfsSnGi5yrQ6N1IwBwjSI=
+SIZE (freeradius-server-2.1.8.tar.bz2) = 2544696
diff --git a/net/freeradius/patches/patch-configure b/net/freeradius/patches/patch-configure
deleted file mode 100644
index 60c88a43493..00000000000
--- a/net/freeradius/patches/patch-configure
+++ /dev/null
@@ -1,90 +0,0 @@
-$OpenBSD: patch-configure,v 1.7 2008/12/29 19:17:36 rui Exp $
---- configure.orig	Sun Dec 28 00:27:47 2008
-+++ configure	Sun Dec 28 00:36:56 2008
-@@ -4862,7 +4862,7 @@ fi
-     LTDLINCL='-I${top_srcdir}/''libltdl'
-   else
-     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
--    LIBLTDL="-lltdl"
-+    LIBLTDL="-L$with_ltdl_lib -lltdl"
-     LTDLINCL=
-   fi
-   # For backwards non-gettext consistent compatibility...
-@@ -8874,7 +8874,6 @@ bsdi[45]*)
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-   sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-@@ -20336,13 +20335,13 @@ fi
- done
- 
- 
--  { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-+  { echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
-+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -20399,7 +20398,7 @@ fi
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
- if test $ac_cv_lib_pthread_pthread_create = yes; then
-    CFLAGS="$CFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
--                  LIBS="$LIBS -lpthread"
-+                  LIBS="$LIBS -pthread"
- else
-   { echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
- echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6; }
-@@ -20649,7 +20648,6 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -20709,8 +20707,6 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then
- #define HAVE_LIBRESOLV 1
- _ACEOF
- 
--  LIBS="-lresolv $LIBS"
--
- fi
- 
- 
-@@ -20867,7 +20863,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lssl  $LIBS"
-+LIBS="-lcrypto -lssl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23411,7 +23407,7 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
-+#include <unistd.h>
- #ifdef HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
-@@ -23478,7 +23474,7 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
-+#include <unistd.h>
- #ifdef HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
diff --git a/net/freeradius/patches/patch-configure_in b/net/freeradius/patches/patch-configure_in
new file mode 100644
index 00000000000..ca7d515a1c3
--- /dev/null
+++ b/net/freeradius/patches/patch-configure_in
@@ -0,0 +1,41 @@
+$OpenBSD: patch-configure_in,v 1.1 2010/05/17 16:39:25 sthen Exp $
+--- configure.in.orig	Mon May 10 17:01:49 2010
++++ configure.in	Mon May 10 17:08:27 2010
+@@ -474,7 +474,7 @@ dnl # to do the threading properly.
+ dnl #
+   AC_CHECK_LIB(pthread, pthread_create,
+ 		[ CFLAGS="$CFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
+-                  LIBS="$LIBS -lpthread" ],
++                  LIBS="$LIBS -pthread" ],
+ 		AC_CHECK_LIB(c_r, pthread_create,
+ 			    [ CFLAGS="$CFLAGS -pthread -D_THREAD_SAFE" ],
+ 			    [ WITH_THREADS="no" ]
+@@ -510,7 +510,8 @@ AC_CHECK_LIB(socket, getsockname)
+ 
+ dnl Check for -lresolv
+ dnl This library may be needed later.
+-AC_CHECK_LIB(resolv, inet_aton)
++AC_CHECK_FUNCS([inet_aton])
++dnl AC_CHECK_LIB(resolv, inet_aton)
+ 
+ dnl Check if we need -lnsl. Usually if we want to
+ dnl link against -lsocket we need to include -lnsl as well.
+@@ -771,12 +772,18 @@ FR_CHECK_TYPE_INCLUDE([
+ ],uint32_t, unsigned int, [uint32_t should be the canonical 'network integer])
+ 
+ AC_CHECK_TYPE(struct in6_addr, AC_DEFINE(HAVE_STRUCT_IN6_ADDR, 1, [IPv6 address structure]), [], [
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ #ifdef HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
+ ])
+ 
+ AC_CHECK_TYPE(struct sockaddr_storage, AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1, [Generic socket addresses]), [], [
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ #ifdef HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
diff --git a/net/freeradius/patches/patch-raddb_radiusd_conf_in b/net/freeradius/patches/patch-raddb_radiusd_conf_in
index 8435ae0e5b7..29bcb43f0d1 100644
--- a/net/freeradius/patches/patch-raddb_radiusd_conf_in
+++ b/net/freeradius/patches/patch-raddb_radiusd_conf_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-raddb_radiusd_conf_in,v 1.10 2008/12/29 19:17:36 rui Exp $
---- raddb/radiusd.conf.in.orig	Fri Dec  5 16:37:56 2008
-+++ raddb/radiusd.conf.in	Sun Dec 28 00:26:19 2008
+$OpenBSD: patch-raddb_radiusd_conf_in,v 1.11 2010/05/17 16:39:25 sthen Exp $
+--- raddb/radiusd.conf.in.orig	Wed Dec 30 15:44:35 2009
++++ raddb/radiusd.conf.in	Mon May 10 14:10:42 2010
 @@ -54,7 +54,7 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
@@ -30,7 +30,7 @@ $OpenBSD: patch-raddb_radiusd_conf_in,v 1.10 2008/12/29 19:17:36 rui Exp $
  
  #  max_request_time: The maximum time (in seconds) to handle a request.
  #
-@@ -522,8 +522,8 @@ security {
+@@ -541,8 +541,8 @@ security {
  #
  #  allowed values: {no, yes}
  #
@@ -41,7 +41,7 @@ $OpenBSD: patch-raddb_radiusd_conf_in,v 1.10 2008/12/29 19:17:36 rui Exp $
  
  
  # CLIENTS CONFIGURATION
-@@ -539,7 +539,7 @@ $INCLUDE proxy.conf
+@@ -558,7 +558,7 @@ $INCLUDE proxy.conf
  #  Anything listed in 'clients.conf' will take precedence over the
  #  information from the old-style configuration files.
  #
@@ -50,43 +50,37 @@ $OpenBSD: patch-raddb_radiusd_conf_in,v 1.10 2008/12/29 19:17:36 rui Exp $
  
  
  # THREAD POOL CONFIGURATION
-@@ -656,12 +656,12 @@ modules {
+@@ -675,12 +675,12 @@ modules {
  	#  For all EAP related authentications.
  	#  Now in another file, because it is very large.
  	#
 -	$INCLUDE eap.conf
-+	$INCLUDE ${confdir}/eap.conf 
++	$INCLUDE ${confdir}/eap.conf
  
  	#  Include another file that has the SQL-related configuration.
  	#  This is another file only because it tends to be big.
  	#
--	$INCLUDE sql.conf
-+	$INCLUDE ${confdir}/sql.conf 
+-#	$INCLUDE sql.conf
++#	$INCLUDE ${confdir}/sql.conf
  
  	#
  	#  This module is an SQL enabled version of the counter module.
-@@ -673,16 +673,16 @@ modules {
+@@ -692,12 +692,12 @@ modules {
  	#  totally dependent on the SQL module to process Accounting
  	#  packets.
  	#
--	$INCLUDE sql/mysql/counter.conf
--	#$INCLUDE sql/postgresql/counter.conf
-+	$INCLUDE ${confdir}/sql/mysql/counter.conf 
-+	#$INCLUDE ${confdir}/sql/postgresql/counter.conf 
+-#	$INCLUDE sql/mysql/counter.conf
++#	$INCLUDE ${confdir}/sql/mysql/counter.conf
  
  	#
  	#  IP addresses managed in an SQL table.
  	#
--	#$INCLUDE sqlippool.conf
-+	#$INCLUDE ${confdir}/sqlippool.conf 
- 
- 	# OTP token support.  Not included by default.
--	# $INCLUDE otp.conf
-+	# $INCLUDE ${confdir}/otp.conf 
- 
+-#	$INCLUDE sqlippool.conf
++#	$INCLUDE ${confdir}/sqlippool.conf
  }
  
-@@ -753,7 +753,7 @@ instantiate {
+ # Instantiation
+@@ -767,7 +767,7 @@ instantiate {
  #	to multiple times.
  #
  ######################################################################
diff --git a/net/freeradius/patches/patch-src_lib_Makefile b/net/freeradius/patches/patch-src_lib_Makefile
index 632afda6ba3..a2a3830662b 100644
--- a/net/freeradius/patches/patch-src_lib_Makefile
+++ b/net/freeradius/patches/patch-src_lib_Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_lib_Makefile,v 1.5 2008/03/21 19:25:33 rui Exp $
---- src/lib/Makefile.orig	Mon Mar 17 06:28:54 2008
-+++ src/lib/Makefile	Fri Mar 21 16:50:50 2008
+$OpenBSD: patch-src_lib_Makefile,v 1.6 2010/05/17 16:39:25 sthen Exp $
+--- src/lib/Makefile.orig	Wed Dec 30 15:44:35 2009
++++ src/lib/Makefile	Mon May 10 14:10:42 2010
 @@ -40,7 +40,7 @@ TARGET		= $(LIBPREFIX)freeradius-radius
  all: $(TARGET).la
  
@@ -10,9 +10,3 @@ $OpenBSD: patch-src_lib_Makefile,v 1.5 2008/03/21 19:25:33 rui Exp $
  	$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^
  
  $(LT_OBJS): $(INCLUDES)
-@@ -53,5 +53,3 @@ install: all
- 	$(INSTALL) -d -m 755	$(R)$(libdir)
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
diff --git a/net/freeradius/patches/patch-src_lib_log_c b/net/freeradius/patches/patch-src_lib_log_c
deleted file mode 100644
index 5b177893aff..00000000000
--- a/net/freeradius/patches/patch-src_lib_log_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_lib_log_c,v 1.1 2008/09/21 15:39:14 rui Exp $
---- src/lib/log.c.orig	Fri Sep  5 14:27:57 2008
-+++ src/lib/log.c	Fri Sep 19 17:20:18 2008
-@@ -57,6 +57,8 @@
- #endif
- #endif
- 
-+#define USE_PTHREAD_FOR_TLS (1)
-+
- #ifndef USE_PTHREAD_FOR_TLS
- /*
-  *	Try to create a thread-local-storage version of this buffer.
diff --git a/net/freeradius/patches/patch-src_main_radsniff_c b/net/freeradius/patches/patch-src_main_radsniff_c
new file mode 100644
index 00000000000..69247e4b10c
--- /dev/null
+++ b/net/freeradius/patches/patch-src_main_radsniff_c
@@ -0,0 +1,23 @@
+$OpenBSD: patch-src_main_radsniff_c,v 1.1 2010/05/17 16:39:25 sthen Exp $
+--- src/main/radsniff.c.orig	Mon May 10 17:27:54 2010
++++ src/main/radsniff.c	Mon May 10 17:27:55 2010
+@@ -40,7 +40,7 @@ static VALUE_PAIR *filter_vps = NULL;
+ 
+ static int minimal = 0;
+ static int do_sort = 0;
+-struct timeval start_pcap = {0, 0};
++struct bpf_timeval start_pcap = {0, 0};
+ static rbtree_t *filter_tree = NULL;
+ typedef int (*rbcmp)(const void *, const void *);
+ 
+@@ -161,8 +161,8 @@ static void sort(RADIUS_PACKET *packet)
+ }
+ 
+ #define USEC 1000000
+-static void tv_sub(struct timeval *end, struct timeval *start,
+-		   struct timeval *elapsed)
++static void tv_sub(struct bpf_timeval *end, struct bpf_timeval *start,
++		   struct bpf_timeval *elapsed)
+ {
+ 	elapsed->tv_sec = end->tv_sec - start->tv_sec;
+ 	if (elapsed->tv_sec > 0) {
diff --git a/net/freeradius/patches/patch-src_modules_rules_mak b/net/freeradius/patches/patch-src_modules_rules_mak
index 1d9d657d761..52d15a446c3 100644
--- a/net/freeradius/patches/patch-src_modules_rules_mak
+++ b/net/freeradius/patches/patch-src_modules_rules_mak
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_modules_rules_mak,v 1.5 2008/12/29 19:17:36 rui Exp $
---- src/modules/rules.mak.orig	Fri Dec  5 16:37:56 2008
-+++ src/modules/rules.mak	Sun Dec 28 00:26:20 2008
-@@ -115,9 +115,9 @@ build-module: $(TARGET).la $(RLM_UTILS)
+$OpenBSD: patch-src_modules_rules_mak,v 1.6 2010/05/17 16:39:25 sthen Exp $
+--- src/modules/rules.mak.orig	Wed Dec 30 15:44:35 2009
++++ src/modules/rules.mak	Mon May 10 14:10:43 2010
+@@ -121,9 +121,9 @@ build-module: $(TARGET).la $(RLM_UTILS)
  	done
  
  $(TARGET).la: $(LT_OBJS)
@@ -13,7 +13,7 @@ $OpenBSD: patch-src_modules_rules_mak,v 1.5 2008/12/29 19:17:36 rui Exp $
  
  #######################################################################
  #
-@@ -164,7 +164,5 @@ install:
+@@ -170,7 +170,5 @@ install:
  	@[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
  	if [ "x$(TARGET)" != "x" ]; then \
  	    $(LIBTOOL) --mode=install $(INSTALL) -c \
diff --git a/net/freeradius/patches/patch-src_tests_runtests_sh b/net/freeradius/patches/patch-src_tests_runtests_sh
new file mode 100644
index 00000000000..e6e01497f40
--- /dev/null
+++ b/net/freeradius/patches/patch-src_tests_runtests_sh
@@ -0,0 +1,9 @@
+$OpenBSD: patch-src_tests_runtests_sh,v 1.1 2010/05/17 16:39:25 sthen Exp $
+--- src/tests/runtests.sh.orig	Mon May 10 23:28:35 2010
++++ src/tests/runtests.sh	Mon May 10 23:28:20 2010
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ PORT=12340
+ HOME_PORT=12350
diff --git a/net/freeradius/pkg/MESSAGE-main b/net/freeradius/pkg/MESSAGE-main
index d682c8fa7d8..917bb1f3a82 100644
--- a/net/freeradius/pkg/MESSAGE-main
+++ b/net/freeradius/pkg/MESSAGE-main
@@ -1,5 +1,9 @@
-To have radiusd start at boot time, you have to adapt
-${SYSCONFDIR}/raddb/radiusd.conf and insert the following into /etc/rc.local.
+Review the sample configuration files in ${SYSCONFDIR}/raddb (starting
+with radiusd.conf) and adapt as necessary. For the first run, start
+radiusd manually with the -X flag.
+
+To have freeradius start at system boot, you may insert the following
+into /etc/rc.local:
 
 if [ -x ${PREFIX}/sbin/radiusd ]; then
 	install -d -o _freeradius /var/run/radiusd
diff --git a/net/freeradius/pkg/PLIST-iodbc b/net/freeradius/pkg/PLIST-iodbc
index 0a86cd5eb1e..2c05670b485 100644
--- a/net/freeradius/pkg/PLIST-iodbc
+++ b/net/freeradius/pkg/PLIST-iodbc
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST-iodbc,v 1.1.1.1 2006/04/16 14:37:08 sturm Exp $
-lib/freeradius/rlm_sql_iodbc.a
-lib/freeradius/rlm_sql_iodbc.la
+@comment $OpenBSD: PLIST-iodbc,v 1.2 2010/05/17 16:39:25 sthen Exp $
 lib/freeradius/rlm_sql_iodbc.so
+share/doc/freeradius/mssql
+share/examples/freeradius/sql/mssql/
+share/examples/freeradius/sql/mssql/dialup.conf
+share/examples/freeradius/sql/mssql/schema.sql
diff --git a/net/freeradius/pkg/PLIST-ldap b/net/freeradius/pkg/PLIST-ldap
index d5a44a2a0d9..688ef6df136 100644
--- a/net/freeradius/pkg/PLIST-ldap
+++ b/net/freeradius/pkg/PLIST-ldap
@@ -1,4 +1,12 @@
-@comment $OpenBSD: PLIST-ldap,v 1.1.1.1 2006/04/16 14:37:09 sturm Exp $
-lib/freeradius/rlm_ldap.a
-lib/freeradius/rlm_ldap.la
+@comment $OpenBSD: PLIST-ldap,v 1.2 2010/05/17 16:39:25 sthen Exp $
+@conflict freeradius-server-<2.1.8
 lib/freeradius/rlm_ldap.so
+share/doc/freeradius/examples/iplanet.ldif
+share/doc/freeradius/examples/iplanet.schema
+share/doc/freeradius/examples/openldap.schema
+share/doc/freeradius/ldap_howto.txt
+share/doc/freeradius/rlm_ldap
+share/examples/freeradius/ldap.attrmap
+@sample ${SYSCONFDIR}/raddb/ldap.attrmap
+share/examples/freeradius/modules/ldap
+@sample ${SYSCONFDIR}/raddb/modules/ldap
diff --git a/net/freeradius/pkg/PLIST-main b/net/freeradius/pkg/PLIST-main
index 2542a23947a..470408db291 100644
--- a/net/freeradius/pkg/PLIST-main
+++ b/net/freeradius/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.12 2008/12/29 19:17:36 rui Exp $
+@comment $OpenBSD: PLIST-main,v 1.13 2010/05/17 16:39:25 sthen Exp $
 @conflict radiusd-cistron-*
 @conflict radiusd-lucent-*
 @pkgpath net/freeradius
@@ -18,155 +18,84 @@ bin/radzap
 @bin bin/rlm_ippool_tool
 @bin bin/smbencrypt
 include/freeradius/
+include/freeradius/autoconf.h
+include/freeradius/conf.h
+include/freeradius/conffile.h
+include/freeradius/detail.h
+include/freeradius/dhcp.h
+include/freeradius/event.h
 include/freeradius/hash.h
+include/freeradius/heap.h
 include/freeradius/ident.h
 include/freeradius/libradius.h
 include/freeradius/md4.h
 include/freeradius/md5.h
 include/freeradius/missing.h
+include/freeradius/modcall.h
+include/freeradius/modules.h
 include/freeradius/packet.h
+include/freeradius/rad_assert.h
 include/freeradius/radius.h
+include/freeradius/radiusd.h
 include/freeradius/radpaths.h
+include/freeradius/radutmp.h
+include/freeradius/realms.h
 include/freeradius/sha1.h
+include/freeradius/stats.h
+include/freeradius/sysutmp.h
 include/freeradius/token.h
 include/freeradius/udpfromto.h
+include/freeradius/vmps.h
 include/freeradius/vqp.h
 lib/freeradius/
-lib/freeradius/rlm_acct_unique.a
-lib/freeradius/rlm_acct_unique.la
 lib/freeradius/rlm_acct_unique.so
-lib/freeradius/rlm_acctlog.a
-lib/freeradius/rlm_acctlog.la
 lib/freeradius/rlm_acctlog.so
-lib/freeradius/rlm_always.a
-lib/freeradius/rlm_always.la
 lib/freeradius/rlm_always.so
-lib/freeradius/rlm_attr_filter.a
-lib/freeradius/rlm_attr_filter.la
 lib/freeradius/rlm_attr_filter.so
-lib/freeradius/rlm_attr_rewrite.a
-lib/freeradius/rlm_attr_rewrite.la
 lib/freeradius/rlm_attr_rewrite.so
-lib/freeradius/rlm_chap.a
-lib/freeradius/rlm_chap.la
 lib/freeradius/rlm_chap.so
-lib/freeradius/rlm_checkval.a
-lib/freeradius/rlm_checkval.la
 lib/freeradius/rlm_checkval.so
-lib/freeradius/rlm_copy_packet.a
-lib/freeradius/rlm_copy_packet.la
 lib/freeradius/rlm_copy_packet.so
-lib/freeradius/rlm_counter.a
-lib/freeradius/rlm_counter.la
 lib/freeradius/rlm_counter.so
-lib/freeradius/rlm_dbm.a
-lib/freeradius/rlm_dbm.la
 lib/freeradius/rlm_dbm.so
-lib/freeradius/rlm_detail.a
-lib/freeradius/rlm_detail.la
 lib/freeradius/rlm_detail.so
-lib/freeradius/rlm_digest.a
-lib/freeradius/rlm_digest.la
 lib/freeradius/rlm_digest.so
-lib/freeradius/rlm_dynamic_clients.a
-lib/freeradius/rlm_dynamic_clients.la
 lib/freeradius/rlm_dynamic_clients.so
-lib/freeradius/rlm_eap.a
-lib/freeradius/rlm_eap.la
 lib/freeradius/rlm_eap.so
-lib/freeradius/rlm_eap_gtc.a
-lib/freeradius/rlm_eap_gtc.la
 lib/freeradius/rlm_eap_gtc.so
-lib/freeradius/rlm_eap_leap.a
-lib/freeradius/rlm_eap_leap.la
 lib/freeradius/rlm_eap_leap.so
-lib/freeradius/rlm_eap_md5.a
-lib/freeradius/rlm_eap_md5.la
 lib/freeradius/rlm_eap_md5.so
-lib/freeradius/rlm_eap_mschapv2.a
-lib/freeradius/rlm_eap_mschapv2.la
 lib/freeradius/rlm_eap_mschapv2.so
-lib/freeradius/rlm_eap_peap.a
-lib/freeradius/rlm_eap_peap.la
 lib/freeradius/rlm_eap_peap.so
-lib/freeradius/rlm_eap_sim.a
-lib/freeradius/rlm_eap_sim.la
 lib/freeradius/rlm_eap_sim.so
-lib/freeradius/rlm_eap_tls.a
-lib/freeradius/rlm_eap_tls.la
 lib/freeradius/rlm_eap_tls.so
-lib/freeradius/rlm_eap_ttls.a
-lib/freeradius/rlm_eap_ttls.la
 lib/freeradius/rlm_eap_ttls.so
-lib/freeradius/rlm_exec.a
-lib/freeradius/rlm_exec.la
 lib/freeradius/rlm_exec.so
-lib/freeradius/rlm_expiration.a
-lib/freeradius/rlm_expiration.la
 lib/freeradius/rlm_expiration.so
-lib/freeradius/rlm_expr.a
-lib/freeradius/rlm_expr.la
 lib/freeradius/rlm_expr.so
-lib/freeradius/rlm_fastusers.a
-lib/freeradius/rlm_fastusers.la
 lib/freeradius/rlm_fastusers.so
-lib/freeradius/rlm_files.a
-lib/freeradius/rlm_files.la
 lib/freeradius/rlm_files.so
-lib/freeradius/rlm_ippool.a
-lib/freeradius/rlm_ippool.la
 lib/freeradius/rlm_ippool.so
-lib/freeradius/rlm_krb5.a
-lib/freeradius/rlm_krb5.la
 lib/freeradius/rlm_krb5.so
-lib/freeradius/rlm_linelog.a
-lib/freeradius/rlm_linelog.la
 lib/freeradius/rlm_linelog.so
-lib/freeradius/rlm_logintime.a
-lib/freeradius/rlm_logintime.la
 lib/freeradius/rlm_logintime.so
-lib/freeradius/rlm_mschap.a
-lib/freeradius/rlm_mschap.la
 lib/freeradius/rlm_mschap.so
-lib/freeradius/rlm_otp.a
-lib/freeradius/rlm_otp.la
 lib/freeradius/rlm_otp.so
-lib/freeradius/rlm_pap.a
-lib/freeradius/rlm_pap.la
 lib/freeradius/rlm_pap.so
-lib/freeradius/rlm_passwd.a
-lib/freeradius/rlm_passwd.la
 lib/freeradius/rlm_passwd.so
-lib/freeradius/rlm_policy.a
-lib/freeradius/rlm_policy.la
 lib/freeradius/rlm_policy.so
-lib/freeradius/rlm_preprocess.a
-lib/freeradius/rlm_preprocess.la
 lib/freeradius/rlm_preprocess.so
-lib/freeradius/rlm_radutmp.a
-lib/freeradius/rlm_radutmp.la
 lib/freeradius/rlm_radutmp.so
-lib/freeradius/rlm_realm.a
-lib/freeradius/rlm_realm.la
 lib/freeradius/rlm_realm.so
-lib/freeradius/rlm_sql.a
-lib/freeradius/rlm_sql.la
 lib/freeradius/rlm_sql.so
-lib/freeradius/rlm_sql_log.a
-lib/freeradius/rlm_sql_log.la
 lib/freeradius/rlm_sql_log.so
-lib/freeradius/rlm_sqlcounter.a
-lib/freeradius/rlm_sqlcounter.la
 lib/freeradius/rlm_sqlcounter.so
-lib/freeradius/rlm_sqlippool.a
-lib/freeradius/rlm_sqlippool.la
 lib/freeradius/rlm_sqlippool.so
-lib/freeradius/rlm_unix.a
-lib/freeradius/rlm_unix.la
 lib/freeradius/rlm_unix.so
 lib/libfreeradius-eap.a
 lib/libfreeradius-eap.la
 @lib lib/libfreeradius-eap.so.${LIBfreeradius-eap_VERSION}
+lib/libfreeradius-radius-${V}.la
 lib/libfreeradius-radius.a
 lib/libfreeradius-radius.la
 @lib lib/libfreeradius-radius.so.${LIBfreeradius-radius_VERSION}
@@ -201,6 +130,7 @@ lib/libfreeradius-radius.la
 @man man/man5/rlm_unix.5
 @man man/man5/unlang.5
 @man man/man5/users.5
+@man man/man8/raddebug.8
 @man man/man8/radiusd.8
 @man man/man8/radmin.8
 @man man/man8/radrelay.8
@@ -208,6 +138,7 @@ lib/libfreeradius-radius.la
 @man man/man8/radwatch.8
 @man man/man8/rlm_ippool_tool.8
 sbin/checkrad
+sbin/raddebug
 @bin sbin/radiusd
 @bin sbin/radmin
 sbin/radwatch
@@ -215,11 +146,11 @@ sbin/radwatch
 share/doc/freeradius/
 share/doc/freeradius/Acct-Type
 share/doc/freeradius/Autz-Type
-share/doc/freeradius/CYGWIN
+@comment share/doc/freeradius/CYGWIN
 share/doc/freeradius/ChangeLog
 share/doc/freeradius/DIFFS
-share/doc/freeradius/MACOSX
-share/doc/freeradius/OS2
+@comment share/doc/freeradius/MACOSX
+@comment share/doc/freeradius/OS2
 share/doc/freeradius/Post-Auth-Type
 share/doc/freeradius/RADIUS-LDAP-eDirectory
 share/doc/freeradius/RADIUS-SQL.schema
@@ -234,15 +165,9 @@ share/doc/freeradius/cisco
 share/doc/freeradius/coding-methods.txt
 share/doc/freeradius/configurable_failover
 share/doc/freeradius/examples/
-share/doc/freeradius/examples/iplanet.ldif
-share/doc/freeradius/examples/iplanet.schema
-share/doc/freeradius/examples/openldap.schema
-share/doc/freeradius/examples/postgresql_update_radacct_group_trigger.sql
-share/doc/freeradius/ldap_howto.txt
 share/doc/freeradius/load-balance.txt
 share/doc/freeradius/misc-nas
 share/doc/freeradius/module_interface
-share/doc/freeradius/mssql
 share/doc/freeradius/performance-testing
 share/doc/freeradius/processing_users_file
 share/doc/freeradius/proxy
@@ -301,16 +226,16 @@ share/doc/freeradius/rfc/rfc5090.txt
 share/doc/freeradius/rfc/rfc5176.txt
 share/doc/freeradius/rfc/rfc5247.txt
 share/doc/freeradius/rfc/rfc5281.txt
+share/doc/freeradius/rfc/rfc5580.txt
 share/doc/freeradius/rlm_dbm
 share/doc/freeradius/rlm_eap
 share/doc/freeradius/rlm_expiration
 share/doc/freeradius/rlm_fastusers
 share/doc/freeradius/rlm_jradius
 share/doc/freeradius/rlm_krb5
-share/doc/freeradius/rlm_ldap
-share/doc/freeradius/rlm_pam
+@comment share/doc/freeradius/rlm_pam
 share/doc/freeradius/rlm_passwd
-share/doc/freeradius/rlm_python
+@comment share/doc/freeradius/rlm_python
 share/doc/freeradius/rlm_sim_triplets
 share/doc/freeradius/rlm_sql
 share/doc/freeradius/rlm_sqlcounter
@@ -320,39 +245,49 @@ share/doc/freeradius/supervise-radiusd.txt
 share/doc/freeradius/tuning_guide
 share/doc/freeradius/variables.txt
 share/examples/freeradius/
-@mode 750
+@mode 755
 @group _freeradius
 @sample ${SYSCONFDIR}/raddb/
-@mode
-@group
+@mode 640
 share/examples/freeradius/acct_users
 @sample ${SYSCONFDIR}/raddb/acct_users
 share/examples/freeradius/attrs
+@sample ${SYSCONFDIR}/raddb/attrs
+share/examples/freeradius/attrs.access_challenge
+@sample ${SYSCONFDIR}/raddb/attrs.access_challenge
 share/examples/freeradius/attrs.access_reject
 @sample ${SYSCONFDIR}/raddb/attrs.access_reject
 share/examples/freeradius/attrs.accounting_response
 @sample ${SYSCONFDIR}/raddb/attrs.accounting_response
 share/examples/freeradius/attrs.pre-proxy
-share/examples/freeradius/certs/
-@mode 750
-@group _freeradius
-@sample ${SYSCONFDIR}/raddb/certs/
+@sample ${SYSCONFDIR}/raddb/attrs.pre-proxy
 @mode
-@group
+share/examples/freeradius/certs/
+@mode 770
+@sample ${SYSCONFDIR}/raddb/certs/
+@mode 640
 share/examples/freeradius/certs/Makefile
+@sample ${SYSCONFDIR}/raddb/certs/Makefile
 share/examples/freeradius/certs/README
+@sample ${SYSCONFDIR}/raddb/certs/README
+@mode 750
 share/examples/freeradius/certs/bootstrap
+@sample ${SYSCONFDIR}/raddb/certs/bootstrap
+@mode 640
 share/examples/freeradius/certs/ca.cnf
+@sample ${SYSCONFDIR}/raddb/certs/ca.cnf
 share/examples/freeradius/certs/client.cnf
+@sample ${SYSCONFDIR}/raddb/certs/client.cnf
 share/examples/freeradius/certs/server.cnf
+@sample ${SYSCONFDIR}/raddb/certs/server.cnf
 share/examples/freeradius/certs/xpextensions
 @sample ${SYSCONFDIR}/raddb/certs/xpextensions
 share/examples/freeradius/clients.conf
-@mode 640
 @sample ${SYSCONFDIR}/raddb/clients.conf
-@mode
+@mode 644
 share/examples/freeradius/dictionary
 @sample ${SYSCONFDIR}/raddb/dictionary
+@mode 640
 share/examples/freeradius/eap.conf
 @sample ${SYSCONFDIR}/raddb/eap.conf
 share/examples/freeradius/experimental.conf
@@ -361,8 +296,6 @@ share/examples/freeradius/hints
 @sample ${SYSCONFDIR}/raddb/hints
 share/examples/freeradius/huntgroups
 @sample ${SYSCONFDIR}/raddb/huntgroups
-share/examples/freeradius/ldap.attrmap
-@sample ${SYSCONFDIR}/raddb/ldap.attrmap
 share/examples/freeradius/modules/
 @sample ${SYSCONFDIR}/raddb/modules/
 share/examples/freeradius/modules/acct_unique
@@ -379,6 +312,8 @@ share/examples/freeradius/modules/checkval
 @sample ${SYSCONFDIR}/raddb/modules/checkval
 share/examples/freeradius/modules/counter
 @sample ${SYSCONFDIR}/raddb/modules/counter
+share/examples/freeradius/modules/cui
+@sample ${SYSCONFDIR}/raddb/modules/cui
 share/examples/freeradius/modules/detail
 @sample ${SYSCONFDIR}/raddb/modules/detail
 share/examples/freeradius/modules/detail.example.com
@@ -405,8 +340,6 @@ share/examples/freeradius/modules/ippool
 @sample ${SYSCONFDIR}/raddb/modules/ippool
 share/examples/freeradius/modules/krb5
 @sample ${SYSCONFDIR}/raddb/modules/krb5
-share/examples/freeradius/modules/ldap
-@sample ${SYSCONFDIR}/raddb/modules/ldap
 share/examples/freeradius/modules/linelog
 @sample ${SYSCONFDIR}/raddb/modules/linelog
 share/examples/freeradius/modules/logintime
@@ -417,14 +350,16 @@ share/examples/freeradius/modules/mac2vlan
 @sample ${SYSCONFDIR}/raddb/modules/mac2vlan
 share/examples/freeradius/modules/mschap
 @sample ${SYSCONFDIR}/raddb/modules/mschap
-share/examples/freeradius/modules/pam
-@sample ${SYSCONFDIR}/raddb/modules/pam
+share/examples/freeradius/modules/ntlm_auth
+@sample ${SYSCONFDIR}/raddb/modules/ntlm_auth
+share/examples/freeradius/modules/otp
+@sample ${SYSCONFDIR}/raddb/modules/otp
+@comment share/examples/freeradius/modules/pam
 share/examples/freeradius/modules/pap
 @sample ${SYSCONFDIR}/raddb/modules/pap
 share/examples/freeradius/modules/passwd
 @sample ${SYSCONFDIR}/raddb/modules/passwd
-share/examples/freeradius/modules/perl
-@sample ${SYSCONFDIR}/raddb/modules/perl
+@comment share/examples/freeradius/modules/perl
 share/examples/freeradius/modules/policy
 @sample ${SYSCONFDIR}/raddb/modules/policy
 share/examples/freeradius/modules/preprocess
@@ -435,6 +370,8 @@ share/examples/freeradius/modules/realm
 @sample ${SYSCONFDIR}/raddb/modules/realm
 share/examples/freeradius/modules/smbpasswd
 @sample ${SYSCONFDIR}/raddb/modules/smbpasswd
+share/examples/freeradius/modules/smsotp
+@sample ${SYSCONFDIR}/raddb/modules/smsotp
 share/examples/freeradius/modules/sql_log
 @sample ${SYSCONFDIR}/raddb/modules/sql_log
 share/examples/freeradius/modules/sqlcounter_expire_on_login
@@ -445,108 +382,83 @@ share/examples/freeradius/modules/unix
 @sample ${SYSCONFDIR}/raddb/modules/unix
 share/examples/freeradius/modules/wimax
 @sample ${SYSCONFDIR}/raddb/modules/wimax
-share/examples/freeradius/otp.conf
-@sample ${SYSCONFDIR}/raddb/otp.conf
 share/examples/freeradius/policy.conf
 @sample ${SYSCONFDIR}/raddb/policy.conf
 share/examples/freeradius/policy.txt
 share/examples/freeradius/preproxy_users
 @sample ${SYSCONFDIR}/raddb/preproxy_users
 share/examples/freeradius/proxy.conf
-@mode 640
 @sample ${SYSCONFDIR}/raddb/proxy.conf
-@mode
 share/examples/freeradius/radiusd.conf
-@mode 640
 @sample ${SYSCONFDIR}/raddb/radiusd.conf
-@mode
 share/examples/freeradius/sites-available/
 @sample ${SYSCONFDIR}/raddb/sites-available/
 share/examples/freeradius/sites-available/README
+@sample ${SYSCONFDIR}/raddb/sites-available/README
 share/examples/freeradius/sites-available/buffered-sql
+@sample ${SYSCONFDIR}/raddb/sites-available/buffered-sql
 share/examples/freeradius/sites-available/control-socket
+@sample ${SYSCONFDIR}/raddb/sites-available/control-socket
 share/examples/freeradius/sites-available/copy-acct-to-home-server
+@sample ${SYSCONFDIR}/raddb/sites-available/copy-acct-to-home-server
 share/examples/freeradius/sites-available/decoupled-accounting
+@sample ${SYSCONFDIR}/raddb/sites-available/decoupled-accounting
 share/examples/freeradius/sites-available/default
+@sample ${SYSCONFDIR}/raddb/sites-available/default
 share/examples/freeradius/sites-available/dhcp
+@sample ${SYSCONFDIR}/raddb/sites-available/dhcp
 share/examples/freeradius/sites-available/dynamic-clients
+@sample ${SYSCONFDIR}/raddb/sites-available/dynamic-clients
 share/examples/freeradius/sites-available/example
+@sample ${SYSCONFDIR}/raddb/sites-available/example
 share/examples/freeradius/sites-available/inner-tunnel
+@sample ${SYSCONFDIR}/raddb/sites-available/inner-tunnel
+share/examples/freeradius/sites-available/originate-coa
+@sample ${SYSCONFDIR}/raddb/sites-available/originate-coa
 share/examples/freeradius/sites-available/proxy-inner-tunnel
+@sample ${SYSCONFDIR}/raddb/sites-available/proxy-inner-tunnel
 share/examples/freeradius/sites-available/robust-proxy-accounting
+@sample ${SYSCONFDIR}/raddb/sites-available/robust-proxy-accounting
 share/examples/freeradius/sites-available/status
+@sample ${SYSCONFDIR}/raddb/sites-available/status
 share/examples/freeradius/sites-available/virtual.example.com
+@sample ${SYSCONFDIR}/raddb/sites-available/virtual.example.com
 share/examples/freeradius/sites-available/vmps
+@sample ${SYSCONFDIR}/raddb/sites-available/vmps
 share/examples/freeradius/sites-enabled/
 @sample ${SYSCONFDIR}/raddb/sites-enabled/
+share/examples/freeradius/sites-enabled/control-socket
 share/examples/freeradius/sites-enabled/default
-@sample ${SYSCONFDIR}/raddb/sites-enabled/default
 share/examples/freeradius/sites-enabled/inner-tunnel
-@sample ${SYSCONFDIR}/raddb/sites-enabled/inner-tunnel
 share/examples/freeradius/sql/
 @sample ${SYSCONFDIR}/raddb/sql/
 share/examples/freeradius/sql.conf
-@mode 640
 @sample ${SYSCONFDIR}/raddb/sql.conf
-@mode
-share/examples/freeradius/sql/mssql/
-share/examples/freeradius/sql/mssql/dialup.conf
-share/examples/freeradius/sql/mssql/schema.sql
-share/examples/freeradius/sql/mysql/
-@sample ${SYSCONFDIR}/raddb/sql/mysql/
-share/examples/freeradius/sql/mysql/admin.sql
-share/examples/freeradius/sql/mysql/counter.conf
-@sample ${SYSCONFDIR}/raddb/sql/mysql/counter.conf
-share/examples/freeradius/sql/mysql/dialup.conf
-@sample ${SYSCONFDIR}/raddb/sql/mysql/dialup.conf
-share/examples/freeradius/sql/mysql/ippool.conf
-@sample ${SYSCONFDIR}/raddb/sql/mysql/ippool.conf
-share/examples/freeradius/sql/mysql/ippool.sql
-share/examples/freeradius/sql/mysql/nas.sql
-share/examples/freeradius/sql/mysql/schema.sql
-share/examples/freeradius/sql/mysql/wimax.conf
-@sample ${SYSCONFDIR}/raddb/sql/mysql/wimax.conf
-share/examples/freeradius/sql/mysql/wimax.sql
-share/examples/freeradius/sql/oracle/
-@sample ${SYSCONFDIR}/raddb/sql/oracle/
-share/examples/freeradius/sql/oracle/dialup.conf
-@sample ${SYSCONFDIR}/raddb/sql/oracle/dialup.conf
-share/examples/freeradius/sql/oracle/ippool.conf
-@sample ${SYSCONFDIR}/raddb/sql/oracle/ippool.conf
-share/examples/freeradius/sql/oracle/ippool.sql
-share/examples/freeradius/sql/oracle/msqlippool.txt
-share/examples/freeradius/sql/oracle/nas.sql
-share/examples/freeradius/sql/oracle/schema.sql
-share/examples/freeradius/sql/postgresql/
-@sample ${SYSCONFDIR}/raddb/sql/postgresql/
-share/examples/freeradius/sql/postgresql/admin.sql
-share/examples/freeradius/sql/postgresql/cisco_h323_db_schema.sql
-share/examples/freeradius/sql/postgresql/counter.conf
-@sample ${SYSCONFDIR}/raddb/sql/postgresql/counter.conf
-share/examples/freeradius/sql/postgresql/dialup.conf
-@sample ${SYSCONFDIR}/raddb/sql/postgresql/dialup.conf
-share/examples/freeradius/sql/postgresql/ippool.conf
-@sample ${SYSCONFDIR}/raddb/sql/postgresql/ippool.conf
-share/examples/freeradius/sql/postgresql/ippool.sql
-share/examples/freeradius/sql/postgresql/nas.sql
-share/examples/freeradius/sql/postgresql/schema.sql
-share/examples/freeradius/sql/postgresql/update_radacct_group_trigger.sql
-share/examples/freeradius/sql/postgresql/voip-postpaid.conf
-@sample ${SYSCONFDIR}/raddb/sql/postgresql/voip-postpaid.conf
+@comment share/examples/freeradius/sql/oracle/
+@comment share/examples/freeradius/sql/oracle/dialup.conf
+@comment share/examples/freeradius/sql/oracle/ippool.conf
+@comment share/examples/freeradius/sql/oracle/ippool.sql
+@comment share/examples/freeradius/sql/oracle/msqlippool.txt
+@comment share/examples/freeradius/sql/oracle/nas.sql
+@comment share/examples/freeradius/sql/oracle/schema.sql
 share/examples/freeradius/sqlippool.conf
 @sample ${SYSCONFDIR}/raddb/sqlippool.conf
 share/examples/freeradius/templates.conf
 @sample ${SYSCONFDIR}/raddb/templates.conf
 share/examples/freeradius/users
 @sample ${SYSCONFDIR}/raddb/users
+@mode
 share/freeradius/
 share/freeradius/dictionary
 share/freeradius/dictionary.3com
 share/freeradius/dictionary.3gpp
 share/freeradius/dictionary.3gpp2
 share/freeradius/dictionary.acc
+share/freeradius/dictionary.acme
 share/freeradius/dictionary.airespace
 share/freeradius/dictionary.alcatel
+share/freeradius/dictionary.alcatel.esam
+share/freeradius/dictionary.alcatel.sr
 share/freeradius/dictionary.alteon
 share/freeradius/dictionary.altiga
 share/freeradius/dictionary.alvarion
@@ -555,6 +467,7 @@ share/freeradius/dictionary.aptis
 share/freeradius/dictionary.aruba
 share/freeradius/dictionary.ascend
 share/freeradius/dictionary.asn
+share/freeradius/dictionary.audiocodes
 share/freeradius/dictionary.avaya
 share/freeradius/dictionary.azaire
 share/freeradius/dictionary.bay
@@ -582,12 +495,15 @@ share/freeradius/dictionary.fortinet
 share/freeradius/dictionary.foundry
 share/freeradius/dictionary.freeradius
 share/freeradius/dictionary.freeradius.internal
+share/freeradius/dictionary.freeswitch
 share/freeradius/dictionary.gandalf
 share/freeradius/dictionary.garderos
 share/freeradius/dictionary.gemtek
 share/freeradius/dictionary.h3c
 share/freeradius/dictionary.hp
 share/freeradius/dictionary.huawei
+share/freeradius/dictionary.iea
+share/freeradius/dictionary.infonet
 share/freeradius/dictionary.ipunplugged
 share/freeradius/dictionary.issanni
 share/freeradius/dictionary.itk
@@ -637,6 +553,7 @@ share/freeradius/dictionary.rfc4818
 share/freeradius/dictionary.rfc4849
 share/freeradius/dictionary.rfc5090
 share/freeradius/dictionary.rfc5176
+share/freeradius/dictionary.rfc5580
 share/freeradius/dictionary.riverstone
 share/freeradius/dictionary.roaringpenguin
 share/freeradius/dictionary.shasta
@@ -668,6 +585,9 @@ share/freeradius/dictionary.zyxel
 @sample /var/log/radius/
 @sample /var/log/radius/radacct/
 @sample /var/run/radiusd/
-@extra /var/log/radius/radwtmp
+@exec-add ln -s ../sites-available/control-socket ${SYSCONFDIR}/raddb/sites-enabled/
+@exec-add ln -s ../sites-available/default ${SYSCONFDIR}/raddb/sites-enabled/
+@exec-add ln -s ../sites-available/inner-tunnel ${SYSCONFDIR}/raddb/sites-enabled/
 @extraunexec rm -rf ${SYSCONFDIR}/raddb
 @extraunexec rm -rf /var/log/radius
+@extra /var/log/radius/radwtmp
diff --git a/net/freeradius/pkg/PLIST-mysql b/net/freeradius/pkg/PLIST-mysql
index 8b464df7872..397eccf3f15 100644
--- a/net/freeradius/pkg/PLIST-mysql
+++ b/net/freeradius/pkg/PLIST-mysql
@@ -1,4 +1,25 @@
-@comment $OpenBSD: PLIST-mysql,v 1.1.1.1 2006/04/16 14:37:08 sturm Exp $
-lib/freeradius/rlm_sql_mysql.a
-lib/freeradius/rlm_sql_mysql.la
+@comment $OpenBSD: PLIST-mysql,v 1.2 2010/05/17 16:39:25 sthen Exp $
+@conflict freeradius-server-<2.1.8
 lib/freeradius/rlm_sql_mysql.so
+share/examples/freeradius/sql/mysql/
+@sample ${SYSCONFDIR}/raddb/sql/mysql/
+share/examples/freeradius/sql/mysql/admin.sql
+share/examples/freeradius/sql/mysql/counter.conf
+@sample ${SYSCONFDIR}/raddb/sql/mysql/counter.conf
+share/examples/freeradius/sql/mysql/cui.conf
+@sample ${SYSCONFDIR}/raddb/sql/mysql/cui.conf
+share/examples/freeradius/sql/mysql/cui.sql
+share/examples/freeradius/sql/mysql/dialup.conf
+@sample ${SYSCONFDIR}/raddb/sql/mysql/dialup.conf
+share/examples/freeradius/sql/mysql/ippool.conf
+@sample ${SYSCONFDIR}/raddb/sql/mysql/ippool.conf
+share/examples/freeradius/sql/mysql/ippool.sql
+share/examples/freeradius/sql/mysql/nas.sql
+share/examples/freeradius/sql/mysql/schema.sql
+share/examples/freeradius/sql/mysql/wimax.conf
+@sample ${SYSCONFDIR}/raddb/sql/mysql/wimax.conf
+share/examples/freeradius/sql/mysql/wimax.sql
+share/examples/freeradius/sql/ndb/
+share/examples/freeradius/sql/ndb/README
+share/examples/freeradius/sql/ndb/admin.sql
+share/examples/freeradius/sql/ndb/schema.sql
diff --git a/net/freeradius/pkg/PLIST-pgsql b/net/freeradius/pkg/PLIST-pgsql
index 0857ce7818b..d346e8b3177 100644
--- a/net/freeradius/pkg/PLIST-pgsql
+++ b/net/freeradius/pkg/PLIST-pgsql
@@ -1,4 +1,20 @@
-@comment $OpenBSD: PLIST-pgsql,v 1.1.1.1 2006/04/16 14:37:08 sturm Exp $
-lib/freeradius/rlm_sql_postgresql.a
-lib/freeradius/rlm_sql_postgresql.la
+@comment $OpenBSD: PLIST-pgsql,v 1.2 2010/05/17 16:39:25 sthen Exp $
+@conflict freeradius-<2.1.8
 lib/freeradius/rlm_sql_postgresql.so
+share/doc/freeradius/examples/postgresql_update_radacct_group_trigger.sql
+share/examples/freeradius/sql/postgresql/
+@sample ${SYSCONFDIR}/raddb/sql/postgresql/
+share/examples/freeradius/sql/postgresql/admin.sql
+share/examples/freeradius/sql/postgresql/cisco_h323_db_schema.sql
+share/examples/freeradius/sql/postgresql/counter.conf
+@sample ${SYSCONFDIR}/raddb/sql/postgresql/counter.conf
+share/examples/freeradius/sql/postgresql/dialup.conf
+@sample ${SYSCONFDIR}/raddb/sql/postgresql/dialup.conf
+share/examples/freeradius/sql/postgresql/ippool.conf
+@sample ${SYSCONFDIR}/raddb/sql/postgresql/ippool.conf
+share/examples/freeradius/sql/postgresql/ippool.sql
+share/examples/freeradius/sql/postgresql/nas.sql
+share/examples/freeradius/sql/postgresql/schema.sql
+share/examples/freeradius/sql/postgresql/update_radacct_group_trigger.sql
+share/examples/freeradius/sql/postgresql/voip-postpaid.conf
+@sample ${SYSCONFDIR}/raddb/sql/postgresql/voip-postpaid.conf