bl3ify

11 files changed, 35 insertions, 33 deletions

diff --git a/www/zope25-Calendar/Makefile b/www/zope25-Calendar/Makefile
index f452a2d4d7c..4267b870cd2 100644
--- a/www/zope25-Calendar/Makefile
+++ b/www/zope25-Calendar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/22 04:14:41 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/23 11:41:35 recht Exp $
 
 DISTNAME=	Calendar-1.0.10
 PKGREVISION=	1
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.zope.org/Members/jdavid/Calendar
 COMMENT=	The Calendar Tag
 
 ZOPE_COPYPRODUCT= zope-std-copyproduct-short
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 .include "../../www/zope25/product.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope25-EasyImage/Makefile b/www/zope25-EasyImage/Makefile
index 90e37f596dd..b43b4342ec5 100644
--- a/www/zope25-EasyImage/Makefile
+++ b/www/zope25-EasyImage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/22 04:14:41 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/23 11:41:35 recht Exp $
 
 DISTNAME=	EasyImage15
 PKGREVISION=	1
@@ -14,7 +14,7 @@ HOMEPAGE=	http://www.zope.org/Members/regebro/easyimage
 COMMENT=	Image extension for Zope
 
 ZOPE_COPYPRODUCT= zope-std-copyproduct-short
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 post-extract:
 	${RM} -r ${WRKSRC}/easyimage/cvs ${WRKSRC}/easyimage/icons/cvs \
@@ -31,5 +31,5 @@ post-extract:
 		${WRKSRC}/EasyImage/dtml/manage_convertResizeEasyImageForm.dtml
 
 .include "../../www/zope25/product.mk"
-.include "../../graphics/py-imaging/buildlink2.mk"
+.include "../../graphics/py-imaging/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope25-JPicture/Makefile b/www/zope25-JPicture/Makefile
index d0cc32ad913..06c0c247d0a 100644
--- a/www/zope25-JPicture/Makefile
+++ b/www/zope25-JPicture/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/22 04:14:42 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/23 11:41:35 recht Exp $
 
 DISTNAME=	JPicture-2_0
 PKGREVISION=	1
@@ -14,8 +14,8 @@ HOMEPAGE=	http://www.dataflake.org/software/jpicture/
 COMMENT=	Present your photos quickly in zope
 
 ZOPE_COPYPRODUCT= zope-std-copyproduct-short
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 .include "../../www/zope25/product.mk"
-.include "../../graphics/py-imaging/buildlink2.mk"
+.include "../../graphics/py-imaging/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope25-MailManager/Makefile b/www/zope25-MailManager/Makefile
index 415d7a3196d..759c2c2fe46 100644
--- a/www/zope25-MailManager/Makefile
+++ b/www/zope25-MailManager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/08/11 15:22:24 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/05/23 11:41:35 recht Exp $
 
 DISTNAME=	MailManager-0.94
 PKGNAME=	zope25-MailManager-0.94
@@ -9,13 +9,13 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://mailmanager.sourceforge.net/
 COMMENT=	Mail management and issue tracking
 
+DEPENDS+=	${PYPKGPREFIX}-mimelib-[0-9]*:../../net/py-mimelib
 DEPENDS+=	zope25-CookieCrumbler>=1.1:../../www/zope25-CookieCrumbler
 DEPENDS+=	zope25-BTreeFolder2-[0-9]*:../../www/zope25-BTreeFolder2
 DEPENDS+=	zope25-StripoGram>=1.4:../../www/zope25-StripoGram
 DEPENDS+=	zope25-Epoz>=0.5.1:../../www/zope25-Epoz
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 .include "../../www/zope25/product.mk"
-.include "../../net/py-mimelib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope25-ParsedXML/Makefile b/www/zope25-ParsedXML/Makefile
index f2eceaa0cd7..69a742421db 100644
--- a/www/zope25-ParsedXML/Makefile
+++ b/www/zope25-ParsedXML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/23 16:48:54 recht Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/23 11:41:35 recht Exp $
 
 DISTNAME=	ParsedXML-1.3.1
 PKGREVISION=	2
@@ -12,8 +12,8 @@ HOMEPAGE=	http://www.zope.org/Members/faassen/ParsedXML
 COMMENT=	Allows you to use XML objects in the Zope environment
 
 ZOPE_COPYPRODUCT= zope-std-copyproduct-short
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 .include "../../www/zope25/product.mk"
-.include "../../textproc/py-xml/buildlink2.mk"
+.include "../../textproc/py-xml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope25-RenderableCharts/Makefile b/www/zope25-RenderableCharts/Makefile
index 17dbc9f0c49..c131218c0ac 100644
--- a/www/zope25-RenderableCharts/Makefile
+++ b/www/zope25-RenderableCharts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/10 19:19:11 kristerw Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/23 11:41:35 recht Exp $
 #
 
 DISTNAME=	RenderableCharts-0.6
@@ -10,10 +10,10 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Members/Dirk.Datzert/RenderableCharts/
 COMMENT=	Drawings with reportlab's graphics toolkit
 
-USE_BUILDLINK2=	yes
-BUILDLINK_DEPENDS.pyreportlab= ${PYPKGPREFIX}-reportlab>=1.17
+DEPENDS+=	${PYPKGPREFIX}-reportlab>=1.17:../../print/py-reportlab
+DEPENDS+=	${PYPKGPREFIX}-reportlab-renderPM-[0-9]*:../../print/py-reportlab-renderPM
+
+USE_BUILDLINK3=	yes
 
 .include "../../www/zope25/product.mk"
-.include "../../print/py-reportlab/buildlink2.mk"
-.include "../../print/py-reportlab-renderPM/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope25-ZMySQLDA/Makefile b/www/zope25-ZMySQLDA/Makefile
index 4a87a1530d9..6d86ba2cb30 100644
--- a/www/zope25-ZMySQLDA/Makefile
+++ b/www/zope25-ZMySQLDA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:56:16 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/23 11:41:35 recht Exp $
 #
 
 DISTNAME=	ZMySQLDA-2.0.8
@@ -11,9 +11,10 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/mysql-python
 COMMENT=	MySQL Database adaptor for Zope
 
-USE_BUILDLINK2=	yes
+DEPENDS+=	${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb
+
+USE_BUILDLINK3=	yes
 ZOPE_COPYPRODUCT= zope-std-copyproduct-long
 
 .include "../../www/zope25/product.mk"
-.include "../../databases/py-mysqldb/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope25-ZPhotoSlides/Makefile b/www/zope25-ZPhotoSlides/Makefile
index 2a44128b3ae..e16efa5aa24 100644
--- a/www/zope25-ZPhotoSlides/Makefile
+++ b/www/zope25-ZPhotoSlides/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/26 15:57:34 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2004/05/23 11:41:35 recht Exp $
 
 DISTNAME=	ZPhotoSlides-1.1b
 PKGNAME=	zope25-ZPhotoSlides-1.1b
@@ -12,8 +12,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Members/p3b/ZPhotoSlides
 COMMENT=	Present your photos quickly in zope
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 .include "../../www/zope25/product.mk"
-.include "../../graphics/py-imaging/buildlink2.mk"
+.include "../../graphics/py-imaging/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope25-ZWeatherApplet/Makefile b/www/zope25-ZWeatherApplet/Makefile
index 07f9d2464ad..05e6e1378ad 100644
--- a/www/zope25-ZWeatherApplet/Makefile
+++ b/www/zope25-ZWeatherApplet/Makefile
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:17 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/23 11:41:35 recht Exp $
 
 DISTNAME=	ZWeatherApplet-1.51
 PKGREVISION=	1
 PKGNAME=	zope25-ZWeatherApplet-1.51
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=/zweatherapplet/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zweatherapplet/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.librelogiciel.com/software/
 COMMENT=	Zope Weather applet
 
+DEPENDS+=	${PYPKGPREFIX}-pymetar-[0-9]*:../../net/py-METAR
+
 ZOPE_COPYPRODUCT= zope-std-copyproduct-short
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 .include "../../www/zope25/product.mk"
-.include "../../net/py-METAR/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope25-zopebook/Makefile b/www/zope25-zopebook/Makefile
index 578c4f59a81..10793588816 100644
--- a/www/zope25-zopebook/Makefile
+++ b/www/zope25-zopebook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:56:18 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/23 11:41:35 recht Exp $
 #
 
 DISTNAME=	ZopeBook
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Documentation/Books/ZopeBook/current/index_html
 COMMENT=	Documentation for Zope-2.5
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	yes
 NO_BUILD=	yes
 
 ZBDIR=	${PREFIX}/share/doc/html/ZopeBook-2.5
diff --git a/www/zope25/Makefile b/www/zope25/Makefile
index 638fab3094c..155274919fd 100644
--- a/www/zope25/Makefile
+++ b/www/zope25/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/04/23 09:13:23 uebayasi Exp $
+# $NetBSD: Makefile,v 1.13 2004/05/23 11:41:35 recht Exp $
 #
 
 DISTNAME=	Zope-2.6.2-src
@@ -14,7 +14,7 @@ COMMENT=	Zope, the Z Object Publishing Environment
 DIST_SUBDIR=	zope
 
 PYTHON_VERSIONS_ACCEPTED=	21pth
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 ZOPEDIR=	${PREFIX}/lib/zope
 ZOPEPY=		pcgi lib/python ZServer z2.py zpasswd.py