- add a better startup script with matching name

- merge post-install and install

4 files changed, 39 insertions, 22 deletions

diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index 22dca76ea0df..7ac4fae405e0 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	radiusd-cistron
 PORTVERSION=	1.6.7
-PORTREVISTION=	2
+PORTREVISTION=	3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.cistron.nl/pub/people/miquels/radius/ \
 		ftp://ftp.freeradius.org/pub/radius/
@@ -29,9 +29,22 @@ do-build:
 
 do-install:
 	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} install
+	${SED} -e "s=%%PREFIX%%=${PREFIX}=" \
+		${FILESDIR}/radiusd-cistron.sh \
+		> ${WRKSRC}/radiusd-cistron.sh
+	${INSTALL_SCRIPT} ${WRKSRC}/radiusd-cistron.sh \
+		${PREFIX}/etc/rc.d/radiusd-cistron.sh
 	@${MKDIR} -m 700 /var/log/radacct
+	${INSTALL_MAN} ${WRKSRC}/doc/radlast.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/radtest.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/radwho.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/radzap.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/clients.5rad ${MANPREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/doc/naslist.5rad ${MANPREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/doc/radiusd.8 ${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/radwatch.8 ${MANPREFIX}/man/man8
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/radiusd-cistron
+	${MKDIR} ${PREFIX}/share/doc/radiusd-cistron
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/radiusd-cistron
 	${INSTALL_DATA} ${WRKSRC}/doc/ChangeLog ${PREFIX}/share/doc/radiusd-cistron
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/radiusd-cistron
@@ -43,19 +56,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/README.simul ${PREFIX}/share/doc/radiusd-cistron
 	${INSTALL_DATA} ${WRKSRC}/doc/README.usersfile ${PREFIX}/share/doc/radiusd-cistron
 .endif
-	${INSTALL_MAN} ${WRKSRC}/doc/radlast.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/radtest.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/radwho.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/radzap.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/clients.5rad ${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/doc/naslist.5rad ${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/doc/radiusd.8 ${MANPREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/doc/radwatch.8 ${MANPREFIX}/man/man8
-
-post-install:
-	@${SED} -e "s=!!PREFIX!!=${PREFIX}=g" ${FILESDIR}/radiusd.sh.tmpl \
-		> ${PREFIX}/etc/rc.d/radiusd.sh
-	@${CHMOD} 555 ${PREFIX}/etc/rc.d/radiusd.sh
-	@${CHOWN} root:wheel ${PREFIX}/etc/rc.d/radiusd.sh
 
 .include <bsd.port.mk>
diff --git a/net/radiusd-cistron/files/radiusd-cistron.sh b/net/radiusd-cistron/files/radiusd-cistron.sh
new file mode 100644
index 000000000000..c51c91fbb299
--- /dev/null
+++ b/net/radiusd-cistron/files/radiusd-cistron.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+case "$1" in
+start)
+	[ -x %%PREFIX%%/sbin/radiusd ] &&
+	%%PREFIX%%/sbin/radiusd -y &&
+	echo -n ' radiusd'
+        ;;
+stop)
+	if test -e /var/run/radiusd.pid
+	then
+		kill `head -1 /var/run/radiusd.pid`
+		rm -f /var/run/radiusd.pid
+	fi
+	;;
+*)
+	echo ""
+	echo "Usage: $0 { start | stop }"
+	echo ""
+	;;
+esac
diff --git a/net/radiusd-cistron/files/radiusd.sh.tmpl b/net/radiusd-cistron/files/radiusd.sh.tmpl
deleted file mode 100644
index e616665f8e66..000000000000
--- a/net/radiusd-cistron/files/radiusd.sh.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-case "$1" in
-stop) killall radiusd;;
-*) [ -x !!PREFIX!!/sbin/radiusd ] && !!PREFIX!!/sbin/radiusd -y && echo -n ' radiusd';;
-esac
diff --git a/net/radiusd-cistron/pkg-plist b/net/radiusd-cistron/pkg-plist
index 165e8ca38b75..fb1ef334a895 100644
--- a/net/radiusd-cistron/pkg-plist
+++ b/net/radiusd-cistron/pkg-plist
@@ -11,7 +11,7 @@ etc/raddb/naslist.sample
 etc/raddb/naspasswd.sample
 etc/raddb/realms.sample
 etc/raddb/users.sample
-etc/rc.d/radiusd.sh
+etc/rc.d/radiusd-cistron.sh
 sbin/checkrad
 sbin/radiusd
 sbin/radrelay