update to sylpheed-claws 0.9.12

This release of Sylpheed-Claws is based on version 0.9.12cvs1 of the
main Sylpheed branch.

Notes for this release:
~~~~~~~~~~~~~~~~~~~~~~~

* Previous users of the included plugins will need to reload them on
starting this version. The directory where they are stored has
changed.
They are now in $PREFIX/lib/sylpheed-claws/plugins
(previously: $PREFIX/lib/sylpheed/plugins)

New in this release:
~~~~~~~~~~~~~~~~~~~~

* A session timeout for POP3/SMTP has been implemented,
(synchronised from main Sylpheed)

* A paperclip icon is no longer displayed in the Status column for
mail that does not contain a real attachment (like HTML mail)

* the SSL certificate check has been re-enabled

* tools/nautilus2sylpheed.sh
the whitespace limitation in file names has been
fixed

* updated translations: French, German, Slovak, and Spanish.

* Bug fixes, including the following:
o bug 393 'Bad inerpretation of "Pop Before SMTP"'
o bug 396 'Zombie process when spamassassin is called'
o bug 503 'fix compilation with older OpenSSL'
o bug 511 'Folder-Renaming not reflected immediately'
o detect library providing 'encrypt' function

For further details of the numbered bugs listed above consult
http://www.thewildbeast.co.uk/sylpheed-claws/bugzilla/index.cgi

* and other code reorganisation, cleanups, and more.

5 files changed, 356 insertions, 355 deletions

diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 77fe1fdc847..d104f8b0152 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2004/06/02 07:56:19 adam Exp $
+# $NetBSD: Makefile,v 1.35 2004/07/18 09:56:47 recht Exp $
 #
 
 .include "Makefile.common"
 
-PKGNAME=	sylpheed-claws-${SYLPHEED_VERSION}
+#PKGNAME=	sylpheed-claws-${SYLPHEED_VERSION}
 
 MAINTAINER=	chris@NetBSD.org
 COMMENT=	X based e-mail and netnews client
@@ -56,7 +56,7 @@ CONF_FILES=	${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${FILESDIR}/mime.types ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/sylpheed*.png ${PREFIX}/share/sylpheed
+	${INSTALL_DATA} ${WRKSRC}/sylpheed*.png ${PREFIX}/share/sylpheed-claws
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../security/gpgme03/buildlink3.mk"
diff --git a/mail/sylpheed-claws/Makefile.common b/mail/sylpheed-claws/Makefile.common
index 3a07698ed63..9f649701e15 100644
--- a/mail/sylpheed-claws/Makefile.common
+++ b/mail/sylpheed-claws/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.7 2004/06/02 07:56:19 adam Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/07/18 09:56:47 recht Exp $
 #
 
-DISTNAME=	sylpheed-${SYLPHEED_VERSION}claws
+DISTNAME=	sylpheed-claws-${SYLPHEED_VERSION}
 CATEGORIES=	mail news x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,4 +21,4 @@ GNU_CONFIGURE=		YES
 # Force gnome detection off to avoid installing some extra files
 CONFIGURE_ENV+=		ac_cv_path_GNOME_CONFIG="no"
 
-SYLPHEED_VERSION=	0.9.11
+SYLPHEED_VERSION=	0.9.12
diff --git a/mail/sylpheed-claws/PLIST b/mail/sylpheed-claws/PLIST
index 0e4c8a6257c..ec617734ebe 100644
--- a/mail/sylpheed-claws/PLIST
+++ b/mail/sylpheed-claws/PLIST
@@ -1,346 +1,347 @@
-@comment $NetBSD: PLIST,v 1.13 2004/06/02 07:56:19 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2004/07/18 09:56:47 recht Exp $
 bin/sylpheed
-include/sylpheed/account.h
-include/sylpheed/action.h
-include/sylpheed/adbookbase.h
-include/sylpheed/addr_compl.h
-include/sylpheed/addrbook.h
-include/sylpheed/addrcache.h
-include/sylpheed/addrclip.h
-include/sylpheed/addrdefs.h
-include/sylpheed/addressadd.h
-include/sylpheed/addressbook.h
-include/sylpheed/addressitem.h
-include/sylpheed/addrgather.h
-include/sylpheed/addrharvest.h
-include/sylpheed/addrindex.h
-include/sylpheed/addritem.h
-include/sylpheed/addrquery.h
-include/sylpheed/addrselect.h
-include/sylpheed/alertpanel.h
-include/sylpheed/browseldap.h
-include/sylpheed/codeconv.h
-include/sylpheed/common/base64.h
-include/sylpheed/common/defs.h
-include/sylpheed/common/hooks.h
-include/sylpheed/common/intl.h
-include/sylpheed/common/log.h
-include/sylpheed/common/md5.h
-include/sylpheed/common/mgutils.h
-include/sylpheed/common/nntp.h
-include/sylpheed/common/passcrypt.h
-include/sylpheed/common/plugin.h
-include/sylpheed/common/prefs.h
-include/sylpheed/common/progressindicator.h
-include/sylpheed/common/quoted-printable.h
-include/sylpheed/common/session.h
-include/sylpheed/common/smtp.h
-include/sylpheed/common/socket.h
-include/sylpheed/common/ssl.h
-include/sylpheed/common/ssl_certificate.h
-include/sylpheed/common/string_match.h
-include/sylpheed/common/stringtable.h
-include/sylpheed/common/sylpheed.h
-include/sylpheed/common/template.h
-include/sylpheed/common/utils.h
-include/sylpheed/common/uuencode.h
-include/sylpheed/common/version.h
-include/sylpheed/common/xml.h
-include/sylpheed/common/xmlprops.h
-include/sylpheed/compose.h
-include/sylpheed/config.h
-include/sylpheed/crash.h
-include/sylpheed/customheader.h
-include/sylpheed/displayheader.h
-include/sylpheed/editaddress.h
-include/sylpheed/editbook.h
-include/sylpheed/editgroup.h
-include/sylpheed/editjpilot.h
-include/sylpheed/editldap.h
-include/sylpheed/editldap_basedn.h
-include/sylpheed/editvcard.h
-include/sylpheed/enriched.h
-include/sylpheed/exphtmldlg.h
-include/sylpheed/expldifdlg.h
-include/sylpheed/export.h
-include/sylpheed/exporthtml.h
-include/sylpheed/exportldif.h
-include/sylpheed/filtering.h
-include/sylpheed/folder.h
-include/sylpheed/folder_item_prefs.h
-include/sylpheed/foldersel.h
-include/sylpheed/folderutils.h
-include/sylpheed/folderview.h
-include/sylpheed/grouplistdialog.h
-include/sylpheed/gtk/about.h
-include/sylpheed/gtk/colorlabel.h
-include/sylpheed/gtk/colorsel.h
-include/sylpheed/gtk/description_window.h
-include/sylpheed/gtk/filesel.h
-include/sylpheed/gtk/foldersort.h
-include/sylpheed/gtk/gtkaspell.h
-include/sylpheed/gtk/gtksctree.h
-include/sylpheed/gtk/gtkshruler.h
-include/sylpheed/gtk/gtkstext.h
-include/sylpheed/gtk/gtkutils.h
-include/sylpheed/gtk/gtkvscrollbutton.h
-include/sylpheed/gtk/inputdialog.h
-include/sylpheed/gtk/logwindow.h
-include/sylpheed/gtk/manage_window.h
-include/sylpheed/gtk/menu.h
-include/sylpheed/gtk/pluginwindow.h
-include/sylpheed/gtk/prefswindow.h
-include/sylpheed/gtk/progressdialog.h
-include/sylpheed/gtk/sslcertwindow.h
-include/sylpheed/headerview.h
-include/sylpheed/html.h
-include/sylpheed/imap.h
-include/sylpheed/imap_gtk.h
-include/sylpheed/import.h
-include/sylpheed/importldif.h
-include/sylpheed/importmutt.h
-include/sylpheed/importpine.h
-include/sylpheed/inc.h
-include/sylpheed/jpilot.h
-include/sylpheed/ldapctrl.h
-include/sylpheed/ldaplocate.h
-include/sylpheed/ldapquery.h
-include/sylpheed/ldapserver.h
-include/sylpheed/ldaputil.h
-include/sylpheed/ldif.h
-include/sylpheed/localfolder.h
-include/sylpheed/main.h
-include/sylpheed/mainwindow.h
-include/sylpheed/manual.h
-include/sylpheed/matcher.h
-include/sylpheed/matcher_parser.h
-include/sylpheed/matcher_parser_lex.h
-include/sylpheed/matcher_parser_parse.h
-include/sylpheed/mbox.h
-include/sylpheed/message_search.h
-include/sylpheed/messageview.h
-include/sylpheed/mh.h
-include/sylpheed/mh_gtk.h
-include/sylpheed/mimeview.h
-include/sylpheed/msgcache.h
-include/sylpheed/mutt.h
-include/sylpheed/news.h
-include/sylpheed/news_gtk.h
-include/sylpheed/noticeview.h
-include/sylpheed/passphrase.h
-include/sylpheed/pgpmime.h
-include/sylpheed/pine.h
-include/sylpheed/pop.h
-include/sylpheed/prefs_account.h
-include/sylpheed/prefs_actions.h
-include/sylpheed/prefs_common.h
-include/sylpheed/prefs_customheader.h
-include/sylpheed/prefs_display_header.h
-include/sylpheed/prefs_ext_prog.h
-include/sylpheed/prefs_filtering.h
-include/sylpheed/prefs_filtering_action.h
-include/sylpheed/prefs_folder_item.h
-include/sylpheed/prefs_fonts.h
-include/sylpheed/prefs_gtk.h
-include/sylpheed/prefs_matcher.h
-include/sylpheed/prefs_spelling.h
-include/sylpheed/prefs_summary_column.h
-include/sylpheed/prefs_template.h
-include/sylpheed/prefs_themes.h
-include/sylpheed/prefs_toolbar.h
-include/sylpheed/privacy.h
-include/sylpheed/procheader.h
-include/sylpheed/procmime.h
-include/sylpheed/procmsg.h
-include/sylpheed/quote_fmt.h
-include/sylpheed/quote_fmt_lex.h
-include/sylpheed/quote_fmt_parse.h
-include/sylpheed/recv.h
-include/sylpheed/remotefolder.h
-include/sylpheed/rfc2015.h
-include/sylpheed/select-keys.h
-include/sylpheed/send_message.h
-include/sylpheed/setup.h
-include/sylpheed/sgpgme.h
-include/sylpheed/sourcewindow.h
-include/sylpheed/ssl_manager.h
-include/sylpheed/statusbar.h
-include/sylpheed/stock_pixmap.h
-include/sylpheed/summary_search.h
-include/sylpheed/summaryview.h
-include/sylpheed/textview.h
-include/sylpheed/toolbar.h
-include/sylpheed/undo.h
-include/sylpheed/unmime.h
-include/sylpheed/vcard.h
+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/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/intl.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/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/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/grouplistdialog.h
+include/sylpheed-claws/gtk/about.h
+include/sylpheed-claws/gtk/colorlabel.h
+include/sylpheed-claws/gtk/colorsel.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/gtkstext.h
+include/sylpheed-claws/gtk/gtkutils.h
+include/sylpheed-claws/gtk/gtkvscrollbutton.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/headerview.h
+include/sylpheed-claws/html.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/passphrase.h
+include/sylpheed-claws/pgpmime.h
+include/sylpheed-claws/pine.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_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_item.h
+include/sylpheed-claws/prefs_fonts.h
+include/sylpheed-claws/prefs_gtk.h
+include/sylpheed-claws/prefs_matcher.h
+include/sylpheed-claws/prefs_spelling.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/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/rfc2015.h
+include/sylpheed-claws/select-keys.h
+include/sylpheed-claws/send_message.h
+include/sylpheed-claws/setup.h
+include/sylpheed-claws/sgpgme.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
 lib/pkgconfig/sylpheed-claws.pc
 man/man1/sylpheed.1
 share/examples/sylpheed/mime.types
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
-share/sylpheed/faq/de/sylpheed-faq-1.html
-share/sylpheed/faq/de/sylpheed-faq-2.html
-share/sylpheed/faq/de/sylpheed-faq-3.html
-share/sylpheed/faq/de/sylpheed-faq.html
-share/sylpheed/faq/en/sylpheed-faq-1.html
-share/sylpheed/faq/en/sylpheed-faq-2.html
-share/sylpheed/faq/en/sylpheed-faq-3.html
-share/sylpheed/faq/en/sylpheed-faq-4.html
-share/sylpheed/faq/en/sylpheed-faq.html
-share/sylpheed/faq/es/sylpheed-faq-1.html
-share/sylpheed/faq/es/sylpheed-faq-2.html
-share/sylpheed/faq/es/sylpheed-faq-3.html
-share/sylpheed/faq/es/sylpheed-faq-4.html
-share/sylpheed/faq/es/sylpheed-faq.html
-share/sylpheed/faq/fr/sylpheed-faq-1.html
-share/sylpheed/faq/fr/sylpheed-faq-2.html
-share/sylpheed/faq/fr/sylpheed-faq-3.html
-share/sylpheed/faq/fr/sylpheed-faq.html
-share/sylpheed/faq/it/sylpheed-faq-1.html
-share/sylpheed/faq/it/sylpheed-faq-2.html
-share/sylpheed/faq/it/sylpheed-faq-3.html
-share/sylpheed/faq/it/sylpheed-faq.html
-share/sylpheed/manual/de/sylpheed-1.html
-share/sylpheed/manual/de/sylpheed-10.html
-share/sylpheed/manual/de/sylpheed-11.html
-share/sylpheed/manual/de/sylpheed-12.html
-share/sylpheed/manual/de/sylpheed-13.html
-share/sylpheed/manual/de/sylpheed-14.html
-share/sylpheed/manual/de/sylpheed-15.html
-share/sylpheed/manual/de/sylpheed-16.html
-share/sylpheed/manual/de/sylpheed-17.html
-share/sylpheed/manual/de/sylpheed-18.html
-share/sylpheed/manual/de/sylpheed-19.html
-share/sylpheed/manual/de/sylpheed-2.html
-share/sylpheed/manual/de/sylpheed-20.html
-share/sylpheed/manual/de/sylpheed-3.html
-share/sylpheed/manual/de/sylpheed-4.html
-share/sylpheed/manual/de/sylpheed-5.html
-share/sylpheed/manual/de/sylpheed-6.html
-share/sylpheed/manual/de/sylpheed-7.html
-share/sylpheed/manual/de/sylpheed-8.html
-share/sylpheed/manual/de/sylpheed-9.html
-share/sylpheed/manual/de/sylpheed.html
-share/sylpheed/manual/en/sylpheed-1.html
-share/sylpheed/manual/en/sylpheed-10.html
-share/sylpheed/manual/en/sylpheed-11.html
-share/sylpheed/manual/en/sylpheed-12.html
-share/sylpheed/manual/en/sylpheed-13.html
-share/sylpheed/manual/en/sylpheed-14.html
-share/sylpheed/manual/en/sylpheed-15.html
-share/sylpheed/manual/en/sylpheed-16.html
-share/sylpheed/manual/en/sylpheed-17.html
-share/sylpheed/manual/en/sylpheed-18.html
-share/sylpheed/manual/en/sylpheed-19.html
-share/sylpheed/manual/en/sylpheed-2.html
-share/sylpheed/manual/en/sylpheed-20.html
-share/sylpheed/manual/en/sylpheed-21.html
-share/sylpheed/manual/en/sylpheed-22.html
-share/sylpheed/manual/en/sylpheed-3.html
-share/sylpheed/manual/en/sylpheed-4.html
-share/sylpheed/manual/en/sylpheed-5.html
-share/sylpheed/manual/en/sylpheed-6.html
-share/sylpheed/manual/en/sylpheed-7.html
-share/sylpheed/manual/en/sylpheed-8.html
-share/sylpheed/manual/en/sylpheed-9.html
-share/sylpheed/manual/en/sylpheed.html
-share/sylpheed/manual/es/sylpheed-1.html
-share/sylpheed/manual/es/sylpheed-10.html
-share/sylpheed/manual/es/sylpheed-11.html
-share/sylpheed/manual/es/sylpheed-12.html
-share/sylpheed/manual/es/sylpheed-13.html
-share/sylpheed/manual/es/sylpheed-14.html
-share/sylpheed/manual/es/sylpheed-15.html
-share/sylpheed/manual/es/sylpheed-16.html
-share/sylpheed/manual/es/sylpheed-17.html
-share/sylpheed/manual/es/sylpheed-18.html
-share/sylpheed/manual/es/sylpheed-19.html
-share/sylpheed/manual/es/sylpheed-2.html
-share/sylpheed/manual/es/sylpheed-20.html
-share/sylpheed/manual/es/sylpheed-3.html
-share/sylpheed/manual/es/sylpheed-4.html
-share/sylpheed/manual/es/sylpheed-5.html
-share/sylpheed/manual/es/sylpheed-6.html
-share/sylpheed/manual/es/sylpheed-7.html
-share/sylpheed/manual/es/sylpheed-8.html
-share/sylpheed/manual/es/sylpheed-9.html
-share/sylpheed/manual/es/sylpheed.html
-share/sylpheed/manual/fr/sylpheed-1.html
-share/sylpheed/manual/fr/sylpheed-10.html
-share/sylpheed/manual/fr/sylpheed-11.html
-share/sylpheed/manual/fr/sylpheed-12.html
-share/sylpheed/manual/fr/sylpheed-13.html
-share/sylpheed/manual/fr/sylpheed-14.html
-share/sylpheed/manual/fr/sylpheed-15.html
-share/sylpheed/manual/fr/sylpheed-16.html
-share/sylpheed/manual/fr/sylpheed-17.html
-share/sylpheed/manual/fr/sylpheed-18.html
-share/sylpheed/manual/fr/sylpheed-19.html
-share/sylpheed/manual/fr/sylpheed-2.html
-share/sylpheed/manual/fr/sylpheed-20.html
-share/sylpheed/manual/fr/sylpheed-3.html
-share/sylpheed/manual/fr/sylpheed-4.html
-share/sylpheed/manual/fr/sylpheed-5.html
-share/sylpheed/manual/fr/sylpheed-6.html
-share/sylpheed/manual/fr/sylpheed-7.html
-share/sylpheed/manual/fr/sylpheed-8.html
-share/sylpheed/manual/fr/sylpheed-9.html
-share/sylpheed/manual/fr/sylpheed.html
-share/sylpheed/manual/ja/sylpheed-1.html
-share/sylpheed/manual/ja/sylpheed-10.html
-share/sylpheed/manual/ja/sylpheed-11.html
-share/sylpheed/manual/ja/sylpheed-12.html
-share/sylpheed/manual/ja/sylpheed-13.html
-share/sylpheed/manual/ja/sylpheed-14.html
-share/sylpheed/manual/ja/sylpheed-15.html
-share/sylpheed/manual/ja/sylpheed-16.html
-share/sylpheed/manual/ja/sylpheed-17.html
-share/sylpheed/manual/ja/sylpheed-2.html
-share/sylpheed/manual/ja/sylpheed-3.html
-share/sylpheed/manual/ja/sylpheed-4.html
-share/sylpheed/manual/ja/sylpheed-5.html
-share/sylpheed/manual/ja/sylpheed-6.html
-share/sylpheed/manual/ja/sylpheed-7.html
-share/sylpheed/manual/ja/sylpheed-8.html
-share/sylpheed/manual/ja/sylpheed-9.html
-share/sylpheed/manual/ja/sylpheed.html
-share/sylpheed/manual/ja/sylpheed.sgml
-share/sylpheed/sylpheed-128x128.png
-share/sylpheed/sylpheed-64x64.png
-share/sylpheed/sylpheed.png
-@dirrm share/sylpheed/manual/ja
-@dirrm share/sylpheed/manual/fr
-@dirrm share/sylpheed/manual/es
-@dirrm share/sylpheed/manual/en
-@dirrm share/sylpheed/manual/de
-@dirrm share/sylpheed/manual
-@dirrm share/sylpheed/faq/it
-@dirrm share/sylpheed/faq/fr
-@dirrm share/sylpheed/faq/es
-@dirrm share/sylpheed/faq/en
-@dirrm share/sylpheed/faq/de
-@dirrm share/sylpheed/faq
-@dirrm share/sylpheed
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/sylpheed-claws.mo
+${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/sylpheed-claws.mo
+share/sylpheed-claws/faq/de/sylpheed-faq-1.html
+share/sylpheed-claws/faq/de/sylpheed-faq-2.html
+share/sylpheed-claws/faq/de/sylpheed-faq-3.html
+share/sylpheed-claws/faq/de/sylpheed-faq.html
+share/sylpheed-claws/faq/en/sylpheed-faq-1.html
+share/sylpheed-claws/faq/en/sylpheed-faq-2.html
+share/sylpheed-claws/faq/en/sylpheed-faq-3.html
+share/sylpheed-claws/faq/en/sylpheed-faq-4.html
+share/sylpheed-claws/faq/en/sylpheed-faq.html
+share/sylpheed-claws/faq/es/sylpheed-faq-1.html
+share/sylpheed-claws/faq/es/sylpheed-faq-2.html
+share/sylpheed-claws/faq/es/sylpheed-faq-3.html
+share/sylpheed-claws/faq/es/sylpheed-faq-4.html
+share/sylpheed-claws/faq/es/sylpheed-faq.html
+share/sylpheed-claws/faq/fr/sylpheed-faq-1.html
+share/sylpheed-claws/faq/fr/sylpheed-faq-2.html
+share/sylpheed-claws/faq/fr/sylpheed-faq-3.html
+share/sylpheed-claws/faq/fr/sylpheed-faq.html
+share/sylpheed-claws/faq/it/sylpheed-faq-1.html
+share/sylpheed-claws/faq/it/sylpheed-faq-2.html
+share/sylpheed-claws/faq/it/sylpheed-faq-3.html
+share/sylpheed-claws/faq/it/sylpheed-faq.html
+share/sylpheed-claws/manual/de/sylpheed-1.html
+share/sylpheed-claws/manual/de/sylpheed-10.html
+share/sylpheed-claws/manual/de/sylpheed-11.html
+share/sylpheed-claws/manual/de/sylpheed-12.html
+share/sylpheed-claws/manual/de/sylpheed-13.html
+share/sylpheed-claws/manual/de/sylpheed-14.html
+share/sylpheed-claws/manual/de/sylpheed-15.html
+share/sylpheed-claws/manual/de/sylpheed-16.html
+share/sylpheed-claws/manual/de/sylpheed-17.html
+share/sylpheed-claws/manual/de/sylpheed-18.html
+share/sylpheed-claws/manual/de/sylpheed-19.html
+share/sylpheed-claws/manual/de/sylpheed-2.html
+share/sylpheed-claws/manual/de/sylpheed-20.html
+share/sylpheed-claws/manual/de/sylpheed-3.html
+share/sylpheed-claws/manual/de/sylpheed-4.html
+share/sylpheed-claws/manual/de/sylpheed-5.html
+share/sylpheed-claws/manual/de/sylpheed-6.html
+share/sylpheed-claws/manual/de/sylpheed-7.html
+share/sylpheed-claws/manual/de/sylpheed-8.html
+share/sylpheed-claws/manual/de/sylpheed-9.html
+share/sylpheed-claws/manual/de/sylpheed.html
+share/sylpheed-claws/manual/en/sylpheed-1.html
+share/sylpheed-claws/manual/en/sylpheed-10.html
+share/sylpheed-claws/manual/en/sylpheed-11.html
+share/sylpheed-claws/manual/en/sylpheed-12.html
+share/sylpheed-claws/manual/en/sylpheed-13.html
+share/sylpheed-claws/manual/en/sylpheed-14.html
+share/sylpheed-claws/manual/en/sylpheed-15.html
+share/sylpheed-claws/manual/en/sylpheed-16.html
+share/sylpheed-claws/manual/en/sylpheed-17.html
+share/sylpheed-claws/manual/en/sylpheed-18.html
+share/sylpheed-claws/manual/en/sylpheed-19.html
+share/sylpheed-claws/manual/en/sylpheed-2.html
+share/sylpheed-claws/manual/en/sylpheed-20.html
+share/sylpheed-claws/manual/en/sylpheed-21.html
+share/sylpheed-claws/manual/en/sylpheed-22.html
+share/sylpheed-claws/manual/en/sylpheed-3.html
+share/sylpheed-claws/manual/en/sylpheed-4.html
+share/sylpheed-claws/manual/en/sylpheed-5.html
+share/sylpheed-claws/manual/en/sylpheed-6.html
+share/sylpheed-claws/manual/en/sylpheed-7.html
+share/sylpheed-claws/manual/en/sylpheed-8.html
+share/sylpheed-claws/manual/en/sylpheed-9.html
+share/sylpheed-claws/manual/en/sylpheed.html
+share/sylpheed-claws/manual/es/sylpheed-1.html
+share/sylpheed-claws/manual/es/sylpheed-10.html
+share/sylpheed-claws/manual/es/sylpheed-11.html
+share/sylpheed-claws/manual/es/sylpheed-12.html
+share/sylpheed-claws/manual/es/sylpheed-13.html
+share/sylpheed-claws/manual/es/sylpheed-14.html
+share/sylpheed-claws/manual/es/sylpheed-15.html
+share/sylpheed-claws/manual/es/sylpheed-16.html
+share/sylpheed-claws/manual/es/sylpheed-17.html
+share/sylpheed-claws/manual/es/sylpheed-18.html
+share/sylpheed-claws/manual/es/sylpheed-19.html
+share/sylpheed-claws/manual/es/sylpheed-2.html
+share/sylpheed-claws/manual/es/sylpheed-20.html
+share/sylpheed-claws/manual/es/sylpheed-3.html
+share/sylpheed-claws/manual/es/sylpheed-4.html
+share/sylpheed-claws/manual/es/sylpheed-5.html
+share/sylpheed-claws/manual/es/sylpheed-6.html
+share/sylpheed-claws/manual/es/sylpheed-7.html
+share/sylpheed-claws/manual/es/sylpheed-8.html
+share/sylpheed-claws/manual/es/sylpheed-9.html
+share/sylpheed-claws/manual/es/sylpheed.html
+share/sylpheed-claws/manual/fr/sylpheed-1.html
+share/sylpheed-claws/manual/fr/sylpheed-10.html
+share/sylpheed-claws/manual/fr/sylpheed-11.html
+share/sylpheed-claws/manual/fr/sylpheed-12.html
+share/sylpheed-claws/manual/fr/sylpheed-13.html
+share/sylpheed-claws/manual/fr/sylpheed-14.html
+share/sylpheed-claws/manual/fr/sylpheed-15.html
+share/sylpheed-claws/manual/fr/sylpheed-16.html
+share/sylpheed-claws/manual/fr/sylpheed-17.html
+share/sylpheed-claws/manual/fr/sylpheed-18.html
+share/sylpheed-claws/manual/fr/sylpheed-19.html
+share/sylpheed-claws/manual/fr/sylpheed-2.html
+share/sylpheed-claws/manual/fr/sylpheed-20.html
+share/sylpheed-claws/manual/fr/sylpheed-3.html
+share/sylpheed-claws/manual/fr/sylpheed-4.html
+share/sylpheed-claws/manual/fr/sylpheed-5.html
+share/sylpheed-claws/manual/fr/sylpheed-6.html
+share/sylpheed-claws/manual/fr/sylpheed-7.html
+share/sylpheed-claws/manual/fr/sylpheed-8.html
+share/sylpheed-claws/manual/fr/sylpheed-9.html
+share/sylpheed-claws/manual/fr/sylpheed.html
+share/sylpheed-claws/manual/ja/sylpheed-1.html
+share/sylpheed-claws/manual/ja/sylpheed-10.html
+share/sylpheed-claws/manual/ja/sylpheed-11.html
+share/sylpheed-claws/manual/ja/sylpheed-12.html
+share/sylpheed-claws/manual/ja/sylpheed-13.html
+share/sylpheed-claws/manual/ja/sylpheed-14.html
+share/sylpheed-claws/manual/ja/sylpheed-15.html
+share/sylpheed-claws/manual/ja/sylpheed-16.html
+share/sylpheed-claws/manual/ja/sylpheed-17.html
+share/sylpheed-claws/manual/ja/sylpheed-2.html
+share/sylpheed-claws/manual/ja/sylpheed-3.html
+share/sylpheed-claws/manual/ja/sylpheed-4.html
+share/sylpheed-claws/manual/ja/sylpheed-5.html
+share/sylpheed-claws/manual/ja/sylpheed-6.html
+share/sylpheed-claws/manual/ja/sylpheed-7.html
+share/sylpheed-claws/manual/ja/sylpheed-8.html
+share/sylpheed-claws/manual/ja/sylpheed-9.html
+share/sylpheed-claws/manual/ja/sylpheed.html
+share/sylpheed-claws/manual/ja/sylpheed.sgml
+share/sylpheed-claws/sylpheed-128x128.png
+share/sylpheed-claws/sylpheed-64x64.png
+share/sylpheed-claws/sylpheed.png
+@dirrm share/sylpheed-claws/manual/ja
+@dirrm share/sylpheed-claws/manual/fr
+@dirrm share/sylpheed-claws/manual/es
+@dirrm share/sylpheed-claws/manual/en
+@dirrm share/sylpheed-claws/manual/de
+@dirrm share/sylpheed-claws/manual
+@dirrm share/sylpheed-claws/faq/it
+@dirrm share/sylpheed-claws/faq/fr
+@dirrm share/sylpheed-claws/faq/es
+@dirrm share/sylpheed-claws/faq/en
+@dirrm share/sylpheed-claws/faq/de
+@dirrm share/sylpheed-claws/faq
+@dirrm share/sylpheed-claws
 @dirrm share/examples/sylpheed
-@dirrm include/sylpheed/gtk
-@dirrm include/sylpheed/common
-@dirrm include/sylpheed
+@dirrm include/sylpheed-claws/gtk
+@dirrm include/sylpheed-claws/common
+@dirrm include/sylpheed-claws
diff --git a/mail/sylpheed-claws/PLIST.plugins b/mail/sylpheed-claws/PLIST.plugins
index bf1d7cebf29..8ec197848c4 100644
--- a/mail/sylpheed-claws/PLIST.plugins
+++ b/mail/sylpheed-claws/PLIST.plugins
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.plugins,v 1.1 2004/01/01 21:39:02 cube Exp $
-lib/sylpheed/plugins/${PLUGIN_NAME}.a
-lib/sylpheed/plugins/${PLUGIN_NAME}.la
-lib/sylpheed/plugins/${PLUGIN_NAME}.so
-@unexec ${RMDIR} %D/lib/sylpheed/plugins 2>/dev/null || ${TRUE}
+@comment $NetBSD: PLIST.plugins,v 1.2 2004/07/18 09:56:47 recht Exp $
+lib/sylpheed-claws/plugins/${PLUGIN_NAME}.a
+lib/sylpheed-claws/plugins/${PLUGIN_NAME}.la
+lib/sylpheed-claws/plugins/${PLUGIN_NAME}.so
+@unexec ${RMDIR} %D/lib/sylpheed-claws/plugins 2>/dev/null || ${TRUE}
diff --git a/mail/sylpheed-claws/distinfo b/mail/sylpheed-claws/distinfo
index e37c0236820..44e455e624a 100644
--- a/mail/sylpheed-claws/distinfo
+++ b/mail/sylpheed-claws/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2004/06/02 07:56:19 adam Exp $
+$NetBSD: distinfo,v 1.15 2004/07/18 09:56:47 recht Exp $
 
-SHA1 (sylpheed-0.9.11claws.tar.bz2) = 7b44a21e3d52b2d6c6135e99e2a85f3d14e9e94a
-Size (sylpheed-0.9.11claws.tar.bz2) = 3012539 bytes
+SHA1 (sylpheed-claws-0.9.12.tar.bz2) = 19aae94a782f8b6aa5653a706e722149d241ee8e
+Size (sylpheed-claws-0.9.12.tar.bz2) = 3031344 bytes