* Upgrade jabber from 1.4 to 1.4.1.

* Integate the jabber transports into this port instead of having
  separate ports.  Included are: aim-transport, conference, icq-transport
  irc-transport, jud, msn-transport and yahoo-transport.

Note: The configuration file still needs updating for the new transports.

12 files changed, 260 insertions, 34 deletions

diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index cb8e873d8c23..9ee35604137f 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -6,10 +6,18 @@
 #
 
 PORTNAME=	jabber
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.4.1
+PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	http://download.jabber.org/dists/1.4/final/
+DISTFILES+=	jabber-1.4.1.tar.gz \
+		aim-transport-0.9.0.tar.gz \
+		conference-0.4.1.tar.gz \
+		icq-transport-0.9.tar.gz \
+		irc-transport-0.1b-1.40.linux.tar.gz \
+		jud-0.4.tar.gz \
+		msn-transport-1.1.tar.gz \
+		yahoo-transport-0.8-1.4.linux.tar.gz
 
 MAINTAINER=	joe@FreeBSD.org
 
@@ -20,6 +28,23 @@ USE_GMAKE=	yes
 
 rc=${PREFIX}/etc/rc.d
 
+JABDIR=		${PORTNAME}-${PORTVERSION}
+post-extract:
+	@mv ${WRKDIR}/aim-transport-0.9.0 ${WRKDIR}/${JABDIR}/aim-transport
+	@mv ${WRKDIR}/conference-0.4.1 ${WRKDIR}/${JABDIR}/conference
+	@mv ${WRKDIR}/icq-transport-0.9 ${WRKDIR}/${JABDIR}/icq-transport
+	@mv ${WRKDIR}/irc-transport-0.1b-1.40 ${WRKDIR}/${JABDIR}/irc-transport
+	@mv ${WRKDIR}/jud-0.4 ${WRKDIR}/${JABDIR}/jud
+	@mv ${WRKDIR}/msn-transport-1.1 ${WRKDIR}/${JABDIR}/msn-transport
+	@mv ${WRKDIR}/yahoo-transport-0.8-1.4 ${WRKDIR}/${JABDIR}/yahoo-transport
+
+post-configure:
+	@cd ${WRKDIR}/${JABDIR}/aim-transport && ./configure
+	@cd ${WRKDIR}/${JABDIR}/irc-transport && ./configure \
+		--includedir=${WRKDIR}/${JABDIR}/jabberd
+	@cd ${WRKDIR}/${JABDIR}/yahoo-transport && ./configure \
+		--includedir=${WRKDIR}/${JABDIR}/jabberd
+
 post-install:
 	@PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${rc}
diff --git a/net-im/jabber/distinfo b/net-im/jabber/distinfo
index f0f594770884..12bd01a1b696 100644
--- a/net-im/jabber/distinfo
+++ b/net-im/jabber/distinfo
@@ -1 +1,8 @@
-MD5 (jabber-1.4.tar.gz) = af1c79bfae8d1071fc6d1210b397c984
+MD5 (jabber-1.4.1.tar.gz) = fc7afba8969e53c5e3b662156d1cdeae
+MD5 (aim-transport-0.9.0.tar.gz) = 16af3cdaa008a30079f5a89ecc4dbc90
+MD5 (conference-0.4.1.tar.gz) = 01b825d9f917674f25fdba29255d081b
+MD5 (icq-transport-0.9.tar.gz) = ffa69ae19ac18395c87470c1729dcc59
+MD5 (irc-transport-0.1b-1.40.linux.tar.gz) = 5ccf1bb828e3d813380f100e4d11f7f6
+MD5 (jud-0.4.tar.gz) = a057e8dd5966fa0d26ded03697ba395a
+MD5 (msn-transport-1.1.tar.gz) = 251cd4b6cfc6c52a0f15c3ff2bfbfff9
+MD5 (yahoo-transport-0.8-1.4.linux.tar.gz) = 0850f8d36d7b1e8df656fa84d03c82ba
diff --git a/net-im/jabber/files/patch-ab b/net-im/jabber/files/patch-ab
index 5daa875ef780..e3c1080d575f 100644
--- a/net-im/jabber/files/patch-ab
+++ b/net-im/jabber/files/patch-ab
@@ -1,22 +1,53 @@
 --- Makefile.orig	Sun Jan 21 05:32:48 2001
