Convert to buildlink3.

3 files changed, 26 insertions, 14 deletions

diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile
index 1d2676b94a5..71395c44679 100644
--- a/x11/gnome-python/Makefile
+++ b/x11/gnome-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2004/03/26 02:27:59 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2004/04/27 02:04:07 snj Exp $
 
 DISTNAME=		gnome-python-1.4.4
 PKGNAME=		${PYPKGPREFIX}-gnome-1.4.4
@@ -17,7 +17,7 @@ CONFLICTS+=		gnome-python-*
 
 GNU_CONFIGURE=		yes
 USE_X11=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
@@ -38,9 +38,8 @@ post-configure:
 .endfor
 .endif
 
-.include "../../devel/libglade/buildlink2.mk"
-.include "../../x11/gtkglarea/buildlink2.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-.include "../../x11/gnome-core/buildlink2.mk"
-.include "../../x11/gtkglarea/buildlink2.mk"
+.include "../../x11/gnome-core/buildlink3.mk"
+.include "../../x11/gtkglarea/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-python/buildlink2.mk b/x11/gnome-python/buildlink2.mk
deleted file mode 100644
index f4c4f4b50c4..00000000000
--- a/x11/gnome-python/buildlink2.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.8 2004/03/26 02:27:59 wiz Exp $
-
-.include "../../lang/python/pyversion.mk"
-
-BUILDLINK_PACKAGES+=		pygnome
-BUILDLINK_DEPENDS.pygnome?=	${PYPKGPREFIX}-gnome>=1.4.4nb4
-BUILDLINK_RECOMMENDED.pygnome?=	${PYPKGPREFIX}-gnome>=1.4.4nb5
-BUILDLINK_PKGSRCDIR.pygnome?=	../../x11/gnome-python
diff --git a/x11/gnome-python/buildlink3.mk b/x11/gnome-python/buildlink3.mk
new file mode 100644
index 00000000000..fb806431fc0
--- /dev/null
+++ b/x11/gnome-python/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 02:04:07 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+PY_GNOME_BUILDLINK3_MK:=	${PY_GNOME_BUILDLINK3_MK}+
+
+.include "../../lang/python/pyversion.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	pygnome
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygnome}
+BUILDLINK_PACKAGES+=	pygnome
+
+.if !empty(PY_GNOME_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pygnome+=	${PYPKGPREFIX}-gnome>=1.4.4nb4
+BUILDLINK_RECOMMENDED.pygnome+=	${PYPKGPREFIX}-gnome>=1.4.4nb5
+BUILDLINK_PKGSRCDIR.pygnome?=	../../x11/gnome-python
+.endif	# PY_GNOME_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}