View | Details | Raw Unified | Return to bug 245464
Collapse All | Expand All

(-)claws-mail/Makefile (-12 / +12 lines)
Lines 21-27 Link Here
21
		libnettle.so:security/nettle
21
		libnettle.so:security/nettle
22
RUN_DEPENDS=	mime-support>0:misc/mime-support
22
RUN_DEPENDS=	mime-support>0:misc/mime-support
23
23
24
USES=		autoreconf gettext-tools compiler:c++11-lang cpe desktop-file-utils gettext gnome pathfix pkgconfig \
24
USES=		autoreconf compiler:c++11-lang cpe desktop-file-utils gettext gettext-tools gnome pathfix pkgconfig \
25
		python:3.6 shebangfix ssl xorg
25
		python:3.6 shebangfix ssl xorg
26
USE_XORG=	ice sm
26
USE_XORG=	ice sm
27
USE_GNOME=	cairo gtk20 librsvg2
27
USE_GNOME=	cairo gtk20 librsvg2
Lines 60-79 Link Here
60
60
61
.include "Makefile.claws"
61
.include "Makefile.claws"
62
62
63
post-patch:
64
	@${REINPLACE_CMD} 's|-dirty||' ${WRKSRC}/version
65
66
post-install:
63
post-install:
67
	@${MKDIR} ${STAGEDIR}${DATADIR}
64
	@${MKDIR} ${STAGEDIR}${DATADIR}
68
	(cd ${WRKSRC}/tools && \
65
	(cd ${WRKSRC}/tools && \
69
		${INSTALL_SCRIPT} OOo2claws-mail.pl acroread2claws-mail.pl \
66
		${INSTALL_SCRIPT} acroread2claws-mail.pl ca-certificates.crt \
70
		calypso_convert.pl convert_mbox.pl eud2gc.py filter_conv.pl \
67
		calypso_convert.pl claws-mail-compose-insert-files.pl \
71
		filter_conv_new.pl fix_date.sh gif2xface.pl google_msgid.pl \
68
		cm-reparent.pl convert_mbox.pl csv2addressbook.pl ddg_search.pl \
72
		google_search.pl kmail-mailbox2claws-mail.pl kmail2claws-mail.pl \
69
		eud2gc.py filter_conv.pl filter_conv_new.pl fix_date.sh \
73
		kmail2claws-mail_v2.pl multiwebsearch.conf multiwebsearch.pl \
70
		gif2xface.pl google_msgid.pl kmail-mailbox2claws-mail.pl \
74
		nautilus2claws-mail.sh outlook2claws-mail.pl tb2claws-mail \
71
		kmail2claws-mail.pl kmail2claws-mail_v2.pl mairix.sh \
75
		tbird2claws.py textviewer.pl textviewer.sh \
72
		mew2claws-mail.pl multiwebsearch.conf multiwebsearch.pl \
76
		thunderbird-filters-convertor.pl uudec uuooffice vcard2xml.py \
73
		nautilus2claws-mail.sh outlook2claws-mail.pl popfile-link.sh \
74
		tb2claws-mail tbird2claws.py textviewer.pl textviewer.sh \
75
		thunderbird-filters-convertor.pl update-po uudec uuooffice \
76
		vcard2xml.py \
77
		${STAGEDIR}${DATADIR})
77
		${STAGEDIR}${DATADIR})
78
78
79
post-install-DOCS-on:
79
post-install-DOCS-on:
(-)claws-mail/Makefile.claws (-1 / +3 lines)
Lines 1-6 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTVERSION=	3.17.4
3
PORTVERSION=	3.17.5
4
CATEGORIES?=	mail
4
CATEGORIES?=	mail
5
MASTER_SITES=	http://www.claws-mail.org/download.php?file=releases/
5
MASTER_SITES=	http://www.claws-mail.org/download.php?file=releases/
6
6
Lines 21-30 Link Here
21
		bogofilter \
21
		bogofilter \
22
		bsfilter \
22
		bsfilter \
23
		clamd \
23
		clamd \
24
		dillo \
24
		fancy \
25
		fancy \
25
		fetchinfo \
26
		fetchinfo \
26
		gdata \
27
		gdata \
27
		libravatar \
28
		libravatar \
29
		litehtml_viewer \
28
		mailmbox \
30
		mailmbox \
29
		managesieve \
31
		managesieve \
30
		newmail \
32
		newmail \
