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, 30 insertions, 8 deletions

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