4 files changed, 149 insertions, 138 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index e53332e11cea..f881df0c983b 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -21,6 +21,7 @@ LOGDIR?=	/var/log
 
 CONFLICTS=	gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
 USE_GMAKE=	yes
+USE_PERL5_BUILD=yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \
 		--localstatedir=/var \
@@ -28,29 +29,16 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \
 		--with-ltdl-include=${LOCALBASE}/include \
 		--with-ltdl-lib=${LOCALBASE}/lib
 
-.if defined(WITH_OPENLDAP_VER)
-.if ${WITH_OPENLDAP_VER} == 20 || ${WITH_OPENLDAP_VER} == 21
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap${WITH_OPENLDAP_VER}
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap${WITH_OPENLDAP_VER}
-.else
-BROKEN=		"WITH_OPENLDAP_VER must be 20 or 21"
-.endif
+.if defined(WITH_OPENLDAP)
+USE_OPENLDAP=	YES
 PLIST_SUB+=	LDAP=""
 .else
 CONFIGURE_ARGS+=--without-rlm_ldap
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
-.if defined(WITH_MYSQL_VER)
-.if ${WITH_MYSQL_VER} == 41
-LIB_DEPENDS+=	mysqlclient.14:${PORTSDIR}/databases/mysql41-client
-.elif ${WITH_MYSQL_VER} == 40
-LIB_DEPENDS+=	mysqlclient.12:${PORTSDIR}/databases/mysql40-client
-.elif ${WITH_MYSQL_VER} == 3
-LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-.else
-BROKEN=		"WITH_MYSQL_VER must be 3, 40 or 41"
-.endif
+.if defined(WITH_MYSQL)
+USE_MYSQL=	YES
 PLIST_SUB+=	MYSQL=""
 .else
 CONFIGURE_ARGS+=--without-rlm_sql_mysql
diff --git a/net/freeradius/files/patch-doc::Makefile b/net/freeradius/files/patch-doc::Makefile
new file mode 100644
index 000000000000..e28cdc4d9f6d
--- /dev/null
+++ b/net/freeradius/files/patch-doc::Makefile
@@ -0,0 +1,14 @@
+--- doc/Makefile.orig	Thu Nov 20 14:32:45 2003
++++ doc/Makefile	Thu Nov 20 14:33:01 2003
+@@ -21,9 +21,9 @@
+ 
+ install:
+ 	$(INSTALL) -d -m 755	$(R)$(datadir)/doc
+-	$(INSTALL) -d -m 755	$(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)
++	$(INSTALL) -d -m 755	$(R)$(datadir)/doc/freeradius
+ 	for i in $(DOCS) rlm_*; do \
+-		$(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION); \
++		$(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius; \
+ 	done
+ 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
+ 
diff --git a/net/freeradius/files/patch-doc::rfc::Makefile b/net/freeradius/files/patch-doc::rfc::Makefile
new file mode 100644
index 000000000000..cce186e1c302
--- /dev/null
+++ b/net/freeradius/files/patch-doc::rfc::Makefile
@@ -0,0 +1,12 @@
+--- doc/rfc/Makefile.orig	Thu Nov 20 14:42:52 2003
++++ doc/rfc/Makefile	Thu Nov 20 14:43:03 2003
+@@ -16,7 +16,7 @@
+ 	rm -f refs rfc*.html *~ .rewrite index.html
+ 
+ install:
+-	$(INSTALL) -d -m 755	$(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)/rfc
++	$(INSTALL) -d -m 755	$(R)$(datadir)/doc/freeradius/rfc
+ 	for i in `ls -1 *.txt *.html`; do \
+-		$(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)/rfc; \
++		$(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius/rfc; \
+ 	done
diff --git a/net/freeradius/pkg-plist b/net/freeradius/pkg-plist
index 6cb59c6867af..b9eb57903c7d 100644
--- a/net/freeradius/pkg-plist
+++ b/net/freeradius/pkg-plist
@@ -191,127 +191,124 @@ sbin/checkrad
 sbin/radiusd
 sbin/radwatch
 sbin/rc.radiusd
-share/doc/freeradius-0.9.2/Autz-Type
-share/doc/freeradius-0.9.2/DIFFS
-share/doc/freeradius-0.9.2/MACOSX
-share/doc/freeradius-0.9.2/OS2
-share/doc/freeradius-0.9.2/RADIUS-LDAP.schema
-share/doc/freeradius-0.9.2/RADIUS-LDAPv3.schema
-share/doc/freeradius-0.9.2/RADIUS-SQL.schema
-share/doc/freeradius-0.9.2/README
-share/doc/freeradius-0.9.2/Simultaneous-Use
-share/doc/freeradius-0.9.2/aaa.txt
-share/doc/freeradius-0.9.2/ascend
-share/doc/freeradius-0.9.2/bay
-share/doc/freeradius-0.9.2/bugs
-share/doc/freeradius-0.9.2/cisco
-share/doc/freeradius-0.9.2/coding-methods.txt
-share/doc/freeradius-0.9.2/configurable_failover
-share/doc/freeradius-0.9.2/duplicate-users
-share/doc/freeradius-0.9.2/module_interface
-share/doc/freeradius-0.9.2/performance-testing
-share/doc/freeradius-0.9.2/processing_users_file
-share/doc/freeradius-0.9.2/proxy
-share/doc/freeradius-0.9.2/radrelay
-share/doc/freeradius-0.9.2/rfc/attributes.html
-share/doc/freeradius-0.9.2/rfc/draft-sterman-aaa-sip-00.txt
-share/doc/freeradius-0.9.2/rfc/leap.txt
-share/doc/freeradius-0.9.2/rfc/rfc1157.txt
-share/doc/freeradius-0.9.2/rfc/rfc1227.txt
-share/doc/freeradius-0.9.2/rfc/rfc1448.txt
-share/doc/freeradius-0.9.2/rfc/rfc1901.txt
-share/doc/freeradius-0.9.2/rfc/rfc1905.txt
-share/doc/freeradius-0.9.2/rfc/rfc2058.txt
-share/doc/freeradius-0.9.2/rfc/rfc2059.txt
-share/doc/freeradius-0.9.2/rfc/rfc2138.txt
-share/doc/freeradius-0.9.2/rfc/rfc2139.txt
-share/doc/freeradius-0.9.2/rfc/rfc2243.txt
-share/doc/freeradius-0.9.2/rfc/rfc2289.txt
-share/doc/freeradius-0.9.2/rfc/rfc2433.txt
-share/doc/freeradius-0.9.2/rfc/rfc2548.txt
-share/doc/freeradius-0.9.2/rfc/rfc2618.txt
-share/doc/freeradius-0.9.2/rfc/rfc2619.txt
-share/doc/freeradius-0.9.2/rfc/rfc2620.txt
-share/doc/freeradius-0.9.2/rfc/rfc2621.txt
-share/doc/freeradius-0.9.2/rfc/rfc2716.txt
-share/doc/freeradius-0.9.2/rfc/rfc2759.txt
-share/doc/freeradius-0.9.2/rfc/rfc2809.txt
-share/doc/freeradius-0.9.2/rfc/rfc2865.txt
-share/doc/freeradius-0.9.2/rfc/rfc2866.txt
-share/doc/freeradius-0.9.2/rfc/rfc2867.txt
-share/doc/freeradius-0.9.2/rfc/rfc2868.txt
-share/doc/freeradius-0.9.2/rfc/rfc2869.txt
-share/doc/freeradius-0.9.2/rfc/rfc2882.txt
-share/doc/freeradius-0.9.2/rfc/rfc2924.txt
-share/doc/freeradius-0.9.2/rfc/rfc3162.txt
-share/doc/freeradius-0.9.2/rlm_acct_unique
-share/doc/freeradius-0.9.2/rlm_always
-share/doc/freeradius-0.9.2/rlm_attr_filter
-share/doc/freeradius-0.9.2/rlm_dbm
-share/doc/freeradius-0.9.2/rlm_detail
-share/doc/freeradius-0.9.2/rlm_digest
-share/doc/freeradius-0.9.2/rlm_eap
-share/doc/freeradius-0.9.2/rlm_expr
-share/doc/freeradius-0.9.2/rlm_fastusers
-share/doc/freeradius-0.9.2/rlm_krb5
-share/doc/freeradius-0.9.2/rlm_ldap
-share/doc/freeradius-0.9.2/rlm_mschap
-share/doc/freeradius-0.9.2/rlm_pam
-share/doc/freeradius-0.9.2/rlm_passwd
-share/doc/freeradius-0.9.2/rlm_python
-share/doc/freeradius-0.9.2/rlm_sql
-share/doc/freeradius-0.9.2/rlm_sqlcounter
-share/doc/freeradius-0.9.2/rlm_unix
-share/doc/freeradius-0.9.2/rlm_x99_token
-share/doc/freeradius-0.9.2/supervise-radiusd.txt
-share/doc/freeradius-0.9.2/tuning_guide
-share/doc/freeradius-0.9.2/variables.txt
-share/freeradius/dictionary
-share/freeradius/dictionary.acc
-share/freeradius/dictionary.alcatel
-share/freeradius/dictionary.alteon
-share/freeradius/dictionary.altiga
-share/freeradius/dictionary.aptis
-share/freeradius/dictionary.ascend
-share/freeradius/dictionary.bay
-share/freeradius/dictionary.bintec
-share/freeradius/dictionary.cabletron
-share/freeradius/dictionary.cisco
-share/freeradius/dictionary.cisco.bbsm
-share/freeradius/dictionary.cisco.vpn3000
-share/freeradius/dictionary.cisco.vpn5000
-share/freeradius/dictionary.colubris
-share/freeradius/dictionary.columbia_university
-share/freeradius/dictionary.compat
-share/freeradius/dictionary.erx
-share/freeradius/dictionary.extreme
-share/freeradius/dictionary.foundry
-share/freeradius/dictionary.freeradius
-share/freeradius/dictionary.itk
-share/freeradius/dictionary.juniper
-share/freeradius/dictionary.livingston
-share/freeradius/dictionary.microsoft
-share/freeradius/dictionary.netscreen
-share/freeradius/dictionary.nokia
-share/freeradius/dictionary.nomadix
-share/freeradius/dictionary.quintum
-share/freeradius/dictionary.redback
-share/freeradius/dictionary.redcreek
-share/freeradius/dictionary.shasta
-share/freeradius/dictionary.shiva
-share/freeradius/dictionary.springtide
-share/freeradius/dictionary.telebit
-share/freeradius/dictionary.tunnel
-share/freeradius/dictionary.usr
-share/freeradius/dictionary.versanet
-share/freeradius/dictionary.wispr
-share/freeradius/dictionary.xedia
-share/nls/C/C
-share/nls/POSIX/C
-share/nls/en_US.US-ASCII/C
-@dirrm share/freeradius
-@dirrm share/doc/freeradius-0.9.2/rfc
-@dirrm share/doc/freeradius-0.9.2
+%%DOCSDIR%%/Autz-Type
+%%DOCSDIR%%/DIFFS
+%%DOCSDIR%%/MACOSX
+%%DOCSDIR%%/OS2
+%%DOCSDIR%%/RADIUS-LDAP.schema
+%%DOCSDIR%%/RADIUS-LDAPv3.schema
+%%DOCSDIR%%/RADIUS-SQL.schema
+%%DOCSDIR%%/README
+%%DOCSDIR%%/Simultaneous-Use
+%%DOCSDIR%%/aaa.txt
+%%DOCSDIR%%/ascend
+%%DOCSDIR%%/bay
+%%DOCSDIR%%/bugs
+%%DOCSDIR%%/cisco
+%%DOCSDIR%%/coding-methods.txt
+%%DOCSDIR%%/configurable_failover
+%%DOCSDIR%%/duplicate-users
+%%DOCSDIR%%/module_interface
+%%DOCSDIR%%/performance-testing
+%%DOCSDIR%%/processing_users_file
+%%DOCSDIR%%/proxy
+%%DOCSDIR%%/radrelay
+%%DOCSDIR%%/rfc/attributes.html
+%%DOCSDIR%%/rfc/draft-sterman-aaa-sip-00.txt
+%%DOCSDIR%%/rfc/leap.txt
+%%DOCSDIR%%/rfc/rfc1157.txt
+%%DOCSDIR%%/rfc/rfc1227.txt
+%%DOCSDIR%%/rfc/rfc1448.txt
+%%DOCSDIR%%/rfc/rfc1901.txt
+%%DOCSDIR%%/rfc/rfc1905.txt
+%%DOCSDIR%%/rfc/rfc2058.txt
+%%DOCSDIR%%/rfc/rfc2059.txt
+%%DOCSDIR%%/rfc/rfc2138.txt
+%%DOCSDIR%%/rfc/rfc2139.txt
+%%DOCSDIR%%/rfc/rfc2243.txt
+%%DOCSDIR%%/rfc/rfc2289.txt
+%%DOCSDIR%%/rfc/rfc2433.txt
+%%DOCSDIR%%/rfc/rfc2548.txt
+%%DOCSDIR%%/rfc/rfc2618.txt
+%%DOCSDIR%%/rfc/rfc2619.txt
+%%DOCSDIR%%/rfc/rfc2620.txt
+%%DOCSDIR%%/rfc/rfc2621.txt
+%%DOCSDIR%%/rfc/rfc2716.txt
+%%DOCSDIR%%/rfc/rfc2759.txt
+%%DOCSDIR%%/rfc/rfc2809.txt
+%%DOCSDIR%%/rfc/rfc2865.txt
+%%DOCSDIR%%/rfc/rfc2866.txt
+%%DOCSDIR%%/rfc/rfc2867.txt
+%%DOCSDIR%%/rfc/rfc2868.txt
+%%DOCSDIR%%/rfc/rfc2869.txt
+%%DOCSDIR%%/rfc/rfc2882.txt
+%%DOCSDIR%%/rfc/rfc2924.txt
+%%DOCSDIR%%/rfc/rfc3162.txt
+%%DOCSDIR%%/rlm_acct_unique
+%%DOCSDIR%%/rlm_always
+%%DOCSDIR%%/rlm_attr_filter
+%%DOCSDIR%%/rlm_dbm
+%%DOCSDIR%%/rlm_detail
+%%DOCSDIR%%/rlm_digest
+%%DOCSDIR%%/rlm_eap
+%%DOCSDIR%%/rlm_expr
+%%DOCSDIR%%/rlm_fastusers
+%%DOCSDIR%%/rlm_krb5
+%%DOCSDIR%%/rlm_ldap
+%%DOCSDIR%%/rlm_mschap
+%%DOCSDIR%%/rlm_pam
+%%DOCSDIR%%/rlm_passwd
+%%DOCSDIR%%/rlm_python
+%%DOCSDIR%%/rlm_sql
+%%DOCSDIR%%/rlm_sqlcounter
+%%DOCSDIR%%/rlm_unix
+%%DOCSDIR%%/rlm_x99_token
+%%DOCSDIR%%/supervise-radiusd.txt
+%%DOCSDIR%%/tuning_guide
+%%DOCSDIR%%/variables.txt
+%%DATADIR%%/dictionary
+%%DATADIR%%/dictionary.acc
+%%DATADIR%%/dictionary.alcatel
+%%DATADIR%%/dictionary.alteon
+%%DATADIR%%/dictionary.altiga
+%%DATADIR%%/dictionary.aptis
+%%DATADIR%%/dictionary.ascend
+%%DATADIR%%/dictionary.bay
+%%DATADIR%%/dictionary.bintec
+%%DATADIR%%/dictionary.cabletron
+%%DATADIR%%/dictionary.cisco
+%%DATADIR%%/dictionary.cisco.bbsm
+%%DATADIR%%/dictionary.cisco.vpn3000
+%%DATADIR%%/dictionary.cisco.vpn5000
+%%DATADIR%%/dictionary.colubris
+%%DATADIR%%/dictionary.columbia_university
+%%DATADIR%%/dictionary.compat
+%%DATADIR%%/dictionary.erx
+%%DATADIR%%/dictionary.extreme
+%%DATADIR%%/dictionary.foundry
+%%DATADIR%%/dictionary.freeradius
+%%DATADIR%%/dictionary.itk
+%%DATADIR%%/dictionary.juniper
+%%DATADIR%%/dictionary.livingston
+%%DATADIR%%/dictionary.microsoft
+%%DATADIR%%/dictionary.netscreen
+%%DATADIR%%/dictionary.nokia
+%%DATADIR%%/dictionary.nomadix
+%%DATADIR%%/dictionary.quintum
+%%DATADIR%%/dictionary.redback
+%%DATADIR%%/dictionary.redcreek
+%%DATADIR%%/dictionary.shasta
+%%DATADIR%%/dictionary.shiva
+%%DATADIR%%/dictionary.springtide
+%%DATADIR%%/dictionary.telebit
+%%DATADIR%%/dictionary.tunnel
+%%DATADIR%%/dictionary.usr
+%%DATADIR%%/dictionary.versanet
+%%DATADIR%%/dictionary.wispr
+%%DATADIR%%/dictionary.xedia
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%/rfc
+@dirrm %%DOCSDIR%%
 @dirrm etc/raddb
 @exec mkdir -p /var/log/raddb
 @exec chmod -R og= /var/log/raddb