summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/sylpheed/DESCR2
-rw-r--r--mail/sylpheed/Makefile18
-rw-r--r--mail/sylpheed/PLIST6
-rw-r--r--mail/sylpheed/distinfo10
-rw-r--r--mail/sylpheed/options.mk4
-rw-r--r--mail/sylpheed/patches/patch-aa85
-rw-r--r--mail/sylpheed/patches/patch-ab12
7 files changed, 120 insertions, 17 deletions
diff --git a/mail/sylpheed/DESCR b/mail/sylpheed/DESCR
index d73fab042ba..9c0f8feca79 100644
--- a/mail/sylpheed/DESCR
+++ b/mail/sylpheed/DESCR
@@ -1,4 +1,4 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+, running on
+Sylpheed is an e-mail client (and news reader) based on GTK+ v2, running on
X Window System, and aiming for
* Quick response
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 8694085c3df..5a3f81dcec9 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.112 2008/03/30 14:47:35 darcy Exp $
+# $NetBSD: Makefile,v 1.113 2008/06/29 11:38:32 tnn Exp $
-DISTNAME= sylpheed-2.4.8
-PKGREVISION= 1
+DISTNAME= sylpheed-2.5.0
CATEGORIES= mail news x11
-MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v2.4/
+MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v2.5/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= chris@NetBSD.org
HOMEPAGE= http://sylpheed.sraoss.jp/en/
COMMENT= X based e-mail and netnews client
-CONFLICTS= sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]*
+PKG_DESTDIR_SUPPORT= user-destdir
+CONFLICTS= sylpheed-claws-[0-9]*
+USE_DIRS+= xdg-1.4
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake msgfmt pkg-config
-USE_LANGUAGES+= c c++
+USE_TOOLS+= gmake msgfmt pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-nls
@@ -29,8 +29,8 @@ EGDIR= ${PREFIX}/share/examples/sylpheed
CONF_FILES= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${FILESDIR}/mime.types ${EGDIR}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+ ${INSTALL_DATA} ${FILESDIR}/mime.types ${DESTDIR}${EGDIR}
.include "options.mk"
.include "../../converters/libiconv/buildlink3.mk"
diff --git a/mail/sylpheed/PLIST b/mail/sylpheed/PLIST
index 86c74fa1907..546b36a4019 100644
--- a/mail/sylpheed/PLIST
+++ b/mail/sylpheed/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.15 2007/04/25 17:21:11 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.16 2008/06/29 11:38:32 tnn Exp $
bin/sylpheed
+share/applications/sylpheed.desktop
share/examples/sylpheed/mime.types
share/locale/be/LC_MESSAGES/sylpheed.mo
share/locale/bg/LC_MESSAGES/sylpheed.mo
@@ -31,6 +32,7 @@ share/locale/uk/LC_MESSAGES/sylpheed.mo
share/locale/vi/LC_MESSAGES/sylpheed.mo
share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
share/locale/zh_TW/LC_MESSAGES/sylpheed.mo
+share/pixmaps/sylpheed.png
share/sylpheed/faq/de/sylpheed-faq-1.html
share/sylpheed/faq/de/sylpheed-faq-2.html
share/sylpheed/faq/de/sylpheed-faq-3.html
@@ -108,4 +110,6 @@ share/sylpheed/manual/ja/sylpheed.sgml
@dirrm share/sylpheed/faq/de
@dirrm share/sylpheed/faq
@dirrm share/sylpheed
+@comment in xdg-dirs: @dirrm share/pixmaps
@dirrm share/examples/sylpheed
+@comment in xdg-dirs: @dirrm share/applications
diff --git a/mail/sylpheed/distinfo b/mail/sylpheed/distinfo
index 8d36ceae4cd..73b9833925a 100644
--- a/mail/sylpheed/distinfo
+++ b/mail/sylpheed/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.62 2008/01/03 22:38:41 xtraeme Exp $
+$NetBSD: distinfo,v 1.63 2008/06/29 11:38:32 tnn Exp $
-SHA1 (sylpheed-2.4.8.tar.bz2) = 49a1f4eaa1fd8adce1f0e812abea5058dcb8dcec
-RMD160 (sylpheed-2.4.8.tar.bz2) = 69d6fc05e394b666e78d96cc83ccd302f3de4ceb
-Size (sylpheed-2.4.8.tar.bz2) = 2759841 bytes
+SHA1 (sylpheed-2.5.0.tar.bz2) = d6384669b720c361d1761bbcc5d426e69a1d2bd4
+RMD160 (sylpheed-2.5.0.tar.bz2) = 7514a6b49b4cc399c7926dd4a011bce9566e5971
+Size (sylpheed-2.5.0.tar.bz2) = 2762950 bytes
+SHA1 (patch-aa) = 30305efb899b511b0b3aff50377c7d1b9d6176a8
+SHA1 (patch-ab) = 465f69e8cee24da06089e24eefd3963908aa04be
diff --git a/mail/sylpheed/options.mk b/mail/sylpheed/options.mk
index 70226b8e170..b25ca711865 100644
--- a/mail/sylpheed/options.mk
+++ b/mail/sylpheed/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.4 2008/05/30 19:22:46 tnn Exp $
+# $NetBSD: options.mk,v 1.5 2008/06/29 11:38:32 tnn Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.sylpheed
-PKG_SUPPORTED_OPTIONS= jpilot ldap inet6 gpgme # gtkspell
+PKG_SUPPORTED_OPTIONS= jpilot ldap inet6 gpgme gtkspell
PKG_SUGGESTED_OPTIONS= inet6 gpgme
.include "../../mk/bsd.options.mk"
diff --git a/mail/sylpheed/patches/patch-aa b/mail/sylpheed/patches/patch-aa
new file mode 100644
index 00000000000..3c047c202cb
--- /dev/null
+++ b/mail/sylpheed/patches/patch-aa
@@ -0,0 +1,85 @@
+$NetBSD: patch-aa,v 1.5 2008/06/29 11:38:32 tnn Exp $
+
+--- src/compose.c.orig 2008-05-16 11:23:12.000000000 +0200
++++ src/compose.c
+@@ -69,7 +69,7 @@
+ #if USE_GTKSPELL
+ # include <gtk/gtkradiomenuitem.h>
+ # include <gtkspell/gtkspell.h>
+-# include <aspell.h>
++# include <enchant/enchant.h>
+ #endif
+
+ #include <stdio.h>
+@@ -5295,6 +5295,7 @@ static Compose *compose_create(PrefsAcco
+ #ifdef USE_GTKSPELL
+ compose->check_spell = prefs_common.check_spell;
+ compose->spell_lang = g_strdup(prefs_common.spell_lang);
++ compose->spell_dict_list = NULL;
+ compose->spell_menu = spell_menu;
+ #endif /* USE_GTKSPELL */
+
+@@ -5734,26 +5735,30 @@ static void compose_set_out_encoding(Com
+ #if USE_GTKSPELL
+ static void compose_set_spell_lang_menu(Compose *compose)
+ {
+- AspellConfig *config;
+- AspellDictInfoList *dlist;
+- AspellDictInfoEnumeration *dels;
+- const AspellDictInfo *entry;
++ EnchantBroker* eb;
+ GSList *dict_list = NULL, *menu_list = NULL, *cur;
+ GtkWidget *menu;
+ gboolean lang_set = FALSE;
+
+- config = new_aspell_config();
+- dlist = get_aspell_dict_info_list(config);
+- delete_aspell_config(config);
+-
+- dels = aspell_dict_info_list_elements(dlist);
+- while ((entry = aspell_dict_info_enumeration_next(dels)) != 0) {
+- dict_list = g_slist_append(dict_list, (gchar *)entry->name);
+- if (compose->spell_lang != NULL &&
+- g_ascii_strcasecmp(compose->spell_lang, entry->name) == 0)
+- lang_set = TRUE;
++ void enchDictDescCb (const char * const lang_tag,
++ const char * const provider_name,
++ const char * const provider_desc,
++ const char * const provider_file,
++ void * user_data)
++ {
++ dict_list = g_slist_append(dict_list, g_strdup((gchar*)lang_tag));
++ }
++
++ eb = enchant_broker_init();
++ enchant_broker_list_dicts (eb, enchDictDescCb, &dict_list);
++ compose->spell_dict_list = dict_list;
++ enchant_broker_free(eb);
++
++ for (cur = dict_list; cur!=NULL; cur = cur->next) {
++ if (compose->spell_lang != NULL &&
++ g_ascii_strcasecmp(compose->spell_lang, cur->data) == 0)
++ lang_set = TRUE;
+ }
+- delete_aspell_dict_info_enumeration(dels);
+
+ menu = gtk_menu_new();
+
+@@ -5913,6 +5918,7 @@ static void compose_destroy(Compose *com
+ AttachInfo *ainfo;
+ GtkTextBuffer *buffer;
+ GtkClipboard *clipboard;
++ GSList *cur;
+
+ compose_list = g_list_remove(compose_list, compose);
+
+@@ -5924,6 +5930,9 @@ static void compose_destroy(Compose *com
+ address_completion_end(compose->window);
+
+ #if USE_GTKSPELL
++ for (cur = compose->spell_dict_list; cur!=NULL; cur = cur->next) {
++ g_free((gchar*)cur->data);
++ }
+ g_free(compose->spell_lang);
+ #endif
+
diff --git a/mail/sylpheed/patches/patch-ab b/mail/sylpheed/patches/patch-ab
new file mode 100644
index 00000000000..216e0dd38aa
--- /dev/null
+++ b/mail/sylpheed/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.3 2008/06/29 11:38:32 tnn Exp $
+
+--- src/compose.h.orig 2008-05-08 10:37:28.000000000 +0200
++++ src/compose.h
+@@ -135,6 +135,7 @@ struct _Compose
+ #if USE_GTKSPELL
+ GtkWidget *spell_menu;
+ gchar *spell_lang;
++ GSList *spell_dict_list;
+ gboolean check_spell;
+ #endif
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 10:44:02 +0000