- Update to 2.0.5

- Change handling and structure of configuration files
- Add new options to startup script ("reload", "debug")
- Introduce pkg-message
- Other fixes and enhancements

PR:		ports/124439
Submitted by:	David Wood <david@wood2.org.uk> (maintainer)
Tested by:	mm

1 files changed, 344 insertions, 315 deletions

diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist
index 8f08490a057..a0f9152c663 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -11,16 +11,7 @@ bin/rlm_dbm_cat
 bin/rlm_dbm_parser
 bin/rlm_ippool_tool
 bin/smbencrypt
-@unexec for i in `find -P %D/%%EXAMPLESDIR%%/raddb/ \( -type f -or -type l \) -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ -f %D/%%EXAMPLESDIR%%/raddb/${i} ]; then if cmp -hsz %D/%%EXAMPLESDIR%%/raddb/${i} %D/etc/raddb/${i}; then rm -f %D/etc/raddb/${i}; fi; fi; done
-@unexec for i in `find -d %D/%%EXAMPLESDIR%%/raddb/ -type d -mindepth 1 -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ -d %D/etc/raddb/${i} ]; then rmdir %D/etc/raddb/${i} 2>/dev/null || true; fi; done
-@dirrmtry etc/raddb/certs
-@dirrmtry etc/raddb/sql/mssql
-@dirrmtry etc/raddb/sql/mysql
-@dirrmtry etc/raddb/sql/oracle
-@dirrmtry etc/raddb/sql/postgresql
-@dirrmtry etc/raddb/sql
-@dirrmtry etc/raddb/sites-available
-@dirrmtry etc/raddb
+@unexec different=0 ; for i in `find %D/%%EXAMPLESDIR%%/raddb/certs/ -type f -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/certs/::g'`; do if ! cmp -hsz %D/%%EXAMPLESDIR%%/raddb/certs/${i} %D/etc/raddb/certs/${i}; then different=1; break; fi; done; if [ ${different} -eq 0 ] && diff -rq --exclude=certs %D/%%EXAMPLESDIR%%/raddb %D/etc/raddb >/dev/null 2>&1; then rm -rf %D/etc/raddb; fi
 @unexec if [ -d %D/etc/raddb ]; then echo "You should remove %D/etc/raddb if you don't need it any more."; fi
 %%EXAMPLESDIR%%/raddb/acct_users
 %%EXAMPLESDIR%%/raddb/attrs
@@ -37,10 +28,45 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/clients.conf
 %%EXAMPLESDIR%%/raddb/dictionary
 %%EXAMPLESDIR%%/raddb/eap.conf
+%%EXAMPLESDIR%%/raddb/example.pl
 %%EXAMPLESDIR%%/raddb/experimental.conf
 %%EXAMPLESDIR%%/raddb/hints
 %%EXAMPLESDIR%%/raddb/huntgroups
 %%EXAMPLESDIR%%/raddb/ldap.attrmap
+%%EXAMPLESDIR%%/raddb/modules/acct_unique
+%%EXAMPLESDIR%%/raddb/modules/always
+%%EXAMPLESDIR%%/raddb/modules/attr_filter
+%%EXAMPLESDIR%%/raddb/modules/attr_rewrite
+%%EXAMPLESDIR%%/raddb/modules/chap
+%%EXAMPLESDIR%%/raddb/modules/checkval
+%%EXAMPLESDIR%%/raddb/modules/counter
+%%EXAMPLESDIR%%/raddb/modules/detail
+%%EXAMPLESDIR%%/raddb/modules/detail.log
+%%EXAMPLESDIR%%/raddb/modules/digest
+%%EXAMPLESDIR%%/raddb/modules/echo
+%%EXAMPLESDIR%%/raddb/modules/etc_group
+%%EXAMPLESDIR%%/raddb/modules/exec
+%%EXAMPLESDIR%%/raddb/modules/expiration
+%%EXAMPLESDIR%%/raddb/modules/expr
+%%EXAMPLESDIR%%/raddb/modules/files
+%%EXAMPLESDIR%%/raddb/modules/ippool
+%%EXAMPLESDIR%%/raddb/modules/krb5
+%%EXAMPLESDIR%%/raddb/modules/ldap
+%%EXAMPLESDIR%%/raddb/modules/logintime
+%%EXAMPLESDIR%%/raddb/modules/mac2ip
+%%EXAMPLESDIR%%/raddb/modules/mac2vlan
+%%EXAMPLESDIR%%/raddb/modules/mschap
+%%EXAMPLESDIR%%/raddb/modules/pam
+%%EXAMPLESDIR%%/raddb/modules/pap
+%%EXAMPLESDIR%%/raddb/modules/passwd
+%%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/sradutmp
+%%EXAMPLESDIR%%/raddb/modules/unix
 %%EXAMPLESDIR%%/raddb/otp.conf
 %%EXAMPLESDIR%%/raddb/policy.conf
 %%EXAMPLESDIR%%/raddb/policy.txt
