- Update to 4.5.0

PR:		215126
Submitted by:	itbot@list.ru
Approved by:	6yearold@gmail.com(maintainer)

4 files changed, 50 insertions, 104 deletions

diff --git a/math/z3/Makefile b/math/z3/Makefile
index cc156bcf535d..7f5e2ec97aaf 100644
--- a/math/z3/Makefile
+++ b/math/z3/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	z3
-PORTVERSION=	4.4.0
+PORTVERSION=	4.5.0
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	math
 
@@ -12,39 +12,40 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BROKEN_powerpc64=	Does not build
+# compiler picks ${LOCALBASE}/include/dictionary.h from iniparser
+CONFLICTS=		iniparser-*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Z3Prover
 
-OPTIONS_DEFINE=		DEBUG STATIC
+OPTIONS_DEFINE=		DEBUG STATIC PYTHON GMP
 
-OPTIONS_DEFAULT=	STATIC
+OPTIONS_DEFAULT=	STATIC PYTHON
 OPTIONS_SUB=		yes
 
 DEBUG_CONFIGURE_ON=	--debug
 
+PYTHON_DESC= 		Enable python bindings
+PYTHON_CONFIGURE_ON=	--python
+PYTHON_USES=		python
+
 STATIC_DESC=		Build static z3 library
 STATIC_CONFIGURE_ON=	--staticlib
 
 GMP_DESC=		Use GMP library for AP arithmetic
 GMP_CONFIGURE_ON=	--gmp
-GMP_CXXFLAGS=		-I${LOCALBASE}include
+GMP_CXXFLAGS=		-I${LOCALBASE}/include
 GMP_LDFLAGS=		-L${LOCALBASE}/lib
 GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 
 HAS_CONFIGURE=		yes
+CONFIGURE_ARGS=		--prefix=${PREFIX}
 USE_LDCONFIG=		yes
 BUILD_WRKSRC=		${WRKSRC}/build
 INSTALL_WRKSRC=		${WRKSRC}/build
 
-USES=		python
-
-pre-build:
-	${MKDIR} ${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/z3
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libz3.so
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/libz3.so
 
 .include <bsd.port.mk>
diff --git a/math/z3/distinfo b/math/z3/distinfo
index 0b8b9746084f..c73f7607309c 100644
--- a/math/z3/distinfo
+++ b/math/z3/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Z3Prover-z3-z3-4.4.0_GH0.tar.gz) = 65b72f9eb0af50949e504b47080fb3fc95f11c435633041d9a534473f3142cba
-SIZE (Z3Prover-z3-z3-4.4.0_GH0.tar.gz) = 3060731
+TIMESTAMP = 1480626874
+SHA256 (Z3Prover-z3-z3-4.5.0_GH0.tar.gz) = aeae1d239c5e06ac183be7dd853775b84698db1265cb2258e5918a28372d4a0c
+SIZE (Z3Prover-z3-z3-4.5.0_GH0.tar.gz) = 3573695
diff --git a/math/z3/files/patch-scripts_mk__util.py b/math/z3/files/patch-scripts_mk__util.py
index 93056270dedb..b3d538e51461 100644
--- a/math/z3/files/patch-scripts_mk__util.py
+++ b/math/z3/files/patch-scripts_mk__util.py
@@ -1,7 +1,7 @@
---- scripts/mk_util.py.orig	2015-04-29 14:40:46 UTC
+--- scripts/mk_util.py.orig	2016-11-07 22:02:30 UTC
 +++ scripts/mk_util.py
-@@ -41,7 +41,7 @@ CXX_COMPILERS=['g++', 'clang++']
- C_COMPILERS=['gcc', 'clang']
+@@ -49,7 +49,7 @@ C_COMPILERS=['gcc', 'clang']
+ CSC_COMPILERS=['csc', 'mcs']
  JAVAC=None
  JAR=None
 -PYTHON_PACKAGE_DIR=distutils.sysconfig.get_python_lib()
@@ -9,71 +9,12 @@
  BUILD_DIR='build'
  REV_BUILD_DIR='..'
  SRC_DIR='src'
