Convert to buildlink3.

7 files changed, 51 insertions, 35 deletions

diff --git a/print/bg5ps/Makefile b/print/bg5ps/Makefile
index a66862f6c0e..c9838e7b0cf 100644
--- a/print/bg5ps/Makefile
+++ b/print/bg5ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:16:18 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/05 04:03:19 snj Exp $
 
 DISTNAME=	bg5ps-1.3.0
 CATEGORIES=	print converters
@@ -11,7 +11,7 @@ COMMENT=	Convert Big5/GB encoded files to postscript
 
 DEPENDS+=	arphic-ttf>=2.11:../../fonts/arphic-ttf
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 PKG_SYSCONFSUBDIR?=	bg5ps
 
 post-patch:
@@ -19,5 +19,5 @@ post-patch:
 		${WRKSRC}/bg5ps > ${WRKSRC}/bg5ps.new
 
 .include "../../lang/python/extension.mk"
-.include "../../graphics/freetype-lib/buildlink2.mk"
+.include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/cups/buildlink2.mk b/print/cups/buildlink2.mk
deleted file mode 100644
index 0bae00062b0..00000000000
--- a/print/cups/buildlink2.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/03/26 02:27:50 wiz Exp $
-
-.if !defined(CUPS_BUILDLINK2_MK)
-CUPS_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		cups
-BUILDLINK_DEPENDS.cups?=	cups>=1.1.19nb3
-BUILDLINK_RECOMMENDED.cups?=	cups>=1.1.20nb1
-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.*
-
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	cups-buildlink
-
-cups-buildlink: _BUILDLINK_USE
-
-.endif	# CUPS_BUILDLINK2_MK
diff --git a/print/p5-PostScript-MailLabels/Makefile b/print/p5-PostScript-MailLabels/Makefile
index 7c0677723c3..25a13e5f2ee 100644
--- a/print/p5-PostScript-MailLabels/Makefile
+++ b/print/p5-PostScript-MailLabels/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/04/24 22:46:11 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/05 04:03:19 snj Exp $
 
 DISTNAME=	PostScript-MailLabels-1.01
 PKGNAME=	p5-${DISTNAME}
@@ -10,7 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.oplnk.net/~ajackson/software/maillabels/
 COMMENT=	Create PostScript for printing on mailing label stock
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/PostScript/MailLabels/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/print/py-reportlab-renderPM/Makefile b/print/py-reportlab-renderPM/Makefile
index bbda490b0d1..65afa134a2e 100644
--- a/print/py-reportlab-renderPM/Makefile
+++ b/print/py-reportlab-renderPM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:24:29 agc Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/05 04:03:19 snj Exp $
 #
 
 DISTNAME=	renderPM-0-9
@@ -14,8 +14,8 @@ COMMENT=	Pixmap rendering for reportlab
 WRKSRC=		${WRKDIR}
 PYBINMODULE=	yes
 PYDISTUTILSPKG=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 .include "../../lang/python/extension.mk"
-.include "../../graphics/py-imaging/buildlink2.mk"
+.include "../../graphics/py-imaging/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/py-reportlab-renderPM/buildlink3.mk b/print/py-reportlab-renderPM/buildlink3.mk
new file mode 100644
index 00000000000..5960e0b5d50
--- /dev/null
+++ b/print/py-reportlab-renderPM/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 04:03:19 snj Exp $
+
+BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH}+
+PYRLRENDERPM_BUILDLINK3_MK:=	${PYRLRENDERPM_BUILDLINK3_MK}+
+
+.include "../../lang/python/pyversion.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	pyrlrenderpm
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyrlrenderpm}
+BUILDLINK_PACKAGES+=	pyrlrenderpm
+
+.if !empty(PYRLRENDERPM_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pyrlrenderpm+=	${PYPKGPREFIX}-reportlab-renderPM-[0-9]*
+BUILDLINK_PKGSRCDIR.pyrlrenderpm?=	../../print/py-reportlab-renderPM
+.endif	# PYRLRENDERPM_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 6ffbd17d222..13e21e0345c 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/23 16:48:54 recht Exp $
+# $NetBSD: Makefile,v 1.18 2004/05/05 04:03:19 snj Exp $
 #
 
 DISTNAME=	ReportLab_1_18
@@ -15,12 +15,12 @@ COMMENT=	Powerful PDF-generating toolkit for Python
 WRKSRC=		${WRKDIR}/reportlab/lib
 PYBINMODULE=	yes
 PYDISTUTILSPKG=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 post-install:
 	cd ${WRKDIR} && ${PAX} -rw -pp reportlab ${PREFIX}/${PYSITELIB}
 	${RM} -rf ${PREFIX}/${PYSITELIB}/reportlab/lib/build
 
 .include "../../lang/python/extension.mk"
-.include "../../textproc/py-xml/buildlink2.mk"
+.include "../../textproc/py-xml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/py-reportlab/buildlink3.mk b/print/py-reportlab/buildlink3.mk
new file mode 100644
index 00000000000..edd2d697d41
--- /dev/null
+++ b/print/py-reportlab/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 04:03:19 snj Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+PYREPORTLAB_BUILDLINK3_MK:=	${PYREPORTLAB_BUILDLINK3_MK}+
+
+.include "../../lang/python/pyversion.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	pyreportlab
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyreportlab}
+BUILDLINK_PACKAGES+=	pyreportlab
+
+.if !empty(PYREPORTLAB_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pyreportlab+=		${PYPKGPREFIX}-reportlab-[0-9]*
+BUILDLINK_PKGSRCDIR.pyreportlab?=	../../print/py-reportlab
+.endif	# PYREPORTLAB_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}