-+++ Makefile	Sun Feb 11 17:03:13 2001
-@@ -14,7 +14,18 @@
++++ Makefile	Sat Jun 16 14:40:48 2001
+@@ -4,6 +4,15 @@
+ 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
++
++
+ 
+ all: all-recursive
+ 
+@@ -13,8 +22,33 @@
+ 
  single: single-recursive
  
++LIBDIR=${PREFIX}/lib/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 ${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 -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}/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
  
  all-local:
  
diff --git a/net-im/jabber/files/patch-ae b/net-im/jabber/files/patch-ae
new file mode 100644
index 000000000000..c07658cca85c
--- /dev/null
+++ b/net-im/jabber/files/patch-ae
@@ -0,0 +1,19 @@
+--- 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-im/jabber/files/patch-af b/net-im/jabber/files/patch-af
new file mode 100644
index 000000000000..78b739541596
--- /dev/null
+++ b/net-im/jabber/files/patch-af
@@ -0,0 +1,19 @@
+--- 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-im/jabber/pkg-plist b/net-im/jabber/pkg-plist
index dc19bedb4a79..dc3cfc7855da 100644
--- a/net-im/jabber/pkg-plist
+++ b/net-im/jabber/pkg-plist
@@ -1,15 +1,27 @@
 bin/jabberd
 etc/jabber.xml.sample
 etc/rc.d/jabberd.sh
+lib/jabber/aim-transport/aimtrans.so
+lib/jabber/conference/conference.so
 lib/jabber/dialback/dialback.so
 lib/jabber/dnsrv/dnsrv.so
+lib/jabber/icq-transport/icqtrans.so
+lib/jabber/irc-transport/irc_transport.so
 lib/jabber/jsm/jsm.so
+lib/jabber/msn-transport/msntrans.so
 lib/jabber/pthsock/pthsock_client.so
 lib/jabber/xdb_file/xdb_file.so
+lib/jabber/yahoo-transport/yahootrans.so
+@dirrm lib/jabber/aim-transport
+@dirrm lib/jabber/conference
 @dirrm lib/jabber/dialback
 @dirrm lib/jabber/dnsrv
+@dirrm lib/jabber/icq-transport
+@dirrm lib/jabber/irc-transport
 @dirrm lib/jabber/jsm
+@dirrm lib/jabber/msn-transport
 @dirrm lib/jabber/pthsock
 @dirrm lib/jabber/xdb_file
+@dirrm lib/jabber/yahoo-transport
 @dirrm lib/jabber
 @unexec rmdir /var/spool/jabber 2>/dev/null || true
diff --git a/net/jabber/Makefile b/net/jabber/Makefile
index cb8e873d8c23..9ee35604137f 100644
--- a/net/jabber/Makefile
+++ b/net/jabber/Makefile
@@ -6,10 +6,18 @@
 #
 
 PORTNAME=	jabber
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.4.1
+PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	http://download.jabber.org/dists/1.4/final/
+DISTFILES+=	jabber-1.4.1.tar.gz \
+		aim-transport-0.9.0.tar.gz \
+		conference-0.4.1.tar.gz \
+		icq-transport-0.9.tar.gz \
+		irc-transport-0.1b-1.40.linux.tar.gz \
+		jud-0.4.tar.gz \
+		msn-transport-1.1.tar.gz \
+		yahoo-transport-0.8-1.4.linux.tar.gz
 
 MAINTAINER=	joe@FreeBSD.org
 
@@ -20,6 +28,23 @@ USE_GMAKE=	yes
 
 rc=${PREFIX}/etc/rc.d
 
+JABDIR=		${PORTNAME}-${PORTVERSION}
+post-extract:
+	@mv ${WRKDIR}/aim-transport-0.9.0 ${WRKDIR}/${JABDIR}/aim-transport
+	@mv ${WRKDIR}/conference-0.4.1 ${WRKDIR}/${JABDIR}/conference
+	@mv ${WRKDIR}/icq-transport-0.9 ${WRKDIR}/${JABDIR}/icq-transport
+	@mv ${WRKDIR}/irc-transport-0.1b-1.40 ${WRKDIR}/${JABDIR}/irc-transport
+	@mv ${WRKDIR}/jud-0.4 ${WRKDIR}/${JABDIR}/jud
+	@mv ${WRKDIR}/msn-transport-1.1 ${WRKDIR}/${JABDIR}/msn-transport
+	@mv ${WRKDIR}/yahoo-transport-0.8-1.4 ${WRKDIR}/${JABDIR}/yahoo-transport
+
+post-configure:
+	@cd ${WRKDIR}/${JABDIR}/aim-transport && ./configure
+	@cd ${WRKDIR}/${JABDIR}/irc-transport && ./configure \
+		--includedir=${WRKDIR}/${JABDIR}/jabberd
+	@cd ${WRKDIR}/${JABDIR}/yahoo-transport && ./configure \
+		--includedir=${WRKDIR}/${JABDIR}/jabberd
+
 post-install:
 	@PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${rc}