(-)claws-mail/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1564729842
1
TIMESTAMP = 1586379298
2
SHA256 (claws-mail-3.17.4.tar.xz) = 590ed1131e51b3a627e75c3b256068f5176a498628e1c8f3315b9bc09482ae02
2
SHA256 (claws-mail-3.17.5.tar.xz) = daced25bfc2ab5b3f9ac2762b091ca3aede50da23e694d338dff1f066bab59be
3
SIZE (claws-mail-3.17.4.tar.xz) = 6280252
3
SIZE (claws-mail-3.17.5.tar.xz) = 6290944
(-)claws-mail/files/patch-configure (-20 lines)
Lines 1-20 Link Here
1
--- configure.orig	2016-11-12 20:55:45 UTC
2
+++ configure
3
@@ -21147,7 +21147,7 @@ $as_echo "#define HAVE_LIBSOUP_GNOME 1" 
4
 fi
5
 
6
 
7
-
8
+OLDLIBS=$LIBS
9
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archive_read_new in -larchive" >&5
10
 $as_echo_n "checking for archive_read_new in -larchive... " >&6; }
11
 if ${ac_cv_lib_archive_archive_read_new+:} false; then :
12
@@ -21192,7 +21192,7 @@ else
13
   HAVE_ARCHIVE=no
14
 
15
 fi
16
-
17
+LIBS=$OLDLIBS
18
 
19
 
20
 pkg_failed=no
(-)claws-mail/files/patch-configure.ac (-37 / +4 lines)
Lines 1-39 Link Here
1
--- configure.ac.orig	2019-03-07 05:44:37 UTC
1
--- configure.ac.orig	2020-04-08 14:26:12.215936000 -0700
2
+++ configure.ac
2
+++ configure.ac	2020-04-08 14:30:01.861284000 -0700
3
@@ -920,6 +920,32 @@ if test x"$enable_libetpan" = xyes; then
3
@@ -1325,7 +1325,7 @@
4
 	    AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
5
 	    AC_MSG_RESULT([$libetpan_result])
6
 	  fi
7
+	   LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
8
+	   LIBETPAN_LIBS="`$libetpanconfig --libs`"
9
+	   LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
10
+	else
11
+	  libetpanconfig="pkg-config libetpan"
12
+	  CPPFLAGS="$CPPFLAGS `$libetpanconfig --cflags 2>/dev/null`"
13
+	  AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
14
+	  if test "x$libetpan_result" = "xyes"; then
15
+	    AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
16
+	    LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`"
17
+	    AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
18
+	    AC_MSG_RESULT([$libetpan_result])
19
+	  fi
20
+	   LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
21
+	   LIBETPAN_LIBS="`$libetpanconfig --libs`"
22
+	   LIBETPAN_VERSION=`$libetpanconfig --modversion | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
23
+	fi
24
+	if test "x$libetpan_result" = "xyes"; then
25
+	   if test "$LIBETPAN_VERSION" -lt "57"; then
26
+		AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
27
+		AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
28
+                AC_MSG_ERROR([libetpan 0.57 not found])
29
+	   fi
30
+	   AC_SUBST(LIBETPAN_FLAGS)
31
+	   AC_SUBST(LIBETPAN_LIBS)
32
+	   AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.)
33
 	fi
34
 	if test "x$libetpan_result" = "xyes"; then
35
 	   LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
36
@@ -1301,7 +1327,7 @@ fi
37
 dnl Python *********************************************************************
4
 dnl Python *********************************************************************
38
 missing_python=""
5
 missing_python=""