@@ -51,9 +77,12 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/sites-available/buffered-sql
 %%EXAMPLESDIR%%/raddb/sites-available/copy-acct-to-home-server
 %%EXAMPLESDIR%%/raddb/sites-available/default
+%%EXAMPLESDIR%%/raddb/sites-available/dhcp
 %%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/virtual.example.com
 %%EXAMPLESDIR%%/raddb/sites-available/vmps
 %%EXAMPLESDIR%%/raddb/sites-enabled/default
 %%EXAMPLESDIR%%/raddb/sites-enabled/inner-tunnel
@@ -61,6 +90,7 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/sql.conf
 %%EXAMPLESDIR%%/raddb/sql/mssql/dialup.conf
 %%EXAMPLESDIR%%/raddb/sql/mssql/schema.sql
+%%EXAMPLESDIR%%/raddb/sql/mysql/admin.sql
 %%EXAMPLESDIR%%/raddb/sql/mysql/counter.conf
 %%EXAMPLESDIR%%/raddb/sql/mysql/dialup.conf
 %%EXAMPLESDIR%%/raddb/sql/mysql/ippool.conf
@@ -68,9 +98,12 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/sql/mysql/nas.sql
 %%EXAMPLESDIR%%/raddb/sql/mysql/schema.sql
 %%EXAMPLESDIR%%/raddb/sql/oracle/dialup.conf
+%%EXAMPLESDIR%%/raddb/sql/oracle/ippool.conf
 %%EXAMPLESDIR%%/raddb/sql/oracle/ippool.sql
+%%EXAMPLESDIR%%/raddb/sql/oracle/msqlippool.txt
 %%EXAMPLESDIR%%/raddb/sql/oracle/nas.sql
 %%EXAMPLESDIR%%/raddb/sql/oracle/schema.sql
+%%EXAMPLESDIR%%/raddb/sql/postgresql/admin.sql
 %%EXAMPLESDIR%%/raddb/sql/postgresql/cisco_h323_db_schema.sql
 %%EXAMPLESDIR%%/raddb/sql/postgresql/counter.conf
 %%EXAMPLESDIR%%/raddb/sql/postgresql/dialup.conf
@@ -83,321 +116,315 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/sqlippool.conf
 %%EXAMPLESDIR%%/raddb/templates.conf
 %%EXAMPLESDIR%%/raddb/users
