cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to claws-mail 3.6.1.

Browse Source 
Due to some licensing mess, it now uses GnuTLS instead of OpenSSL.
Switched to textproc/enchant instead of textproc/aspell for spelling.

No objection from ajacoutot@, looks good to MAINTAINER.
This commit is contained in:
landry 2008-10-17 12:46:33 +00:00
parent 6db04e1c97
commit 218924c8fe
10 changed files with 113 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mail/claws-mail/Makefile
View File

@ -1,4 +1,6 @@
# $OpenBSD: Makefile,v 1.21 2008/07/02 09:28:09 landry Exp $
# $OpenBSD: Makefile,v 1.22 2008/10/17 12:46:33 landry Exp $
SHARED_ONLY= Yes
COMMENT-main= mail and news client
COMMENT-docs= documentation
@ -7,7 +9,7 @@ COMMENT-clamav= clamav plugin
COMMENT-dillo= dillo plugin
COMMENT-spamassassin= spamassassin plugin
V= 3.5.0
V= 3.6.1
DISTNAME= claws-mail-${V}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-docs= claws-mail-docs-${V}
@ -20,7 +22,7 @@ HOMEPAGE= http://www.claws-mail.org/
MAINTAINER= Ulrich Kahl <ulrich.kahl@cityweb.de>
# GPLv3
# GPLv3+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -38,7 +40,6 @@ FLAVOR?=
FLAVOR_STRING= ${FLAVOR_EXT:S/-/,/g}
SUBST_VARS= FLAVOR_STRING
SHARED_ONLY= Yes
RUN_DEPENDS-bogofilter= ::${BUILD_PKGPATH} \
::mail/bogofilter
RUN_DEPENDS-dillo= ::${BUILD_PKGPATH} \
@ -53,12 +54,12 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
pangoft2-1.0 pcre pixman-1 png ssl z
WANTLIB-main= ${WANTLIB} ICE SM c dbus-1 gthread-2.0 gpg-error \
pthread stdc++
gcrypt pthread stdc++
WANTLIB-docs=
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
etpan::mail/libetpan \
etpan.>=13::mail/libetpan \
sasl2::security/cyrus-sasl2
RUN_DEPENDS-main= ${RUN_DEPENDS} \
@ -66,7 +67,8 @@ RUN_DEPENDS-main= ${RUN_DEPENDS} \
LIB_DEPENDS-main= ${LIB_DEPENDS} \
startup-notification-1::devel/startup-notification \
aspell::textproc/aspell/core \
enchant::textproc/enchant \
gnutls::security/gnutls \
gpgme::security/gpgme \
dbus-glib-1::x11/dbus-glib
@ -158,7 +160,6 @@ post-install:
${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

10
mail/claws-mail/distinfo
View File

@ -1,5 +1,5 @@
MD5 (claws/claws-mail-3.5.0.tar.bz2) = WXqaC50RMyXeb9AVAMCvmA==
RMD160 (claws/claws-mail-3.5.0.tar.bz2) = g3IgomZcCjldJbvatkr4kD5XjR0=
SHA1 (claws/claws-mail-3.5.0.tar.bz2) = GDMQajo2Whao8bgzYto27zLt1vs=
SHA256 (claws/claws-mail-3.5.0.tar.bz2) = UepE4XH/oAmITs3dto2f7QhtmvvFRswwPoRi3omoq/o=
SIZE (claws/claws-mail-3.5.0.tar.bz2) = 4819732
MD5 (claws/claws-mail-3.6.1.tar.bz2) = dhuK4tV0WIRgoPsepJMcyw==
RMD160 (claws/claws-mail-3.6.1.tar.bz2) = o2qSu+n+ID93C/6oDr4GNi5ZxmY=
SHA1 (claws/claws-mail-3.6.1.tar.bz2) = WJS25TOhUc6OS+ZEXhF81AoPY7k=
SHA256 (claws/claws-mail-3.6.1.tar.bz2) = ZzN6ShpaXOCfKjhCK3pvxIHkdH901N3t0TDU+wb8OQc=
SIZE (claws/claws-mail-3.6.1.tar.bz2) = 5387916

12
mail/claws-mail/patches/patch-configure_ac
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.4 2008/07/02 09:28:09 landry Exp $
--- configure.ac.orig Fri Jun 27 09:49:55 2008
+++ configure.ac Tue Jul 1 13:44:47 2008
@@ -628,6 +628,7 @@ else
$OpenBSD: patch-configure_ac,v 1.5 2008/10/17 12:46:33 landry Exp $
--- configure.ac.orig Fri Oct 3 05:19:26 2008
+++ configure.ac Sat Oct 4 16:02:26 2008
@@ -640,6 +640,7 @@ else
AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="$LDAP_LIBS -lresolv")
AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
@ -9,7 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2008/07/02 09:28:09 landry Exp $
AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="$LDAP_LIBS -llber",,
$LDAP_LIBS)
@@ -643,7 +644,8 @@ else
@@ -655,7 +656,8 @@ else
AC_CHECK_LIB(ldap, ldap_start_tls_s,
[ ac_cv_have_tls=yes ],
@ -19,7 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2008/07/02 09:28:09 landry Exp $
fi
@@ -703,7 +705,7 @@ if test "$ac_cv_enable_jpilot" = yes; then
@@ -715,7 +717,7 @@ if test "$ac_cv_enable_jpilot" = yes; then
AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ])
fi

