 @@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.42 2014/07/30 09:45:38 fhajny Exp $
+# $NetBSD: Makefile,v 1.43 2014/07/31 10:31:51 fhajny Exp $
 DISTNAME=	ejabberd-14.07
 PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ejabberd.im/
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
 LICENSE=	gnu-gpl-v2
 BUILD_DEPENDS+=		git-base>=1.5:../../devel/git-base
 CONFLICTS+=		jabberd-[0-9]*
 GNU_CONFIGURE=		yes

 @@ -1,16 +1,16 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: ejabberd.sh,v 1.3 2013/10/11 13:32:25 fhajny Exp $
+# $NetBSD: ejabberd.sh,v 1.4 2014/07/31 10:31:51 fhajny Exp $
 # $FreeBSD: ejabberd.sh.in,v 1.1 2005/08/28 15:51:48 vsevolod Exp $
+#
 # PROVIDE: ejabberd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 if [ -f /etc/rc.subr ]
 then
         . /etc/rc.subr
 fi
 name="ejabberd"
 @@ -19,61 +19,61 @@ rcvar=${name}
 command=ejabberdctl
 ejabberd_user="@EJABBERD_USER@"
 reload_cmd="ejabberd_reload"
 restart_cmd="ejabberd_reload"
 start_cmd="ejabberd_start"
 status_cmd="ejabberd_status"
 stop_cmd="ejabberd_stop"
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/bin:@PREFIX@/sbin
 EJABBERDCTL=@PREFIX@/sbin/ejabberdctl
 ejabberd_status()
+{
-    su -m $ejabberd_user -c "$EJABBERDCTL status >/dev/null"
+    su $ejabberd_user -c "$EJABBERDCTL status >/dev/null"
+}
 ejabberd_start()
+{
     echo -n "Starting $name: "
     if ejabberd_status; then
 	echo " already running."
 	exit 1
     else
-	su -m $ejabberd_user -c "$EJABBERDCTL start"
+	su $ejabberd_user -c "$EJABBERDCTL start"
     fi
     echo "$name."
+}
 ejabberd_stop()
+{
     echo -n "Stopping $name: "
-    if su -m $ejabberd_user -c "$EJABBERDCTL stop"; then
+    if su $ejabberd_user -c "$EJABBERDCTL stop"; then
 	cnt=0
         while ejabberd_status; do
             cnt=`expr $cnt + 1`
             if [ $cnt -gt 60 ]; then
                 echo -n " failed "
                 break
             fi
             sleep 1
             echo -n "."
         done
     else
         echo -n " failed "
     fi
     echo "$name."
+}
 ejabberd_reload()
+{
     echo -n "Restarting $name: "
     if ejabberd_status; then
-        su -m $ejabberd_user -c "$EJABBERDCTL restart"
+        su $ejabberd_user -c "$EJABBERDCTL restart"
     else
         ejabberd_start
     fi
     echo "$name."
+}
 load_rc_config $name
 run_rc_command "$1"

 @@ -13,26 +13,29 @@
     <dependency name='system-log' grouping='optional_all' restart_on='none' type='service'>
       <service_fmri value='svc:/system/system-log' />
     </dependency>
     <dependency name='config-files' grouping='require_any' restart_on='refresh' type='path'>
       <service_fmri value='file://localhost@PKG_SYSCONFDIR@/ejabberd.cfg' />
       <service_fmri value='file://localhost@PKG_SYSCONFDIR@/ejabberctl.cfg' />
       <service_fmri value='file://localhost@PKG_SYSCONFDIR@/inetrc' />
     </dependency>
     <dependency name='@SMF_NAME@-epmd' grouping='require_all' restart_on='none' type='service'>
       <service_fmri value='svc:/@SMF_PREFIX@/epmd' />
     </dependency>
     <method_context working_directory='@EJABBERD_DB@'>
       <method_credential user='@EJABBERD_USER@' group='@EJABBERD_GROUP@' />
       <method_environment>
         <envvar name='HOME' value='@EJABBERD_DB@' />
       </method_environment>
     </method_context>
     <exec_method name='start' type='method' exec='@PREFIX@/sbin/ejabberdctl start' timeout_seconds='120' />
     <exec_method name='stop' type='method' exec='@PREFIX@/sbin/ejabberdctl stop' timeout_seconds='60' />
     <property_group name='startd' type='framework'>
       <propval name='ignore_error' type='astring' value='core,signal' />
     </property_group>
     <stability value='Unstable' />
     <template>
       <common_name>
         <loctext xml:lang='C'>ejabberd - the Erlang Jabber/XMPP daemon</loctext>
       </common_name>
     </template>
   </service>