summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2007-08-21 15:30:31 +0000
committerabs <abs@pkgsrc.org>2007-08-21 15:30:31 +0000
commit9768df8102cb799cc4cb6118b634daa89c1314db (patch)
treeee2ca615579d3ca53914e783147413450f22fe4b /chat
parent7f8ef871b05ef7a6b29683fdeb034d0da0eab2ac (diff)
downloadpkgsrc-9768df8102cb799cc4cb6118b634daa89c1314db.tar.gz
Update to mu-conference-0.6.0nb6
- mu-conference's rc.d script doesn't get the user/pid-file right, and does not set the runtime user From: PR#28600 by Eric Schnoebelen
Diffstat (limited to 'chat')
-rw-r--r--chat/mu-conference/Makefile4
-rw-r--r--chat/mu-conference/files/muc.sh5
2 files changed, 5 insertions, 4 deletions
diff --git a/chat/mu-conference/Makefile b/chat/mu-conference/Makefile
index a25dae3a978..6760d4d11b3 100644
--- a/chat/mu-conference/Makefile
+++ b/chat/mu-conference/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2007/07/04 20:54:33 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2007/08/21 15:30:31 abs Exp $
#
DISTNAME= mu-conference-0.6.0
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= chat
MASTER_SITES= http://jabber.terrapin.com/JCR/ http://www.jabberstudio.org/projects/mu-conference/releases/download.php?file=
DISTFILES= ${DISTNAME}.tar.gz jcr-0.1.2.tar.gz
diff --git a/chat/mu-conference/files/muc.sh b/chat/mu-conference/files/muc.sh
index 237baa27b33..323ee581658 100644
--- a/chat/mu-conference/files/muc.sh
+++ b/chat/mu-conference/files/muc.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: muc.sh,v 1.2 2004/07/08 22:26:04 abs Exp $
+# $NetBSD: muc.sh,v 1.3 2007/08/21 15:30:32 abs Exp $
#
# PROVIDE: muc
# REQUIRE: DAEMON
@@ -14,8 +14,9 @@ rcvar=$name
command="@PREFIX@/bin/mu-conference"
required_files="@PKG_SYSCONFDIR@/${name}-jcr.xml"
extra_commands="reload"
+muc_user="@JABBERD_USER@"
command_args="-c ${required_files} > /dev/null 2>&1 &"
-pidfile="@JABBERD_PIDDIR@/${name}.pid"
+pidfile="@JABBERD_PIDDIR@/`basename ${command}`.pid"
stop_postcmd="remove_pidfile"
start_precmd="ensure_piddir"