5 files changed, 93 insertions, 50 deletions

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 5df5c2038e8a..8204bb06b660 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freeradius
-DISTVERSION=	2.0.5
+DISTVERSION=	2.1.3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
@@ -47,15 +47,10 @@ OPTIONS=	USER		"Run as user freeradius, group freeradius" on \
 		MYSQL		"With MySQL database support" off \
 		PGSQL		"With PostgreSQL database support" off \
 		FIREBIRD	"With Firebird database support (EXPERIMENTAL)" off \
-		SNMP		"With SNMP support" off \
 		EXPERIMENTAL	"Build experimental modules (including DHCP)" off
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700000
-BROKEN=		fails to build python rlm module
-.endif
-
 # Default requirements for rc script
 _REQUIRE=	NETWORKING SERVERS
 
@@ -153,6 +148,7 @@ CONFIGURE_ARGS+=--enable-heimdal-krb5
 .else
 LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5
 .endif
+CONFIGURE_ARGS+=--with-rlm_krb5
 CONFIGURE_ARGS+=--with-rlm-krb5-lib-dir=${LOCALBASE}/lib
 CONFIGURE_ARGS+=--with-rlm-krb5-include-dir=${LOCALBASE}/include
 PLIST_SUB+=	KRB5=""
@@ -163,6 +159,7 @@ PLIST_SUB+=	KRB5="@comment "
 
 .ifdef(WITH_LDAP)
 USE_OPENLDAP=	YES
+CONFIGURE_ARGS+=--with-rlm_ldap
 PLIST_SUB+=	LDAP=""
 _REQUIRE+=	slapd
 .else
@@ -204,10 +201,21 @@ PLIST_SUB+=	FIREBIRD="@comment "
 WITH_EXPERIMENTAL=	yes
 .endif
 
-.ifdef(WITH_SNMP)
-LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
+# No SMB option yet; rlm_smb is still unbuildable
+.ifdef(WITH_SMB)
+LIB_DEPENDS=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+CONFIGURE_ARGS+=--with-rlm_smb
+CONFIGURE_ARGS+=--with-rlm-smb-lib-dir=${LOCALBASE}/lib
+CONFIGURE_ARGS+=--with-rlm-smb-include-dir=${LOCALBASE}/include
+PLIST_SUB+=	SMB=""
 .else
-CONFIGURE_ARGS+=--without-snmp
+CONFIGURE_ARGS+=--without-rlm_smb
+PLIST_SUB+=	SMB="@comment "
+.endif
+
+# SMB module is still experimental
+.if defined(WITH_SMB) && !defined(WITH_EXPERIMENTAL)
+WITH_EXPERIMENTAL=	yes
 .endif
 
 .ifdef(WITH_EXPERIMENTAL)
@@ -248,7 +256,7 @@ MAN5=		acct_users.5 clients.conf.5 dictionary.5 radiusd.conf.5 \
 		rlm_detail.5 rlm_digest.5 rlm_expr.5 rlm_files.5 rlm_mschap.5 \
 		rlm_pap.5 rlm_passwd.5 rlm_policy.5 rlm_realm.5 rlm_sql.5 \
 		rlm_sql_log.5 rlm_unix.5 unlang.5 users.5
-MAN8=		radiusd.8 radrelay.8 radsqlrelay.8 radwatch.8 \
+MAN8=		radiusd.8 radmin.8 radrelay.8 radsqlrelay.8 radwatch.8 \
 		rlm_ippool_tool.8
 
 SUB_LIST+=	REQUIRE="${_REQUIRE}"
@@ -266,6 +274,14 @@ post-patch:
 # Clean up after the last operation (so as not to get unwanted files in raddb)
 	@${FIND} -E ${WRKSRC}/raddb/certs -regex '.*/bootstrap\.(orig|bak)$$' \
 		-delete
