From martijn@pacno.net  Mon Jun  7 21:33:45 2004
Return-Path: <martijn@pacno.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A506416A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  7 Jun 2004 21:33:45 +0000 (GMT)
Received: from post-21.mail.nl.demon.net (post-21.mail.nl.demon.net [194.159.73.20])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D863F43D5D
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  7 Jun 2004 21:33:42 +0000 (GMT)
	(envelope-from martijn@pacno.net)
Received: from [82.161.93.5] (helo=hostage.demon.nl)
	by post-21.mail.nl.demon.net with esmtp (Exim 3.36 #2)
	id 1BXRkT-000CQW-00
	for FreeBSD-gnats-submit@freebsd.org; Mon, 07 Jun 2004 21:33:41 +0000
Received: from localhost (localhost [127.0.0.1])
	by hostage.demon.nl (Postfix) with ESMTP id 263A9409E
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  7 Jun 2004 23:33:41 +0200 (CEST)
Received: from hostage.demon.nl ([127.0.0.1])
 by localhost (drain.pacno.net [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 19561-02 for <FreeBSD-gnats-submit@freebsd.org>;
 Mon,  7 Jun 2004 23:33:33 +0200 (CEST)
Received: by hostage.demon.nl (Postfix, from userid 1001)
	id 5A834409C; Mon,  7 Jun 2004 23:33:32 +0200 (CEST)
Message-Id: <20040607213332.5A834409C@hostage.demon.nl>
Date: Mon,  7 Jun 2004 23:33:32 +0200 (CEST)
From: Martijn Lina <martijn@pacno.net>
Reply-To: Martijn Lina <martijn@pacno.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Upgrade to version 20040131
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         67689
>Category:       ports
>Synopsis:       Upgrade net/jabber-aim to version 20040131
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    seanc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 07 21:40:19 GMT 2004
>Closed-Date:    Fri Jul 02 04:40:41 GMT 2004
>Last-Modified:  Fri Jul 02 04:40:41 GMT 2004
>Originator:     Martijn Lina
>Release:        FreeBSD 5.2.1-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD drain.pacno.net 5.2.1-RELEASE-p8 FreeBSD 5.2.1-RELEASE-p8 

	x86/k6-2

>Description:
	The port is out of date

>How-To-Repeat:
	Try to build to current port, it won't even find the source on the net
>Fix:

Please apply the following patch:


diff -urNd net/jabber-aim.orig/Makefile net/jabber-aim/Makefile
--- net/jabber-aim.orig/Makefile	Sat Mar 20 04:36:39 2004
+++ net/jabber-aim/Makefile	Mon Jun  7 23:22:59 2004
@@ -5,11 +5,11 @@
 # $FreeBSD: ports/net/jabber-aim/Makefile,v 1.7 2004/03/14 06:17:06 ade Exp $
 
 PORTNAME=	aim-transport
-PORTVERSION=	0.9.24c
-PORTREVISION=	1
+PORTVERSION=	20040131
 CATEGORIES=	net
-MASTER_SITES=	http://download.jabber.org/dists/transports/aim-transport/
+MASTER_SITES=	http://aim-transport.jabberstudio.org/
 PKGNAMEPREFIX=	jabber-
+DISTNAME=	${PORTNAME}-stable-${PORTVERSION}b
 DIST_SUBDIR=	jabber
 
 MAINTAINER=	seanc@FreeBSD.org
@@ -17,9 +17,10 @@
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-stable-${PORTVERSION}
 PLIST_FILES=	lib/jabber/aimtrans.so
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOCONF_VER=	257
 
 CONFIGURE_ARGS+=	--with-jabberd=${PREFIX}/include/jabber
 
@@ -27,6 +28,6 @@
 	${INSTALL_DATA} ${WRKSRC}/src/aimtrans.so ${PREFIX}/lib/jabber/
 
 post-install:
-	@cat pkg-message
+	@${CAT} pkg-message
 
 .include <bsd.port.mk>
diff -urNd net/jabber-aim.orig/distinfo net/jabber-aim/distinfo
--- net/jabber-aim.orig/distinfo	Thu Apr  1 14:40:36 2004
+++ net/jabber-aim/distinfo	Mon Jun  7 23:18:45 2004
@@ -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 -urNd net/jabber-aim.orig/files/patch-aa net/jabber-aim/files/patch-aa
--- net/jabber-aim.orig/files/patch-aa	Fri Apr 19 06:22:50 2002
+++ net/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));

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->seanc 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Jun 8 01:58:03 GMT 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67689 
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Fri Jul 2 04:40:15 GMT 2004 
State-Changed-Why:  
Superced by ports/68573. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67689 
>Unformatted:
