Jabber needs SIGKILL to die

remove redundant logfile
fix pkg-plist (mispelling and extra directory)

PR:		37363
Submitted by:	maintainer
Pointed out by:	Neil Darlow

4 files changed, 9 insertions, 16 deletions

diff --git a/net-im/jabber/files/jabberd.sh b/net-im/jabber/files/jabberd.sh
index 91773820c519..d6aa960fb6f6 100644
--- a/net-im/jabber/files/jabberd.sh
+++ b/net-im/jabber/files/jabberd.sh
@@ -7,7 +7,6 @@ fi
 
 USER="jabber"
 RUNDIR="/var/tmp"
-LOG="/var/log/jabber.log"
 HOSTNAME=`/bin/hostname`
 
 test -x ${PREFIX}/sbin/jabberd || exit 1
@@ -20,9 +19,9 @@ cd ${RUNDIR} || exit
 
 case ${1:-start} in
 start)
-    su -f -m ${USER} -c "jabberd -h ${HOSTNAME} -c ${PREFIX}/etc/jabber.xml" >${LOG} 2>&1 &;;
+    su -f -m ${USER} -c "jabberd -B -h ${HOSTNAME} -c ${PREFIX}/etc/jabber.xml" ;;
 
 stop)
-    killall jabberd;
+    killall -SIGKILL -u ${USER} jabberd;
     rm -f ${RUNDIR}/jabber.pid;
 esac
diff --git a/net-im/jabber/pkg-deinstall b/net-im/jabber/pkg-deinstall
index 0248658c829f..7c67ecc0cca6 100644
--- a/net-im/jabber/pkg-deinstall
+++ b/net-im/jabber/pkg-deinstall
@@ -55,17 +55,17 @@ fi
 
 export PATH=/bin:/usr/bin:/usr/sbin
 
-user=jabber
-group=jabber
+USER=jabber
+GROUP=jabber
 
 if ps -axc | grep -q jabberd; then
     if yesno "There are some jabberd processes running.  Shall I kill them" y
     then
-	killall jabberd
+	killall -SIGKILL -u ${USER} jabberd
 	sleep 2
     else
 	echo "OK ... I hope you know what you are doing."
     fi
 fi
 
-delete_account ${user} ${group}
+delete_account ${USER} ${GROUP}
diff --git a/net-im/jabber/pkg-install b/net-im/jabber/pkg-install
index fc8486a5f2bc..7714ddb1d21a 100644
--- a/net-im/jabber/pkg-install
+++ b/net-im/jabber/pkg-install
@@ -133,11 +133,6 @@ EOF
     chown root:${group} ${etcdir}/jabber.xml ${etcdir}/jabber.xml.sample
     chmod 640 ${etcdir}/jabber.xml ${etcdir}/jabber.xml.sample
 
-    if [ ! -f /var/log/jabber.log ]; then
-	echo "Creating \"/var/log/jabber.log\"."
-	cp /dev/null /var/log/jabber.log
-    fi
-
     if [ ! -f /var/log/jabber.error ]; then
 	echo "Creating \"/var/log/jabber.error\"."
 	cp /dev/null /var/log/jabber.error
@@ -149,8 +144,8 @@ EOF
     fi
 
     echo "Fixing log files ownerships and modes."
-    chown ${user}:${group} /var/log/jabber.log /var/log/jabber.error /var/log/jabber.record
-    chmod 640 /var/log/jabber.log /var/log/jabber.error /var/log/jabber.record
+    chown ${user}:${group} /var/log/jabber.error /var/log/jabber.record
+    chmod 640 /var/log/jabber.error /var/log/jabber.record
 
     ;;
 esac
diff --git a/net-im/jabber/pkg-plist b/net-im/jabber/pkg-plist
index a8f57d1df18c..14a96c279805 100644
--- a/net-im/jabber/pkg-plist
+++ b/net-im/jabber/pkg-plist
@@ -2,12 +2,11 @@ sbin/jabberd
 @unexec if cmp -s %D/etc/jabber.xml.sample %D/etc/jabber.xml; then rm -f %D/etc/jabber.xml; fi
 etc/jabber.xml.sample
 etc/rc.d/jabberd.sh
-include/jabber/
 include/jabber/lib/lib.h
 include/jabber/lib/xmlparse.h
 include/jabber/platform-settings
 include/jabber/jabberd.h
-include/jabberd/pth.h
+include/jabber/pth.h
 lib/jabber/dialback/dialback.so
 lib/jabber/dnsrv/dnsrv.so
 lib/jabber/jsm/jsm.so