Convert to buildlink3.

4 files changed, 27 insertions, 30 deletions

diff --git a/x11/py-qt2-sip/Makefile b/x11/py-qt2-sip/Makefile
index f2b3d69c2e8..11758743747 100644
--- a/x11/py-qt2-sip/Makefile
+++ b/x11/py-qt2-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:56 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/02 05:35:17 snj Exp $
 #
 
 DISTNAME=	sip-3.1
@@ -10,7 +10,7 @@ MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://www.riverbankcomputing.co.uk/sip/index.php
 COMMENT=	Tool to create Python bindings for C++ libraries
 
-USE_BUILDLINK2= 	# defined
+USE_BUILDLINK3= 	yes
 USE_X11=		# defined
 USE_LIBTOOL=		# defined
 
@@ -23,6 +23,6 @@ PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 MAKE_ENV+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 .include "../../lang/python/extension.mk"
-.include "../../x11/qt2-libs/buildlink2.mk"
+.include "../../x11/qt2-libs/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qt2-sip/buildlink2.mk b/x11/py-qt2-sip/buildlink2.mk
deleted file mode 100644
index d5e1a56cac4..00000000000
--- a/x11/py-qt2-sip/buildlink2.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/03/29 05:05:50 jlam Exp $
-
-.if !defined(PY_QT2_SIP_BUILDLINK2_MK)
-PY_QT2_SIP_BUILDLINK2_MK=	# defined
-
-.include "../../lang/python/pyversion.mk"
-
-BUILDLINK_PACKAGES+=		pyqt2sip
-BUILDLINK_PKGBASE.pyqt2sip?=	${PYPKGPREFIX}-qt2-sip
-BUILDLINK_DEPENDS.pyqt2sip?=	${PYPKGPREFIX}-qt2-sip-[0-9]*
-BUILDLINK_PKGSRCDIR.pyqt2sip?=	../../x11/py-qt2-sip
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.pyqt2sip=pyqt2sip
-BUILDLINK_PREFIX.pyqt2sip_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.pyqt2sip=	${PYINC}/sip.h
-BUILDLINK_FILES.pyqt2sip+=	${PYINC}/sipQt.h
-BUILDLINK_FILES.pyqt2sip+=	${PYSITELIB}/libsip.*
-
-BUILDLINK_TARGETS+=	pyqt2sip-buildlink
-
-pyqt2sip-buildlink: _BUILDLINK_USE
-
-.endif	# PY_QT2_SIP_BUILDLINK2_MK
diff --git a/x11/py-qt2-sip/buildlink3.mk b/x11/py-qt2-sip/buildlink3.mk
new file mode 100644
index 00000000000..c6cb4d28d4b
--- /dev/null
+++ b/x11/py-qt2-sip/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/02 05:35:17 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+PY_QT2_SIP_BUILDLINK3_MK:=	${PY_QT2_SIP_BUILDLINK3_MK}+
+
+.include "../../lang/python/pyversion.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	pyqt2sip
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyqt2sip}
+BUILDLINK_PACKAGES+=	pyqt2sip
+
+.if !empty(PY_QT2_SIP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pyqt2sip+=	${PYPKGPREFIX}-qt2-sip-[0-9]*
+BUILDLINK_PKGSRCDIR.pyqt2sip?=	../../x11/py-qt2-sip
+.endif	# PY_QT2_SIP_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile
index 536a87a9742..dca5cf84b7c 100644
--- a/x11/py-qt2/Makefile
+++ b/x11/py-qt2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/21 07:51:00 snj Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/02 05:35:17 snj Exp $
 #
 
 DISTNAME=	PyQt-3.1-Qt-2.3.1
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.riverbankcomputing.co.uk/pyqt/index.php
 COMMENT=	Python bindings for the Qt toolkit
 
 WRKSRC=			${WRKDIR}/PyQt-3.1
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 USE_X11=		# defined
 USE_LIBTOOL=		# defined
 
@@ -25,7 +25,7 @@ MAKE_ENV+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 .include "../../lang/python/extension.mk"
 
-.include "../../x11/py-qt2-sip/buildlink2.mk"
-.include "../../x11/qt2-libs/buildlink2.mk"
+.include "../../x11/py-qt2-sip/buildlink3.mk"
+.include "../../x11/qt2-libs/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"