+# If EXPERIMENTAL (and therefore DHCP) is enabled, enable the DHCP dictionary
+.ifdef(WITH_EXPERIMENTAL)
+	@${REINPLACE_CMD} -Ee 's:^#(.+ dictionary\.dhcp)$$:\1:g' \
+		${WRKSRC}/share/dictionary
+.endif
+# Patch scripts/Makefile not to install (unnecessary) rc.radiusd
+	@${REINPLACE_CMD} -Ee 's:^(.+rc\.radiusd.+)$$:#\1:g' \
+		${WRKSRC}/scripts/Makefile
 
 pre-configure:
 # Replace -pthread with ${PTHREAD_LIBS} in configure(.in) files
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index 1a2317a8e2d4..d86ef10080c7 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,3 +1,3 @@
-MD5 (freeradius-server-2.0.5.tar.bz2) = 3f7f3491d619542baa72746cbd6a7ed2
-SHA256 (freeradius-server-2.0.5.tar.bz2) = 9eab7d8bfa89196a28ed65a76f647edd5e666dd9edc6e29384381d72139ed6e2
-SIZE (freeradius-server-2.0.5.tar.bz2) = 2323968
+MD5 (freeradius-server-2.1.3.tar.bz2) = df7a23ec6303a89d014fcc43418ce5e5
+SHA256 (freeradius-server-2.1.3.tar.bz2) = 984cf7f3418de8f2abe1e599827264495cef1d234cce4abe05a06a4b6419db1a
+SIZE (freeradius-server-2.1.3.tar.bz2) = 2380451
diff --git a/net/freeradius2/files/patch-config-security b/net/freeradius2/files/patch-config-security
deleted file mode 100644
index 0a5774475283..000000000000
--- a/net/freeradius2/files/patch-config-security
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main/mainconfig.c	2008-06-05 10:48:22.000000000 +0100
-+++ src/main/mainconfig.c	2008-07-02 22:18:16.000000000 +0100
-@@ -229,6 +229,8 @@
- 	{ "log_auth_goodpass", PW_TYPE_BOOLEAN, 0, &mainconfig.log_auth_goodpass, NULL },
- 	{ "log_stripped_names", PW_TYPE_BOOLEAN, 0, &log_stripped_names, NULL },
- 
-+	{  "security", PW_TYPE_SUBSECTION, 0, NULL, (const void *) security_config },
-+
- 	{ NULL, -1, 0, NULL, NULL }
- };
- 
diff --git a/net/freeradius2/files/patch-pthread b/net/freeradius2/files/patch-pthread
index 66d9904cbf04..5cfc02d9ec9d 100644
--- a/net/freeradius2/files/patch-pthread
+++ b/net/freeradius2/files/patch-pthread
@@ -1,5 +1,5 @@
 --- configure.in	Mon Aug  6 00:38:46 2007
-+++ configure.in	Wed Aug 29 20:06:05 2007
++++ configure.in	Thu Sep 18 18:30:00 2008
 @@ -470,14 +470,25 @@
  dnl # On Some systems, we need extra pre-processor flags, to get them to
  dnl # to do the threading properly.
@@ -15,7 +15,7 @@
 +dnl # On FreeBSD, check the pthread_create function with -pthread in $CFLAGS
 +dnl # but WITHOUT -lpthread (see FreeBSD Porter's Handbook, section 12.12
 +dnl # at http://tinyurl.com/34cya8 )
-+  case "$host" in
++  case "$build" in
 +  *-freebsd*)
 +    CFLAGS="$CFLAGS -pthread"
 +    AC_CHECK_FUNC(pthread_create, , [ WITH_THREADS="no" ])
@@ -35,7 +35,7 @@
  
  dnl #
 --- src/modules/rlm_ldap/configure.in	Fri Jul 27 17:51:33 2007
-+++ src/modules/rlm_ldap/configure.in	Fri Jul 27 18:10:51 2007
++++ src/modules/rlm_ldap/configure.in	Thu Sep 18 18:30:00 2008
 @@ -77,14 +77,27 @@
  
  	dnl pthread stuff is usually in -lpthread
@@ -49,7 +49,7 @@
 -				      [ rlm_ldap_with_threads="no" ]
 -				      )
 -			 )
-+	    case "$host" in
++	    case "$build" in
 +	    *-freebsd*)
 +	        old_CFLAGS=$CFLAGS
 +	        CFLAGS="$CFLAGS -pthread"
@@ -72,7 +72,7 @@
  
  	dnl Try only "-lldap_r" or "-lldap"
 --- src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in	Fri Nov 25 20:31:54 2005
-+++ src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in	Fri Jul 27 19:11:33 2007
++++ src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in	Thu Sep 18 18:30:00 2008
 @@ -61,14 +61,27 @@
  
      dnl pthread stuff is usually in -lpthread
@@ -86,7 +86,7 @@
 -				  [ mysql_with_threads=no ]
 -				  )
 -		     )
-+	case "$host" in
++	case "$build" in
 +	*-freebsd*)
 +	    old_CFLAGS=$CFLAGS
 +	    CFLAGS="$CFLAGS -pthread"
@@ -109,7 +109,7 @@
  
      if test "x$mysql_with_threads" = "xyes"; then
 --- src/modules/rlm_python/configure.in	Mon May 14 23:27:21 2007
