xmms and xml2

[Mikhail Teterin]

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: