summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/CHANGES-200717
-rw-r--r--doc/TODO3
-rw-r--r--mail/claws-mail-bogofilter/DESCR15
-rw-r--r--mail/claws-mail-bogofilter/Makefile17
-rw-r--r--mail/claws-mail-bogofilter/PLIST4
-rw-r--r--mail/claws-mail-clamav/DESCR6
-rw-r--r--mail/claws-mail-clamav/Makefile23
-rw-r--r--mail/claws-mail-clamav/PLIST3
-rw-r--r--mail/claws-mail-dillo-viewer/DESCR8
-rw-r--r--mail/claws-mail-dillo-viewer/Makefile17
-rw-r--r--mail/claws-mail-dillo-viewer/PLIST3
-rw-r--r--mail/claws-mail-gtkhtml/DESCR8
-rw-r--r--mail/claws-mail-gtkhtml/Makefile26
-rw-r--r--mail/claws-mail-gtkhtml/PLIST15
-rw-r--r--mail/claws-mail-gtkhtml/distinfo5
-rw-r--r--mail/claws-mail-newmail/DESCR2
-rw-r--r--mail/claws-mail-newmail/Makefile25
-rw-r--r--mail/claws-mail-newmail/PLIST3
-rw-r--r--mail/claws-mail-newmail/distinfo5
-rw-r--r--mail/claws-mail-notification/DESCR13
-rw-r--r--mail/claws-mail-notification/Makefile24
-rw-r--r--mail/claws-mail-notification/PLIST8
-rw-r--r--mail/claws-mail-notification/distinfo5
-rw-r--r--mail/claws-mail-pdf_viewer/DESCR5
-rw-r--r--mail/claws-mail-pdf_viewer/Makefile26
-rw-r--r--mail/claws-mail-pdf_viewer/PLIST14
-rw-r--r--mail/claws-mail-pdf_viewer/distinfo5
-rw-r--r--mail/claws-mail-pgp/DESCR4
-rw-r--r--mail/claws-mail-pgp/Makefile25
-rw-r--r--mail/claws-mail-pgp/PLIST1
-rw-r--r--mail/claws-mail-pgpcore/DESCR4
-rw-r--r--mail/claws-mail-pgpcore/Makefile22
-rw-r--r--mail/claws-mail-pgpcore/PLIST11
-rw-r--r--mail/claws-mail-pgpinline/DESCR4
-rw-r--r--mail/claws-mail-pgpinline/Makefile21
-rw-r--r--mail/claws-mail-pgpinline/PLIST7
-rw-r--r--mail/claws-mail-pgpmime/DESCR4
-rw-r--r--mail/claws-mail-pgpmime/Makefile21
-rw-r--r--mail/claws-mail-pgpmime/PLIST7
-rw-r--r--mail/claws-mail-smime/DESCR2
-rw-r--r--mail/claws-mail-smime/Makefile25
-rw-r--r--mail/claws-mail-smime/PLIST4
-rw-r--r--mail/claws-mail-smime/distinfo5
-rw-r--r--mail/claws-mail-spamassassin/DESCR19
-rw-r--r--mail/claws-mail-spamassassin/Makefile17
-rw-r--r--mail/claws-mail-spamassassin/PLIST3
-rw-r--r--mail/claws-mail-trayicon/DESCR4
-rw-r--r--mail/claws-mail-trayicon/Makefile16
-rw-r--r--mail/claws-mail-trayicon/PLIST3
-rw-r--r--mail/claws-mail/DESCR22
-rw-r--r--mail/claws-mail/MESSAGE7
-rw-r--r--mail/claws-mail/MESSAGE.plugins7
-rw-r--r--mail/claws-mail/Makefile72
-rw-r--r--mail/claws-mail/Makefile.common61
-rw-r--r--mail/claws-mail/Makefile.vers3
-rw-r--r--mail/claws-mail/PLIST264
-rw-r--r--mail/claws-mail/PLIST.plugins3
-rw-r--r--mail/claws-mail/buildlink3.mk19
-rw-r--r--mail/claws-mail/distinfo8
-rw-r--r--mail/claws-mail/files/mime.types471
-rw-r--r--mail/claws-mail/patches/patch-ab13
-rw-r--r--mail/claws-mail/patches/patch-ac20
-rw-r--r--mail/claws-mail/patches/patch-ad24
-rw-r--r--mail/claws-mail/plugins.mk21
64 files changed, 1546 insertions, 3 deletions
diff --git a/doc/CHANGES-2007 b/doc/CHANGES-2007
index bcb3e27e151..e833fca499e 100644
--- a/doc/CHANGES-2007
+++ b/doc/CHANGES-2007
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2007,v 1.1683 2007/08/03 00:55:58 tnn Exp $
+$NetBSD: CHANGES-2007,v 1.1684 2007/08/03 02:34:35 smb Exp $
Changes to the packages collection and infrastructure in 2007:
@@ -3087,3 +3087,18 @@ Changes to the packages collection and infrastructure in 2007:
Added security/py-denyhosts version 2.6 [he 2007-08-02]
Updated graphics/imlib2 to 1.3.0nb1 [tnn 2007-08-02]
Updated pkgtools/pkg_rolling-replace to 0.5 [tnn 2007-08-03]
+ Added mail/claws-mail version 2.10.0 [smb 2007-08-02]
+ Added mail/claws-mail-bogofilter version 2.10.0 [smb 2007-08-02]
+ Added mail/claws-mail-clamav-plugin version 2.10.0 [smb 2007-08-02]
+ Added mail/claws-mail-dillo-viewer version 2.10.0 [smb 2007-08-02]
+ Added mail/claws-mail-gtkhtml2_viewer version 0.15.1 [smb 2007-08-02]
+ Added mail/claws-mail-newmail version 0.0.10 [smb 2007-08-02]
+ Added mail/claws-mail-notification version 0.11 [smb 2007-08-02]
+ Added mail/claws-mail-pdf_viewer version 0.5 [smb 2007-08-02]
+ Added mail/claws-mail-pgp version 2.10.0 [smb 2007-08-02]
+ Added mail/claws-mail-pgpcore version 2.10.0 [smb 2007-08-02]
+ Added mail/claws-mail-pgpinline version 2.10.0 [smb 2007-08-02]
+ Added mail/claws-mail-pgpmime version 2.10.0 [smb 2007-08-02]
+ Added mail/claws-mail-smime version 0.7.1 [smb 2007-08-02]
+ Added mail/claws-mail-spamassassin version 2.10.0 [smb 2007-08-02]
+ Added mail/claws-mail-trayicon version 2.10.0 [smb 2007-08-02]
diff --git a/doc/TODO b/doc/TODO
index 48710f88994..472cfd1e14c 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.6558 2007/08/02 22:36:44 jlam Exp $
+$NetBSD: TODO,v 1.6559 2007/08/03 02:34:36 smb Exp $
Suggested new packages
======================
@@ -1180,7 +1180,6 @@ Suggested package updates
o suse_base-10.2
o swfdec-0.4.3
o swi-prolog-5.6.31
- o sylpheed-claws-2.10.0 [now claws-mail]
o sympa-5.3
o sysinfo-4.2.2
o taskjuggler-2.4.0
diff --git a/mail/claws-mail-bogofilter/DESCR b/mail/claws-mail-bogofilter/DESCR
new file mode 100644
index 00000000000..3dfd64522ac
--- /dev/null
+++ b/mail/claws-mail-bogofilter/DESCR
@@ -0,0 +1,15 @@
+The Bogofilter plugin provides anti-spam capabilities for Claws
+Mail. Bogofilter is a pure Bayesian filter, written in C, which
+makes it very fast. Claws Mail also provides a SpamAssassin anti-spam
+plugin, with the same feature set, but more extensive 'spaminess'
+checks. The Bogofilter plugin features are:
+
+ * Filtering spam when mail is received, moving it to a specific
+ folder, or destroying it completely,
+ * Learning what is spam and what is ham, in order to better
+ filter your mailbox.
+
+Before Bogofilter is able to function effectively, you have to show
+it a few of your spam emails and a few real emails. You can do that
+by selecting some messages, right-clicking on them and choosing
+'Mark/Mark as spam' or 'Mark/Mark as ham'.
diff --git a/mail/claws-mail-bogofilter/Makefile b/mail/claws-mail-bogofilter/Makefile
new file mode 100644
index 00000000000..1ab3bf983b7
--- /dev/null
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:42 smb Exp $
+#
+
+PLUGIN_NAME= bogofilter
+.include "../../mail/claws-mail/plugins.mk"
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= Enables the scanning of incoming mail using Bogofilter
+
+CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+
+DEPENDS+= claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+= bogofilter>=1.0.3nb1:../../mail/bogofilter
+
+.include "../../x11/gtk2/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-bogofilter/PLIST b/mail/claws-mail-bogofilter/PLIST
new file mode 100644
index 00000000000..35fd2ee920d
--- /dev/null
+++ b/mail/claws-mail-bogofilter/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:43 smb Exp $
+lib/claws-mail/plugins/bogofilter.la
+@dirrm lib/claws-mail/plugins
+@dirrm lib/claws-mail
diff --git a/mail/claws-mail-clamav/DESCR b/mail/claws-mail-clamav/DESCR
new file mode 100644
index 00000000000..ea2cfeecf02
--- /dev/null
+++ b/mail/claws-mail-clamav/DESCR
@@ -0,0 +1,6 @@
+The Clam AntiVirus plugin provides anti-virus capabilities for Claws Mail.
+The Clam AntiVirus plugin features are:
+
+ * Filtering infected messages when mail is received, and moving them
+ to a specific folder or destroying them completely.
+ * Scanning the contents of attached archive files
diff --git a/mail/claws-mail-clamav/Makefile b/mail/claws-mail-clamav/Makefile
new file mode 100644
index 00000000000..ca6469c00c1
--- /dev/null
+++ b/mail/claws-mail-clamav/Makefile
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:43 smb Exp $
+#
+
+PLUGIN_NAME= clamav_plugin
+.include "../../mail/claws-mail/plugins.mk"
+BUILD_DIRS= src/plugins/clamav
+INSTALL_DIRS= src/plugins/clamav
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= Enables the scanning of message attachments using Clam AntiVirus
+
+CONFIGURE_ARGS+= --enable-clamav-plugin
+
+USE_LANGUAGES= c
+
+DEPENDS+= claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+= clamav>=0.91.1nb1:../../mail/clamav
+
+.include "../../mail/clamav/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-clamav/PLIST b/mail/claws-mail-clamav/PLIST
new file mode 100644
index 00000000000..9a63e86bba3
--- /dev/null
+++ b/mail/claws-mail-clamav/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:44 smb Exp $
+lib/claws-mail/plugins/clamav_plugin.la
+@dirrm lib/claws-mail/plugins
diff --git a/mail/claws-mail-dillo-viewer/DESCR b/mail/claws-mail-dillo-viewer/DESCR
new file mode 100644
index 00000000000..e4992ff7021
--- /dev/null
+++ b/mail/claws-mail-dillo-viewer/DESCR
@@ -0,0 +1,8 @@
+The Dillo HTML Viewer plugin is an HTML renderer plugin for Claws
+Mail. It features:
+
+ * Basic rendering of HTML message parts
+ * Optional fetching and displaying of remote images
+ * Browsing the web from within of Claws Mail
+
+It uses Dillo's --local option by default for safe browsing.
diff --git a/mail/claws-mail-dillo-viewer/Makefile b/mail/claws-mail-dillo-viewer/Makefile
new file mode 100644
index 00000000000..92e75e5fbcc
--- /dev/null
+++ b/mail/claws-mail-dillo-viewer/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:45 smb Exp $
+#
+
+PLUGIN_NAME= dillo_viewer
+.include "../../mail/claws-mail/plugins.mk"
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= Plugin to use the Dillo web browser for html rendering
+
+CONFIGURE_ARGS+= --enable-dillo_viewer-plugin
+
+DEPENDS+= claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+= dillo>=0.8.6nb2:../../www/dillo
+
+.include "../../x11/gtk2/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-dillo-viewer/PLIST b/mail/claws-mail-dillo-viewer/PLIST
new file mode 100644
index 00000000000..27ad6aa6cce
--- /dev/null
+++ b/mail/claws-mail-dillo-viewer/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:46 smb Exp $
+lib/claws-mail/plugins/dillo_viewer.la
+@dirrm lib/claws-mail/plugins
diff --git a/mail/claws-mail-gtkhtml/DESCR b/mail/claws-mail-gtkhtml/DESCR
new file mode 100644
index 00000000000..054f702d9f1
--- /dev/null
+++ b/mail/claws-mail-gtkhtml/DESCR
@@ -0,0 +1,8 @@
+The Gtkhtml2Viewer plugin is an HTML renderer plugin for Claws Mail. It
+features:
+
+ * Basic rendering of HTML message parts
+ * Displaying of attached images
+ * Optional fetching and displaying of remote images
+ * Remote image caching
+ * The ability to Reply to the message, quoting the selected text
diff --git a/mail/claws-mail-gtkhtml/Makefile b/mail/claws-mail-gtkhtml/Makefile
new file mode 100644
index 00000000000..edb6a56479c
--- /dev/null
+++ b/mail/claws-mail-gtkhtml/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:46 smb Exp $
+#
+
+DISTNAME=gtkhtml2_viewer-0.15.1
+PKGNAME=claws-mail-gtkhtml2_viewer-0.15.1
+CATEGORIES=mail
+MASTER_SITES= http://claws-mail.org/downloads/plugins/
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= Renders HTML mail using the gtkhtml2 rendering widget
+
+DEPENDS+= claws-mail>=2.10.0:../../mail/claws-mail
+
+.include "../../mk/bsd.prefs.mk"
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+USE_LANGUAGES+= c
+
+.include "../../mail/claws-mail/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../www/libgtkhtml/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-gtkhtml/PLIST b/mail/claws-mail-gtkhtml/PLIST
new file mode 100644
index 00000000000..e842c3ef1ae
--- /dev/null
+++ b/mail/claws-mail-gtkhtml/PLIST
@@ -0,0 +1,15 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:47 smb Exp $
+lib/claws-mail/plugins/gtkhtml2_viewer.la
+share/locale/ca/LC_MESSAGES/gtkhtml2_viewer.mo
+share/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo
+share/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo
+share/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo
+share/locale/fr/LC_MESSAGES/gtkhtml2_viewer.mo
+share/locale/hu/LC_MESSAGES/gtkhtml2_viewer.mo
+share/locale/it/LC_MESSAGES/gtkhtml2_viewer.mo
+share/locale/pl/LC_MESSAGES/gtkhtml2_viewer.mo
+share/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo
+share/locale/sk/LC_MESSAGES/gtkhtml2_viewer.mo
+share/locale/sr/LC_MESSAGES/gtkhtml2_viewer.mo
+share/locale/zh_CN/LC_MESSAGES/gtkhtml2_viewer.mo
+@dirrm lib/claws-mail/plugins
diff --git a/mail/claws-mail-gtkhtml/distinfo b/mail/claws-mail-gtkhtml/distinfo
new file mode 100644
index 00000000000..8b3513aa9d1
--- /dev/null
+++ b/mail/claws-mail-gtkhtml/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2007/08/03 02:34:47 smb Exp $
+
+SHA1 (gtkhtml2_viewer-0.15.1.tar.gz) = cff826f55bd27a260ee7c69438a591da8fa8f90c
+RMD160 (gtkhtml2_viewer-0.15.1.tar.gz) = 24a3dc19709242a43b7255ca25b2e809d559b91c
+Size (gtkhtml2_viewer-0.15.1.tar.gz) = 392495 bytes
diff --git a/mail/claws-mail-newmail/DESCR b/mail/claws-mail-newmail/DESCR
new file mode 100644
index 00000000000..707b88a22fc
--- /dev/null
+++ b/mail/claws-mail-newmail/DESCR
@@ -0,0 +1,2 @@
+This plugin writes a msg header summary to a log file, (Default:
+~/Mail/NewLog), on arrival of new mail *after* sorting.
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
new file mode 100644
index 00000000000..a3699b80613
--- /dev/null
+++ b/mail/claws-mail-newmail/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:48 smb Exp $
+#
+
+DISTNAME=newmail-0.0.10
+PKGNAME=claws-mail-newmail-0.0.10
+CATEGORIES=mail
+MASTER_SITES= http://claws-mail.org/downloads/plugins/
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= Provides various ways to notify the user of new and unread email
+
+DEPENDS+= claws-mail>=2.10.0:../../mail/claws-mail
+
+.include "../../mk/bsd.prefs.mk"
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+USE_LANGUAGES+= c
+
+.include "../../mail/claws-mail/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-newmail/PLIST b/mail/claws-mail-newmail/PLIST
new file mode 100644
index 00000000000..111d6528e9c
--- /dev/null
+++ b/mail/claws-mail-newmail/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:49 smb Exp $
+lib/claws-mail/plugins/newmail.la
+@dirrm lib/claws-mail/plugins
diff --git a/mail/claws-mail-newmail/distinfo b/mail/claws-mail-newmail/distinfo
new file mode 100644
index 00000000000..cdf3f162b97
--- /dev/null
+++ b/mail/claws-mail-newmail/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2007/08/03 02:34:49 smb Exp $
+
+SHA1 (newmail-0.0.10.tar.gz) = 7800ea9d73e737a726fb396d409f293daad4e5dc
+RMD160 (newmail-0.0.10.tar.gz) = c7ea906b94822ef9b6c15b4d593b72feecd65f6e
+Size (newmail-0.0.10.tar.gz) = 322622 bytes
diff --git a/mail/claws-mail-notification/DESCR b/mail/claws-mail-notification/DESCR
new file mode 100644
index 00000000000..afcfd80e22d
--- /dev/null
+++ b/mail/claws-mail-notification/DESCR
@@ -0,0 +1,13 @@
+The Notification plugin provides various ways to notify the user
+of new and possibly unread mail. Currently, the following modules
+are implemented:
+
+ * A mail banner (stocks ticker-like widget)
+ * A popup window
+ * A command to be issued on new mail arrival
+
+All modules can be activated or deactivated at compilation time,
+and are highly configurable at run time. It is possible to include
+only selected folders in any module. In general, the notification
+is executed after filtering, so it is possible to exclude spam or
+other unwanted messages from notification.
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
new file mode 100644
index 00000000000..5ac290df751
--- /dev/null
+++ b/mail/claws-mail-notification/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:49 smb Exp $
+#
+
+DISTNAME=notification_plugin-0.11
+PKGNAME=claws-mail-notification-0.11
+CATEGORIES=mail
+MASTER_SITES= http://claws-mail.org/downloads/plugins/
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= Provides various ways to notify the user of new and unread email
+
+DEPENDS+= claws-mail>=2.10.0:../../mail/claws-mail
+
+.include "../../mk/bsd.prefs.mk"
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+USE_LANGUAGES+= c
+
+.include "../../mail/claws-mail/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-notification/PLIST b/mail/claws-mail-notification/PLIST
new file mode 100644
index 00000000000..defb5dc7889
--- /dev/null
+++ b/mail/claws-mail-notification/PLIST
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:51 smb Exp $
+lib/claws-mail/plugins/notification_plugin.la
+share/locale/ca/LC_MESSAGES/notification_plugin.mo
+share/locale/cs/LC_MESSAGES/notification_plugin.mo
+share/locale/hu/LC_MESSAGES/notification_plugin.mo
+share/locale/pt_BR/LC_MESSAGES/notification_plugin.mo
+share/locale/zh_CN/LC_MESSAGES/notification_plugin.mo
+@dirrm lib/claws-mail/plugins
diff --git a/mail/claws-mail-notification/distinfo b/mail/claws-mail-notification/distinfo
new file mode 100644
index 00000000000..7175e47bfe3
--- /dev/null
+++ b/mail/claws-mail-notification/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2007/08/03 02:34:50 smb Exp $
+
+SHA1 (notification_plugin-0.11.tar.gz) = 694ac3b7ad85a7a411cb82fadb1eb070180df012
+RMD160 (notification_plugin-0.11.tar.gz) = 24df62b7304e65d88cbd6bdd94b990462b6bf13a
+Size (notification_plugin-0.11.tar.gz) = 436031 bytes
diff --git a/mail/claws-mail-pdf_viewer/DESCR b/mail/claws-mail-pdf_viewer/DESCR
new file mode 100644
index 00000000000..d5bf6c964fc
--- /dev/null
+++ b/mail/claws-mail-pdf_viewer/DESCR
@@ -0,0 +1,5 @@
+The PDF Viewer plugin renders PDF and Postscript attachments in
+Claws Mail. It features:
+
+ * Moving between document pages, sequentially and jumping to
+ a specific page
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
new file mode 100644
index 00000000000..346a2b6b68c
--- /dev/null
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:51 smb Exp $
+#
+
+DISTNAME=pdf_viewer-0.5
+PKGNAME=claws-mail-pdf_viewer-0.5
+CATEGORIES=mail
+MASTER_SITES= http://claws-mail.org/downloads/plugins/
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= Enables the viewing of PDF and PostScript attachments
+
+DEPENDS+= claws-mail>=2.10.0:../../mail/claws-mail
+
+.include "../../mk/bsd.prefs.mk"
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+USE_TOOLS+= gs:run
+USE_LANGUAGES+= c
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../mail/claws-mail/buildlink3.mk"
+.include "../../print/poppler-glib/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-pdf_viewer/PLIST b/mail/claws-mail-pdf_viewer/PLIST
new file mode 100644
index 00000000000..08f5dd5d144
--- /dev/null
+++ b/mail/claws-mail-pdf_viewer/PLIST
@@ -0,0 +1,14 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:52 smb Exp $
+lib/claws-mail/plugins/pdf_viewer.la
+share/locale/ca/LC_MESSAGES/pdf_viewer.mo
+share/locale/de/LC_MESSAGES/pdf_viewer.mo
+share/locale/es/LC_MESSAGES/pdf_viewer.mo
+share/locale/fi/LC_MESSAGES/pdf_viewer.mo
+share/locale/fr/LC_MESSAGES/pdf_viewer.mo
+share/locale/hu/LC_MESSAGES/pdf_viewer.mo
+share/locale/it/LC_MESSAGES/pdf_viewer.mo
+share/locale/pl/LC_MESSAGES/pdf_viewer.mo
+share/locale/pt_BR/LC_MESSAGES/pdf_viewer.mo
+share/locale/sk/LC_MESSAGES/pdf_viewer.mo
+share/locale/sr/LC_MESSAGES/pdf_viewer.mo
+@dirrm lib/claws-mail/plugins
diff --git a/mail/claws-mail-pdf_viewer/distinfo b/mail/claws-mail-pdf_viewer/distinfo
new file mode 100644
index 00000000000..46f650184bd
--- /dev/null
+++ b/mail/claws-mail-pdf_viewer/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2007/08/03 02:34:52 smb Exp $
+
+SHA1 (pdf_viewer-0.5.tar.gz) = d1191d90e9a86708508ebebfb9a69004530d7bf1
+RMD160 (pdf_viewer-0.5.tar.gz) = 65bf8df2dfabc21aa39ee7e72a56fb8b8b6ec51b
+Size (pdf_viewer-0.5.tar.gz) = 396385 bytes
diff --git a/mail/claws-mail-pgp/DESCR b/mail/claws-mail-pgp/DESCR
new file mode 100644
index 00000000000..289d1095004
--- /dev/null
+++ b/mail/claws-mail-pgp/DESCR
@@ -0,0 +1,4 @@
+Using Dillo, a very light web browser, the dillo-viewer plugin allows
+Sylpheed-claws to render HTML attachments. Note that it is done in a somewhat
+secure way, by passing the -s argument to Dillo, which prevents it from making
+any Internet connection.
diff --git a/mail/claws-mail-pgp/Makefile b/mail/claws-mail-pgp/Makefile
new file mode 100644
index 00000000000..1270c73c618
--- /dev/null
+++ b/mail/claws-mail-pgp/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:53 smb Exp $
+#
+.include "../../mail/claws-mail/Makefile.vers"
+
+DISTNAME= claws-mail-pgp-${CLAWS_VERSION}
+CATEGORIES= mail security
+MASTER_SITES= # empty
+DISTFILES= # empy
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= Metapackage for the PGP plug-in for Claws-mail
+
+DEPENDS+= claws-mail-pgpcore>=${CLAWS_VERSION}:../../mail/claws-mail-pgpcore
+DEPENDS+= claws-mail-pgpmime>=${CLAWS_VERSION}:../../mail/claws-mail-pgpmime
+DEPENDS+= claws-mail-pgpinline>=${CLAWS_VERSION}:../../mail/claws-mail-pgpinline
+
+EXTRACT_ONLY= # empty
+NO_CHECKSUM= yes
+NO_CONFIGURE= yes
+NO_BUILD= yes
+NO_MTREE= yes
+
+do-install: # empty
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-pgp/PLIST b/mail/claws-mail-pgp/PLIST
new file mode 100644
index 00000000000..96230bd8f53
--- /dev/null
+++ b/mail/claws-mail-pgp/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:53 smb Exp $
diff --git a/mail/claws-mail-pgpcore/DESCR b/mail/claws-mail-pgpcore/DESCR
new file mode 100644
index 00000000000..289d1095004
--- /dev/null
+++ b/mail/claws-mail-pgpcore/DESCR
@@ -0,0 +1,4 @@
+Using Dillo, a very light web browser, the dillo-viewer plugin allows
+Sylpheed-claws to render HTML attachments. Note that it is done in a somewhat
+secure way, by passing the -s argument to Dillo, which prevents it from making
+any Internet connection.
diff --git a/mail/claws-mail-pgpcore/Makefile b/mail/claws-mail-pgpcore/Makefile
new file mode 100644
index 00000000000..39072b3044a
--- /dev/null
+++ b/mail/claws-mail-pgpcore/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:54 smb Exp $
+#
+
+PLUGIN_NAME= pgpcore
+.include "../../mail/claws-mail/plugins.mk"
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= Handles core PGP functions
+
+CONFIGURE_ARGS+= --enable-gpgme
+CONFIGURE_ARGS+= --enable-pgpcore-plugin
+CONFIGURE_ARGS+= --enable-pgpmime-plugin
+CONFIGURE_ARGS+= --enable-pgpinline-plugin
+
+DEPENDS+= claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+= gnupg>=1.4.7:../../security/gnupg
+DEPENDS+= gpgme>=1.1.4:../../security/gpgme
+
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../security/gpgme/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-pgpcore/PLIST b/mail/claws-mail-pgpcore/PLIST
new file mode 100644
index 00000000000..67f05655e29
--- /dev/null
+++ b/mail/claws-mail-pgpcore/PLIST
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:55 smb Exp $
+include/claws-mail/plugins/pgpcore/passphrase.h
+include/claws-mail/plugins/pgpcore/pgp_viewer.h
+include/claws-mail/plugins/pgpcore/prefs_gpg.h
+include/claws-mail/plugins/pgpcore/select-keys.h
+include/claws-mail/plugins/pgpcore/sgpgme.h
+lib/claws-mail/plugins/pgpcore.la
+@dirrm lib/claws-mail/plugins
+@dirrm include/claws-mail/plugins/pgpcore
+@dirrm include/claws-mail/plugins
+@dirrm include/claws-mail
diff --git a/mail/claws-mail-pgpinline/DESCR b/mail/claws-mail-pgpinline/DESCR
new file mode 100644
index 00000000000..289d1095004
--- /dev/null
+++ b/mail/claws-mail-pgpinline/DESCR
@@ -0,0 +1,4 @@
+Using Dillo, a very light web browser, the dillo-viewer plugin allows
+Sylpheed-claws to render HTML attachments. Note that it is done in a somewhat
+secure way, by passing the -s argument to Dillo, which prevents it from making
+any Internet connection.
diff --git a/mail/claws-mail-pgpinline/Makefile b/mail/claws-mail-pgpinline/Makefile
new file mode 100644
index 00000000000..c0e93a97ecd
--- /dev/null
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:55 smb Exp $
+#
+
+PLUGIN_NAME= pgpinline
+.include "../../mail/claws-mail/plugins.mk"
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= Handles PGP/Inline signed and/or encrypted mails
+
+CONFIGURE_ARGS+= --enable-gpgme
+CONFIGURE_ARGS+= --enable-pgpcore-plugin
+CONFIGURE_ARGS+= --enable-pgpinline-plugin
+
+DEPENDS+= claws-mail-pgpcore>=${CLAWS_VERSION}:../../mail/claws-mail-pgpcore
+
+PLIST_SRC+= PLIST
+
+.include "../../security/gpgme/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-pgpinline/PLIST b/mail/claws-mail-pgpinline/PLIST
new file mode 100644
index 00000000000..b030d257a9d
--- /dev/null
+++ b/mail/claws-mail-pgpinline/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:56 smb Exp $
+include/claws-mail/plugins/pgpinline/pgpinline.h
+lib/claws-mail/plugins/pgpinline.deps
+lib/claws-mail/plugins/pgpinline.la
+@dirrm lib/claws-mail/plugins
+@dirrm include/claws-mail/plugins/pgpinline
+@dirrm include/claws-mail/plugins
diff --git a/mail/claws-mail-pgpmime/DESCR b/mail/claws-mail-pgpmime/DESCR
new file mode 100644
index 00000000000..289d1095004
--- /dev/null
+++ b/mail/claws-mail-pgpmime/DESCR
@@ -0,0 +1,4 @@
+Using Dillo, a very light web browser, the dillo-viewer plugin allows
+Sylpheed-claws to render HTML attachments. Note that it is done in a somewhat
+secure way, by passing the -s argument to Dillo, which prevents it from making
+any Internet connection.
diff --git a/mail/claws-mail-pgpmime/Makefile b/mail/claws-mail-pgpmime/Makefile
new file mode 100644
index 00000000000..e372608f46e
--- /dev/null
+++ b/mail/claws-mail-pgpmime/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:56 smb Exp $
+#
+
+PLUGIN_NAME= pgpmime
+.include "../../mail/claws-mail/plugins.mk"
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= Handles PGP/MIME signed and/or encrypted mails
+
+CONFIGURE_ARGS+= --enable-gpgme
+CONFIGURE_ARGS+= --enable-pgpcore-plugin
+CONFIGURE_ARGS+= --enable-pgpmime-plugin
+
+DEPENDS+= claws-mail-pgpcore>=${CLAWS_VERSION}:../../mail/claws-mail-pgpcore
+
+PLIST_SRC+= PLIST
+
+.include "../../security/gpgme/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-pgpmime/PLIST b/mail/claws-mail-pgpmime/PLIST
new file mode 100644
index 00000000000..83ae7c5b60a
--- /dev/null
+++ b/mail/claws-mail-pgpmime/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:57 smb Exp $
+include/claws-mail/plugins/pgpmime/pgpmime.h
+lib/claws-mail/plugins/pgpmime.deps
+lib/claws-mail/plugins/pgpmime.la
+@dirrm lib/claws-mail/plugins
+@dirrm include/claws-mail/plugins/pgpmime
+@dirrm include/claws-mail/plugins
diff --git a/mail/claws-mail-smime/DESCR b/mail/claws-mail-smime/DESCR
new file mode 100644
index 00000000000..52ed69ed792
--- /dev/null
+++ b/mail/claws-mail-smime/DESCR
@@ -0,0 +1,2 @@
+This plugin handles S/MIME signed and/or encrypted mails. You can
+decrypt mails, verify signatures or sign and encrypt your own mails.
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
new file mode 100644
index 00000000000..b64762913ef
--- /dev/null
+++ b/mail/claws-mail-smime/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:57 smb Exp $
+
+DISTNAME=smime-0.7.1
+PKGNAME=claws-mail-smime-0.7.1
+CATEGORIES=mail
+MASTER_SITES= http://claws-mail.org/downloads/plugins/
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= This plugin handles S/MIME signed and/or encrypted mails
+
+DEPENDS+= claws-mail>=2.10.0:../../mail/claws-mail
+
+.include "../../mk/bsd.prefs.mk"
+
+GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
+USE_LIBTOOL= yes
+USE_LANGUAGES+= c
+
+.include "../../mail/claws-mail/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../security/gpgme/buildlink3.mk"
+.include "../../security/gnupg2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-smime/PLIST b/mail/claws-mail-smime/PLIST
new file mode 100644
index 00000000000..f7c6a19e011
--- /dev/null
+++ b/mail/claws-mail-smime/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:59 smb Exp $
+lib/claws-mail/plugins/smime.deps
+lib/claws-mail/plugins/smime.la
+@dirrm lib/claws-mail/plugins
diff --git a/mail/claws-mail-smime/distinfo b/mail/claws-mail-smime/distinfo
new file mode 100644
index 00000000000..fa76449c5ac
--- /dev/null
+++ b/mail/claws-mail-smime/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2007/08/03 02:34:58 smb Exp $
+
+SHA1 (smime-0.7.1.tar.gz) = aef2a5a0779dbaf18268f202e6752145df9f8edc
+RMD160 (smime-0.7.1.tar.gz) = 5f296ef28feca0adedd5e0ac9cac4fb2f54de918
+Size (smime-0.7.1.tar.gz) = 329614 bytes
diff --git a/mail/claws-mail-spamassassin/DESCR b/mail/claws-mail-spamassassin/DESCR
new file mode 100644
index 00000000000..69824233835
--- /dev/null
+++ b/mail/claws-mail-spamassassin/DESCR
@@ -0,0 +1,19 @@
+The SpamAssassin plugin provides anti-spam capabilities for Claws
+Mail. SpamAssassin is a complete spam checker, featuring local
+tests, remote tests, Bayesian filtering, and more. It is written
+in perl. This complete set of checks makes it really good at catching
+spam, at the expense of filtering rather slowly. Claws Mail also
+provides a Bogofilter anti-spam plugin, which does only Bayesian
+filtering, making it faster than SpamAssassin. The SpamAssassin
+plugin features are:
+
+ * Filtering spam when mail is received, and moving it to
+ a specific folder or destroying it completely
+ * Learning what is spam and what is ham, in order to better
+ filter your mailbox
+ * The ability to use a remote SpamAssassin server for
+ filtering and learning
+
+SpamAssassin can begin filtering your emails right away, as it
+isn't only a Bayesian filter; but you should correct it with the
+learning feature if you get false positives or false negatives.
diff --git a/mail/claws-mail-spamassassin/Makefile b/mail/claws-mail-spamassassin/Makefile
new file mode 100644
index 00000000000..86050a23d2e
--- /dev/null
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:59 smb Exp $
+#
+
+PLUGIN_NAME= spamassassin
+.include "../../mail/claws-mail/plugins.mk"
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= Enables the scanning of incoming mail using SpamAssassin
+
+CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+
+DEPENDS+= claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+= spamassassin>=3.2.1:../../mail/spamassassin
+
+.include "../../x11/gtk2/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-spamassassin/PLIST b/mail/claws-mail-spamassassin/PLIST
new file mode 100644
index 00000000000..3dfc5807e77
--- /dev/null
+++ b/mail/claws-mail-spamassassin/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:35:00 smb Exp $
+lib/claws-mail/plugins/spamassassin.la
+@dirrm lib/claws-mail/plugins
diff --git a/mail/claws-mail-trayicon/DESCR b/mail/claws-mail-trayicon/DESCR
new file mode 100644
index 00000000000..87aba206532
--- /dev/null
+++ b/mail/claws-mail-trayicon/DESCR
@@ -0,0 +1,4 @@
+The TrayIcon plugin provides a notification icon in the system's
+notification area. It can be used to see whether you have unread
+or new mail, and to trigger common actions. A tooltip also shows
+the current new, unread and total number of messages.
diff --git a/mail/claws-mail-trayicon/Makefile b/mail/claws-mail-trayicon/Makefile
new file mode 100644
index 00000000000..57b63a362bf
--- /dev/null
+++ b/mail/claws-mail-trayicon/Makefile
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:35:00 smb Exp $
+#
+
+PLUGIN_NAME= trayicon
+.include "../../mail/claws-mail/plugins.mk"
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= Places an icon in the system tray for new mail
+
+CONFIGURE_ARGS+= --enable-trayicon-plugin
+
+DEPENDS+= claws-mail>=2.10.0:../../mail/claws-mail
+
+.include "../../x11/gtk2/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-trayicon/PLIST b/mail/claws-mail-trayicon/PLIST
new file mode 100644
index 00000000000..622d447886b
--- /dev/null
+++ b/mail/claws-mail-trayicon/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:35:01 smb Exp $
+lib/claws-mail/plugins/trayicon.la
+@dirrm lib/claws-mail/plugins
diff --git a/mail/claws-mail/DESCR b/mail/claws-mail/DESCR
new file mode 100644
index 00000000000..3ff8731880a
--- /dev/null
+++ b/mail/claws-mail/DESCR
@@ -0,0 +1,22 @@
+Claws-mail is an e-mail client (and news reader) based on GTK+, running on
+X Window System, and aiming for
+
+ * Quick response
+ * Graceful, and sophisticated interface
+ * Easy configuration, intuitive operation
+ * Abundant features
+
+The appearance and interface are similar to some popular e-mail
+clients for Windows, such as Outlook Express, Becky!, and Datula.
+The interface is also designed to emulate the mailers on Emacsen,
+and almost all commands are accessible with the keyboard.
+
+The messages are managed by MH format, and you'll be able to use
+it together with another mailer based on MH format (like Mew). You
+can also utilize fetchmail or/and procmail, and external programs
+on receiving (like inc or imget).
+
+Claws-mail was based on Sylpheed (and was once known as sylpheed-claws),
+but now this extended version adds many useful and powerful features,
+such as a plugin mechanism, built-in image viewer, drag-n-drop
+support, and a lot more.
diff --git a/mail/claws-mail/MESSAGE b/mail/claws-mail/MESSAGE
new file mode 100644
index 00000000000..41a736b2345
--- /dev/null
+++ b/mail/claws-mail/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2007/08/03 02:34:40 smb Exp $
+
+All Claws-Mail plug-ins are separate packages, and must be installed
+separately.
+
+===========================================================================
diff --git a/mail/claws-mail/MESSAGE.plugins b/mail/claws-mail/MESSAGE.plugins
new file mode 100644
index 00000000000..ec5063c83d2
--- /dev/null
+++ b/mail/claws-mail/MESSAGE.plugins
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE.plugins,v 1.1 2007/08/03 02:34:38 smb Exp $
+
+To use ${PKGNAME}, you must manually load the plugin
+through Configuration/Plugins.
+
+===========================================================================
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
new file mode 100644
index 00000000000..8037dfa174f
--- /dev/null
+++ b/mail/claws-mail/Makefile
@@ -0,0 +1,72 @@
+# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:39 smb Exp $
+
+.include "Makefile.common"
+
+#PKGNAME= claws-mail-${CLAWS_VERSION}
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= X based e-mail and netnews client
+
+USE_TOOLS+= msgfmt
+PKGCONFIG_OVERRIDE+= claws-mail.pc.in
+
+
+
+PKG_SYSCONFSUBDIR= claws-mail
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+
+USE_DIRS+= xdg-1.4
+
+.include "../../mk/bsd.prefs.mk"
+
+FACES_IS_INSTALLED!= ${PKG_INFO} -e faces || ${ECHO}
+.if empty(FACES_IS_INSTALLED)
+. include "../../graphics/compface/buildlink3.mk"
+.else
+. include "../../mail/faces/buildlink3.mk"
+.endif
+
+EGDIR= ${PREFIX}/share/examples/claws-mail
+CONF_FILES= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.claws-mail
+PKG_SUGGESTED_OPTIONS=
+PKG_SUPPORTED_OPTIONS= jpilot ldap inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mjpilot)
+CONFIGURE_ARGS+= --enable-jpilot
+. include "../../comms/pilot-link-libs/buildlink3.mk"
+. include "../../comms/jpilot/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-jpilot
+.endif
+
+.if !empty(PKG_OPTIONS:Mldap)
+CONFIGURE_ARGS+= --enable-ldap
+. include "../../databases/openldap-client/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-ldap
+.endif
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+= --enable-ipv6
+.else
+CONFIGURE_ARGS+= --disable-ipv6
+.endif
+
+post-install:
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ ${INSTALL_DATA} ${FILESDIR}/mime.types ${EGDIR}
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/claws-mail
+ ${INSTALL_DATA} ${WRKSRC}/claws-mail*.png ${PREFIX}/share/claws-mail
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/aspell/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common
new file mode 100644
index 00000000000..c886cad6f5f
--- /dev/null
+++ b/mail/claws-mail/Makefile.common
@@ -0,0 +1,61 @@
+# $NetBSD: Makefile.common,v 1.1 2007/08/03 02:34:39 smb Exp $
+
+DISTNAME= claws-mail-${CLAWS_VERSION}
+CATEGORIES= mail news x11
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
+EXTRACT_SUFX= .tar.bz2
+
+HOMEPAGE= http://claws-mail.org/
+
+DISTINFO_FILE= ${.CURDIR}/../../mail/claws-mail/distinfo
+PATCHDIR= ${.CURDIR}/../../mail/claws-mail/patches
+
+
+# for SMTP, POP3 and IMAP over SSL
+# set these just in case we don't have a pkg-config file for openssl
+CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include"
+CONFIGURE_ENV+= OPENSSL_LIBS="-L${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto"
+
+USE_TOOLS+= gmake pkg-config
+USE_LANGUAGES+= c
+USE_LIBTOOL= YES
+USE_PKGLOCALEDIR= YES
+
+GNU_CONFIGURE= YES
+# Force gnome detection off to avoid installing some extra files
+CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG="no"
+
+CONFIGURE_ARGS+= --enable-aspell
+CONFIGURE_ARGS+= --enable-nls
+CONFIGURE_ARGS+= --enable-openssl
+CONFIGURE_ARGS+= --enable-compface
+CONFIGURE_ARGS+= --disable-gpgme
+CONFIGURE_ARGS+= --disable-pgpcore-plugin
+CONFIGURE_ARGS+= --disable-pgpmime-plugin
+CONFIGURE_ARGS+= --disable-pgpinline-plugin
+CONFIGURE_ARGS+= --disable-trayicon-plugin
+CONFIGURE_ARGS+= --disable-image-viewer-plugin
+CONFIGURE_ARGS+= --disable-clamav-plugin
+CONFIGURE_ARGS+= --disable-dillo-viewer-plugin
+CONFIGURE_ARGS+= --disable-mathml-viewer-plugin
+CONFIGURE_ARGS+= --disable-gnomeprint
+BUILDLINK_ABI_DEPENDS.libetpan+= libetpan>=0.49
+CONFIGURE_ARGS+= --enable-libetpan
+.include "../../mail/libetpan/buildlink3.mk"
+
+#.if !empty(PKG_BUILD_OPTIONS.claws-mail:Mbogofilter)
+#CONFIGURE_ARGS+= --enable-bogofilter-plugin
+#.else
+#CONFIGURE_ARGS+= --disable-bogofilter-plugin
+#.endif
+#.if !empty(PKG_BUILD_OPTIONS.claws-mail:Mspamassassin)
+#CONFIGURE_ARGS+= --enable-spamassassin-plugin
+#.else
+#CONFIGURE_ARGS+= --disable-spamassassin-plugin
+#.endif
+CONFIGURE_ARGS+= --disable-bogofilter-plugin
+CONFIGURE_ARGS+= --disable-spamassassin-plugin
+
+.include "../../mail/claws-mail/Makefile.vers"
+
+.include "../../mk/x11.buildlink3.mk"
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
new file mode 100644
index 00000000000..752d5256daf
--- /dev/null
+++ b/mail/claws-mail/Makefile.vers
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.vers,v 1.1 2007/08/03 02:34:42 smb Exp $
+#
+CLAWS_VERSION= 2.10.0
diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST
new file mode 100644
index 00000000000..7e1ca65c39f
--- /dev/null
+++ b/mail/claws-mail/PLIST
@@ -0,0 +1,264 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:40 smb Exp $
+bin/claws-mail
+bin/sylpheed-claws
+include/claws-mail/account.h
+include/claws-mail/action.h
+include/claws-mail/adbookbase.h
+include/claws-mail/addr_compl.h
+include/claws-mail/addrbook.h
+include/claws-mail/addrcache.h
+include/claws-mail/addrclip.h
+include/claws-mail/addrdefs.h
+include/claws-mail/addressadd.h
+include/claws-mail/addressbook.h
+include/claws-mail/addressbook_foldersel.h
+include/claws-mail/addressitem.h
+include/claws-mail/addrgather.h
+include/claws-mail/addrharvest.h
+include/claws-mail/addrindex.h
+include/claws-mail/addritem.h
+include/claws-mail/addrquery.h
+include/claws-mail/addrselect.h
+include/claws-mail/alertpanel.h
+include/claws-mail/browseldap.h
+include/claws-mail/codeconv.h
+include/claws-mail/common/base64.h
+include/claws-mail/common/claws.h
+include/claws-mail/common/defs.h
+include/claws-mail/common/hooks.h
+include/claws-mail/common/log.h
+include/claws-mail/common/md5.h
+include/claws-mail/common/mgutils.h
+include/claws-mail/common/nntp.h
+include/claws-mail/common/passcrypt.h
+include/claws-mail/common/plugin.h
+include/claws-mail/common/prefs.h
+include/claws-mail/common/progressindicator.h
+include/claws-mail/common/quoted-printable.h
+include/claws-mail/common/session.h
+include/claws-mail/common/smtp.h
+include/claws-mail/common/socket.h
+include/claws-mail/common/ssl.h
+include/claws-mail/common/ssl_certificate.h
+include/claws-mail/common/string_match.h
+include/claws-mail/common/stringtable.h
+include/claws-mail/common/template.h
+include/claws-mail/common/timing.h
+include/claws-mail/common/utils.h
+include/claws-mail/common/uuencode.h
+include/claws-mail/common/valgrind.h
+include/claws-mail/common/version.h
+include/claws-mail/common/xml.h
+include/claws-mail/common/xmlprops.h
+include/claws-mail/compose.h
+include/claws-mail/config.h
+include/claws-mail/crash.h
+include/claws-mail/customheader.h
+include/claws-mail/displayheader.h
+include/claws-mail/editaddress.h
+include/claws-mail/editbook.h
+include/claws-mail/editgroup.h
+include/claws-mail/editjpilot.h
+include/claws-mail/editldap.h
+include/claws-mail/editldap_basedn.h
+include/claws-mail/editvcard.h
+include/claws-mail/enriched.h
+include/claws-mail/etpan/etpan-errors.h
+include/claws-mail/etpan/etpan-thread-manager-types.h
+include/claws-mail/etpan/etpan-thread-manager.h
+include/claws-mail/etpan/imap-thread.h
+include/claws-mail/exphtmldlg.h
+include/claws-mail/expldifdlg.h
+include/claws-mail/export.h
+include/claws-mail/exporthtml.h
+include/claws-mail/exportldif.h
+include/claws-mail/filtering.h
+include/claws-mail/folder.h
+include/claws-mail/folder_item_prefs.h
+include/claws-mail/foldersel.h
+include/claws-mail/folderutils.h
+include/claws-mail/folderview.h
+include/claws-mail/gedit-print.h
+include/claws-mail/grouplistdialog.h
+include/claws-mail/gtk/about.h
+include/claws-mail/gtk/authors.h
+include/claws-mail/gtk/claws-marshal.h
+include/claws-mail/gtk/colorlabel.h
+include/claws-mail/gtk/colorsel.h
+include/claws-mail/gtk/combobox.h
+include/claws-mail/gtk/description_window.h
+include/claws-mail/gtk/filesel.h
+include/claws-mail/gtk/foldersort.h
+include/claws-mail/gtk/gtkaspell.h
+include/claws-mail/gtk/gtksctree.h
+include/claws-mail/gtk/gtkshruler.h
+include/claws-mail/gtk/gtksourceprintjob.h
+include/claws-mail/gtk/gtkutils.h
+include/claws-mail/gtk/gtkvscrollbutton.h
+include/claws-mail/gtk/headers.h
+include/claws-mail/gtk/icon_legend.h
+include/claws-mail/gtk/inputdialog.h
+include/claws-mail/gtk/logwindow.h
+include/claws-mail/gtk/manage_window.h
+include/claws-mail/gtk/menu.h
+include/claws-mail/gtk/pluginwindow.h
+include/claws-mail/gtk/prefswindow.h
+include/claws-mail/gtk/progressdialog.h
+include/claws-mail/gtk/quicksearch.h
+include/claws-mail/gtk/sslcertwindow.h
+include/claws-mail/headerview.h
+include/claws-mail/html.h
+include/claws-mail/image_viewer.h
+include/claws-mail/imap.h
+include/claws-mail/imap_gtk.h
+include/claws-mail/import.h
+include/claws-mail/importldif.h
+include/claws-mail/importmutt.h
+include/claws-mail/importpine.h
+include/claws-mail/inc.h
+include/claws-mail/jpilot.h
+include/claws-mail/ldapctrl.h
+include/claws-mail/ldaplocate.h
+include/claws-mail/ldapquery.h
+include/claws-mail/ldapserver.h
+include/claws-mail/ldapupdate.h
+include/claws-mail/ldaputil.h
+include/claws-mail/ldif.h
+include/claws-mail/localfolder.h
+include/claws-mail/main.h
+include/claws-mail/mainwindow.h
+include/claws-mail/manual.h
+include/claws-mail/matcher.h
+include/claws-mail/matcher_parser.h
+include/claws-mail/matcher_parser_lex.h
+include/claws-mail/matcher_parser_parse.h
+include/claws-mail/mbox.h
+include/claws-mail/message_search.h
+include/claws-mail/messageview.h
+include/claws-mail/mh.h
+include/claws-mail/mh_gtk.h
+include/claws-mail/mimeview.h
+include/claws-mail/msgcache.h
+include/claws-mail/mutt.h
+include/claws-mail/news.h
+include/claws-mail/news_gtk.h
+include/claws-mail/noticeview.h
+include/claws-mail/partial_download.h
+include/claws-mail/pine.h
+include/claws-mail/pop.h
+include/claws-mail/prefs_account.h
+include/claws-mail/prefs_actions.h
+include/claws-mail/prefs_common.h
+include/claws-mail/prefs_compose_writing.h
+include/claws-mail/prefs_customheader.h
+include/claws-mail/prefs_display_header.h
+include/claws-mail/prefs_ext_prog.h
+include/claws-mail/prefs_filtering.h
+include/claws-mail/prefs_filtering_action.h
+include/claws-mail/prefs_folder_column.h
+include/claws-mail/prefs_folder_item.h
+include/claws-mail/prefs_fonts.h
+include/claws-mail/prefs_gtk.h
+include/claws-mail/prefs_image_viewer.h
+include/claws-mail/prefs_logging.h
+include/claws-mail/prefs_matcher.h
+include/claws-mail/prefs_message.h
+include/claws-mail/prefs_msg_colors.h
+include/claws-mail/prefs_other.h
+include/claws-mail/prefs_quote.h
+include/claws-mail/prefs_receive.h
+include/claws-mail/prefs_send.h
+include/claws-mail/prefs_spelling.h
+include/claws-mail/prefs_summaries.h
+include/claws-mail/prefs_summary_column.h
+include/claws-mail/prefs_summary_open.h
+include/claws-mail/prefs_template.h
+include/claws-mail/prefs_themes.h
+include/claws-mail/prefs_toolbar.h
+include/claws-mail/prefs_wrapping.h
+include/claws-mail/privacy.h
+include/claws-mail/procheader.h
+include/claws-mail/procmime.h
+include/claws-mail/procmsg.h
+include/claws-mail/quote_fmt.h
+include/claws-mail/quote_fmt_lex.h
+include/claws-mail/quote_fmt_parse.h
+include/claws-mail/recv.h
+include/claws-mail/remotefolder.h
+include/claws-mail/send_message.h
+include/claws-mail/setup.h
+include/claws-mail/sourcewindow.h
+include/claws-mail/ssl_manager.h
+include/claws-mail/statusbar.h
+include/claws-mail/stock_pixmap.h
+include/claws-mail/summary_search.h
+include/claws-mail/summaryview.h
+include/claws-mail/textview.h
+include/claws-mail/toolbar.h
+include/claws-mail/undo.h
+include/claws-mail/unmime.h
+include/claws-mail/uri_opener.h
+include/claws-mail/vcard.h
+include/claws-mail/wizard.h
+lib/pkgconfig/claws-mail.pc
+man/man1/claws-mail.1
+share/applications/claws-mail.desktop
+share/claws-mail/claws-mail-128x128.png
+share/claws-mail/claws-mail-64x64.png
+share/claws-mail/claws-mail.png
+share/doc/claws-mail/RELEASE_NOTES
+share/doc/claws-mail/manual/en/claws-mail-manual.html
+share/doc/claws-mail/manual/en/claws-mail-manual.pdf
+share/doc/claws-mail/manual/en/claws-mail-manual.ps
+share/doc/claws-mail/manual/en/claws-mail-manual.txt
+share/doc/claws-mail/manual/es/claws-mail-manual.html
+share/doc/claws-mail/manual/es/claws-mail-manual.pdf
+share/doc/claws-mail/manual/es/claws-mail-manual.ps
+share/doc/claws-mail/manual/es/claws-mail-manual.txt
+share/doc/claws-mail/manual/fr/claws-mail-manual.html
+share/doc/claws-mail/manual/fr/claws-mail-manual.pdf
+share/doc/claws-mail/manual/fr/claws-mail-manual.ps
+share/doc/claws-mail/manual/fr/claws-mail-manual.txt
+share/doc/claws-mail/manual/pl/claws-mail-manual.html
+share/doc/claws-mail/manual/pl/claws-mail-manual.pdf
+share/doc/claws-mail/manual/pl/claws-mail-manual.ps
+share/doc/claws-mail/manual/pl/claws-mail-manual.txt
+share/examples/claws-mail/mime.types
+share/locale/bg/LC_MESSAGES/claws-mail.mo
+share/locale/ca/LC_MESSAGES/claws-mail.mo
+share/locale/cs/LC_MESSAGES/claws-mail.mo
+share/locale/de/LC_MESSAGES/claws-mail.mo
+share/locale/el/LC_MESSAGES/claws-mail.mo
+share/locale/en_GB/LC_MESSAGES/claws-mail.mo
+share/locale/es/LC_MESSAGES/claws-mail.mo
+share/locale/fi/LC_MESSAGES/claws-mail.mo
+share/locale/fr/LC_MESSAGES/claws-mail.mo
+share/locale/hr/LC_MESSAGES/claws-mail.mo
+share/locale/hu/LC_MESSAGES/claws-mail.mo
+share/locale/it/LC_MESSAGES/claws-mail.mo
+share/locale/ja/LC_MESSAGES/claws-mail.mo
+share/locale/ko/LC_MESSAGES/claws-mail.mo
+share/locale/nb/LC_MESSAGES/claws-mail.mo
+share/locale/nl/LC_MESSAGES/claws-mail.mo
+share/locale/pl/LC_MESSAGES/claws-mail.mo
+share/locale/pt_BR/LC_MESSAGES/claws-mail.mo
+share/locale/ru/LC_MESSAGES/claws-mail.mo
+share/locale/sk/LC_MESSAGES/claws-mail.mo
+share/locale/sr/LC_MESSAGES/claws-mail.mo
+share/locale/sv/LC_MESSAGES/claws-mail.mo
+share/locale/zh_CN/LC_MESSAGES/claws-mail.mo
+share/locale/zh_TW/LC_MESSAGES/claws-mail.mo
+@dirrm share/examples/claws-mail
+@dirrm share/doc/claws-mail/manual/pl
+@dirrm share/doc/claws-mail/manual/fr
+@dirrm share/doc/claws-mail/manual/es
+@dirrm share/doc/claws-mail/manual/en
+@dirrm share/doc/claws-mail/manual
+@dirrm share/doc/claws-mail
+@dirrm share/claws-mail
+@comment in xdg-dirs: @dirrm share/applications
+@dirrm include/claws-mail/gtk
+@dirrm include/claws-mail/etpan
+@dirrm include/claws-mail/common
+@dirrm include/claws-mail
+@dirrm etc/claws-mail
diff --git a/mail/claws-mail/PLIST.plugins b/mail/claws-mail/PLIST.plugins
new file mode 100644
index 00000000000..2c7bcc23870
--- /dev/null
+++ b/mail/claws-mail/PLIST.plugins
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.plugins,v 1.1 2007/08/03 02:34:40 smb Exp $
+lib/claws-mail/plugins/${PLUGIN_NAME}.la
+@unexec ${RMDIR} %D/lib/claws-mail/plugins 2>/dev/null || ${TRUE}
diff --git a/mail/claws-mail/buildlink3.mk b/mail/claws-mail/buildlink3.mk
new file mode 100644
index 00000000000..0d3b0e45cf5
--- /dev/null
+++ b/mail/claws-mail/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2007/08/03 02:34:41 smb Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+CLAWS_MAIL_BUILDLINK3_MK:= ${CLAWS_MAIL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= claws-mail
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nclaws-mail}
+BUILDLINK_PACKAGES+= claws-mail
+BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}claws-mail
+
+.if ${CLAWS_MAIL_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=2.4.0
+BUILDLINK_PKGSRCDIR.claws-mail?= ../../mail/claws-mail
+.endif # CLAWS_MAIL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
new file mode 100644
index 00000000000..dc158976a60
--- /dev/null
+++ b/mail/claws-mail/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2007/08/03 02:34:41 smb Exp $
+
+SHA1 (claws-mail-2.10.0.tar.bz2) = 0ee38ec2dd0c37941b0bcc4af7ab441ec432c63c
+RMD160 (claws-mail-2.10.0.tar.bz2) = e10eed2c3461a8c85d6313f0c57581a3b0ea654f
+Size (claws-mail-2.10.0.tar.bz2) = 5520512 bytes
+SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
+SHA1 (patch-ac) = fe2f1a8e4e8ff634d24eeefc86e8b41800621c19
+SHA1 (patch-ad) = 9090824f9ad3688315567ed0857673cb94123897
diff --git a/mail/claws-mail/files/mime.types b/mail/claws-mail/files/mime.types
new file mode 100644
index 00000000000..195474f4d35
--- /dev/null
+++ b/mail/claws-mail/files/mime.types
@@ -0,0 +1,471 @@
+# This is a comment. I love comments.
+
+# This file controls what Internet media types are sent to the client for
+# given file extension(s). Sending the correct media type to the client
+# is important so they know how to handle the content of the file.
+# Extra types can either be added here or by using an AddType directive
+# in your config files. For more information about Internet media types,
+# please read RFC 2045, 2046, 2047, 2048, and 2077. The Internet media type
+# registry is at <ftp://ftp.iana.org/assignments/media-types/>.
+
+# MIME type Extension
+application/EDI-Consent
+application/EDI-X12
+application/EDIFACT
+application/activemessage
+application/andrew-inset ez
+application/applefile
+application/atomicmail
+application/batch-SMTP
+application/beep+xml
+application/cals-1840
+application/commonground
+application/cybercash
+application/dca-rft
+application/dec-dx
+application/dvcs
+application/eshop
+application/http
+application/hyperstudio
+application/iges
+application/index
+application/index.cmd
+application/index.obj
+application/index.response
+application/index.vnd
+application/iotp
+application/ipp
+application/isup
+application/font-tdpfr
+application/mac-binhex40 hqx
+application/mac-compactpro cpt
+application/macwriteii
+application/marc
+application/mathematica
+application/mathematica-old
+application/msword doc
+application/news-message-id
+application/news-transmission
+application/ocsp-request
+application/ocsp-response
+application/octet-stream bin dms lha lzh exe class so dll
+application/oda oda
+application/parityfec
+application/pdf pdf
+application/pgp-encrypted
+application/pgp-keys
+application/pgp-signature
+application/pkcs10
+application/pkcs7-mime
+application/pkcs7-signature
+application/pkix-cert
+application/pkix-crl
+application/pkixcmp
+application/postscript ai eps ps
+application/prs.alvestrand.titrax-sheet
+application/prs.cww
+application/prs.nprend
+application/qsig
+application/remote-printing
+application/riscos
+application/rtf
+application/sdp
+application/set-payment
+application/set-payment-initiation
+application/set-registration
+application/set-registration-initiation
+application/sgml
+application/sgml-open-catalog
+application/sieve
+application/slate
+application/smil smi smil
+application/timestamp-query
+application/timestamp-reply
+application/vemmi
+application/vnd.3M.Post-it-Notes
+application/vnd.FloGraphIt
+application/vnd.accpac.simply.aso
+application/vnd.accpac.simply.imp
+application/vnd.acucobol
+application/vnd.aether.imp
+application/vnd.anser-web-certificate-issue-initiation
+application/vnd.anser-web-funds-transfer-initiation
+application/vnd.audiograph
+application/vnd.businessobjects
+application/vnd.bmi
+application/vnd.canon-cpdl
+application/vnd.canon-lips
+application/vnd.claymore
+application/vnd.commerce-battelle
+application/vnd.commonspace
+application/vnd.comsocaller
+application/vnd.contact.cmsg
+application/vnd.cosmocaller
+application/vnd.cups-postscript
+application/vnd.cups-raster
+application/vnd.cups-raw
+application/vnd.ctc-posml
+application/vnd.cybank
+application/vnd.dna
+application/vnd.dpgraph
+application/vnd.dxr
+application/vnd.ecdis-update
+application/vnd.ecowin.chart
+application/vnd.ecowin.filerequest
+application/vnd.ecowin.fileupdate
+application/vnd.ecowin.series
+application/vnd.ecowin.seriesrequest
+application/vnd.ecowin.seriesupdate
+application/vnd.enliven
+application/vnd.epson.esf
+application/vnd.epson.msf
+application/vnd.epson.quickanime
+application/vnd.epson.salt
+application/vnd.epson.ssf
+application/vnd.ericsson.quickcall
+application/vnd.eudora.data
+application/vnd.fdf
+application/vnd.ffsns
+application/vnd.framemaker
+application/vnd.fsc.weblaunch
+application/vnd.fujitsu.oasys
+application/vnd.fujitsu.oasys2
+application/vnd.fujitsu.oasys3
+application/vnd.fujitsu.oasysgp
+application/vnd.fujitsu.oasysprs
+application/vnd.fujixerox.ddd
+application/vnd.fujixerox.docuworks
+application/vnd.fujixerox.docuworks.binder
+application/vnd.fut-misnet
+application/vnd.grafeq
+application/vnd.groove-account
+application/vnd.groove-identity-message
+application/vnd.groove-injector
+application/vnd.groove-tool-message
+application/vnd.groove-tool-template
+application/vnd.groove-vcard
+application/vnd.hhe.lesson-player
+application/vnd.hp-HPGL
+application/vnd.hp-PCL
+application/vnd.hp-PCLXL
+application/vnd.hp-hpid
+application/vnd.hp-hps
+application/vnd.httphone
+application/vnd.hzn-3d-crossword
+application/vnd.ibm.afplinedata
+application/vnd.ibm.MiniPay
+application/vnd.ibm.modcap
+application/vnd.informix-visionary
+application/vnd.intercon.formnet
+application/vnd.intertrust.digibox
+application/vnd.intertrust.nncp
+application/vnd.intu.qbo
+application/vnd.intu.qfx
+application/vnd.irepository.package+xml
+application/vnd.is-xpr
+application/vnd.japannet-directory-service
+application/vnd.japannet-jpnstore-wakeup
+application/vnd.japannet-payment-wakeup
+application/vnd.japannet-registration
+application/vnd.japannet-registration-wakeup
+application/vnd.japannet-setstore-wakeup
+application/vnd.japannet-verification
+application/vnd.japannet-verification-wakeup
+application/vnd.koan
+application/vnd.lotus-1-2-3
+application/vnd.lotus-approach
+application/vnd.lotus-freelance
+application/vnd.lotus-notes
+application/vnd.lotus-organizer
+application/vnd.lotus-screencam
+application/vnd.lotus-wordpro
+application/vnd.mcd
+application/vnd.mediastation.cdkey
+application/vnd.meridian-slingshot
+application/vnd.mif mif
+application/vnd.minisoft-hp3000-save
+application/vnd.mitsubishi.misty-guard.trustweb
+application/vnd.mobius.daf
+application/vnd.mobius.dis
+application/vnd.mobius.msl
+application/vnd.mobius.plc
+application/vnd.mobius.txf
+application/vnd.motorola.flexsuite
+application/vnd.motorola.flexsuite.adsi
+application/vnd.motorola.flexsuite.fis
+application/vnd.motorola.flexsuite.gotap
+application/vnd.motorola.flexsuite.kmr
+application/vnd.motorola.flexsuite.ttc
+application/vnd.motorola.flexsuite.wem
+application/vnd.mozilla.xul+xml
+application/vnd.ms-artgalry
+application/vnd.ms-asf
+application/vnd.ms-excel xls
+application/vnd.ms-lrm
+application/vnd.ms-powerpoint ppt
+application/vnd.ms-project
+application/vnd.ms-tnef
+application/vnd.ms-works
+application/vnd.mseq
+application/vnd.msign
+application/vnd.music-niff
+application/vnd.musician
+application/vnd.netfpx
+application/vnd.noblenet-directory
+application/vnd.noblenet-sealer
+application/vnd.noblenet-web
+application/vnd.novadigm.EDM
+application/vnd.novadigm.EDX
+application/vnd.novadigm.EXT
+application/vnd.osa.netdeploy
+application/vnd.palm
+application/vnd.pg.format
+application/vnd.pg.osasli
+application/vnd.powerbuilder6
+application/vnd.powerbuilder6-s
+application/vnd.powerbuilder7
+application/vnd.powerbuilder7-s
+application/vnd.powerbuilder75
+application/vnd.powerbuilder75-s
+application/vnd.previewsystems.box
+application/vnd.publishare-delta-tree
+application/vnd.pvi.ptid1
+application/vnd.pwg-xhtml-print+xml
+application/vnd.rapid
+application/vnd.s3sms
+application/vnd.seemail
+application/vnd.shana.informed.formdata
+application/vnd.shana.informed.formtemplate
+application/vnd.shana.informed.interchange
+application/vnd.shana.informed.package
+application/vnd.sss-cod
+application/vnd.sss-dtf
+application/vnd.sss-ntf
+application/vnd.street-stream
+application/vnd.svd
+application/vnd.swiftview-ics
+application/vnd.triscape.mxs
+application/vnd.trueapp
+application/vnd.truedoc
+application/vnd.tve-trigger
+application/vnd.ufdl
+application/vnd.uplanet.alert
+application/vnd.uplanet.alert-wbxml
+application/vnd.uplanet.bearer-choice-wbxml
+application/vnd.uplanet.bearer-choice
+application/vnd.uplanet.cacheop
+application/vnd.uplanet.cacheop-wbxml
+application/vnd.uplanet.channel
+application/vnd.uplanet.channel-wbxml
+application/vnd.uplanet.list
+application/vnd.uplanet.list-wbxml
+application/vnd.uplanet.listcmd
+application/vnd.uplanet.listcmd-wbxml
+application/vnd.uplanet.signal
+application/vnd.vcx
+application/vnd.vectorworks
+application/vnd.vidsoft.vidconference
+application/vnd.visio
+application/vnd.vividence.scriptfile
+application/vnd.wap.sic
+application/vnd.wap.slc
+application/vnd.wap.wbxml wbxml
+application/vnd.wap.wmlc wmlc
+application/vnd.wap.wmlscriptc wmlsc
+application/vnd.webturbo
+application/vnd.wrq-hp3000-labelled
+application/vnd.wt.stf
+application/vnd.xara
+application/vnd.xfdl
+application/vnd.yellowriver-custom-menu
+application/whoispp-query
+application/whoispp-response
+application/wita
+application/wordperfect5.1
+application/x-bcpio bcpio
+application/x-cdlink vcd
+application/x-chess-pgn pgn
+application/x-compress
+application/x-cpio cpio
+application/x-csh csh
+application/x-director dcr dir dxr
+application/x-dvi dvi
+application/x-futuresplash spl
+application/x-gtar gtar
+application/x-gzip
+application/x-hdf hdf
+application/x-javascript js
+application/x-koan skp skd skt skm
+application/x-latex latex
+application/x-netcdf nc cdf
+application/x-sh sh
+application/x-shar shar
+application/x-shockwave-flash swf
+application/x-stuffit sit
+application/x-sv4cpio sv4cpio
+application/x-sv4crc sv4crc
+application/x-tar tar
+application/x-tcl tcl
+application/x-tex tex
+application/x-texinfo texinfo texi
+application/x-troff t tr roff
+application/x-troff-man man
+application/x-troff-me me
+application/x-troff-ms ms
+application/x-ustar ustar
+application/x-wais-source src
+application/x400-bp
+application/xhtml+xml xhtml xht
+application/xml
+application/xml-dtd
+application/xml-external-parsed-entity
+application/zip zip
+audio/32kadpcm
+audio/basic au snd
+audio/g.722.1
+audio/l16
+audio/midi mid midi kar
+audio/mp4a-latm
+audio/mpa-robust
+audio/mpeg mpga mp2 mp3
+audio/parityfec
+audio/prs.sid
+audio/telephone-event
+audio/tone
+audio/vnd.cisco.nse
+audio/vnd.cns.anp1
+audio/vnd.cns.inf1
+audio/vnd.digital-winds
+audio/vnd.everad.plj
+audio/vnd.lucent.voice
+audio/vnd.nortel.vbk
+audio/vnd.nuera.ecelp4800
+audio/vnd.nuera.ecelp7470
+audio/vnd.nuera.ecelp9600
+audio/vnd.octel.sbc
+audio/vnd.qcelp
+audio/vnd.rhetorex.32kadpcm
+audio/vnd.vmx.cvsd
+audio/x-aiff aif aiff aifc
+audio/x-mpegurl m3u
+audio/x-pn-realaudio ram rm
+audio/x-pn-realaudio-plugin rpm
+audio/x-realaudio ra
+audio/x-wav wav
+chemical/x-pdb pdb
+chemical/x-xyz xyz
+image/bmp bmp
+image/cgm
+image/g3fax
+image/gif gif
+image/ief ief
+image/jpeg jpeg jpg jpe
+image/naplps
+image/png png
+image/prs.btif
+image/prs.pti
+image/tiff tiff tif
+image/vnd.cns.inf2
+image/vnd.djvu djvu djv
+image/vnd.dwg
+image/vnd.dxf
+image/vnd.fastbidsheet
+image/vnd.fpx
+image/vnd.fst
+image/vnd.fujixerox.edmics-mmr
+image/vnd.fujixerox.edmics-rlc
+image/vnd.mix
+image/vnd.net-fpx
+image/vnd.svf
+image/vnd.wap.wbmp wbmp
+image/vnd.xiff
+image/x-cmu-raster ras
+image/x-portable-anymap pnm
+image/x-portable-bitmap pbm
+image/x-portable-graymap pgm
+image/x-portable-pixmap ppm
+image/x-rgb rgb
+image/x-xbitmap xbm
+image/x-xpixmap xpm
+image/x-xwindowdump xwd
+message/delivery-status
+message/disposition-notification
+message/external-body
+message/http
+message/news
+message/partial
+message/rfc822
+message/s-http
+model/iges igs iges
+model/mesh msh mesh silo
+model/vnd.dwf
+model/vnd.flatland.3dml
+model/vnd.gdl
+model/vnd.gs-gdl
+model/vnd.gtw
+model/vnd.mts
+model/vnd.vtu
+model/vrml wrl vrml
+multipart/alternative
+multipart/appledouble
+multipart/byteranges
+multipart/digest
+multipart/encrypted
+multipart/form-data
+multipart/header-set
+multipart/mixed
+multipart/parallel
+multipart/related
+multipart/report
+multipart/signed
+multipart/voice-message
+text/calendar
+text/css css
+text/directory
+text/enriched
+text/html html htm
+text/parityfec
+text/plain asc txt
+text/prs.lines.tag
+text/rfc822-headers
+text/richtext rtx
+text/rtf rtf
+text/sgml sgml sgm
+text/tab-separated-values tsv
+text/t140
+text/uri-list
+text/vnd.DMClientScript
+text/vnd.IPTC.NITF
+text/vnd.IPTC.NewsML
+text/vnd.abc
+text/vnd.curl
+text/vnd.flatland.3dml
+text/vnd.fly
+text/vnd.fmi.flexstor
+text/vnd.in3d.3dml
+text/vnd.in3d.spot
+text/vnd.latex-z
+text/vnd.motorola.reflex
+text/vnd.ms-mediapackage
+text/vnd.wap.si
+text/vnd.wap.sl
+text/vnd.wap.wml wml
+text/vnd.wap.wmlscript wmls
+text/x-setext etx
+text/xml xml xsl
+text/xml-external-parsed-entity
+video/mp4v-es
+video/mpeg mpeg mpg mpe
+video/parityfec
+video/pointer
+video/quicktime qt mov
+video/vnd.fvt
+video/vnd.motorola.video
+video/vnd.motorola.videop
+video/vnd.mpegurl mxu
+video/vnd.mts
+video/vnd.nokia.interleaved-multimedia
+video/vnd.vivo
+video/x-msvideo avi
+video/x-sgi-movie movie
+x-conference/x-cooltalk ice
diff --git a/mail/claws-mail/patches/patch-ab b/mail/claws-mail/patches/patch-ab
new file mode 100644
index 00000000000..fc1c49abaef
--- /dev/null
+++ b/mail/claws-mail/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/08/03 02:34:37 smb Exp $
+
+--- po/Makefile.in.in.orig 2006-08-28 02:07:05.000000000 -0500
++++ po/Makefile.in.in 2006-10-11 09:52:32.000000000 -0500
+@@ -30,7 +30,7 @@
+
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-mkinstalldirs = $(SHELL) @install_sh@ -d
++mkinstalldirs = @install_sh@ -d
+ mkdir_p = @mkdir_p@
+
+ GMSGFMT_ = @GMSGFMT@
diff --git a/mail/claws-mail/patches/patch-ac b/mail/claws-mail/patches/patch-ac
new file mode 100644
index 00000000000..b28e6584448
--- /dev/null
+++ b/mail/claws-mail/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.1 2007/08/03 02:34:37 smb Exp $
+
+--- src/prefs_common.h.orig 2007-08-01 18:42:50.000000000 -0400
++++ src/prefs_common.h 2007-08-01 18:43:04.000000000 -0400
+@@ -313,7 +313,6 @@
+
+ GList *mime_open_cmd_history;
+
+-#if USE_GPGME
+ /* Privacy */
+ gboolean auto_check_signatures;
+ gboolean gpg_signature_popup;
+@@ -321,7 +320,6 @@
+ gint store_passphrase_timeout;
+ gboolean passphrase_grab;
+ gboolean gpg_warning;
+-#endif /* USE_GPGME */
+
+ /* Addressbook */
+ gboolean addressbook_use_editaddress_dialog;
diff --git a/mail/claws-mail/patches/patch-ad b/mail/claws-mail/patches/patch-ad
new file mode 100644
index 00000000000..f01946de508
--- /dev/null
+++ b/mail/claws-mail/patches/patch-ad
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.1 2007/08/03 02:34:38 smb Exp $
+
+--- src/toolbar.c.orig 2007-08-02 04:10:24.000000000 -0400
++++ src/toolbar.c 2007-08-02 04:10:58.000000000 -0400
+@@ -427,9 +427,7 @@
+ { A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD, _("Forward") },
+ { A_SEPARATOR, 0, ("") },
+ { A_TRASH, STOCK_PIXMAP_TRASH, _("Trash") },
+-#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
+ { A_LEARN_SPAM, STOCK_PIXMAP_SPAM_BTN, _("Spam") },
+-#endif
+ { A_SEPARATOR, 0, ("") },
+ { A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
+ };
+@@ -525,9 +523,7 @@
+ { A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD, _("Forward") },
+ { A_SEPARATOR, 0, ("") },
+ { A_TRASH, STOCK_PIXMAP_TRASH, _("Trash") },
+-#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
+ { A_LEARN_SPAM, STOCK_PIXMAP_SPAM_BTN, _("Spam") },
+-#endif
+ { A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
+ #ifdef MAEMO
+ ,
diff --git a/mail/claws-mail/plugins.mk b/mail/claws-mail/plugins.mk
new file mode 100644
index 00000000000..361597e8651
--- /dev/null
+++ b/mail/claws-mail/plugins.mk
@@ -0,0 +1,21 @@
+# $NetBSD: plugins.mk,v 1.1 2007/08/03 02:34:41 smb Exp $
+#
+
+.include "../../mail/claws-mail/Makefile.common"
+
+PKGNAME= claws-mail-${PLUGIN_NAME:S/_/-/}-${CLAWS_VERSION}
+
+CONFIGURE_DIRS= .
+BUILD_DIRS= src/plugins/${PLUGIN_NAME}
+INSTALL_DIRS= src/plugins/${PLUGIN_NAME}
+
+DEPENDS+= claws-mail>=${CLAWS_VERSION}:../../mail/claws-mail
+
+LIBTOOL_OVERRIDE= ../../../libtool
+
+#.include "../../mail/claws-mail/options.mk"
+
+PLIST_SRC= ${.CURDIR}/../../mail/claws-mail/PLIST.plugins
+PLIST_SUBST+= PLUGIN_NAME=${PLUGIN_NAME:Q}
+
+MESSAGE_SRC+= ${.CURDIR}/../../mail/claws-mail/MESSAGE.plugins