-+++ src/modules/rlm_python/configure.in	Tue Mar 18 13:52:32 2008
++++ src/modules/rlm_python/configure.in	Thu Sep 18 18:30:00 2008
 @@ -85,6 +85,34 @@
  		FR_SMART_CHECK_LIB(python${PY_VERSION}, Py_Initialize)
  		LIBS=$old_LIBS
@@ -120,7 +120,7 @@
 +		if test "x$smart_lib" = "x"; then
 +		    AC_MSG_NOTICE([Checking to see if libpython needs -pthread.])
 +		    libpython_with_threads="yes"
-+		    case "$host" in
++		    case "$build" in
 +		    *-freebsd*)
 +		        old_CFLAGS=$CFLAGS
 +		        CFLAGS="$CFLAGS -pthread"
diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist
index a0f9152c6638..5d528effa37d 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -1,5 +1,6 @@
 @stopdaemon radiusd
 bin/radclient
+bin/radconf2xml
 bin/radeapclient
 bin/radlast
 bin/radsniff
@@ -41,6 +42,7 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/modules/checkval
 %%EXAMPLESDIR%%/raddb/modules/counter
 %%EXAMPLESDIR%%/raddb/modules/detail
+%%EXAMPLESDIR%%/raddb/modules/detail.example.com
 %%EXAMPLESDIR%%/raddb/modules/detail.log
 %%EXAMPLESDIR%%/raddb/modules/digest
 %%EXAMPLESDIR%%/raddb/modules/echo
@@ -49,9 +51,11 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/modules/expiration
 %%EXAMPLESDIR%%/raddb/modules/expr
 %%EXAMPLESDIR%%/raddb/modules/files
+%%EXAMPLESDIR%%/raddb/modules/inner-eap
 %%EXAMPLESDIR%%/raddb/modules/ippool
 %%EXAMPLESDIR%%/raddb/modules/krb5
 %%EXAMPLESDIR%%/raddb/modules/ldap
+%%EXAMPLESDIR%%/raddb/modules/linelog
 %%EXAMPLESDIR%%/raddb/modules/logintime
 %%EXAMPLESDIR%%/raddb/modules/mac2ip
 %%EXAMPLESDIR%%/raddb/modules/mac2vlan
@@ -59,14 +63,17 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/modules/pam
 %%EXAMPLESDIR%%/raddb/modules/pap
 %%EXAMPLESDIR%%/raddb/modules/passwd
+%%EXAMPLESDIR%%/raddb/modules/perl
 %%EXAMPLESDIR%%/raddb/modules/policy
 %%EXAMPLESDIR%%/raddb/modules/preprocess
 %%EXAMPLESDIR%%/raddb/modules/radutmp
 %%EXAMPLESDIR%%/raddb/modules/realm
 %%EXAMPLESDIR%%/raddb/modules/smbpasswd
 %%EXAMPLESDIR%%/raddb/modules/sql_log
+%%EXAMPLESDIR%%/raddb/modules/sqlcounter_expire_on_login
 %%EXAMPLESDIR%%/raddb/modules/sradutmp
 %%EXAMPLESDIR%%/raddb/modules/unix
+%%EXAMPLESDIR%%/raddb/modules/wimax
 %%EXAMPLESDIR%%/raddb/otp.conf
 %%EXAMPLESDIR%%/raddb/policy.conf
 %%EXAMPLESDIR%%/raddb/policy.txt
@@ -75,18 +82,21 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/radiusd.conf
 %%EXAMPLESDIR%%/raddb/sites-available/README
 %%EXAMPLESDIR%%/raddb/sites-available/buffered-sql
+%%EXAMPLESDIR%%/raddb/sites-available/control-socket
 %%EXAMPLESDIR%%/raddb/sites-available/copy-acct-to-home-server
+%%EXAMPLESDIR%%/raddb/sites-available/decoupled-accounting
 %%EXAMPLESDIR%%/raddb/sites-available/default
 %%EXAMPLESDIR%%/raddb/sites-available/dhcp
+%%EXAMPLESDIR%%/raddb/sites-available/dynamic-clients
 %%EXAMPLESDIR%%/raddb/sites-available/example
 %%EXAMPLESDIR%%/raddb/sites-available/inner-tunnel
 %%EXAMPLESDIR%%/raddb/sites-available/proxy-inner-tunnel
 %%EXAMPLESDIR%%/raddb/sites-available/robust-proxy-accounting
