- add USE_RC_SUBR

- refine IGNORE
- bump PORTREVISION

4 files changed, 30 insertions, 27 deletions

diff --git a/sysutils/diskcheckd/Makefile b/sysutils/diskcheckd/Makefile
index 9d3d7c57c59e..c59c92bf7a3b 100644
--- a/sysutils/diskcheckd/Makefile
+++ b/sysutils/diskcheckd/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	diskcheckd
 PORTVERSION=	20010823
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	# part of port
 DISTFILES=	# part of port
@@ -17,12 +17,10 @@ EXTRACT_ONLY=	# part of port
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Daemon to check for disk read errors
 
-STARTUP=	diskcheckd.sh
 MAN8=		diskcheckd.8
 MLINKS=		diskcheckd.8 diskcheckd.conf.5
 
-NO_WRKSUBDIR=	yes
-
+USE_RC_SUBR=	diskcheckd
 CFLAGS+=	-D_PATH_CONF='\"${PREFIX}/etc/diskcheckd.conf\"'
 MAKEFILE=	/usr/share/mk/bsd.prog.mk
 MAKE_ARGS=	PROG=diskcheckd MAN8=${MAN8}
@@ -30,7 +28,7 @@ MAKE_ARGS=	PROG=diskcheckd MAN8=${MAN8}
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-IGNORE=		Not tested on anything less than 5.0, use at discretion
+IGNORE=		is not tested on anything less than 5.0, use at discretion
 .endif
 
 do-extract:
@@ -46,7 +44,6 @@ do-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd ${PREFIX}/sbin
 	${INSTALL_DATA}	${FILESDIR}/diskcheckd.conf ${PREFIX}/etc/diskcheckd.conf.sample
-	${INSTALL_SCRIPT} ${FILESDIR}/diskcheckd.sh ${PREFIX}/etc/rc.d
 	${INSTALL_MAN} ${WRKSRC}/diskcheckd.8 ${PREFIX}/man/man8
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/diskcheckd/files/diskcheckd.in b/sysutils/diskcheckd/files/diskcheckd.in
new file mode 100644
index 000000000000..2140d618c7cd
--- /dev/null
+++ b/sysutils/diskcheckd/files/diskcheckd.in
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: diskcheckd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+
+# Define these diskcheckd_* variables in one of these files:
+#	/etc/rc.conf
+#	/etc/rc.conf.local
+#	/etc/rc.conf.d/diskcheckd
+#
+# DO NOT CHANGE THE DEFAULT VALUES HERE
+
+diskcheckd_enable=${diskcheckd_enable:-"no"}
+
+. /etc/rc.subr
+
+name="diskcheckd"
+rcvar=`set_rcvar`
+command=%%PREFIX%%/sbin/diskcheckd
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/sysutils/diskcheckd/files/diskcheckd.sh b/sysutils/diskcheckd/files/diskcheckd.sh
deleted file mode 100644
index 7459f8215c22..000000000000
--- a/sysutils/diskcheckd/files/diskcheckd.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-	start)
-		[ -x ${PREFIX}/sbin/diskcheckd ] && ${PREFIX}/sbin/diskcheckd
-		;;
-	stop)
-		/usr/bin/killall diskcheckd
-		;;
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop }"
-		echo ""
-		;;
-esac
diff --git a/sysutils/diskcheckd/pkg-plist b/sysutils/diskcheckd/pkg-plist
index 9aeb1e7697d2..a7ac39d8e931 100644
--- a/sysutils/diskcheckd/pkg-plist
+++ b/sysutils/diskcheckd/pkg-plist
@@ -1,5 +1,4 @@
 sbin/diskcheckd
-etc/rc.d/diskcheckd.sh
 @unexec if cmp -s %D/etc/diskcheckd.conf.sample %D/etc/diskcheckd.conf; then rm -f %D/etc/diskcheckd.conf; fi
 etc/diskcheckd.conf.sample
 @exec if [ ! -f %D/etc/diskcheckd.conf ]; then cp %D/etc/diskcheckd.conf.sample %D/etc/diskcheckd.conf; fi