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.

48 files changed, 316 insertions, 69 deletions

diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index 3a772426a95..98e85322b65 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/06/12 01:14:49 uebayasi Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/25 18:39:59 jlam Exp $
 # FreeBSD Id: ports/japanese/eb/Makefile,v 1.21 2000/08/21 03:39:42 kevlo Exp
 
 DISTNAME=	eb-3.2.2
@@ -47,7 +47,7 @@ EB_APPENDICES=	\
 EXTRACT_ONLY=	${EB_DISTFILES}
 
 DIST_SUBDIR=		eb
-USE_BUILDLINK_ONLY=	# Defined
+USE_BUILDLINK2=		# Defined
 USE_LIBTOOL=		# Defined
 GNU_CONFIGURE=		# Defined
 CONFIGURE_ARGS+=	--with-zlib
@@ -69,7 +69,8 @@ post-install:
 		${GTAR} -C ${EB_APPENDIXDIR} -zxmf ${_DISTDIR}/$${f}; \
 	done
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/zlib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
+
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/eb/PLIST b/textproc/eb/PLIST
index 67bc5690bc3..b2b54e38f1e 100644
--- a/textproc/eb/PLIST
+++ b/textproc/eb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/06/12 01:14:49 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 18:39:59 jlam Exp $
 bin/ebappendix
 bin/ebfont
 bin/ebinfo
diff --git a/textproc/eb/buildlink.mk b/textproc/eb/buildlink.mk
index 07bef2c61bc..2d68f46afc8 100644
--- a/textproc/eb/buildlink.mk
+++ b/textproc/eb/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/06/12 01:14:49 uebayasi Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/08/25 18:39:59 jlam Exp $
 #
 # This Makefile fragment is included by packages that use EB.
 #
