Thu Jan 15 20:53:18 2015 UTC ()
Improve minidlna rc files

In particular, it fixes the non-working stop target
Reported by J. Baker


(degroote)
diff -r1.10 -r1.11 pkgsrc/multimedia/minidlna/Makefile
diff -r1.2 -r1.3 pkgsrc/multimedia/minidlna/files/minidlna.sh
cvs diff -r1.10 -r1.11 pkgsrc/multimedia/minidlna/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/minidlna/Makefile 2015/01/14 21:32:20 1.10
+++ pkgsrc/multimedia/minidlna/Makefile 2015/01/15 20:53:18 1.11
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.10 2015/01/14 21:32:20 degroote Exp $ 1# $NetBSD: Makefile,v 1.11 2015/01/15 20:53:18 degroote Exp $
2 2
3DISTNAME= minidlna-1.1.4 3DISTNAME= minidlna-1.1.4
 4PKGREVISION= 1
4CATEGORIES= multimedia 5CATEGORIES= multimedia
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/}
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://minidlna.sourceforge.net/ 9HOMEPAGE= http://minidlna.sourceforge.net/
9COMMENT= DLNA server 10COMMENT= DLNA server
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
13EGDIR= ${PREFIX}/share/examples/minidlna 14EGDIR= ${PREFIX}/share/examples/minidlna
14USE_TOOLS+= msgfmt 15USE_TOOLS+= msgfmt
15 16
16CONF_FILES= ${EGDIR}/minidlna.conf \ 17CONF_FILES= ${EGDIR}/minidlna.conf \
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/minidlna/files/minidlna.sh (expand / switch to unified diff)

--- pkgsrc/multimedia/minidlna/files/minidlna.sh 2015/01/14 21:32:20 1.2
+++ pkgsrc/multimedia/minidlna/files/minidlna.sh 2015/01/15 20:53:18 1.3
@@ -1,23 +1,18 @@ @@ -1,23 +1,18 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: minidlna.sh,v 1.2 2015/01/14 21:32:20 degroote Exp $ 3# $NetBSD: minidlna.sh,v 1.3 2015/01/15 20:53:18 degroote Exp $
4# 4#
5# PROVIDE: minidlna 5# PROVIDE: minidlna
6# REQUIRE: DAEMON 6# REQUIRE: DAEMON
7# 7#
8 8
9. /etc/rc.subr 9. /etc/rc.subr
10 10
11name="minidlna" 11name="minidlna"
12rcvar=${name} 12required_files="@PKG_SYSCONFDIR@/minidlna.conf"
13start_cmd="start_minidlna" 
14required_files="@PKG_SYSCONFDIR@/${name}.conf" 
15pidfile="/var/run/minidlna/minidlna.pid" 13pidfile="/var/run/minidlna/minidlna.pid"
16 14command="@PREFIX@/sbin/minidlnad"
17start_minidlna() 15command_args=" -f ${required_files}"
18{ 
19 @PREFIX@/sbin/minidlnad -f ${required_files} 
20} 
21 16
22load_rc_config ${name} 17load_rc_config ${name}
23run_rc_command "$1" 18run_rc_command "$1"