sylpheed-claws was renamed upstream to claws-mail. Compleate repocopies of

mail/sulpheed-claws-* plugins to mail/claws-mail-* and update them to the
latest version. [1]

PR:		106576-106589 [1], 107286 [2]
Submitted by:	Pawel Pekala (maintainer) [1], me (itetcu) [2]
Repocopies by:	marcus@

33 files changed, 182 insertions, 218 deletions

diff --git a/mail/claws-mail-att_remover/Makefile b/mail/claws-mail-att_remover/Makefile
index 703cb1c91d0f..165d38954039 100644
--- a/mail/claws-mail-att_remover/Makefile
+++ b/mail/claws-mail-att_remover/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	att_remover
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	1.0.4
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/
-PKGNAMEPREFIX=	sylpheed-claws-
+MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
+PKGNAMEPREFIX=	claws-mail-
 
 MAINTAINER=	c0rn@o2.pl
-COMMENT=	Attachments removing plugin for sylpheed-claws
+COMMENT=	Attachments removing plugin for claws-mail
 
-BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
+BUILD_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_AUTOTOOLS=	autoconf:259
 
-PLIST_FILES=	lib/sylpheed-claws/plugins/att_remover.a \
-	lib/sylpheed-claws/plugins/att_remover.la \
-	lib/sylpheed-claws/plugins/att_remover.so
+PLIST_FILES=	lib/claws-mail/plugins/att_remover.a \
+	lib/claws-mail/plugins/att_remover.la \
+	lib/claws-mail/plugins/att_remover.so
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-att_remover/distinfo b/mail/claws-mail-att_remover/distinfo
index cc09b41b6834..2a7a9a09818b 100644
--- a/mail/claws-mail-att_remover/distinfo
+++ b/mail/claws-mail-att_remover/distinfo
@@ -1,3 +1,3 @@
-MD5 (att_remover-1.0.3.tar.gz) = a0d92d60461d996e6a14f57b1bca1fbe
-SHA256 (att_remover-1.0.3.tar.gz) = c5b63ff476d2e885e0c044f962a254e2ff380de2158089353b1ec6529a300b17
-SIZE (att_remover-1.0.3.tar.gz) = 320740
+MD5 (att_remover-1.0.4.tar.gz) = 88881a73209216418179ca836f55bd48
+SHA256 (att_remover-1.0.4.tar.gz) = d400b5c3c56a9dd2447394b4b0ad5e70eb21d32d44f3556774411b5c9b2304db
+SIZE (att_remover-1.0.4.tar.gz) = 320300
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index 0a54b980b41b..4a6e8144e552 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	cachesaver
-PORTVERSION=	0.10.2
-PORTREVISION=	1
+PORTVERSION=	0.10.3
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/
-PKGNAMEPREFIX=	sylpheed-claws-
+MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
+PKGNAMEPREFIX=	claws-mail-
 
 MAINTAINER=	c0rn@o2.pl
-COMMENT=	Cache saving plugin for sylpheed-claws
+COMMENT=	Cache saving plugin for claws-mail
 
-BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
+BUILD_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_AUTOTOOLS=	autoconf:259
 
-PLIST_FILES=	lib/sylpheed-claws/plugins/cachesaver.a \
-	lib/sylpheed-claws/plugins/cachesaver.la \
-	lib/sylpheed-claws/plugins/cachesaver.so
+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
index aa19b7b1359d..c28a6a5db1b3 100644
--- a/mail/claws-mail-cachesaver/distinfo
+++ b/mail/claws-mail-cachesaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (cachesaver-0.10.2.tar.gz) = e4371addf71c53238b225b6771f4865f
-SHA256 (cachesaver-0.10.2.tar.gz) = 3be620c20008de754a555836023931deaa5c183f8683d63966eb8015f223137f
-SIZE (cachesaver-0.10.2.tar.gz) = 323693
+MD5 (cachesaver-0.10.3.tar.gz) = 8c4b373822ed61366e968466cd55fc99
+SHA256 (cachesaver-0.10.3.tar.gz) = 4bf97925bd0e873e190bfffb06263fa46a1848c8696ab5b4ae4f91cdf2e6bdeb
+SIZE (cachesaver-0.10.3.tar.gz) = 323242
diff --git a/mail/claws-mail-etpan_privacy/Makefile b/mail/claws-mail-etpan_privacy/Makefile
index fc817f7be8d9..8071321d38c8 100644
--- a/mail/claws-mail-etpan_privacy/Makefile
+++ b/mail/claws-mail-etpan_privacy/Makefile
@@ -6,25 +6,24 @@
 #
 
 PORTNAME=	etpan_privacy
-PORTVERSION=	0.15.3
-PORTREVISION=	1
+PORTVERSION=	0.15.4
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/
-PKGNAMEPREFIX=	sylpheed-claws-
+MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
+PKGNAMEPREFIX=	claws-mail-
 DISTNAME=	etpan-privacy-${PORTVERSION}
 
 MAINTAINER=	c0rn@o2.pl
-COMMENT=	S/MIME, PGP verification and decryption plugin for sylpheed-claws
+COMMENT=	S/MIME, PGP verification and decryption plugin for claws-mail
 
-BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
+BUILD_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_AUTOTOOLS=	autoconf:259
 
-PLIST_FILES=	lib/sylpheed-claws/plugins/etpan-privacy.a \
-	lib/sylpheed-claws/plugins/etpan-privacy.la \
-	lib/sylpheed-claws/plugins/etpan-privacy.so
+PLIST_FILES=	lib/claws-mail/plugins/etpan-privacy.a \
+	lib/claws-mail/plugins/etpan-privacy.la \
+	lib/claws-mail/plugins/etpan-privacy.so
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-etpan_privacy/distinfo b/mail/claws-mail-etpan_privacy/distinfo
index ff5aed8a80a8..8729758d8a96 100644
--- a/mail/claws-mail-etpan_privacy/distinfo
+++ b/mail/claws-mail-etpan_privacy/distinfo
@@ -1,3 +1,3 @@
-MD5 (etpan-privacy-0.15.3.tar.gz) = e6010abd5f9a3cfc081126d492ac926d
-SHA256 (etpan-privacy-0.15.3.tar.gz) = 4cf5b4c246e3f8105868c0ff5ebcf9298f4860c822b6f1b57394817dbb03dee8
-SIZE (etpan-privacy-0.15.3.tar.gz) = 332673
+MD5 (etpan-privacy-0.15.4.tar.gz) = 8a1c77acdbc0725bb94ac5feb7bc547b
+SHA256 (etpan-privacy-0.15.4.tar.gz) = c48962d0a1922ed4d87520fe45d6e7fcac86a4a8327075582dd23c0eb573bde3
+SIZE (etpan-privacy-0.15.4.tar.gz) = 332111
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 5afbba4c148c..5a2e9cfa5588 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -6,29 +6,24 @@
 #
 
 PORTNAME=	fetchinfo
-PORTVERSION=	0.4.16
-PORTREVISION=	1
+PORTVERSION=	0.4.17
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/
-PKGNAMEPREFIX=	sylpheed-claws-
+MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
+PKGNAMEPREFIX=	claws-mail-
 DISTNAME=	${PORTNAME}-plugin-${PORTVERSION}
 
 MAINTAINER=	c0rn@o2.pl
-COMMENT=	Header insertation plugin for sylpheed-claws
+COMMENT=	Header insertation plugin for claws-mail
 
-BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
+BUILD_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_AUTOTOOLS=	autoconf:259
 
-PLIST_FILES=	lib/sylpheed-claws/plugins/fetchinfo_plugin.a \
-	lib/sylpheed-claws/plugins/fetchinfo_plugin.la \
-	lib/sylpheed-claws/plugins/fetchinfo_plugin.so \
-	lib/sylpheed-claws/plugins/fetchinfo_plugin_gtk.a \
-	lib/sylpheed-claws/plugins/fetchinfo_plugin_gtk.la \
-	lib/sylpheed-claws/plugins/fetchinfo_plugin_gtk.so \
-	lib/sylpheed-claws/plugins/fetchinfo_plugin_gtk.deps
+PLIST_FILES=	lib/claws-mail/plugins/fetchinfo_plugin.a \
+	lib/claws-mail/plugins/fetchinfo_plugin.la \
+	lib/claws-mail/plugins/fetchinfo_plugin.so \
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-fetchinfo/distinfo b/mail/claws-mail-fetchinfo/distinfo
index 395c74852706..7512b1e97ff8 100644
--- a/mail/claws-mail-fetchinfo/distinfo
+++ b/mail/claws-mail-fetchinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (fetchinfo-plugin-0.4.16.tar.gz) = 81891cafede37f5be8b2986a8b3d0373
-SHA256 (fetchinfo-plugin-0.4.16.tar.gz) = b2605deb520c06b7c5d3d0e2c46d753cd80bd8ffae646dd7a23b96bd9d5b79be
-SIZE (fetchinfo-plugin-0.4.16.tar.gz) = 326788
+MD5 (fetchinfo-plugin-0.4.17.tar.gz) = 133a10b983e9555a006eecc8a9152ae3
+SHA256 (fetchinfo-plugin-0.4.17.tar.gz) = 31f3f3e73adb7ab12ca9ae03d32ede52a616e5578b968a1e6a1d78fc3b7bc10d
+SIZE (fetchinfo-plugin-0.4.17.tar.gz) = 325773
diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile
index 54d37199fa68..f4ad1925cbfd 100644
--- a/mail/claws-mail-gtkhtml2_viewer/Makefile
+++ b/mail/claws-mail-gtkhtml2_viewer/Makefile
@@ -6,22 +6,21 @@
 #
 
 PORTNAME=	gtkhtml2_viewer
