ports/60867: Upgrade of net/jabber-yahoo to version 2.3.0

[Martijn Lina]

>Number:         60867
>Category:       ports
>Synopsis:       Upgrade of net/jabber-yahoo to version 2.3.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 03 11:50:15 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Martijn Lina
>Release:        FreeBSD 5.2-RC i386
>Organization:
>Environment:
System: FreeBSD 5.2-RC i386


>Description:
	from the website:
	"This release incorporates many small bugs fixes. The most significant
	changes are better handling in cases of connection timeouts and errors.
	In addition, this release of Yahoo-t is designed to be run standalone
	using the upcoming JCR 0.2.1 release. This will create a standalone
	binary version of the transport. See http://jabber.terrapin.com/ for
	details on JCR. It is expected to be released within a week."
>How-To-Repeat:
>Fix:
	Apply this patch:


diff -ruN jabber-yahoo.orig/Makefile jabber-yahoo/Makefile
--- jabber-yahoo.orig/Makefile	Tue Oct  7 10:01:06 2003
+++ jabber-yahoo/Makefile	Sat Jan  3 20:22:55 2004
@@ -5,11 +5,11 @@
 # $FreeBSD: ports/net/jabber-yahoo/Makefile,v 1.10 2003/10/07 08:01:06 erwin Exp $
 
 PORTNAME=	yahoo
-PORTVERSION=	2.2.0
+PORTVERSION=	2.3.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.jabberstudio.org/files/yahoo-transport-2/
 PKGNAMEPREFIX=	jabber-
-DISTNAME=	yahoo-t-${PORTVERSION}
+DISTNAME=	yahoo-transport-${PORTVERSION}
 DIST_SUBDIR=	jabber
 
 MAINTAINER=	ports at FreeBSD.org
@@ -21,7 +21,7 @@
 USE_GNOME=	glib12
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/yahoo-transport-2
+WRKSRC=		${WRKDIR}/yahoo-transport-${PORTVERSION}
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/yahoo-transport.so ${PREFIX}/lib/jabber/
diff -ruN jabber-yahoo.orig/distinfo jabber-yahoo/distinfo
--- jabber-yahoo.orig/distinfo	Tue Oct  7 10:01:06 2003
+++ jabber-yahoo/distinfo	Sat Jan  3 20:21:51 2004
@@ -1 +1 @@
-MD5 (jabber/yahoo-t-2.2.0.tar.gz) = 2bedde34f0da56ec29ab04248cf75082
+MD5 (jabber/yahoo-transport-2.3.0.tar.gz) = 281136e9934dd9e9221739a83bac4a2e
diff -ruN jabber-yahoo.orig/files/patch-Makefile jabber-yahoo/files/patch-Makefile
--- jabber-yahoo.orig/files/patch-Makefile	Thu Jan  1 01:00:00 1970
+++ jabber-yahoo/files/patch-Makefile	Sat Jan  3 20:23:28 2004
@@ -0,0 +1,16 @@
+--- Makefile.orig	Mon Sep 29 02:40:44 2003
++++ Makefile	Sat Jan  3 20:23:13 2004
+@@ -1,10 +1,10 @@
+ 
+ #  $Id: Makefile,v 1.5 2003/09/29 00:40:44 pcurtis Exp $
+ 
+-include ../platform-settings
++include ${PREFIX}/include/jabber/platform-settings
+ 
+-CFLAGS:=$(CFLAGS) -I../jabberd  `glib-config --cflags`
+-LIBS:=$(LIBS) `glib-config --libs glib`
++CFLAGS:=$(CFLAGS) -I${PREFIX}/include -I${PREFIX}/include/jabber `glib12-config --cflags`
++LIBS:=$(LIBS) `glib12-config --libs glib` -liconv
+ 
+ YAHOO_OBJECTS=yahoo-transport.o yahoo-session.o yahoo-phandler.o yahoo.o \
+ 	crypt.o gaim-sha.o yahoo-presence.o yahoo-server.o md5.o yahoo-message.o \
diff -ruN jabber-yahoo.orig/files/patch-aa jabber-yahoo/files/patch-aa
--- jabber-yahoo.orig/files/patch-aa	Sat Oct 12 16:37:51 2002
+++ jabber-yahoo/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,16 +0,0 @@
---- Makefile.orig	Sat Oct 12 07:06:35 2002
-+++ Makefile	Sat Oct 12 07:08:05 2002
-@@ -1,10 +1,10 @@
- 
- #  $Id: Makefile,v 1.3 2002/08/12 23:46:51 pcurtis Exp $
- 
--include ../platform-settings
-+include ${PREFIX}/include/jabber/platform-settings
- 
--CFLAGS:=$(CFLAGS) -I../jabberd  `glib-config --cflags`
--LIBS:=$(LIBS) `glib-config --libs glib`
-+CFLAGS:=$(CFLAGS) -I${PREFIX}/include -I${PREFIX}/include/jabber `glib12-config --cflags`
-+LIBS:=$(LIBS) `glib12-config --libs glib` -liconv
- 
- YAHOO_OBJECTS=yahoo-transport.o yahoo-session.o yahoo-phandler.o yahoo.o \
- 	crypt.o yahoo-presence.o yahoo-server.o md5.o yahoo-message.o \
>Release-Note:
>Audit-Trail:
>Unformatted: