This is an update of the net/jabberd port to version 2.0.3 (vendor

string "2.0s3") which fixes some serious memory leaks and other
significant bugs.  This update also replaces the rc.d script with
a new version that uses the rc.subr framework.

I was able to successfully compile the port with all of the WITH_*
knobs, but only have the means to test WITH_POSTGRESQL (which worked
as expected).

commiter says:
- Added extra line to files/patch-util::util.h (4.x fix)
- Changed --with-extra-include-path statements to work around
  mysql inclusion and db41 exclusion.
- Added --disable- for options not choosen.

PR:		ports/68967
Submitted by:	Kirk Strauser <kirk@strauser.com>

3 files changed, 61 insertions, 39 deletions

diff --git a/net-im/jabberd/files/jabberd.sh b/net-im/jabberd/files/jabberd.sh
index c7dee3844214..ba4d7d177121 100644
--- a/net-im/jabberd/files/jabberd.sh
+++ b/net-im/jabberd/files/jabberd.sh
@@ -1,37 +1,48 @@
-#! /bin/sh
+#!/bin/sh
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/jabberd\.sh\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
+# Start or stop jabberd
+# $FreeBSD: /tmp/pcvs/ports/net-im/jabberd/files/Attic/jabberd.sh,v 1.3 2004-07-13 02:38:15 edwin Exp $
 
-USER="jabber"
-RUNDIR="/var/jabberd/pid"
-HOSTNAME=`/bin/hostname`
+# PROVIDE: jabberd
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+#
+prefix=/usr/local
 
-test -x ${PREFIX}/bin/jabberd || exit 1
+# Define these jabberd_* variables in one of these files:
+#       /etc/rc.conf
+#       /etc/rc.conf.local
+#       /etc/rc.conf.d/gkrellmd
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+jabberd_chdir="/var/jabberd/pid"
+jabberd_enable="NO"
+jabberd_flags=""
+jabberd_user="jabber"
 
-export PATH=/sbin:/bin:/usr/bin:${PREFIX}/bin:${PREFIX}/sbin
-umask 077
+. /etc/rc.subr
 
-cd ${RUNDIR} || exit
+name="jabberd"
+rcvar=`set_rcvar`
+command="/usr/local/bin/jabberd"
+command_args="&"
+procname="/usr/local/bin/router"
+
+load_rc_config $name
+
+pidfile="${jabberd_chdir}/router.pid"
 
 case "$1" in
-start)
-    su -f -m ${USER} -c ${PREFIX}/bin/jabberd &
-    echo -n ' jabberd'
-    ;;
-stop)
-    killall -u ${USER} jabberd c2s resolver router s2s sm
-    for file in c2s resolver router s2s sm
-      do
-      rm -f ${RUNDIR}/$file.pid
-    done
-    echo -n ' jabberd'
-    ;;
-*)
-    echo "Usage: `basename $0` {start|stop}" >&2
-    ;;
+	stop)
+		echo "Stopping Jabber2"
+		killall -u ${jabberd_user} jabberd c2s resolver router s2s sm
+		for file in c2s resolver router s2s sm; do
+			rm -f ${jabberd_chdir}/$file.pid
+		done
+	;;
+	*)
+		run_rc_command "$1"
+	;;
 esac
-
-exit 0
diff --git a/net-im/jabberd/files/patch-configure b/net-im/jabberd/files/patch-configure
index 3a4c2e90c8bb..ac6637e6d87d 100644
--- a/net-im/jabberd/files/patch-configure
+++ b/net-im/jabberd/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Sun Feb 22 13:14:13 2004
-+++ configure	Sun Feb 22 13:14:42 2004
-@@ -23709,7 +23709,7 @@
-         ;;
-       esac
+--- configure.orig	Mon Jul 12 10:15:17 2004
++++ configure	Mon Jul 12 10:15:26 2004
+@@ -20575,7 +20575,7 @@
+ done
  
--      for db_libname in db-4.2 db-4.1 db-4 db4 db; do
-+      for db_libname in db-4.2 db-4.1 db-4 db4 db41 db; do
-         # We generate a separate cache variable for each prefix and libname
-         # we search under.  That way, we avoid caching information that
-         # changes if the user runs `configure' with a different set of
+     if test "x-$ac_cv_header_db_h" = "x-yes" ; then
+-        for lib in db-4.2 db-4.1 db-4 db4 db ; do
++        for lib in db-4.2 db-4.1 db-4 db4 db41 ; do
+             if test "x-$have_db_version" != "x-yes" ; then
+                 echo "$as_me:$LINENO: checking for db_create in -l$lib" >&5
+ echo $ECHO_N "checking for db_create in -l$lib... $ECHO_C" >&6
diff --git a/net-im/jabberd/files/patch-util.h b/net-im/jabberd/files/patch-util.h
new file mode 100644
index 000000000000..dd73e70867aa
--- /dev/null
+++ b/net-im/jabberd/files/patch-util.h
@@ -0,0 +1,11 @@
+--- util/util.h.orig	Mon May 31 16:31:06 2004
++++ util/util.h	Mon Jul 12 10:29:58 2004
+@@ -30,6 +30,8 @@
+ #include <time.h>
+ #include <errno.h>
+ #include <assert.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ 
+ #ifdef HAVE_NETINET_IN_H
+ # include <netinet/in.h>