-@@ -948,7 +948,7 @@ class LibComponent(Component):
- 
-     def mk_install(self, out):
-         for include in self.includes2install:
--            out.write('\t@cp %s %s\n' % (os.path.join(self.to_src_dir, include), os.path.join('$(PREFIX)', 'include', include)))
-+            out.write('\t@cp %s %s\n' % (os.path.join(self.to_src_dir, include), os.path.join('$(DESTDIR)/$(PREFIX)', 'include', include)))
- 
-     def mk_uninstall(self, out):
-         for include in self.includes2install:
-@@ -1034,7 +1034,7 @@ class ExeComponent(Component):
-     def mk_install(self, out):
-         if self.install:
-             exefile = '%s$(EXE_EXT)' % self.exe_name
--            out.write('\t@cp %s %s\n' % (exefile, os.path.join('$(PREFIX)', 'bin', exefile)))
-+            out.write('\t@cp %s %s\n' % (exefile, os.path.join('$(DESTDIR)/$(PREFIX)', 'bin', exefile)))
- 
-     def mk_uninstall(self, out):
-         exefile = '%s$(EXE_EXT)' % self.exe_name
-@@ -1180,11 +1180,11 @@ class DLLComponent(Component):
-     def mk_install(self, out):
-         if self.install:
-             dllfile = '%s$(SO_EXT)' % self.dll_name
--            out.write('\t@cp %s %s\n' % (dllfile, os.path.join('$(PREFIX)', 'lib', dllfile)))
--            out.write('\t@cp %s %s\n' % (dllfile, os.path.join(PYTHON_PACKAGE_DIR, dllfile)))
-+            out.write('\t@cp %s %s\n' % (dllfile, os.path.join('$(DESTDIR)/$(PREFIX)', 'lib', dllfile)))
-+            out.write('\t@cp %s %s\n' % (dllfile, os.path.join('$(DESTDIR)' + PYTHON_PACKAGE_DIR, dllfile)))
-             if self.static:
-                 libfile = '%s$(LIB_EXT)' % self.dll_name
--                out.write('\t@cp %s %s\n' % (libfile, os.path.join('$(PREFIX)', 'lib', libfile)))
-+                out.write('\t@cp %s %s\n' % (libfile, os.path.join('$(DESTDIR)/$(PREFIX)', 'lib', libfile)))
- 
- 
-     def mk_uninstall(self, out):
-@@ -1359,8 +1359,8 @@ class JavaDLLComponent(Component):
-     def mk_install(self, out):
-         if is_java_enabled() and self.install:
-             dllfile = '%s$(SO_EXT)' % self.dll_name
--            out.write('\t@cp %s %s\n' % (dllfile, os.path.join('$(PREFIX)', 'lib', dllfile)))
--            out.write('\t@cp %s.jar %s.jar\n' % (self.package_name, os.path.join('$(PREFIX)', 'lib', self.package_name)))
-+            out.write('\t@cp %s %s\n' % (dllfile, os.path.join('$(DESTDIR)/$(PREFIX)', 'lib', dllfile)))
-+            out.write('\t@cp %s.jar %s.jar\n' % (self.package_name, os.path.join('$(DESTDIR)/$(PREFIX)', 'lib', self.package_name)))
- 
-     def mk_uninstall(self, out):
-         if is_java_enabled() and self.install:
-@@ -1873,6 +1873,7 @@ def mk_config():
-             CPPFLAGS     = '%s -D_TRACE' % CPPFLAGS
-         CXXFLAGS         = '%s -msse -msse2' % CXXFLAGS
-         config.write('PREFIX=%s\n' % PREFIX)
-+        config.write('DESTDIR?=\n')
-         config.write('CC=%s\n' % CC)
-         config.write('CXX=%s\n' % CXX)
-         config.write('CXXFLAGS=%s %s\n' % (CPPFLAGS, CXXFLAGS))
-@@ -1926,12 +1927,12 @@ def mk_install(out):
-     out.write('\t@mkdir -p %s\n' % os.path.join('$(PREFIX)', 'lib'))
-     for c in get_components():
-         c.mk_install(out)
--    out.write('\t@cp z3*.py %s\n' % PYTHON_PACKAGE_DIR)
-+    out.write('\t@cp z3*.py %s\n' % ('$(DESTDIR)/' + PYTHON_PACKAGE_DIR))
-     if sys.version >= "3":
-         out.write('\t@cp %s*.pyc %s\n' % (os.path.join('__pycache__', 'z3'),
--                                          os.path.join(PYTHON_PACKAGE_DIR, '__pycache__')))
-+                                          os.path.join('$(DESTDIR)/' + PYTHON_PACKAGE_DIR, '__pycache__')))
-     else:
--        out.write('\t@cp z3*.pyc %s\n' % PYTHON_PACKAGE_DIR)
-+        out.write('\t@cp z3*.pyc %s\n' % ('$(DESTDIR)/' + PYTHON_PACKAGE_DIR))
-     out.write('\t@echo Z3 was successfully installed.\n')
-     if PYTHON_PACKAGE_DIR != distutils.sysconfig.get_python_lib():
-         if os.uname()[0] == 'Darwin':
+@@ -2391,7 +2391,7 @@ def mk_config():
+         check_ar()
+         CXX = find_cxx_compiler()
+         CC  = find_c_compiler()
+-        SLIBEXTRAFLAGS = ''
++        SLIBEXTRAFLAGS = LDFLAGS
+         if GPROF:
+             CXXFLAGS = '%s -pg' % CXXFLAGS
+             LDFLAGS  = '%s -pg' % LDFLAGS
diff --git a/math/z3/pkg-plist b/math/z3/pkg-plist
index 0a77495b98ad..c3d8328fccf1 100644
--- a/math/z3/pkg-plist
+++ b/math/z3/pkg-plist
@@ -3,32 +3,35 @@ include/z3++.h
 include/z3.h
 include/z3_algebraic.h
 include/z3_api.h
