Index: branches/2019Q1/mail/claws-mail/Makefile =================================================================== --- branches/2019Q1/mail/claws-mail/Makefile (revision 489852) +++ branches/2019Q1/mail/claws-mail/Makefile (revision 489853) @@ -1,87 +1,88 @@ # Created by: Simon 'corecode' Schubert # $FreeBSD$ PORTNAME= claws-mail +PORTREVISION= 1 CATEGORIES= mail news ipv6 COMMENT= Lightweight and featureful GTK+ based e-mail and news client LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcurl.so:ftp/curl \ libetpan.so:mail/libetpan \ libfreetype.so:print/freetype2 \ libsasl2.so:security/cyrus-sasl2 \ libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ libnettle.so:security/nettle RUN_DEPENDS= mime-support>0:misc/mime-support -USES= compiler:c++11-lang cpe desktop-file-utils gnome pathfix \ - python:2.7 shebangfix ssl +USES= autoreconf gettext-tools compiler:c++11-lang cpe desktop-file-utils gettext gnome pathfix \ + python:3.6 shebangfix ssl USE_XORG= ice sm USE_GNOME= cairo gtk20 librsvg2 SHEBANG_FILES= tools/*.pl tools/*.py tools/tb2claws-mail INSTALLS_ICONS= yes OPTIONS_DEFINE= COMPFACE DEBUG DOCS ENCHANT IPV6 JPILOT LDAP \ NLS STARTUP THEMES OPTIONS_DEFAULT=COMPFACE ENCHANT STARTUP THEMES OPTIONS_SUB= yes COMPFACE_DESC= X-Face support COMPFACE_CONFIGURE_ENABLE= compface COMPFACE_LIB_DEPENDS= libcompface.so:mail/faces DEBUG_CONFIGURE_ON= --enable-maintainer-mode ENCHANT_DESC= Spell checking support ENCHANT_CONFIGURE_ENABLE= enchant ENCHANT_LIB_DEPENDS= libenchant.so:textproc/enchant IPV6_CONFIGURE_ENABLE= ipv6 JPILOT_DESC= JPilot support JPILOT_CONFIGURE_ENABLE= jpilot JPILOT_LIB_DEPENDS= libpisock.so:palm/pilot-link JPILOT_RUN_DEPENDS= jpilot:palm/jpilot LDAP_CONFIGURE_ENABLE= ldap LDAP_USE= openldap=yes NLS_CONFIGURE_OFF= --disable-nls NLS_USES= gettext-tools STARTUP_DESC= Startup notification support STARTUP_CONFIGURE_ENABLE= startup-notification STARTUP_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification THEMES_DESC= Additional themes THEMES_RUN_DEPENDS= claws-mail-themes>0:x11-themes/claws-mail-themes .include "Makefile.claws" post-patch: @${REINPLACE_CMD} 's|-dirty||' ${WRKSRC}/version post-install: @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/tools && \ ${INSTALL_SCRIPT} OOo2claws-mail.pl acroread2claws-mail.pl \ calypso_convert.pl convert_mbox.pl eud2gc.py filter_conv.pl \ filter_conv_new.pl fix_date.sh gif2xface.pl google_msgid.pl \ google_search.pl kmail-mailbox2claws-mail.pl kmail2claws-mail.pl \ kmail2claws-mail_v2.pl multiwebsearch.conf multiwebsearch.pl \ nautilus2claws-mail.sh outlook2claws-mail.pl tb2claws-mail \ tbird2claws.py textviewer.pl textviewer.sh \ thunderbird-filters-convertor.pl uudec uuooffice vcard2xml.py \ ${STAGEDIR}${DATADIR}) post-install-DOCS-on: (cd ${WRKSRC} && ${INSTALL_DATA} NEWS README TODO ${STAGEDIR}${DOCSDIR}) ${INSTALL_DATA} ${WRKSRC}/tools/README ${STAGEDIR}${DOCSDIR}/README.tools .include Index: branches/2019Q1/mail/claws-mail/Makefile.claws =================================================================== --- branches/2019Q1/mail/claws-mail/Makefile.claws (revision 489852) +++ branches/2019Q1/mail/claws-mail/Makefile.claws (revision 489853) @@ -1,82 +1,82 @@ # $FreeBSD$ PORTVERSION= 3.17.3 CATEGORIES?= mail MASTER_SITES= http://www.claws-mail.org/download.php?file=releases/ MAINTAINER= joneum@FreeBSD.org LICENSE= GPLv3 -USES+= gettext-runtime gmake iconv libtool pkgconfig tar:xz +USES+= autoreconf gettext-tools gmake iconv libtool pkgconfig tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG} --disable-dbus --disable-static CLAWS_PLUGINS= acpi_notifier \ address_keeper \ archive \ att_remover \ attachwarner \ bogofilter \ bsfilter \ clamd \ fancy \ fetchinfo \ gdata \ libravatar \ mailmbox \ managesieve \ newmail \ notification \ pdf_viewer \ perl \ python \ pgpcore \ pgpinline \ pgpmime \ rssyl \ smime \ spam_report \ spamassassin \ tnef_parse \ vcalendar .for p in ${CLAWS_PLUGINS} CONFIGURE_ARGS+= --disable-${p}-plugin .endfor .if defined(CLAWS_PLUGINS_BUILD) DISTNAME= claws-mail-${PORTVERSION} PKGNAMEPREFIX= claws-mail- BUILD_DEPENDS+= claws-mail>=${PORTVERSION}:mail/claws-mail RUN_DEPENDS+= claws-mail>=${PORTVERSION}:mail/claws-mail MASTERDIR= ${.CURDIR}/../../mail/claws-mail DESCR= ${.CURDIR}/pkg-descr FILESDIR= ${.CURDIR}/files PLIST= ${NONEXISTENT} PKGMESSAGE= ${.CURDIR}/pkg-message CONFIGURE_ARGS+= --disable-nls . for p in ${CLAWS_PLUGINS_BUILD} CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S|--disable-${p}-plugin||} PLIST_FILES+= lib/claws-mail/plugins/${p:S|spam_|spam|}.so . endfor do-build: . for p in ${CLAWS_PLUGINS_BUILD} (cd ${WRKSRC}/src/plugins/${p} && ${MAKE_CMD}) . endfor do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/claws-mail/plugins . for p in ${CLAWS_PLUGINS_BUILD} (cd ${WRKSRC}/src/plugins/${p} && \ ${INSTALL_LIB} .libs/${p:S|spam_|spam|}.so \ ${STAGEDIR}${PREFIX}/lib/claws-mail/plugins) . endfor .endif Index: branches/2019Q1/mail/claws-mail/files/patch-configure.ac =================================================================== --- branches/2019Q1/mail/claws-mail/files/patch-configure.ac (nonexistent) +++ branches/2019Q1/mail/claws-mail/files/patch-configure.ac (revision 489853) @@ -0,0 +1,20 @@ +--- configure.ac.orig 2019-01-08 23:08:21 UTC ++++ configure.ac +@@ -1268,7 +1268,7 @@ fi + + dnl Python ********************************************************************* + AM_PATH_PYTHON([2.5], [ +- AC_PATH_PROG(PYTHON_CONFIG, python$PYTHON_VERSION-config) ++ AC_PATH_PROG(PYTHON_CONFIG, python"$PYTHON_VERSION"m-config) + if test x"$PYTHON_CONFIG" = x"" ; then + AC_PATH_PROG(PYTHON_CONFIG, python-config) + fi +@@ -1286,7 +1286,7 @@ AM_PATH_PYTHON([2.5], [ + _save_libs="$LIBS" + if test x"$platform_win32" = xno; then + # libpython.so +- PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}.so" ++ PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}m.so" + AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl"]) + AC_MSG_CHECKING([whether to dlopen $PYTHON_SHARED_LIB works]) + AC_RUN_IFELSE( Property changes on: branches/2019Q1/mail/claws-mail/files/patch-configure.ac ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_accounttype.c =================================================================== --- branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_accounttype.c (nonexistent) +++ branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_accounttype.c (revision 489853) @@ -0,0 +1,22 @@ +--- src/plugins/python/accounttype.c.orig 2018-09-10 13:00:33 UTC ++++ src/plugins/python/accounttype.c +@@ -24,6 +24,10 @@ + + #include + ++#if PY_MAJOR_VERSION == 3 ++typedef int (*cmpfunc)(PyObject *, PyObject *); ++#endif ++ + typedef struct { + PyObject_HEAD + PrefsAccount *account; +@@ -38,7 +42,7 @@ static int Account_init(clawsmail_Accoun + + static void Account_dealloc(clawsmail_AccountObject* self) + { +- self->ob_type->tp_free((PyObject*)self); ++ Py_TYPE(self)->tp_free((PyObject*)self); + } + + static int Account_compare(clawsmail_AccountObject *obj1, clawsmail_AccountObject *obj2) Property changes on: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_accounttype.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_composewindowtype.c =================================================================== --- branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_composewindowtype.c (nonexistent) +++ branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_composewindowtype.c (revision 489853) @@ -0,0 +1,20 @@ +--- src/plugins/python/composewindowtype.c.orig 2019-01-09 18:38:06 UTC ++++ src/plugins/python/composewindowtype.c +@@ -54,7 +54,7 @@ static void ComposeWindow_dealloc(clawsm + Py_XDECREF(self->text); + Py_XDECREF(self->replyinfo); + Py_XDECREF(self->fwdinfo); +- self->ob_type->tp_free((PyObject*)self); ++ Py_TYPE(self)->tp_free((PyObject*)self); + } + + static void flush_gtk_queue(void) +@@ -345,7 +345,7 @@ static PyObject* ComposeWindow_set_heade + headerfield = PyTuple_GetItem(element, 0); + headercontent = PyTuple_GetItem(element, 1); + if(!headerfield || !headercontent +- || !PyObject_TypeCheck(headerfield, &PyString_Type) || !PyObject_TypeCheck(headercontent, &PyString_Type)) { ++ || !PyObject_TypeCheck(headerfield, &PyBytes_Type) || !PyObject_TypeCheck(headercontent, &PyBytes_Type)) { + PyErr_SetString(PyExc_LookupError, "Argument to set_header_list() must be a list of tuples with two strings"); + return NULL; + } Property changes on: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_composewindowtype.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_folderpropertiestype.c =================================================================== --- branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_folderpropertiestype.c (nonexistent) +++ branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_folderpropertiestype.c (revision 489853) @@ -0,0 +1,11 @@ +--- src/plugins/python/folderpropertiestype.c.orig 2019-01-09 18:47:36 UTC ++++ src/plugins/python/folderpropertiestype.c +@@ -38,7 +38,7 @@ static int FolderProperties_init(clawsma + + static void FolderProperties_dealloc(clawsmail_FolderPropertiesObject* self) + { +- self->ob_type->tp_free((PyObject*)self); ++ Py_TYPE(self)->tp_free((PyObject*)self); + } + + static PyObject* get_default_account(clawsmail_FolderPropertiesObject *self, void *closure) Property changes on: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_folderpropertiestype.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_foldertype.c =================================================================== --- branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_foldertype.c (nonexistent) +++ branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_foldertype.c (revision 489853) @@ -0,0 +1,11 @@ +--- src/plugins/python/foldertype.c.orig 2019-01-09 18:47:36 UTC ++++ src/plugins/python/foldertype.c +@@ -40,7 +40,7 @@ typedef struct { + static void Folder_dealloc(clawsmail_FolderObject* self) + { + Py_XDECREF(self->properties); +- self->ob_type->tp_free((PyObject*)self); ++ Py_TYPE(self)->tp_free((PyObject*)self); + } + + static int Folder_init(clawsmail_FolderObject *self, PyObject *args, PyObject *kwds) Property changes on: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_foldertype.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_mailboxtype.c =================================================================== --- branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_mailboxtype.c (nonexistent) +++ branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_mailboxtype.c (revision 489853) @@ -0,0 +1,11 @@ +--- src/plugins/python/mailboxtype.c.orig 2019-01-09 18:47:36 UTC ++++ src/plugins/python/mailboxtype.c +@@ -41,7 +41,7 @@ static int Mailbox_init(clawsmail_Mailbo + static void Mailbox_dealloc(clawsmail_MailboxObject* self) + { + self->folder = NULL; +- self->ob_type->tp_free((PyObject*)self); ++ Py_TYPE(self)->tp_free((PyObject*)self); + } + + static PyObject* Mailbox_str(clawsmail_MailboxObject *self) Property changes on: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_mailboxtype.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_messageinfotype.c =================================================================== --- branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_messageinfotype.c (nonexistent) +++ branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_messageinfotype.c (revision 489853) @@ -0,0 +1,11 @@ +--- src/plugins/python/messageinfotype.c.orig 2019-01-09 18:47:36 UTC ++++ src/plugins/python/messageinfotype.c +@@ -43,7 +43,7 @@ typedef struct { + + static void MessageInfo_dealloc(clawsmail_MessageInfoObject* self) + { +- self->ob_type->tp_free((PyObject*)self); ++ Py_TYPE(self)->tp_free((PyObject*)self); + } + + static int MessageInfo_init(clawsmail_MessageInfoObject *self, PyObject *args, PyObject *kwds) Property changes on: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_messageinfotype.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q1/mail/claws-mail-python/Makefile =================================================================== --- branches/2019Q1/mail/claws-mail-python/Makefile (revision 489852) +++ branches/2019Q1/mail/claws-mail-python/Makefile (revision 489853) @@ -1,16 +1,14 @@ # Created by: Martin Wilke # $FreeBSD$ PORTNAME= python -PORTREVISION= 0 +PORTREVISION= 1 COMMENT= Python scripting plugin for Claws Mail - -BROKEN= fails to stage USE_GNOME= pygtk2 CLAWS_PLUGINS_BUILD= python .include "../claws-mail/Makefile.claws" .include Index: branches/2019Q1 =================================================================== --- branches/2019Q1 (revision 489852) +++ branches/2019Q1 (revision 489853) Property changes on: branches/2019Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r489852