bl3ify and also add a missing GConf2 dependency discovered by

buildlink3.

Bump PKGREVISION.

3 files changed, 39 insertions, 9 deletions

diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 3155ec47017..32de3efa1aa 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/02/09 18:47:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/11 07:42:42 xtraeme Exp $
 #
 
 DISTNAME=	libgtkhtml-2.4.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgtkhtml/2.4/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +14,7 @@ COMMENT=	Lightweight HTML rendering GTK2 widget
 BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_X11=		yes
@@ -22,9 +22,10 @@ USE_X11=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	libgtkhtml-2.0.pc.in
 
-.include "../../devel/gail/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../sysutils/gnome-vfs2/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/gail/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/libgtkhtml/buildlink2.mk b/www/libgtkhtml/buildlink2.mk
index f9ae9276b76..6a9903963ed 100644
--- a/www/libgtkhtml/buildlink2.mk
+++ b/www/libgtkhtml/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/01/03 18:49:55 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/02/11 07:42:42 xtraeme Exp $
 #
 # This Makefile fragment is included by packages that use libgtkhtml.
 #
@@ -30,6 +30,7 @@ BUILDLINK_FILES.libgtkhtml+=	include/gtkhtml-2.0/libgtkhtml/view/*
 BUILDLINK_FILES.libgtkhtml+=	include/gtkhtml-2.0/libgtkhtml/*
 BUILDLINK_FILES.libgtkhtml+=	lib/libgtkhtml-2.*
 
+.include "../../devel/GConf2/buildlink2.mk"
 .include "../../devel/gail/buildlink2.mk"
 .include "../../sysutils/gnome-vfs2/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk
new file mode 100644
index 00000000000..84f5ec9f10d
--- /dev/null
+++ b/www/libgtkhtml/buildlink3.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:42:42 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use libgtkhtml.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBGTKHTML_BUILDLINK3_MK:=	${LIBGTKHTML_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libgtkhtml
+.endif
+
+.if !empty(LIBGTKHTML_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libgtkhtml
+BUILDLINK_DEPENDS.libgtkhtml+=		libgtkhtml>=2.4.1nb5
+BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
+
+.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/gail/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.endif # LIBGTKHTML_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}