6 files changed, 91 insertions, 108 deletions

diff --git a/net/jabber/files/jabberd.sh b/net/jabber/files/jabberd.sh
index b32951192940..91773820c519 100644
--- a/net/jabber/files/jabberd.sh
+++ b/net/jabber/files/jabberd.sh
@@ -4,27 +4,25 @@ if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/jabberd\.sh\$"); then
     echo "$0: Cannot determine the PREFIX" >&2
     exit 1
 fi
-user=jabber
-rundir=/tmp
-out=/var/log/jabber.log
-hostname=`/bin/hostname`
 
-# Load PTH libraries
-ldconfig -m `${PREFIX}/bin/pth-config --libdir`
+USER="jabber"
+RUNDIR="/var/tmp"
+LOG="/var/log/jabber.log"
+HOSTNAME=`/bin/hostname`
 
-export PATH=/bin:/usr/bin:${PREFIX}/bin
+test -x ${PREFIX}/sbin/jabberd || exit 1
+
+export PATH=/sbin:/bin:/usr/bin:${PREFIX}/bin:${PREFIX}/sbin
 umask 077
 
-test -x ${PREFIX}/bin/jabberd || exit 1
-echo -n " jabberd"
-cd ${rundir} || exit
+echo -n " jabberd "
+cd ${RUNDIR} || exit
 
-arg=${1:-start}
-case $arg in
+case ${1:-start} in
 start)
-    su -f -m ${user} -c "jabberd -h ${hostname} -c ${PREFIX}/etc/jabber.xml" >${out} 2>&1 &;;
+    su -f -m ${USER} -c "jabberd -h ${HOSTNAME} -c ${PREFIX}/etc/jabber.xml" >${LOG} 2>&1 &;;
 
 stop)
     killall jabberd;
-    rm -f /var/tmp/jabber.pid;
+    rm -f ${RUNDIR}/jabber.pid;
 esac
diff --git a/net/jabber/files/patch-aa b/net/jabber/files/patch-aa
index 46021cd44f7b..80239a100c69 100644
--- a/net/jabber/files/patch-aa
+++ b/net/jabber/files/patch-aa
@@ -1,11 +1,57 @@
---- configure.orig	Sat Feb  3 05:06:24 2001
-+++ configure	Sat Feb 10 23:46:59 2001
-@@ -32,7 +32,7 @@
+--- 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='${PREFIX}/lib/jabber'
++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/jabber/files/patch-ab b/net/jabber/files/patch-ab
index 214993d4645b..589e6646ceee 100644
--- a/net/jabber/files/patch-ab
+++ b/net/jabber/files/patch-ab
@@ -1,55 +1,44 @@
---- Makefile.orig	Sun Jan 21 14:32:48 2001
-+++ Makefile	Tue Jan 22 23:55:05 2002
-@@ -4,6 +4,15 @@
+--- Makefile.orig	Sat Jan 20 21:32:48 2001
++++ Makefile	Sun Apr 14 23:30:36 2002
+@@ -4,6 +4,10 @@
  include platform-settings
  
  SUBDIRS=pthsock xdb_file dnsrv jsm dialback jabberd
-+SUBDIRS+=aim-transport
-+SUBDIRS+=conference
-+SUBDIRS+=icq-transport
-+SUBDIRS+=irc-transport
-+SUBDIRS+=jud
-+SUBDIRS+=msn-transport
-+SUBDIRS+=yahoo-transport
-+
-+
++INSTALL_DATA=`cat .install_data-freebsd`
++INSTALL_DIR=install -d
++INSTALL_PROGRAM=`cat .install_program-freebsd`
++INSTALL_SCRIPT=`cat .install_data-freebsd`
  
  all: all-recursive
  
-@@ -13,8 +22,35 @@
+@@ -13,8 +17,29 @@
  
  single: single-recursive
  
 +LIBDIR=${PREFIX}/lib/jabber
++INCDIR=${PREFIX}/include/jabber
  install:
 -	printf "\n\nNo actual make install, you just run it out of the directory!\n"
