5 files changed, 81 insertions, 44 deletions
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index ca5a36d33569..4c17a2047739 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 
 PORTNAME=	gnu-radius
-PORTVERSION=	1.2
-PORTREVISION=	2
+PORTVERSION=	1.2.95
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
 MASTER_SITE_SUBDIR=	radius
-DISTNAME=       radius-${PORTVERSION}
+DISTNAME=	radius-${PORTVERSION}
 
 MAINTAINER=	lance@merlin.net.ua
 COMMENT=	GNU RADIUS server
@@ -18,11 +17,13 @@ COMMENT=	GNU RADIUS server
 #MAKEFILE=	Makefile
 
 CONFLICTS=	freeradius-0.* openradius-0.* radiusd-cistron-1.*
+USE_RC_SUBR=	yes
 USE_SUBMAKE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	# empty
 
+INFO=		radius
 MAN1=		radgrep.1 radlast.1 raduse.1 radwho.1
 MAN8=		builddbm.8 radctl.8 radiusd.8 radping.8 radzap.8
 MANCOMPRESSED=	no
@@ -31,8 +32,6 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		CURDIR="${.CURDIR}" \
 		MKDIR="${MKDIR}"
 
-STARTUP_FILE=	${PREFIX}/etc/rc.d/gnu-radius.sh
-
 .if defined(BATCH)
 CONFIGURE_ARGS+=--with-include-path="${LOCALBASE}/include/" \
 		--with-lib-path="${LOCALBASE}/lib/"
@@ -45,11 +44,12 @@ post-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-patch:
+	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%RC_SUBR%%|${RC_SUBR}|g" \
+		< ${FILESDIR}/radiusd.sh > ${WRKDIR}/radiusd.sh
+
 post-install:
-	@${SED} -e "s=!!PREFIX!!=${PREFIX}=g" ${FILESDIR}/gnu-radius.sh.tmpl \
-		> ${PREFIX}/etc/rc.d/gnu-radius.sh
-	@${CHMOD} 550 ${PREFIX}/etc/rc.d/gnu-radius.sh
-	@${CHOWN} root:wheel ${PREFIX}/etc/rc.d/gnu-radius.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/radiusd.sh ${PREFIX}/etc/rc.d/radiusd.sh
 
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
diff --git a/net/gnu-radius/distinfo b/net/gnu-radius/distinfo
index d4727c555f64..1e8483e74aa6 100644
--- a/net/gnu-radius/distinfo
+++ b/net/gnu-radius/distinfo
@@ -1,2 +1,2 @@
-MD5 (radius-1.2.tar.gz) = 41efba1332ff563e1f88f2aba04d9d24
-SIZE (radius-1.2.tar.gz) = 1784097
+MD5 (radius-1.2.95.tar.gz) = b2647149f012b02f65e9a2f45fafcb59
+SIZE (radius-1.2.95.tar.gz) = 2027511
diff --git a/net/gnu-radius/files/gnu-radius.sh.tmpl b/net/gnu-radius/files/gnu-radius.sh.tmpl
deleted file mode 100644
index 894832c9ce8f..000000000000
--- a/net/gnu-radius/files/gnu-radius.sh.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-case "$1" in
-stop)
-	killall radiusd
-	;;
-*)
-	if [ -x !!PREFIX!!/sbin/radiusd ]; then
-		!!PREFIX!!/sbin/radiusd -y && echo -n ' radiusd'
-	fi
-	;;
-esac
diff --git a/net/gnu-radius/files/radiusd.sh b/net/gnu-radius/files/radiusd.sh
new file mode 100644
index 000000000000..70411d5b8596
--- /dev/null
+++ b/net/gnu-radius/files/radiusd.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# PROVIDE radiusd
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable radiusd:
+#
+# radiusd_enable="YES"
+#
+
+. %%RC_SUBR%%
+
+name=radiusd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/radiusd
+radiusd_config=${radiusd_config:-"%%PREFIX%%/etc/raddb/config"}
+required_files=${radiusd_config}
+pidfile=/var/run/radiusd.pid
+
+radiusd_enable=${radiusd_enable:-"NO"}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/gnu-radius/pkg-plist b/net/gnu-radius/pkg-plist
index ead955b684da..ebf26b086d76 100644
--- a/net/gnu-radius/pkg-plist
+++ b/net/gnu-radius/pkg-plist
@@ -1,3 +1,4 @@
+@unexec %D/etc/rc.d/radiusd.sh forcestop 2>/dev/null || true
 bin/builddbm
 bin/radgrep
 bin/radlast
@@ -5,6 +6,9 @@ bin/radping
 bin/radtest
 bin/radwho
 bin/radzap
+sbin/radauth
+sbin/radctl
+sbin/radiusd
 etc/raddb/access.deny
 etc/raddb/client.conf
 etc/raddb/clients
@@ -14,6 +18,7 @@ etc/raddb/dict/ascend.vs
 etc/raddb/dict/cisco
 etc/raddb/dict/compat
 etc/raddb/dict/livingston
+etc/raddb/dict/microsoft
 etc/raddb/dict/standard
 etc/raddb/dict/tunnel
 etc/raddb/dict/usr
@@ -21,36 +26,52 @@ etc/raddb/dict/voip
 etc/raddb/dictionary
 etc/raddb/hints
 etc/raddb/huntgroups
+etc/raddb/nas.rc
 etc/raddb/naslist
 etc/raddb/nastypes
-etc/raddb/nas.rc
 etc/raddb/realms
 etc/raddb/sqlserver
 etc/raddb/users
-etc/rc.d/gnu-radius.sh
-@unexec install-info --delete %D/info/radius.info %D/info/dir
-info/radius.info
-info/radius.info-1
-info/radius.info-2
-info/radius.info-3
-info/radius.info-4
-info/radius.info-5
-info/radius.info-6
-info/radius.info-7
-@exec install-info %D/info/radius.info %D/info/dir
-sbin/radauth
-sbin/radctl
-sbin/radiusd
+etc/rc.d/radiusd.sh
+@dirrm etc/raddb/dict
+@dirrm etc/raddb
+include/radius/argcv.h
+include/radius/argp.h
+include/radius/dictionary.h
+include/radius/envar.h
+include/radius/getopt.h
+include/radius/list.h
+include/radius/md4.h
+include/radius/md5.h
+include/radius/mem.h
+include/radius/obstack.h
+include/radius/radargp.h
+include/radius/raddbm.h
+include/radius/radius.h
+include/radius/radpaths.h
+include/radius/radscm.h
+include/radius/radutmp.h
+include/radius/sha1.h
+include/radius/symtab.h
+include/radius/types.h
+@dirrm include/radius
+lib/libgnuradius.a
+lib/libgnuradius.la
+lib/libgnuradius.so
+lib/libgnuradius.so.0
+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/scheme/boot.scm
-share/radius/1.2/scheme/ttl.scm
-share/radius/1.2/rewrite/checknas.rw
-share/radius/1.2/rewrite/log-hook.rw
-@dirrm etc/raddb/dict
-@dirrm etc/raddb
+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
+@dirrm share/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."