ports/59832: Upgrade of jabber-aim to version 20030314 (supersedes ports/37713)

[Martijn Lina]

>Number:         59832
>Category:       ports
>Synopsis:       Upgrade of jabber-aim to version 20030314 (supersedes ports/37713)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 30 04:30:23 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Martijn Lina
>Release:        FreeBSD 5.1-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD 5.1-RELEASE-p11 i386


>Description:
	From ports/37713: When a ICQ contact sends a message
	to a jabber user via the aim-transport, the transport
	always sends an Auto-Reply message to that contact,
	even when the jabber user is online.
	
	The original PR is from May 03 2002, and the url
	doesn't work anymore. The current version has a lot of
	issues fixed, see http://aim-transport.jabberstudio.org/ChangeLog

>How-To-Repeat:
	From ports/37713: Have a ICQ contact send you a message.
>Fix:
	Apply the patch:

diff -ruN jabber-aim.orig/Makefile jabber-aim/Makefile
--- jabber-aim.orig/Makefile	Sat Oct 18 04:33:40 2003
+++ jabber-aim/Makefile	Sun Nov 30 13:16:41 2003
@@ -4,17 +4,19 @@
 #
 # $FreeBSD: ports/net/jabber-aim/Makefile,v 1.4 2003/10/16 10:00:50 dd Exp $
 
-PORTNAME=	aim-transport
-PORTVERSION=	0.9.24c
+PORTNAME=	aim
+PORTVERSION=	20030314
 CATEGORIES=	net
-MASTER_SITES=	http://download.jabber.org/dists/transports/aim-transport/
+MASTER_SITES=	http://aim-transport.jabberstudio.org/
 PKGNAMEPREFIX=	jabber-
+DISTNAME=	${PORTNAME}-transport-stable-${PORTVERSION}
 DIST_SUBDIR=	jabber
 
 MAINTAINER=	seanc at FreeBSD.org
 COMMENT=	Jabber AIM Transport module
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_GMAKE=	yes
 USE_AUTOCONF=	yes
diff -ruN jabber-aim.orig/distinfo jabber-aim/distinfo
--- jabber-aim.orig/distinfo	Fri Apr 19 06:22:50 2002
+++ jabber-aim/distinfo	Sun Nov 30 13:17:11 2003
@@ -1 +1 @@
-MD5 (jabber/aim-transport-0.9.24c.tar.gz) = a3c18654d41ebfaa3c74117004bf7d93
+MD5 (jabber/aim-transport-stable-20030314.tar.gz) = 950e2661ca99e5bcac5930373f0b0fd4
diff -ruN jabber-aim.orig/files/patch-aa jabber-aim/files/patch-aa
--- jabber-aim.orig/files/patch-aa	Fri Apr 19 06:22:50 2002
+++ jabber-aim/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -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));
diff -ruN jabber-aim.orig/files/patch-src:Makefile.in jabber-aim/files/patch-src:Makefile.in
--- jabber-aim.orig/files/patch-src:Makefile.in	Thu Jan  1 01:00:00 1970
+++ jabber-aim/files/patch-src:Makefile.in	Sun Nov 30 13:12:55 2003
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Sun Nov 30 13:12:19 2003
++++ src/Makefile.in	Sun Nov 30 13:12:37 2003
+@@ -97,7 +97,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I.
+ CPPFLAGS = @CPPFLAGS@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -L/usr/local/lib -liconv
+ LIBS = @LIBS@
+ aimtrans_so_OBJECTS =  admin.$(OBJEXT) adverts.$(OBJEXT) auth.$(OBJEXT) \
+ bos.$(OBJEXT) buddies.$(OBJEXT) buddylist.$(OBJEXT) charset.$(OBJEXT) \
>Release-Note:
>Audit-Trail:
>Unformatted: