Add PostgreSQL support; support NOPORTDOCS.

PR:		59921
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org>

3 files changed, 106 insertions, 85 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index df34c249581a..43660749f686 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -27,7 +27,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \
 		--localstatedir=/var \
 		--disable-ltdl-install \
 		--with-ltdl-include=${LOCALBASE}/include \
-		--with-ltdl-lib=${LOCALBASE}/lib
+		--with-ltdl-lib=${LOCALBASE}/lib \
+		--with-large-files
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 .if defined(WITH_OPENLDAP)
@@ -46,6 +47,18 @@ CONFIGURE_ARGS+=--without-rlm_sql_mysql
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
+.if defined(WITH_PGSQL) || defined(WITH_POSTGRESQL)
+LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7-client
+PLIST_SUB+=	PGSQL=""
+.else
+CONFIGURE_ARGS+=--without-rlm_sql_postgresql
+PLIST_SUB+=	PGSQL="@comment "
+.endif
+
+.if defined(NOPORTDOCS)
+MAKE_ENV+=		NOPORTDOCS=yes
+.endif
+
 # rlm_x99_token seems broken
 CONFIGURE_ARGS+=--without-rlm_x99_token
 PLIST_SUB+=	TOKEN="@comment "
@@ -55,7 +68,7 @@ INSTALLS_SHLIB=	yes
 MAN1=		radclient.1 radlast.1 radtest.1 radwho.1 radzap.1
 MAN5=		acct_users.5 clients.5 dictionary.5 naslist.5 radiusd.conf.5 \
 		users.5
-MAN8=		radiusd.8 radrelay.8 radwatch.8
+MAN8=		radiusd.8 radrelay.8 radwatch.8 rlm_ippool_tool.8
 
 DICTS=		dictionary.acc dictionary.alcatel dictionary.alteon \
 	       	dictionary.altiga dictionary.aptis dictionary.ascend \
@@ -70,9 +83,9 @@ DICTS=		dictionary.acc dictionary.alcatel dictionary.alteon \
 	       	dictionary.usr dictionary.versanet
 
 post-install:
-	@${MKDIR} ${PREFIX}/etc/raddb ${PREFIX}/share/freeradius
+	@${MKDIR} ${PREFIX}/etc/raddb ${DATADIR}
 .for dict in ${DICTS}
-	${INSTALL_DATA} ${WRKSRC}/share/${dict} ${PREFIX}/share/freeradius/${dict}
+	${INSTALL_DATA} ${WRKSRC}/share/${dict} ${DATADIR}/${dict}
 .endfor
 	${INSTALL_SCRIPT} ${FILESDIR}/radiusd.sh ${PREFIX}/etc/rc.d/radiusd.sh
 
