Update to 0.9.12a.

Please read the ChangeLog at http://sylpheed-claws.sourceforge.net/news.php,
there are some changes which may need user interaction.

6 files changed, 20 insertions, 12 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 7fe16530b122..8b73738a2429 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	0.9.12
+PORTVERSION=	0.9.12a
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -27,7 +27,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GNOME=	gnomehack pkgconfig gtk12
 USE_REINPLACE=	yes
 WANT_GNOME=	yes
@@ -76,10 +76,12 @@ USE_GNOME+=		imlib
 CONFIGURE_ARGS+=	--disable-gdk-pixbuf
 .endif
 .if defined(WITH_GPGME) || defined(WITH_ALL)
+PLIST_SUB+=		GPGME=""
 LIB_DEPENDS+=		gpgme.9:${PORTSDIR}/security/gpgme
 RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
 CONFIGURE_ARGS+=	--enable-gpgme
 .else
+PLIST_SUB+=		GPGME="@comment "
 CONFIGURE_ARGS+=	--disable-gpgme
 .endif
 .if defined(WITH_COMPFACE) || defined(WITH_ALL)
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 2069115fbf4f..9a1f5050aef0 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,4 +1,4 @@
-MD5 (sylpheed-claws-0.9.12.tar.bz2) = 798f25bb5dae7fd4959fbcb38868bef0
-SIZE (sylpheed-claws-0.9.12.tar.bz2) = 3031344
+MD5 (sylpheed-claws-0.9.12a.tar.bz2) = 382caecd2b21cbcd9b8d07816025a87c
+SIZE (sylpheed-claws-0.9.12a.tar.bz2) = 3078119
 MD5 (sylpheed-iconset-20040525.tar.gz) = a2aa029cdee6cc22a0305774b70a5a70
 SIZE (sylpheed-iconset-20040525.tar.gz) = 856996
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index fd6c990ef6bb..67fdd07df1df 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -32,6 +32,7 @@ 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/partial_download.h
 include/sylpheed-claws/common/passcrypt.h
 include/sylpheed-claws/common/plugin.h
 include/sylpheed-claws/common/prefs.h
@@ -133,7 +134,6 @@ 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
@@ -148,11 +148,13 @@ 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_msg_colors.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/prefs_wrapping.h
 include/sylpheed-claws/privacy.h
 include/sylpheed-claws/procheader.h
 include/sylpheed-claws/procmime.h
@@ -166,7 +168,6 @@ 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
@@ -187,6 +188,7 @@ lib/sylpheed-claws/plugins/trayicon.so
 %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so
 %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin_gtk.so
 %%IMAGE%%lib/sylpheed-claws/plugins/image_viewer.so
+%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.so
 %%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.so
 %%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin_gtk.so
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 7fe16530b122..8b73738a2429 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	0.9.12
+PORTVERSION=	0.9.12a
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -27,7 +27,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GNOME=	gnomehack pkgconfig gtk12
 USE_REINPLACE=	yes
 WANT_GNOME=	yes
@@ -76,10 +76,12 @@ USE_GNOME+=		imlib
 CONFIGURE_ARGS+=	--disable-gdk-pixbuf
 .endif
 .if defined(WITH_GPGME) || defined(WITH_ALL)
+PLIST_SUB+=		GPGME=""
 LIB_DEPENDS+=		gpgme.9:${PORTSDIR}/security/gpgme
 RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
 CONFIGURE_ARGS+=	--enable-gpgme
 .else
+PLIST_SUB+=		GPGME="@comment "
 CONFIGURE_ARGS+=	--disable-gpgme
 .endif
 .if defined(WITH_COMPFACE) || defined(WITH_ALL)
diff --git a/mail/sylpheed-claws/distinfo b/mail/sylpheed-claws/distinfo
index 2069115fbf4f..9a1f5050aef0 100644
--- a/mail/sylpheed-claws/distinfo
+++ b/mail/sylpheed-claws/distinfo
@@ -1,4 +1,4 @@
-MD5 (sylpheed-claws-0.9.12.tar.bz2) = 798f25bb5dae7fd4959fbcb38868bef0
-SIZE (sylpheed-claws-0.9.12.tar.bz2) = 3031344
+MD5 (sylpheed-claws-0.9.12a.tar.bz2) = 382caecd2b21cbcd9b8d07816025a87c
+SIZE (sylpheed-claws-0.9.12a.tar.bz2) = 3078119
 MD5 (sylpheed-iconset-20040525.tar.gz) = a2aa029cdee6cc22a0305774b70a5a70
 SIZE (sylpheed-iconset-20040525.tar.gz) = 856996
diff --git a/mail/sylpheed-claws/pkg-plist b/mail/sylpheed-claws/pkg-plist
index fd6c990ef6bb..67fdd07df1df 100644
--- a/mail/sylpheed-claws/pkg-plist
+++ b/mail/sylpheed-claws/pkg-plist
@@ -32,6 +32,7 @@ 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/partial_download.h
 include/sylpheed-claws/common/passcrypt.h
 include/sylpheed-claws/common/plugin.h
 include/sylpheed-claws/common/prefs.h
@@ -133,7 +134,6 @@ 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
@@ -148,11 +148,13 @@ 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_msg_colors.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/prefs_wrapping.h
 include/sylpheed-claws/privacy.h
 include/sylpheed-claws/procheader.h
 include/sylpheed-claws/procmime.h
@@ -166,7 +168,6 @@ 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
@@ -187,6 +188,7 @@ lib/sylpheed-claws/plugins/trayicon.so
 %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so
 %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin_gtk.so
 %%IMAGE%%lib/sylpheed-claws/plugins/image_viewer.so
+%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.so
 %%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.so
 %%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin_gtk.so
 %%PORTDOCS%%%%DOCSDIR%%/NEWS