Update to 2.1.7.

    * The spell checking feature was implemented (requires GtkSpell).
    * The drop of files is allowed on the whole composition window.
    * The insertion of text by drag and drop was disabled.
    * The PGP interface is disabled if GnuPG is not available.
    * A bug that aborted program if invalid UTF-8 text is put in the log
      window was fixed.
    * The pane between summary and message view became more visible.
    * Reply-to-list is not enabled for subscribe confirmation request etc.
    * The bug that the separator of newsgroups was broken was fixed.
    * The bug that broke the summary selection when mark, unread, and
      colorlabel flags were changed while the summary was sorted by them
      was fixed.
    * The bug that caused crash when quote colors dialog was closed by the
      window close button was fixed.
    * The bug that showed wrong value if the total size of a folder was more
      than 2GB was fixed.

3 files changed, 54 insertions, 37 deletions

diff --git a/mail/sylpheed-devel/Makefile b/mail/sylpheed-devel/Makefile
index aa1a5ff0028..8e2adf2dd26 100644
--- a/mail/sylpheed-devel/Makefile
+++ b/mail/sylpheed-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2005/11/12 07:40:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.21 2005/11/19 10:46:11 xtraeme Exp $
 
-DISTNAME=	sylpheed-2.1.6
+DISTNAME=	sylpheed-2.1.7
 CATEGORIES=	mail news x11
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/v2.1/
@@ -23,41 +23,11 @@ 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}
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.sylpheed-devel
-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 +35,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-devel/distinfo b/mail/sylpheed-devel/distinfo
index f2f48f42b81..994b2a2c89f 100644
--- a/mail/sylpheed-devel/distinfo
+++ b/mail/sylpheed-devel/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2005/11/12 07:40:32 xtraeme Exp $
+$NetBSD: distinfo,v 1.18 2005/11/19 10:46:11 xtraeme Exp $
 
-SHA1 (sylpheed-2.1.6.tar.bz2) = 099400be80965d053df84073dd4c440f347d2758
-RMD160 (sylpheed-2.1.6.tar.bz2) = 0300cc2507166af4a31f4119dab07a94249b8203
-Size (sylpheed-2.1.6.tar.bz2) = 2387321 bytes
+SHA1 (sylpheed-2.1.7.tar.bz2) = 5c00daaa33630a51ad541808bc5f60ca9c7d0329
+RMD160 (sylpheed-2.1.7.tar.bz2) = 391cc065c9d27b4aa7e3fd6b88310ab4cd816c48
+Size (sylpheed-2.1.7.tar.bz2) = 2397271 bytes
diff --git a/mail/sylpheed-devel/options.mk b/mail/sylpheed-devel/options.mk
new file mode 100644
index 00000000000..168b36c99bd
--- /dev/null
+++ b/mail/sylpheed-devel/options.mk
@@ -0,0 +1,47 @@
+# $NetBSD: options.mk,v 1.1 2005/11/19 10:46:11 xtraeme Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.sylpheed-devel
+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
+