Bug 188090 - [patch] net/freeradius2 add stage support
Summary: [patch] net/freeradius2 add stage support
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Ryan Steinmetz
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-03-30 19:30 UTC by Olli Hauer
Modified: 2014-04-09 04:30 UTC (History)
1 user (show)

See Also:


Attachments
freeradius2.diff (28.87 KB, patch)
2014-03-30 19:30 UTC, Olli Hauer
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Olli Hauer freebsd_committer 2014-03-30 19:30:00 UTC
- add stage support
- cleanup pkg-plist
- cert bootstrapping works fine with the system make
  (tested on FreeBSD 8.4/9.2/10)

Redports build log with stage support
https://redports.org/buildarchive/20140330173500-23099

[QAT] build log wo. stage support 
https://qat.redports.org/buildarchive/r349540/

I haven't found the reason for the linker error and also got the same error
on my system without stage support until I've rebuilt all ports from
scratch.  A simple re-install all dependencies build in poudrie / tinderbox
was not enough ...

I've done some tests with the old 2.2.3 and 3.0.1 release and the current
3.1.x version from githup and haven't got the linker error but was not able
to find the culprit.
Comment 1 Edwin Groothuis freebsd_committer 2014-03-30 19:30:05 UTC
Responsible Changed
From-To: freebsd-ports-bugs->zi

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Olli Hauer 2014-03-30 19:40:20 UTC
Hi Ryan,

patches can be fetched also from here:

http://people.freebsd.org/~ohauer/diffs/stage/stage_freeradius2.diff
http://people.freebsd.org/~ohauer/diffs/stage/stage_freeradius3.diff

-- 
Regards,
olli
Comment 3 dfilter service freebsd_committer 2014-04-09 04:23:01 UTC
Author: bdrewery
Date: Wed Apr  9 03:22:57 2014
New Revision: 350666
URL: http://svnweb.freebsd.org/changeset/ports/350666
QAT: https://qat.redports.org/buildarchive/r350666/

Log:
  - Support stage
  - Switch CONFLICTS to CONFLICTS_INSTALL
  - Use USES=tar
  
  PR:		ports/188090
  Submitted by:	ohauer
  Approved by:	zi (maintainer)

Modified:
  head/net/freeradius2/Makefile
  head/net/freeradius2/pkg-plist

Modified: head/net/freeradius2/Makefile
==============================================================================
--- head/net/freeradius2/Makefile	Wed Apr  9 02:38:39 2014	(r350665)
+++ head/net/freeradius2/Makefile	Wed Apr  9 03:22:57 2014	(r350666)
@@ -22,14 +22,13 @@ LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/data
 LOGDIR?=	/var/log
 KRB5_CONFIG?=	/usr/bin/krb5-config --libs
 
-CONFLICTS=	gnu-radius-[0-9].* openradius-[0-9].* radiusd-cistron-[0-9].* \
-		freeradius-mysql-[0-9].* freeradius-[013-9].* freeradius3-3.*
+CONFLICTS_INSTALL=	gnu-radius-[0-9].* openradius-[0-9].* radiusd-cistron-[0-9].* \
+		freeradius-mysql-[0-9].* freeradius-[^2].* freeradius3-3.*
 
 USE_RC_SUBR=	radiusd
 
-USES=		gmake
+USES=		gmake tar:bzip2
 USE_AUTOTOOLS=	libltdl libtool autoconf
-USE_BZIP2=	yes
 USE_OPENSSL=	yes
 MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
@@ -55,7 +54,6 @@ DEVELOPER_DESC=		Enable developer option
 EDIR_DESC=		Enable eDirectory support (implies LDAP)
 SSL_PORT_DESC=		Use OpenSSL from the ports collection
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 # Default requirements for rc script
@@ -265,6 +263,9 @@ WITH_OPENSSL_PORT=yes
 
 .include <bsd.port.pre.mk>
 
+# if we're installing, place sample configs into ${EXAMPLESDIR}
+MAKE_ARGS+=	raddbdir="${EXAMPLESDIR}/raddb" R=${STAGEDIR}
+
 .if ${ARCH} == "sparc64" && ${OSVERSION} < 700000
 BROKEN=		Does not build on sparc64-6
 .endif
@@ -309,51 +310,24 @@ CONFIGURE_ARGS+=--without-rlm_eap_ikev2 
 CONFIGURE_ARGS+=	--with-pic
 .endif
 
