From owner-svn-ports-head@freebsd.org Sun Nov 3 19:14:24 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 15F2617FDEB; Sun, 3 Nov 2019 19:14:24 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 475lwb6nMwz3Kgd; Sun, 3 Nov 2019 19:14:23 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CCC73186D8; Sun, 3 Nov 2019 19:14:23 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA3JENTV005334; Sun, 3 Nov 2019 19:14:23 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA3JENgp005330; Sun, 3 Nov 2019 19:14:23 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201911031914.xA3JENgp005330@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 3 Nov 2019 19:14:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516589 - in head/mail/claws-mail: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/mail/claws-mail: . files X-SVN-Commit-Revision: 516589 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2019 19:14:24 -0000 Author: sunpoet Date: Sun Nov 3 19:14:23 2019 New Revision: 516589 URL: https://svnweb.freebsd.org/changeset/ports/516589 Log: Fix build with libetpan 1.9.4 Reported by: antoine Modified: head/mail/claws-mail/Makefile head/mail/claws-mail/files/patch-configure.ac Modified: head/mail/claws-mail/Makefile ============================================================================== --- head/mail/claws-mail/Makefile Sun Nov 3 19:14:16 2019 (r516588) +++ head/mail/claws-mail/Makefile Sun Nov 3 19:14:23 2019 (r516589) @@ -21,7 +21,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libnettle.so:security/nettle RUN_DEPENDS= mime-support>0:misc/mime-support -USES= autoreconf gettext-tools compiler:c++11-lang cpe desktop-file-utils gettext gnome pathfix \ +USES= autoreconf gettext-tools compiler:c++11-lang cpe desktop-file-utils gettext gnome pathfix pkgconfig \ python:3.6 shebangfix ssl USE_XORG= ice sm USE_GNOME= cairo gtk20 librsvg2 Modified: head/mail/claws-mail/files/patch-configure.ac ============================================================================== --- head/mail/claws-mail/files/patch-configure.ac Sun Nov 3 19:14:16 2019 (r516588) +++ head/mail/claws-mail/files/patch-configure.ac Sun Nov 3 19:14:23 2019 (r516589) @@ -1,15 +1,48 @@ ---- configure.ac.orig 2019-01-08 23:08:21 UTC +--- configure.ac.orig 2019-03-07 05:44:37 UTC +++ configure.ac -@@ -1268,7 +1268,7 @@ fi - +@@ -920,6 +920,32 @@ if test x"$enable_libetpan" = xyes; then + AC_TRY_LINK([#include ], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no]) + AC_MSG_RESULT([$libetpan_result]) + fi ++ LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`" ++ LIBETPAN_LIBS="`$libetpanconfig --libs`" ++ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'` ++ else ++ libetpanconfig="pkg-config libetpan" ++ CPPFLAGS="$CPPFLAGS `$libetpanconfig --cflags 2>/dev/null`" ++ AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes]) ++ if test "x$libetpan_result" = "xyes"; then ++ AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine]) ++ LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`" ++ AC_TRY_LINK([#include ], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no]) ++ AC_MSG_RESULT([$libetpan_result]) ++ fi ++ LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`" ++ LIBETPAN_LIBS="`$libetpanconfig --libs`" ++ LIBETPAN_VERSION=`$libetpanconfig --modversion | $AWK -F. '{printf "%d", ($1 * 100) + $2}'` ++ fi ++ if test "x$libetpan_result" = "xyes"; then ++ if test "$LIBETPAN_VERSION" -lt "57"; then ++ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/]) ++ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) ++ AC_MSG_ERROR([libetpan 0.57 not found]) ++ fi ++ AC_SUBST(LIBETPAN_FLAGS) ++ AC_SUBST(LIBETPAN_LIBS) ++ AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.) + fi + if test "x$libetpan_result" = "xyes"; then + LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`" +@@ -1301,7 +1327,7 @@ fi dnl Python ********************************************************************* + missing_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], [ +@@ -1320,7 +1346,7 @@ AM_PATH_PYTHON([2.5], [ _save_libs="$LIBS" if test x"$platform_win32" = xno; then # libpython.so