From bd04d12c025d473e3103b6eec6bf21d9eb9f8b07 Mon Sep 17 00:00:00 2001
From: landry <landry@openbsd.org>
Date: Mon, 20 Oct 2008 12:22:42 +0000
Subject: [PATCH] Remove -dillo subpackage, claws devs don't plan to support
 dillo2, and claws-mail-htmlviewer plugin is far better anyway.

From Ulrich Kahl (MAINTAINER) and ok ajacoutot@
---
 mail/claws-mail/Makefile        | 13 +++++--------
 mail/claws-mail/pkg/DESCR-dillo |  1 -
 mail/claws-mail/pkg/PLIST-dillo |  4 ----
 3 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 mail/claws-mail/pkg/DESCR-dillo
 delete mode 100644 mail/claws-mail/pkg/PLIST-dillo

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index a36412d9a3a..9f5184037ac 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2008/10/17 12:46:33 landry Exp $
+# $OpenBSD: Makefile,v 1.23 2008/10/20 12:22:42 landry Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,15 +6,13 @@ COMMENT-main=		mail and news client
 COMMENT-docs=		documentation
 COMMENT-bogofilter=	bogofilter plugin
 COMMENT-clamav=		clamav plugin
-COMMENT-dillo=		dillo plugin
 COMMENT-spamassassin=	spamassassin plugin
 
 V=			3.6.1
 DISTNAME=		claws-mail-${V}
-PKGNAME-main=			${DISTNAME}
+PKGNAME-main=			${DISTNAME}p0
 FULLPKGNAME-docs=		claws-mail-docs-${V}
 FULLPKGNAME-bogofilter=		claws-mail-bogofilter-${V}
-FULLPKGNAME-dillo=		claws-mail-dillo-${V}
 FULLPKGNAME-spamassassin=	claws-mail-spamassassin-${V}
 CATEGORIES=		mail news
 
@@ -33,7 +31,7 @@ EXTRACT_SUFX=		.tar.bz2
 
 DIST_SUBDIR=		claws
 
-MULTI_PACKAGES=		-main -docs -bogofilter -dillo -spamassassin
+MULTI_PACKAGES=		-main -docs -bogofilter -spamassassin
 FLAVORS=		jpilot compface ldap debug
 FLAVOR?=
 
@@ -42,8 +40,6 @@ SUBST_VARS=		FLAVOR_STRING
 
 RUN_DEPENDS-bogofilter=	::${BUILD_PKGPATH} \
 			::mail/bogofilter 
-RUN_DEPENDS-dillo=	::${BUILD_PKGPATH} \
-			::www/dillo 
 RUN_DEPENDS-spamassassin=::${BUILD_PKGPATH} \
 			::mail/p5-Mail-SpamAssassin 
 
@@ -73,7 +69,8 @@ LIB_DEPENDS-main=	${LIB_DEPENDS} \
 			dbus-glib-1::x11/dbus-glib
 
 CONFIGURE_ARGS+=	--disable-gnomeprint \
-			--disable-networkmanager-support
+			--disable-networkmanager-support \
+			--disable-dillo-viewer-plugin
 
 LIB_DEPENDS-docs=
 PKG_ARCH-docs=	*
diff --git a/mail/claws-mail/pkg/DESCR-dillo b/mail/claws-mail/pkg/DESCR-dillo
deleted file mode 100644
index 68cfd13bf07..00000000000
--- a/mail/claws-mail/pkg/DESCR-dillo
+++ /dev/null
@@ -1 +0,0 @@
-Claws Mail plugin to utilize dillo for html rendering.
diff --git a/mail/claws-mail/pkg/PLIST-dillo b/mail/claws-mail/pkg/PLIST-dillo
deleted file mode 100644
index 8c1ecc76367..00000000000
--- a/mail/claws-mail/pkg/PLIST-dillo
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $OpenBSD: PLIST-dillo,v 1.3 2007/04/20 05:42:51 steven Exp $
-@pkgpath mail/sylpheed-claws,-dillo${FLAVOR_STRING}
-lib/claws-mail/plugins/dillo_viewer.la
-lib/claws-mail/plugins/dillo_viewer.so