39
 AM_PATH_PYTHON([2.5], [
6
 AM_PATH_PYTHON([2.5], [
Lines 42-48 Link Here
42
 	if test x"$PYTHON_CONFIG" = x"" ; then
9
 	if test x"$PYTHON_CONFIG" = x"" ; then
43
 		AC_PATH_PROG(PYTHON_CONFIG, python-config)
10
 		AC_PATH_PROG(PYTHON_CONFIG, python-config)
44
 	fi
11
 	fi
45
@@ -1320,7 +1346,7 @@ AM_PATH_PYTHON([2.5], [
12
@@ -1344,7 +1344,7 @@
46
 		_save_libs="$LIBS"
13
 		_save_libs="$LIBS"
47
 		if test x"$platform_win32" = xno; then
14
 		if test x"$platform_win32" = xno; then
48
 			# libpython.so
15
 			# libpython.so
(-)claws-mail/files/patch-src_plugins_python_accounttype.c (-22 lines)
Lines 1-22 Link Here
1
--- src/plugins/python/accounttype.c.orig	2018-09-10 13:00:33 UTC
2
+++ src/plugins/python/accounttype.c
3
@@ -24,6 +24,10 @@
4
 
5
 #include <structmember.h>
6
 
7
+#if PY_MAJOR_VERSION == 3
8
+typedef int (*cmpfunc)(PyObject *, PyObject *);
9
+#endif
10
+
11
 typedef struct {
12
     PyObject_HEAD
13
     PrefsAccount *account;
14
@@ -38,7 +42,7 @@ static int Account_init(clawsmail_Accoun
15
 
16
 static void Account_dealloc(clawsmail_AccountObject* self)
17
 {
18
-  self->ob_type->tp_free((PyObject*)self);
19
+  Py_TYPE(self)->tp_free((PyObject*)self);
20
 }
21
 
22
 static int Account_compare(clawsmail_AccountObject *obj1, clawsmail_AccountObject *obj2)
(-)claws-mail/files/patch-src_plugins_python_composewindowtype.c (-20 lines)
Lines 1-20 Link Here
1
--- src/plugins/python/composewindowtype.c.orig	2019-01-09 18:38:06 UTC
2
+++ src/plugins/python/composewindowtype.c
3
@@ -54,7 +54,7 @@ static void ComposeWindow_dealloc(clawsm
4
   Py_XDECREF(self->text);
5
   Py_XDECREF(self->replyinfo);
6
   Py_XDECREF(self->fwdinfo);
7
-  self->ob_type->tp_free((PyObject*)self);
8
+  Py_TYPE(self)->tp_free((PyObject*)self);
9
 }
10
 
11
 static void flush_gtk_queue(void)
12
@@ -345,7 +345,7 @@ static PyObject* ComposeWindow_set_heade
13
     headerfield = PyTuple_GetItem(element, 0);
14
     headercontent = PyTuple_GetItem(element, 1);
15
     if(!headerfield || !headercontent
16
-        || !PyObject_TypeCheck(headerfield, &PyString_Type) || !PyObject_TypeCheck(headercontent, &PyString_Type)) {
17
+        || !PyObject_TypeCheck(headerfield, &PyBytes_Type) || !PyObject_TypeCheck(headercontent, &PyBytes_Type)) {
18
       PyErr_SetString(PyExc_LookupError, "Argument to set_header_list() must be a list of tuples with two strings");
19
       return NULL;
20
     }
(-)claws-mail/files/patch-src_plugins_python_folderpropertiestype.c (-11 lines)
Lines 1-11 Link Here
1
--- src/plugins/python/folderpropertiestype.c.orig	2019-01-09 18:47:36 UTC
2
+++ src/plugins/python/folderpropertiestype.c
3
@@ -38,7 +38,7 @@ static int FolderProperties_init(clawsma
4
 
5
 static void FolderProperties_dealloc(clawsmail_FolderPropertiesObject* self)
6
 {
7
-  self->ob_type->tp_free((PyObject*)self);
8
+  Py_TYPE(self)->tp_free((PyObject*)self);
9
 }
10
 
11
 static PyObject* get_default_account(clawsmail_FolderPropertiesObject *self, void *closure)
(-)claws-mail/files/patch-src_plugins_python_foldertype.c (-11 lines)
Lines 1-11 Link Here
1
--- src/plugins/python/foldertype.c.orig	2019-01-09 18:47:36 UTC
2
+++ src/plugins/python/foldertype.c
3
@@ -40,7 +40,7 @@ typedef struct {
4
 static void Folder_dealloc(clawsmail_FolderObject* self)
5
 {
6
   Py_XDECREF(self->properties);
7
-  self->ob_type->tp_free((PyObject*)self);
8
+  Py_TYPE(self)->tp_free((PyObject*)self);
9
 }
10
 
11
 static int Folder_init(clawsmail_FolderObject *self, PyObject *args, PyObject *kwds)
(-)claws-mail/files/patch-src_plugins_python_mailboxtype.c (-11 lines)
Lines 1-11 Link Here
1
--- src/plugins/python/mailboxtype.c.orig	2019-01-09 18:47:36 UTC
2
+++ src/plugins/python/mailboxtype.c
3
@@ -41,7 +41,7 @@ static int Mailbox_init(clawsmail_Mailbo
4
 static void Mailbox_dealloc(clawsmail_MailboxObject* self)
5
 {
6
   self->folder = NULL;
7
-  self->ob_type->tp_free((PyObject*)self);
8
+  Py_TYPE(self)->tp_free((PyObject*)self);
9
 }
10
 
11
 static PyObject* Mailbox_str(clawsmail_MailboxObject *self)
(-)claws-mail/files/patch-src_plugins_python_messageinfotype.c (-11 lines)
Lines 1-11 Link Here
1
--- src/plugins/python/messageinfotype.c.orig	2019-01-09 18:47:36 UTC
2
+++ src/plugins/python/messageinfotype.c
3
@@ -43,7 +43,7 @@ typedef struct {
4
 
5
 static void MessageInfo_dealloc(clawsmail_MessageInfoObject* self)
6
 {
7
-  self->ob_type->tp_free((PyObject*)self);
8
+  Py_TYPE(self)->tp_free((PyObject*)self);
9
 }
10
 
11
 static int MessageInfo_init(clawsmail_MessageInfoObject *self, PyObject *args, PyObject *kwds)
(-)claws-mail/pkg-plist (-3 / +9 lines)
Lines 229-235 Link Here
229
include/claws-mail/vcard.h
229
include/claws-mail/vcard.h
230
include/claws-mail/viewtypes.h
230
include/claws-mail/viewtypes.h
231
include/claws-mail/wizard.h
231
include/claws-mail/wizard.h
232
lib/claws-mail/plugins/dillo.so
233
lib/claws-mail/plugins/pgpinline.deps
232
lib/claws-mail/plugins/pgpinline.deps
234
lib/claws-mail/plugins/pgpmime.deps
233
lib/claws-mail/plugins/pgpmime.deps
235
lib/claws-mail/plugins/smime.deps
234
lib/claws-mail/plugins/smime.deps
Lines 236-245 Link Here
236
libdata/pkgconfig/claws-mail.pc
235
libdata/pkgconfig/claws-mail.pc
237
man/man1/claws-mail.1.gz
236
man/man1/claws-mail.1.gz
238
share/applications/claws-mail.desktop
237
share/applications/claws-mail.desktop
239
%%DATADIR%%/OOo2claws-mail.pl
240
%%DATADIR%%/acroread2claws-mail.pl
238
%%DATADIR%%/acroread2claws-mail.pl
239
%%DATADIR%%/ca-certificates.crt
241
%%DATADIR%%/calypso_convert.pl
240
%%DATADIR%%/calypso_convert.pl
241
%%DATADIR%%/claws-mail-compose-insert-files.pl
242
%%DATADIR%%/cm-reparent.pl
242
%%DATADIR%%/convert_mbox.pl
243
%%DATADIR%%/convert_mbox.pl
244
%%DATADIR%%/csv2addressbook.pl
245
%%DATADIR%%/ddg_search.pl
243
%%DATADIR%%/eud2gc.py
246
%%DATADIR%%/eud2gc.py
244
%%DATADIR%%/filter_conv.pl
247
%%DATADIR%%/filter_conv.pl
245
%%DATADIR%%/filter_conv_new.pl
248
%%DATADIR%%/filter_conv_new.pl
Lines 246-264 Link Here
246
%%DATADIR%%/fix_date.sh
249
%%DATADIR%%/fix_date.sh
247
%%DATADIR%%/gif2xface.pl
250
%%DATADIR%%/gif2xface.pl
248
%%DATADIR%%/google_msgid.pl
251
%%DATADIR%%/google_msgid.pl
249
%%DATADIR%%/google_search.pl
250
%%DATADIR%%/kmail-mailbox2claws-mail.pl
252
%%DATADIR%%/kmail-mailbox2claws-mail.pl
251
%%DATADIR%%/kmail2claws-mail.pl
253
%%DATADIR%%/kmail2claws-mail.pl
252
%%DATADIR%%/kmail2claws-mail_v2.pl
254
%%DATADIR%%/kmail2claws-mail_v2.pl
255
%%DATADIR%%/mairix.sh
256
%%DATADIR%%/mew2claws-mail.pl
253
%%DATADIR%%/multiwebsearch.conf
257
%%DATADIR%%/multiwebsearch.conf
254
%%DATADIR%%/multiwebsearch.pl
258
%%DATADIR%%/multiwebsearch.pl
255
%%DATADIR%%/nautilus2claws-mail.sh
259
%%DATADIR%%/nautilus2claws-mail.sh
256
%%DATADIR%%/outlook2claws-mail.pl
260
%%DATADIR%%/outlook2claws-mail.pl
261
%%DATADIR%%/popfile-link.sh
257
%%DATADIR%%/tb2claws-mail
262
%%DATADIR%%/tb2claws-mail
258
%%DATADIR%%/tbird2claws.py
263
%%DATADIR%%/tbird2claws.py
259
%%DATADIR%%/textviewer.pl
264
%%DATADIR%%/textviewer.pl
260
%%DATADIR%%/textviewer.sh
265
%%DATADIR%%/textviewer.sh
261
%%DATADIR%%/thunderbird-filters-convertor.pl
266
%%DATADIR%%/thunderbird-filters-convertor.pl
267
%%DATADIR%%/update-po
262
%%DATADIR%%/uudec
268
%%DATADIR%%/uudec
263
%%DATADIR%%/uuooffice
269
%%DATADIR%%/uuooffice
264
%%DATADIR%%/vcard2xml.py
270
%%DATADIR%%/vcard2xml.py

Return to bug 245464