-%%EXAMPLESDIR%%/raddb/example.pl
-@exec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type d -mindepth 1 -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ ! -d %D/etc/raddb/${i} ]; then mkdir -p %D/etc/raddb/${i}; fi; done
-@exec for i in `find -P %D/%%EXAMPLESDIR%%/raddb/ \( -type f -or -type l \) -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ ! -f %D/etc/raddb/${i} ]; then cp -RP %D/%%EXAMPLESDIR%%/raddb/${i} %D/etc/raddb/${i}; fi; done
+@exec if ! [ -d %D/etc/raddb -o -L %D/etc/raddb ]; then cp -RP %D/%%EXAMPLESDIR%%/raddb %D/etc/raddb; echo '===> Bootstrapping default certificates, please wait...'; %D/etc/raddb/certs/bootstrap >/dev/null 2>&1; fi
 @exec chmod -R g-w,o-rwx %D/etc/raddb
 @dirrm %%EXAMPLESDIR%%/raddb/sites-enabled
 @dirrm %%EXAMPLESDIR%%/raddb/certs
+@dirrm %%EXAMPLESDIR%%/raddb/modules
+@dirrm %%EXAMPLESDIR%%/raddb/sites-available
 @dirrm %%EXAMPLESDIR%%/raddb/sql/mssql
 @dirrm %%EXAMPLESDIR%%/raddb/sql/mysql
 @dirrm %%EXAMPLESDIR%%/raddb/sql/oracle
 @dirrm %%EXAMPLESDIR%%/raddb/sql/postgresql
 @dirrm %%EXAMPLESDIR%%/raddb/sql
-@dirrm %%EXAMPLESDIR%%/raddb/sites-available
 @dirrm %%EXAMPLESDIR%%/raddb
 @dirrm %%EXAMPLESDIR%%
-lib/libfreeradius-eap-%%PORTVERSION%%.la
-lib/libfreeradius-eap-%%PORTVERSION%%.so
-lib/libfreeradius-eap.a
-lib/libfreeradius-eap.la
-lib/libfreeradius-eap.so
-lib/libfreeradius-radius-%%PORTVERSION%%.la
-lib/libfreeradius-radius-%%PORTVERSION%%.so
-lib/libfreeradius-radius.a
-lib/libfreeradius-radius.la
-lib/libfreeradius-radius.so
-lib/rlm_acct_unique-%%PORTVERSION%%.la
-lib/rlm_acct_unique-%%PORTVERSION%%.so
-lib/rlm_acct_unique.a
-lib/rlm_acct_unique.la
-lib/rlm_acct_unique.so
-lib/rlm_acctlog-%%PORTVERSION%%.la
-lib/rlm_acctlog-%%PORTVERSION%%.so
-lib/rlm_acctlog.a
-lib/rlm_acctlog.la
-lib/rlm_acctlog.so
-lib/rlm_always-%%PORTVERSION%%.la
-lib/rlm_always-%%PORTVERSION%%.so
-lib/rlm_always.a
-lib/rlm_always.la
-lib/rlm_always.so
-lib/rlm_attr_filter-%%PORTVERSION%%.la
-lib/rlm_attr_filter-%%PORTVERSION%%.so
-lib/rlm_attr_filter.a
-lib/rlm_attr_filter.la
-lib/rlm_attr_filter.so
-lib/rlm_attr_rewrite-%%PORTVERSION%%.la
-lib/rlm_attr_rewrite-%%PORTVERSION%%.so
-lib/rlm_attr_rewrite.a
-lib/rlm_attr_rewrite.la
-lib/rlm_attr_rewrite.so
-lib/rlm_chap-%%PORTVERSION%%.la
-lib/rlm_chap-%%PORTVERSION%%.so
-lib/rlm_chap.a
-lib/rlm_chap.la
-lib/rlm_chap.so
-lib/rlm_checkval-%%PORTVERSION%%.la
-lib/rlm_checkval-%%PORTVERSION%%.so
-lib/rlm_checkval.a
-lib/rlm_checkval.la
-lib/rlm_checkval.so
-lib/rlm_copy_packet-%%PORTVERSION%%.la
-lib/rlm_copy_packet-%%PORTVERSION%%.so
-lib/rlm_copy_packet.a
-lib/rlm_copy_packet.la
-lib/rlm_copy_packet.so
-lib/rlm_counter-%%PORTVERSION%%.la
-lib/rlm_counter-%%PORTVERSION%%.so
-lib/rlm_counter.a
-lib/rlm_counter.la
-lib/rlm_counter.so
-%%EXPM%%lib/rlm_cram-%%PORTVERSION%%.la
-%%EXPM%%lib/rlm_cram-%%PORTVERSION%%.so
-%%EXPM%%lib/rlm_cram.a
-%%EXPM%%lib/rlm_cram.la
-%%EXPM%%lib/rlm_cram.so
-lib/rlm_dbm-%%PORTVERSION%%.la
-lib/rlm_dbm-%%PORTVERSION%%.so
-lib/rlm_dbm.a
-lib/rlm_dbm.la
-lib/rlm_dbm.so
-lib/rlm_detail-%%PORTVERSION%%.la
-lib/rlm_detail-%%PORTVERSION%%.so
-lib/rlm_detail.a
-lib/rlm_detail.la
-lib/rlm_detail.so
-lib/rlm_digest-%%PORTVERSION%%.la
-lib/rlm_digest-%%PORTVERSION%%.so
-lib/rlm_digest.a
-lib/rlm_digest.la
-lib/rlm_digest.so
-lib/rlm_eap-%%PORTVERSION%%.la
-lib/rlm_eap-%%PORTVERSION%%.so
-lib/rlm_eap.a
-lib/rlm_eap.la
-lib/rlm_eap.so
-lib/rlm_eap_gtc-%%PORTVERSION%%.la
-lib/rlm_eap_gtc-%%PORTVERSION%%.so
-lib/rlm_eap_gtc.a
-lib/rlm_eap_gtc.la
-lib/rlm_eap_gtc.so
-lib/rlm_eap_leap-%%PORTVERSION%%.la
-lib/rlm_eap_leap-%%PORTVERSION%%.so
-lib/rlm_eap_leap.a
-lib/rlm_eap_leap.la
-lib/rlm_eap_leap.so
-lib/rlm_eap_md5-%%PORTVERSION%%.la
-lib/rlm_eap_md5-%%PORTVERSION%%.so
-lib/rlm_eap_md5.a
-lib/rlm_eap_md5.la
-lib/rlm_eap_md5.so
-lib/rlm_eap_mschapv2-%%PORTVERSION%%.la
-lib/rlm_eap_mschapv2-%%PORTVERSION%%.so
-lib/rlm_eap_mschapv2.a
-lib/rlm_eap_mschapv2.la
-lib/rlm_eap_mschapv2.so
-lib/rlm_eap_peap-%%PORTVERSION%%.la
-lib/rlm_eap_peap-%%PORTVERSION%%.so
-lib/rlm_eap_peap.a
-lib/rlm_eap_peap.la
-lib/rlm_eap_peap.so
-lib/rlm_eap_sim-%%PORTVERSION%%.la
-lib/rlm_eap_sim-%%PORTVERSION%%.so
-lib/rlm_eap_sim.a
-lib/rlm_eap_sim.la
-lib/rlm_eap_sim.so
-lib/rlm_eap_tls-%%PORTVERSION%%.la
-lib/rlm_eap_tls-%%PORTVERSION%%.so
-lib/rlm_eap_tls.a
-lib/rlm_eap_tls.la
-lib/rlm_eap_tls.so
-lib/rlm_eap_tnc-%%PORTVERSION%%.la
-lib/rlm_eap_tnc-%%PORTVERSION%%.so
-lib/rlm_eap_tnc.a
-lib/rlm_eap_tnc.la
-lib/rlm_eap_tnc.so
-lib/rlm_eap_ttls-%%PORTVERSION%%.la
-lib/rlm_eap_ttls-%%PORTVERSION%%.so
-lib/rlm_eap_ttls.a
-lib/rlm_eap_ttls.la
-lib/rlm_eap_ttls.so
-%%EXPM%%lib/rlm_example-%%PORTVERSION%%.la
-%%EXPM%%lib/rlm_example-%%PORTVERSION%%.so
-%%EXPM%%lib/rlm_example.a
-%%EXPM%%lib/rlm_example.la
-%%EXPM%%lib/rlm_example.so
-lib/rlm_exec-%%PORTVERSION%%.la
-lib/rlm_exec-%%PORTVERSION%%.so
-lib/rlm_exec.a
-lib/rlm_exec.la
-lib/rlm_exec.so
-lib/rlm_expiration-%%PORTVERSION%%.la
-lib/rlm_expiration-%%PORTVERSION%%.so
-lib/rlm_expiration.a
-lib/rlm_expiration.la
-lib/rlm_expiration.so
-lib/rlm_expr-%%PORTVERSION%%.la
-lib/rlm_expr-%%PORTVERSION%%.so
-lib/rlm_expr.a
-lib/rlm_expr.la
-lib/rlm_expr.so
-lib/rlm_fastusers-%%PORTVERSION%%.la
-lib/rlm_fastusers-%%PORTVERSION%%.so
-lib/rlm_fastusers.a
-lib/rlm_fastusers.la
-lib/rlm_fastusers.so
-lib/rlm_files-%%PORTVERSION%%.la
-lib/rlm_files-%%PORTVERSION%%.so
-lib/rlm_files.a
-lib/rlm_files.la
-lib/rlm_files.so
-lib/rlm_ippool-%%PORTVERSION%%.la
-lib/rlm_ippool-%%PORTVERSION%%.so
-lib/rlm_ippool.a
-lib/rlm_ippool.la
-lib/rlm_ippool.so
-%%EXPM%%lib/rlm_jradius-%%PORTVERSION%%.la
-%%EXPM%%lib/rlm_jradius-%%PORTVERSION%%.so
-%%EXPM%%lib/rlm_jradius.a
-%%EXPM%%lib/rlm_jradius.la
-%%EXPM%%lib/rlm_jradius.so
-%%KRB5%%lib/rlm_krb5-%%PORTVERSION%%.la
-%%KRB5%%lib/rlm_krb5-%%PORTVERSION%%.so
-%%KRB5%%lib/rlm_krb5.a
-%%KRB5%%lib/rlm_krb5.la
-%%KRB5%%lib/rlm_krb5.so
-%%LDAP%%lib/rlm_ldap-%%PORTVERSION%%.la
-%%LDAP%%lib/rlm_ldap-%%PORTVERSION%%.so
-%%LDAP%%lib/rlm_ldap.a
-%%LDAP%%lib/rlm_ldap.la
-%%LDAP%%lib/rlm_ldap.so
-%%EXPM%%lib/rlm_linelog-%%PORTVERSION%%.la
-%%EXPM%%lib/rlm_linelog-%%PORTVERSION%%.so
-%%EXPM%%lib/rlm_linelog.a
-%%EXPM%%lib/rlm_linelog.la
-%%EXPM%%lib/rlm_linelog.so
-lib/rlm_logintime-%%PORTVERSION%%.la
-lib/rlm_logintime-%%PORTVERSION%%.so
-lib/rlm_logintime.a
-lib/rlm_logintime.la
-lib/rlm_logintime.so
-lib/rlm_mschap-%%PORTVERSION%%.la
-lib/rlm_mschap-%%PORTVERSION%%.so
-lib/rlm_mschap.a
-lib/rlm_mschap.la
-lib/rlm_mschap.so
-lib/rlm_otp-%%PORTVERSION%%.la
-lib/rlm_otp-%%PORTVERSION%%.so
-lib/rlm_otp.a
-lib/rlm_otp.la
-lib/rlm_otp.so
-lib/rlm_pam-%%PORTVERSION%%.la
-lib/rlm_pam-%%PORTVERSION%%.so
-lib/rlm_pam.a
-lib/rlm_pam.la
-lib/rlm_pam.so
-lib/rlm_pap-%%PORTVERSION%%.la
-lib/rlm_pap-%%PORTVERSION%%.so
-lib/rlm_pap.a
-lib/rlm_pap.la
-lib/rlm_pap.so
-lib/rlm_passwd-%%PORTVERSION%%.la
-lib/rlm_passwd-%%PORTVERSION%%.so
-lib/rlm_passwd.a
-lib/rlm_passwd.la
-lib/rlm_passwd.so
-%%RLMPERL%%lib/rlm_perl-%%PORTVERSION%%.la
-%%RLMPERL%%lib/rlm_perl-%%PORTVERSION%%.so
-%%RLMPERL%%lib/rlm_perl.a
-%%RLMPERL%%lib/rlm_perl.la
-%%RLMPERL%%lib/rlm_perl.so
-lib/rlm_policy-%%PORTVERSION%%.la
-lib/rlm_policy-%%PORTVERSION%%.so
-lib/rlm_policy.a
-lib/rlm_policy.la
-lib/rlm_policy.so
-lib/rlm_preprocess-%%PORTVERSION%%.la
-lib/rlm_preprocess-%%PORTVERSION%%.so
-lib/rlm_preprocess.a
-lib/rlm_preprocess.la
-lib/rlm_preprocess.so
-%%EXPM%%lib/rlm_protocol_filter-%%PORTVERSION%%.la
-%%EXPM%%lib/rlm_protocol_filter-%%PORTVERSION%%.so
-%%EXPM%%lib/rlm_protocol_filter.a
-%%EXPM%%lib/rlm_protocol_filter.la
-%%EXPM%%lib/rlm_protocol_filter.so
-lib/rlm_python-%%PORTVERSION%%.la
-lib/rlm_python-%%PORTVERSION%%.so
-lib/rlm_python.a
-lib/rlm_python.la
-lib/rlm_python.so
-lib/rlm_radutmp-%%PORTVERSION%%.la
-lib/rlm_radutmp-%%PORTVERSION%%.so
-lib/rlm_radutmp.a
-lib/rlm_radutmp.la
-lib/rlm_radutmp.so
-lib/rlm_realm-%%PORTVERSION%%.la
-lib/rlm_realm-%%PORTVERSION%%.so
-lib/rlm_realm.a
-lib/rlm_realm.la
-lib/rlm_realm.so
-%%EXPM%%lib/rlm_sim_files-%%PORTVERSION%%.la
-%%EXPM%%lib/rlm_sim_files-%%PORTVERSION%%.so
-%%EXPM%%lib/rlm_sim_files.a
-%%EXPM%%lib/rlm_sim_files.la
-%%EXPM%%lib/rlm_sim_files.so
-%%EXPM%%lib/rlm_smb-%%PORTVERSION%%.la
-%%EXPM%%lib/rlm_smb-%%PORTVERSION%%.so
-%%EXPM%%lib/rlm_smb.a
-%%EXPM%%lib/rlm_smb.la
-%%EXPM%%lib/rlm_smb.so
-lib/rlm_sql-%%PORTVERSION%%.la
-lib/rlm_sql-%%PORTVERSION%%.so
-lib/rlm_sql.a
-lib/rlm_sql.la
-lib/rlm_sql.so
-%%FIREBIRD%%lib/rlm_sql_firebird-%%PORTVERSION%%.la
-%%FIREBIRD%%lib/rlm_sql_firebird-%%PORTVERSION%%.so
-%%FIREBIRD%%lib/rlm_sql_firebird.a
-%%FIREBIRD%%lib/rlm_sql_firebird.la
-%%FIREBIRD%%lib/rlm_sql_firebird.so
-lib/rlm_sql_log-%%PORTVERSION%%.la
-lib/rlm_sql_log-%%PORTVERSION%%.so
-lib/rlm_sql_log.a
-lib/rlm_sql_log.la
-lib/rlm_sql_log.so
-%%MYSQL%%lib/rlm_sql_mysql-%%PORTVERSION%%.la
-%%MYSQL%%lib/rlm_sql_mysql-%%PORTVERSION%%.so
-%%MYSQL%%lib/rlm_sql_mysql.a
-%%MYSQL%%lib/rlm_sql_mysql.la
-%%MYSQL%%lib/rlm_sql_mysql.so
-%%PGSQL%%lib/rlm_sql_postgresql-%%PORTVERSION%%.la
-%%PGSQL%%lib/rlm_sql_postgresql-%%PORTVERSION%%.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
-%%EXPM%%lib/rlm_sqlhpwippool-%%PORTVERSION%%.la
-%%EXPM%%lib/rlm_sqlhpwippool-%%PORTVERSION%%.so
-%%EXPM%%lib/rlm_sqlhpwippool.a
-%%EXPM%%lib/rlm_sqlhpwippool.la
-%%EXPM%%lib/rlm_sqlhpwippool.so
-lib/rlm_sqlippool-%%PORTVERSION%%.la
-lib/rlm_sqlippool-%%PORTVERSION%%.so
-lib/rlm_sqlippool.a
-lib/rlm_sqlippool.la
-lib/rlm_sqlippool.so
-lib/rlm_unix-%%PORTVERSION%%.la
-lib/rlm_unix-%%PORTVERSION%%.so
-lib/rlm_unix.a
-lib/rlm_unix.la
-lib/rlm_unix.so
-sbin/check-radiusd-config
+%%LIBDIR%%/libfreeradius-eap-%%PORTVERSION%%.la
+%%LIBDIR%%/libfreeradius-eap-%%PORTVERSION%%.so
+%%LIBDIR%%/libfreeradius-eap.a
+%%LIBDIR%%/libfreeradius-eap.la
+%%LIBDIR%%/libfreeradius-eap.so
+%%LIBDIR%%/libfreeradius-radius-%%PORTVERSION%%.la
+%%LIBDIR%%/libfreeradius-radius-%%PORTVERSION%%.so
+%%LIBDIR%%/libfreeradius-radius.a
+%%LIBDIR%%/libfreeradius-radius.la
+%%LIBDIR%%/libfreeradius-radius.so
+%%LIBDIR%%/rlm_acct_unique-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_acct_unique-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_acct_unique.a
+%%LIBDIR%%/rlm_acct_unique.la
+%%LIBDIR%%/rlm_acct_unique.so
+%%LIBDIR%%/rlm_acctlog-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_acctlog-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_acctlog.a
+%%LIBDIR%%/rlm_acctlog.la
+%%LIBDIR%%/rlm_acctlog.so
+%%LIBDIR%%/rlm_always-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_always-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_always.a
+%%LIBDIR%%/rlm_always.la
+%%LIBDIR%%/rlm_always.so
+%%LIBDIR%%/rlm_attr_filter-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_attr_filter-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_attr_filter.a
+%%LIBDIR%%/rlm_attr_filter.la
+%%LIBDIR%%/rlm_attr_filter.so
+%%LIBDIR%%/rlm_attr_rewrite-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_attr_rewrite-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_attr_rewrite.a
+%%LIBDIR%%/rlm_attr_rewrite.la
+%%LIBDIR%%/rlm_attr_rewrite.so
+%%LIBDIR%%/rlm_chap-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_chap-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_chap.a
+%%LIBDIR%%/rlm_chap.la
+%%LIBDIR%%/rlm_chap.so
+%%LIBDIR%%/rlm_checkval-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_checkval-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_checkval.a
+%%LIBDIR%%/rlm_checkval.la
+%%LIBDIR%%/rlm_checkval.so
+%%LIBDIR%%/rlm_copy_packet-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_copy_packet-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_copy_packet.a
+%%LIBDIR%%/rlm_copy_packet.la
+%%LIBDIR%%/rlm_copy_packet.so
+%%LIBDIR%%/rlm_counter-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_counter-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_counter.a
+%%LIBDIR%%/rlm_counter.la
+%%LIBDIR%%/rlm_counter.so
+%%EXPM%%%%LIBDIR%%/rlm_cram-%%PORTVERSION%%.la
+%%EXPM%%%%LIBDIR%%/rlm_cram-%%PORTVERSION%%.so
+%%EXPM%%%%LIBDIR%%/rlm_cram.a
+%%EXPM%%%%LIBDIR%%/rlm_cram.la
+%%EXPM%%%%LIBDIR%%/rlm_cram.so
+%%LIBDIR%%/rlm_dbm-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_dbm-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_dbm.a
+%%LIBDIR%%/rlm_dbm.la
+%%LIBDIR%%/rlm_dbm.so
+%%LIBDIR%%/rlm_detail-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_detail-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_detail.a
+%%LIBDIR%%/rlm_detail.la
+%%LIBDIR%%/rlm_detail.so
+%%LIBDIR%%/rlm_digest-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_digest-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_digest.a
+%%LIBDIR%%/rlm_digest.la
+%%LIBDIR%%/rlm_digest.so
+%%LIBDIR%%/rlm_eap-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_eap-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_eap.a
+%%LIBDIR%%/rlm_eap.la
+%%LIBDIR%%/rlm_eap.so
+%%LIBDIR%%/rlm_eap_gtc-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_eap_gtc-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_eap_gtc.a
+%%LIBDIR%%/rlm_eap_gtc.la
+%%LIBDIR%%/rlm_eap_gtc.so
+%%LIBDIR%%/rlm_eap_leap-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_eap_leap-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_eap_leap.a
+%%LIBDIR%%/rlm_eap_leap.la
+%%LIBDIR%%/rlm_eap_leap.so
+%%LIBDIR%%/rlm_eap_md5-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_eap_md5-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_eap_md5.a
+%%LIBDIR%%/rlm_eap_md5.la
+%%LIBDIR%%/rlm_eap_md5.so
+%%LIBDIR%%/rlm_eap_mschapv2-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_eap_mschapv2-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_eap_mschapv2.a
+%%LIBDIR%%/rlm_eap_mschapv2.la
+%%LIBDIR%%/rlm_eap_mschapv2.so
+%%LIBDIR%%/rlm_eap_peap-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_eap_peap-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_eap_peap.a
+%%LIBDIR%%/rlm_eap_peap.la
+%%LIBDIR%%/rlm_eap_peap.so
+%%LIBDIR%%/rlm_eap_sim-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_eap_sim-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_eap_sim.a
+%%LIBDIR%%/rlm_eap_sim.la
+%%LIBDIR%%/rlm_eap_sim.so
+%%LIBDIR%%/rlm_eap_tls-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_eap_tls-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_eap_tls.a
+%%LIBDIR%%/rlm_eap_tls.la
+%%LIBDIR%%/rlm_eap_tls.so
+%%LIBDIR%%/rlm_eap_ttls-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_eap_ttls-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_eap_ttls.a
+%%LIBDIR%%/rlm_eap_ttls.la
+%%LIBDIR%%/rlm_eap_ttls.so
+%%EXPM%%%%LIBDIR%%/rlm_example-%%PORTVERSION%%.la
+%%EXPM%%%%LIBDIR%%/rlm_example-%%PORTVERSION%%.so
+%%EXPM%%%%LIBDIR%%/rlm_example.a
+%%EXPM%%%%LIBDIR%%/rlm_example.la
+%%EXPM%%%%LIBDIR%%/rlm_example.so
+%%LIBDIR%%/rlm_exec-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_exec-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_exec.a
+%%LIBDIR%%/rlm_exec.la
+%%LIBDIR%%/rlm_exec.so
+%%LIBDIR%%/rlm_expiration-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_expiration-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_expiration.a
+%%LIBDIR%%/rlm_expiration.la
+%%LIBDIR%%/rlm_expiration.so
+%%LIBDIR%%/rlm_expr-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_expr-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_expr.a
+%%LIBDIR%%/rlm_expr.la
+%%LIBDIR%%/rlm_expr.so
+%%LIBDIR%%/rlm_fastusers-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_fastusers-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_fastusers.a
+%%LIBDIR%%/rlm_fastusers.la
+%%LIBDIR%%/rlm_fastusers.so
+%%LIBDIR%%/rlm_files-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_files-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_files.a
+%%LIBDIR%%/rlm_files.la
+%%LIBDIR%%/rlm_files.so
+%%LIBDIR%%/rlm_ippool-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_ippool-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_ippool.a
+%%LIBDIR%%/rlm_ippool.la
+%%LIBDIR%%/rlm_ippool.so
+%%EXPM%%%%LIBDIR%%/rlm_jradius-%%PORTVERSION%%.la
+%%EXPM%%%%LIBDIR%%/rlm_jradius-%%PORTVERSION%%.so
+%%EXPM%%%%LIBDIR%%/rlm_jradius.a
+%%EXPM%%%%LIBDIR%%/rlm_jradius.la
+%%EXPM%%%%LIBDIR%%/rlm_jradius.so
+%%KRB5%%%%LIBDIR%%/rlm_krb5-%%PORTVERSION%%.la
+%%KRB5%%%%LIBDIR%%/rlm_krb5-%%PORTVERSION%%.so
+%%KRB5%%%%LIBDIR%%/rlm_krb5.a
+%%KRB5%%%%LIBDIR%%/rlm_krb5.la
+%%KRB5%%%%LIBDIR%%/rlm_krb5.so
+%%LDAP%%%%LIBDIR%%/rlm_ldap-%%PORTVERSION%%.la
+%%LDAP%%%%LIBDIR%%/rlm_ldap-%%PORTVERSION%%.so
+%%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_logintime-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_logintime-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_logintime.a
+%%LIBDIR%%/rlm_logintime.la
+%%LIBDIR%%/rlm_logintime.so
+%%LIBDIR%%/rlm_mschap-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_mschap-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_mschap.a
+%%LIBDIR%%/rlm_mschap.la
+%%LIBDIR%%/rlm_mschap.so
+%%LIBDIR%%/rlm_otp-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_otp-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_otp.a
+%%LIBDIR%%/rlm_otp.la
+%%LIBDIR%%/rlm_otp.so
+%%LIBDIR%%/rlm_pam-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_pam-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_pam.a
+%%LIBDIR%%/rlm_pam.la
+%%LIBDIR%%/rlm_pam.so
+%%LIBDIR%%/rlm_pap-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_pap-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_pap.a
+%%LIBDIR%%/rlm_pap.la
+%%LIBDIR%%/rlm_pap.so
+%%LIBDIR%%/rlm_passwd-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_passwd-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_passwd.a
+%%LIBDIR%%/rlm_passwd.la
+%%LIBDIR%%/rlm_passwd.so
+%%RLMPERL%%%%LIBDIR%%/rlm_perl-%%PORTVERSION%%.la
+%%RLMPERL%%%%LIBDIR%%/rlm_perl-%%PORTVERSION%%.so
+%%RLMPERL%%%%LIBDIR%%/rlm_perl.a
+%%RLMPERL%%%%LIBDIR%%/rlm_perl.la
+%%RLMPERL%%%%LIBDIR%%/rlm_perl.so
+%%LIBDIR%%/rlm_policy-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_policy-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_policy.a
+%%LIBDIR%%/rlm_policy.la
+%%LIBDIR%%/rlm_policy.so
+%%LIBDIR%%/rlm_preprocess-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_preprocess-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_preprocess.a
+%%LIBDIR%%/rlm_preprocess.la
+%%LIBDIR%%/rlm_preprocess.so
+%%EXPM%%%%LIBDIR%%/rlm_protocol_filter-%%PORTVERSION%%.la
+%%EXPM%%%%LIBDIR%%/rlm_protocol_filter-%%PORTVERSION%%.so
+%%EXPM%%%%LIBDIR%%/rlm_protocol_filter.a
+%%EXPM%%%%LIBDIR%%/rlm_protocol_filter.la
+%%EXPM%%%%LIBDIR%%/rlm_protocol_filter.so
+%%LIBDIR%%/rlm_python-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_python-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_python.a
+%%LIBDIR%%/rlm_python.la
+%%LIBDIR%%/rlm_python.so
+%%LIBDIR%%/rlm_radutmp-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_radutmp-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_radutmp.a
+%%LIBDIR%%/rlm_radutmp.la
+%%LIBDIR%%/rlm_radutmp.so
+%%LIBDIR%%/rlm_realm-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_realm-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_realm.a
+%%LIBDIR%%/rlm_realm.la
+%%LIBDIR%%/rlm_realm.so
+%%EXPM%%%%LIBDIR%%/rlm_sim_files-%%PORTVERSION%%.la
+%%EXPM%%%%LIBDIR%%/rlm_sim_files-%%PORTVERSION%%.so
+%%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
+%%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
+%%LIBDIR%%/rlm_sql_log-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_sql_log-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_sql_log.a
+%%LIBDIR%%/rlm_sql_log.la
+%%LIBDIR%%/rlm_sql_log.so
+%%MYSQL%%%%LIBDIR%%/rlm_sql_mysql-%%PORTVERSION%%.la
+%%MYSQL%%%%LIBDIR%%/rlm_sql_mysql-%%PORTVERSION%%.so
+%%MYSQL%%%%LIBDIR%%/rlm_sql_mysql.a
+%%MYSQL%%%%LIBDIR%%/rlm_sql_mysql.la
+%%MYSQL%%%%LIBDIR%%/rlm_sql_mysql.so
+%%PGSQL%%%%LIBDIR%%/rlm_sql_postgresql-%%PORTVERSION%%.la
+%%PGSQL%%%%LIBDIR%%/rlm_sql_postgresql-%%PORTVERSION%%.so
+%%PGSQL%%%%LIBDIR%%/rlm_sql_postgresql.a
+%%PGSQL%%%%LIBDIR%%/rlm_sql_postgresql.la
+%%PGSQL%%%%LIBDIR%%/rlm_sql_postgresql.so
+%%LIBDIR%%/rlm_sqlcounter-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_sqlcounter-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_sqlcounter.a
+%%LIBDIR%%/rlm_sqlcounter.la
+%%LIBDIR%%/rlm_sqlcounter.so
+%%EXPM%%%%LIBDIR%%/rlm_sqlhpwippool-%%PORTVERSION%%.la
+%%EXPM%%%%LIBDIR%%/rlm_sqlhpwippool-%%PORTVERSION%%.so
+%%EXPM%%%%LIBDIR%%/rlm_sqlhpwippool.a
+%%EXPM%%%%LIBDIR%%/rlm_sqlhpwippool.la
+%%EXPM%%%%LIBDIR%%/rlm_sqlhpwippool.so
+%%LIBDIR%%/rlm_sqlippool-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_sqlippool-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_sqlippool.a
+%%LIBDIR%%/rlm_sqlippool.la
+%%LIBDIR%%/rlm_sqlippool.so
+%%LIBDIR%%/rlm_unix-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_unix-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_unix.a
+%%LIBDIR%%/rlm_unix.la
+%%LIBDIR%%/rlm_unix.so
+@dirrm %%LIBDIR%%
 sbin/checkrad
 sbin/radiusd
 sbin/radwatch
@@ -539,10 +566,12 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.cisco.bbsm
 %%DATADIR%%/dictionary.cisco.vpn3000
 %%DATADIR%%/dictionary.cisco.vpn5000
+%%DATADIR%%/dictionary.clavister
 %%DATADIR%%/dictionary.colubris
 %%DATADIR%%/dictionary.columbia_university
 %%DATADIR%%/dictionary.compat
 %%DATADIR%%/dictionary.cosine
+%%DATADIR%%/dictionary.dhcp
 %%DATADIR%%/dictionary.digium
 %%DATADIR%%/dictionary.epygi
 %%DATADIR%%/dictionary.ericsson