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.

7 files changed, 36 insertions, 9 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