12 files changed, 153 insertions, 138 deletions

diff --git a/net/jabber/Makefile b/net/jabber/Makefile
index 337e90fbfeda..d38314581555 100644
--- a/net/jabber/Makefile
+++ b/net/jabber/Makefile
@@ -1,25 +1,28 @@
-# New ports collection makefile for:	jabber-transport
-# Date created:			7 April 2000
-# Whom:				Kostya Lukin <lukin@okbmei.msk.su>
+# New ports collection makefile for:	jabber
+# Date created:			5 February 2001
+# Whom:				joe
 #
 # $FreeBSD$
 #
 
-PORTNAME=	jabber-transport
-PORTVERSION=	1.0
+PORTNAME=	jabber
+PORTVERSION=	1.4
 CATEGORIES=	net
-MASTER_SITES=	http://download.jabber.org/dists/1.0/final/
+MASTER_SITES=	http://download.jabber.org/dists/1.4/final/
 
-MAINTAINER=	lukin@okbmei.msk.su
+MAINTAINER=	joe@FreeBSD.org
 
-LIB_DEPENDS=	etherx.1:${PORTSDIR}/net/libetherx
+BUILD_DEPENDS=	pth:${PORTSDIR}/devel/pth \
+		libxode-config:${PORTSDIR}/textproc/libxode \
+		jabber-config:${PORTSDIR}/net/libjabber
 
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 
 rc=${PREFIX}/etc/rc.d
 
 post-install:
 	@PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${INSTALL_SCRIPT} ${FILESDIR}/jserver.sh ${rc}
+	@${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${rc}
 
 .include <bsd.port.mk>
diff --git a/net/jabber/distinfo b/net/jabber/distinfo
index 8d324feb28c0..f0f594770884 100644
--- a/net/jabber/distinfo
+++ b/net/jabber/distinfo
@@ -1 +1 @@
-MD5 (jabber-transport-1.0.tar.gz) = e28f1b9844e1a93f11b32e0f622dfd01
+MD5 (jabber-1.4.tar.gz) = af1c79bfae8d1071fc6d1210b397c984
diff --git a/net/jabber/files/jabberd.sh b/net/jabber/files/jabberd.sh
index c550ee513139..b9ed328b640e 100644
--- a/net/jabber/files/jabberd.sh
+++ b/net/jabber/files/jabberd.sh
@@ -1,27 +1,26 @@
 #! /bin/sh
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/jserver\.sh\$"); then
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/jabberd\.sh\$"); then
     echo "$0: Cannot determine the PREFIX" >&2
     exit 1
 fi
-user=jserver
+user=jabber
 rundir=/tmp
-out=${rundir}/jserver.out
+out=/var/log/jabber.log
+hostname=`/bin/hostname`
 
 export PATH=/bin:/usr/bin:${PREFIX}/bin
 umask 077
 
-test -x ${PREFIX}/bin/jserver || exit 1
-echo -n " jserver"
+test -x ${PREFIX}/bin/jabberd || exit 1
+echo -n " jabberd"
 cd ${rundir} || exit
 
 arg=${1:-start}
 case $arg in
 start)
-    su -f -m ${user} -c \
-	"jserver" \
-	>>${out} 2>&1 &;;
+    su -f -m ${user} -c "jabberd -h ${hostname} -c ${PREFIX}/etc/jabber.xml" >${out} 2>&1 &;;
 
 stop)
-    killall jserver;;
+    killall jabberd;;
 esac
diff --git a/net/jabber/files/jserver.sh b/net/jabber/files/jserver.sh
deleted file mode 100644
index c550ee513139..000000000000
--- a/net/jabber/files/jserver.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/jserver\.sh\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-user=jserver
-rundir=/tmp
-out=${rundir}/jserver.out
-
-export PATH=/bin:/usr/bin:${PREFIX}/bin
-umask 077
-
-test -x ${PREFIX}/bin/jserver || exit 1
-echo -n " jserver"
-cd ${rundir} || exit
-
-arg=${1:-start}
-case $arg in
-start)
-    su -f -m ${user} -c \
-	"jserver" \
-	>>${out} 2>&1 &;;
-
-stop)
-    killall jserver;;
-esac
diff --git a/net/jabber/files/patch-aa b/net/jabber/files/patch-aa
index 20549a78e67d..46021cd44f7b 100644
--- a/net/jabber/files/patch-aa
+++ b/net/jabber/files/patch-aa
@@ -1,27 +1,11 @@
---- src/jserver.xml.in.orig	Mon May  1 11:30:00 2000
-+++ src/jserver.xml.in	Wed May 10 18:22:14 2000
-@@ -37,12 +37,12 @@
-   <log>
- 
-     <!-- replace with <error>syslog</error> to log to syslog instead, remove to log to STDERR -->
--    <error>@prefix@/var/log/jserver.error</error>
-+    <error>/var/log/jserver.error</error>
- 
--    <session>@prefix@/var/log/jserver.log</session>
-+    <session>/var/log/jserver.log</session>
- 
-     <!-- This will log some basic tracking information about every packet of data (TONS!)
--      <packet>@prefix@/var/log/jserver_packet.log</packet>
-+      <packet>/var/log/jserver_packet.log</packet>
-     -->
- 
-   </log>
-@@ -50,7 +50,7 @@
- 
- Data is stored on the filesystem for each user, make sure the folder exists!
- 
--  <spool>@prefix@/var/jspool</spool>
-+  <spool>/var/jspool</spool>
- 
- Registration instructions and fields, remove to disallow registration:
- 
+--- configure.orig	Sat Feb  3 05:06:24 2001
++++ configure	Sat Feb 10 23:46:59 2001
+@@ -32,7 +32,7 @@
+ LDFLAGS="$LDFLAGS"
+ LIBS="$LIBS"
+ XLDFLAGS="$XLDFLAGS "
+-JHOME=`pwd`
++JHOME='${PREFIX}/lib/jabber'
+ 
+ ##
+ # Print a cool header
diff --git a/net/jabber/files/patch-ab b/net/jabber/files/patch-ab
index 6272a4f76e86..5daa875ef780 100644
--- a/net/jabber/files/patch-ab
+++ b/net/jabber/files/patch-ab
@@ -1,19 +1,22 @@
---- src/Makefile.in.orig	Mon May  1 19:47:49 2000
-+++ src/Makefile.in	Wed May 17 17:05:17 2000
-@@ -442,14 +442,8 @@
+--- Makefile.orig	Sun Jan 21 05:32:48 2001
++++ Makefile	Sun Feb 11 17:03:13 2001
+@@ -14,7 +14,18 @@
+ single: single-recursive
  