+SUB_FILES+=	pkg-install pkg-message
 SUB_LIST+=	RADIUS_USER="${RADIUS_USER}" \
 		RADIUS_GROUP="${RADIUS_GROUP}" \
 		RADDB_WORK="${WRKSRC}/raddb" \
 		RADDB="${PREFIX}/etc/raddb" \
 		LOGDIR="${LOGDIR}" \
 		LIBDIR="${PREFIX}/${FREERADIUS_LIBDIR}"
-SUB_FILES+=	pkg-install pkg-message
-
-MAN1=		radclient.1 radeapclient.1 radlast.1 radtest.1 radwho.1 \
-		radzap.1 smbencrypt.1
-MAN5=		acct_users.5 clients.conf.5 dictionary.5 radiusd.conf.5 \
-		radrelay.conf.5 rlm_acct_unique.5 rlm_always.5 \
-		rlm_attr_filter.5 rlm_attr_rewrite.5 rlm_chap.5 rlm_counter.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 checkrad.5
-MAN8=		radiusd.8 radmin.8 raddebug.8 radrelay.8 radsqlrelay.8 \
-		radwatch.8 rlm_ippool_tool.8 radconf2xml.8 radcrypt.8 \
-		radsniff.8 rlm_dbm_cat.8 rlm_dbm_parser.8
-
 SUB_LIST+=	REQUIRE="${_REQUIRE}"
 
 post-patch:
 # never try to find execinfo.h (needed until we can enable/disable backtrace
 	@${REINPLACE_CMD} -e '/execinfo.h/d' ${WRKSRC}/configure \
 		${WRKSRC}/configure.in
-# Patch Makefile / Makefile.in throughout the source tree to install raddb
-# contents in ${EXAMPLESDIR}/raddb rather than the raddbdir from configure
-	@${FIND} -E ${WRKSRC} -regex '.*/Makefile(\.in)?$$' -exec \
-		${REINPLACE_CMD} -e "s:\$$(R)\$$(raddbdir):${EXAMPLESDIR}/raddb:g" {} \;
-# Clean up after the last operation (so as not to get unwanted files when installing doc/)
-	@${FIND} -E ${WRKSRC} -regex '.*/Makefile(\.in)?\.(orig|bak)$$' -delete
-# Patch raddb/certs/bootstrap to use gmake instead of make
-	@${REINPLACE_CMD} -Ee "s:^make:${GMAKE}:" \
-		${WRKSRC}/raddb/certs/bootstrap
 # Patch raddb/certs/Makefile for the full path to the openssl binary (using
 # ports OpenSSL if installed)
 	@${REINPLACE_CMD} -E \
 		-e "s:^([[:space:]])+openssl:\1${OPENSSLBASE}/bin/openssl:g" \
 		${WRKSRC}/raddb/certs/Makefile
-# Clean up after the last two operations (so as not to get unwanted files in
-# raddb)
-	@${FIND} -E ${WRKSRC}/raddb/certs \
-		-regex '.*/(bootstrap|Makefile)\.(orig|bak)$$' \
-		-delete
 # If we're using Heimdal from base, alter the LIBS variable
 .if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MHEIMDAL_PORT)
 	@${REINPLACE_CMD} -e 's|LIBS|KRB5LIBS|g' ${WRKSRC}/src/modules/rlm_krb5/configure
@@ -364,14 +338,7 @@ post-patch:
 .if ${PORT_OPTIONS:MDHCP}
 	@${REINPLACE_CMD} -Ee 's:^#(.+ dictionary\.dhcp)$$:\1:g' \
 		${WRKSRC}/share/dictionary
-# Clean up (so as not to get an unwanted file in share)
-	@${FIND} -E ${WRKSRC}/share \
-		-regex '.*/dictionary\.(orig|bak)$$' \
-		-delete
-.endif
-# Fix PgSQL statement
-	@${REINPLACE_CMD} -i '' -e 's|ius.rad||' \
-		${WRKSRC}/raddb/sql/postgresql/admin.sql
+.endif
 # Patch scripts/Makefile not to install (unnecessary) rc.radiusd
 	@${REINPLACE_CMD} -Ee 's:^(.+rc\.radiusd.+)$$:#\1:g' \
 		${WRKSRC}/scripts/Makefile
@@ -390,27 +357,4 @@ pre-configure:
 	@cd ${WRKSRC}/src/modules/rlm_perl && ${AUTOCONF} -I ${WRKSRC}
 	@cd ${WRKSRC}/src/modules/rlm_python && ${AUTOCONF} -I ${WRKSRC}
 
-pre-install:
-# Run pkg-install PRE-INSTALL
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
-		PRE-INSTALL
-
-post-install:
-# If ${PREFIX}/etc/raddb isn't a directory (or a symlink), make a copy
-# of ${EXAMPLESDIR}/raddb as ${PREFIX}/etc/raddb, then bootstrap the
-# certificates
-	@if ! [ -d ${PREFIX}/etc/raddb -o -L ${PREFIX}/etc/raddb ]; then \
-		${CP} -RP ${EXAMPLESDIR}/raddb ${PREFIX}/etc/raddb; \
-		${ECHO_MSG} '===> Bootstrapping default certificates, please wait...'; \
-		${PREFIX}/etc/raddb/certs/bootstrap >/dev/null 2>&1; \
-	fi
-# Set ${PREFIX}/etc/raddb and all the files and folders in it to g-w,o-rwx
-# (FreeRADIUS will probably complain if this is not done)
-	@${CHMOD} -R g-w,o-rwx ${PREFIX}/etc/raddb
-# Run pkg-install POST-INSTALL
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
-		POST-INSTALL
-# Display the contents of pkg-message
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>

Modified: head/net/freeradius2/pkg-plist
==============================================================================
--- head/net/freeradius2/pkg-plist	Wed Apr  9 02:38:39 2014	(r350665)
+++ head/net/freeradius2/pkg-plist	Wed Apr  9 03:22:57 2014	(r350666)
@@ -1,7 +1,10 @@
 @stopdaemon radiusd
-bin/radcrypt
+@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
+bin/rad_counter
 bin/radclient
 bin/radconf2xml
+bin/radcrypt
 bin/radeapclient
 bin/radlast
 bin/radsniff
@@ -9,176 +12,51 @@ bin/radsqlrelay
 bin/radtest
 bin/radwho
 bin/radzap
-bin/rad_counter
 bin/rlm_dbm_cat
 bin/rlm_dbm_parser
 bin/rlm_ippool_tool
 bin/smbencrypt
