Use the bsd.pkg.install.mk framework to install the startup shell script

and configuration files into PKG_SYSCONFDIR.

Patch provided by David Ferlier in PR pkg/20940, with more changes by me.
Bump package revision to 1.

5 files changed, 64 insertions, 11 deletions

diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index 4106c01a7b7..d4a6e24e659 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/09/09 17:11:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/30 10:30:33 xtraeme Exp $
 #
 
 DISTNAME=	icecast-1.3.12
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.icecast.org/releases/
 
@@ -11,6 +12,11 @@ COMMENT=	Internet broadcasting system using Mpeg Layer III streaming
 
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
+USE_PKGINSTALL=		yes
+
+RCD_SCRIPTS=		icecast
+PKG_SYSCONFSUBDIR=	icecast
+
 CONFIGURE_ARGS+=	--with-readline \
 			--with-libwrap \
 			--with-python
@@ -22,6 +28,13 @@ LDFLAGS+=		${BUILDLINK_LDFLAGS.${PYPACKAGE}}
 LIBS+=			-lutil
 PTHREAD_OPTS+=		native
 
+EGDIR=			${PREFIX}/share/examples/icecast
+FILES=			groups.aut mounts.aut users.aut icecast.conf
+
+.for F in ${FILES}
+CONF_FILES+=		${EGDIR}/${F}.dist ${PKG_SYSCONFDIR}/${F}
+.endfor
+			
 .include "../../devel/readline/buildlink2.mk"
 .include "../../lang/python/application.mk"
 .include "../../security/tcp_wrappers/buildlink2.mk"
diff --git a/audio/icecast/PLIST b/audio/icecast/PLIST
index 9db570326ce..6fe37ec841d 100644
--- a/audio/icecast/PLIST
+++ b/audio/icecast/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:29:33 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/09/30 10:30:33 xtraeme Exp $
 bin/icecast
-etc/icecast/groups.aut.dist
-etc/icecast/icecast.conf.dist
-etc/icecast/mounts.aut.dist
-etc/icecast/users.aut.dist
+etc/rc.d/icecast
 share/doc/icecast/manual.html
+share/examples/icecast/groups.aut.dist
+share/examples/icecast/icecast.conf.dist
+share/examples/icecast/mounts.aut.dist
+share/examples/icecast/users.aut.dist
 share/icecast/templates/306.html
 share/icecast/templates/400.html
 share/icecast/templates/403.html
@@ -24,8 +25,5 @@ share/icecast/templates/manual.html
 share/icecast/templates/mountlist.html
 share/icecast/templates/statistics.html
 @dirrm share/icecast/templates
-@exec ${MKDIR} %D/share/icecast/static
-@dirrm share/icecast/static
-@dirrm share/icecast
+@dirrm share/examples/icecast
 @dirrm share/doc/icecast
-@dirrm etc/icecast
diff --git a/audio/icecast/distinfo b/audio/icecast/distinfo
index 65727063d7e..5529dda61fb 100644
--- a/audio/icecast/distinfo
+++ b/audio/icecast/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2003/09/09 17:11:16 jmmv Exp $
+$NetBSD: distinfo,v 1.7 2003/09/30 10:30:33 xtraeme Exp $
 
 SHA1 (icecast-1.3.12.tar.gz) = bacb760390453718de536b85979ff3a9a73c7710
 Size (icecast-1.3.12.tar.gz) = 269822 bytes
 SHA1 (patch-aa) = 169202f563e4e2812d8d532264dcdb4f9ffc8df2
 SHA1 (patch-ab) = a1039a552874ffcfc8fc25b867e259bf14aa46cc
+SHA1 (patch-ac) = 95454920dea0bb01a467920dd07b2a4f889bd3be
diff --git a/audio/icecast/files/icecast.sh b/audio/icecast/files/icecast.sh
new file mode 100644
index 00000000000..a06218204a7
--- /dev/null
+++ b/audio/icecast/files/icecast.sh
@@ -0,0 +1,27 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# PROVIDE: icecast
+# REQUIRE: DAEMON LOGIN network
+
+
+name="icecast"
+command="@PREFIX@/bin/${name}"
+mainconfigfile="@PKG_SYSCONFDIR@/${name}.conf"
+icecast_flags="-c ${mainconfigfile} -d @PKG_SYSCONFDIR@ -b"
+sig_stop="KILL"
+
+
+. /etc/rc.subr
+
+
+pidfile="/var/run/${name}.pid"
+required_files="${mainconfigfile}"
+
+
+load_rc_config $name
+run_rc_command "$1"
+
+
+if [ "$1" != "stop" ]; then
+	echo $(check_process $command) > $pidfile
+fi
diff --git a/audio/icecast/patches/patch-ac b/audio/icecast/patches/patch-ac
new file mode 100644
index 00000000000..367f02eb1f0
--- /dev/null
+++ b/audio/icecast/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2003/09/30 10:30:33 xtraeme Exp $
+
+--- conf/Makefile.in.orig	2003-09-30 12:09:22.000000000 +0200
++++ conf/Makefile.in	2003-09-30 12:09:58.000000000 +0200
+@@ -83,7 +83,8 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-etcdir = $(ICECAST_ETCDIR_INST)
++EGDIR = $(prefix)/share/examples/icecast
++etcdir = $(EGDIR)
+ etc_DATA = groups.aut.dist icecast.conf.dist mounts.aut.dist users.aut.dist
+ 
+ EXTRA_DIST = $(etc_DATA)