Update to latest snapshot.

PR:		ports/68573
Submitted by:	Martijn Lina
Approved by:	seanc known to be busy

3 files changed, 7 insertions, 48 deletions

diff --git a/net-im/jabber-aim/Makefile b/net-im/jabber-aim/Makefile
index c8ff6044aa81..12ce66b68a25 100644
--- a/net-im/jabber-aim/Makefile
+++ b/net-im/jabber-aim/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	aim
-PORTVERSION=	0.9.24c
-PORTREVISION=	1
+PORTVERSION=	20040131.b
 CATEGORIES=	net
-MASTER_SITES=	http://download.jabber.org/dists/transports/aim-transport/
+MASTER_SITES=	http://aim-transport.jabberstudio.org/
 PKGNAMEPREFIX=	jabber-
 PKGNAMESUFFIX=	-transport
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-stable-${PORTVERSION:R}${PORTVERSION:E}
 DIST_SUBDIR=	jabber
 
 MAINTAINER=	seanc@FreeBSD.org
@@ -19,9 +18,10 @@ COMMENT=	Jabber AIM Transport module
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
 
+WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-stable-${PORTVERSION:R}
 PLIST_FILES=	lib/jabber/aimtrans.so
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOCONF_VER=	259
 
 CONFIGURE_ARGS+=--with-jabberd=${LOCALBASE}/include/jabber
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include/pth
diff --git a/net-im/jabber-aim/distinfo b/net-im/jabber-aim/distinfo
index 6a8210d69bf9..5a38efc3fd6e 100644
--- a/net-im/jabber-aim/distinfo
+++ b/net-im/jabber-aim/distinfo
@@ -1,2 +1,2 @@
-MD5 (jabber/aim-transport-0.9.24c.tar.gz) = a3c18654d41ebfaa3c74117004bf7d93
-SIZE (jabber/aim-transport-0.9.24c.tar.gz) = 298241
+MD5 (jabber/aim-transport-stable-20040131b.tar.gz) = 804469a50824691adcfa2cec71dbf6df
+SIZE (jabber/aim-transport-stable-20040131b.tar.gz) = 400742
diff --git a/net-im/jabber-aim/files/patch-aa b/net-im/jabber-aim/files/patch-aa
deleted file mode 100644
index 943027808952..000000000000
--- a/net-im/jabber-aim/files/patch-aa
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/sessions.c	Tue Nov 27 04:14:37 2001
-+++ /usr/ports/distfiles/jabber/sessions.c.orig	Wed Jan 30 09:07:47 2002
-@@ -221,6 +221,29 @@
-     return 1;
- }
- 
-+static int aim_icbmparaminfo(aim_session_t* sess, aim_frame_t* fr, ...)
-+{
-+    struct aim_icbmparameters *params;
-+    va_list ap;
-+
-+	va_start(ap, fr);
-+	params = va_arg(ap, struct aim_icbmparameters *);
-+	va_end(ap);
-+
-+	/*
-+	 * Set these to your taste, or client medium.  Setting minmsginterval
-+	 * higher is good for keeping yourself from getting flooded (esp
-+	 * if you're on a slow connection or something where that would be
-+	 * useful).
-+	 */
-+	params->maxmsglen = 8000;
-+	params->minmsginterval = 0; /* in milliseconds */
-+
-+	aim_seticbmparam(sess, params);
-+
-+	return 1;
-+}
-+
- int at_conninitdone_admin(aim_session_t *sess,
-                           aim_frame_t *command, ...)
- {
-@@ -411,6 +434,8 @@
-                             AIM_CB_SPECIAL_CONNERR, at_parse_connerr, 0);
-         aim_conn_addhandler(sess, bosconn, 0x0001, 0x001f, 
-                             at_memrequest, 0);
-+        aim_conn_addhandler(sess, bosconn, 0x0004, 0x0005, 
-+                            aim_icbmparaminfo, 0);
-         
-     
-         am = pmalloco(s->p, sizeof(_at_mio));