Mon Aug 30 21:49:00 2021 UTC ()
mediatomb: improve the RC script provided

This should now work both with and without rc.subr available, on NetBSD and
with rc.subr from pkgsrc.

While there, update the homepage.

Tested on NetBSD/amd64.

Bumps PKGREVISION.


(khorben)
diff -r1.79 -r1.80 pkgsrc/multimedia/mediatomb/Makefile
diff -r1.3 -r1.4 pkgsrc/multimedia/mediatomb/files/mediatomb.sh
cvs diff -r1.79 -r1.80 pkgsrc/multimedia/mediatomb/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mediatomb/Makefile 2021/08/29 23:14:04 1.79
+++ pkgsrc/multimedia/mediatomb/Makefile 2021/08/30 21:49:00 1.80
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile,v 1.79 2021/08/29 23:14:04 khorben Exp $ 1# $NetBSD: Makefile,v 1.80 2021/08/30 21:49:00 khorben Exp $
2 2
3DISTNAME= mediatomb-0.12.1 3DISTNAME= mediatomb-0.12.1
4PKGREVISION= 57 4PKGREVISION= 58
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mediatomb/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mediatomb/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://mediatomb.cc/ 9HOMEPAGE= https://sourceforge.net/projects/mediatomb/
10COMMENT= UPnP MediaServer with a web user interface 10COMMENT= UPnP MediaServer with a web user interface
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14USE_TOOLS+= automake autoconf autoreconf pkg-config 14USE_TOOLS+= automake autoconf autoreconf pkg-config
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16 16
17RCD_SCRIPTS= mediatomb 17RCD_SCRIPTS= mediatomb
18 18
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20 20
21PKG_GROUPS= ${MEDIATOMB_GROUP} 21PKG_GROUPS= ${MEDIATOMB_GROUP}
22PKG_USERS= ${MEDIATOMB_USER}:${MEDIATOMB_GROUP} 22PKG_USERS= ${MEDIATOMB_USER}:${MEDIATOMB_GROUP}
cvs diff -r1.3 -r1.4 pkgsrc/multimedia/mediatomb/files/mediatomb.sh (expand / switch to unified diff)

--- pkgsrc/multimedia/mediatomb/files/mediatomb.sh 2021/08/29 23:14:04 1.3
+++ pkgsrc/multimedia/mediatomb/files/mediatomb.sh 2021/08/30 21:49:00 1.4
@@ -1,27 +1,33 @@ @@ -1,27 +1,33 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: mediatomb.sh,v 1.3 2021/08/29 23:14:04 khorben Exp $ 3# $NetBSD: mediatomb.sh,v 1.4 2021/08/30 21:49:00 khorben Exp $
4# 4#
5# PROVIDE: mediatomb 5# PROVIDE: mediatomb
6# REQUIRE: DAEMON 6# REQUIRE: DAEMON
7# KEYWORD: shutdown 7# KEYWORD: shutdown
 8#
 9# You will need to set some variables in @PKG_SYSCONFDIR@/rc.conf to start mediatomb:
 10#
 11# mediatomb=YES
8 12
9. @SYSCONFBASE@/rc.subr 13if [ -f @SYSCONFBASE@/rc.subr ]; then
 14 . @SYSCONFBASE@/rc.subr
 15 load_rc_config_var mediatomb_username mediatomb_username
 16 load_rc_config_var mediatomb_groupname mediatomb_groupname
 17fi
10 18
11name="mediatomb" 19name="mediatomb"
12rcvar=$name 20rcvar=$name
13load_rc_config_var mediatomb_username mediatomb_username 
14load_rc_config_var mediatomb_groupname mediatomb_groupname 
15command="@PREFIX@/bin/mediatomb" 21command="@PREFIX@/bin/mediatomb"
16logfile="@VARBASE@/log/${name}.log" 22logfile="@VARBASE@/log/${name}.log"
17pidfile="@PKG_HOME@/${name}.pid" 23pidfile="@PKG_HOME@/${name}.pid"
18command_args="-d -u ${mediatomb_username:-@MEDIATOMB_USER@} -g ${mediatomb_groupname:-@MEDIATOMB_USER@} -m @PKG_HOME@ -P ${pidfile} -l ${logfile} -c @PKG_SYSCONFDIR@/config.xml" 24command_args="-d -u ${mediatomb_username:-@MEDIATOMB_USER@} -g ${mediatomb_groupname:-@MEDIATOMB_USER@} -m @PKG_HOME@ -P ${pidfile} -l ${logfile} -c @PKG_SYSCONFDIR@/config.xml"
19extra_commands="reload" 25extra_commands="reload"
20 26
21if [ -f @SYSCONFBASE@/rc.subr ]; then 27if [ -f @SYSCONFBASE@/rc.subr ]; then
22 load_rc_config $name 28 load_rc_config $name
23 run_rc_command "$1" 29 run_rc_command "$1"
24else 30else
25 echo -n "${name}" 31 echo -n "${name}"
26 ${command} ${mediatomb_flags} ${command_args} 32 ${command} ${mediatomb_flags} ${command_args}
27fi 33fi