-@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
-%%EXAMPLESDIR%%/raddb/attrs.access_reject
-%%EXAMPLESDIR%%/raddb/attrs.accounting_response
-%%EXAMPLESDIR%%/raddb/attrs.pre-proxy
-%%EXAMPLESDIR%%/raddb/certs/Makefile
-%%EXAMPLESDIR%%/raddb/certs/README
-%%EXAMPLESDIR%%/raddb/certs/bootstrap
-%%EXAMPLESDIR%%/raddb/certs/ca.cnf
-%%EXAMPLESDIR%%/raddb/certs/client.cnf
-%%EXAMPLESDIR%%/raddb/certs/server.cnf
-%%EXAMPLESDIR%%/raddb/certs/xpextensions
-%%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/cache
-%%EXAMPLESDIR%%/raddb/modules/chap
-%%EXAMPLESDIR%%/raddb/modules/checkval
-%%EXAMPLESDIR%%/raddb/modules/counter
-%%EXAMPLESDIR%%/raddb/modules/cui
-%%EXAMPLESDIR%%/raddb/modules/detail
-%%EXAMPLESDIR%%/raddb/modules/detail.example.com
-%%EXAMPLESDIR%%/raddb/modules/detail.log
-%%EXAMPLESDIR%%/raddb/modules/dhcp_sqlippool
-%%EXAMPLESDIR%%/raddb/modules/digest
-%%EXAMPLESDIR%%/raddb/modules/dynamic_clients
-%%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/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
-%%EXAMPLESDIR%%/raddb/modules/mschap
-%%EXAMPLESDIR%%/raddb/modules/ntlm_auth
-%%EXAMPLESDIR%%/raddb/modules/opendirectory
-%%EXAMPLESDIR%%/raddb/modules/otp
-%%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/radrelay
-%%EXAMPLESDIR%%/raddb/modules/radutmp
-%%EXAMPLESDIR%%/raddb/modules/realm
-%%EXAMPLESDIR%%/raddb/modules/redis
-%%EXAMPLESDIR%%/raddb/modules/rediswho
-%%EXAMPLESDIR%%/raddb/modules/replicate
-%%EXAMPLESDIR%%/raddb/modules/smbpasswd
-%%EXAMPLESDIR%%/raddb/modules/smsotp
-%%EXAMPLESDIR%%/raddb/modules/soh
-%%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/panic.gdb
-%%EXAMPLESDIR%%/raddb/policy.conf
-%%EXAMPLESDIR%%/raddb/policy.txt
-%%EXAMPLESDIR%%/raddb/preproxy_users
-%%EXAMPLESDIR%%/raddb/proxy.conf
-%%EXAMPLESDIR%%/raddb/radiusd.conf
-%%EXAMPLESDIR%%/raddb/sites-available/README
-%%EXAMPLESDIR%%/raddb/sites-available/buffered-sql
-%%EXAMPLESDIR%%/raddb/sites-available/coa
-%%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/dhcp.relay
-%%EXAMPLESDIR%%/raddb/sites-available/dynamic-clients
-%%EXAMPLESDIR%%/raddb/sites-available/example
-%%EXAMPLESDIR%%/raddb/sites-available/inner-tunnel
-%%EXAMPLESDIR%%/raddb/sites-available/originate-coa
-%%EXAMPLESDIR%%/raddb/sites-available/proxy-inner-tunnel
-%%EXAMPLESDIR%%/raddb/sites-available/robust-proxy-accounting
-%%EXAMPLESDIR%%/raddb/sites-available/status
-%%EXAMPLESDIR%%/raddb/sites-available/soh
-%%EXAMPLESDIR%%/raddb/sites-available/virtual.example.com
-%%EXAMPLESDIR%%/raddb/sites-available/vmps
-%%EXAMPLESDIR%%/raddb/sites-enabled/control-socket
-%%EXAMPLESDIR%%/raddb/sites-enabled/default
-%%EXAMPLESDIR%%/raddb/sites-enabled/inner-tunnel
-%%EXAMPLESDIR%%/raddb/sql.conf
-%%EXAMPLESDIR%%/raddb/sql/ndb/README
-%%EXAMPLESDIR%%/raddb/sql/ndb/admin.sql
-%%EXAMPLESDIR%%/raddb/sql/ndb/schema.sql
-%%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/cui.conf
-%%EXAMPLESDIR%%/raddb/sql/mysql/cui.sql
-%%EXAMPLESDIR%%/raddb/sql/mysql/dialup.conf
-%%EXAMPLESDIR%%/raddb/sql/mysql/ippool.conf
-%%EXAMPLESDIR%%/raddb/sql/mysql/ippool-dhcp.conf
-%%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
-%%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
-%%EXAMPLESDIR%%/raddb/sql/postgresql/ippool.conf
-%%EXAMPLESDIR%%/raddb/sql/postgresql/ippool.sql
-%%EXAMPLESDIR%%/raddb/sql/postgresql/nas.sql
-%%EXAMPLESDIR%%/raddb/sql/postgresql/schema.sql
-%%EXAMPLESDIR%%/raddb/sql/postgresql/update_radacct_group_trigger.sql
-%%EXAMPLESDIR%%/raddb/sql/postgresql/voip-postpaid.conf
-%%EXAMPLESDIR%%/raddb/sqlippool.conf
-%%EXAMPLESDIR%%/raddb/templates.conf
-%%EXAMPLESDIR%%/raddb/users
-%%EXAMPLESDIR%%/raddb/attrs.access_challenge
-@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/ndb
-@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
-@dirrm %%EXAMPLESDIR%%
+include/freeradius/autoconf.h
+include/freeradius/base64.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/threads.h
+include/freeradius/token.h
+include/freeradius/udpfromto.h
+include/freeradius/vmps.h
+include/freeradius/vqp.h
 %%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-%%LIBVER%%.la
+%%LIBDIR%%/libfreeradius-radius-%%LIBVER%%.so
 %%LIBDIR%%/libfreeradius-radius.a
 %%LIBDIR%%/libfreeradius-radius.la
 %%LIBDIR%%/libfreeradius-radius.so
-%%LIBDIR%%/libfreeradius-radius-%%LIBVER%%.la
-%%LIBDIR%%/libfreeradius-radius-%%LIBVER%%.so
 %%LIBDIR%%/rlm_acct_unique-%%PORTVERSION%%.la
 %%LIBDIR%%/rlm_acct_unique-%%PORTVERSION%%.so
 %%LIBDIR%%/rlm_acct_unique.a
@@ -424,16 +302,16 @@ bin/smbencrypt
 %%LIBDIR%%/rlm_realm.a
 %%LIBDIR%%/rlm_realm.la
 %%LIBDIR%%/rlm_realm.so
-%%LIBDIR%%/rlm_soh.so
-%%LIBDIR%%/rlm_soh-%%PORTVERSION%%.so
-%%LIBDIR%%/rlm_soh.la
-%%LIBDIR%%/rlm_soh.a
-%%LIBDIR%%/rlm_soh-%%PORTVERSION%%.la
-%%LIBDIR%%/rlm_replicate-%%PORTVERSION%%.so
-%%LIBDIR%%/rlm_replicate.so
 %%LIBDIR%%/rlm_replicate-%%PORTVERSION%%.la
