[MAINTAINER] irc/kvirc: [New MASTER_SITES, Fix arts support]

	- Remove duplicate and inactive mirror from MASTER_SITES
	- Add new official mirrors to MASTER_SITES
	- Fix arts support, add OPTIONS for audio settings and use correct entries for LIB_DEPENDS
	- Use DATADIR in pkg-plist

PR:		ports/75082
Submitted by:	Michael Ranner <mranner@inode.at>

5 files changed, 73 insertions, 13 deletions

diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 4c17a2047739..490dba82ecd6 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	gnu-radius
-PORTVERSION=	1.2.95
+PORTVERSION=	1.3
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	radius
 DISTNAME=	radius-${PORTVERSION}
 
@@ -23,6 +23,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	# empty
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
 INFO=		radius
 MAN1=		radgrep.1 radlast.1 raduse.1 radwho.1
 MAN8=		builddbm.8 radctl.8 radiusd.8 radping.8 radzap.8
diff --git a/net/gnu-radius/distinfo b/net/gnu-radius/distinfo
index 1e8483e74aa6..154ff22d307b 100644
--- a/net/gnu-radius/distinfo
+++ b/net/gnu-radius/distinfo
@@ -1,2 +1,2 @@
-MD5 (radius-1.2.95.tar.gz) = b2647149f012b02f65e9a2f45fafcb59
-SIZE (radius-1.2.95.tar.gz) = 2027511
+MD5 (radius-1.3.tar.gz) = ab0223f6504355c4827a7c03cb4e21b0
+SIZE (radius-1.3.tar.gz) = 2047469
diff --git a/net/gnu-radius/files/patch-dbm b/net/gnu-radius/files/patch-dbm
new file mode 100644
index 000000000000..66b842d7b18d
--- /dev/null
+++ b/net/gnu-radius/files/patch-dbm
@@ -0,0 +1,11 @@
+--- radiusd/builddbm.c.orig	Wed Dec  8 14:22:52 2004
++++ radiusd/builddbm.c	Wed Dec  8 14:23:11 2004
+@@ -57,7 +57,7 @@
+ 
+         if (2 + check_len + reply_len > closure->pair_buffer_size) {
+                 grad_log(L_ERR, "%s:%d: %s",
+-                         closure->filename, sym->lineno,
++                         closure->filename, sym->loc.line,
+ 		         _("too many attributes"));
+                 return -1;
+         }
diff --git a/net/gnu-radius/pkg-plist b/net/gnu-radius/pkg-plist
index ebf26b086d76..90b08112129f 100644
--- a/net/gnu-radius/pkg-plist
+++ b/net/gnu-radius/pkg-plist
@@ -59,18 +59,38 @@ lib/libgnuradius.a
 lib/libgnuradius.la
 lib/libgnuradius.so
 lib/libgnuradius.so.0
+%%GUILE%%bin/radsession
+%%GUILE%%lib/libradscm.a
+%%GUILE%%lib/libradscm.la
+%%GUILE%%lib/libradscm.so
+%%GUILE%%lib/libradscm.so.0
+%%CLIENT%%lib/libservscm.a
+%%CLIENT%%lib/security/pam_radius.a
+%%CLIENT%%lib/security/pam_radius.la
+%%CLIENT%%lib/security/pam_radius.so
+%%CLIENT%%libexec/nas.scm
 share/locale/ca/LC_MESSAGES/radius.mo
 share/locale/es/LC_MESSAGES/radius.mo
 share/locale/pl/LC_MESSAGES/radius.mo
 share/locale/ru/LC_MESSAGES/radius.mo
