7 files changed, 39 insertions, 89 deletions
diff --git a/net-im/jabber/files/jabberd.sh b/net-im/jabber/files/jabberd.sh
index d6aa960fb6f6..2ad8b7ea99c7 100644
--- a/net-im/jabber/files/jabberd.sh
+++ b/net-im/jabber/files/jabberd.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/jabberd\.sh\$"); then
     echo "$0: Cannot determine the PREFIX" >&2
diff --git a/net-im/jabber/files/patch-ab b/net-im/jabber/files/patch-Makefile
index 589e6646ceee..ce467316fcdd 100644
--- a/net-im/jabber/files/patch-ab
+++ b/net-im/jabber/files/patch-Makefile
@@ -11,7 +11,7 @@
  
  all: all-recursive
  
-@@ -13,8 +17,29 @@
+@@ -13,8 +17,28 @@
  
  single: single-recursive
  
@@ -37,7 +37,6 @@
 +	${INSTALL_DIR} ${INCDIR}/lib
 +	${INSTALL_DATA} jabberd/lib/lib.h ${INCDIR}/lib
 +	${INSTALL_DATA} jabberd/lib/xmlparse.h ${INCDIR}/lib
-+	${INSTALL_DATA} jabberd/pth-1.4.0/pth.h ${INCDIR}
 +	
  
  all-local:
diff --git a/net-im/jabber/files/patch-aa b/net-im/jabber/files/patch-aa
deleted file mode 100644
index 80239a100c69..000000000000
--- a/net-im/jabber/files/patch-aa
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.orig	Mon Feb 11 11:14:06 2002
-+++ configure	Sun Apr 14 18:38:40 2002
-@@ -32,7 +32,8 @@
- LDFLAGS="$LDFLAGS"
- LIBS="$LIBS"
- XLDFLAGS="$XLDFLAGS "
--JHOME=`pwd`
-+JHOME="`cat .prefix-freebsd`/lib/jabber"
-+WRKSRC="`cat .wrksrc-freebsd`"
- 
- ##
- # Print a cool header
-@@ -76,31 +77,19 @@
- ##
- # Pth check
- ##
--printf "Getting pth settings..."
--PTH_CFLAGS=`pth-config --cflags`
--PTH_LDFLAGS=`pth-config --ldflags`
--PTH_LIBS=`pth-config --libs`
--PTH_LIBDIR=`pth-config --libdir`
--if [ -n "$PTH_CFLAGS" ]; then
--    CFLAGS="$CFLAGS $PTH_CFLAGS";
--    LDFLAGS="$LDFLAGS $PTH_LDFLAGS";
--    LIBS="$LIBS $PTH_LIBS";
--    SLIBS="$SLIBS $PTH_LIBDIR/libpth.a";
--    printf "         Done.\n";
--else
--    if [ -d "jabberd/pth-1.4.0" ]; then
--        opwd=`pwd`
--        cd jabberd/pth-1.4.0;
--        ./configure || (printf "Error Configuring pth"; exit 1);
--        cd $opwd;
--        PSUBDIR="pth-1.4.0";
--        PTHP=`pwd`"/jabberd/pth-1.4.0";
--        PLINK="$PTHP/pth_*.o";
--        CFLAGS="$CFLAGS -I`pwd`/jabberd/pth-1.4.0";
--    else
--        printf "          Error.\n\n No version of PTH is available on this system\nhttp://www.gnu.org/software/pth/";
--    fi
--fi
-+echo "Using jabber's internal copy of pth 1.4.0 because 1.4.1 is incompatible"
-+opwd=`pwd`
-+cd jabberd/pth-1.4.0;
-+echo "Configuring jabber pth-1.4.0..."
-+./configure || (echo "Error Configuring pth"; exit 1);
-+echo "Building pth-1.4.0..."
-+gmake
-+cd $opwd;
-+PSUBDIR="pth-1.4.0";
-+PTHP="`pwd`/jabberd/pth-1.4.0";
-+PLINK="$PTHP/pth_*.o";
-+CFLAGS="$CFLAGS -I${PTHP}";
-+LDFLAGS="$LDFLAGS -L${PTHP}";
- 
- 
- 
diff --git a/net-im/jabber/files/patch-ac b/net-im/jabber/files/patch-ac
deleted file mode 100644
index 45e15e08afaa..000000000000
--- a/net-im/jabber/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- jabber.xml.orig	Sat Feb  3 22:46:56 2001
-+++ jabber.xml	Sun Feb 11 01:19:01 2001
-@@ -576,7 +576,7 @@
-   <!--
-   This specifies the file to store the pid of the process in.
-   -->
--  <pidfile>./jabber.pid</pidfile>
-+  <pidfile>/var/tmp/jabber.pid</pidfile>
- 
- 
- </jabber>
diff --git a/net-im/jabber/files/patch-configure b/net-im/jabber/files/patch-configure
new file mode 100644
index 000000000000..07f6c8b3c757
--- /dev/null
+++ b/net-im/jabber/files/patch-configure
@@ -0,0 +1,9 @@
+--- configure.orig      Mon Feb 11 11:14:06 2002
++++ configure   Sun Apr 14 18:38:40 2002
+@@ -32,7 +32,8 @@
+ LDFLAGS="$LDFLAGS"
+ LIBS="$LIBS"
+ XLDFLAGS="$XLDFLAGS "
+-JHOME=`pwd`
++JHOME="`cat .prefix-freebsd`/lib/jabber"
++WRKSRC="`cat .wrksrc-freebsd`"
diff --git a/net-im/jabber/files/patch-ad b/net-im/jabber/files/patch-jabber.xml
index 63266c9a12eb..378893a1aea6 100644
--- a/net-im/jabber/files/patch-ad
+++ b/net-im/jabber/files/patch-jabber.xml
@@ -1,27 +1,17 @@
---- jabber.xml.orig	Sun Feb 11 17:24:48 2001
-+++ jabber.xml	Sun Feb 11 17:26:23 2001
-@@ -41,6 +41,10 @@
-     Multiple <host/> entries are allowed - each one is for a 
+--- jabber.xml.orig	Thu Nov 13 22:53:46 2003
++++ jabber.xml	Thu May  6 04:19:22 2004
+@@ -49,6 +49,10 @@
      separate virtual server. Note that each host entry must 
      be on one line, the server doesn't like it otherwise! :)
