From owner-freebsd-gnome@FreeBSD.ORG  Sun May  4 19:24:23 2003
Return-Path: <owner-freebsd-gnome@FreeBSD.ORG>
Delivered-To: freebsd-gnome@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 49E5737B401
	for <gnome@FreeBSD.org>; Sun,  4 May 2003 19:24:23 -0700 (PDT)
Received: from aldan.algebra.com (aldan.algebra.com [216.254.65.224])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 36E9F43F3F
	for <gnome@FreeBSD.org>; Sun,  4 May 2003 19:24:22 -0700 (PDT)
	(envelope-from mi@aldan.algebra.com)
Received: from aldan.algebra.com (mi@localhost [127.0.0.1])
	by aldan.algebra.com (8.12.9/8.12.9) with ESMTP id h452OIfb020695;
	Sun, 4 May 2003 22:24:18 -0400 (EDT)
	(envelope-from mi@aldan.algebra.com)
Received: (from mi@localhost)
	by aldan.algebra.com (8.12.9/8.12.9/Submit) id h452OGxT020573;
	Sun, 4 May 2003 22:24:16 -0400 (EDT)
From: Mikhail Teterin <mi@aldan.algebra.com>
Message-Id: <200305050224.h452OGxT020573@aldan.algebra.com>
To: esk@ira.uka.de, gnome@FreeBSD.org
Date: Sun, 4 May 2003 22:24:12 -0400 (EDT)
X-Face: %UW#n0|w>ydeGt/b@1-.UFP=K^~-:0f#O:D7w<gv/&E-lL7twZCT8B~/PA4|\t$ti+22K">
	y+z3/UR{6SCQ
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Subject: xmms and xml2
X-BeenThere: freebsd-gnome@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: GNOME for FreeBSD -- porting and maintaining
	<freebsd-gnome.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gnome>
List-Post: <mailto:freebsd-gnome@freebsd.org>
List-Help: <mailto:freebsd-gnome-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 May 2003 02:24:23 -0000

Hello!

Coercing xmms to compile/link with libxml2 instead of the outdated
libxml seems fairly simple. The following patch does that and fixes
a few style bugs. I'm not sure about the regular Gnome desktop, but
the KDE uses libxml2 only -- building/using yet another XML library
seems a bit waistful :-) Yours,

	-mi

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/xmms/Makefile,v
retrieving revision 1.50
diff -U2 -r1.50 Makefile
--- Makefile	20 Apr 2003 19:35:01 -0000	1.50
+++ Makefile	5 May 2003 02:24:01 -0000
@@ -8,5 +8,5 @@
 PORTNAME=	xmms
 PORTVERSION=	1.2.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES+=	multimedia audio
 MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.2.x/ \
@@ -19,5 +19,5 @@
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gtk12 gnomehack libxml
+USE_GNOME=	gtk12 gnomehack libxml2
 USE_REINPLACE=	yes
 WANT_GNOME=	yes
@@ -25,9 +25,10 @@
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2/libxml" \
 		LIBS="-L${LOCALBASE}/lib" \
 		INPUT_PLUGINS="${INPUT_PLUGINS}" \
 		OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
 		VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
+CONFIGURE_ARGS+=--with-libxml-prefix="${LOCALBASE}"
 MAN1=		gnomexmms.1 wmxmms.1 xmms.1
 
@@ -119,6 +120,8 @@
 
 post-patch:
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
 		 's|\(datadir\)/aclocal|(prefix)/share/aclocal|g'
+	@${REINPLACE_CMD} -e 's|xml-config|xml2-config|g' \
+		-e 's|-lxml|-lxml2|g' ${WRKSRC}/configure
 
 post-install: