ports/68404: [PATCH] net/jabber-msn-transport: fix build and other stuff

[ports at c0decafe.net]

>Number:         68404
>Category:       ports
>Synopsis:       [PATCH] net/jabber-msn-transport: fix build and other stuff
>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:   Sat Jun 26 22:50:20 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     ports at c0decafe.net
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD atlantis.local 4.10-STABLE FreeBSD 4.10-STABLE #0: Sat Jun 26 12:02:34 EEST 2004
>Description:
- 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?)
- bump portrevision

Port maintainer (martijn at pacno.net) is cc'd.

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- jabber-msn-transport-1.2.8.r1_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/jabber-msn.orig/Makefile /usr/ports/net/jabber-msn/Makefile
--- /usr/ports/net/jabber-msn.orig/Makefile	Fri Jun  4 01:41:38 2004
+++ /usr/ports/net/jabber-msn/Makefile	Sun Jun 27 01:06:41 2004
@@ -4,12 +4,15 @@
 #
 # $FreeBSD: ports/net/jabber-msn/Makefile,v 1.8 2004/06/03 22:41:38 roam Exp $
 
-PORTNAME=	jabber-msn
-PORTVERSION=	1.2.8.rc1
-PORTREVISION=	2
+PORTNAME=	msn
+PORTVERSION=	1.2.8.r1
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://msn-transport.jabberstudio.org/
-DISTNAME=	msn-transport-${PORTVERSION:S/.rc/rc/}
+PKGNAMEPREFIX=	jabber-
+PKGNAMESUFFIX=	-transport
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION:S/.r/rc/}
+DIST_SUBDIR=	jabber
 
 MAINTAINER=	martijn at pacno.net
 COMMENT=	Jabber MSN-Transport module
@@ -19,13 +22,14 @@
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --with-jabberd=${PREFIX}/include/jabber \
-		--with-pth=${PREFIX}/include/jabber
-CONFIGURE_ENV=  LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS+=--with-jabberd=${LOCALBASE}/include/jabber \
+		--with-pth=${LOCALBASE}/include/pth
 
 do-install:
+	@${MKDIR} ${PREFIX}/lib/jabber
 	${INSTALL_DATA} ${WRKSRC}/src/msntrans.so ${PREFIX}/lib/jabber/
 .if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
diff -ruN --exclude=CVS /usr/ports/net/jabber-msn.orig/distinfo /usr/ports/net/jabber-msn/distinfo
--- /usr/ports/net/jabber-msn.orig/distinfo	Wed Mar 31 06:10:01 2004
+++ /usr/ports/net/jabber-msn/distinfo	Sun Jun 27 01:05:13 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.2.8rc1.tar.gz) = 832ac9fba617f11462c6457eacf4009a
+SIZE (jabber/msn-transport-1.2.8rc1.tar.gz) = 80925
diff -ruN --exclude=CVS /usr/ports/net/jabber-msn.orig/pkg-plist /usr/ports/net/jabber-msn/pkg-plist
--- /usr/ports/net/jabber-msn.orig/pkg-plist	Thu Oct 16 14:45:48 2003
+++ /usr/ports/net/jabber-msn/pkg-plist	Sun Jun 27 00:23:30 2004
@@ -1,2 +1,3 @@
 lib/jabber/msntrans.so
-%%PORTDOCS%%share/doc/jabber-msn
+%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- jabber-msn-transport-1.2.8.r1_3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: