Fix the problem noted by Ben Collver <collver@linuxfreemail.com> in

pkg/13929 where xml2-config lies about the location of the libxml2
headers.  "xml2-config --cflags" now returns:

	-I/usr/pkg/include/libxml2/libxml -I/usr/pkg/include

which correctly finds the libxml2 headers.  When using buildlink, the
config wrapper xml2-config returns:

	-I${BUILDLINK_DIR}/include/libxml -I/usr/pkg/include

which correctly finds the libxml2 headers in their buildlinked locations.

4 files changed, 19 insertions, 10 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 620ec650d9d..6ddd2360a92 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/24 16:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/14 06:53:34 jlam Exp $
 
 DISTNAME=	libxml2-2.4.2
 CATEGORIES=	textproc
@@ -9,11 +9,15 @@ HOMEPAGE=	http://xmlsoft.org/
 COMMENT=	Xml parser library for GNOME
 
 USE_BUILDLINK_ONLY=	yes
-GNU_CONFIGURE=		yes
+REPLACE_BUILDLINK=	xml2-config xml2Conf.sh
+
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_DIR}
+
 .include "../../devel/zlib/buildlink.mk"
 .include "../../converters/libiconv/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libxml2/buildlink.mk b/textproc/libxml2/buildlink.mk
index 16a22689ce0..0c07c1bfbe4 100644
--- a/textproc/libxml2/buildlink.mk
+++ b/textproc/libxml2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/08/31 07:22:30 skrll Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/09/14 06:53:34 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libxml2.
 #
@@ -26,7 +26,10 @@ BUILDLINK_FILES.libxml2=	include/libxml2/libxml/*
 BUILDLINK_FILES.libxml2+=	lib/libxml2.*
 BUILDLINK_FILES.libxml2+=	lib/xml2Conf.sh
 
-BUILDLINK_TRANSFORM.libxml2=	-e "s|\/include\/libxml2|\/include|g"
+# The libxml2 headers should be found at the same location as for libxml.I
+BUILDLINK_TRANSFORM.libxml2=	-e "s|/include/libxml2/|/include/|g"
+BUILDLINK_CONFIG_WRAPPER_SED+=  \
+	-e "s|-I${BUILDLINK_PREFIX.libxml2}/include/libxml2/|-I${BUILDLINK_DIR}/include/|g"
 
 .include "../../devel/zlib/buildlink.mk"
 .include "../../converters/libiconv/buildlink.mk"
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 16f75dd1909..7a11b5ea16c 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/08/24 16:59:01 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/09/14 06:53:34 jlam Exp $
 
 SHA1 (libxml2-2.4.2.tar.gz) = fc9c2ce9289c64e8d871bc1895489701b1555e41
 Size (libxml2-2.4.2.tar.gz) = 1431796 bytes
-SHA1 (patch-aa) = c68980c8cd8b0c125127e1ae2a717cd75ac5ae52
+SHA1 (patch-aa) = 7cadf5c936b816931e1b8aa5f0f1836a793b4fd5
 SHA1 (patch-ab) = 08bf886034f5404fa0f07bad09fb24f4338d453e
 SHA1 (patch-ac) = 30a934bdfe298e67725452ea92b428e0d27d40bc
 SHA1 (patch-ad) = 715a93a65cebcc4216da647f148903974ffc31f0
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa
index edd380183ad..0b454adf7da 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2001/08/24 16:59:03 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2001/09/14 06:53:35 jlam Exp $
 
---- configure.orig	Wed Aug 15 14:26:09 2001
+--- configure.orig	Wed Aug 15 08:26:09 2001
 +++ configure
 @@ -6152,7 +6152,7 @@
  
@@ -11,12 +11,14 @@ $NetBSD: patch-aa,v 1.2 2001/08/24 16:59:03 wiz Exp $
  else
    HTML_DIR=$with_html_dir
  fi
-@@ -7086,7 +7086,7 @@
+@@ -7086,8 +7086,8 @@
  fi
  
  
 -XML_LIBDIR='-L${libdir}'
+-XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
 +XML_LIBDIR='-L${libdir} -Wl,-R${libdir}'
- XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
++XML_INCLUDEDIR='-I${includedir}/libxml2/libxml -I${includedir}'
  
  XML_CFLAGS=""
+ RDL_LIBS=""