diff --git a/net/jabber/distinfo b/net/jabber/distinfo
index f0f594770884..12bd01a1b696 100644
--- a/net/jabber/distinfo
+++ b/net/jabber/distinfo
@@ -1 +1,8 @@
-MD5 (jabber-1.4.tar.gz) = af1c79bfae8d1071fc6d1210b397c984
+MD5 (jabber-1.4.1.tar.gz) = fc7afba8969e53c5e3b662156d1cdeae
+MD5 (aim-transport-0.9.0.tar.gz) = 16af3cdaa008a30079f5a89ecc4dbc90
+MD5 (conference-0.4.1.tar.gz) = 01b825d9f917674f25fdba29255d081b
+MD5 (icq-transport-0.9.tar.gz) = ffa69ae19ac18395c87470c1729dcc59
+MD5 (irc-transport-0.1b-1.40.linux.tar.gz) = 5ccf1bb828e3d813380f100e4d11f7f6
+MD5 (jud-0.4.tar.gz) = a057e8dd5966fa0d26ded03697ba395a
+MD5 (msn-transport-1.1.tar.gz) = 251cd4b6cfc6c52a0f15c3ff2bfbfff9
+MD5 (yahoo-transport-0.8-1.4.linux.tar.gz) = 0850f8d36d7b1e8df656fa84d03c82ba
diff --git a/net/jabber/files/patch-ab b/net/jabber/files/patch-ab
index 5daa875ef780..e3c1080d575f 100644
--- a/net/jabber/files/patch-ab
+++ b/net/jabber/files/patch-ab
@@ -1,22 +1,53 @@
 --- Makefile.orig	Sun Jan 21 05:32:48 2001
-+++ Makefile	Sun Feb 11 17:03:13 2001
-@@ -14,7 +14,18 @@
++++ Makefile	Sat Jun 16 14:40:48 2001
+@@ -4,6 +4,15 @@
+ 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
++
++
+ 
+ all: all-recursive
+ 
+@@ -13,8 +22,33 @@
+ 
  single: single-recursive
  
++LIBDIR=${PREFIX}/lib/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 ${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 -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}/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
  
  all-local:
  
diff --git a/net/jabber/files/patch-ae b/net/jabber/files/patch-ae
new file mode 100644
index 000000000000..c07658cca85c
--- /dev/null
+++ b/net/jabber/files/patch-ae
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 000000000000..78b739541596
--- /dev/null
+++ b/net/jabber/files/patch-af
@@ -0,0 +1,19 @@
+--- 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/pkg-plist b/net/jabber/pkg-plist
index dc19bedb4a79..dc3cfc7855da 100644
--- a/net/jabber/pkg-plist
+++ b/net/jabber/pkg-plist
@@ -1,15 +1,27 @@
 bin/jabberd
 etc/jabber.xml.sample
 etc/rc.d/jabberd.sh
+lib/jabber/aim-transport/aimtrans.so
+lib/jabber/conference/conference.so
 lib/jabber/dialback/dialback.so
 lib/jabber/dnsrv/dnsrv.so
+lib/jabber/icq-transport/icqtrans.so
+lib/jabber/irc-transport/irc_transport.so
 lib/jabber/jsm/jsm.so
+lib/jabber/msn-transport/msntrans.so
 lib/jabber/pthsock/pthsock_client.so
 lib/jabber/xdb_file/xdb_file.so
+lib/jabber/yahoo-transport/yahootrans.so
+@dirrm lib/jabber/aim-transport
+@dirrm lib/jabber/conference
 @dirrm lib/jabber/dialback
 @dirrm lib/jabber/dnsrv
+@dirrm lib/jabber/icq-transport
+@dirrm lib/jabber/irc-transport
 @dirrm lib/jabber/jsm
+@dirrm lib/jabber/msn-transport
 @dirrm lib/jabber/pthsock
 @dirrm lib/jabber/xdb_file
+@dirrm lib/jabber/yahoo-transport
 @dirrm lib/jabber
 @unexec rmdir /var/spool/jabber 2>/dev/null || true