[pkgsrc/trunk]: pkgsrc/chat/jabberd2 Update jabberd2 to jabberd-2.0s2nb1

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/32e76e7598f1
branches:  trunk
changeset: 477058:32e76e7598f1
user:      abs <abs%pkgsrc.org@localhost>
date:      Sat Jun 26 11:21:46 2004 +0000

description:
Update jabberd2 to jabberd-2.0s2nb1
Since the various jabber daemons need to write their pid files as the
jabberd user, ensure a jabberd owned /var/run/jabberd is created by rc.d files

diffstat:

 chat/jabberd2/Makefile          |  5 +++--
 chat/jabberd2/files/c2s.sh      |  9 ++++++++-
 chat/jabberd2/files/resolver.sh |  9 ++++++++-
 chat/jabberd2/files/router.sh   |  9 ++++++++-
 chat/jabberd2/files/s2s.sh      |  9 ++++++++-
 chat/jabberd2/files/sm.sh       |  9 ++++++++-
 6 files changed, 43 insertions(+), 7 deletions(-)

diffs (147 lines):

diff -r 1ce6beacf72a -r 32e76e7598f1 chat/jabberd2/Makefile
--- a/chat/jabberd2/Makefile    Sat Jun 26 11:02:12 2004 +0000
+++ b/chat/jabberd2/Makefile    Sat Jun 26 11:21:46 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/06/03 10:14:13 abs Exp $
+# $NetBSD: Makefile,v 1.4 2004/06/26 11:21:46 abs Exp $
 #
 
 DISTNAME=              jabberd-2.0s2
+PKGREVISION=           1
 CATEGORIES=            chat
 MASTER_SITES=          http://www.jabberstudio.org/files/jabberd2/
 
@@ -132,7 +133,7 @@
 # Directory to store the database files
 JABBERD_DBDIR?=                /var/db/jabberd
 # Directory to store the pid files
-JABBERD_PIDDIR?=       /var/run
+JABBERD_PIDDIR?=       /var/run/jabberd
 
 .for f in ${JABBERD_LOGDIR} ${JABBERD_DBDIR} ${JABBERD_PIDDIR}
 OWN_DIRS_PERMS+=       ${f} ${JABBERD_USER} ${JABBERD_GROUP} 770
diff -r 1ce6beacf72a -r 32e76e7598f1 chat/jabberd2/files/c2s.sh
--- a/chat/jabberd2/files/c2s.sh        Sat Jun 26 11:02:12 2004 +0000
+++ b/chat/jabberd2/files/c2s.sh        Sat Jun 26 11:21:46 2004 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: c2s.sh,v 1.1.1.1 2004/03/28 19:44:07 xtraeme Exp $
+# $NetBSD: c2s.sh,v 1.2 2004/06/26 11:21:46 abs Exp $
 #
 # PROVIDE: c2s
 # REQUIRE: DAEMON
@@ -18,6 +18,13 @@
 c2s_user="@JABBERD_USER@"
 pidfile="@JABBERD_PIDDIR@/${name}.pid"
 stop_postcmd="remove_pidfile"
+start_precmd="ensure_piddir"
+
+ensure_piddir()
+{
+       mkdir -p @JABBERD_PIDDIR@
+       chown @JABBERD_USER@ @JABBERD_PIDDIR@
+}
 
 remove_pidfile()
 {
diff -r 1ce6beacf72a -r 32e76e7598f1 chat/jabberd2/files/resolver.sh
--- a/chat/jabberd2/files/resolver.sh   Sat Jun 26 11:02:12 2004 +0000
+++ b/chat/jabberd2/files/resolver.sh   Sat Jun 26 11:21:46 2004 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: resolver.sh,v 1.1.1.1 2004/03/28 19:44:07 xtraeme Exp $
+# $NetBSD: resolver.sh,v 1.2 2004/06/26 11:21:46 abs Exp $
 #
 # PROVIDE: resolver
 # REQUIRE: DAEMON c2s
@@ -18,6 +18,13 @@
 resolver_user="@JABBERD_USER@"
 pidfile="@JABBERD_PIDDIR@/${name}.pid"
 stop_postcmd="remove_pidfile"
+start_precmd="ensure_piddir"
+
+ensure_piddir()
+{
+       mkdir -p @JABBERD_PIDDIR@
+       chown @JABBERD_USER@ @JABBERD_PIDDIR@
+}
 
 remove_pidfile()
 { 
diff -r 1ce6beacf72a -r 32e76e7598f1 chat/jabberd2/files/router.sh
--- a/chat/jabberd2/files/router.sh     Sat Jun 26 11:02:12 2004 +0000
+++ b/chat/jabberd2/files/router.sh     Sat Jun 26 11:21:46 2004 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: router.sh,v 1.1.1.1 2004/03/28 19:44:07 xtraeme Exp $
+# $NetBSD: router.sh,v 1.2 2004/06/26 11:21:46 abs Exp $
 #
 # PROVIDE: router
 # REQUIRE: DAEMON c2s
@@ -18,6 +18,13 @@
 router_user="@JABBERD_USER@"
 pidfile="@JABBERD_PIDDIR@/${name}.pid"
 stop_postcmd="remove_pidfile"
+start_precmd="ensure_piddir"
+
+ensure_piddir()
+{
+       mkdir -p @JABBERD_PIDDIR@
+       chown @JABBERD_USER@ @JABBERD_PIDDIR@
+}
 
 remove_pidfile()
 {
diff -r 1ce6beacf72a -r 32e76e7598f1 chat/jabberd2/files/s2s.sh
--- a/chat/jabberd2/files/s2s.sh        Sat Jun 26 11:02:12 2004 +0000
+++ b/chat/jabberd2/files/s2s.sh        Sat Jun 26 11:21:46 2004 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: s2s.sh,v 1.1.1.1 2004/03/28 19:44:07 xtraeme Exp $
+# $NetBSD: s2s.sh,v 1.2 2004/06/26 11:21:46 abs Exp $
 #
 # PROVIDE: s2s
 # REQUIRE: DAEMON c2s
@@ -18,6 +18,13 @@
 s2s_user="@JABBERD_USER@"
 pidfile="@JABBERD_PIDDIR@/${name}.pid"
 stop_postcmd="remove_pidfile"
+start_precmd="ensure_piddir"
+
+ensure_piddir()
+{
+       mkdir -p @JABBERD_PIDDIR@
+       chown @JABBERD_USER@ @JABBERD_PIDDIR@
+}
 
 remove_pidfile()
 {
diff -r 1ce6beacf72a -r 32e76e7598f1 chat/jabberd2/files/sm.sh
--- a/chat/jabberd2/files/sm.sh Sat Jun 26 11:02:12 2004 +0000
+++ b/chat/jabberd2/files/sm.sh Sat Jun 26 11:21:46 2004 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: sm.sh,v 1.1.1.1 2004/03/28 19:44:07 xtraeme Exp $
+# $NetBSD: sm.sh,v 1.2 2004/06/26 11:21:46 abs Exp $
 #
 # PROVIDE: sm
 # REQUIRE: DAEMON c2s
@@ -18,6 +18,13 @@
 sm_user="@JABBERD_USER@"
 pidfile="@JABBERD_PIDDIR@/${name}.pid"
 stop_postcmd="remove_pidfile"
+start_precmd="ensure_piddir"
+
+ensure_piddir()
+{
+       mkdir -p @JABBERD_PIDDIR@
+       chown @JABBERD_USER@ @JABBERD_PIDDIR@
+}
 
 remove_pidfile()
 {