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.

12 files changed, 36 insertions, 15 deletions

diff --git a/print/ja-vflib-lib/Makefile b/print/ja-vflib-lib/Makefile
index 73779a8fd79..673920b946c 100644
--- a/print/ja-vflib-lib/Makefile
+++ b/print/ja-vflib-lib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 18:39:43 jlam Exp $
 
 PKGNAME=		ja-vflib-lib-${VFLIB_VERSION}
 COMMENT=		Japanese Vector font library
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
 
 .include "Makefile.common"
 
diff --git a/print/ja-vflib-lib/Makefile.common b/print/ja-vflib-lib/Makefile.common
index b0c08795a4f..72ce739dfae 100644
--- a/print/ja-vflib-lib/Makefile.common
+++ b/print/ja-vflib-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $
+# $NetBSD: Makefile.common,v 1.2 2002/08/25 18:39:43 jlam Exp $
 # FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $
 
 DISTNAME=		VFlib2-${VFLIB_VERSION}
@@ -19,8 +19,8 @@ USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 FT_LIB=			ttf -lintl
-FT_INCLUDEDIR=		${BUILDLINK_DIR}/include/freetype
-FT_LIBDIR=		${BUILDLINK_DIR}/lib
+FT_INCLUDEDIR=		${BUILDLINK_PREFIX.freetype}/include/freetype
+FT_LIBDIR=		${BUILDLINK_PREFIX.freetype}/lib
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-freetype="${FT_LIB}"
@@ -33,4 +33,4 @@ PATCHDIR=		${.CURDIR}/../../print/ja-vflib-lib/patches
 
 EXTRACT_ONLY=		${VFLIB_SRC}
 
-.include "../../graphics/freetype-lib/buildlink.mk"
+.include "../../graphics/freetype-lib/buildlink2.mk"
diff --git a/print/ja-vflib-lib/PLIST b/print/ja-vflib-lib/PLIST
index a38b80ae673..a8ce760a024 100644
--- a/print/ja-vflib-lib/PLIST
+++ b/print/ja-vflib-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 18:39:43 jlam Exp $
 bin/bdfindex
 bin/fwindex
 bin/ttindex
diff --git a/print/ja-vflib-lib/buildlink.mk b/print/ja-vflib-lib/buildlink.mk
index f4ccdd6e4ec..b731ab733c5 100644
--- a/print/ja-vflib-lib/buildlink.mk
+++ b/print/ja-vflib-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 18:39:44 jlam Exp $
 #
 # This Makefile fragment is included by packages that use VFlib.
 #
diff --git a/print/ja-vflib-lib/buildlink2.mk b/print/ja-vflib-lib/buildlink2.mk
new file mode 100644
index 00000000000..95ec8ee6a1c
--- /dev/null
+++ b/print/ja-vflib-lib/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:44 jlam Exp $
+
+.if !defined(VFLIB_BUILDLINK2_MK)
+VFLIB_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		vflib
+BUILDLINK_DEPENDS.vflib?=	ja-vflib-lib>=2.24.2
+BUILDLINK_PKGSRCDIR.vflib?=	../../print/ja-vflib-lib
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.vflib=ja-vflib-lib
+BUILDLINK_PREFIX.vflib_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.vflib=		include/VF.h
+BUILDLINK_FILES.vflib+=		lib/libVFlib2.*
+
+.include "../../graphics/freetype-lib/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	vflib-buildlink
+
+vflib-buildlink: _BUILDLINK_USE
+
+.endif	# VFLIB_BUILDLINK2_MK
diff --git a/print/ja-vflib-lib/distinfo b/print/ja-vflib-lib/distinfo
index b95244aba9e..e40d8a74402 100644
--- a/print/ja-vflib-lib/distinfo
+++ b/print/ja-vflib-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $
+$NetBSD: distinfo,v 1.2 2002/08/25 18:39:45 jlam Exp $
 
 SHA1 (VFlib2-2.24.2.tar.gz) = 970ab8e18e50f10763af27ebcfee135bbfdbcda5
 Size (VFlib2-2.24.2.tar.gz) = 540093 bytes
diff --git a/print/ja-vflib-lib/patches/patch-aa b/print/ja-vflib-lib/patches/patch-aa
index 1b9d5174dc8..141c29024b3 100644
--- a/print/ja-vflib-lib/patches/patch-aa
+++ b/print/ja-vflib-lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 18:39:45 jlam Exp $
 
 --- Makefile.in.orig	Mon Sep 14 01:25:04 1998
 +++ Makefile.in	Mon May  1 04:37:47 2000
diff --git a/print/ja-vflib-lib/patches/patch-ab b/print/ja-vflib-lib/patches/patch-ab
index 9d068e595d1..18d2f5ad162 100644
--- a/print/ja-vflib-lib/patches/patch-ab
+++ b/print/ja-vflib-lib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 18:39:45 jlam Exp $
 
 --- configure.in.orig	Wed Feb 17 23:58:02 1999
 +++ configure.in	Wed Jul 19 17:36:22 2000
diff --git a/print/ja-vflib-lib/patches/patch-ac b/print/ja-vflib-lib/patches/patch-ac
index 6edbf99078a..3909779c542 100644
--- a/print/ja-vflib-lib/patches/patch-ac
+++ b/print/ja-vflib-lib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $
+$NetBSD: patch-ac,v 1.2 2002/08/25 18:39:45 jlam Exp $
 
 --- src/Makefile.in.orig	Tue Oct 27 02:33:17 1998
 +++ src/Makefile.in
diff --git a/print/ja-vflib-lib/patches/patch-ad b/print/ja-vflib-lib/patches/patch-ad
index b95ba9db911..14ab542236c 100644
--- a/print/ja-vflib-lib/patches/patch-ad
+++ b/print/ja-vflib-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 18:39:45 jlam Exp $
 
 --- tools/Imakefile.in.orig	Tue Oct 27 03:02:45 1998
 +++ tools/Imakefile.in	Mon May  1 04:41:40 2000
diff --git a/print/ja-vflib-lib/patches/patch-ae b/print/ja-vflib-lib/patches/patch-ae
index 9249c24bf0f..2802542da23 100644
--- a/print/ja-vflib-lib/patches/patch-ae
+++ b/print/ja-vflib-lib/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 18:39:46 jlam Exp $
 
 --- make-sub.in.orig	Mon Aug 31 05:22:45 1998
 +++ make-sub.in
diff --git a/print/ja-vflib-lib/patches/patch-af b/print/ja-vflib-lib/patches/patch-af
index 15a37a1df18..7b503390518 100644
--- a/print/ja-vflib-lib/patches/patch-af
+++ b/print/ja-vflib-lib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $
+$NetBSD: patch-af,v 1.2 2002/08/25 18:39:46 jlam Exp $
 
 --- configure.orig	Wed Feb 17 23:58:33 1999
 +++ configure	Sun May 27 18:43:19 2001