4 files changed, 62 insertions, 13 deletions
diff --git a/net/soup/Makefile b/net/soup/Makefile
index 19798c53e06..42a5f5f04a0 100644
--- a/net/soup/Makefile
+++ b/net/soup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/03/26 02:27:49 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/25 20:04:54 snj Exp $
 #
 
 DISTNAME=		soup-0.7.10
@@ -12,17 +12,17 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Callback-based mechanism for sending and servicing SOAP requests
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	soup.pc.in
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-.include "../../textproc/libxml/buildlink2.mk"
-.include "../../devel/bonobo/buildlink2.mk"
-.include "../../devel/GConf/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../devel/glib/buildlink2.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/libxml/buildlink3.mk"
+.include "../../devel/bonobo/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../devel/glib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/soup/buildlink3.mk b/net/soup/buildlink3.mk
new file mode 100644
index 00000000000..ed6539d68d7
--- /dev/null
+++ b/net/soup/buildlink3.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 20:04:54 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+SOUP_BUILDLINK3_MK:=	${SOUP_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	soup
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsoup}
+BUILDLINK_PACKAGES+=	soup
+
+.if !empty(SOUP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.soup?=                soup>=0.7.10nb7
+BUILDLINK_RECOMMENDED.soup?=            soup>=0.7.10nb8
+BUILDLINK_PKGSRCDIR.soup?=	../../net/soup
+.endif	# SOUP_BUILDLINK3_MK
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/libxml/buildlink3.mk"
+.include "../../devel/bonobo/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../devel/glib/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index 3ba29fabf17..a7c32953e9d 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/03/26 02:27:57 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2004/04/25 20:05:31 snj Exp $
 #
 
 DISTNAME=		glibwww-0.2
@@ -10,13 +10,13 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Event register functions that use the glib event loop
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../www/libwww/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../www/libwww/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/glibwww/buildlink3.mk b/www/glibwww/buildlink3.mk
new file mode 100644
index 00000000000..0f4401b9210
--- /dev/null
+++ b/www/glibwww/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 20:05:31 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GLIBWWW_BUILDLINK3_MK:=	${GLIBWWW_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	glibwww
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglibwww}
+BUILDLINK_PACKAGES+=	glibwww
+
+.if !empty(GLIBWWW_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.glibwww?=	glibwww>=0.2nb5
+BUILDLINK_RECOMMENDED.glibwww?=	glibwww>=0.2nb6
+BUILDLINK_PKGSRCDIR.glibwww?=	../../www/glibwww
+.endif	# GLIBWWW_BUILDLINK3_MK
+
+.include "../../www/libwww/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}