From owner-svn-ports-head@freebsd.org  Wed Aug  8 12:32:04 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72527105AF94;
 Wed,  8 Aug 2018 12:32:04 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 2192D7C23E;
 Wed,  8 Aug 2018 12:32:04 +0000 (UTC)
 (envelope-from jbeich@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 0440F270A;
 Wed,  8 Aug 2018 12:32:04 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w78CW3RV047349;
 Wed, 8 Aug 2018 12:32:03 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w78CW3Ko047348;
 Wed, 8 Aug 2018 12:32:03 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201808081232.w78CW3Ko047348@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 8 Aug 2018 12:32:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r476641 - in head/math/cadabra2: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: jbeich
X-SVN-Commit-Paths: in head/math/cadabra2: . files
X-SVN-Commit-Revision: 476641
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.27
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Aug 2018 12:32:04 -0000

Author: jbeich
Date: Wed Aug  8 12:32:03 2018
New Revision: 476641
URL: https://svnweb.freebsd.org/changeset/ports/476641

Log:
  math/cadabra2: unbreak with libc++ 7
  
  In file included from core/PythonCdb.cc:25:
  In file included from libs/pybind11/include/pybind11/stl.h:34:
  /usr/include/c++/v1/experimental/optional:11:2: error: "<experimental/optional> has been removed. Use <optional> instead."
  
  PR:		230355
  Obtained from:	upstream (pybind11)

Added:
  head/math/cadabra2/files/patch-pybind11-libc++7   (contents, props changed)
Modified:
  head/math/cadabra2/Makefile   (contents, props changed)

Modified: head/math/cadabra2/Makefile
==============================================================================
--- head/math/cadabra2/Makefile	Wed Aug  8 12:31:40 2018	(r476640)
+++ head/math/cadabra2/Makefile	Wed Aug  8 12:32:03 2018	(r476641)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cadabra2
 DISTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/

Added: head/math/cadabra2/files/patch-pybind11-libc++7
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/cadabra2/files/patch-pybind11-libc++7	Wed Aug  8 12:32:03 2018	(r476641)
@@ -0,0 +1,26 @@
+https://github.com/pybind/pybind11/commit/ff6bd092d482b0c4e51aeb7367c3e5ecbc18a9de
+
+--- libs/pybind11/include/pybind11/cast.h.orig	2018-03-30 09:33:27 UTC
++++ libs/pybind11/include/pybind11/cast.h
+@@ -1685,6 +1685,9 @@ template <> inline void cast_safe<void>(object &&) {}
+ 
+ NAMESPACE_END(detail)
+ 
++template <return_value_policy policy = return_value_policy::automatic_reference>
++tuple make_tuple() { return tuple(0); }
++
+ template <return_value_policy policy = return_value_policy::automatic_reference,
+           typename... Args> tuple make_tuple(Args&&... args_) {
+     constexpr size_t size = sizeof...(Args);
+--- libs/pybind11/include/pybind11/stl.h.orig	2018-03-30 09:33:27 UTC
++++ libs/pybind11/include/pybind11/stl.h
+@@ -30,7 +30,8 @@
+ #    define PYBIND11_HAS_OPTIONAL 1
+ #  endif
+ // std::experimental::optional (but not allowed in c++11 mode)
+-#  if defined(PYBIND11_CPP14) && __has_include(<experimental/optional>)
++#  if defined(PYBIND11_CPP14) && (__has_include(<experimental/optional>) && \
++                                 !__has_include(<optional>))
+ #    include <experimental/optional>
+ #    define PYBIND11_HAS_EXP_OPTIONAL 1
+ #  endif