5 files changed, 40 insertions, 46 deletions

diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index b6f3a7cc063c..161dd380a0b2 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -5,12 +5,13 @@
 # $FreeBSD$
 
 PORTNAME=	gnu-radius
-PORTVERSION=	0.96.4
+PORTVERSION=	1.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	radius
+DISTNAME=       radius-1.0
 
-MAINTAINER=	lance@evitel.net
+MAINTAINER=	lance@merlin.net.ua
 COMMENT=	GNU RADIUS server
 
 #MAKEFILE=	Makefile
@@ -18,6 +19,7 @@ COMMENT=	GNU RADIUS server
 USE_SUBMAKE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	# empty
 
 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 514c6de8bd1d..092b44ad668a 100644
--- a/net/gnu-radius/distinfo
+++ b/net/gnu-radius/distinfo
@@ -1 +1 @@
-MD5 (gnu-radius-0.96.4.tar.gz) = 95eaadf48e0d8662bdaadfdaebd7df37
+MD5 (radius-1.0.tar.gz) = 0d17140cc44ea7cff25b93a809595f8f
diff --git a/net/gnu-radius/files/patch-symtab.c b/net/gnu-radius/files/patch-symtab.c
deleted file mode 100644
index c1616834b72d..000000000000
--- a/net/gnu-radius/files/patch-symtab.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- radlib/symtab.c.orig	Tue Nov 27 12:13:36 2001
-+++ radlib/symtab.c	Wed Apr 24 09:54:42 2002
-@@ -307,6 +307,9 @@
- {
- 	int i;
- 	Symbol *sym, *next;
-+
-+	if (symtab->hash_num == -1)
-+		return;
- 	
- 	for (i = 0; i < hash_size[symtab->hash_num]; i++) {
- 		sym = symtab->sym[i];
diff --git a/net/gnu-radius/pkg-plist b/net/gnu-radius/pkg-plist
index 392544a8cfe4..a75e925c884a 100644
--- a/net/gnu-radius/pkg-plist
+++ b/net/gnu-radius/pkg-plist
@@ -1,43 +1,35 @@
-bin/radwho
-bin/radzap
+bin/builddbm
+bin/radgrep
 bin/radlast
-bin/raduse
 bin/radping
-bin/radgrep
 bin/radtest
-bin/builddbm
-sbin/radauth
-sbin/radiusd
-sbin/radctl
+bin/radwho
+bin/radzap
 etc/raddb/access.deny
 etc/raddb/client.conf
 etc/raddb/clients
 etc/raddb/config
-etc/raddb/config.syntax
+etc/raddb/dict/ascend
+etc/raddb/dict/ascend.vs
+etc/raddb/dict/cisco
+etc/raddb/dict/compat
+etc/raddb/dict/livingston
+etc/raddb/dict/tunnel
+etc/raddb/dict/usr
+etc/raddb/dict/voip
 etc/raddb/dictionary
 etc/raddb/hints
 etc/raddb/huntgroups
-etc/raddb/nas.rc
+etc/raddb/menus/menu1
+etc/raddb/menus/menu2
 etc/raddb/naslist
 etc/raddb/nastypes
 etc/raddb/realms
 etc/raddb/rewrite
-etc/raddb/rewrite.full
 etc/raddb/sqlserver
 etc/raddb/users
-etc/raddb/dict/ascend
-etc/raddb/dict/cisco
-etc/raddb/dict/livingston
-etc/raddb/dict/usr
-etc/raddb/dict/ascend.vs
-etc/raddb/dict/compat
-etc/raddb/dict/tunnel
-etc/raddb/dict/voip
-etc/raddb/menus/menu1
-etc/raddb/menus/menu2
 etc/rc.d/gnu-radius.sh
-share/gnu-radius/boot.scm
-share/gnu-radius/ttl.scm
+@unexec install-info --delete %D/info/radius.info %D/info/dir
 info/radius.info
 info/radius.info-1
 info/radius.info-2
@@ -46,10 +38,19 @@ info/radius.info-4
 info/radius.info-5
 info/radius.info-6
 info/radius.info-7
-@dirrm etc/raddb/dict
+@exec install-info %D/info/radius.info %D/info/dir
+sbin/radauth
+sbin/radctl
+sbin/radiusd
+share/locale/es/LC_MESSAGES/radius.mo
+share/locale/pl/LC_MESSAGES/radius.mo
+share/locale/ru/LC_MESSAGES/radius.mo
+share/radius/boot.scm
+share/radius/ttl.scm
+%%GUILE%%share/radius/guile-procedures.txt
 @dirrm etc/raddb/menus
+@dirrm etc/raddb/dict
 @dirrm etc/raddb
-@dirrm share/gnu-radius
 @unexec rm -f /var/run/radiusd.pid
 @unexec rm -rf /var/log/radius
 @unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radstat alone."
diff --git a/net/gnu-radius/scripts/configure b/net/gnu-radius/scripts/configure
index 80526d02ebb5..b981006c651f 100644
--- a/net/gnu-radius/scripts/configure
+++ b/net/gnu-radius/scripts/configure
@@ -18,14 +18,14 @@ MySQL		"Enable MySQL support" ON \
 PostgreSQL	"Enable PostgreSQL support" OFF \
 SNMP	    "Enable SNMP support" ON \
 Notify		"Enable TTL notification" OFF \
-2> /tmp/checklist.tmp.$$
+2> $tempfile
 
 	retval=$?
 
-	if [ -s /tmp/checklist.tmp.$$ ]; then
-		set `cat /tmp/checklist.tmp.$$`
+	if [ -s $tempfile ]; then
+		set `cat $tempfile`
 	fi
-	rm -f /tmp/checklist.tmp.$$
+	rm -f $tempfile
 
 	case $retval in
 		0)	if [ -z "$*" ]; then
@@ -59,7 +59,7 @@ while [ "$1" ]; do
 			;;
 		\"PostgreSQL\")
 			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/${POSTGRESQL_PORT}:install"
+			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}:install"
 			echo "CONFIGURE_ARGS+= --with-postgres"
 			INCLUDE_PATH="$INCLUDE_PATH:${LOCALBASE}/include/pgsql/"
 			;;
@@ -83,8 +83,11 @@ echo "CONFIGURE_ARGS+= --with-lib-path=\"$LIB_PATH\""
 
 if [ -z $GUILE ]; then
 	echo "CONFIGURE_ARGS+= --without-guile"
-echo ${PLIST}
+	echo "GUILE=	\"@comment \""
 else
 	echo "BUILD_DEPENDS+= guile:${PORTSDIR}/lang/guile"
+	echo "GUILE=	\"\""
 	unset GUILE
 fi
+
+echo "PLIST_SUB+=	GUILE=\${GUILE}"