-%%LIBDIR%%/rlm_replicate.la
+%%LIBDIR%%/rlm_replicate-%%PORTVERSION%%.so
 %%LIBDIR%%/rlm_replicate.a
+%%LIBDIR%%/rlm_replicate.la
+%%LIBDIR%%/rlm_replicate.so
+%%LIBDIR%%/rlm_soh-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_soh-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_soh.a
+%%LIBDIR%%/rlm_soh.la
+%%LIBDIR%%/rlm_soh.so
 %%EXPM%%%%RLMRUBY%%%%LIBDIR%%/rlm_ruby-%%PORTVERSION%%.la
 %%EXPM%%%%RLMRUBY%%%%LIBDIR%%/rlm_ruby-%%PORTVERSION%%.so
 %%EXPM%%%%RLMRUBY%%%%LIBDIR%%/rlm_ruby.a
@@ -514,46 +392,63 @@ bin/smbencrypt
 %%LIBDIR%%/rlm_wimax.a
 %%LIBDIR%%/rlm_wimax.la
 %%LIBDIR%%/rlm_wimax.so
-@dirrm %%LIBDIR%%
+man/man1/radclient.1.gz
+man/man1/radeapclient.1.gz
+man/man1/radlast.1.gz
+man/man1/radtest.1.gz
+man/man1/radwho.1.gz
+man/man1/radzap.1.gz
+man/man1/smbencrypt.1.gz
+man/man5/acct_users.5.gz
+man/man5/checkrad.5.gz
+man/man5/clients.conf.5.gz
+man/man5/dictionary.5.gz
+man/man5/radiusd.conf.5.gz
+man/man5/radrelay.conf.5.gz
+man/man5/rlm_acct_unique.5.gz
+man/man5/rlm_always.5.gz
+man/man5/rlm_attr_filter.5.gz
+man/man5/rlm_attr_rewrite.5.gz
+man/man5/rlm_chap.5.gz
+man/man5/rlm_counter.5.gz
+man/man5/rlm_detail.5.gz
+man/man5/rlm_digest.5.gz
+man/man5/rlm_expr.5.gz
+man/man5/rlm_files.5.gz
+man/man5/rlm_mschap.5.gz
+man/man5/rlm_pap.5.gz
+man/man5/rlm_passwd.5.gz
+man/man5/rlm_policy.5.gz
+man/man5/rlm_realm.5.gz
+man/man5/rlm_sql.5.gz
+man/man5/rlm_sql_log.5.gz
+man/man5/rlm_unix.5.gz
+man/man5/unlang.5.gz
+man/man5/users.5.gz
+man/man8/radconf2xml.8.gz
+man/man8/radcrypt.8.gz
+man/man8/raddebug.8.gz
+man/man8/radiusd.8.gz
+man/man8/radmin.8.gz
+man/man8/radrelay.8.gz
+man/man8/radsniff.8.gz
+man/man8/radsqlrelay.8.gz
+man/man8/radwatch.8.gz
+man/man8/rlm_dbm_cat.8.gz
+man/man8/rlm_dbm_parser.8.gz
+man/man8/rlm_ippool_tool.8.gz
 sbin/checkrad
 sbin/raddebug
 sbin/radiusd
 sbin/radmin
 sbin/radwatch
-include/freeradius/autoconf.h
-include/freeradius/base64.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/threads.h
-include/freeradius/token.h
-include/freeradius/udpfromto.h
-include/freeradius/vmps.h
-include/freeradius/vqp.h
-@dirrm include/freeradius
+%%PORTDOCS%%%%DOCSDIR%%/Acct-Type.rst
+%%PORTDOCS%%%%DOCSDIR%%/Autz-Type.rst
+%%PORTDOCS%%%%DOCSDIR%%/CYGWIN.rst
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/DIFFS.rst
 %%PORTDOCS%%%%DOCSDIR%%/MACOSX
+%%PORTDOCS%%%%DOCSDIR%%/Makefile.sphinx
 %%PORTDOCS%%%%DOCSDIR%%/OS2
 %%PORTDOCS%%%%DOCSDIR%%/Post-Auth-Type
 %%PORTDOCS%%%%DOCSDIR%%/RADIUS-LDAP-eDirectory
@@ -561,15 +456,28 @@ include/freeradius/vqp.h
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/Session-Type
 %%PORTDOCS%%%%DOCSDIR%%/Simultaneous-Use
