Hi,
this is the diff to update z3 to latest release.
Ok?
Cheers,
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/z3/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile 15 Dec 2018 12:43:40 -0000 1.10
+++ Makefile 19 Jan 2019 09:55:04 -0000
@@ -2,7 +2,7 @@
COMMENT = Z3 theorem prover
-VERSION = 4.8.3
+VERSION = 4.8.4
DISTNAME = z3-${VERSION}
GH_ACCOUNT = Z3Prover
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/z3/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 15 Dec 2018 12:43:40 -0000 1.4
+++ distinfo 19 Jan 2019 09:55:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (z3-4.8.3.tar.gz) = IWILaMNzzeoNOyzyQCC+Ts+yLt3GYpZj9unOMc/ceN4=
-SIZE (z3-4.8.3.tar.gz) = 4119116
+SHA256 (z3-4.8.4.tar.gz) = Whj+YWwqMLVuWy9bnwP0Bc3yQ1cRUX/3CwdqATlu9gE=
+SIZE (z3-4.8.4.tar.gz) = 4117081
Index: patches/patch-scripts_mk_util_py
===================================================================
RCS file: /cvs/ports/math/z3/patches/patch-scripts_mk_util_py,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-scripts_mk_util_py
--- patches/patch-scripts_mk_util_py 24 Nov 2018 00:57:15 -0000 1.2
+++ patches/patch-scripts_mk_util_py 19 Jan 2019 09:55:04 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-scripts_mk_util_py,v 1.2
Index: scripts/mk_util.py
--- scripts/mk_util.py.orig
+++ scripts/mk_util.py
-@@ -49,7 +49,7 @@ C_COMPILERS=['gcc', 'clang']
+@@ -50,7 +50,7 @@ C_COMPILERS=['gcc', 'clang']
CSC_COMPILERS=['csc', 'mcs']
JAVAC=None
JAR=None
@@ -12,7 +12,7 @@ Index: scripts/mk_util.py
BUILD_DIR='build'
REV_BUILD_DIR='..'
SRC_DIR='src'
-@@ -2494,7 +2494,6 @@ def mk_config():
+@@ -2801,7 +2801,6 @@ def mk_config():
EXAMP_DEBUG_FLAG = '-g'
CPPFLAGS = '%s -DZ3DEBUG -D_DEBUG' % CPPFLAGS
else:
@@ -20,7 +20,7 @@ Index: scripts/mk_util.py
if GPROF:
CXXFLAGS += '-fomit-frame-pointer'
CPPFLAGS = '%s -DNDEBUG -D_EXTERNAL_RELEASE' % CPPFLAGS
-@@ -2528,7 +2527,7 @@ def mk_config():
+@@ -2836,7 +2835,7 @@ def mk_config():
elif sysname == 'OpenBSD':
CXXFLAGS = '%s -D_OPENBSD_' % CXXFLAGS
OS_DEFINES = '-D_OPENBSD_'
@@ -29,7 +29,7 @@ Index: scripts/mk_util.py
SLIBFLAGS = '-shared'
elif sysname.startswith('CYGWIN'):
CXXFLAGS = '%s -D_CYGWIN' % CXXFLAGS
-@@ -2544,9 +2543,9 @@ def mk_config():
+@@ -2852,9 +2851,9 @@ def mk_config():
LIB_EXT = '.lib'
else:
raise MKException('Unsupported platform: %s' % sysname)
@@ -38,6 +38,6 @@ Index: scripts/mk_util.py
if is64():
- if not sysname.startswith('CYGWIN') and not sysname.startswith('MSYS') and not sysname.startswith('MINGW'):
- CXXFLAGS = '%s -fPIC' % CXXFLAGS
- CPPFLAGS = '%s -D_AMD64_' % CPPFLAGS
if sysname == 'Linux':
CPPFLAGS = '%s -D_USE_THREAD_LOCAL' % CPPFLAGS
+ elif not LINUX_X64:
