3 files changed, 12 insertions, 152 deletions
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index ad50b1be0713..ce5503e90ef9 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	1.9.100
-PORTREVISION=	3
+PORTVERSION=	2.0.0
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -100,11 +99,11 @@ WITH_CLAMAV=		yes
 .endif
 
 .if defined(WITH_CLAMAV) || defined(WITH_ALL)
-CONFIGURE_ARGS+=	--enable-clamav
+CONFIGURE_ARGS+=	--enable-clamav-plugin
 PLIST_SUB+=		CLAM_PLUG=""
 BUILD_DEPENDS=	   	${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav
 .else
-CONFIGURE_ARGS+=	--disable-clamav
+CONFIGURE_ARGS+=	--disable-clamav-plugin
 PLIST_SUB+=		CLAM_PLUG="@comment "
 .endif
 .if defined(WITH_COMPFACE) || defined(WITH_ALL)
@@ -130,7 +129,7 @@ CONFIGURE_ARGS+=	--disable-jpilot
 USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--enable-ldap
 .else
-CONFIGURE_ARGS+=	--enable-ldap
+CONFIGURE_ARGS+=	--disable-ldap
 .endif
 .if defined(WITH_SA_PLUG) || defined(WITH_ALL)
 RUN_DEPENDS+=		spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 4f55fdc1b2a8..d8b4db3ca766 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,6 +1,6 @@
-MD5 (sylpheed-claws-1.9.100.tar.bz2) = 863c314557f90f17c2f6d6a0ab57e6c2
-SHA256 (sylpheed-claws-1.9.100.tar.bz2) = f4bf3826925caa9d1d877345671c9fbb1c4990cea500eead505806e245bca78d
-SIZE (sylpheed-claws-1.9.100.tar.bz2) = 3480063
+MD5 (sylpheed-claws-2.0.0.tar.bz2) = 6e26f8e36772b71361d0c463b9a6c7a1
+SHA256 (sylpheed-claws-2.0.0.tar.bz2) = 6f7e7c2ec81d6fa608f0efc785a81928dbafad3eae8b3ac3c58d3b3413eb344d
+SIZE (sylpheed-claws-2.0.0.tar.bz2) = 3764105
 MD5 (sylpheed-iconset-20040929.tar.gz) = d72cf03bf3d13cf9e2785eaca3807707
 SHA256 (sylpheed-iconset-20040929.tar.gz) = 11e791cf7187b5f3ac5a5ab5f0144d9ea8701bbc6182b30b35c30c2cc50e5210
 SIZE (sylpheed-iconset-20040929.tar.gz) = 1298891
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index 0596059b0a5c..7498ac935f5d 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -91,6 +91,7 @@ include/sylpheed-claws/gtk/gtkshruler.h
 include/sylpheed-claws/gtk/gtksourceprintjob.h
 include/sylpheed-claws/gtk/gtkutils.h
 include/sylpheed-claws/gtk/gtkvscrollbutton.h
+include/sylpheed-claws/gtk/icon_legend.h
 include/sylpheed-claws/gtk/inputdialog.h
 include/sylpheed-claws/gtk/logwindow.h
 include/sylpheed-claws/gtk/manage_window.h
@@ -209,152 +210,18 @@ libdata/pkgconfig/sylpheed-claws.pc
 @dirrmtry include/sylpheed-claws/plugins
 @dirrmtry include/sylpheed-claws
 %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so
-%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin_gtk.so
-%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin_gtk.deps
 %%GPGME%%lib/sylpheed-claws/plugins/pgpcore.so
 %%GPGME%%lib/sylpheed-claws/plugins/pgpmime.deps
 %%GPGME%%lib/sylpheed-claws/plugins/pgpmime.so
 %%GPGME%%lib/sylpheed-claws/plugins/pgpinline.deps
 %%GPGME%%lib/sylpheed-claws/plugins/pgpinline.so
 %%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.so
-%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin_gtk.deps
-%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin_gtk.so
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.sylprint
 %%PORTDOCS%%%%DOCSDIR%%/README.tools
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-4.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-4.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-10.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-11.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-12.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-13.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-14.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-15.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-16.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-17.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-18.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-19.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-20.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-9.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-10.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-11.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-12.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-13.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-14.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-15.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-16.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-17.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-18.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-19.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-20.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-21.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-22.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-9.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-10.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-11.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-12.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-13.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-14.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-15.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-16.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-17.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-18.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-19.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-20.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-9.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-10.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-11.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-12.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-13.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-14.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-15.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-16.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-17.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-18.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-19.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-20.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-9.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-10.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-11.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-12.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-13.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-14.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-15.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-16.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-17.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-18.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-19.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-20.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-9.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.sgml
 share/locale/bg/LC_MESSAGES/sylpheed-claws.mo
 share/locale/ca/LC_MESSAGES/sylpheed-claws.mo
 share/locale/cs/LC_MESSAGES/sylpheed-claws.mo
@@ -405,6 +272,10 @@ share/pixmaps/sylpheed-claws.png
 %%DATADIR%%/update-po
 %%DATADIR%%/uudec
 %%DATADIR%%/vcard2xml.py
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-claws-manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-claws-manual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-claws-manual.ps
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-claws-manual.txt
 %%THEMES%%%%DATADIR%%/themes/Crystal/.sylpheed_themeinfo
 %%THEMES%%%%DATADIR%%/themes/Crystal/close.xpm
 %%THEMES%%%%DATADIR%%/themes/Crystal/continue.xpm
@@ -2167,18 +2038,8 @@ share/pixmaps/sylpheed-claws.png
 %%THEMES%%@dirrm %%DATADIR%%/themes/tom_2.1.1
 %%THEMES%%@dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/ja
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/fr
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/es
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/de
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/it
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/fr
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/es
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/sylpheed-claws/plugins
 @dirrm lib/sylpheed-claws