+ 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 ${PREFIX}/lib/jabber/jsm
++	install -c jsm/jsm.so ${PREFIX}/lib/jabber/jsm
++	install -d ${PREFIX}/lib/jabber/xdb_file
++	install -c xdb_file/xdb_file.so ${PREFIX}/lib/jabber/xdb_file
++	install -d ${PREFIX}/lib/jabber/pthsock
++	install -c pthsock/pthsock_client.so ${PREFIX}/lib/jabber/pthsock
++	install -d ${PREFIX}/lib/jabber/dnsrv
++	install -c dnsrv/dnsrv.so ${PREFIX}/lib/jabber/dnsrv
++	install -d ${PREFIX}/lib/jabber/dialback
++	install -c dialback/dialback.so ${PREFIX}/lib/jabber/dialback
  
- install-data-local:
--	$(SH) if test ! -f $(sysconfdir)/jserver.xml; then \
--	$(mkinstalldirs) $(sysconfdir); \
--	$(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml; \
--	else \
--		echo "You already have a jserver.xml installed, not overwriting"; \
--	fi
--	$(mkinstalldirs) $(prefix)/var/jspool
--	$(mkinstalldirs) $(prefix)/var/log
-+	$(mkinstalldirs) $(sysconfdir);
-+	$(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml.default
+ all-local:
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/net/jabber/files/patch-ac b/net/jabber/files/patch-ac
index b2ae73998fab..45e15e08afaa 100644
--- a/net/jabber/files/patch-ac
+++ b/net/jabber/files/patch-ac
@@ -1,11 +1,11 @@
---- configure.orig	Sun Apr 30 20:32:29 2000
-+++ configure	Sun Apr 30 20:33:08 2000
-@@ -2321,7 +2321,7 @@
- #define $ac_tr_lib 1
- EOF
+--- 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>
  
--  LIBS="-lpth $LIBS"
-+  LIBS="-L$prefix/lib -lpth $LIBS"
  
- else
-   echo "$ac_t""no" 1>&6
+ </jabber>
diff --git a/net/jabber/files/patch-ad b/net/jabber/files/patch-ad
new file mode 100644
index 000000000000..63266c9a12eb
--- /dev/null
+++ b/net/jabber/files/patch-ad
@@ -0,0 +1,50 @@
+--- 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 
+     separate virtual server. Note that each host entry must 
+     be on one line, the server doesn't like it otherwise! :)
++
++    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.
+     -->
+ 
+     <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 @@
+       <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>
+ 
+@@ -357,7 +363,7 @@
+     <host/>
+     <logtype/>
+     <format>%d: [%t] (%h): %s</format>
+-    <file>error.log</file>
++    <file>/var/log/jabber.error</file>
+     <stderr/>
+   </log>
+ 
+@@ -370,7 +376,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. -->
diff --git a/net/jabber/pkg-deinstall b/net/jabber/pkg-deinstall
index 355d51ea398d..0248658c829f 100644
--- a/net/jabber/pkg-deinstall
+++ b/net/jabber/pkg-deinstall
@@ -55,13 +55,13 @@ fi
 
 export PATH=/bin:/usr/bin:/usr/sbin
 
-user=jserver
-group=jserver
+user=jabber
+group=jabber
 
-if ps -axc | grep -q jserver; then
-    if yesno "There are some jserver processes running.  Shall I kill them" y
+if ps -axc | grep -q jabberd; then
+    if yesno "There are some jabberd processes running.  Shall I kill them" y
     then
-	killall jserver
+	killall jabberd
 	sleep 2
     else
 	echo "OK ... I hope you know what you are doing."
diff --git a/net/jabber/pkg-descr b/net/jabber/pkg-descr
index 02fa0e883a20..29b00f2a9bc8 100644
--- a/net/jabber/pkg-descr
+++ b/net/jabber/pkg-descr
@@ -1,11 +1,11 @@
-The Jabber transport (jserver) is a daemon for Jabber clients to connect
-and communicate with. It only handles native Jabber protocol.
+The Jabber server (jabberd) is a daemon for Jabber clients to connect
+and communicate with.
 
-After editing $PREFIX/etc/jserver.xml, the server can be started by
+After editing $PREFIX/etc/jabber.xml, the server can be started by
 rc.d script.
 
 Complete information about configuration can be found in the Jabber Server
 mini-HOWTO at http://docs.jabber.org/.
 
-You can learn more about Jabber-Transport at
+You can learn more about Jabber at
 WWW: http://server.jabber.org/
diff --git a/net/jabber/pkg-install b/net/jabber/pkg-install
index 9a0bf378ad65..fc8486a5f2bc 100644
--- a/net/jabber/pkg-install
+++ b/net/jabber/pkg-install
@@ -107,9 +107,9 @@ EOF
 	exit 1
     fi
 
-    user=jserver
-    group=jserver
-    spooldir="/var/jspool"
+    user=jabber
+    group=jabber
+    spooldir="/var/spool/jabber"
     etcdir=${PREFIX:-$PKG_PREFIX}/etc
 
     echo ""
@@ -124,33 +124,33 @@ EOF
     chown -R ${user}:${group} ${spooldir}
     chmod -R go= ${spooldir}
 
-    if [ ! -f ${etcdir}/jserver.xml ]; then
-	echo "Creating \"${etcdir}/jserver.xml\"."
-	cp -p ${etcdir}/jserver.xml.default ${etcdir}/jserver.xml
+    if [ ! -f ${etcdir}/jabber.xml ]; then
+	echo "Creating \"${etcdir}/jabber.xml\"."
+	cp -p ${etcdir}/jabber.xml.sample ${etcdir}/jabber.xml
     fi
 
     echo "Fixing config files ownerships and modes."
-    chown root:${group} ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default
-    chmod 640 ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default
+    chown root:${group} ${etcdir}/jabber.xml ${etcdir}/jabber.xml.sample
+    chmod 640 ${etcdir}/jabber.xml ${etcdir}/jabber.xml.sample
 
-    if [ ! -f /var/log/jserver.log ]; then
-	echo "Creating \"/var/log/jserver.log\"."
-	cp /dev/null /var/log/jserver.log
+    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/jserver.error ]; then
-	echo "Creating \"/var/log/jserver.error\"."
-	cp /dev/null /var/log/jserver.error
+    if [ ! -f /var/log/jabber.error ]; then
+	echo "Creating \"/var/log/jabber.error\"."
+	cp /dev/null /var/log/jabber.error
     fi
 
-    if [ ! -f /var/log/jserver_packet.log ]; then
-	echo "Creating \"/var/log/jserver_packet.log\"."
-	cp /dev/null /var/log/jserver_packet.log
+    if [ ! -f /var/log/jabber.record ]; then
+	echo "Creating \"/var/log/jabber.record\"."
+	cp /dev/null /var/log/jabber.record
     fi
 
     echo "Fixing log files ownerships and modes."
-    chown ${user}:${group} /var/log/jserver.log /var/log/jserver.error /var/log/jserver_packet.log
-    chmod 600 /var/log/jserver.log /var/log/jserver.error /var/log/jserver_packet.log
+    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
 
     ;;
 esac
diff --git a/net/jabber/pkg-plist b/net/jabber/pkg-plist
index 57544b72a86f..dc19bedb4a79 100644
--- a/net/jabber/pkg-plist
+++ b/net/jabber/pkg-plist
@@ -1,12 +1,15 @@
-bin/jserver
-etc/jserver.xml.default
-etc/rc.d/jserver.sh
-lib/jabber/mod_echo.so
-lib/jabber/mod_time.so
-lib/jabber/mod_version.so
-lib/jabber/svc_hell.so
-lib/jabber/svc_http.so
-lib/jabber/svc_irc.so
-lib/jabber/svc_telnet.so
+bin/jabberd
+etc/jabber.xml.sample
+etc/rc.d/jabberd.sh
+lib/jabber/dialback/dialback.so
+lib/jabber/dnsrv/dnsrv.so
+lib/jabber/jsm/jsm.so
+lib/jabber/pthsock/pthsock_client.so
+lib/jabber/xdb_file/xdb_file.so
+@dirrm lib/jabber/dialback
+@dirrm lib/jabber/dnsrv
+@dirrm lib/jabber/jsm
+@dirrm lib/jabber/pthsock
+@dirrm lib/jabber/xdb_file
 @dirrm lib/jabber
-@unexec rmdir /var/jspool 2>/dev/null || true
+@unexec rmdir /var/spool/jabber 2>/dev/null || true