-PORTVERSION=	0.12
-PORTREVISION=	2
+PORTVERSION=	0.13
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/
-PKGNAMEPREFIX=	sylpheed-claws-
+MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
+PKGNAMEPREFIX=	claws-mail-
 
 MAINTAINER=	c0rn@o2.pl
-COMMENT=	HTML renderer plugin for sylpheed-claws
+COMMENT=	HTML renderer plugin for claws-mail
 
 LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
+BUILD_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_GNOME=	libgtkhtml
 USE_ICONV=	yes
 USE_GETTEXT=	yes
@@ -29,9 +28,9 @@ USE_GETTEXT=	yes
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 	--with-libintl-prefix=${LOCALBASE}
 
-PLIST_FILES=	lib/sylpheed-claws/plugins/gtkhtml2_viewer.a \
-	lib/sylpheed-claws/plugins/gtkhtml2_viewer.la \
-	lib/sylpheed-claws/plugins/gtkhtml2_viewer.so \
+PLIST_FILES=	lib/claws-mail/plugins/gtkhtml2_viewer.a \
+	lib/claws-mail/plugins/gtkhtml2_viewer.la \
+	lib/claws-mail/plugins/gtkhtml2_viewer.so \
 	share/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo \
 	share/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo \
 	share/locale/sk/LC_MESSAGES/gtkhtml2_viewer.mo \
diff --git a/mail/claws-mail-gtkhtml2_viewer/distinfo b/mail/claws-mail-gtkhtml2_viewer/distinfo
index 877f394134e1..9a7c40e4f8f2 100644
--- a/mail/claws-mail-gtkhtml2_viewer/distinfo
+++ b/mail/claws-mail-gtkhtml2_viewer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtkhtml2_viewer-0.12.tar.gz) = 18ee56f61dc014770bad3f7f933dd975
-SHA256 (gtkhtml2_viewer-0.12.tar.gz) = 92ae19b29794757b16b139a1bbadb69a915e47497d2de93e12cbbc844cc8da77
-SIZE (gtkhtml2_viewer-0.12.tar.gz) = 385438
+MD5 (gtkhtml2_viewer-0.13.tar.gz) = 044e2acae50e544663c0e58f3ece01e7
+SHA256 (gtkhtml2_viewer-0.13.tar.gz) = 75a6be90d94febb5d2147fb3ebbc11bcb102f2331886f7760e6453e489ce6f0f
+SIZE (gtkhtml2_viewer-0.13.tar.gz) = 382676
diff --git a/mail/claws-mail-gtkhtml2_viewer/files/patch-configure.ac b/mail/claws-mail-gtkhtml2_viewer/files/patch-configure.ac
deleted file mode 100644
index c38aecafef59..000000000000
--- a/mail/claws-mail-gtkhtml2_viewer/files/patch-configure.ac
+++ /dev/null
@@ -1,8 +0,0 @@
---- configure.ac.orig	Fri Sep 29 18:29:03 2006
-+++ configure.ac	Fri Sep 29 18:29:18 2006
-@@ -1,4 +1,4 @@
--AC_PREREQ(2.60)
-+AC_PREREQ(2.59)
- AC_INIT(src/gtkhtml2_viewer.c)
- AC_CONFIG_AUX_DIR(config)
- AM_MAINTAINER_MODE
diff --git a/mail/claws-mail-maildir/Makefile b/mail/claws-mail-maildir/Makefile
index a02e7be42407..e4f6211166b6 100644
--- a/mail/claws-mail-maildir/Makefile
+++ b/mail/claws-mail-maildir/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	maildir
-PORTVERSION=	0.24.2
-PORTREVISION=	1
+PORTVERSION=	0.24.3
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/
-PKGNAMEPREFIX=	sylpheed-claws-
+MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
+PKGNAMEPREFIX=	claws-mail-
 
 MAINTAINER=	c0rn@o2.pl