+%%EXAMPLESDIR%%/raddb/sites-available/status
 %%EXAMPLESDIR%%/raddb/sites-available/virtual.example.com
 %%EXAMPLESDIR%%/raddb/sites-available/vmps
 %%EXAMPLESDIR%%/raddb/sites-enabled/default
 %%EXAMPLESDIR%%/raddb/sites-enabled/inner-tunnel
-%%EXAMPLESDIR%%/raddb/snmp.conf
 %%EXAMPLESDIR%%/raddb/sql.conf
 %%EXAMPLESDIR%%/raddb/sql/mssql/dialup.conf
 %%EXAMPLESDIR%%/raddb/sql/mssql/schema.sql
@@ -97,6 +107,8 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/sql/mysql/ippool.sql
 %%EXAMPLESDIR%%/raddb/sql/mysql/nas.sql
 %%EXAMPLESDIR%%/raddb/sql/mysql/schema.sql
+%%EXAMPLESDIR%%/raddb/sql/mysql/wimax.conf
+%%EXAMPLESDIR%%/raddb/sql/mysql/wimax.sql
 %%EXAMPLESDIR%%/raddb/sql/oracle/dialup.conf
 %%EXAMPLESDIR%%/raddb/sql/oracle/ippool.conf
 %%EXAMPLESDIR%%/raddb/sql/oracle/ippool.sql
@@ -204,6 +216,11 @@ bin/smbencrypt
 %%LIBDIR%%/rlm_digest.a
 %%LIBDIR%%/rlm_digest.la
 %%LIBDIR%%/rlm_digest.so
+%%LIBDIR%%/rlm_dynamic_clients-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_dynamic_clients-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_dynamic_clients.a
+%%LIBDIR%%/rlm_dynamic_clients.la
+%%LIBDIR%%/rlm_dynamic_clients.so
 %%LIBDIR%%/rlm_eap-%%PORTVERSION%%.la
 %%LIBDIR%%/rlm_eap-%%PORTVERSION%%.so
 %%LIBDIR%%/rlm_eap.a
@@ -299,11 +316,11 @@ bin/smbencrypt
 %%LDAP%%%%LIBDIR%%/rlm_ldap.a
 %%LDAP%%%%LIBDIR%%/rlm_ldap.la
 %%LDAP%%%%LIBDIR%%/rlm_ldap.so
-%%EXPM%%%%LIBDIR%%/rlm_linelog-%%PORTVERSION%%.la
-%%EXPM%%%%LIBDIR%%/rlm_linelog-%%PORTVERSION%%.so
-%%EXPM%%%%LIBDIR%%/rlm_linelog.a
-%%EXPM%%%%LIBDIR%%/rlm_linelog.la
-%%EXPM%%%%LIBDIR%%/rlm_linelog.so
+%%LIBDIR%%/rlm_linelog-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_linelog-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_linelog.a
+%%LIBDIR%%/rlm_linelog.la
+%%LIBDIR%%/rlm_linelog.so
 %%LIBDIR%%/rlm_logintime-%%PORTVERSION%%.la
 %%LIBDIR%%/rlm_logintime-%%PORTVERSION%%.so
 %%LIBDIR%%/rlm_logintime.a
@@ -374,21 +391,21 @@ bin/smbencrypt
 %%EXPM%%%%LIBDIR%%/rlm_sim_files.a
 %%EXPM%%%%LIBDIR%%/rlm_sim_files.la
 %%EXPM%%%%LIBDIR%%/rlm_sim_files.so
-%%EXPM%%%%LIBDIR%%/rlm_smb-%%PORTVERSION%%.la
-%%EXPM%%%%LIBDIR%%/rlm_smb-%%PORTVERSION%%.so
-%%EXPM%%%%LIBDIR%%/rlm_smb.a
-%%EXPM%%%%LIBDIR%%/rlm_smb.la
-%%EXPM%%%%LIBDIR%%/rlm_smb.so
+%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb-%%PORTVERSION%%.la
+%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb-%%PORTVERSION%%.so
+%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb.a
+%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb.la
+%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb.so
 %%LIBDIR%%/rlm_sql-%%PORTVERSION%%.la
 %%LIBDIR%%/rlm_sql-%%PORTVERSION%%.so
 %%LIBDIR%%/rlm_sql.a
 %%LIBDIR%%/rlm_sql.la
 %%LIBDIR%%/rlm_sql.so
