Update gtkhtml to 0.14.0 and while at it, buildlinkify. Changes are

bugfixes only.

4 files changed, 64 insertions, 13 deletions

diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index b5d8700dfc3..18f0fc34d86 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2001/09/29 16:29:26 rh Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/05 07:00:21 rh Exp $
 
-DISTNAME=		gtkhtml-0.13.0
+DISTNAME=		gtkhtml-0.14.0
 CATEGORIES=		www gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/gtkhtml/}
 EXTRACT_SUFX=		.tar.bz2
@@ -9,12 +9,8 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		lightweight HTML rendering/printing/editing engine
 
-DEPENDS+=		gal>=0.5nb1:../../devel/gal
 DEPENDS+=		glibwww-[0-9]*:../../www/glibwww
-DEPENDS+=		bonobo>=0.37:../../devel/bonobo
 DEPENDS+=		{control-center<1.5.0,libcapplet-[0-9]*}:../../x11/controlcenter
-DEPENDS+=		gnome-print>=0.28:../../print/gnome-print
-DEPENDS+=		libghttp>=1.0:../../www/libghttp
 
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
@@ -22,6 +18,10 @@ USE_LIBTOOL=		YES
 USE_GMAKE=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-CPPFLAGS+=		-I${LOCALBASE}/include
 
+.include "../../print/gnome-print/buildlink.mk"
+.include "../../www/libghttp/buildlink.mk"
+.include "../../devel/bonobo/buildlink.mk"
+.include "../../devel/gal/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/gtkhtml/buildlink.mk b/www/gtkhtml/buildlink.mk
new file mode 100644
index 00000000000..6b6e22b2c2c
--- /dev/null
+++ b/www/gtkhtml/buildlink.mk
@@ -0,0 +1,51 @@
+# $NetBSD: buildlink.mk,v 1.1 2001/10/05 07:00:21 rh Exp $
+#
+# This Makefile fragment is included by packages that use gtkhtml.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.gtkhtml to the dependency pattern
+#     for the version of gtkhtml desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(GTKHTML_BUILDLINK_MK)
+GTKHTML_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.gtkhtml?=		gtkhtml>=0.14.0
+DEPENDS+=	${BUILDLINK_DEPENDS.gtkhtml}:../../www/gtkhtml
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.gtkhtml=gtkhtml
+BUILDLINK_PREFIX.gtkhtml_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.gtkhtml+=		include/gtkhtml/*
+BUILDLINK_FILES.gtkhtml+=		lib/bonobo/libstorage_http.*
+BUILDLINK_FILES.gtkhtml+=		lib/libgtkhtml.*
+
+.include "../../print/gnome-print/buildlink.mk"
+.include "../../www/libghttp/buildlink.mk"
+.include "../../devel/bonobo/buildlink.mk"
+.include "../../devel/gal/buildlink.mk"
+
+BUILDLINK_TARGETS.gtkhtml=		gtkhtml-buildlink
+BUILDLINK_TARGETS.gtkhtml+=		gtkhtml-buildlink-config-wrapper
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gtkhtml}
+
+BUILDLINK_CONFIG.gtkhtml=		${BUILDLINK_PREFIX.gtkhtml}/lib/gtkhtmlConf.sh
+BUILDLINK_CONFIG_WRAPPER.gtkhtml=	${BUILDLINK_DIR}/lib/gtkhtmlConf.sh
+
+.if defined(USE_CONFIG_WRAPPER)
+GTKHTML_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.gtkhtml}
+CONFIGURE_ENV+=		GTKHTML_CONFIG="${GTKHTML_CONFIG}"
+MAKE_ENV+=		GTKHTML_CONFIG="${GTKHTML_CONFIG}"
+.endif
+
+pre-configure: ${BUILDLINK_TARGETS.gtkhtml}
+gtkhtml-buildlink: _BUILDLINK_USE
+gtkhtml-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+
+.endif	# GTKHTML_BUILDLINK_MK
diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo
index c9df4ddda6c..2b7cefad95b 100644
--- a/www/gtkhtml/distinfo
+++ b/www/gtkhtml/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2001/09/29 16:29:26 rh Exp $
+$NetBSD: distinfo,v 1.6 2001/10/05 07:00:21 rh Exp $
 
-SHA1 (gtkhtml-0.13.0.tar.bz2) = 42aaf4bd8b5dad4c0ef357c5bea9169df7ecb31b
-Size (gtkhtml-0.13.0.tar.bz2) = 842449 bytes
+SHA1 (gtkhtml-0.14.0.tar.bz2) = 43573722027d749845b3d2545ddc1810e42638ea
+Size (gtkhtml-0.14.0.tar.bz2) = 848138 bytes
 SHA1 (patch-aa) = 912181c9a728714275447e89591d6f01052be75e
 SHA1 (patch-ac) = c99434a59d3b5020bb47363ef26a4d0cd10afca4
diff --git a/www/gtkhtml/pkg/PLIST b/www/gtkhtml/pkg/PLIST
index 6b2e86fb744..94ff82220a1 100644
--- a/www/gtkhtml/pkg/PLIST
+++ b/www/gtkhtml/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2001/09/29 16:29:27 rh Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/10/05 07:00:21 rh Exp $
 bin/ebrowser
 bin/gnome-gtkhtml-editor
 bin/gtkhtml-properties-capplet
@@ -97,8 +97,8 @@ lib/gtkhtmlConf.sh
 lib/libgtkhtml.a
 lib/libgtkhtml.la
 lib/libgtkhtml.so
-lib/libgtkhtml.so.16
-lib/libgtkhtml.so.16.0
+lib/libgtkhtml.so.17
+lib/libgtkhtml.so.17.0
 share/control-center/Documents/gtkhtml-properties.desktop
 share/control-center/capplets/gtkhtml-properties.desktop
 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop