6 files changed, 310 insertions, 318 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 4c95b4a52cb5..aa4c01b00b02 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -39,6 +39,7 @@
     SUBDIR += cclient
     SUBDIR += chk4mail
     SUBDIR += clamfilter
+    SUBDIR += claws-mail
     SUBDIR += cmail
     SUBDIR += cone
     SUBDIR += contact-lookup-applet
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 8207ca531270..6d63b15464c7 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,12 +1,12 @@
-# New ports collection makefile for:	sylpheed-claws
+# New ports collection makefile for:	claws-mail
 # Date created:		3 January 2002
 # Whom:			Simon 'corecode' Schubert <corecode@corecode.ath.cx>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	sylpheed-claws
-PORTVERSION=	2.6.0
+PORTNAME=	claws-mail
+PORTVERSION=	2.6.1
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -33,8 +33,9 @@ USE_GNOME=	gnomehack pkgconfig gtk20
 GNU_CONFIGURE=	yes
 USE_GCC=	3.3+
 WANT_GNOME=	yes
+INSTALLS_ICONS=	yes
 
-MAN1=		sylpheed-claws.1
+MAN1=		claws-mail.1
 
 CONFIGURE_ARGS=	\
 		--with-libiconv-prefix=${LOCALBASE} \
@@ -176,11 +177,10 @@ post-patch:
 		${WRKSRC}/tools/README.sylprint ${WRKSRC}/tools/sylprint.pl
 	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g ; s|/usr/share|${LOCALBASE}/share|g' \
 		${WRKSRC}/src/procmime.c
-	@${REINPLACE_CMD} -e "s|po intl src|po src| ; s:@SYLPHEED_GNOME:#@SYLPHEED_GNOME:g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|po intl src|po src| ; s:@CLAWS_GNOME2:#@CLAWS_GNOME2:g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s:-Wno-unused-function::" ${WRKSRC}/src/Makefile.in
 	@for f in `${FIND} ${WRKSRC}/tools -type f -print`; do \
 		${REINPLACE_CMD} -e "s|/usr/bin/perl|${PERL}|" $$f; done
-#	@${LN} -s ${WRKSRC}/po/sylpheed.pot ${WRKSRC}/po/${PORTNAME}.pot
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's|src manual faq tools|src tools|' ${WRKSRC}/Makefile.in
 .endif
@@ -194,16 +194,16 @@ post-install:
 .endif
 	@${MKDIR} ${DATADIR}
 	@cd ${WRKSRC}/tools && \
-		${INSTALL_SCRIPT} OOo2sylpheed.pl acroread2sylpheed.pl \
+		${INSTALL_SCRIPT} OOo2claws-mail.pl acroread2claws-mail.pl \
 		calypso_convert.pl convert_mbox.pl eud2gc.py filter_conv.pl \
 		freshmeat_search.pl gif2xface.pl google_msgid.pl \
-		google_search.pl kmail2sylpheed.pl \
-		kmail2sylpheed_v2.pl maildir2sylpheed.pl multiwebsearch.conf \
-		multiwebsearch.pl nautilus2sylpheed.sh outlook2sylpheed.pl \
-		tb2sylpheed textviewer.sh update-po uudec vcard2xml.py \
+		google_search.pl kmail2claws-mail.pl kmail2claws-mail_v2.pl \
+		maildir2claws-mail.pl multiwebsearch.conf multiwebsearch.pl \
+		nautilus2claws-mail.sh outlook2claws-mail.pl tb2claws-mail \
+		textviewer.sh update-po uudec vcard2xml.py \
 		${DATADIR}
 	@${MKDIR} ${PREFIX}/share/applications
-	@${INSTALL_DATA} ${WRKSRC}/sylpheed-claws.desktop ${PREFIX}/share/applications/
+	@${INSTALL_DATA} ${WRKSRC}/claws-mail.desktop ${PREFIX}/share/applications/
 .if !defined(WITHOUT_THEMES)
 	@${MKDIR} ${DATADIR}/themes
 	@cd ${WRKDIR}/${THEMEFILE:C/.tar.gz//} && ${FIND} . -mindepth 2 -print | \
@@ -215,6 +215,6 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/sylprint.pl ${PREFIX}/bin
 	@${INSTALL_DATA} ${WRKSRC}/tools/sylprint.rc ${PREFIX}/etc/sylprint.rc.example
 	@${MKDIR} ${PREFIX}/share/pixmaps
-	@${INSTALL_DATA} ${WRKSRC}/sylpheed-claws*.png ${PREFIX}/share/pixmaps/
+	@${INSTALL_DATA} ${WRKSRC}/claws-mail*.png ${PREFIX}/share/pixmaps/
 
 .include <bsd.port.post.mk>
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index f8392b963fd1..7e70d94aa0cb 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,6 +1,6 @@
-MD5 (sylpheed-claws-2.6.0.tar.bz2) = c16d658bd7d48bbecc2574e70b95c560
-SHA256 (sylpheed-claws-2.6.0.tar.bz2) = 17aa56bd382d3ffb7ad2e76174a3a43b832a815a23b6b993d864e2e133cdc1c7
-SIZE (sylpheed-claws-2.6.0.tar.bz2) = 5098855
+MD5 (claws-mail-2.6.1.tar.bz2) = 98099550a68a08eca5354659f3ea465c
+SHA256 (claws-mail-2.6.1.tar.bz2) = 7edb2d58dbd0a5842dde7cbb2be10f5f70888f3e6f3b4fcb052e909c7eebda88
+SIZE (claws-mail-2.6.1.tar.bz2) = 5080311
 MD5 (sylpheed-claws-themes-20060615.tar.gz) = 8cf1f94353be228d192d843e89557f42
 SHA256 (sylpheed-claws-themes-20060615.tar.gz) = f34bfb8f53ef4b22e25055c588b19b3bc107b1a3dcf28faab409359b788444d7
 SIZE (sylpheed-claws-themes-20060615.tar.gz) = 1716505
diff --git a/mail/claws-mail/files/patch-doc-man-Makefile.in b/mail/claws-mail/files/patch-doc-man-Makefile.in
deleted file mode 100644
index 40953fde2124..000000000000
--- a/mail/claws-mail/files/patch-doc-man-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- doc/man/Makefile.in.orig	Sat Nov  5 12:14:20 2005
-+++ doc/man/Makefile.in	Sat Nov  5 12:15:52 2005
-@@ -329,6 +329,7 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+	  inst=`echo $$inst | sed -e 's:sylpheed\.1:sylpheed-claws.1:'`; \
- 	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
- 	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
diff --git a/mail/claws-mail/files/patch-tools-README.sylprint b/mail/claws-mail/files/patch-tools-README.sylprint
index 1085b058553b..57c402c75d18 100644
--- a/mail/claws-mail/files/patch-tools-README.sylprint
+++ b/mail/claws-mail/files/patch-tools-README.sylprint
@@ -10,9 +10,9 @@
  		Stores user default preferred configuration for the
  		script. Settings in this file may be overriden by
 -		command line options. Must be stored in the same
--		directory of the script and/or in the ~/.sylpheed-claws
+-		directory of the script and/or in the ~/.claws-mail
 +		command line options. Must be stored in the local
-+		configuration directory and/or in the ~/.sylpheed-claws
++		configuration directory and/or in the ~/.claws-mailĂ
  		one (Sylpheed user's configuration directory).
  	
  	/tmp/sylprint.username.number
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index 4288549a6574..c8b4566d7099 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -1,285 +1,286 @@
-bin/sylpheed-claws
+bin/claws-mail
 bin/sylprint.pl
 etc/sylprint.rc.example
-include/sylpheed-claws/account.h
-include/sylpheed-claws/action.h
-include/sylpheed-claws/adbookbase.h
-include/sylpheed-claws/addr_compl.h
-include/sylpheed-claws/addrbook.h
-include/sylpheed-claws/addrcache.h
-include/sylpheed-claws/addrclip.h
-include/sylpheed-claws/addrdefs.h
-include/sylpheed-claws/addressadd.h
-include/sylpheed-claws/addressbook.h
-include/sylpheed-claws/addressbook_foldersel.h
-include/sylpheed-claws/addressitem.h
-include/sylpheed-claws/addrgather.h
-include/sylpheed-claws/addrharvest.h
-include/sylpheed-claws/addrindex.h
-include/sylpheed-claws/addritem.h
-include/sylpheed-claws/addrquery.h
-include/sylpheed-claws/addrselect.h
-include/sylpheed-claws/alertpanel.h
-include/sylpheed-claws/browseldap.h
-include/sylpheed-claws/codeconv.h
-include/sylpheed-claws/common/base64.h
-include/sylpheed-claws/common/defs.h
-include/sylpheed-claws/common/hooks.h
-include/sylpheed-claws/common/log.h
-include/sylpheed-claws/common/md5.h
-include/sylpheed-claws/common/mgutils.h
-include/sylpheed-claws/common/nntp.h
-include/sylpheed-claws/common/passcrypt.h
-include/sylpheed-claws/common/plugin.h
-include/sylpheed-claws/common/prefs.h
-include/sylpheed-claws/common/progressindicator.h
-include/sylpheed-claws/common/quoted-printable.h
-include/sylpheed-claws/common/session.h
-include/sylpheed-claws/common/smtp.h
-include/sylpheed-claws/common/socket.h
-include/sylpheed-claws/common/ssl.h
-include/sylpheed-claws/common/ssl_certificate.h
-include/sylpheed-claws/common/string_match.h
-include/sylpheed-claws/common/stringtable.h
-include/sylpheed-claws/common/sylpheed.h
-include/sylpheed-claws/common/template.h
-include/sylpheed-claws/common/timing.h
-include/sylpheed-claws/common/utils.h
-include/sylpheed-claws/common/uuencode.h
-include/sylpheed-claws/common/version.h
-include/sylpheed-claws/common/xml.h
-include/sylpheed-claws/common/xmlprops.h
-include/sylpheed-claws/compose.h
-include/sylpheed-claws/config.h
-include/sylpheed-claws/crash.h
-include/sylpheed-claws/customheader.h
-include/sylpheed-claws/displayheader.h
-include/sylpheed-claws/editaddress.h
-include/sylpheed-claws/editbook.h
-include/sylpheed-claws/editgroup.h
-include/sylpheed-claws/editjpilot.h
-include/sylpheed-claws/editldap.h
-include/sylpheed-claws/editldap_basedn.h
-include/sylpheed-claws/editvcard.h
-include/sylpheed-claws/enriched.h
-include/sylpheed-claws/etpan/etpan-errors.h
-include/sylpheed-claws/etpan/etpan-log.h
-include/sylpheed-claws/etpan/etpan-thread-manager-types.h
-include/sylpheed-claws/etpan/etpan-thread-manager.h
-include/sylpheed-claws/etpan/imap-thread.h
-include/sylpheed-claws/exphtmldlg.h
-include/sylpheed-claws/expldifdlg.h
-include/sylpheed-claws/export.h
-include/sylpheed-claws/exporthtml.h
-include/sylpheed-claws/exportldif.h
-include/sylpheed-claws/filtering.h
-include/sylpheed-claws/folder.h
-include/sylpheed-claws/folder_item_prefs.h
-include/sylpheed-claws/foldersel.h
-include/sylpheed-claws/folderutils.h
-include/sylpheed-claws/folderview.h
-include/sylpheed-claws/gedit-print.h
-include/sylpheed-claws/grouplistdialog.h
-include/sylpheed-claws/gtk/about.h
-include/sylpheed-claws/gtk/colorlabel.h
-include/sylpheed-claws/gtk/colorsel.h
-include/sylpheed-claws/gtk/combobox.h
-include/sylpheed-claws/gtk/description_window.h
-include/sylpheed-claws/gtk/filesel.h
-include/sylpheed-claws/gtk/foldersort.h
-include/sylpheed-claws/gtk/gtkaspell.h
-include/sylpheed-claws/gtk/gtksctree.h
-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
-include/sylpheed-claws/gtk/menu.h
-include/sylpheed-claws/gtk/pluginwindow.h
-include/sylpheed-claws/gtk/prefswindow.h
-include/sylpheed-claws/gtk/progressdialog.h
-include/sylpheed-claws/gtk/quicksearch.h
-include/sylpheed-claws/gtk/sslcertwindow.h
-include/sylpheed-claws/gtk/sylpheed-marshal.h
-include/sylpheed-claws/headerview.h
-include/sylpheed-claws/html.h
-include/sylpheed-claws/image_viewer.h
-include/sylpheed-claws/imap.h
-include/sylpheed-claws/imap_gtk.h
-include/sylpheed-claws/import.h
-include/sylpheed-claws/importldif.h
-include/sylpheed-claws/importmutt.h
-include/sylpheed-claws/importpine.h
-include/sylpheed-claws/inc.h
-include/sylpheed-claws/jpilot.h
-include/sylpheed-claws/ldapctrl.h
-include/sylpheed-claws/ldaplocate.h
-include/sylpheed-claws/ldapquery.h
-include/sylpheed-claws/ldapserver.h
-include/sylpheed-claws/ldaputil.h
-include/sylpheed-claws/ldif.h
-include/sylpheed-claws/localfolder.h
-include/sylpheed-claws/main.h
-include/sylpheed-claws/mainwindow.h
-include/sylpheed-claws/manual.h
-include/sylpheed-claws/matcher.h
-include/sylpheed-claws/matcher_parser.h
-include/sylpheed-claws/matcher_parser_lex.h
-include/sylpheed-claws/matcher_parser_parse.h
-include/sylpheed-claws/mbox.h
-include/sylpheed-claws/message_search.h
-include/sylpheed-claws/messageview.h
-include/sylpheed-claws/mh.h
-include/sylpheed-claws/mh_gtk.h
-include/sylpheed-claws/mimeview.h
-include/sylpheed-claws/msgcache.h
-include/sylpheed-claws/mutt.h
-include/sylpheed-claws/news.h
-include/sylpheed-claws/news_gtk.h
-include/sylpheed-claws/noticeview.h
-include/sylpheed-claws/partial_download.h
-include/sylpheed-claws/pine.h
-%%GPGME%%include/sylpheed-claws/plugins/pgpcore/passphrase.h
-%%GPGME%%include/sylpheed-claws/plugins/pgpcore/pgp_viewer.h
-%%GPGME%%include/sylpheed-claws/plugins/pgpcore/prefs_gpg.h
-%%GPGME%%include/sylpheed-claws/plugins/pgpcore/select-keys.h
-%%GPGME%%include/sylpheed-claws/plugins/pgpcore/sgpgme.h
-%%GPGME%%include/sylpheed-claws/plugins/pgpinline/pgpinline.h
-%%GPGME%%include/sylpheed-claws/plugins/pgpmime/pgpmime.h
-include/sylpheed-claws/pop.h
-include/sylpheed-claws/prefs_account.h
-include/sylpheed-claws/prefs_actions.h
-include/sylpheed-claws/prefs_common.h
-include/sylpheed-claws/prefs_compose_writing.h
-include/sylpheed-claws/prefs_customheader.h
-include/sylpheed-claws/prefs_display_header.h
-include/sylpheed-claws/prefs_ext_prog.h
-include/sylpheed-claws/prefs_filtering.h
-include/sylpheed-claws/prefs_filtering_action.h
-include/sylpheed-claws/prefs_folder_column.h
-include/sylpheed-claws/prefs_folder_item.h
-include/sylpheed-claws/prefs_fonts.h
-include/sylpheed-claws/prefs_gtk.h
-include/sylpheed-claws/prefs_image_viewer.h
-include/sylpheed-claws/prefs_matcher.h
-include/sylpheed-claws/prefs_message.h
-include/sylpheed-claws/prefs_msg_colors.h
-include/sylpheed-claws/prefs_other.h
-include/sylpheed-claws/prefs_quote.h
-include/sylpheed-claws/prefs_receive.h
-include/sylpheed-claws/prefs_send.h
-include/sylpheed-claws/prefs_spelling.h
-include/sylpheed-claws/prefs_summaries.h
-include/sylpheed-claws/prefs_summary_column.h
-include/sylpheed-claws/prefs_template.h
-include/sylpheed-claws/prefs_themes.h
-include/sylpheed-claws/prefs_toolbar.h
-include/sylpheed-claws/prefs_wrapping.h
-include/sylpheed-claws/privacy.h
-include/sylpheed-claws/procheader.h
-include/sylpheed-claws/procmime.h
-include/sylpheed-claws/procmsg.h
-include/sylpheed-claws/quote_fmt.h
-include/sylpheed-claws/quote_fmt_lex.h
-include/sylpheed-claws/quote_fmt_parse.h
-include/sylpheed-claws/recv.h
-include/sylpheed-claws/remotefolder.h
-include/sylpheed-claws/send_message.h
-include/sylpheed-claws/setup.h
-include/sylpheed-claws/sourcewindow.h
-include/sylpheed-claws/ssl_manager.h
-include/sylpheed-claws/statusbar.h
-include/sylpheed-claws/stock_pixmap.h
-include/sylpheed-claws/summary_search.h
-include/sylpheed-claws/summaryview.h
-include/sylpheed-claws/textview.h
-include/sylpheed-claws/toolbar.h
-include/sylpheed-claws/undo.h
-include/sylpheed-claws/unmime.h
-include/sylpheed-claws/vcard.h
-include/sylpheed-claws/wizard.h
-lib/sylpheed-claws/plugins/bogofilter.a
-lib/sylpheed-claws/plugins/bogofilter.la
-lib/sylpheed-claws/plugins/bogofilter.so
-%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.a
-%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.la
-%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so
-%%DILLO%%lib/sylpheed-claws/plugins/dillo_viewer.a
-%%DILLO%%lib/sylpheed-claws/plugins/dillo_viewer.la
-%%DILLO%%lib/sylpheed-claws/plugins/dillo_viewer.so
-%%GPGME%%lib/sylpheed-claws/plugins/pgpcore.a
-%%GPGME%%lib/sylpheed-claws/plugins/pgpcore.la
-%%GPGME%%lib/sylpheed-claws/plugins/pgpcore.so
-%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.a
-%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.deps
-%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.la
-%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.so
-%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.a
-%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.deps
-%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.la
-%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.so
-%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.a
-%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.la
-%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.so
-lib/sylpheed-claws/plugins/trayicon.a
-lib/sylpheed-claws/plugins/trayicon.la
-lib/sylpheed-claws/plugins/trayicon.so
-libdata/pkgconfig/sylpheed-claws.pc
-share/applications/sylpheed-claws.desktop
+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/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/claws.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/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-log.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/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/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/gtk/claws-marshal.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/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
+%%GPGME%%include/claws-mail/plugins/pgpcore/passphrase.h
+%%GPGME%%include/claws-mail/plugins/pgpcore/pgp_viewer.h
+%%GPGME%%include/claws-mail/plugins/pgpcore/prefs_gpg.h
+%%GPGME%%include/claws-mail/plugins/pgpcore/select-keys.h
+%%GPGME%%include/claws-mail/plugins/pgpcore/sgpgme.h
+%%GPGME%%include/claws-mail/plugins/pgpinline/pgpinline.h
+%%GPGME%%include/claws-mail/plugins/pgpmime/pgpmime.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_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_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/vcard.h
+include/claws-mail/wizard.h
+lib/claws-mail/plugins/bogofilter.a
+lib/claws-mail/plugins/bogofilter.la
+lib/claws-mail/plugins/bogofilter.so
+%%CLAM_PLUG%%lib/claws-mail/plugins/clamav_plugin.a
+%%CLAM_PLUG%%lib/claws-mail/plugins/clamav_plugin.la
+%%CLAM_PLUG%%lib/claws-mail/plugins/clamav_plugin.so
+%%DILLO%%lib/claws-mail/plugins/dillo_viewer.a
+%%DILLO%%lib/claws-mail/plugins/dillo_viewer.la
+%%DILLO%%lib/claws-mail/plugins/dillo_viewer.so
+%%GPGME%%lib/claws-mail/plugins/pgpcore.a
+%%GPGME%%lib/claws-mail/plugins/pgpcore.la
+%%GPGME%%lib/claws-mail/plugins/pgpcore.so
+%%GPGME%%lib/claws-mail/plugins/pgpinline.a
+%%GPGME%%lib/claws-mail/plugins/pgpinline.deps
+%%GPGME%%lib/claws-mail/plugins/pgpinline.la
+%%GPGME%%lib/claws-mail/plugins/pgpinline.so
+%%GPGME%%lib/claws-mail/plugins/pgpmime.a
+%%GPGME%%lib/claws-mail/plugins/pgpmime.deps
+%%GPGME%%lib/claws-mail/plugins/pgpmime.la
+%%GPGME%%lib/claws-mail/plugins/pgpmime.so
+%%SA_PLUG%%lib/claws-mail/plugins/spamassassin.a
+%%SA_PLUG%%lib/claws-mail/plugins/spamassassin.la
+%%SA_PLUG%%lib/claws-mail/plugins/spamassassin.so
+lib/claws-mail/plugins/trayicon.a
+lib/claws-mail/plugins/trayicon.la
+lib/claws-mail/plugins/trayicon.so
+libdata/pkgconfig/claws-mail.pc
+share/applications/claws-mail.desktop
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.sylprint
 %%PORTDOCS%%%%DOCSDIR%%/README.tools
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-claws-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-claws-manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-claws-manual.ps
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-claws-manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-claws-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-claws-manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-claws-manual.ps
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-claws-manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/pl/sylpheed-claws-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/pl/sylpheed-claws-manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/pl/sylpheed-claws-manual.ps
-%%PORTDOCS%%%%DOCSDIR%%/manual/pl/sylpheed-claws-manual.txt
-share/locale/bg/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ca/LC_MESSAGES/sylpheed-claws.mo
-share/locale/cs/LC_MESSAGES/sylpheed-claws.mo
-share/locale/de/LC_MESSAGES/sylpheed-claws.mo
-share/locale/el/LC_MESSAGES/sylpheed-claws.mo
-share/locale/en_GB/LC_MESSAGES/sylpheed-claws.mo
-share/locale/es/LC_MESSAGES/sylpheed-claws.mo
-share/locale/fi/LC_MESSAGES/sylpheed-claws.mo
-share/locale/fr/LC_MESSAGES/sylpheed-claws.mo
-share/locale/hr/LC_MESSAGES/sylpheed-claws.mo
-share/locale/hu/LC_MESSAGES/sylpheed-claws.mo
-share/locale/it/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ja/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ko/LC_MESSAGES/sylpheed-claws.mo
-share/locale/nb/LC_MESSAGES/sylpheed-claws.mo
-share/locale/nl/LC_MESSAGES/sylpheed-claws.mo
-share/locale/pl/LC_MESSAGES/sylpheed-claws.mo
-share/locale/pt_BR/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ru/LC_MESSAGES/sylpheed-claws.mo
-share/locale/sk/LC_MESSAGES/sylpheed-claws.mo
-share/locale/sr/LC_MESSAGES/sylpheed-claws.mo
-share/locale/sv/LC_MESSAGES/sylpheed-claws.mo
-share/locale/zh_CN/LC_MESSAGES/sylpheed-claws.mo
-share/locale/zh_TW/LC_MESSAGES/sylpheed-claws.mo
-share/pixmaps/sylpheed-claws-128x128.png
-share/pixmaps/sylpheed-claws-64x64.png
-share/pixmaps/sylpheed-claws.png
-%%DATADIR%%/OOo2sylpheed.pl
-%%DATADIR%%/acroread2sylpheed.pl
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/claws-mail-manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/claws-mail-manual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/claws-mail-manual.ps
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/claws-mail-manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual/es/claws-mail-manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/es/claws-mail-manual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual/es/claws-mail-manual.ps
+%%PORTDOCS%%%%DOCSDIR%%/manual/es/claws-mail-manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual/fr/claws-mail-manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/fr/claws-mail-manual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual/fr/claws-mail-manual.ps
+%%PORTDOCS%%%%DOCSDIR%%/manual/fr/claws-mail-manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual/pl/claws-mail-manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/pl/claws-mail-manual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual/pl/claws-mail-manual.ps
+%%PORTDOCS%%%%DOCSDIR%%/manual/pl/claws-mail-manual.txt
+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
+share/pixmaps/claws-mail-128x128.png
+share/pixmaps/claws-mail-64x64.png
+share/pixmaps/claws-mail.png
+%%DATADIR%%/OOo2claws-mail.pl
+%%DATADIR%%/acroread2claws-mail.pl
 %%DATADIR%%/calypso_convert.pl
 %%DATADIR%%/convert_mbox.pl
 %%DATADIR%%/eud2gc.py
@@ -288,14 +289,14 @@ share/pixmaps/sylpheed-claws.png
 %%DATADIR%%/gif2xface.pl
 %%DATADIR%%/google_msgid.pl
 %%DATADIR%%/google_search.pl
-%%DATADIR%%/kmail2sylpheed.pl
-%%DATADIR%%/kmail2sylpheed_v2.pl
-%%DATADIR%%/maildir2sylpheed.pl
+%%DATADIR%%/kmail2claws-mail.pl
+%%DATADIR%%/kmail2claws-mail_v2.pl
+%%DATADIR%%/maildir2claws-mail.pl
 %%DATADIR%%/multiwebsearch.conf
 %%DATADIR%%/multiwebsearch.pl
-%%DATADIR%%/nautilus2sylpheed.sh
-%%DATADIR%%/outlook2sylpheed.pl
-%%DATADIR%%/tb2sylpheed
+%%DATADIR%%/nautilus2claws-mail.sh
+%%DATADIR%%/outlook2claws-mail.pl
+%%DATADIR%%/tb2claws-mail
 %%DATADIR%%/textviewer.sh
 %%THEMES%%%%DATADIR%%/themes/Crystal/.sylpheed_themeinfo
 %%THEMES%%%%DATADIR%%/themes/Crystal/close.xpm
@@ -2535,13 +2536,13 @@ share/pixmaps/sylpheed-claws.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
-@dirrmtry lib/sylpheed-claws/plugins
-@dirrmtry lib/sylpheed-claws
-%%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpmime
-%%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpinline
-%%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpcore
-@dirrmtry include/sylpheed-claws/plugins
-@dirrm include/sylpheed-claws/gtk
-@dirrm include/sylpheed-claws/etpan
-@dirrm include/sylpheed-claws/common
-@dirrmtry include/sylpheed-claws
+@dirrmtry lib/claws-mail/plugins
+@dirrmtry lib/claws-mail
+%%GPGME%%@dirrm include/claws-mail/plugins/pgpmime
+%%GPGME%%@dirrm include/claws-mail/plugins/pgpinline
+%%GPGME%%@dirrm include/claws-mail/plugins/pgpcore
+@dirrmtry include/claws-mail/plugins
+@dirrm include/claws-mail/gtk
+@dirrm include/claws-mail/etpan
+@dirrm include/claws-mail/common
+@dirrmtry include/claws-mail