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.

22 files changed, 99 insertions, 35 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 068f908bd06..66f2964b73f 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2002/07/16 13:14:04 fredb Exp $
+# $NetBSD: Makefile,v 1.50 2002/08/25 18:39:41 jlam Exp $
 
 DISTNAME=		cups-${DIST_VERS}-source
 PKGNAME=		cups-${VERS}
@@ -22,7 +22,7 @@ COMMENT=		Common UNIX Printing System
 
 CONFLICTS+=		LPRng-[0-9]* LPRng-core-[0-9]*
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/html/cups
 CONFIGURE_ARGS+=	--with-cups-user=${CUPS_USER}
 CONFIGURE_ARGS+=	--with-cups-group=${CUPS_GROUP}
-CONFIGURE_ARGS+=	--enable-libtool-unsupported="${LIBTOOL}"
+CONFIGURE_ARGS+=	--enable-libtool-unsupported="${PKGLIBTOOL}"
 CONFIGURE_ARGS+=	--enable-slp
 CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ENV+=		DSOFLAGS="${LDFLAGS}"
@@ -40,7 +40,7 @@ CONFIGURE_ENV+=		DSOFLAGS="${LDFLAGS}"
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(USE_PAM)
-.include "../../security/PAM/buildlink.mk"
+.include "../../security/PAM/buildlink2.mk"
 BUILD_DEFS+=		USE_PAM
 CONFIGURE_ARGS+=	--enable-pam
 PLIST_SRC=		${PKGDIR}/PLIST.pam
@@ -103,11 +103,12 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/cups.pam ${EGDIR}
 .endif
 
-.include "../../devel/zlib/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
-.include "../../net/openslp/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../net/openslp/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/cups/buildlink2.mk b/print/cups/buildlink2.mk
new file mode 100644
index 00000000000..bec7024b546
--- /dev/null
+++ b/print/cups/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:42 jlam Exp $
+
+.if !defined(CUPS_BUILDLINK2_MK)
+CUPS_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		cups
+BUILDLINK_DEPENDS.cups?=	cups>=1.1.14nb1
+BUILDLINK_PKGSRCDIR.cups?=	../../print/cups
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.cups=cups
+BUILDLINK_PREFIX.cups_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.cups=	include/cups/*
+BUILDLINK_FILES.cups+=	lib/libcups.*
+BUILDLINK_FILES.cups+=	lib/libcupsimage.*
+
+BUILDLINK_TARGETS+=	cups-buildlink
+
+cups-buildlink: _BUILDLINK_USE
+
+.endif	# CUPS_BUILDLINK2_MK
diff --git a/print/cups/distinfo b/print/cups/distinfo
index dcc32e8bb93..f279fed1741 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2002/06/09 20:59:34 jlam Exp $
+$NetBSD: distinfo,v 1.15 2002/08/25 18:39:42 jlam Exp $
 
 SHA1 (cups-1.1.14-source.tar.bz2) = b1a940af5f27cebb8bef340aa6a3552c887ad67d
 Size (cups-1.1.14-source.tar.bz2) = 5408714 bytes
diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa
index 51d6dc7a737..c2b5f9871dc 100644
--- a/print/cups/patches/patch-aa
+++ b/print/cups/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.12 2002/06/09 20:59:35 jlam Exp $
+$NetBSD: patch-aa,v 1.13 2002/08/25 18:39:42 jlam Exp $
 
 --- scheduler/main.c.orig	Wed Feb 13 12:21:36 2002
 +++ scheduler/main.c
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
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index 1bfc839c0cd..75bf64c889f 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:37 fredb Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/25 18:39:46 jlam Exp $
 
 .include "Makefile.common"
 
@@ -6,7 +6,7 @@ PKGNAME=		pdflib-${PDFLIB_BASE_VERS}
 PKGREVISION=		1
 COMMENT=		C library to produce PDF files
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 ALL_TARGET=		pdflib
 DOCDIR=			${PREFIX}/share/doc/pdflib
diff --git a/print/pdflib/Makefile.common b/print/pdflib/Makefile.common
index 49358530002..d3a6658895e 100644
--- a/print/pdflib/Makefile.common
+++ b/print/pdflib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2002/06/30 03:58:17 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.5 2002/08/25 18:39:46 jlam Exp $
 
 DISTNAME=		pdflib-${PDFLIB_DIST_VERS}
 PKGREVISION=		1
@@ -38,5 +38,5 @@ CPPFLAGS+=		-Dunix
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
 
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
diff --git a/print/pdflib/PLIST b/print/pdflib/PLIST
index f719a904c07..91ba278fa41 100644
--- a/print/pdflib/PLIST
+++ b/print/pdflib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/30 03:58:17 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:39:46 jlam Exp $
 bin/pdflib-config
 include/pdflib.h
 lib/libpdf.a
diff --git a/print/pdflib/buildlink2.mk b/print/pdflib/buildlink2.mk
new file mode 100644
index 00000000000..e1dc75a25e8
--- /dev/null
+++ b/print/pdflib/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:47 jlam Exp $
+
+.if !defined(PDFLIB_BUILDLINK2_MK)
+PDFLIB_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		pdflib
+BUILDLINK_DEPENDS.pdflib?=	pdflib>=4.0.1nb1
+BUILDLINK_PKGSRCDIR.pdflib?=	../../print/pdflib
+
+EVAL_PREFIX+=				BUILDLINK_PREFIX.pdflib=pdflib
+BUILDLINK_PREFIX.pdflib_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.pdflib=			include/pdflib.h
+BUILDLINK_FILES.pdflib+=		lib/libpdf.*
+
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	pdflib-buildlink
+
+pdflib-buildlink: _BUILDLINK_USE
+
+.endif	# PDFLIB_BUILDLINK2_MK
diff --git a/print/pdflib/distinfo b/print/pdflib/distinfo
index f5da9d1c84c..b4f3c5d29d6 100644
--- a/print/pdflib/distinfo
+++ b/print/pdflib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/07/01 21:48:23 jschauma Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 18:39:47 jlam Exp $
 
 SHA1 (pdflib-4.0.3.tar.gz) = 9fbe256249ef780c4607ee3070785d9a4ecc03f7
 Size (pdflib-4.0.3.tar.gz) = 2373817 bytes
diff --git a/print/pdflib/patches/patch-aa b/print/pdflib/patches/patch-aa
index c7e2f02de68..9258115b515 100644
--- a/print/pdflib/patches/patch-aa
+++ b/print/pdflib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2002/06/30 03:58:17 jschauma Exp $
+$NetBSD: patch-aa,v 1.7 2002/08/25 18:39:47 jlam Exp $
 
 --- configure.orig	Sat Jun 29 21:46:02 2002
 +++ configure	Sat Jun 29 21:47:37 2002