+     Use lowercase for the hostname.
 +
 +    Currently on FreeBSD jabberd is started with the -h option
 +    from /usr/local/etc/rc.d/jabberd.sh.  You'll need to modify
-+    this before changing below.
++    it before the below applies.
      -->
  
      <host><jabberd:cmdline flag="h">localhost</jabberd:cmdline></host>
-@@ -193,7 +197,9 @@
-       entry for <host/> above.
-       -->
- 
-+      <!--
-       <update><jabberd:cmdline flag="h">localhost</jabberd:cmdline></update>
-+      -->
- 
-       <!--
-       This enables the server to automatically update the 
-@@ -298,7 +304,7 @@
+@@ -356,7 +360,7 @@
        <xdb_file>./xdb_file/xdb_file.so</xdb_file>
      </load>
      <xdb_file xmlns="jabber:config:xdb_file">
@@ -30,7 +20,7 @@
      </xdb_file>
    </xdb>
  
-@@ -357,7 +363,7 @@
+@@ -430,7 +434,7 @@
      <host/>
      <logtype/>
      <format>%d: [%t] (%h): %s</format>
@@ -39,7 +29,7 @@
      <stderr/>
    </log>
  
-@@ -370,7 +376,7 @@
+@@ -443,7 +447,7 @@
      <host/>
      <logtype>record</logtype>
      <format>%d %h %s</format>
@@ -48,3 +38,12 @@
    </log>
  
    <!-- The following two services are for handling server-to-server traffic. -->
+@@ -668,7 +672,7 @@
+   <!--
+   This specifies the file to store the pid of the process in.
+   -->
+-  <pidfile>./jabber.pid</pidfile>
++  <pidfile>/var/tmp/jabber.pid</pidfile>
+ 
+ 
+ </jabber>
diff --git a/net-im/jabber/files/patch-jsm-modules-mod_auth_crypt.c b/net-im/jabber/files/patch-jsm-modules-mod_auth_crypt.c
new file mode 100644
index 000000000000..bc7d2121959e
--- /dev/null
+++ b/net-im/jabber/files/patch-jsm-modules-mod_auth_crypt.c
@@ -0,0 +1,11 @@
+--- jsm/modules/mod_auth_crypt.c.orig	Thu May  6 00:00:20 2004
++++ jsm/modules/mod_auth_crypt.c	Thu May  6 00:00:01 2004
+@@ -28,7 +28,7 @@
+  * 
+  * --------------------------------------------------------------------------*/
+ #include "jsm.h"
+-#include "crypt.h"
++#include <unistd.h>
+ 
+ #define HASH_CRYPT 1
+ #define HASH_SHA1  2