+include/z3_ast_containers.h
+include/z3_fixedpoint.h
 include/z3_fpa.h
 include/z3_interp.h
 include/z3_macros.h
+include/z3_optimization.h
 include/z3_polynomial.h
 include/z3_rcf.h
 include/z3_v1.h
 %%STATIC%%lib/libz3.a
 lib/libz3.so
-%%PYTHON_SITELIBDIR%%/libz3.so
-%%PYTHON_SITELIBDIR%%/z3.py
-%%PYTHON_SITELIBDIR%%/z3.pyc
-%%PYTHON_SITELIBDIR%%/z3consts.py
-%%PYTHON_SITELIBDIR%%/z3consts.pyc
-%%PYTHON_SITELIBDIR%%/z3core.py
-%%PYTHON_SITELIBDIR%%/z3core.pyc
-%%PYTHON_SITELIBDIR%%/z3num.py
-%%PYTHON_SITELIBDIR%%/z3num.pyc
-%%PYTHON_SITELIBDIR%%/z3poly.py
-%%PYTHON_SITELIBDIR%%/z3poly.pyc
-%%PYTHON_SITELIBDIR%%/z3printer.py
-%%PYTHON_SITELIBDIR%%/z3printer.pyc
-%%PYTHON_SITELIBDIR%%/z3rcf.py
-%%PYTHON_SITELIBDIR%%/z3rcf.pyc
-%%PYTHON_SITELIBDIR%%/z3test.py
-%%PYTHON_SITELIBDIR%%/z3test.pyc
-%%PYTHON_SITELIBDIR%%/z3types.py
-%%PYTHON_SITELIBDIR%%/z3types.pyc
-%%PYTHON_SITELIBDIR%%/z3util.py
-%%PYTHON_SITELIBDIR%%/z3util.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/lib/libz3.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3consts.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3consts.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3core.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3core.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3num.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3num.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3poly.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3poly.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3printer.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3printer.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3rcf.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3rcf.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3types.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3types.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3util.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3util.pyc