diff --git a/net/freeradius/files/patch-doc::Makefile b/net/freeradius/files/patch-doc::Makefile
index e28cdc4d9f6d..52667f1d81e7 100644
--- a/net/freeradius/files/patch-doc::Makefile
+++ b/net/freeradius/files/patch-doc::Makefile
@@ -1,8 +1,10 @@
---- doc/Makefile.orig	Thu Nov 20 14:32:45 2003
-+++ doc/Makefile	Thu Nov 20 14:33:01 2003
-@@ -21,9 +21,9 @@
+--- doc/Makefile.orig	Tue Dec 24 16:49:34 2002
++++ doc/Makefile	Wed Dec  3 13:56:45 2003
+@@ -20,12 +20,14 @@
+ 	@rm -f include/*~ *~
  
  install:
++ifndef NOPORTDOCS
  	$(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
@@ -11,4 +13,7 @@
 +		$(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius; \
  	done
  	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
++endif
  
+ common:
+ 	@for dir in $(SUBDIRS); do \
diff --git a/net/freeradius/pkg-plist b/net/freeradius/pkg-plist
index 51058c1fb655..b361e5fe08a4 100644
--- a/net/freeradius/pkg-plist
+++ b/net/freeradius/pkg-plist
@@ -172,10 +172,13 @@ lib/rlm_sql-%%PORTVERSION%%.so
 lib/rlm_sql.a
 lib/rlm_sql.la
 lib/rlm_sql.so
+%%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
-%%MYSQL%%lib/rlm_sql_mysql.so.0
+%%PGSQL%%lib/rlm_sql_postgresql-%%PORTVERSION%%.so
+%%PGSQL%%lib/rlm_sql_postgresql.a
+%%PGSQL%%lib/rlm_sql_postgresql.la
 lib/rlm_unix-%%PORTVERSION%%.la
 lib/rlm_unix-%%PORTVERSION%%.so
 lib/rlm_unix.a
@@ -191,81 +194,81 @@ sbin/checkrad
 sbin/radiusd
 sbin/radwatch
 sbin/rc.radiusd
-%%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
+%%PORTDOCS%%%%DOCSDIR%%/Autz-Type
+%%PORTDOCS%%%%DOCSDIR%%/DIFFS
+%%PORTDOCS%%%%DOCSDIR%%/MACOSX
+%%PORTDOCS%%%%DOCSDIR%%/OS2
+%%PORTDOCS%%%%DOCSDIR%%/RADIUS-LDAP.schema
+%%PORTDOCS%%%%DOCSDIR%%/RADIUS-LDAPv3.schema
+%%PORTDOCS%%%%DOCSDIR%%/RADIUS-SQL.schema
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/Simultaneous-Use
+%%PORTDOCS%%%%DOCSDIR%%/aaa.txt
+%%PORTDOCS%%%%DOCSDIR%%/ascend
+%%PORTDOCS%%%%DOCSDIR%%/bay
+%%PORTDOCS%%%%DOCSDIR%%/bugs
+%%PORTDOCS%%%%DOCSDIR%%/cisco
+%%PORTDOCS%%%%DOCSDIR%%/coding-methods.txt
+%%PORTDOCS%%%%DOCSDIR%%/configurable_failover
+%%PORTDOCS%%%%DOCSDIR%%/duplicate-users
+%%PORTDOCS%%%%DOCSDIR%%/module_interface
+%%PORTDOCS%%%%DOCSDIR%%/performance-testing
+%%PORTDOCS%%%%DOCSDIR%%/processing_users_file
+%%PORTDOCS%%%%DOCSDIR%%/proxy
+%%PORTDOCS%%%%DOCSDIR%%/radrelay
+%%PORTDOCS%%%%DOCSDIR%%/rfc/attributes.html
+%%PORTDOCS%%%%DOCSDIR%%/rfc/draft-sterman-aaa-sip-00.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/leap.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1157.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1227.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1448.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1901.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1905.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2058.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2059.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2138.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2139.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2243.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2289.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2433.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2548.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2618.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2619.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2620.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2621.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2716.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2759.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2809.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2865.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2866.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2867.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2868.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2869.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2882.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2924.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3162.txt
+%%PORTDOCS%%%%DOCSDIR%%/rlm_acct_unique
+%%PORTDOCS%%%%DOCSDIR%%/rlm_always
+%%PORTDOCS%%%%DOCSDIR%%/rlm_attr_filter
+%%PORTDOCS%%%%DOCSDIR%%/rlm_dbm
+%%PORTDOCS%%%%DOCSDIR%%/rlm_detail
+%%PORTDOCS%%%%DOCSDIR%%/rlm_digest
+%%PORTDOCS%%%%DOCSDIR%%/rlm_eap
+%%PORTDOCS%%%%DOCSDIR%%/rlm_expr
+%%PORTDOCS%%%%DOCSDIR%%/rlm_fastusers
+%%PORTDOCS%%%%DOCSDIR%%/rlm_krb5
+%%PORTDOCS%%%%DOCSDIR%%/rlm_ldap
+%%PORTDOCS%%%%DOCSDIR%%/rlm_mschap
+%%PORTDOCS%%%%DOCSDIR%%/rlm_pam
+%%PORTDOCS%%%%DOCSDIR%%/rlm_passwd
+%%PORTDOCS%%%%DOCSDIR%%/rlm_python
+%%PORTDOCS%%%%DOCSDIR%%/rlm_sql
+%%PORTDOCS%%%%DOCSDIR%%/rlm_sqlcounter
+%%PORTDOCS%%%%DOCSDIR%%/rlm_unix
+%%PORTDOCS%%%%DOCSDIR%%/rlm_x99_token
+%%PORTDOCS%%%%DOCSDIR%%/supervise-radiusd.txt
+%%PORTDOCS%%%%DOCSDIR%%/tuning_guide
+%%PORTDOCS%%%%DOCSDIR%%/variables.txt
 %%DATADIR%%/dictionary
 %%DATADIR%%/dictionary.acc
 %%DATADIR%%/dictionary.alcatel
@@ -307,8 +310,8 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.wispr
 %%DATADIR%%/dictionary.xedia
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%/rfc
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm etc/raddb
 @exec mkdir -p /var/log/raddb
 @exec chmod -R og= /var/log/raddb