Update to 2.2.0.

* 2.2.0 (stable)

    * The move and copy of messages to queue folders and virtual folders are
      prohibited.
    * The included sylpheed.spec was modified.

* 2.2.0rc (development)

    * The 'minimize to tray icon' feature was modified.
    * The command line options help dialog is not duplicated anymore.
    * The problem that the UI was still insensitive after the execution of
      external editor failed was fixed.
    * The nonstandard Japanese encoding 'x-sjis' was supported.
    * Win32: The locale encoding problem on some languages was fixed.

4 files changed, 61 insertions, 42 deletions

diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 652689d4cb0..126da3f2750 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.87 2006/02/05 23:09:58 joerg Exp $
+# $NetBSD: Makefile,v 1.88 2006/02/19 07:11:08 xtraeme Exp $
 
-DISTNAME=	sylpheed-2.0.4
-PKGREVISION=	2
+DISTNAME=	sylpheed-2.2.0
 CATEGORIES=	mail news x11
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
-MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/v2.0/
+MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/v2.2/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	chris@NetBSD.org
@@ -18,46 +17,16 @@ CONFLICTS=		sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]*
 
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=            yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--enable-ssl
-CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-compface
 
 PKG_SYSCONFSUBDIR=	sylpheed
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.sylpheed
-PKG_SUPPORTED_OPTIONS=  jpilot ldap inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-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
-
-.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+=	--enable-ldap
-.include "../../databases/openldap/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mjpilot)
-CONFIGURE_ARGS+=	--enable-jpilot
-.include "../../comms/pilot-link-libs/buildlink3.mk"
-.include "../../comms/jpilot/buildlink3.mk"
-.endif
-
 EGDIR=		${PREFIX}/share/examples/sylpheed
 CONF_FILES=	${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 
@@ -65,9 +34,9 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${FILESDIR}/mime.types ${EGDIR}
 
+.include "options.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../security/gpgme/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/sylpheed/PLIST b/mail/sylpheed/PLIST
index 7d11400c0a4..8f57dff7567 100644
--- a/mail/sylpheed/PLIST
+++ b/mail/sylpheed/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/07/29 19:32:23 chris Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/02/19 07:11:08 xtraeme Exp $
 bin/sylpheed
 share/examples/sylpheed/mime.types
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/sylpheed.mo
@@ -27,8 +27,9 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/sylpheed.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sylpheed.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/sylpheed.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/sylpheed.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/sylpheed.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/zh_TW/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
@@ -83,6 +84,8 @@ share/sylpheed/manual/ja/sylpheed-18.html
 share/sylpheed/manual/ja/sylpheed-19.html
 share/sylpheed/manual/ja/sylpheed-2.html
 share/sylpheed/manual/ja/sylpheed-20.html
+share/sylpheed/manual/ja/sylpheed-21.html
+share/sylpheed/manual/ja/sylpheed-22.html
 share/sylpheed/manual/ja/sylpheed-3.html
 share/sylpheed/manual/ja/sylpheed-4.html
 share/sylpheed/manual/ja/sylpheed-5.html
diff --git a/mail/sylpheed/distinfo b/mail/sylpheed/distinfo
index 003ec4fcae6..7931b7c2090 100644
--- a/mail/sylpheed/distinfo
+++ b/mail/sylpheed/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.44 2005/11/12 16:43:42 chris Exp $
+$NetBSD: distinfo,v 1.45 2006/02/19 07:11:08 xtraeme Exp $
 
-SHA1 (sylpheed-2.0.4.tar.bz2) = 97949f339b911febc2c734ef225bb266dd187a37
-RMD160 (sylpheed-2.0.4.tar.bz2) = c6d27d9c30b20062c4300a1cae3d7be1f70819c7
-Size (sylpheed-2.0.4.tar.bz2) = 2335882 bytes
+SHA1 (sylpheed-2.2.0.tar.bz2) = 2f7c8bb4b7eed71d0b09b7dd924e26e7fdd82209
+RMD160 (sylpheed-2.2.0.tar.bz2) = 314823bd0319a7364438dba0465d6ed262f72d06
+Size (sylpheed-2.2.0.tar.bz2) = 2492789 bytes
diff --git a/mail/sylpheed/options.mk b/mail/sylpheed/options.mk
new file mode 100644
index 00000000000..b9627d2825b
--- /dev/null
+++ b/mail/sylpheed/options.mk
@@ -0,0 +1,47 @@
+# $NetBSD: options.mk,v 1.1 2006/02/19 07:11:08 xtraeme Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.sylpheed
+PKG_SUPPORTED_OPTIONS=	jpilot ldap inet6 gtkspell gpgme
+PKG_SUGGESTED_OPTIONS=	inet6 gpgme
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+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
+
+.if !empty(PKG_OPTIONS:Mldap)
+CONFIGURE_ARGS+=	--enable-ldap
+.include "../../databases/openldap/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mjpilot)
+CONFIGURE_ARGS+=	--enable-jpilot
+.include "../../comms/pilot-link-libs/buildlink3.mk"
+.include "../../comms/jpilot/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtkspell)
+CONFIGURE_ARGS+=	--enable-gtkspell
+. include "../../textproc/gtkspell/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-gtkspell
+.endif
+
+.if !empty(PKG_OPTIONS:Mgpgme)
+CONFIGURE_ARGS+=	--enable-gpgme
+. include "../../security/gpgme/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-gpgme
+.endif
+