summaryrefslogtreecommitdiff
path: root/mail/claws-mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail/claws-mail')
-rw-r--r--mail/claws-mail/Makefile8
-rw-r--r--mail/claws-mail/Makefile.vers4
-rw-r--r--mail/claws-mail/PLIST14
-rw-r--r--mail/claws-mail/PLIST.shred1
-rw-r--r--mail/claws-mail/distinfo12
-rw-r--r--mail/claws-mail/files/shred.Darwin5
-rw-r--r--mail/claws-mail/files/shred.DragonFlyBSD5
-rw-r--r--mail/claws-mail/files/shred.FreeBSD5
-rw-r--r--mail/claws-mail/files/shred.Linux5
-rw-r--r--mail/claws-mail/files/shred.NetBSD5
-rw-r--r--mail/claws-mail/files/shred.OpenBSD5
-rw-r--r--mail/claws-mail/patches/patch-ad122
-rw-r--r--mail/claws-mail/patches/patch-ae11
-rw-r--r--mail/claws-mail/patches/patch-af11
14 files changed, 183 insertions, 30 deletions
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 4f74552b4ce..ca02e74457d 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2008/05/21 14:02:44 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/07/13 22:34:19 smb Exp $
.include "Makefile.common"
PKGNAME= claws-mail-${CLAWS_VERSION}
-PKGREVISION= 1
MAINTAINER= smb@NetBSD.org
COMMENT= X based e-mail and netnews client
@@ -62,6 +61,11 @@ post-install:
${INSTALL_DATA} ${FILESDIR}/mime.types ${EGDIR}
${INSTALL_DATA_DIR} ${PREFIX}/share/claws-mail
${INSTALL_DATA} ${WRKSRC}/claws-mail*.png ${PREFIX}/share/claws-mail
+.if exists(files/shred.${OPSYS})
+ ${INSTALL_SCRIPT} files/shred.${OPSYS} ${PREFIX}/bin/claws-mail-shred
+PLIST_SRC= PLIST
+PLIST_SRC+= PLIST.shred
+.endif
.include "../../databases/db4/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index 24ca34e2b0b..8c9bb04a621 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.5 2008/05/12 02:25:39 smb Exp $
+# $NetBSD: Makefile.vers,v 1.6 2008/07/13 22:34:19 smb Exp $
#
-CLAWS_VERSION= 3.4.0
+CLAWS_VERSION= 3.5.0
diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST
index 24cb49de908..fb2fa4a2d51 100644
--- a/mail/claws-mail/PLIST
+++ b/mail/claws-mail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/05/20 18:14:45 tnn Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/07/13 22:34:19 smb Exp $
bin/claws-mail
bin/sylpheed-claws
include/claws-mail/account.h
@@ -231,31 +231,19 @@ share/doc/claws-mail/manual/pl/claws-mail-manual.ps
share/doc/claws-mail/manual/pl/claws-mail-manual.txt
share/examples/claws-mail/mime.types
share/icons/hicolor/48x48/apps/claws-mail.png
-share/locale/bg/LC_MESSAGES/claws-mail.mo
share/locale/ca/LC_MESSAGES/claws-mail.mo
-share/locale/cs/LC_MESSAGES/claws-mail.mo
share/locale/de/LC_MESSAGES/claws-mail.mo
-share/locale/el/LC_MESSAGES/claws-mail.mo
share/locale/en_GB/LC_MESSAGES/claws-mail.mo
share/locale/es/LC_MESSAGES/claws-mail.mo
share/locale/fi/LC_MESSAGES/claws-mail.mo
share/locale/fr/LC_MESSAGES/claws-mail.mo
-share/locale/he/LC_MESSAGES/claws-mail.mo
-share/locale/hr/LC_MESSAGES/claws-mail.mo
share/locale/hu/LC_MESSAGES/claws-mail.mo
share/locale/it/LC_MESSAGES/claws-mail.mo
-share/locale/ja/LC_MESSAGES/claws-mail.mo
-share/locale/ko/LC_MESSAGES/claws-mail.mo
-share/locale/nb/LC_MESSAGES/claws-mail.mo
-share/locale/nl/LC_MESSAGES/claws-mail.mo
share/locale/pl/LC_MESSAGES/claws-mail.mo
share/locale/pt_BR/LC_MESSAGES/claws-mail.mo
-share/locale/ru/LC_MESSAGES/claws-mail.mo
share/locale/sk/LC_MESSAGES/claws-mail.mo
share/locale/sr/LC_MESSAGES/claws-mail.mo
-share/locale/sv/LC_MESSAGES/claws-mail.mo
share/locale/zh_CN/LC_MESSAGES/claws-mail.mo
-share/locale/zh_TW/LC_MESSAGES/claws-mail.mo
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
@dirrm share/examples/claws-mail
diff --git a/mail/claws-mail/PLIST.shred b/mail/claws-mail/PLIST.shred
new file mode 100644
index 00000000000..257d18af182
--- /dev/null
+++ b/mail/claws-mail/PLIST.shred
@@ -0,0 +1 @@
+bin/claws-mail-shred
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index f6eaa621afe..f7bc36b59af 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.8 2008/05/12 02:25:39 smb Exp $
+$NetBSD: distinfo,v 1.9 2008/07/13 22:34:19 smb Exp $
-SHA1 (claws-mail-3.4.0.tar.bz2) = 67cf9bc9b9fe917fb4c2b895e6bc9291e5e6497c
-RMD160 (claws-mail-3.4.0.tar.bz2) = 5c1d3a5ca95b5d61948791170ac547ead764a27f
-Size (claws-mail-3.4.0.tar.bz2) = 5999033 bytes
+SHA1 (claws-mail-3.5.0.tar.bz2) = 1833106a3a365a16a8f1b83362da36ef32edd6fb
+RMD160 (claws-mail-3.5.0.tar.bz2) = 837220a2665c0a395d25bbdab64af8903e578d1d
+Size (claws-mail-3.5.0.tar.bz2) = 4819732 bytes
SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
SHA1 (patch-ac) = 6410910bc47784294f508f579891190e19c98402
-SHA1 (patch-ad) = e37162dbbf335bef2b418722cd55c2e19f79e0a6
+SHA1 (patch-ad) = c3df624c54983c0bdc6a568df2d6a0e729d3b2c5
+SHA1 (patch-ae) = b0cf0db0248752d365caab03edabeb136371d07a
+SHA1 (patch-af) = f6670f7387040bab1ad8977667bb7010cbc9b3aa
diff --git a/mail/claws-mail/files/shred.Darwin b/mail/claws-mail/files/shred.Darwin
new file mode 100644
index 00000000000..52b263eb6d8
--- /dev/null
+++ b/mail/claws-mail/files/shred.Darwin
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# Front end to securely delete a file on *BSD and Darwin
+#
+exec rm -P "$@"
diff --git a/mail/claws-mail/files/shred.DragonFlyBSD b/mail/claws-mail/files/shred.DragonFlyBSD
new file mode 100644
index 00000000000..52b263eb6d8
--- /dev/null
+++ b/mail/claws-mail/files/shred.DragonFlyBSD
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# Front end to securely delete a file on *BSD and Darwin
+#
+exec rm -P "$@"
diff --git a/mail/claws-mail/files/shred.FreeBSD b/mail/claws-mail/files/shred.FreeBSD
new file mode 100644
index 00000000000..52b263eb6d8
--- /dev/null
+++ b/mail/claws-mail/files/shred.FreeBSD
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# Front end to securely delete a file on *BSD and Darwin
+#
+exec rm -P "$@"
diff --git a/mail/claws-mail/files/shred.Linux b/mail/claws-mail/files/shred.Linux
new file mode 100644
index 00000000000..8ed8775c401
--- /dev/null
+++ b/mail/claws-mail/files/shred.Linux
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# Front end to securely delete a file on Linux
+#
+exec shred "$@"
diff --git a/mail/claws-mail/files/shred.NetBSD b/mail/claws-mail/files/shred.NetBSD
new file mode 100644
index 00000000000..52b263eb6d8
--- /dev/null
+++ b/mail/claws-mail/files/shred.NetBSD
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# Front end to securely delete a file on *BSD and Darwin
+#
+exec rm -P "$@"
diff --git a/mail/claws-mail/files/shred.OpenBSD b/mail/claws-mail/files/shred.OpenBSD
new file mode 100644
index 00000000000..52b263eb6d8
--- /dev/null
+++ b/mail/claws-mail/files/shred.OpenBSD
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# Front end to securely delete a file on *BSD and Darwin
+#
+exec rm -P "$@"
diff --git a/mail/claws-mail/patches/patch-ad b/mail/claws-mail/patches/patch-ad
index 2a71ab21eff..79259165856 100644
--- a/mail/claws-mail/patches/patch-ad
+++ b/mail/claws-mail/patches/patch-ad
@@ -1,11 +1,60 @@
-$NetBSD: patch-ad,v 1.3 2008/01/09 03:55:09 smb Exp $
-
---- src/toolbar.c.orig 2007-12-26 22:40:51.000000000 -0500
-+++ src/toolbar.c 2007-12-26 22:41:12.000000000 -0500
-@@ -518,10 +518,8 @@
+--- src/toolbar.c.orig 2008-06-30 10:36:22.000000000 -0400
++++ src/toolbar.c 2008-06-30 10:37:19.000000000 -0400
+@@ -164,10 +164,8 @@
+ gpointer data);
+ static void toolbar_addrbook_cb (GtkWidget *widget,
+ gpointer data);
+-#ifdef USE_ASPELL
+ static void toolbar_check_spelling_cb (GtkWidget *widget,
+ gpointer data);
+-#endif
+ static void toolbar_cancel_inc_cb (GtkWidget *widget,
+ gpointer data);
+
+@@ -208,9 +206,7 @@
+ { "A_LINEWRAP_CURRENT", N_("Wrap long lines of current paragraph") },
+ { "A_LINEWRAP_ALL", N_("Wrap all long lines") },
+ { "A_ADDRBOOK", N_("Address book") },
+-#ifdef USE_ASPELL
+ { "A_CHECK_SPELLING", N_("Check spelling") },
+-#endif
+ { "A_CLAWS_ACTIONS", N_("Claws Mail Actions Feature") },
+ { "A_CANCEL_INC", N_("Cancel receiving") },
+ { "A_CLOSE", N_("Close window") },
+@@ -346,9 +342,7 @@
+ A_INSERT, A_ATTACH, A_SIG,
+ A_EXTEDITOR, A_LINEWRAP_CURRENT,
+ A_LINEWRAP_ALL, A_ADDRBOOK,
+-#ifdef USE_ASPELL
+ A_CHECK_SPELLING,
+-#endif
+ A_CLOSE };
+
+ for (i = 0; i < sizeof comp_items / sizeof comp_items[0]; i++)
+@@ -449,9 +443,7 @@
+ case A_ADDRBOOK: return _("Address");
+ case A_CANCEL_INC: return _("Stop");
+ case A_EXECUTE: return _("Execute");
+- #ifdef USE_ASPELL
+ case A_CHECK_SPELLING: return _("Check spelling");
+- #endif
+ default: return "";
+ }
+ }
+@@ -492,9 +484,7 @@
+ case A_ADDRBOOK: return STOCK_PIXMAP_ADDRESS_BOOK;
+ case A_CANCEL_INC: return STOCK_PIXMAP_CANCEL;
+ case A_EXECUTE: return STOCK_PIXMAP_EXEC;
+- #ifdef USE_ASPELL
+ case A_CHECK_SPELLING: return STOCK_PIXMAP_CHECK_SPELLING;
+- #endif
+ default: return -1;
+ }
+ }
+@@ -523,10 +513,8 @@
{ A_SEPARATOR},
{ A_TRASH},
- #ifndef MAEMO
+ #ifndef GENERIC_UMPC
-#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
{ A_LEARN_SPAM},
#endif
@@ -13,10 +62,10 @@ $NetBSD: patch-ad,v 1.3 2008/01/09 03:55:09 smb Exp $
{ A_SEPARATOR},
{ A_GOTO_NEXT}
};
-@@ -617,10 +615,8 @@
+@@ -622,10 +610,8 @@
{ A_SEPARATOR},
{ A_TRASH},
- #ifndef MAEMO
+ #ifndef GENERIC_UMPC
-#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
{ A_LEARN_SPAM},
#endif
@@ -24,3 +73,60 @@ $NetBSD: patch-ad,v 1.3 2008/01/09 03:55:09 smb Exp $
{ A_GOTO_NEXT}
};
+@@ -1585,12 +1571,10 @@
+ compose_toolbar_cb(A_LINEWRAP_ALL, data);
+ }
+
+-#ifdef USE_ASPELL
+ static void toolbar_check_spelling_cb(GtkWidget *widget, gpointer data)
+ {
+ compose_toolbar_cb(A_CHECK_SPELLING, data);
+ }
+-#endif
+ /*
+ * Execute actions from toolbar
+ */
+@@ -1715,9 +1699,7 @@
+ { A_LINEWRAP_CURRENT, toolbar_linewrap_current_cb },
+ { A_LINEWRAP_ALL, toolbar_linewrap_all_cb },
+ { A_ADDRBOOK, toolbar_addrbook_cb },
+-#ifdef USE_ASPELL
+ { A_CHECK_SPELLING, toolbar_check_spelling_cb },
+-#endif
+ { A_CLAWS_ACTIONS, toolbar_actions_execute_cb },
+ { A_CANCEL_INC, toolbar_cancel_inc_cb }
+ };
+@@ -2059,12 +2041,10 @@
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Address book"));
+ toolbar_data->addrbook_btn = item;
+ break;
+-#ifdef USE_ASPELL
+ case A_CHECK_SPELLING:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Check spelling"));
+ toolbar_data->spellcheck_btn = item;
+ break;
+-#endif
+
+ case A_CLAWS_ACTIONS:
+ TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,toolbar_item->text);
+@@ -2417,10 +2397,8 @@
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->linewrap_all_btn, sensitive);
+ if (compose->toolbar->addrbook_btn)
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->addrbook_btn, sensitive);
+-#ifdef USE_ASPELL
+ if (compose->toolbar->spellcheck_btn)
+ GTK_BUTTON_SET_SENSITIVE(compose->toolbar->spellcheck_btn, sensitive);
+-#endif
+ for (; items != NULL; items = g_slist_next(items)) {
+ ToolbarClawsActions *item = (ToolbarClawsActions *)items->data;
+ GTK_BUTTON_SET_SENSITIVE(item->widget, sensitive);
+@@ -2463,9 +2441,7 @@
+ toolbar->linewrap_current_btn = NULL;
+ toolbar->linewrap_all_btn = NULL;
+ toolbar->addrbook_btn = NULL;
+-#ifdef USE_ASPELL
+ toolbar->spellcheck_btn = NULL;
+-#endif
+
+ toolbar_destroy(toolbar);
+ }
diff --git a/mail/claws-mail/patches/patch-ae b/mail/claws-mail/patches/patch-ae
new file mode 100644
index 00000000000..4d5c9c3d03e
--- /dev/null
+++ b/mail/claws-mail/patches/patch-ae
@@ -0,0 +1,11 @@
+--- ./src/common/utils.c.orig 2008-07-01 15:11:18.000000000 -0400
++++ ./src/common/utils.c 2008-07-01 15:11:43.000000000 -0400
+@@ -5078,7 +5078,7 @@
+ if (prefs_common_get_use_shred()) {
+ if (found_shred == -1) {
+ /* init */
+- args[0] = g_find_program_in_path("shred");
++ args[0] = g_find_program_in_path("claws-mail-shred");
+ debug_print("found shred: %s\n", args[0]);
+ found_shred = (args[0] != NULL) ? 1:0;
+ args[1] = "-f";
diff --git a/mail/claws-mail/patches/patch-af b/mail/claws-mail/patches/patch-af
new file mode 100644
index 00000000000..200d4faf240
--- /dev/null
+++ b/mail/claws-mail/patches/patch-af
@@ -0,0 +1,11 @@
+--- src/prefs_other.c.orig 2008-07-01 15:08:42.000000000 -0400
++++ src/prefs_other.c 2008-07-01 15:09:51.000000000 -0400
+@@ -590,7 +590,7 @@
+ PACK_CHECK_BUTTON (vbox2, checkbtn_askonfilter,
+ _("Ask about account specific filtering rules when "
+ "filtering manually"));
+- shred_binary = g_find_program_in_path("shred");
++ shred_binary = g_find_program_in_path("claws-mail-shred");
+ if (shred_binary) {
+ PACK_CHECK_BUTTON (vbox2, checkbtn_use_shred,
+ _("Use secure file deletion if possible"));
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 18:48:21 +0000