Hi,
this patch updates claws-mail to version 3.0.2.
Major part of this was done by Pierre-Emmanuel André <pea
atraveland.org>, with some small modification by me.
Tested on i386 (both) and amd64 (Pierre-Emmanuel André).
Ulrich (maintainer)
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/claws-mail/Makefile,v
retrieving revision 1.11
diff -u -3 -r1.11 Makefile
--- Makefile 14 Nov 2007 09:43:40 -0000 1.11
+++ Makefile 24 Nov 2007 12:52:31 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2007/11/14 09:43:40 steven Exp $
+# $OpenBSD: Makefile,v 1.10 2007/09/28 22:12:00 pyr Exp $
COMMENT-main= mail and news client
COMMENT-docs= documentation
@@ -7,14 +7,14 @@
COMMENT-dillo= dillo plugin
COMMENT-spamassassin= spamassassin plugin
-V= 3.0.1
+V= 3.0.2
DISTNAME= claws-mail-${V}
-PKGNAME-main= ${DISTNAME}p0
+PKGNAME-main= ${DISTNAME}
FULLPKGNAME-docs= claws-mail-docs-${V}
-FULLPKGNAME-bogofilter= claws-mail-bogofilter-${V}p0
-FULLPKGNAME-clamav= claws-mail-clamav-${V}p0
-FULLPKGNAME-dillo= claws-mail-dillo-${V}p0
-FULLPKGNAME-spamassassin= claws-mail-spamassassin-${V}p0
+FULLPKGNAME-bogofilter= claws-mail-bogofilter-${V}
+FULLPKGNAME-clamav= claws-mail-clamav-${V}
+FULLPKGNAME-dillo= claws-mail-dillo-${V}
+FULLPKGNAME-spamassassin= claws-mail-spamassassin-${V}
CATEGORIES= mail news
@@ -50,9 +50,9 @@
RUN_DEPENDS-spamassassin=::${BUILD_PKGPATH} \
::mail/p5-Mail-SpamAssassin
-WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
- Xcomposite Xdamage pcre \
- Xrender crypto expat fontconfig freetype m ssl z
+WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+ Xi Xinerama Xrandr Xrender crypto expat fontconfig \
+ freetype m ssl z pcre
WANTLIB-main= ${WANTLIB} ICE SM c pthread stdc++
@@ -132,6 +132,7 @@
TOOLS= OOo2claws-mail.pl \
acroread2claws-mail.pl \
calypso_convert.pl \
+ claws-mail-compose-insert-files.pl \
convert_mbox.pl \
eud2gc.py \
filter_conv.pl filter_conv_new.pl \
@@ -139,25 +140,28 @@
freshmeat_search.pl \
gif2xface.pl \
google_msgid.pl google_search.pl \
- kmail2claws-mail.pl kmail2claws-mail_v2.pl \
kmail-mailbox2claws-mail.pl \
- multiwebsearch.pl \
+ kmail2claws-mail.pl kmail2claws-mail_v2.pl \
+ mairix.sh \
+ mew2claws-mail.pl \
+ multiwebsearch.conf multiwebsearch.pl \
nautilus2claws-mail.sh \
outlook2claws-mail.pl \
sylprint.pl sylprint.rc \
tb2claws-mail tbird2claws.py \
textviewer.pl textviewer.sh \
thunderbird-filters-convertor.pl \
- update-po \
uudec uuooffice \
vcard2xml.py \
README README.sylprint \
- kdeservicemenu/install.sh
kdeservicemenu/claws-mail-kdeservicemenu.pl \
+ kdeservicemenu/install.sh \
+ kdeservicemenu/claws-mail-kdeservicemenu.pl \
+ kdeservicemenu/template_claws-mail-attach-files.desktop \
kdeservicemenu/README
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/claws-mail.desktop
${PREFIX}/share/applications/claws-mail.desktop
+# ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+# ${INSTALL_DATA} ${WRKSRC}/claws-mail.desktop
${PREFIX}/share/applications/claws-mail.desktop
${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/48x48/apps
${INSTALL_DATA} ${WRKSRC}/claws-mail.png
${PREFIX}/share/icons/hicolor/48x48/apps/claws-mail.png
${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/64x64/apps
@@ -169,5 +173,8 @@
${INSTALL_DATA} ${WRKSRC}/tools/${i} \
${PREFIX}/share/claws-mail/tools/${i}
.endfor
+
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/claws-mail
+ ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/claws-mail
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/claws-mail/distinfo,v
retrieving revision 1.7
diff -u -3 -r1.7 distinfo
--- distinfo 28 Sep 2007 22:12:00 -0000 1.7
+++ distinfo 24 Nov 2007 12:52:31 -0000
@@ -1,5 +1,5 @@
-MD5 (claws/claws-mail-3.0.1.tar.bz2) = cAxrTv6xDMM6QxEcKnNNuA==
-RMD160 (claws/claws-mail-3.0.1.tar.bz2) = QxqzygUTgtseMH7xq6/FzmWfSqM=
-SHA1 (claws/claws-mail-3.0.1.tar.bz2) = ZwwnMb9r8gnKfTvTQbOPwxCOY5A=
-SHA256 (claws/claws-mail-3.0.1.tar.bz2) =
WCWa/W8jmCmurxWjcJeOENi5igitXrTra3D7dpbv7DA=
-SIZE (claws/claws-mail-3.0.1.tar.bz2) = 5654189
+MD5 (claws/claws-mail-3.0.2.tar.bz2) = l6DGJ/kbUbaFG5oe2e56/g==
+RMD160 (claws/claws-mail-3.0.2.tar.bz2) = 5wQfooS3P6pAun/G3OORRiXNidk=
+SHA1 (claws/claws-mail-3.0.2.tar.bz2) = pgespTo0nzoKjY96UfR1RwXhI1A=
+SHA256 (claws/claws-mail-3.0.2.tar.bz2) =
0E21nfiwE2UXITEu0WffldR8iNVerA61t5UNaVjzY24=
+SIZE (claws/claws-mail-3.0.2.tar.bz2) = 5664767
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/mail/claws-mail/patches/patch-configure_ac,v
retrieving revision 1.2
diff -u -3 -r1.2 patch-configure_ac
--- patches/patch-configure_ac 28 Sep 2007 22:12:01 -0000 1.2
+++ patches/patch-configure_ac 24 Nov 2007 12:52:31 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure_ac,v 1.2 2007/09/28 22:12:01 pyr Exp $
---- configure.ac.orig Mon Sep 17 04:49:36 2007
-+++ configure.ac Tue Sep 18 21:45:38 2007
+$OpenBSD$
+--- configure.ac.orig Tue Oct 2 09:28:37 2007
++++ configure.ac Thu Nov 8 10:24:06 2007
@@ -567,6 +567,7 @@ else
AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="$LDAP_LIBS -lresolv")
AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
Index: patches/patch-m4_aspell_m4
===================================================================
RCS file: /cvs/ports/mail/claws-mail/patches/patch-m4_aspell_m4,v
retrieving revision 1.1
diff -u -3 -r1.1 patch-m4_aspell_m4
--- patches/patch-m4_aspell_m4 10 Jul 2007 06:14:43 -0000 1.1
+++ patches/patch-m4_aspell_m4 24 Nov 2007 12:52:31 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-m4_aspell_m4,v 1.1 2007/07/10 06:14:43 pyr Exp $
---- m4/aspell.m4.orig Sun Jul 1 18:36:54 2007
-+++ m4/aspell.m4 Sun Jul 1 18:38:05 2007
+$OpenBSD$
+--- m4/aspell.m4.orig Wed May 5 10:46:03 2004
++++ m4/aspell.m4 Thu Nov 8 10:26:37 2007
@@ -70,7 +70,7 @@ dnl
ifelse([$3], , :, [$3])
else
Index: patches/patch-src_common_smtp_h
===================================================================
RCS file: /cvs/ports/mail/claws-mail/patches/patch-src_common_smtp_h,v
retrieving revision 1.1.1.1
diff -u -3 -r1.1.1.1 patch-src_common_smtp_h
--- patches/patch-src_common_smtp_h 23 Mar 2007 17:38:22 -0000 1.1.1.1
+++ patches/patch-src_common_smtp_h 24 Nov 2007 12:52:31 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_common_smtp_h,v 1.1.1.1 2007/03/23 17:38:22 deanna Exp $
---- src/common/smtp.h.orig Sun Apr 3 15:14:42 2005
-+++ src/common/smtp.h Sun Apr 3 15:15:18 2005
+$OpenBSD$
+--- src/common/smtp.h.orig Wed Jul 11 18:35:49 2007
++++ src/common/smtp.h Thu Nov 8 10:27:36 2007
@@ -32,7 +32,9 @@ typedef struct _SMTPSession SMTPSession;
#define SMTP_SESSION(obj) ((SMTPSession *)obj)
Index: patches/patch-src_inc_c
===================================================================
RCS file: /cvs/ports/mail/claws-mail/patches/patch-src_inc_c,v
retrieving revision 1.3
diff -u -3 -r1.3 patch-src_inc_c
--- patches/patch-src_inc_c 28 Sep 2007 22:12:01 -0000 1.3
+++ patches/patch-src_inc_c 24 Nov 2007 12:52:31 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_inc_c,v 1.3 2007/09/28 22:12:01 pyr Exp $
---- src/inc.c.orig Mon Sep 17 04:14:33 2007
-+++ src/inc.c Tue Sep 18 21:45:32 2007
+$OpenBSD$
+--- src/inc.c.orig Tue Oct 2 09:19:37 2007
++++ src/inc.c Thu Nov 8 10:27:55 2007
@@ -83,7 +83,7 @@ static GdkPixbuf *currentpix;
static GdkPixbuf *errorpix;
static GdkPixbuf *okpix;
@@ -10,7 +10,7 @@
static void inc_finished (MainWindow *mainwin,
gboolean new_messages,
-@@ -938,7 +938,7 @@ static void inc_progress_dialog_set_label(IncProgressD
+@@ -949,7 +949,7 @@ static void inc_progress_dialog_set_label(IncProgressD
static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog,
IncSession *inc_session)
{
Index: patches/patch-src_mbox_c
===================================================================
RCS file: /cvs/ports/mail/claws-mail/patches/patch-src_mbox_c,v
retrieving revision 1.2
diff -u -3 -r1.2 patch-src_mbox_c
--- patches/patch-src_mbox_c 28 Sep 2007 22:12:01 -0000 1.2
+++ patches/patch-src_mbox_c 24 Nov 2007 12:52:31 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_mbox_c,v 1.2 2007/09/28 22:12:01 pyr Exp $
---- src/mbox.c.orig Mon Sep 17 04:14:33 2007
-+++ src/mbox.c Tue Sep 18 21:45:32 2007
+$OpenBSD$
+--- src/mbox.c.orig Sun Sep 16 20:16:42 2007
++++ src/mbox.c Thu Nov 8 10:28:28 2007
@@ -52,7 +52,7 @@
#include "alertpanel.h"
#include "statusbar.h"
Index: patches/patch-src_procmime_c
===================================================================
RCS file: /cvs/ports/mail/claws-mail/patches/patch-src_procmime_c,v
retrieving revision 1.3
diff -u -3 -r1.3 patch-src_procmime_c
--- patches/patch-src_procmime_c 28 Sep 2007 22:12:01 -0000 1.3
+++ patches/patch-src_procmime_c 24 Nov 2007 12:52:31 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_procmime_c,v 1.3 2007/09/28 22:12:01 pyr Exp $
---- src/procmime.c.orig Mon Sep 17 04:14:33 2007
-+++ src/procmime.c Tue Sep 18 21:45:32 2007
+$OpenBSD$
+--- src/procmime.c.orig Tue Oct 2 09:19:40 2007
++++ src/procmime.c Thu Nov 8 10:28:45 2007
@@ -1154,7 +1154,7 @@ GList *procmime_get_mime_type_list(void)
#endif
{
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/mail/claws-mail/pkg/PLIST-docs,v
retrieving revision 1.2
diff -u -3 -r1.2 PLIST-docs
--- pkg/PLIST-docs 20 Apr 2007 05:42:51 -0000 1.2
+++ pkg/PLIST-docs 24 Nov 2007 12:52:31 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST-docs,v 1.2 2007/04/20 05:42:51 steven Exp $
@pkgpath mail/sylpheed-claws,-docs${FLAVOR_STRING}
share/doc/claws-mail/
+share/doc/claws-mail/COPYING
share/doc/claws-mail/RELEASE_NOTES
share/doc/claws-mail/manual/
share/doc/claws-mail/manual/en/
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/claws-mail/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -3 -r1.6 PLIST-main
--- pkg/PLIST-main 8 Sep 2007 15:22:40 -0000 1.6
+++ pkg/PLIST-main 24 Nov 2007 12:52:31 -0000
@@ -244,6 +244,7 @@
share/claws-mail/tools/README.sylprint
share/claws-mail/tools/acroread2claws-mail.pl
share/claws-mail/tools/calypso_convert.pl
+share/claws-mail/tools/claws-mail-compose-insert-files.pl
share/claws-mail/tools/convert_mbox.pl
share/claws-mail/tools/eud2gc.py
share/claws-mail/tools/filter_conv.pl
@@ -257,9 +258,13 @@
share/claws-mail/tools/kdeservicemenu/README
share/claws-mail/tools/kdeservicemenu/claws-mail-kdeservicemenu.pl
share/claws-mail/tools/kdeservicemenu/install.sh
+share/claws-mail/tools/kdeservicemenu/template_claws-mail-attach-files.desktop
share/claws-mail/tools/kmail-mailbox2claws-mail.pl
share/claws-mail/tools/kmail2claws-mail.pl
share/claws-mail/tools/kmail2claws-mail_v2.pl
+share/claws-mail/tools/mairix.sh
+share/claws-mail/tools/mew2claws-mail.pl
+share/claws-mail/tools/multiwebsearch.conf
share/claws-mail/tools/multiwebsearch.pl
share/claws-mail/tools/nautilus2claws-mail.sh
share/claws-mail/tools/outlook2claws-mail.pl
@@ -270,7 +275,6 @@
share/claws-mail/tools/textviewer.pl
share/claws-mail/tools/textviewer.sh
share/claws-mail/tools/thunderbird-filters-convertor.pl
-share/claws-mail/tools/update-po
share/claws-mail/tools/uudec
share/claws-mail/tools/uuooffice
share/claws-mail/tools/vcard2xml.py