-COMMENT=	Maildir++ plugin for sylpheed-claws
+COMMENT=	Maildir++ plugin for claws-mail
 
-BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
+BUILD_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
@@ -26,8 +25,8 @@ USE_BDB=	yes
 CONFIGURE_ENV=	CFLAGS="-I${BDB_INCLUDE_DIR}" \
 	LDFLAGS="-l${BDB_LIB_NAME} -L${BDB_LIB_DIR}"
 
-PLIST_FILES=	lib/sylpheed-claws/plugins/maildir.a \
-	lib/sylpheed-claws/plugins/maildir.la \
-	lib/sylpheed-claws/plugins/maildir.so
+PLIST_FILES=	lib/claws-mail/plugins/maildir.a \
+	lib/claws-mail/plugins/maildir.la \
+	lib/claws-mail/plugins/maildir.so
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-maildir/distinfo b/mail/claws-mail-maildir/distinfo
index 22a12eb32fad..7d0c113edfed 100644
--- a/mail/claws-mail-maildir/distinfo
+++ b/mail/claws-mail-maildir/distinfo
@@ -1,3 +1,3 @@
-MD5 (maildir-0.24.2.tar.gz) = eeaac96f82be9def07dcb22655ee5aeb
-SHA256 (maildir-0.24.2.tar.gz) = e3edee4a8bdca1961b0c55ae8e32aca5fadd4d34a8935985748904b161fe39a9
-SIZE (maildir-0.24.2.tar.gz) = 343095
+MD5 (maildir-0.24.3.tar.gz) = 43a8e6ef18ea219f0c085514649f2c40
+SHA256 (maildir-0.24.3.tar.gz) = cb531a6be8c78c8e85d95030279a1f4691d46a6fcfc084e4240b2dbc273a4f70
+SIZE (maildir-0.24.3.tar.gz) = 342759
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index f2e943585c23..d889a29aa573 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	mailmbox
-PORTVERSION=	1.12.2
-PORTREVISION=	1
+PORTVERSION=	1.12.3
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/
-PKGNAMEPREFIX=	sylpheed-claws-
+MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
+PKGNAMEPREFIX=	claws-mail-
 
 MAINTAINER=	c0rn@o2.pl
-COMMENT=	Mbox maildir plugin for sylpheed-claws
+COMMENT=	Mbox maildir plugin for claws-mail
 
-BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
+BUILD_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_AUTOTOOLS=	autoconf:259
 
-PLIST_FILES=	lib/sylpheed-claws/plugins/mailmbox.a \
-	lib/sylpheed-claws/plugins/mailmbox.la \
-	lib/sylpheed-claws/plugins/mailmbox.so
+PLIST_FILES=	lib/claws-mail/plugins/mailmbox.a \
+	lib/claws-mail/plugins/mailmbox.la \
+	lib/claws-mail/plugins/mailmbox.so
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-mailmbox/distinfo b/mail/claws-mail-mailmbox/distinfo
index 88b0c834e41d..29309ab3c83d 100644
--- a/mail/claws-mail-mailmbox/distinfo
+++ b/mail/claws-mail-mailmbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (mailmbox-1.12.2.tar.gz) = a84af26ad3d59a5eee53d0f97bcb9742
-SHA256 (mailmbox-1.12.2.tar.gz) = c40ac01dcdc7b4b22442b488aff63a27ba67ef0934736c31aa10ad25f14766d2
-SIZE (mailmbox-1.12.2.tar.gz) = 394562
+MD5 (mailmbox-1.12.3.tar.gz) = 75d7f2e2b56aa575d269e79aca87fe07
+SHA256 (mailmbox-1.12.3.tar.gz) = ecc70cf57312a740c6560feda70f9c9fff1e5d131354d55082658efee802c7db
+SIZE (mailmbox-1.12.3.tar.gz) = 394132
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 5643417813ce..aea17fd0a163 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	newmail
-PORTVERSION=	0.0.7
-PORTREVISION=	1
+PORTVERSION=	0.0.8
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/
-PKGNAMEPREFIX=	sylpheed-claws-
+MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
+PKGNAMEPREFIX=	claws-mail-
 
 MAINTAINER=	c0rn@o2.pl
-COMMENT=	Message header summary logging plugin for sylpheed-claws
+COMMENT=	Message header summary logging plugin for claws-mail
 
-BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
+BUILD_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_AUTOTOOLS=	autoconf:259
 
-PLIST_FILES=lib/sylpheed-claws/plugins/newmail.a \
-	lib/sylpheed-claws/plugins/newmail.la \
-	lib/sylpheed-claws/plugins/newmail.so
+PLIST_FILES=lib/claws-mail/plugins/newmail.a \
+	lib/claws-mail/plugins/newmail.la \
+	lib/claws-mail/plugins/newmail.so
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-newmail/distinfo b/mail/claws-mail-newmail/distinfo
index 9d4dc429b7bd..baa5d01a7380 100644
--- a/mail/claws-mail-newmail/distinfo
+++ b/mail/claws-mail-newmail/distinfo
@@ -1,3 +1,3 @@
-MD5 (newmail-0.0.7.tar.gz) = ce22170c3356139c34f487a8adc38333
-SHA256 (newmail-0.0.7.tar.gz) = e4cb834ab423f30d7b9124dcd3bed09f41e1a35b061d8297f9cf08d4ebd75c9d
-SIZE (newmail-0.0.7.tar.gz) = 320867
+MD5 (newmail-0.0.8.tar.gz) = aea9b9e436b563d2087035399a713448
+SHA256 (newmail-0.0.8.tar.gz) = 7e4ae78c29aec0a87959ab749657bd9649454fac733b006421773d6a788e04ef
+SIZE (newmail-0.0.8.tar.gz) = 320356
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 142a1c73a6d4..b68aba06242b 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -6,25 +6,24 @@
 #
 
 PORTNAME=	notification
-PORTVERSION=	0.6
-PORTREVISION=	1
+PORTVERSION=	0.7
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/
-PKGNAMEPREFIX=	sylpheed-claws-
+MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
+PKGNAMEPREFIX=	claws-mail-
 DISTNAME=	notification_plugin-${PORTVERSION}
 
 MAINTAINER=	c0rn@o2.pl
-COMMENT=	New/unread mail notification plugin for sylpheed-claws
+COMMENT=	New/unread mail notification plugin for claws-mail
 
-BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
+BUILD_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_AUTOTOOLS=	autoconf:259
 
-PLIST_FILES=lib/sylpheed-claws/plugins/notification_plugin.a \
-	lib/sylpheed-claws/plugins/notification_plugin.la \
-	lib/sylpheed-claws/plugins/notification_plugin.so
+PLIST_FILES=lib/claws-mail/plugins/notification_plugin.a \
+	lib/claws-mail/plugins/notification_plugin.la \
+	lib/claws-mail/plugins/notification_plugin.so
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-notification/distinfo b/mail/claws-mail-notification/distinfo
index eadff93a682f..aebda399dbcf 100644
--- a/mail/claws-mail-notification/distinfo
+++ b/mail/claws-mail-notification/distinfo
@@ -1,3 +1,3 @@
-MD5 (notification_plugin-0.6.tar.gz) = c5878e30f94b87d52e42285c134574f9
-SHA256 (notification_plugin-0.6.tar.gz) = cc92d413fed97012a939f2af20760f2529889bdda94410824f4fd4f73f4723bc
-SIZE (notification_plugin-0.6.tar.gz) = 360120
+MD5 (notification_plugin-0.7.tar.gz) = ba3d2946ebcfeef39248fcc6d6d468a5
+SHA256 (notification_plugin-0.7.tar.gz) = 55558e5f5e1c387adfa4ee86bc6a2e1e2d7279d1bd2d8bd4c684f78c7db33386
+SIZE (notification_plugin-0.7.tar.gz) = 358927
diff --git a/mail/claws-mail-perl/Makefile b/mail/claws-mail-perl/Makefile
index 14d7b0c9860f..273774797967 100644
--- a/mail/claws-mail-perl/Makefile
+++ b/mail/claws-mail-perl/Makefile
@@ -6,28 +6,27 @@
 #
 
 PORTNAME=	perl
-PORTVERSION=	0.9.5
-PORTREVISION=	1
+PORTVERSION=	0.9.6
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/
-PKGNAMEPREFIX=	sylpheed-claws-
+MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
+PKGNAMEPREFIX=	claws-mail-
 DISTNAME=	perl_plugin-${PORTVERSION}
 
 MAINTAINER=	c0rn@o2.pl
-COMMENT=	Perl filtering plugin for sylpheed-claws
+COMMENT=	Perl filtering plugin for claws-mail
 
-BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
+BUILD_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_AUTOTOOLS=	autoconf:259
 USE_PERL5=	yes
 
-PLIST_FILES=	lib/sylpheed-claws/plugins/perl_plugin.a \
-		lib/sylpheed-claws/plugins/perl_plugin.la \
-		lib/sylpheed-claws/plugins/perl_plugin.so \
-		share/sylpheed-claws/matcherrc2perlfilter.pl
+PLIST_FILES=	lib/claws-mail/plugins/perl_plugin.a \
+		lib/claws-mail/plugins/perl_plugin.la \
+		lib/claws-mail/plugins/perl_plugin.so \
+		share/claws-mail/matcherrc2perlfilter.pl
 
 .include <bsd.port.pre.mk>
 
@@ -36,8 +35,8 @@ IGNORE=		requires newer Perl, but you can use databases/p5-DBI-137 instead
 .endif
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/sylpheed-claws
+	@${MKDIR} ${PREFIX}/share/claws-mail
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/matcherrc2perlfilter.pl \
-		${PREFIX}/share/sylpheed-claws/
+		${PREFIX}/share/claws-mail/
 
 .include <bsd.port.post.mk>
diff --git a/mail/claws-mail-perl/distinfo b/mail/claws-mail-perl/distinfo
index 8545ebb1e1da..54dabae4a205 100644
--- a/mail/claws-mail-perl/distinfo
+++ b/mail/claws-mail-perl/distinfo
@@ -1,3 +1,3 @@
-MD5 (perl_plugin-0.9.5.tar.gz) = 7b6368f4e428caae509234e7eb005373
-SHA256 (perl_plugin-0.9.5.tar.gz) = 66ed9fe273373f9d505a291102ba3055b2538b47330136a5bb5a2c47626e3326
-SIZE (perl_plugin-0.9.5.tar.gz) = 347776
+MD5 (perl_plugin-0.9.6.tar.gz) = ee7a74a388a6216d3cd5690c952aa8b6
+SHA256 (perl_plugin-0.9.6.tar.gz) = f687a15d58c0dffb65d5716966a4c2e240fb604c3d86524647e31bbb65caee4d
+SIZE (perl_plugin-0.9.6.tar.gz) = 347339
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 7f43aa6c3d49..29ff9f47e76e 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -6,22 +6,21 @@
 #
 
 PORTNAME=	rssyl
-PORTVERSION=	0.7
-PORTREVISION=	2
+PORTVERSION=	0.8
 PORTEPOCH=	1
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/
-PKGNAMEPREFIX=	sylpheed-claws-
+MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
+PKGNAMEPREFIX=	claws-mail-
 
 MAINTAINER=	c0rn@o2.pl
-COMMENT=	A RSS/Atom plugin for sylheed-claws
+COMMENT=	A RSS/Atom plugin for claws-mail
 
 LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
+BUILD_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
 
 USE_XLIB=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 
diff --git a/mail/claws-mail-rssyl/distinfo b/mail/claws-mail-rssyl/distinfo
index 531a1e0f7779..5a07262b9766 100644
--- a/mail/claws-mail-rssyl/distinfo
+++ b/mail/claws-mail-rssyl/distinfo
@@ -1,3 +1,3 @@
-MD5 (rssyl-0.7.tar.gz) = a5f8d0b37ac294732539e6315eebe2f6
-SHA256 (rssyl-0.7.tar.gz) = 20d16203880c914642ad97d377cb32eacd165355777c8b2ba821a87b63d6b299
-SIZE (rssyl-0.7.tar.gz) = 448632
+MD5 (rssyl-0.8.tar.gz) = aa5f813f5b3afa1230d42247c81f22ad
+SHA256 (rssyl-0.8.tar.gz) = d4008a3352db3bd6d0625836676f4b01e7ba846ea35ab05257b205a7a0cce16b
+SIZE (rssyl-0.8.tar.gz) = 444329
diff --git a/mail/claws-mail-rssyl/files/patch-configure.ac b/mail/claws-mail-rssyl/files/patch-configure.ac
deleted file mode 100644
index d4c25759b522..000000000000
--- a/mail/claws-mail-rssyl/files/patch-configure.ac
+++ /dev/null
@@ -1,8 +0,0 @@
---- configure.ac.orig	Sun Oct  1 11:05:00 2006
-+++ configure.ac	Sun Oct  1 11:05:19 2006
-@@ -1,4 +1,4 @@
--AC_PREREQ(2.60)
-+AC_PREREQ(2.59)
- AC_INIT(src/plugin.c)
- AC_CONFIG_AUX_DIR(config)
- AM_MAINTAINER_MODE
diff --git a/mail/claws-mail-rssyl/pkg-plist b/mail/claws-mail-rssyl/pkg-plist
index 63171e75728b..3b89de174271 100644
--- a/mail/claws-mail-rssyl/pkg-plist
+++ b/mail/claws-mail-rssyl/pkg-plist
@@ -1,6 +1,6 @@
-lib/sylpheed-claws/plugins/rssyl.a
-lib/sylpheed-claws/plugins/rssyl.la
-lib/sylpheed-claws/plugins/rssyl.so
+lib/claws-mail/plugins/rssyl.a
+lib/claws-mail/plugins/rssyl.la
+lib/claws-mail/plugins/rssyl.so
 share/locale/de/LC_MESSAGES/rssyl.mo
 share/locale/es/LC_MESSAGES/rssyl.mo
 share/locale/fi/LC_MESSAGES/rssyl.mo
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index ac18a6760905..d7139928ec19 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -6,26 +6,25 @@
 #
 
 PORTNAME=	smime
