Fix pkg-plist, use USE_RC_SUBR instead.

Submitted by:	maintainer

3 files changed, 46 insertions, 41 deletions

diff --git a/java/avis/Makefile b/java/avis/Makefile
index f2f9091a6657..3ca40ad5ea90 100644
--- a/java/avis/Makefile
+++ b/java/avis/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	benjsc@FreeBSD.org
 COMMENT=	Elvin Publish/Subscribe Message Bus server based on the Elvin protocol
 
+USE_RC_SUBR=	yes
 USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
@@ -64,11 +65,4 @@ do-install:
 		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
-.if !exists(${WRKDIR}/avisd.sh)
-	@${MKDIR} ${WRKDIR}
-	@${CP} ${FILESDIR}/avisd.sh ${WRKDIR}/avisd.sh
-.endif
-	@${ECHO_CMD} ">> Installing ${PREFIX}/etc/rc.d/avisd.sh startup script."
-	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/avisd.sh ${PREFIX}/etc/rc.d/avisd.sh
-
 .include <bsd.port.post.mk>
diff --git a/java/avis/files/avisd.in b/java/avis/files/avisd.in
new file mode 100644
index 000000000000..50b4b7f0298c
--- /dev/null
+++ b/java/avis/files/avisd.in
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: avisd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following line to /etc/rc.conf to enable `avisd':
+#
+#avisd_enable  (bool): Set to NO by default
+#              Set to YES to enable avisd
+#avisd_config  (path): Set to %%PREFIX%%/etc/avisd.conf
+#              by default
+#avisd_flags (params): Set to -daemon
+#              by default
+#avisd_pidfile (path): Set to /var/run/avisd.pid
+#              by default
+#avisd_logfile (path): Set to /var/log/avis.log
+#              by default
+#
+
+. %%RC_SUBR%%
+
+name="avisd"
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/avisd
+command_interpreter=/bin/sh
+required_files="%%PREFIX%%/etc/avisd.conf"
+
+# read configuration and set defaults
+load_rc_config "$name"
+
+: ${avisd_enable="NO"}
+: ${avisd_pidfile="/var/run/avisd.pid"}
+: ${avisd_flags="-daemon"}
+: ${avisd_config="%%PREFIX%%/etc/avisd.conf"}
+: ${avisd_logfile="/var/log/avisd.log"}
+
+pidfile="$avisd_pidfile"
+command_args="-c $avisd_config $avisd_flags -pidfile $pidfile -logfile $avisd_logfile"
+
+run_rc_command "$1"
diff --git a/java/avis/files/avisd.sh b/java/avis/files/avisd.sh
deleted file mode 100644
index 8c8c51917e4d..000000000000
--- a/java/avis/files/avisd.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: avisd
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-# Add the following line to /etc/rc.conf to enable `avisd':
-#
-#avisd_enable="YES"
-#
-# See avisd(1) for avisd_flags
-#
-
-. "/etc/rc.subr"
-
-name="avisd"
-rcvar=`set_rcvar`
-
-logfile="/var/log/avis.log"
-command="/usr/local/sbin/avisd"
-pidfile="/var/run/$name.pid"
-command_args="-c /usr/local/etc/$name.conf -daemon -pidfile $pidfile -logfile $logfile"
-command_interpreter=/bin/sh
-required_files="/usr/local/etc/$name.conf"
-
-# read configuration and set defaults
-load_rc_config "$name"
-: ${avisd_enable="NO"}
-: ${avisd_flags=""}
-
-run_rc_command "$1"