ports/68570: net/jabber-msn-transport: port upgrade, fix build and other stuff (supersedes ports/68404)

[martijn at pacno.net]

>Number:         68570
>Category:       ports
>Synopsis:       net/jabber-msn-transport: port upgrade, fix build and other stuff (supersedes ports/68404)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 01 21:40:19 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     martijn at pacno.net
>Release:        FreeBSD 5.2.1-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD 5.2.1-RELEASE-p8 


	
>Description:
	This patch includes and therefor supersedes ports/68404. Thanks for submitting.

	- upgrade to version 1.3 (old version not available for download anymore...)
	- fix the build problem induced by net/jabber's update
	- make portlint happy
	- align PORTNAME/PKGNAMEPREFIX/PKGNAMESUFFIX/DIST_SUBDIR on the other jabber components standard (problematic for upgrading?)

	
>How-To-Repeat:
	
>Fix:

diff -rudN net/jabber-msn.orig/Makefile net/jabber-msn/Makefile
--- net/jabber-msn.orig/Makefile	Fri Jun  4 00:41:38 2004
+++ net/jabber-msn/Makefile	Thu Jul  1 23:30:59 2004
@@ -2,14 +2,16 @@
 # Date created:				Sat May 04 06:00:02 PDT 2002
 # Whom:					Martijn Lina <martijn at pacno.net>
 #
-# $FreeBSD: ports/net/jabber-msn/Makefile,v 1.8 2004/06/03 22:41:38 roam Exp $
+# $FreeBSD$
 
-PORTNAME=	jabber-msn
-PORTVERSION=	1.2.8.rc1
-PORTREVISION=	2
+PORTNAME=	msn
+PORTVERSION=	1.3
 CATEGORIES=	net
 MASTER_SITES=	http://msn-transport.jabberstudio.org/
-DISTNAME=	msn-transport-${PORTVERSION:S/.rc/rc/}
+PKGNAMEPREFIX=	jabber-
+PKGNAMESUFFIX=	-transport
+DISTNAME=	msn-transport-1.3-cvs3
+DIST_SUBDIR=	jabber
 
 MAINTAINER=	martijn at pacno.net
 COMMENT=	Jabber MSN-Transport module
@@ -20,7 +22,7 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --with-jabberd=${PREFIX}/include/jabber \
-		--with-pth=${PREFIX}/include/jabber
+		--with-pth=${LOCALBASE}/include/pth
 CONFIGURE_ENV=  LDFLAGS=-L${LOCALBASE}/lib
 
 do-install:
diff -rudN net/jabber-msn.orig/distinfo net/jabber-msn/distinfo
--- net/jabber-msn.orig/distinfo	Wed Mar 31 05:10:01 2004
+++ net/jabber-msn/distinfo	Thu Jul  1 23:17:08 2004
@@ -1,2 +1,2 @@
-MD5 (msn-transport-1.2.8rc1.tar.gz) = 832ac9fba617f11462c6457eacf4009a
-SIZE (msn-transport-1.2.8rc1.tar.gz) = 80925
+MD5 (jabber/msn-transport-1.3-cvs3.tar.gz) = 95288539194dc28d6e3633b4d41fe04d
+SIZE (jabber/msn-transport-1.3-cvs3.tar.gz) = 72208
diff -rudN net/jabber-msn.orig/pkg-plist net/jabber-msn/pkg-plist
--- net/jabber-msn.orig/pkg-plist	Thu Oct 16 13:45:48 2003
+++ net/jabber-msn/pkg-plist	Thu Jul  1 23:20:38 2004
@@ -1,2 +1,3 @@
 lib/jabber/msntrans.so
-%%PORTDOCS%%share/doc/jabber-msn
+%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted: