diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile
index ff272bdde628..861f1dfc9a2e 100644
--- a/net/py-ORBit/Makefile
+++ b/net/py-ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/14 18:26:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/18 16:58:54 minskim Exp $
 #
 
 DISTNAME=	pyorbit-2.0.0
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Python bindings for ORBit2
 
 PY_PATCHPLIST=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
 PKGCONFIG_OVERRIDE+=	pyorbit-2.pc.in
@@ -23,7 +23,8 @@ CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 PYTHON_VERSIONS_ACCEPTED=	23pth 22pth
 BUILDLINK_DEPENDS.python22-pth=	python22-pth>=2.2.2nb2
 
-.include "../../net/ORBit2/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-ORBit/buildlink3.mk b/net/py-ORBit/buildlink3.mk
new file mode 100644
index 000000000000..c2af150fd4a9
--- /dev/null
+++ b/net/py-ORBit/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/18 16:58:54 minskim Exp $
+#
+# This Makefile fragment is included by packages that use py-ORBit.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+PY_ORBIT_BUILDLINK3_MK:=	${PY_ORBIT_BUILDLINK3_MK}+
+
+.include "../../lang/python/pyversion.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	${PYPKGPREFIX}-ORBit
+.endif
+
+.if !empty(PY_ORBIT_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			pyorbit
+BUILDLINK_DEPENDS.pyorbit+=		${PYPKGPREFIX}-ORBit>=2.0.0nb1
+BUILDLINK_PKGSRCDIR.pyorbit?=		../../net/py-ORBit
+
+.include "../../net/ORBit2/buildlink3.mk"
+
+.endif # PY_ORBIT_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 22ca8427d586..5a1b3c18e0d9 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/02/14 18:26:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/18 16:58:36 minskim Exp $
 #
 
 DISTNAME=	pygtk-2.0.0
@@ -15,7 +15,7 @@ COMMENT=	Python bindings for GTK+2
 CONFLICTS=	${PYPKGPREFIX}-gtk<0.6.10
 
 PY_PATCHPLIST=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 PKGCONFIG_OVERRIDE+=	pygtk-2.0.pc.in
 GNU_CONFIGURE=	YES
@@ -24,12 +24,13 @@ CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 PYTHON_VERSIONS_ACCEPTED=	23pth 22pth
 BUILDLINK_DEPENDS.python22-pth=	python22-pth>=2.2.2nb2
 
-.include "../../devel/libglade2/buildlink2.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
-.include "../../math/py-Numeric/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
-.include "../../x11/gtkglarea2/buildlink2.mk"
+.include "../../math/py-Numeric/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtkglarea2/buildlink3.mk"
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
new file mode 100644
index 000000000000..61f8d11d3426
--- /dev/null
+++ b/x11/py-gtk2/buildlink3.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/18 16:58:36 minskim Exp $
+#
+# This Makefile fragment is included by packages that use py-gtk2.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+PY_GTK2_BUILDLINK3_MK:=	${PY_GTK2_BUILDLINK3_MK}+
+
+.include "../../lang/python/pyversion.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	${PYPKGPREFIX}-gtk2
+.endif
+
+.if !empty(PY_GTK2_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			pygtk2
+BUILDLINK_DEPENDS.pygtk2+=		${PYPKGPREFIX}-gtk2>=2.0.0nb2
+BUILDLINK_PKGSRCDIR.pygtk2?=		../../x11/py-gtk2
+
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../math/py-Numeric/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtkglarea2/buildlink3.mk"
+
+.endif # PY_GTK2_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}