- Update to 1.4.4

Thanks to:	Slawomir Kawala <slwkk@alternatywa.net>

6 files changed, 11 insertions, 114 deletions

diff --git a/net-im/jabber/files/jabberd.sh.in b/net-im/jabber/files/jabberd.sh.in
index 89e1ae9e4b37..8a41c5a60fad 100644
--- a/net-im/jabber/files/jabberd.sh.in
+++ b/net-im/jabber/files/jabberd.sh.in
@@ -21,13 +21,12 @@ load_rc_config $name
 required_files=%%PREFIX%%/etc/${name}.xml
 
 : ${jabber_enable="NO"}
-: ${jabber_pidfile="/var/spool/jabber/${name}.pid"}
+: ${jabber_pidfile="/var/run/jabberd/${name}.pid"}
 : ${jabber_flags="-B -h `/bin/hostname` -c ${required_files}"}
 : ${jabber_user="jabber"}
 : ${jabber_group="jabber"}
 
-command=%%PREFIX%%/sbin/jabberd
-command_args="${jabber_flags}"
 pidfile=${jabber_pidfile}
+command="%%PREFIX%%/bin/jabberd"
 
 run_rc_command "$1"
diff --git a/net-im/jabber/files/patch-Makefile b/net-im/jabber/files/patch-Makefile
deleted file mode 100644
index bc261a63564e..000000000000
--- a/net-im/jabber/files/patch-Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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
-+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 +17,27 @@
- 
- 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_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
-+	
- 
- all-local:
- 
diff --git a/net-im/jabber/files/patch-configure b/net-im/jabber/files/patch-configure
deleted file mode 100644
index 07f6c8b3c757..000000000000
--- a/net-im/jabber/files/patch-configure
+++ /dev/null
@@ -1,9 +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`"
diff --git a/net-im/jabber/files/patch-jabber.xml b/net-im/jabber/files/patch-jabber.xml
deleted file mode 100644
index 925184122ed1..000000000000
--- a/net-im/jabber/files/patch-jabber.xml
+++ /dev/null
@@ -1,49 +0,0 @@
---- 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
-+    it before the below applies.
-     -->
- 
-     <host><jabberd:cmdline flag="h">localhost</jabberd:cmdline></host>
-@@ -356,7 +360,7 @@
-       <xdb_file>./xdb_file/xdb_file.so</xdb_file>
-     </load>
-     <xdb_file xmlns="jabber:config:xdb_file">
--      <spool><jabberd:cmdline flag='s'>./spool</jabberd:cmdline></spool>
-+      <spool><jabberd:cmdline flag='s'>/var/spool/jabber</jabberd:cmdline></spool>
-     </xdb_file>
-   </xdb>
- 
-@@ -430,7 +434,7 @@
-     <host/>
-     <logtype/>
-     <format>%d: [%t] (%h): %s</format>
--    <file>error.log</file>
-+    <file>/var/log/jabber.error</file>
-     <stderr/>
-   </log>
- 
-@@ -443,7 +447,7 @@
-     <host/>
-     <logtype>record</logtype>
-     <format>%d %h %s</format>
--    <file>record.log</file>
-+    <file>/var/log/jabber.record</file>
-   </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/spool/jabber/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
deleted file mode 100644
index bc7d2121959e..000000000000
--- a/net-im/jabber/files/patch-jsm-modules-mod_auth_crypt.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
diff --git a/net-im/jabber/files/pkg-message.in b/net-im/jabber/files/pkg-message.in
new file mode 100644
index 000000000000..43b0dfa2f904
--- /dev/null
+++ b/net-im/jabber/files/pkg-message.in
@@ -0,0 +1,9 @@
+
+************** WARNING !!! *****************
+
+If you are upgrading from a version < 1.4.4
+please review your %%PREFIX%%/etc/jabber.xml
+based on new %%PREFIX%%/etc/jabber.xml.dist
+because it's *NOT* backward compatible
+
+********************************************