-PORTVERSION=	0.5.6
-PORTREVISION=	1
+PORTVERSION=	0.5.7
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/
-PKGNAMEPREFIX=	sylpheed-claws-
+MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
+PKGNAMEPREFIX=	claws-mail-
 
 MAINTAINER=	c0rn@o2.pl
-COMMENT=	S/MIME plugin for sylpheed-claws
+COMMENT=	S/MIME plugin for claws-mail
 
 LIB_DEPENDS=	gpgme.17:${PORTSDIR}/security/gpgme
-BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
+BUILD_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_AUTOTOOLS=	autoconf:259
 
-PLIST_FILES=lib/sylpheed-claws/plugins/smime.a \
-	lib/sylpheed-claws/plugins/smime.la \
-	lib/sylpheed-claws/plugins/smime.so \
-	lib/sylpheed-claws/plugins/smime.deps
+PLIST_FILES=lib/claws-mail/plugins/smime.a \
+	lib/claws-mail/plugins/smime.la \
+	lib/claws-mail/plugins/smime.so \
+	lib/claws-mail/plugins/smime.deps
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-smime/distinfo b/mail/claws-mail-smime/distinfo
index 86dc40f18308..1750608bc781 100644
--- a/mail/claws-mail-smime/distinfo
+++ b/mail/claws-mail-smime/distinfo
@@ -1,3 +1,3 @@
-MD5 (smime-0.5.6.tar.gz) = d2dd688fd17cd462b332590ac2311dfd
-SHA256 (smime-0.5.6.tar.gz) = 52715d7ebbf52667b51e503e664ddcb7313e22e12f7f9b7cba66a93dc8044a7c
-SIZE (smime-0.5.6.tar.gz) = 327306
+MD5 (smime-0.5.7.tar.gz) = 38aee2e55b4b06810df5f1fba924791f
+SHA256 (smime-0.5.7.tar.gz) = d4505b2fe81a679445a930782be92d36fcd60e749c230f471abf0d70723e078a
+SIZE (smime-0.5.7.tar.gz) = 326731
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index 237098f8c518..02fe6f971aea 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	synce
-PORTVERSION=	0.6.4
-PORTREVISION=	1
+PORTVERSION=	0.6.5
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/
-PKGNAMEPREFIX=	sylpheed-claws-
+MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
+PKGNAMEPREFIX=	claws-mail-
 DISTNAME=	synce_plugin-${PORTVERSION}
 
 MAINTAINER=	c0rn@o2.pl
-COMMENT=	Windows CE addressbook plugin for sylpheed-claws
+COMMENT=	Windows CE addressbook plugin for claws-mail
 
 LIB_DEPENDS=	rapi.2:${PORTSDIR}/palm/synce-librapi2
-BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
+BUILD_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
@@ -27,8 +26,8 @@ USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ARGS=	--with-libsynce=${LOCALBASE} \
 	--with-librapi2=${LOCALBASE}
 
