bl3ify, while here add missing libbonobo dependency which was discovered

by buildlink3.

Bump PKGREVISION.

3 files changed, 37 insertions, 8 deletions

diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 7d7bc88281d..1b3a6648cc3 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2004/02/09 18:47:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/11 03:59:51 xtraeme Exp $
 #
 
 DISTNAME=	gtkhtml-3.0.9
 PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml3/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.0/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,14 +13,15 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Lightweight HTML rendering/printing/editing engine
 
 USE_GNU_TOOLS+=		make
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/src/libgtkhtml.pc.in
 GNU_CONFIGURE=		yes
 
-.include "../../devel/gail/buildlink2.mk"
-.include "../../devel/gal2/buildlink2.mk"
-.include "../../net/libsoup/buildlink2.mk"
+.include "../../devel/gail/buildlink3.mk"
+.include "../../devel/gal2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../net/libsoup/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/gtkhtml3/buildlink2.mk b/www/gtkhtml3/buildlink2.mk
index 589502b0925..219575727fd 100644
--- a/www/gtkhtml3/buildlink2.mk
+++ b/www/gtkhtml3/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/01/05 12:24:14 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/02/11 03:59:51 xtraeme Exp $
 
 .if !defined(GTKHTML_BUILDLINK2_MK)
 GTKHTML_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gtkhtml
-BUILDLINK_DEPENDS.gtkhtml?=		gtkhtml3>=3.0.9nb2
+BUILDLINK_DEPENDS.gtkhtml?=		gtkhtml3>=3.0.9nb5
 BUILDLINK_PKGSRCDIR.gtkhtml?=		../../www/gtkhtml3
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gtkhtml=gtkhtml
@@ -17,6 +17,7 @@ BUILDLINK_FILES.gtkhtml+=	lib/libgtkhtml-a11y-3.0.*
 
 .include "../../devel/gail/buildlink2.mk"
 .include "../../devel/gal2/buildlink2.mk"
+.include "../../devel/libbonobo/buildlink2.mk"
 .include "../../net/libsoup/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gtkhtml-buildlink
diff --git a/www/gtkhtml3/buildlink3.mk b/www/gtkhtml3/buildlink3.mk
new file mode 100644
index 00000000000..601021af722
--- /dev/null
+++ b/www/gtkhtml3/buildlink3.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 03:59:51 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use gtkhtml3.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GTKHTML3_BUILDLINK3_MK:=	${GTKHTML3_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gtkhtml3
+.endif
+
+.if !empty(GTKHTML3_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			gtkhtml3
+BUILDLINK_DEPENDS.gtkhtml3+=		gtkhtml3>=3.0.9nb5
+BUILDLINK_PKGSRCDIR.gtkhtml3?=		../../www/gtkhtml3
+
+.include "../../devel/gail/buildlink3.mk"
+.include "../../devel/gal2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../net/libsoup/buildlink3.mk"
+
+.endif # GTKHTML3_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}