3 files changed, 7 insertions, 29 deletions
diff --git a/print/pdflib/Makefile.common b/print/pdflib/Makefile.common
index 6fde2c1a961..3240a3d2e80 100644
--- a/print/pdflib/Makefile.common
+++ b/print/pdflib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2004/04/27 11:45:07 recht Exp $
+# $NetBSD: Makefile.common,v 1.13 2004/05/03 21:26:31 snj Exp $
 
 DISTNAME=		pdflib-${PDFLIB_DIST_VERS}
 PKGREVISION=		1
@@ -19,7 +19,7 @@ PDFLIB_BASE_VERS=	4.0.3
 DISTINFO_FILE=		${.CURDIR}/../pdflib/distinfo
 PATCHDIR=		${.CURDIR}/../pdflib/patches
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
@@ -43,5 +43,5 @@ SUBST_FILES.sed=	configure pdflib-config.in
 SUBST_SED.sed=		-e "s|^sed |${SED} |g"
 SUBST_SED.sed+=		-e "s| sed | ${SED} |g"
 
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
diff --git a/print/pdflib/buildlink2.mk b/print/pdflib/buildlink2.mk
deleted file mode 100644
index 4e8984281f1..00000000000
--- a/print/pdflib/buildlink2.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/01/03 18:49:52 reed Exp $
-
-.if !defined(PDFLIB_BUILDLINK2_MK)
-PDFLIB_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		pdflib
-BUILDLINK_DEPENDS.pdflib?=	pdflib>=4.0.3nb2
-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/tcl-pdflib/Makefile b/print/tcl-pdflib/Makefile
index c42a3b98531..e1e8cc3bc00 100644
--- a/print/tcl-pdflib/Makefile
+++ b/print/tcl-pdflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/20 23:36:33 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/03 21:26:31 snj Exp $
 
 .include "../pdflib/Makefile.common"
 
@@ -30,7 +30,7 @@ do-install:
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
 .endfor
 
-.include "../pdflib/buildlink2.mk"
-.include "../../lang/tcl/buildlink2.mk"
+.include "../pdflib/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"