12
mail/claws-mail/patches/patch-m4_aspell_m4
View File

@ -1,12 +0,0 @@
$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
@@ -70,7 +70,7 @@ dnl
ifelse([$3], , :, [$3])
else
ASPELL_CFLAGS="-I$aspell_includes"
- ASPELL_LIBS="-L$aspell_libs -laspell"
+ ASPELL_LIBS="-L$aspell_libs -laspell -lstdc++ -lm"
aspell_version=`$ASPELL version|sed -e "s/\(@(#) International Ispell Version 3.1.20 (but really Aspell \)\(.*\))/\2/"`
rm -f conf.aspelltest
AC_TRY_RUN([

66
mail/claws-mail/patches/patch-src_common_smtp_c Normal file
View File

@ -0,0 +1,66 @@
$OpenBSD: patch-src_common_smtp_c,v 1.1 2008/10/17 12:46:33 landry Exp $
--- src/common/smtp.c.orig Sat Oct 4 16:19:23 2008
+++ src/common/smtp.c Sat Oct 4 16:21:59 2008
@@ -124,7 +124,7 @@ static void smtp_session_destroy(Session *session)
gint smtp_from(SMTPSession *session)
{
- gchar buf[MSGBUFSIZE];
+ gchar buf[MESSAGEBUFSIZE];
gchar *mail_size = NULL;
g_return_val_if_fail(session->from != NULL, SM_ERROR);
@@ -182,7 +182,7 @@ static gint smtp_auth(SMTPSession *session)
static gint smtp_auth_recv(SMTPSession *session, const gchar *msg)
{
- gchar buf[MSGBUFSIZE];
+ gchar buf[MESSAGEBUFSIZE];
switch (session->auth_type) {
case SMTPAUTH_LOGIN:
@@ -258,7 +258,7 @@ static gint smtp_auth_recv(SMTPSession *session, const
static gint smtp_auth_login_user_recv(SMTPSession *session, const gchar *msg)
{
- gchar buf[MSGBUFSIZE];
+ gchar buf[MESSAGEBUFSIZE];
session->state = SMTP_AUTH_LOGIN_PASS;
@@ -278,7 +278,7 @@ static gint smtp_auth_login_user_recv(SMTPSession *ses
static gint smtp_ehlo(SMTPSession *session)
{
- gchar buf[MSGBUFSIZE];
+ gchar buf[MESSAGEBUFSIZE];
session->state = SMTP_EHLO;
@@ -357,7 +357,7 @@ static gint smtp_auth_cram_md5(SMTPSession *session)
static gint smtp_auth_plain(SMTPSession *session)
{
- gchar buf[MSGBUFSIZE];
+ gchar buf[MESSAGEBUFSIZE];
/*
* +1 +1 +1
@@ -422,7 +422,7 @@ static gint smtp_auth_login(SMTPSession *session)
static gint smtp_helo(SMTPSession *session)
{
- gchar buf[MSGBUFSIZE];
+ gchar buf[MESSAGEBUFSIZE];
session->state = SMTP_HELO;
@@ -437,7 +437,7 @@ static gint smtp_helo(SMTPSession *session)
static gint smtp_rcpt(SMTPSession *session)
{
- gchar buf[MSGBUFSIZE];
+ gchar buf[MESSAGEBUFSIZE];
gchar *to;
g_return_val_if_fail(session->cur_to != NULL, SM_ERROR);

12
mail/claws-mail/patches/patch-src_common_smtp_h
View File

@ -1,14 +1,12 @@
$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
@@ -32,7 +32,9 @@ typedef struct _SMTPSession SMTPSession;
$OpenBSD: patch-src_common_smtp_h,v 1.2 2008/10/17 12:46:33 landry Exp $
--- src/common/smtp.h.orig Thu Jul 3 16:31:28 2008
+++ src/common/smtp.h Sat Oct 4 16:20:27 2008
@@ -32,7 +32,7 @@ typedef struct _SMTPSession SMTPSession;
#define SMTP_SESSION(obj) ((SMTPSession *)obj)
-#define MSGBUFSIZE 8192
+#ifndef MSGBUFSIZE
+# define MSGBUFSIZE 8192
+#endif
+#define MESSAGEBUFSIZE 8192
typedef enum
{

12
mail/claws-mail/patches/patch-src_common_socket_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_common_socket_c,v 1.1 2008/04/23 21:11:29 landry Exp $
--- src/common/socket.c.orig Wed Apr 23 23:03:12 2008
+++ src/common/socket.c Wed Apr 23 23:03:21 2008
@@ -124,7 +124,7 @@ struct _SockSource {
SockInfo *sock;
};
-static guint io_timeout = 60;
+static guint io_timeout = 76;
static GList *sock_connect_data_list = NULL;

10
mail/claws-mail/patches/patch-src_inc_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_inc_c,v 1.5 2008/07/02 09:28:09 landry Exp $
--- src/inc.c.orig Fri Jun 27 09:40:19 2008
+++ src/inc.c Tue Jul 1 13:44:40 2008
@@ -88,7 +88,7 @@ static GdkPixbuf *currentpix;
$OpenBSD: patch-src_inc_c,v 1.6 2008/10/17 12:46:33 landry Exp $
--- src/inc.c.orig Thu Sep 18 05:44:28 2008
+++ src/inc.c Sat Oct 4 16:02:19 2008
@@ -85,7 +85,7 @@ static GdkPixbuf *currentpix;
static GdkPixbuf *errorpix;
static GdkPixbuf *okpix;
@ -10,7 +10,7 @@ $OpenBSD: patch-src_inc_c,v 1.5 2008/07/02 09:28:09 landry Exp $
static void inc_finished (MainWindow *mainwin,
gboolean new_messages,
@@ -955,7 +955,7 @@ static void inc_progress_dialog_set_label(IncProgressD
@@ -946,7 +946,7 @@ static void inc_progress_dialog_set_label(IncProgressD
static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog,
IncSession *inc_session)
{

8
mail/claws-mail/patches/patch-src_procmime_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_procmime_c,v 1.5 2008/02/13 13:17:26 landry Exp $
--- src/procmime.c.orig Fri Feb 8 06:33:17 2008
+++ src/procmime.c Fri Feb 8 18:19:56 2008
@@ -1083,7 +1083,7 @@ GList *procmime_get_mime_type_list(void)
$OpenBSD: patch-src_procmime_c,v 1.6 2008/10/17 12:46:33 landry Exp $
--- src/procmime.c.orig Wed Oct 1 03:10:29 2008
+++ src/procmime.c Sat Oct 4 16:02:19 2008
@@ -1085,7 +1085,7 @@ GList *procmime_get_mime_type_list(void)
#endif
{
fp_is_glob_file = FALSE;

14
mail/claws-mail/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.12 2008/07/02 09:28:09 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.13 2008/10/17 12:46:33 landry Exp $
@pkgpath mail/sylpheed-claws,-main${FLAVOR_STRING}
@pkgpath mail/sylpheed-claws${FLAVOR_STRING}
@bin bin/claws-mail
@ -102,6 +102,9 @@ include/claws-mail/gtk/description_window.h
include/claws-mail/gtk/filesel.h
include/claws-mail/gtk/foldersort.h
include/claws-mail/gtk/gtkaspell.h
include/claws-mail/gtk/gtkcmclist.h
include/claws-mail/gtk/gtkcmctree.h
include/claws-mail/gtk/gtkcmoptionmenu.h
include/claws-mail/gtk/gtksctree.h
include/claws-mail/gtk/gtkshruler.h
include/claws-mail/gtk/gtksourceprintjob.h
@ -168,6 +171,8 @@ include/claws-mail/plugins/pgpinline/
include/claws-mail/plugins/pgpinline/pgpinline.h
include/claws-mail/plugins/pgpmime/
include/claws-mail/plugins/pgpmime/pgpmime.h
include/claws-mail/plugins/smime/
include/claws-mail/plugins/smime/smime.h
include/claws-mail/pop.h
include/claws-mail/prefs_account.h
include/claws-mail/prefs_actions.h
@ -234,6 +239,9 @@ lib/claws-mail/plugins/pgpinline.so
lib/claws-mail/plugins/pgpmime.deps
lib/claws-mail/plugins/pgpmime.la
lib/claws-mail/plugins/pgpmime.so
lib/claws-mail/plugins/smime.deps
lib/claws-mail/plugins/smime.la
lib/claws-mail/plugins/smime.so
lib/claws-mail/plugins/trayicon.la
lib/claws-mail/plugins/trayicon.so
lib/pkgconfig/
@ -292,6 +300,7 @@ share/icons/hicolor/48x48/apps/claws-mail.png
share/icons/hicolor/64x64/
share/icons/hicolor/64x64/apps/
share/icons/hicolor/64x64/apps/claws-mail.png
share/locale/bg/LC_MESSAGES/claws-mail.mo
share/locale/ca/LC_MESSAGES/claws-mail.mo
share/locale/de/LC_MESSAGES/claws-mail.mo
share/locale/en_GB/
@ -302,10 +311,13 @@ share/locale/fi/LC_MESSAGES/claws-mail.mo
share/locale/fr/LC_MESSAGES/claws-mail.mo
share/locale/hu/LC_MESSAGES/claws-mail.mo
share/locale/it/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
@exec %D/bin/update-desktop-database
@unexec %D/bin/update-desktop-database