-%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird-%%PORTVERSION%%.la
-%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird-%%PORTVERSION%%.so
-%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird.a
-%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird.la
-%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird.so
+%%EXPM%%%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird-%%PORTVERSION%%.la
+%%EXPM%%%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird-%%PORTVERSION%%.so
+%%EXPM%%%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird.a
+%%EXPM%%%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird.la
+%%EXPM%%%%FIREBIRD%%%%LIBDIR%%/rlm_sql_firebird.so
 %%LIBDIR%%/rlm_sql_log-%%PORTVERSION%%.la
 %%LIBDIR%%/rlm_sql_log-%%PORTVERSION%%.so
 %%LIBDIR%%/rlm_sql_log.a
@@ -424,11 +441,16 @@ bin/smbencrypt
 %%LIBDIR%%/rlm_unix.a
 %%LIBDIR%%/rlm_unix.la
 %%LIBDIR%%/rlm_unix.so
+%%EXPM%%%%LIBDIR%%/rlm_wimax-%%PORTVERSION%%.la
+%%EXPM%%%%LIBDIR%%/rlm_wimax-%%PORTVERSION%%.so
+%%EXPM%%%%LIBDIR%%/rlm_wimax.a
+%%EXPM%%%%LIBDIR%%/rlm_wimax.la
+%%EXPM%%%%LIBDIR%%/rlm_wimax.so
 @dirrm %%LIBDIR%%
 sbin/checkrad
 sbin/radiusd
+sbin/radmin
 sbin/radwatch
-sbin/rc.radiusd
 include/freeradius/hash.h
 include/freeradius/ident.h
 include/freeradius/libradius.h
@@ -487,6 +509,7 @@ include/freeradius/vqp.h
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1901.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1905.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2243.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2284.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2289.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2433.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2548.txt
@@ -513,12 +536,21 @@ include/freeradius/vqp.h
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3748.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4372.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4590.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4668.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4669.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4670.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4671.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4672.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4673.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4675.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4679.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4818.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4849.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5080.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5090.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5176.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5247.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5281.txt
 %%PORTDOCS%%%%DOCSDIR%%/rlm_dbm
 %%PORTDOCS%%%%DOCSDIR%%/rlm_eap
 %%PORTDOCS%%%%DOCSDIR%%/rlm_expiration
@@ -537,8 +569,8 @@ include/freeradius/vqp.h
 %%PORTDOCS%%%%DOCSDIR%%/supervise-radiusd.txt
 %%PORTDOCS%%%%DOCSDIR%%/tuning_guide
 %%PORTDOCS%%%%DOCSDIR%%/variables.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%DATADIR%%/dictionary
 %%DATADIR%%/dictionary.3com
@@ -550,6 +582,7 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.alteon
 %%DATADIR%%/dictionary.altiga
 %%DATADIR%%/dictionary.alvarion
+%%DATADIR%%/dictionary.apc
 %%DATADIR%%/dictionary.aptis
 %%DATADIR%%/dictionary.aruba
 %%DATADIR%%/dictionary.ascend
@@ -593,6 +626,7 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.jradius
 %%DATADIR%%/dictionary.juniper
 %%DATADIR%%/dictionary.karlnet
+%%DATADIR%%/dictionary.lancom
 %%DATADIR%%/dictionary.livingston
 %%DATADIR%%/dictionary.localweb
 %%DATADIR%%/dictionary.lucent
@@ -603,6 +637,7 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.motorola
 %%DATADIR%%/dictionary.navini
 %%DATADIR%%/dictionary.netscreen
+%%DATADIR%%/dictionary.networkphysics
 %%DATADIR%%/dictionary.nexans
 %%DATADIR%%/dictionary.nokia
 %%DATADIR%%/dictionary.nokia.conflict
@@ -632,6 +667,7 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.rfc4679
 %%DATADIR%%/dictionary.rfc4818
 %%DATADIR%%/dictionary.rfc4849
+%%DATADIR%%/dictionary.rfc5090
 %%DATADIR%%/dictionary.rfc5176
 %%DATADIR%%/dictionary.riverstone
 %%DATADIR%%/dictionary.roaringpenguin
@@ -649,11 +685,13 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.tropos
 %%DATADIR%%/dictionary.unix
 %%DATADIR%%/dictionary.usr
+%%DATADIR%%/dictionary.utstarcom
 %%DATADIR%%/dictionary.valemount
 %%DATADIR%%/dictionary.versanet
 %%DATADIR%%/dictionary.vqp
 %%DATADIR%%/dictionary.walabi
 %%DATADIR%%/dictionary.waverider
+%%DATADIR%%/dictionary.wimax
 %%DATADIR%%/dictionary.wispr
 %%DATADIR%%/dictionary.xedia
 %%DATADIR%%/dictionary.xylan