Remove unneeded INSTALL script and update the rplayd.sh to look like an

rc.d script.

3 files changed, 34 insertions, 28 deletions

diff --git a/audio/rplay/INSTALL b/audio/rplay/INSTALL
deleted file mode 100644
index 1bfa6e5f388..00000000000
--- a/audio/rplay/INSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/11/01 00:17:50 zuntum Exp $
-
-case $2 in
-PRE-INSTALL)
-	;;
-
-POST-INSTALL)
-	if [ ! -f ${PKG_PREFIX}/etc/rplay.conf ]; then
-		echo "localhost" >> ${PKG_PREFIX}/etc/rplay.conf
-	fi
-	;;
-esac
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 87664fbff79..83100103e5c 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/08/27 14:35:04 tron Exp $
+# $NetBSD: Makefile,v 1.30 2001/11/21 17:55:55 jlam Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp
 #
 
@@ -14,23 +14,25 @@ COMMENT=	Network audio player
 BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
 
 USE_BUILDLINK_ONLY=	YES
-USE_LIBTOOL=	# defined
-GNU_CONFIGURE=	# defined
-CONFIGURE_ENV+=	RPLAY_TARGET=generic	# XXX generic, or oss, or sun?
+USE_LIBTOOL=		YES
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--sysconfdir=${CONFDIR}
+CONFIGURE_ENV+=		RPLAY_TARGET=generic	# XXX generic, or oss, or sun?
 
 INFO_FILES=	RPLAY.info RPTP.info librplay.info rplay.info
 
 pre-configure:
-	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf
-	cd ${WRKSRC}/doc; for f in *.[0-9]; do				\
-		${SED} -e "s|/usr/local|${PREFIX}|g" $$f > $$f.pdone;	\
-		${MV} -f $$f.pdone $$f;					\
+	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf --force
+	cd ${WRKSRC}/doc; for manpage in *.[0-9]; do			\
+		${SED}	-e "s|/usr/local/etc|${CONFDIR}|g"		\
+			-e "s|/usr/local|${PREFIX}|g"			\
+			$${manpage} > $${manpage}.pdone;		\
+		${MV} -f $${manpage}.pdone $${manpage};			\
 	done
 
 post-install:
-	${SED} -e "s|@PREFIX@|${PREFIX}|g"				\
-		${FILESDIR}/rplayd.sh > ${WRKDIR}/rplayd.sh
-	${INSTALL_SCRIPT} ${WRKDIR}/rplayd.sh ${PREFIX}/etc/rc.d/rplayd
+	${SED} ${FILES_SUBST_SED} ${FILESDIR}/rplayd.sh > ${WRKDIR}/rplayd
+	${INSTALL_SCRIPT} ${WRKDIR}/rplayd ${PREFIX}/etc/rc.d/rplayd
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../audio/gsm/buildlink.mk"
diff --git a/audio/rplay/files/rplayd.sh b/audio/rplay/files/rplayd.sh
index c1b7c7dfdc9..e9095dd4e38 100644
--- a/audio/rplay/files/rplayd.sh
+++ b/audio/rplay/files/rplayd.sh
@@ -1,7 +1,25 @@
 #!/bin/sh
 #
-# $NetBSD: rplayd.sh,v 1.1 2000/01/26 22:11:36 jlam Exp $
+# $NetBSD: rplayd.sh,v 1.2 2001/11/21 17:55:55 jlam Exp $
+#
+# PROVIDE: rplayd
+# REQUIRE: DAEMON
+
+if [ -d /etc/rc.d -a -f /etc/rc.subr ]
+then
+	. /etc/rc.subr
+fi
+
+name="rplayd"
+rcvar=$name
+command="@PREFIX@/sbin/${name}"
+required_files="@CONFDIR@/rplay.conf"
 
-if [ -x @PREFIX@/sbin/rplayd ]; then
-	echo -n ' rplayd';	@PREFIX@/sbin/rplayd
+if [ ! -d /etc/rc.d ]
+then
+	@ECHO@ -n ' ${name}'
+	${command} ${rplayd_flags} ${command_args}
+else
+	load_rc_config $name
+	run_rc_command "$1"
 fi