diff --git a/textproc/eb/buildlink2.mk b/textproc/eb/buildlink2.mk
new file mode 100644
index 00000000000..208aab4e2a2
--- /dev/null
+++ b/textproc/eb/buildlink2.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:00 jlam Exp $
+
+.if !defined(EB_BUILDLINK2_MK)
+EB_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		eb
+
+# eb<=3.2.1 packages didn't fix eb.conf.
+BUILDLINK_DEPENDS.eb?=		eb>=3.2.2
+BUILDLINK_PKGSRCDIR.eb?=	../../textproc/eb
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.eb=eb
+BUILDLINK_PREFIX.eb_DEFAULT?=	${LOCALBASE}
+
+BUILDLINK_FILES.eb=	include/eb/*.h
+BUILDLINK_FILES.eb+=	lib/libeb.*
+
+.if defined(GNU_CONFIGURE)
+CONFIGURE_ARGS+=	--with-eb-conf=${PKG_SYSCONFDIR}/eb.conf
+.endif
+
+BUILDLINK_TARGETS+=	eb-buildlink
+
+eb-buildlink: _BUILDLINK_USE
+
+.endif	# EB_BUILDLINK2_MK
diff --git a/textproc/eb/distinfo b/textproc/eb/distinfo
index 53f99e7e64d..1cd687fb7b5 100644
--- a/textproc/eb/distinfo
+++ b/textproc/eb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/06/12 01:14:49 uebayasi Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 18:40:00 jlam Exp $
 
 SHA1 (eb/eb-3.2.2.tar.gz) = ae6fa87b996c239d95a8e24a4514eadb3cd9fb80
 Size (eb/eb-3.2.2.tar.gz) = 1010300 bytes
diff --git a/textproc/eb/patches/patch-aa b/textproc/eb/patches/patch-aa
index 0195af39aea..ee24da38552 100644
--- a/textproc/eb/patches/patch-aa
+++ b/textproc/eb/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2002/06/12 01:14:49 uebayasi Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 18:40:00 jlam Exp $
 
 --- configure.orig	Sun Jun  9 12:06:40 2002
 +++ configure
diff --git a/textproc/eb/patches/patch-ab b/textproc/eb/patches/patch-ab
index a62a6f294e9..fe2297155ea 100644
--- a/textproc/eb/patches/patch-ab
+++ b/textproc/eb/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2002/06/12 01:14:50 uebayasi Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 18:40:00 jlam Exp $
 
 --- configure.ac.orig	Sat Mar 30 15:45:45 2002
 +++ configure.ac
diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index ae546d06637..31ba3e48d68 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/08/20 11:46:49 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 18:40:01 jlam Exp $
 #
 
 DISTNAME=	expat-1.95.4
@@ -13,7 +13,7 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_GMAKE=		YES
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 DOCDIR=	${PREFIX}/share/doc/html/expat
 
diff --git a/textproc/expat/PLIST b/textproc/expat/PLIST
index 551003351ed..e1f05413a34 100644
--- a/textproc/expat/PLIST
+++ b/textproc/expat/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/20 11:46:49 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:40:01 jlam Exp $
 bin/xmlwf
 include/expat.h
 lib/libexpat.a
diff --git a/textproc/expat/buildlink2.mk b/textproc/expat/buildlink2.mk
new file mode 100644
index 00000000000..f8cca3c5cca
--- /dev/null
+++ b/textproc/expat/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:01 jlam Exp $
+
+.if !defined(EXPAT_BUILDLINK2_MK)
+EXPAT_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		expat
+BUILDLINK_DEPENDS.expat?=	expat>=1.95.2
+BUILDLINK_PKGSRCDIR.expat?=	../../textproc/expat
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.expat=expat
+BUILDLINK_PREFIX.expat_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.expat=		include/expat.h
+BUILDLINK_FILES.expat+=		lib/libexpat.*
+
+BUILDLINK_TARGETS+=	expat-buildlink
+
+expat-buildlink: _BUILDLINK_USE
+
+.endif	# EXPAT_BUILDLINK2_MK
diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo
index b66557a1c01..60e95f92867 100644
--- a/textproc/expat/distinfo
+++ b/textproc/expat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/08/20 11:46:50 drochner Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 18:40:02 jlam Exp $
 
 SHA1 (expat-1.95.4.tar.gz) = e3c7d512f98a495b7c39d63d98e39a0c7b89d63a
 Size (expat-1.95.4.tar.gz) = 263409 bytes
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 0429f68ed4e..8a34f76362a 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/06 13:15:21 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 18:40:02 jlam Exp $
 #
 
 DISTNAME=		intltool-0.18
@@ -11,8 +11,8 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Toolbox for internationalisation
 
 USE_GMAKE=		YES
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/intltool/buildlink2.mk b/textproc/intltool/buildlink2.mk
new file mode 100644
index 00000000000..163cdc7500f
--- /dev/null
+++ b/textproc/intltool/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:02 jlam Exp $
+
+.if !defined(INTLTOOL_BUILDLINK2_MK)
+INTLTOOL_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		intltool
+BUILDLINK_DEPENDS.intltool?=	intltool>=0.18
+BUILDLINK_PKGSRCDIR.intltool?=	../../textproc/intltool
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.intltool=intltool
+BUILDLINK_PREFIX.intltool_DEFAULT=	${LOCALBASE}
+
+.include "../../lang/perl5/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	intltool-buildlink
+
+intltool-buildlink: _BUILDLINK_USE
+
+.endif	# INTLTOOL_BUILDLINK2_MK
diff --git a/textproc/intltool/distinfo b/textproc/intltool/distinfo
index 833678ac708..2271d313586 100644
--- a/textproc/intltool/distinfo
+++ b/textproc/intltool/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/07/02 13:02:50 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/08/25 18:40:02 jlam Exp $
 
 SHA1 (intltool-0.18.tar.bz2) = f282b076f529bc5745b49ee384048b46ec6fe3c9
 Size (intltool-0.18.tar.bz2) = 82619 bytes
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index ec13828fa6a..2698c8756ad 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/08/12 16:23:23 skrll Exp $
+# $NetBSD: Makefile,v 1.21 2002/08/25 18:40:03 jlam Exp $
 
 DISTNAME=	jade-1.2.1
 PKGREVISION=	4
@@ -17,7 +17,7 @@ PATCH_DIST_STRIP=	-p1
 
 CONFLICTS+=	sp-[0-9]*
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
@@ -49,7 +49,7 @@ post-install:
 # Installed by print/tex-jadetex
 	${RM} ${PREFIX}/share/sgml/jade/*jadetex.*
 
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # Turn off C++ optimization as there seem to be problems with the generated
diff --git a/textproc/jade/buildlink2.mk b/textproc/jade/buildlink2.mk
new file mode 100644
index 00000000000..1f30b866476
--- /dev/null
+++ b/textproc/jade/buildlink2.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:03 jlam Exp $
+
+.if !defined(JADE_BUILDLINK2_MK)
+JADE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		jade
+BUILDLINK_DEPENDS.jade?=	jade>=1.2.1
+BUILDLINK_PKGSRCDIR.jade?=	../../textproc/jade
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.jade=jade
+BUILDLINK_PREFIX.jade_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.jade=	include/sp/*
+BUILDLINK_FILES.jade+=	lib/libgrove.*
+BUILDLINK_FILES.jade+=	lib/libsp.*
+BUILDLINK_FILES.jade+=	lib/libspgrove.*
+BUILDLINK_FILES.jade+=	lib/libstyle.*
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	jade-buildlink
+
+jade-buildlink: _BUILDLINK_USE
+
+.endif	# JADE_BUILDLINK2_MK
diff --git a/textproc/jade/distinfo b/textproc/jade/distinfo
index 36d0015968f..85b49c7ccca 100644
--- a/textproc/jade/distinfo
+++ b/textproc/jade/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/08/12 16:23:23 skrll Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 18:40:04 jlam Exp $
 
 SHA1 (jade-1.2.1.tar.gz) = 4326e73b7f0b865515e1bb90c622a8b2aa6ecd06
 Size (jade-1.2.1.tar.gz) = 1092062 bytes
@@ -9,6 +9,6 @@ SHA1 (patch-ab) = 1742175ec89ea8e796b4e874a488225850cf78e1
 SHA1 (patch-ac) = c96ca44b40bbcc9c588dfe40045f4d386e32998d
 SHA1 (patch-ad) = 1afe17aeabda9f7f5c8531b09fb0af6085a8526f
 SHA1 (patch-ae) = a01bd39d4be17884f902a06c5c7324912935241f
-SHA1 (patch-af) = ef312d2f090bc32cdac60296d6b85940205da2a3
-SHA1 (patch-ag) = e6772fab67961e12ee8870a15763cde466b60636
+SHA1 (patch-af) = eb8c986dd4051cb183ccbb8d6aa97f1e801eab58
+SHA1 (patch-ag) = 593c1b6488fee22cd634fa10c90c89fd858c8981
 SHA1 (patch-ah) = d829ea273b99c06d83a6d7944ece12fbae513b6c
diff --git a/textproc/jade/patches/patch-ad b/textproc/jade/patches/patch-ad
index eeaedb9ca00..0a939261818 100644
--- a/textproc/jade/patches/patch-ad
+++ b/textproc/jade/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2002/05/20 18:18:03 cjep Exp $
+$NetBSD: patch-ad,v 1.5 2002/08/25 18:40:04 jlam Exp $
 --- Makefile.prog.in.orig	Wed Aug 29 15:59:35 2001
 +++ Makefile.prog.in	Wed Aug 29 16:01:13 2001
 @@ -13,7 +13,7 @@
diff --git a/textproc/jade/patches/patch-af b/textproc/jade/patches/patch-af
index 16148ce5709..3ef2977a951 100644
--- a/textproc/jade/patches/patch-af
+++ b/textproc/jade/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2001/10/14 12:19:16 tron Exp $
+$NetBSD: patch-af,v 1.2 2002/08/25 18:40:04 jlam Exp $
 
 --- spgrove/Makefile.sub.orig	Sun Oct 14 13:51:50 2001
 +++ spgrove/Makefile.sub	Sun Oct 14 13:58:15 2001
@@ -6,7 +6,7 @@ $NetBSD: patch-af,v 1.1 2001/10/14 12:19:16 tron Exp $
  LIB=spgrove
  INCLUDE=-I$(srcdir)/../grove
 -DEPLIBS=-lm -L$(TOP)/grove/.libs -lgrove -L$(TOP)/lib/.libs -lsp $(LIB_THREADS)
-+DEPLIBS=-lm -L$(TOP)/grove -lgrove -L$(TOP)/lib -lsp $(LIB_THREADS)
++DEPLIBS=-lm $(TOP)/grove/libgrove.la $(TOP)/lib/libsp.la $(LIB_THREADS)
  OBJS=GroveApp.o GroveBuilder.o SdNode.o
  GENSRCS=grove_inst.cxx
  
diff --git a/textproc/jade/patches/patch-ag b/textproc/jade/patches/patch-ag
index 052fdafaf92..8d45b0e5935 100644
--- a/textproc/jade/patches/patch-ag
+++ b/textproc/jade/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 2001/10/14 12:19:16 tron Exp $
+$NetBSD: patch-ag,v 1.2 2002/08/25 18:40:04 jlam Exp $
 
 --- style/Makefile.sub.orig	Sun Oct 14 13:51:50 2001
 +++ style/Makefile.sub	Sun Oct 14 14:01:26 2001
@@ -6,8 +6,8 @@ $NetBSD: patch-ag,v 1.1 2001/10/14 12:19:16 tron Exp $
  LIB=style
 -DEPLIBS=-lm -L$(TOP)/grove/.libs -lgrove -L$(TOP)/lib/.libs -lsp 	\
 -  -L$(TOP)/spgrove/.libs -lspgrove
-+DEPLIBS=-lm -L$(TOP)/grove -lgrove -L$(TOP)/lib -lsp 	\
-+  -L$(TOP)/spgrove -lspgrove
++DEPLIBS=-lm $(TOP)/grove/libgrove.la $(TOP)/lib/libsp.la 	\
++  $(TOP)/spgrove/libspgrove.la
  OBJS=Collector.o \
    DssslApp.o \
    DssslSpecEventHandler.o \
diff --git a/textproc/jade/patches/patch-ah b/textproc/jade/patches/patch-ah
index 70a49e7a0c6..1665bd25cdc 100644
--- a/textproc/jade/patches/patch-ah
+++ b/textproc/jade/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2002/08/13 10:49:05 wiz Exp $
+$NetBSD: patch-ah,v 1.3 2002/08/25 18:40:05 jlam Exp $
 --- Makefile.lib.in.orig	Mon Aug 12 16:56:51 2002
 +++ Makefile.lib.in	Mon Aug 12 16:56:48 2002
 @@ -18,7 +18,7 @@
diff --git a/textproc/kakasi/Makefile b/textproc/kakasi/Makefile
index 60b77e9ec86..803ddcfa785 100644
--- a/textproc/kakasi/Makefile
+++ b/textproc/kakasi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 18:40:05 jlam Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/04/05 04:46:33 max Exp $
 
 DISTNAME=	kakasi-2.3.4
@@ -9,11 +9,11 @@ MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://kakasi.namazu.org/
 COMMENT=	Kanji-Kana Simple Inverter, language filter for Japanese
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${PREFIX}/man/ja_JP.EUC/man1
diff --git a/textproc/kakasi/PLIST b/textproc/kakasi/PLIST
index e15c7e739c8..a3fc3bf2bfe 100644
--- a/textproc/kakasi/PLIST
+++ b/textproc/kakasi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 18:40:05 jlam Exp $
 bin/atoc_conv
 bin/kakasi
 bin/kakasi-config
diff --git a/textproc/kakasi/buildlink.mk b/textproc/kakasi/buildlink.mk
index 1d75a6d3f9c..962f35efb0b 100644
--- a/textproc/kakasi/buildlink.mk
+++ b/textproc/kakasi/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 18:40:05 jlam Exp $
 #
 # This Makefile fragment is included by packages that use kakasi.
 #
diff --git a/textproc/kakasi/buildlink2.mk b/textproc/kakasi/buildlink2.mk
new file mode 100644
index 00000000000..7daea228a7e
--- /dev/null
+++ b/textproc/kakasi/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:06 jlam Exp $
+
+.if !defined(KAKASI_BUILDLINK2_MK)
+KAKASI_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		kakasi
+BUILDLINK_DEPENDS.kakasi?=	kakasi>=2.3.0
+BUILDLINK_PKGSRCDIR.kakasi?=	../../textproc/kakasi
+
+EVAL_PREFIX+=				BUILDLINK_PREFIX.kakasi=kakasi
+BUILDLINK_PREFIX.kakasi_DEFAULT=	${LOCALBASE}
+
+BUILDLINK_FILES.kakasi=		include/libkakasi.h
+BUILDLINK_FILES.kakasi+=	lib/libkakasi.*
+
+BUILDLINK_TARGETS+=	kakasi-buildlink
+
+kakasi-buildlink: _BUILDLINK_USE
+
+.endif	# KAKASI_BUILDLINK2_MK
diff --git a/textproc/kakasi/distinfo b/textproc/kakasi/distinfo
index 2fcdf44e6cf..bc455481dd9 100644
--- a/textproc/kakasi/distinfo
+++ b/textproc/kakasi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $
+$NetBSD: distinfo,v 1.2 2002/08/25 18:40:06 jlam Exp $
 
 SHA1 (kakasi-2.3.4.tar.gz) = ab95a226f301955d2e8ae0d347afbb567e25fbe7
 Size (kakasi-2.3.4.tar.gz) = 1099258 bytes
diff --git a/textproc/kakasi/patches/patch-aa b/textproc/kakasi/patches/patch-aa
index d420c48f349..9597437ff37 100644
--- a/textproc/kakasi/patches/patch-aa
+++ b/textproc/kakasi/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 18:40:06 jlam Exp $
 
 --- lib/libkakasi.c.orig	Sun Sep  2 20:43:21 2001
 +++ lib/libkakasi.c
diff --git a/textproc/kakasi/patches/patch-ab b/textproc/kakasi/patches/patch-ab
index 368d9488c6f..2c65ffb7672 100644
--- a/textproc/kakasi/patches/patch-ab
+++ b/textproc/kakasi/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 18:40:06 jlam Exp $
 
 --- lib/libkakasi.h.orig	Mon Aug 27 11:11:56 2001
 +++ lib/libkakasi.h
diff --git a/textproc/libpspell/Makefile b/textproc/libpspell/Makefile
index 7a430a51442..26a01e3c56f 100644
--- a/textproc/libpspell/Makefile
+++ b/textproc/libpspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/03/05 15:32:16 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 18:40:07 jlam Exp $
 #
 
 DISTNAME=	pspell-.12.2
@@ -11,12 +11,12 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://pspell.sourceforge.net/
 COMMENT=	generic interface to spell checker libraries
 
+USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_LIBTOOL=	YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CONFIGURE_ARGS+=	--enable-doc-dir=${PREFIX}/share/doc/pspell
-USE_BUILDLINK_ONLY=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libpspell/buildlink2.mk b/textproc/libpspell/buildlink2.mk
new file mode 100644
index 00000000000..01aa7cbf01b
--- /dev/null
+++ b/textproc/libpspell/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:07 jlam Exp $
+
+.if !defined(LIBPSPELL_BUILDLINK2_MK)
+LIBPSPELL_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libpspell
+BUILDLINK_DEPENDS.libpspell?=	libpspell>=0.12.2nb1
+BUILDLINK_PKGSRCDIR.libpspell?=	../../textproc/libpspell
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libpspell=libpspell
+BUILDLINK_PREFIX.libpspell_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libpspell=		include/pspell/*
+BUILDLINK_FILES.libpspell+=		lib/libpspell*
+
+BUILDLINK_TARGETS+=	libpspell-buildlink
+
+libpspell-buildlink: _BUILDLINK_USE
+
+.endif	# LIBPSPELL_BUILDLINK2_MK
diff --git a/textproc/libunicode/Makefile b/textproc/libunicode/Makefile
index 76d296615c7..7dbb2e61252 100644
--- a/textproc/libunicode/Makefile
+++ b/textproc/libunicode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/06 12:43:08 rh Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 18:40:08 jlam Exp $
 #
 
 DISTNAME=		libunicode-0.4
@@ -9,7 +9,7 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.pango.org/
 COMMENT=		library for manipulating Unicode characters and strings
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
diff --git a/textproc/libunicode/buildlink2.mk b/textproc/libunicode/buildlink2.mk
new file mode 100644
index 00000000000..fe7668c5ff3
--- /dev/null
+++ b/textproc/libunicode/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:09 jlam Exp $
+
+.if !defined(LIBUNICODE_BUILDLINK2_MK)
+LIBUNICODE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			libunicode
+BUILDLINK_DEPENDS.libunicode?=		libunicode>=0.4
+BUILDLINK_PKGSRCDIR.libunicode?=	../../textproc/libunicode
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libunicode=libunicode
+BUILDLINK_PREFIX.libunicode_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libunicode=	include/unicode.h
+BUILDLINK_FILES.libunicode+=	lib/libunicode.*
+
+BUILDLINK_TARGETS+=	libunicode-buildlink
+
+libunicode-buildlink: _BUILDLINK_USE
+
+.endif	# LIBUNICODE_BUILDLINK2_MK
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index cbcbdb69ea6..bdda8279c5b 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2002/02/03 22:29:11 skrll Exp $
+# $NetBSD: Makefile,v 1.23 2002/08/25 18:40:09 jlam Exp $
 #
 
 DISTNAME=		libxml-1.8.16
@@ -10,11 +10,11 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://xmlsoft.org/
 COMMENT=		XML parser, mainly used by the GNOME project
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-.include "../../devel/zlib/buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libxml/buildlink.mk b/textproc/libxml/buildlink.mk
index 85a5a28369e..f69f1dee9b8 100644
--- a/textproc/libxml/buildlink.mk
+++ b/textproc/libxml/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.12 2002/07/14 02:09:38 rh Exp $
+# $NetBSD: buildlink.mk,v 1.13 2002/08/25 18:40:10 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libxml.
 #
diff --git a/textproc/libxml/buildlink2.mk b/textproc/libxml/buildlink2.mk
new file mode 100644
index 00000000000..aeb062f59c0
--- /dev/null
+++ b/textproc/libxml/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:10 jlam Exp $
+
+.if !defined(LIBXML_BUILDLINK2_MK)
+LIBXML_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libxml
+BUILDLINK_DEPENDS.libxml?=	libxml>=1.8.11
+BUILDLINK_PKGSRCDIR.libxml?=	../../textproc/libxml
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libxml=libxml
+BUILDLINK_PREFIX.libxml_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libxml=		include/gnome-xml/*
+BUILDLINK_FILES.libxml+=	lib/libxml.*
+BUILDLINK_FILES.libxml+=	lib/xmlConf.sh
+
+.include "../../devel/zlib/buildlink2.mk"
+
+BUILDLINK_TARGETS+=		libxml-buildlink
+
+libxml-buildlink: _BUILDLINK_USE
+
+.endif	# LIBXML_BUILDLINK2_MK
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
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 1e21275a368..bf7ad40405f 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/08/22 11:17:33 martti Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/25 18:40:13 jlam Exp $
 
 DISTNAME=	libxslt-1.0.19
 PKGNAME=	${DISTNAME}
@@ -7,19 +7,21 @@ MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/libxslt/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://xmlsoft.org/
-COMMENT=	Xslt parser library for GNOME
+COMMENT=	XSLT parser library for GNOME
 
-USE_BUILDLINK_ONLY=	yes
+BUILDLINK_DEPENDS.libxml2=     libxml2>=2.4.10
+
+USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-libxml-prefix=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-libxml-prefix=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
 BUILDLINK_DEPENDS.libxml2=     libxml2>=2.4.17
 
-.include "../../textproc/libxml2/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libxslt/buildlink2.mk b/textproc/libxslt/buildlink2.mk
new file mode 100644
index 00000000000..ce09e46c9ad
--- /dev/null
+++ b/textproc/libxslt/buildlink2.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:13 jlam Exp $
+
+.if !defined(LIBXSLT_BUILDLINK2_MK)
+LIBXSLT_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libxslt
+BUILDLINK_DEPENDS.libxslt?=	libxslt>=1.0.7
+BUILDLINK_PKGSRCDIR.libxslt?=	../../textproc/libxslt
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libxslt=libxslt
+BUILDLINK_PREFIX.libxslt_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libxslt=	include/breakpoint/*
+BUILDLINK_FILES.libxslt+=	include/libexslt/*
+BUILDLINK_FILES.libxslt+=	include/libxslt/*
+BUILDLINK_FILES.libxslt+=	lib/libexslt.*
+BUILDLINK_FILES.libxslt+=	lib/libxslt.*
+BUILDLINK_FILES.libxslt+=	lib/libxsltbreakpoint.*
+BUILDLINK_FILES.libxslt+=	lib/xsltConf.sh
+
+.include "../../textproc/libxml2/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	libxslt-buildlink
+
+libxslt-buildlink: _BUILDLINK_USE
+
+.endif	# LIBXSLT_BUILDLINK2_MK
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index d9e280c86bd..33a9168f258 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/01/01 03:11:18 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 18:40:14 jlam Exp $
 
 DISTNAME=		Sablot-0.71
 PKGNAME=		sablotron-0.71
@@ -9,12 +9,13 @@ MAINTAINER=		uithuis@dds.nl
 HOMEPAGE=		http://www.gingerall.com/charlie/ga/xml/p_sab.xml
 COMMENT=		XML toolkit implementing XSLT, DOM, and XPath
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=  	YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/tools/ltconfig
 
-.include "../../converters/libiconv/buildlink.mk"
-.include "../../textproc/expat/buildlink.mk"
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../textproc/expat/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/sablotron/buildlink2.mk b/textproc/sablotron/buildlink2.mk
new file mode 100644
index 00000000000..5ef9f8c5643
--- /dev/null
+++ b/textproc/sablotron/buildlink2.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:14 jlam Exp $
+
+.if !defined(SABLOTRON_BUILDLINK2_MK)
+SABLOTRON_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		sablotron
+BUILDLINK_DEPENDS.sablotron?=	sablotron>=0.71
+BUILDLINK_PKGSRCDIR.sablotron?=	../../textproc/sablotron
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.sablotron=sablotron
+BUILDLINK_PREFIX.sablotron_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.sablotron=	include/sablot.h
+BUILDLINK_FILES.sablotron+=	include/sdom.h
+BUILDLINK_FILES.sablotron+=	include/shandler.h
+BUILDLINK_FILES.sablotron+=	include/sxpath.h
+BUILDLINK_FILES.sablotron+=	lib/libsablot.*
+
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../textproc/expat/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	sablotron-buildlink
+
+sablotron-buildlink: _BUILDLINK_USE
+
+.endif	# SABLOTRON_BUILDLINK2_MK
diff --git a/textproc/sablotron/distinfo b/textproc/sablotron/distinfo
index 56d06e487f3..edb7c6afc85 100644
--- a/textproc/sablotron/distinfo
+++ b/textproc/sablotron/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/07/24 12:16:09 agc Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 18:40:14 jlam Exp $
 
 SHA1 (Sablot-0.71.tar.gz) = 8da42bba936832941d4f077551d47c1d3393e6c4
 Size (Sablot-0.71.tar.gz) = 274268 bytes
diff --git a/textproc/sablotron/patches/patch-aa b/textproc/sablotron/patches/patch-aa
index 2bf8c2ad4bc..048265e5255 100644
--- a/textproc/sablotron/patches/patch-aa
+++ b/textproc/sablotron/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2002/07/24 11:16:27 agc Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 18:40:15 jlam Exp $
 
 --- src/engine/Makefile.in	2002/07/24 11:00:26	1.1
 +++ src/engine/Makefile.in	2002/07/24 11:01:31
diff --git a/textproc/sablotron/patches/patch-ab b/textproc/sablotron/patches/patch-ab
index b55568fcf31..0b43597ea6d 100644
--- a/textproc/sablotron/patches/patch-ab
+++ b/textproc/sablotron/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2002/07/24 12:16:09 agc Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 18:40:15 jlam Exp $
 
 --- src/engine/Makefile.am	2002/07/24 12:13:41	1.1
 +++ src/engine/Makefile.am	2002/07/24 12:14:28