9 files changed, 2 insertions, 111 deletions

diff --git a/MOVED b/MOVED
index 75a96c284625..6309ced3bcf9 100644
--- a/MOVED
+++ b/MOVED
@@ -4386,3 +4386,5 @@ sysutils/userspace-rcu|sysutils/liburcu|2013-06-07|Renamed correctly according t
 mail/mixminion||2013-06-07|Has expired: This port requires python version, we haven't in the ports tree already
 devel/gprbuild-aux|devel/gprbuild|2013-06-10|Has expired: Deprecated in favour of devel/gprbuild
 devel/linuxthreads||2013-06-10|Has expired: Broken for more than 6 month
+mail/claws-mail-gtkhtml2_viewer|mail/claws-mail-fancy|2013-06-11|Has expired: No longer maintained, please use mail/claws-mail-fancy instead
+mail/claws-mail-cachesaver||2013-06-11|Has expired: No longer maintained by Claws Mail team
diff --git a/mail/Makefile b/mail/Makefile
index f1e47ba0cb94..7ca63082a2f3 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -52,12 +52,10 @@
     SUBDIR += claws-mail-attach_warner
     SUBDIR += claws-mail-bogofilter
     SUBDIR += claws-mail-bsfilter
-    SUBDIR += claws-mail-cachesaver
     SUBDIR += claws-mail-clamd
     SUBDIR += claws-mail-fancy
     SUBDIR += claws-mail-fetchinfo
     SUBDIR += claws-mail-gdata
-    SUBDIR += claws-mail-gtkhtml2_viewer
     SUBDIR += claws-mail-mailmbox
     SUBDIR += claws-mail-newmail
     SUBDIR += claws-mail-notification
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
deleted file mode 100644
index 1cd6040e0b79..000000000000
--- a/mail/claws-mail-cachesaver/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Created by: Pawel Pekala <c0rn@o2.pl>
-# $FreeBSD$
-
-PORTNAME=	cachesaver
-PORTVERSION=	0.10.9
-PORTREVISION=	18
-CATEGORIES=	mail
-MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX=	claws-mail-
-
-MAINTAINER=	pawel@FreeBSD.org
-COMMENT=	Cache saving plugin for Claws Mail
-
-LICENSE=	GPLv3
-
-BUILD_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf
-MAKE_JOBS_SAFE=	yes
-
-DEPRECATED=	No longer maintained by Claws Mail team
-EXPIRATION_DATE=2013-06-11
-
-PLIST_FILES=	lib/claws-mail/plugins/cachesaver.a \
-		lib/claws-mail/plugins/cachesaver.la \
-		lib/claws-mail/plugins/cachesaver.so
-
-.include <bsd.port.mk>
diff --git a/mail/claws-mail-cachesaver/distinfo b/mail/claws-mail-cachesaver/distinfo
deleted file mode 100644
index fbf3481fd596..000000000000
--- a/mail/claws-mail-cachesaver/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cachesaver-0.10.9.tar.gz) = 5253fe2c993b755f295a612148ce6c6c315df482a3791ec13d68593bc66386b5
-SIZE (cachesaver-0.10.9.tar.gz) = 334633
diff --git a/mail/claws-mail-cachesaver/pkg-descr b/mail/claws-mail-cachesaver/pkg-descr
deleted file mode 100644
index 18b5f2da162f..000000000000
--- a/mail/claws-mail-cachesaver/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This plugin saves the caches every 60 seconds (or user-defined period).
-It helps avoiding the loss of metadata on crashes.
-
-WWW: http://www.claws-mail.org/plugins.php
diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile
deleted file mode 100644
index 1bd29598ef4a..000000000000
--- a/mail/claws-mail-gtkhtml2_viewer/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Created by: Pawel Pekala <c0rn@o2.pl>
-# $FreeBSD$
-
-PORTNAME=	gtkhtml2_viewer
-PORTVERSION=	0.34
-PORTREVISION=	1
-CATEGORIES=	mail
-MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX=	claws-mail-
-
-MAINTAINER=	pawel@FreeBSD.org
-COMMENT=	HTML renderer plugin for Claws Mail
-
-LICENSE=	GPLv3
-
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf
-USE_GNOME=	gtk20
-USES=		iconv
-MAKE_JOBS_SAFE=	yes
-
-DEPRECATED=	No longer maintained, please use mail/claws-mail-fancy instead
-EXPIRATION_DATE=2013-06-11
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
-		--with-libintl-prefix=${LOCALBASE}
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/claws-mail-gtkhtml2_viewer/distinfo b/mail/claws-mail-gtkhtml2_viewer/distinfo
deleted file mode 100644
index 2fc88c0bbbef..000000000000
--- a/mail/claws-mail-gtkhtml2_viewer/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gtkhtml2_viewer-0.34.tar.gz) = 283fd3dff88ea0431c8595431fe0f2944b13d8480d952e1ead7fdc6e6eca282c
-SIZE (gtkhtml2_viewer-0.34.tar.gz) = 714838
diff --git a/mail/claws-mail-gtkhtml2_viewer/pkg-descr b/mail/claws-mail-gtkhtml2_viewer/pkg-descr
deleted file mode 100644
index 834d76fff19e..000000000000
--- a/mail/claws-mail-gtkhtml2_viewer/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This plugin renders HTML mail using the gtkhtml2 rendering widget.
-
-WWW: http://www.claws-mail.org/plugin.php?plugin=gtkhtml2
diff --git a/mail/claws-mail-gtkhtml2_viewer/pkg-plist b/mail/claws-mail-gtkhtml2_viewer/pkg-plist
deleted file mode 100644
index 2ebc9057d6e1..000000000000
--- a/mail/claws-mail-gtkhtml2_viewer/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-lib/claws-mail/plugins/gtkhtml2_viewer.a
-lib/claws-mail/plugins/gtkhtml2_viewer.la
-lib/claws-mail/plugins/gtkhtml2_viewer.so
-%%NLS%%share/locale/ca/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/it/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id_ID