-PLIST_FILES=	lib/sylpheed-claws/plugins/synce_plugin.a \
-	lib/sylpheed-claws/plugins/synce_plugin.la \
-	lib/sylpheed-claws/plugins/synce_plugin.so
+PLIST_FILES=	lib/claws-mail/plugins/synce_plugin.a \
+	lib/claws-mail/plugins/synce_plugin.la \
+	lib/claws-mail/plugins/synce_plugin.so
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-synce/distinfo b/mail/claws-mail-synce/distinfo
index 44e61f91a8e3..94576f62f383 100644
--- a/mail/claws-mail-synce/distinfo
+++ b/mail/claws-mail-synce/distinfo
@@ -1,3 +1,3 @@
-MD5 (synce_plugin-0.6.4.tar.gz) = 6da61b888a069a7cbc94c0470d514f25
-SHA256 (synce_plugin-0.6.4.tar.gz) = 5122c7936bb513804949851d750276c4e74695af41d83295da8f63d386db8194
-SIZE (synce_plugin-0.6.4.tar.gz) = 328809
+MD5 (synce_plugin-0.6.5.tar.gz) = a88fde9b10f14c22a0ba954224801da2
+SHA256 (synce_plugin-0.6.5.tar.gz) = 7989e884a81d7f654ce6069ee2be1972b43dc4182d9923536aca636bcd3785b6
+SIZE (synce_plugin-0.6.5.tar.gz) = 328177
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index e291b4de6816..73df6f3dcfd3 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -6,28 +6,33 @@
 #
 
 PORTNAME=	vcalendar
-PORTVERSION=	1.89.1
-PORTREVISION=	3
+PORTVERSION=	1.91
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/ \
+MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	miwi
-PKGNAMEPREFIX=	sylpheed-claws-
+PKGNAMEPREFIX=	claws-mail-
 
 MAINTAINER=	c0rn@o2.pl
-COMMENT=	vCalendar plugin for sylpheed-claws
+COMMENT=	vCalendar plugin for claws-mail
 
 LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
-RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
+BUILD_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=2.6:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_XLIB=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 	--with-libintl-prefix=${LOCALBASE}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVESION} < 500000
+IGNORE=	doens't buid
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/mail/claws-mail-vcalendar/distinfo b/mail/claws-mail-vcalendar/distinfo
index 64fbdc4fa850..ef57e48d0e9d 100644
--- a/mail/claws-mail-vcalendar/distinfo
+++ b/mail/claws-mail-vcalendar/distinfo
@@ -1,3 +1,3 @@
-MD5 (vcalendar-1.89.1.tar.gz) = cfe351cb2c894429761ed773cf3823ea
-SHA256 (vcalendar-1.89.1.tar.gz) = c7e9cc7070f046799e150037ca92053edc007c1b16c28141b8121051503a4f05
-SIZE (vcalendar-1.89.1.tar.gz) = 704019
+MD5 (vcalendar-1.91.tar.gz) = 929a4324ef7fe10bfebb4b4b020a7493
+SHA256 (vcalendar-1.91.tar.gz) = 8c10af7fbce2aa2bbd3183a3c8e3b8c7ffed98954907d1acd3e9c02e49191e0d
+SIZE (vcalendar-1.91.tar.gz) = 710592
diff --git a/mail/claws-mail-vcalendar/files/patch-configure.ac b/mail/claws-mail-vcalendar/files/patch-configure.ac
deleted file mode 100644
index da0d0995037b..000000000000
--- a/mail/claws-mail-vcalendar/files/patch-configure.ac
+++ /dev/null
@@ -1,8 +0,0 @@
---- configure.ac.orig	Sun Oct  1 11:28:13 2006
-+++ configure.ac	Sun Oct  1 11:28:27 2006
-@@ -1,4 +1,4 @@
--AC_PREREQ(2.60)
-+AC_PREREQ(2.59)
- AC_INIT(src/plugin.c)
- AC_CONFIG_AUX_DIR(config)
- AM_MAINTAINER_MODE
diff --git a/mail/claws-mail-vcalendar/pkg-plist b/mail/claws-mail-vcalendar/pkg-plist
index 82b9f14e4297..ec4b52cba323 100644
--- a/mail/claws-mail-vcalendar/pkg-plist
+++ b/mail/claws-mail-vcalendar/pkg-plist
@@ -1,7 +1,7 @@
 include/ical.h
-lib/sylpheed-claws/plugins/vcalendar.so
-lib/sylpheed-claws/plugins/vcalendar.la
-lib/sylpheed-claws/plugins/vcalendar.a
+lib/claws-mail/plugins/vcalendar.so
+lib/claws-mail/plugins/vcalendar.la
+lib/claws-mail/plugins/vcalendar.a
 share/locale/de/LC_MESSAGES/vcalendar.mo
 share/locale/es/LC_MESSAGES/vcalendar.mo
 share/locale/fi/LC_MESSAGES/vcalendar.mo