From owner-dev-commits-ports-main@freebsd.org Wed May 26 15:08:31 2021
Return-Path: <owner-dev-commits-ports-main@freebsd.org>
Delivered-To: dev-commits-ports-main@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 A3ED663FE98;
Wed, 26 May 2021 15:08:31 +0000 (UTC) (envelope-from git@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)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4FqvTq24Klz3Q18;
Wed, 26 May 2021 15:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D81021328C;
Wed, 26 May 2021 15:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14QF8U4X009896;
Wed, 26 May 2021 15:08:30 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14QF8UW5009895;
Wed, 26 May 2021 15:08:30 GMT (envelope-from git)
Date: Wed, 26 May 2021 15:08:30 GMT
Message-Id: <202105261508.14QF8UW5009895@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Subject: git: a8f6a20fd3a5 - main - math/gringo: fix build with python3 scons
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: amdmi3
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: a8f6a20fd3a56fce35572e16b484a41e175946d9
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-ports-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the main branch of the FreeBSD ports repository
<dev-commits-ports-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-ports-main>,
<mailto:dev-commits-ports-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-ports-main/>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Help: <mailto:dev-commits-ports-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-main>,
<mailto:dev-commits-ports-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 May 2021 15:08:31 -0000
The branch main has been updated by amdmi3:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a8f6a20fd3a56fce35572e16b484a41e175946d9
commit a8f6a20fd3a56fce35572e16b484a41e175946d9
Author: Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2021-05-26 14:19:00 +0000
Commit: Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2021-05-26 15:05:36 +0000
math/gringo: fix build with python3 scons
Approved by: portmgr blanket
---
math/gringo/Makefile | 2 +-
math/gringo/files/patch-SConscript | 67 ++++++++++++++++++++++++++++++++++++--
2 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/math/gringo/Makefile b/math/gringo/Makefile
index 9cc807d00dc5..55fb2347c239 100644
--- a/math/gringo/Makefile
+++ b/math/gringo/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= re2c:devel/re2c
-USES= bison compiler:c++11-lib python:2.7 scons:python2
+USES= bison compiler:c++11-lib python:2.7 scons
MAKE_ARGS= ${MAKE_ENV}
CXXFLAGS+= -std=c++11
MAKE_ENV= WITH_LUA=no
diff --git a/math/gringo/files/patch-SConscript b/math/gringo/files/patch-SConscript
index ca548bd49f60..7ec44177f6fa 100644
--- a/math/gringo/files/patch-SConscript
+++ b/math/gringo/files/patch-SConscript
@@ -1,6 +1,34 @@
---- SConscript.orig 2015-08-17 12:39:49 UTC
+--- SConscript.orig 2015-11-17 11:48:49 UTC
+++ SConscript
-@@ -202,7 +202,7 @@ if env['WITH_LUA'] == "auto":
+@@ -171,21 +171,21 @@ DEFS = {}
+ failure = False
+
+ if not conf.CheckBison():
+- print 'error: no usable bison version found'
++ print('error: no usable bison version found')
+ failure = True
+
+ if not conf.CheckRe2c():
+- print 'error: no usable re2c version found'
++ print('error: no usable re2c version found')
+ failure = True
+
+ if not conf.CheckCXX():
+- print 'error: no usable C++ compiler found'
+- print "Please check the log file for further information: " + log_file
++ print('error: no usable C++ compiler found')
++ print("Please check the log file for further information: " + log_file)
+ Exit(1)
+
+ if not conf.CheckSHCXX():
+- print 'error: no usable (shared) C++ compiler found'
+- print "Please check the log file for further information: " + log_file
++ print('error: no usable (shared) C++ compiler found')
++ print("Please check the log file for further information: " + log_file)
+ Exit(1)
+
+ with_python = False
+@@ -206,7 +206,7 @@ if env['WITH_LUA'] == "auto":
if conf.CheckWithPkgConfig("lua", ["lua", "lua5.1", "lua-5.1", "lua5.2", "lua-5.2", "lua5.3", "lua-5.3"]):
with_lua = True
DEFS["WITH_LUA"] = 1
@@ -9,3 +37,38 @@
if not conf.CheckLibs("lua", env['WITH_LUA'], "lua.hpp"):
failure = True
else:
+@@ -241,7 +241,7 @@ if env['WITH_TBB'] == "auto":
+ with_tbb = True
+ elif env['WITH_TBB']:
+ if not claspConf.CheckLibs("tbb", env['WITH_TBB'], 'tbb/tbb.h'):
+- print 'error: tbb library not found'
++ print('error: tbb library not found')
+ failure = True
+ else:
+ with_tbb = True
+@@ -249,7 +249,7 @@ if with_tbb:
+ DEFS["WITH_THREADS"] = 1
+ if claspConf.CheckNeedRT():
+ if not claspConf.CheckLibWithHeader('rt', 'time.h', 'C++'):
+- print 'error: rt library not found'
++ print('error: rt library not found')
+ failure = True
+
+ claspEnv = claspConf.Finish()
+@@ -267,14 +267,14 @@ if env['WITH_CPPUNIT']:
+ elif testConf.CheckLibs("cppunit", env['WITH_CPPUNIT'], 'cppunit/TestFixture.h'):
+ with_cppunit = True
+ else:
+- print 'error: cppunit library not found'
++ print('error: cppunit library not found')
+ failure = True
+ testEnv = testConf.Finish()
+
+ # {{{1 Check configuration
+
+ if failure:
+- print "Please check the log file for further information: " + log_file
++ print("Please check the log file for further information: " + log_file)
+ Exit(1)
+
+ # {{{1 Opts: Library