<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e65cfab05f36944037cb508c8a17974aa954726c">https://github.com/macports/macports-ports/commit/e65cfab05f36944037cb508c8a17974aa954726c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e65cfab claws-mail: add patch to build with libetpan 1.9.4
</span>e65cfab is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e65cfab05f36944037cb508c8a17974aa954726c
</span>Author: Perry E. Metzger <perry@piermont.com>
AuthorDate: Wed Nov 6 10:33:36 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> claws-mail: add patch to build with libetpan 1.9.4
</span>---
mail/claws-mail/Portfile | 5 +-
mail/claws-mail/files/patch-libetpan-1.9.4.diff | 97 +++++++++++++++++++++++++
2 files changed, 101 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/claws-mail/Portfile b/mail/claws-mail/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fd8c437..a77a0c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/claws-mail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/claws-mail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup cxx11 1.1
</span>
name claws-mail
version 3.17.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories mail news
platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,6 +64,9 @@ if {${os.platform} eq "darwin" && ${os.version} < 12} {
</span> patchfiles patch-claws-mail-no-export-dynamic-on-older-ld-versions.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# This can likely be removed when claws is upgraded from 3.17.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-libetpan-1.9.4.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # override faulty check for C++ compiler
configure.env-append \
REAL_CXX=${configure.cxx}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/claws-mail/files/patch-libetpan-1.9.4.diff b/mail/claws-mail/files/patch-libetpan-1.9.4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ecd5062
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/claws-mail/files/patch-libetpan-1.9.4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,97 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 412a3f014..6a80c2a92 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -908,38 +908,62 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Libetpan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([whether to use libetpan])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x"$enable_libetpan" = xyes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT(yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libetpan_result=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_PATH_PROG(libetpanconfig, [libetpan-config])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x$libetpanconfig" != "x"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="$CPPFLAGS `$libetpanconfig --cflags 2>/dev/null`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x$libetpan_result" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([$libetpan_result])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x$libetpan_result" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBETPAN_LIBS="`$libetpanconfig --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "$LIBETPAN_VERSION" -lt "57"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT(yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ libetpan_config=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ libetpan_result=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ libetpan_versiontype=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # since 1.9.4, libetpan uses pkg-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_MODULES([LIBETPAN], [libetpan >= 1.9.4],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBETPAN_VERSION=`pkg-config --modversion | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ libetpan_config=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # before 1.9.4, libetpan uses its own libetpan-config script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_PATH_PROG(libetpanconfig, [libetpan-config])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "x$libetpanconfig" != "x"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBETPAN_LIBS="`$libetpanconfig --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # support libetpan version like x.x and x.x.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ libetpan_versiontype=`$libetpanconfig --version | tr -dc . | wc -c`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test $libetpan_versiontype -eq 1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ libetpan_config=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "x$libetpan_config" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CPPFLAGS="$CPPFLAGS $LIBETPAN_FLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "x$libetpan_result" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS="$LIBS $LIBETPAN_LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT([$libetpan_result])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "x$libetpan_result" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test $libetpan_versiontype -eq 1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "$LIBETPAN_VERSION" -lt "57"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([libetpan 0.57 not found])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_SUBST(LIBETPAN_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_SUBST(LIBETPAN_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([libetpan 0.57 not found])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_SUBST(LIBETPAN_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_SUBST(LIBETPAN_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNit TP support.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([libetpan 0.57 not found])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT(no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT(no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>