4 files changed, 23 insertions, 16 deletions

diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index a98c3302649a..98e754a73709 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -7,21 +7,24 @@
 
 PORTNAME=	jabber
 PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	http://download.jabber.org/dists/1.4/final/
+MASTER_SITES=	http://download.jabber.org/dists/1.4/final/ \
+		http://download.jabber.org/dists/transports/aim-transport/ \
+		http://download.jabber.org/dists/transports/yahoo-transport/ \
+		http://download.jabber.org/dists/transports/irc-transport/
 DISTFILES+=	jabber-1.4.1.tar.gz \
-		aim-transport-0.9.0.tar.gz \
+		aim-transport-0.9.24c.tar.gz \
 		conference-0.4.1.tar.gz \
 		icq-transport-0.9.tar.gz \
-		irc-transport-0.1b-1.40.linux.tar.gz \
+		irc-transport-0.1.1-1.4.linux.tar.gz \
 		jud-0.4.tar.gz \
 		msn-transport-1.1.tar.gz \
 		yahoo-transport-0.8-1.4.linux.tar.gz
 
 MAINTAINER=	sean@chittenden.org
 
-LIB_DEPENDS=	pth:${PORTSDIR}/devel/pth
+LIB_DEPENDS=	pth.14:${PORTSDIR}/devel/pth
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -33,20 +36,20 @@ rc=${PREFIX}/etc/rc.d
 
 JABDIR=		${PORTNAME}-${PORTVERSION}
 post-extract:
-	@mv ${WRKDIR}/aim-transport-0.9.0 ${WRKDIR}/${JABDIR}/aim-transport
+	@mv ${WRKDIR}/aim-transport-0.9.24c ${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}/irc-transport-0.1.1-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:
 	${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" \
-		CPPFLAGS=`pth-config --cflags` \
-		LDFLAGS=`pth-config --ldflags` \
-		LIBS=`pth-config --libs` ${SHELL} -c \
-	"cd ${WRKDIR}/${JABDIR}/aim-transport; ./configure; \
+		CPPFLAGS="`pth-config --cflags` `libxode-config --cflags`" \
+		LDFLAGS="`pth-config --ldflags` `libxode-config --ldflags`" \
+		LIBS="`pth-config --libs` `libxode-config --libs`" ${SHELL} -c \
+	"cd ${WRKDIR}/${JABDIR}/aim-transport; ./configure --with-jabberd=${WRKDIR}/${JABDIR}/jabberd; \
 	 cd ${WRKDIR}/${JABDIR}/irc-transport;  \
 		./configure --includedir=${WRKDIR}/${JABDIR}/jabberd; \
 	 cd ${WRKDIR}/${JABDIR}/yahoo-transport; \
diff --git a/net-im/jabber/distinfo b/net-im/jabber/distinfo
index 12bd01a1b696..68e323c8a17c 100644
--- a/net-im/jabber/distinfo
+++ b/net-im/jabber/distinfo
@@ -1,8 +1,8 @@
 MD5 (jabber-1.4.1.tar.gz) = fc7afba8969e53c5e3b662156d1cdeae
-MD5 (aim-transport-0.9.0.tar.gz) = 16af3cdaa008a30079f5a89ecc4dbc90
+MD5 (aim-transport-0.9.24c.tar.gz) = a3c18654d41ebfaa3c74117004bf7d93
 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 (irc-transport-0.1.1-1.4.linux.tar.gz) = a08ef678fa8d768d7696af5bb85d1e34
 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 e3c1080d575f..214993d4645b 100644
--- a/net-im/jabber/files/patch-ab
+++ b/net-im/jabber/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Jan 21 05:32:48 2001
-+++ Makefile	Sat Jun 16 14:40:48 2001
+--- Makefile.orig	Sun Jan 21 14:32:48 2001
++++ Makefile	Tue Jan 22 23:55:05 2002
 @@ -4,6 +4,15 @@
  include platform-settings
  
@@ -16,7 +16,7 @@
  
  all: all-recursive
  
-@@ -13,8 +22,33 @@
+@@ -13,8 +22,35 @@
  
  single: single-recursive
  
@@ -27,6 +27,8 @@
 +	@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
diff --git a/net-im/jabber/pkg-plist b/net-im/jabber/pkg-plist
index 008e57af317e..9dcb38939957 100644
--- a/net-im/jabber/pkg-plist
+++ b/net-im/jabber/pkg-plist
@@ -9,6 +9,7 @@ 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/jud/jud.so
 lib/jabber/msn-transport/msntrans.so
 lib/jabber/pthsock/pthsock_client.so
 lib/jabber/xdb_file/xdb_file.so
@@ -20,6 +21,7 @@ lib/jabber/yahoo-transport/yahootrans.so
 @dirrm lib/jabber/icq-transport
 @dirrm lib/jabber/irc-transport
 @dirrm lib/jabber/jsm
+@dirrm lib/jabber/jud
 @dirrm lib/jabber/msn-transport
 @dirrm lib/jabber/pthsock
 @dirrm lib/jabber/xdb_file