bl3ify

8 files changed, 130 insertions, 22 deletions

diff --git a/devel/gail/Makefile b/devel/gail/Makefile
index e17a03216c6..0fc9d240afd 100644
--- a/devel/gail/Makefile
+++ b/devel/gail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/23 21:50:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/11 03:04:28 xtraeme Exp $
 #
 
 DISTNAME=	gail-1.4.1
@@ -12,7 +12,7 @@ HOMEPAGE=	http://developer.gnome.org/projects/gap/
 COMMENT=	GNOME Accessibility Implementation Library
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_X11=		yes
 USE_LIBTOOL=		yes
@@ -23,9 +23,9 @@ PKGCONFIG_OVERRIDE=	gail.pc.in
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
-.include "../../devel/atk/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/libart2/buildlink2.mk"
-.include "../../graphics/libgnomecanvas/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/atk/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gail/buildlink3.mk b/devel/gail/buildlink3.mk
new file mode 100644
index 00000000000..917d26da2dd
--- /dev/null
+++ b/devel/gail/buildlink3.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 03:04:28 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use gail.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GAIL_BUILDLINK3_MK:=	${GAIL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gail
+.endif
+
+.if !empty(GAIL_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			gail
+BUILDLINK_DEPENDS.gail+=		gail>=1.4.1nb1
+BUILDLINK_PKGSRCDIR.gail?=		../../devel/gail
+
+.include "../../devel/atk/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.endif # GAIL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile
index 3e5c34a4411..edbfec7b67b 100644
--- a/devel/gal2/Makefile
+++ b/devel/gal2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/02/09 18:47:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/11 03:04:28 xtraeme Exp $
 #
 
 DISTNAME=	gal-1.99.10
@@ -14,7 +14,7 @@ COMMENT=	Library functions that came from Gnumeric and Evolution
 
 USE_X11=		yes
 USE_GNU_TOOLS+=		make
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 BUILD_USES_MSGFMT=	yes
 USE_LIBTOOL=		yes
@@ -24,7 +24,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
-.include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../print/libgnomeprintui/buildlink2.mk"
-.include "../../textproc/intltool/buildlink2.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../print/libgnomeprintui/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gal2/buildlink3.mk b/devel/gal2/buildlink3.mk
new file mode 100644
index 00000000000..cc71ab8ac3c
--- /dev/null
+++ b/devel/gal2/buildlink3.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 03:04:28 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use gal2.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GAL2_BUILDLINK3_MK:=	${GAL2_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gal2
+.endif
+
+.if !empty(GAL2_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			gal2
+BUILDLINK_DEPENDS.gal2+=		gal2>=1.99.10nb3
+BUILDLINK_PKGSRCDIR.gal2?=		../../devel/gal2
+
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../print/libgnomeprintui/buildlink3.mk"
+
+.endif # GAL2_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 6e4b0f3498f..432f32950cf 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/24 13:55:30 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/11 02:54:41 xtraeme Exp $
 
 DISTNAME=	libesmtp-1.0.1
 PKGREVISION=	1
@@ -12,7 +12,7 @@ MAINTAINER=	dolemite@wuli.nu
 HOMEPAGE=	http://www.stafford.uklinux.net/libesmtp/
 COMMENT=	Library to manage posting of electronic mail
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
@@ -38,6 +38,6 @@ post-buildlink:
 			${BUILDLINK_DIR}/include; \
 	fi
 
-.include "../../mk/pthread.buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/libesmtp/buildlink3.mk b/mail/libesmtp/buildlink3.mk
new file mode 100644
index 00000000000..e6b85c01d3a
--- /dev/null
+++ b/mail/libesmtp/buildlink3.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:54:41 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use libesmtp.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBESMTP_BUILDLINK3_MK:=	${LIBESMTP_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libesmtp
+.endif
+
+.if !empty(LIBESMTP_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libesmtp
+BUILDLINK_DEPENDS.libesmtp+=		libesmtp>=1.0rc1nb1
+BUILDLINK_PKGSRCDIR.libesmtp?=		../../mail/libesmtp
+
+LIBESMTP=	-lesmtp
+
+CONFIGURE_ENV+=	LIBESMTP="${LIBESMTP}"
+MAKE_ENV+=	LIBESMTP="${LIBESMTP}"
+
+.include "../../security/openssl/buildlink3.mk"
+
+.endif # LIBESMTP_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile
index cbeddab12f5..180605e439a 100644
--- a/net/libsoup/Makefile
+++ b/net/libsoup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/05 22:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/11 03:06:30 xtraeme Exp $
 #
 
 DISTNAME=		libsoup-1.99.26
@@ -10,7 +10,7 @@ MAINTAINER=		recht@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		HTTP library implementation in C
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
@@ -19,8 +19,8 @@ PKGCONFIG_OVERRIDE+=    ${WRKSRC}/soup-2.0.pc.in
 
 CONFIGURE_ARGS+=	--disable-gtk-doc
 
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk
new file mode 100644
index 00000000000..b81a58d1b3b
--- /dev/null
+++ b/net/libsoup/buildlink3.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 03:06:30 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use libsoup.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBSOUP_BUILDLINK3_MK:=	${LIBSOUP_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libsoup
+.endif
+
+.if !empty(LIBSOUP_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libsoup
+BUILDLINK_DEPENDS.libsoup+=		libsoup>=1.99.26
+BUILDLINK_PKGSRCDIR.libsoup?=		../../net/libsoup
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+
+.endif # LIBSOUP_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}