-%%GUILE%%share/radius/guile-procedures.txt
-share/radius/1.2.95/rewrite/checknas.rw
-share/radius/1.2.95/rewrite/log-hook.rw
-share/radius/1.2.95/rewrite/nas-ip.rw
-@dirrm share/radius/1.2.95/scheme
-@dirrm share/radius/1.2.95/rewrite
-@dirrm share/radius/1.2.95/modules
-@dirrm share/radius/1.2.95
+%%GUILE%%share/radius/%%PORTVERSION%%/scheme/gnuradius.scm
+%%GUILE%%share/radius/%%PORTVERSION%%/scheme/ipalloc.scm
+%%GUILE%%share/radius/%%PORTVERSION%%/scheme/radiusd.scm
+%%GUILE%%share/radius/%%PORTVERSION%%/scheme/ttl.scm
+%%GUILE%%share/radius/%%PORTVERSION%%/scheme/guile-procedures.txt
+share/radius/%%PORTVERSION%%/rewrite/checknas.rw
+share/radius/%%PORTVERSION%%/rewrite/log-hook.rw
+share/radius/%%PORTVERSION%%/rewrite/nas-ip.rw
+%%MYSQL%%share/radius/%%PORTVERSION%%/modules/mysql.a
+%%MYSQL%%share/radius/%%PORTVERSION%%/modules/mysql.la
+%%MYSQL%%share/radius/%%PORTVERSION%%/modules/mysql.so
+%%PGSQL%%share/radius/%%PORTVERSION%%/modules/postgres.a
+%%PGSQL%%share/radius/%%PORTVERSION%%/modules/postgres.la
+%%PGSQL%%share/radius/%%PORTVERSION%%/modules/postgres.so
+@dirrm share/radius/%%PORTVERSION%%/scheme
+@dirrm share/radius/%%PORTVERSION%%/rewrite
+@dirrm share/radius/%%PORTVERSION%%/modules
+@dirrm share/radius/%%PORTVERSION%%
 @dirrm share/radius
 @unexec rm -f /var/run/radiusd.pid
 @unexec rm -rf /var/log/radius
diff --git a/net/gnu-radius/scripts/configure b/net/gnu-radius/scripts/configure
index b7e03ad9686d..5e95f25e93b1 100644
--- a/net/gnu-radius/scripts/configure
+++ b/net/gnu-radius/scripts/configure
@@ -47,7 +47,8 @@ LIB_PATH=${LOCALBASE}/lib/
 while [ "$1" ]; do
 	case $1 in
 		\"Client\")
-			echo "CONFIGURE_ARGS+= --with-client"
+			echo "CONFIGURE_ARGS+= --enable-client"
+			export CLIENT=Yes
 			export GUILE=Yes
 			;;
 		\"DBM\")
@@ -57,12 +58,14 @@ while [ "$1" ]; do
 			echo "USE_MYSQL=	YES"
 			echo "CONFIGURE_ARGS+= --with-mysql"
 			LIB_PATH="$LIB_PATH:${LOCALBASE}/lib/mysql/"
+			export MYSQL=Yes
 			;;
 		\"PostgreSQL\")
 			echo "POSTGRESQL_PORT?=	databases/postgresql7"
 			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
 			echo "CONFIGURE_ARGS+= --with-postgres"
 			INCLUDE_PATH="$INCLUDE_PATH:${LOCALBASE}/include/pgsql/"
+			export PGSQL=Yes
 			;;
 		\"SNMP\")
 			echo "CONFIGURE_ARGS+= --enable-snmp"
@@ -91,4 +94,28 @@ else
 	unset GUILE
 fi
 
+if [ -z $CLIENT ]; then
+	echo "CLIENT=   \"@comment \""
+else
+	echo "CLIENT=   \"\""
+	unset CLIENT
+fi
+
+if [ -z $MYSQL ]; then
+	echo "MYSQL=    \"@comment \""
+else
+	echo "MYSQL=    \"\""
+	unset MYSQL
+fi
+
+if [ -z $PGSQL ]; then
+	echo "PGSQL=    \"@comment \""
+else
+	echo "PGSQL=    \"\""
+	unset PGSQL
+fi
+
 echo "PLIST_SUB+=	GUILE=\${GUILE}"
+echo "PLIST_SUB+=	CLIENT=\${CLIENT}"
+echo "PLIST_SUB+=	PGSQL=\${PGSQL}"
+echo "PLIST_SUB+=	MYSQL=\${MYSQL}"