-+	@install -c jabberd/jabberd ${PREFIX}/bin
-+	@install -c jabber.xml ${PREFIX}/etc/jabber.xml.sample
-+	@install -d ${LIBDIR}/jsm
-+	@install -c jsm/jsm.so ${LIBDIR}/jsm
-+	@install -d ${LIBDIR}/jud
-+	@install -c jud/jud.so ${LIBDIR}/jud
-+	@install -d ${LIBDIR}/xdb_file
-+	@install -c xdb_file/xdb_file.so ${LIBDIR}/xdb_file
-+	@install -d ${LIBDIR}/pthsock
-+	@install -c pthsock/pthsock_client.so ${LIBDIR}/pthsock
-+	@install -d ${LIBDIR}/dnsrv
-+	@install -c dnsrv/dnsrv.so ${LIBDIR}/dnsrv
-+	@install -d ${LIBDIR}/dialback
-+	@install -c dialback/dialback.so ${LIBDIR}/dialback
-+
-+	@install -d ${LIBDIR}/aim-transport
-+	@install -c aim-transport/src/aimtrans.so ${LIBDIR}/aim-transport
-+	@install -d ${LIBDIR}/conference
-+	@install -c conference/conference.so ${LIBDIR}/conference
-+	@install -d ${LIBDIR}/icq-transport
-+	@install -c icq-transport/icqtrans.so ${LIBDIR}/icq-transport
-+	@install -d ${LIBDIR}/irc-transport
-+	@install -c irc-transport/src/irc_transport.so ${LIBDIR}/irc-transport
-+	@install -d ${LIBDIR}/msn-transport
-+	@install -c msn-transport/msntrans.so ${LIBDIR}/msn-transport
-+	@install -d ${LIBDIR}/yahoo-transport
-+	@install -c yahoo-transport/src/yahootrans.so ${LIBDIR}/yahoo-transport
++	${INSTALL_PROGRAM} jabberd/jabberd ${PREFIX}/sbin
++	${INSTALL_DATA} jabber.xml ${PREFIX}/etc/jabber.xml.sample
++	${INSTALL_DIR} ${LIBDIR}/jsm
++	${INSTALL_DATA} jsm/jsm.so ${LIBDIR}/jsm
++	${INSTALL_DIR} ${LIBDIR}/xdb_file
++	${INSTALL_DATA} xdb_file/xdb_file.so ${LIBDIR}/xdb_file
++	${INSTALL_DIR} ${LIBDIR}/pthsock
++	${INSTALL_DATA} pthsock/pthsock_client.so ${LIBDIR}/pthsock
++	${INSTALL_DIR} ${LIBDIR}/dnsrv
++	${INSTALL_DATA} dnsrv/dnsrv.so ${LIBDIR}/dnsrv
++	${INSTALL_DIR} ${LIBDIR}/dialback
++	${INSTALL_DATA} dialback/dialback.so ${LIBDIR}/dialback
++	${INSTALL_DIR} ${INCDIR}
++	${INSTALL_DATA} platform-settings ${INCDIR}
++	${INSTALL_DATA} jabberd/jabberd.h ${INCDIR}
++	${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/jabber/files/patch-ae b/net/jabber/files/patch-ae
deleted file mode 100644
index c07658cca85c..000000000000
--- a/net/jabber/files/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
---- irc-transport/src/Makefile.in.orig	Wed Feb  7 18:31:02 2001
-+++ irc-transport/src/Makefile.in	Sat Jun 16 13:38:46 2001
-@@ -31,6 +31,7 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
-+localinclude = /usr/local/include
- 
- DESTDIR =
- 
-@@ -72,7 +73,7 @@
- VERSION = @VERSION@
- 
- CFLAGS = -g -fPIC -shared
--INCLUDES = -I$(JABBERD_INC) -I$(top_builddir)/include
-+INCLUDES = -I$(JABBERD_INC) -I$(top_builddir)/include -I$(includedir) -I$(localinclude)
- bin_PROGRAMS = irc_transport.so
- 
- irc_transport_so_SOURCES =  	util.c 	init.c     irc_in.c     irc_out.c 
diff --git a/net/jabber/files/patch-af b/net/jabber/files/patch-af
deleted file mode 100644
index 78b739541596..000000000000
--- a/net/jabber/files/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
---- yahoo-transport/src/Makefile.in.orig	Wed Feb  7 18:15:42 2001
-+++ yahoo-transport/src/Makefile.in	Sat Jun 16 14:17:47 2001
-@@ -31,6 +31,7 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
-+localinclude = /usr/local/include
- 
- DESTDIR =
- 
-@@ -72,7 +73,7 @@
- 
- CC = gcc
- CFLAGS = -g -Wall -fPIC
--INCLUDES = -I$(JABBERD_INC) -I$(includedir) -I$(top_builddir)/include
-+INCLUDES = -I$(JABBERD_INC) -I$(top_builddir)/include -I$(includedir) -I$(localinclude)
- 
- bin_PROGRAMS = yahootrans.so
- 
diff --git a/net/jabber/files/patch-ag b/net/jabber/files/patch-ag
deleted file mode 100644
index f855814c10ff..000000000000
--- a/net/jabber/files/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
---- msn-transport/Makefile.orig	Mon Feb  5 09:25:59 2001
-+++ msn-transport/Makefile	Tue Sep  4 08:12:05 2001
-@@ -1,7 +1,7 @@
- include ../platform-settings
- 
--CC=gcc
--CFLAGS:=$(CFLAGS) $(DEFINES) -I../jabberd/ -Wall -g -O2
-+#CC=gcc
-+CFLAGS:=$(CFLAGS) $(DEFINES) -I../jabberd/ # -Wall -g -O2
- 
- msntrans_HEADERS=msntrans.h ../jabberd/jabberd.h
-