Convert to buildlink3.

3 files changed, 24 insertions, 14 deletions

diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile
index ae79d4f4379..3de54ddd6b7 100644
--- a/databases/py-psycopg/Makefile
+++ b/databases/py-psycopg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/04/16 17:21:34 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/08 05:25:12 snj Exp $
 #
 
 DISTNAME=	psycopg-1.1.11
@@ -18,13 +18,13 @@ CONFIGURE_ARGS+= \
 # XXX ${PYSITELIB}/... doesn't get transformed by buildlink2
 CONFIGURE_ARGS+= --with-mxdatetime-includes=${BUILDLINK_DIR}/include
 ALL_TARGET=	default
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 PYTHON_VERSIONS_ACCEPTED= 21pth 22pth
 PY_PATCHPLIST=	yes
 
-.include "../../databases/postgresql-lib/buildlink2.mk"
+.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-.include "../../time/py-mxDateTime/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../time/py-mxDateTime/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-psycopg/buildlink2.mk b/databases/py-psycopg/buildlink2.mk
deleted file mode 100644
index 70af7a5ca91..00000000000
--- a/databases/py-psycopg/buildlink2.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/03/29 05:05:33 jlam Exp $
-
-.include "../../lang/python/pyversion.mk"
-
-BUILDLINK_PACKAGES+=		psycopg
-BUILDLINK_PKGBASE.psycopg?=	${PYPKGPREFIX}-psycopg
-BUILDLINK_DEPENDS.psycopg?=	${PYPKGPREFIX}-psycopg>=1.0.14nb1
-BUILDLINK_RECOMMENDED.psycopg?=	${PYPKGPREFIX}-psycopg>=1.0.14nb2
-BUILDLINK_PKGSRCDIR.psycopg?=	../../databases/py-psycopg
diff --git a/databases/py-psycopg/buildlink3.mk b/databases/py-psycopg/buildlink3.mk
new file mode 100644
index 00000000000..fd02722092d
--- /dev/null
+++ b/databases/py-psycopg/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/08 05:25:12 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+PY_PSYCOPG_BUILDLINK3_MK:=	${PY_PSYCOPG_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	psycopg
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npsycopg}
+BUILDLINK_PACKAGES+=	psycopg
+
+.if !empty(PY_PSYCOPG_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.psycopg+=	${PYPKGPREFIX}-psycopg>=1.0.14nb1
+BUILDLINK_RECOMMENDED.psycopg?=	${PYPKGPREFIX}-psycopg>=1.0.14nb2
+BUILDLINK_PKGSRCDIR.psycopg?=	../../databases/py-psycopg
+.endif	# PY_PSYCOPG_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}