Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

6 files changed, 33 insertions, 9 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 05346c81d0f..140719b74f0 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/07/12 15:45:02 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/25 18:40:10 jlam Exp $
 
 DISTNAME=	libxml2-${LIBXML_VERSION}
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://xmlsoft.org/
 COMMENT=	XML parser library for GNOME
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
@@ -17,10 +17,11 @@ LIBXML_VERSION=		2.4.23
 PLIST_SUBST+=		LIBXML_VERSION=${LIBXML_VERSION}
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--without-python
 
-.include "../../devel/zlib/buildlink.mk"
-.include "../../converters/libiconv/buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../converters/libiconv/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST
index 333db665582..1d37b217fb2 100644
--- a/textproc/libxml2/PLIST
+++ b/textproc/libxml2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2002/07/12 15:45:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2002/08/25 18:40:11 jlam Exp $
 bin/xml2-config
 bin/xmlcatalog
 bin/xmllint
diff --git a/textproc/libxml2/buildlink2.mk b/textproc/libxml2/buildlink2.mk
new file mode 100644
index 00000000000..49e82707453
--- /dev/null
+++ b/textproc/libxml2/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:11 jlam Exp $
+
+.if !defined(LIBXML2_BUILDLINK2_MK)
+LIBXML2_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libxml2
+BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.4.2
+BUILDLINK_PKGSRCDIR.libxml2?=	../../textproc/libxml2
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libxml2=libxml2
+BUILDLINK_PREFIX.libxml2_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libxml2=	include/libxml2/libxml/*
+BUILDLINK_FILES.libxml2+=	lib/libxml2.*
+BUILDLINK_FILES.libxml2+=	lib/xml2Conf.sh
+
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../converters/libiconv/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	libxml2-buildlink
+
+libxml2-buildlink: _BUILDLINK_USE
+
+.endif	# LIBXML2_BUILDLINK2_MK
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 1841d5b0e59..61f4e55ec46 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/07/12 15:45:02 wiz Exp $
+$NetBSD: distinfo,v 1.14 2002/08/25 18:40:11 jlam Exp $
 
 SHA1 (libxml2-2.4.23.tar.gz) = a4e8ebc47b9e27de6486f280773e8c1ed9aecb5a
 Size (libxml2-2.4.23.tar.gz) = 2062657 bytes
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa
index 4b9d0116e67..00a2b296d60 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2002/05/17 13:02:30 martti Exp $
+$NetBSD: patch-aa,v 1.10 2002/08/25 18:40:12 jlam Exp $
 
 --- configure.orig	Mon Apr 29 18:38:47 2002
 +++ configure	Fri May 17 14:51:28 2002
diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-ad
index 300b081a74c..33d5c79a689 100644
--- a/textproc/libxml2/patches/patch-ad
+++ b/textproc/libxml2/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.5 2002/05/17 13:02:30 martti Exp $
+$NetBSD: patch-ad,v 1.6 2002/08/25 18:40:12 jlam Exp $
 
 --- doc/Makefile.in.orig	Mon Apr 29 18:39:10 2002
 +++ doc/Makefile.in	Fri May 17 14:51:51 2002