+%%PORTDOCS%%%%DOCSDIR%%/SoH.txt
+%%PORTDOCS%%%%DOCSDIR%%/aaa.rst
 %%PORTDOCS%%%%DOCSDIR%%/ascend
 %%PORTDOCS%%%%DOCSDIR%%/bay
 %%PORTDOCS%%%%DOCSDIR%%/bugs
+%%PORTDOCS%%%%DOCSDIR%%/cisco.rst
+%%PORTDOCS%%%%DOCSDIR%%/coding-methods.rst
+%%PORTDOCS%%%%DOCSDIR%%/configurable_failover.rst
 %%PORTDOCS%%%%DOCSDIR%%/examples/iplanet.ldif
 %%PORTDOCS%%%%DOCSDIR%%/examples/iplanet.schema
 %%PORTDOCS%%%%DOCSDIR%%/examples/openldap.schema
 %%PORTDOCS%%%%DOCSDIR%%/examples/postgresql_update_radacct_group_trigger.sql
+%%PORTDOCS%%%%DOCSDIR%%/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/ldap_howto.rst
+%%PORTDOCS%%%%DOCSDIR%%/load-balance.rst
+%%PORTDOCS%%%%DOCSDIR%%/misc-nas.rst
+%%PORTDOCS%%%%DOCSDIR%%/module_interface.rst
 %%PORTDOCS%%%%DOCSDIR%%/mssql
 %%PORTDOCS%%%%DOCSDIR%%/performance-testing
+%%PORTDOCS%%%%DOCSDIR%%/processing_users_file.rst
+%%PORTDOCS%%%%DOCSDIR%%/proxy.rst
+%%PORTDOCS%%%%DOCSDIR%%/release-method.rst
 %%PORTDOCS%%%%DOCSDIR%%/rfc/attributes.html
 %%PORTDOCS%%%%DOCSDIR%%/rfc/draft-kamath-pppext-eap-mschapv2-00.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/draft-sterman-aaa-sip-00.txt
@@ -650,30 +558,148 @@ include/freeradius/vqp.h
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sqlcounter
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sqlippool
 %%PORTDOCS%%%%DOCSDIR%%/snmp
-%%PORTDOCS%%%%DOCSDIR%%/SoH.txt
-%%PORTDOCS%%%%DOCSDIR%%/tuning_guide
-%%PORTDOCS%%%%DOCSDIR%%/Acct-Type.rst
-%%PORTDOCS%%%%DOCSDIR%%/Autz-Type.rst
-%%PORTDOCS%%%%DOCSDIR%%/CYGWIN.rst
-%%PORTDOCS%%%%DOCSDIR%%/DIFFS.rst
-%%PORTDOCS%%%%DOCSDIR%%/Makefile.sphinx
-%%PORTDOCS%%%%DOCSDIR%%/aaa.rst
-%%PORTDOCS%%%%DOCSDIR%%/cisco.rst
-%%PORTDOCS%%%%DOCSDIR%%/coding-methods.rst
-%%PORTDOCS%%%%DOCSDIR%%/configurable_failover.rst
-%%PORTDOCS%%%%DOCSDIR%%/index.rst
-%%PORTDOCS%%%%DOCSDIR%%/ldap_howto.rst
-%%PORTDOCS%%%%DOCSDIR%%/load-balance.rst
-%%PORTDOCS%%%%DOCSDIR%%/misc-nas.rst
-%%PORTDOCS%%%%DOCSDIR%%/module_interface.rst
-%%PORTDOCS%%%%DOCSDIR%%/processing_users_file.rst
-%%PORTDOCS%%%%DOCSDIR%%/proxy.rst
-%%PORTDOCS%%%%DOCSDIR%%/release-method.rst
 %%PORTDOCS%%%%DOCSDIR%%/supervise-radiusd.rst
+%%PORTDOCS%%%%DOCSDIR%%/tuning_guide
 %%PORTDOCS%%%%DOCSDIR%%/variables.rst
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/raddb/acct_users
+%%EXAMPLESDIR%%/raddb/attrs
+%%EXAMPLESDIR%%/raddb/attrs.access_challenge
+%%EXAMPLESDIR%%/raddb/attrs.access_reject
+%%EXAMPLESDIR%%/raddb/attrs.accounting_response
+%%EXAMPLESDIR%%/raddb/attrs.pre-proxy
+%%EXAMPLESDIR%%/raddb/certs/Makefile
+%%EXAMPLESDIR%%/raddb/certs/README
+%%EXAMPLESDIR%%/raddb/certs/bootstrap
+%%EXAMPLESDIR%%/raddb/certs/ca.cnf
+%%EXAMPLESDIR%%/raddb/certs/client.cnf
+%%EXAMPLESDIR%%/raddb/certs/server.cnf
+%%EXAMPLESDIR%%/raddb/certs/xpextensions
+%%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/cache
+%%EXAMPLESDIR%%/raddb/modules/chap
+%%EXAMPLESDIR%%/raddb/modules/checkval
+%%EXAMPLESDIR%%/raddb/modules/counter
+%%EXAMPLESDIR%%/raddb/modules/cui
+%%EXAMPLESDIR%%/raddb/modules/detail
+%%EXAMPLESDIR%%/raddb/modules/detail.example.com
+%%EXAMPLESDIR%%/raddb/modules/detail.log
+%%EXAMPLESDIR%%/raddb/modules/dhcp_sqlippool
+%%EXAMPLESDIR%%/raddb/modules/digest
+%%EXAMPLESDIR%%/raddb/modules/dynamic_clients
+%%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/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
+%%EXAMPLESDIR%%/raddb/modules/mschap
+%%EXAMPLESDIR%%/raddb/modules/ntlm_auth
+%%EXAMPLESDIR%%/raddb/modules/opendirectory
+%%EXAMPLESDIR%%/raddb/modules/otp
+%%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/radrelay
+%%EXAMPLESDIR%%/raddb/modules/radutmp
+%%EXAMPLESDIR%%/raddb/modules/realm
+%%EXAMPLESDIR%%/raddb/modules/redis
+%%EXAMPLESDIR%%/raddb/modules/rediswho
+%%EXAMPLESDIR%%/raddb/modules/replicate
+%%EXAMPLESDIR%%/raddb/modules/smbpasswd
+%%EXAMPLESDIR%%/raddb/modules/smsotp
+%%EXAMPLESDIR%%/raddb/modules/soh
+%%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/panic.gdb
+%%EXAMPLESDIR%%/raddb/policy.conf
+%%EXAMPLESDIR%%/raddb/policy.txt
+%%EXAMPLESDIR%%/raddb/preproxy_users
+%%EXAMPLESDIR%%/raddb/proxy.conf
+%%EXAMPLESDIR%%/raddb/radiusd.conf
+%%EXAMPLESDIR%%/raddb/sites-available/README
+%%EXAMPLESDIR%%/raddb/sites-available/buffered-sql
+%%EXAMPLESDIR%%/raddb/sites-available/coa
+%%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/dhcp.relay
+%%EXAMPLESDIR%%/raddb/sites-available/dynamic-clients
+%%EXAMPLESDIR%%/raddb/sites-available/example
+%%EXAMPLESDIR%%/raddb/sites-available/inner-tunnel
+%%EXAMPLESDIR%%/raddb/sites-available/originate-coa
+%%EXAMPLESDIR%%/raddb/sites-available/proxy-inner-tunnel
+%%EXAMPLESDIR%%/raddb/sites-available/robust-proxy-accounting
+%%EXAMPLESDIR%%/raddb/sites-available/soh
+%%EXAMPLESDIR%%/raddb/sites-available/status
+%%EXAMPLESDIR%%/raddb/sites-available/virtual.example.com
+%%EXAMPLESDIR%%/raddb/sites-available/vmps
+%%EXAMPLESDIR%%/raddb/sites-enabled/control-socket
+%%EXAMPLESDIR%%/raddb/sites-enabled/default
+%%EXAMPLESDIR%%/raddb/sites-enabled/inner-tunnel
+%%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/cui.conf
+%%EXAMPLESDIR%%/raddb/sql/mysql/cui.sql
+%%EXAMPLESDIR%%/raddb/sql/mysql/dialup.conf
+%%EXAMPLESDIR%%/raddb/sql/mysql/ippool-dhcp.conf
+%%EXAMPLESDIR%%/raddb/sql/mysql/ippool.conf
+%%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/ndb/README
+%%EXAMPLESDIR%%/raddb/sql/ndb/admin.sql
+%%EXAMPLESDIR%%/raddb/sql/ndb/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
+%%EXAMPLESDIR%%/raddb/sql/postgresql/ippool.conf
+%%EXAMPLESDIR%%/raddb/sql/postgresql/ippool.sql
+%%EXAMPLESDIR%%/raddb/sql/postgresql/nas.sql
+%%EXAMPLESDIR%%/raddb/sql/postgresql/schema.sql
+%%EXAMPLESDIR%%/raddb/sql/postgresql/update_radacct_group_trigger.sql
+%%EXAMPLESDIR%%/raddb/sql/postgresql/voip-postpaid.conf
+%%EXAMPLESDIR%%/raddb/sqlippool.conf
+%%EXAMPLESDIR%%/raddb/templates.conf
+%%EXAMPLESDIR%%/raddb/users
 %%DATADIR%%/dictionary
 %%DATADIR%%/dictionary.3com
 %%DATADIR%%/dictionary.3gpp
@@ -683,9 +709,9 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.aerohive
 %%DATADIR%%/dictionary.airespace
 %%DATADIR%%/dictionary.alcatel
+%%DATADIR%%/dictionary.alcatel-lucent.aaa
 %%DATADIR%%/dictionary.alcatel.esam
 %%DATADIR%%/dictionary.alcatel.sr
-%%DATADIR%%/dictionary.alcatel-lucent.aaa
 %%DATADIR%%/dictionary.alteon
 %%DATADIR%%/dictionary.altiga
 %%DATADIR%%/dictionary.alvarion
@@ -695,9 +721,9 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.ascend
 %%DATADIR%%/dictionary.ascend.illegal
 %%DATADIR%%/dictionary.asn
+%%DATADIR%%/dictionary.audiocodes
 %%DATADIR%%/dictionary.avaya
 %%DATADIR%%/dictionary.azaire
-%%DATADIR%%/dictionary.audiocodes
 %%DATADIR%%/dictionary.bay
 %%DATADIR%%/dictionary.bintec
 %%DATADIR%%/dictionary.bristol
@@ -723,8 +749,8 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.digium
 %%DATADIR%%/dictionary.dlink
 %%DATADIR%%/dictionary.efficientip
-%%DATADIR%%/dictionary.epygi
 %%DATADIR%%/dictionary.eltex
+%%DATADIR%%/dictionary.epygi
 %%DATADIR%%/dictionary.ericsson
 %%DATADIR%%/dictionary.erx
 %%DATADIR%%/dictionary.extreme
@@ -741,8 +767,8 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.h3c
 %%DATADIR%%/dictionary.hp
 %%DATADIR%%/dictionary.huawei
-%%DATADIR%%/dictionary.infonet
 %%DATADIR%%/dictionary.iea
+%%DATADIR%%/dictionary.infonet
 %%DATADIR%%/dictionary.ipunplugged
 %%DATADIR%%/dictionary.issanni
 %%DATADIR%%/dictionary.itk
@@ -846,15 +872,28 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.xylan
 %%DATADIR%%/dictionary.zeus
 %%DATADIR%%/dictionary.zyxel
+@unexec rmdir >/dev/null 2>&1 /var/run/radiusd || :
+@unexec rmdir >/dev/null 2>&1 /var/log/radacct || :
 @dirrm %%DATADIR%%
-@dirrmtry share/freeradius
-@dirrmtry share/examples/freeradius/raddb/sites-available
-@dirrmtry share/examples/freeradius/raddb/modules
-@dirrmtry share/examples/freeradius/raddb
-@dirrmtry share/examples/freeradius
-@dirrmtry share/doc/freeradius/rfc
-@dirrmtry share/doc/freeradius
+@dirrm %%EXAMPLESDIR%%/raddb/sql/postgresql
+@dirrm %%EXAMPLESDIR%%/raddb/sql/oracle
+@dirrm %%EXAMPLESDIR%%/raddb/sql/ndb
+@dirrm %%EXAMPLESDIR%%/raddb/sql/mysql
+@dirrm %%EXAMPLESDIR%%/raddb/sql/mssql
+@dirrm %%EXAMPLESDIR%%/raddb/sql
+@dirrm %%EXAMPLESDIR%%/raddb/sites-enabled
+@dirrm %%EXAMPLESDIR%%/raddb/sites-available
+@dirrm %%EXAMPLESDIR%%/raddb/modules
+@dirrm %%EXAMPLESDIR%%/raddb/certs
+@dirrm %%EXAMPLESDIR%%/raddb
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%LIBDIR%%
+@dirrm include/freeradius
+@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
 @exec if [ ! -d /var/log/radacct ]; then mkdir -p /var/log/radacct; chmod -R go= /var/log/radacct; fi
 @exec for i in /var/log/radius.log /var/log/radutmp /var/log/radwtmp; do if [ ! -f ${i} ]; then touch ${i}; chmod go= ${i}; fi; done
 @exec mkdir -p /var/run/radiusd
-@unexec rm -fr /var/run/radiusd
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Bryan Drewery freebsd_committer 2014-04-09 04:23:25 UTC
State Changed
From-To: open->closed

Committed, linker error fixed by r349957.