On Wed Oct 16, 2019 at 02:59:32AM +0000, wen heping wrote:
> Hi,ports@:
>
> Here is a patch for math/z3 to update to 4.8.6.
> It build well and run well on amd64-current system.
> It defines NO_TEST and no other ports depend on it.
>
> Comments? OK?
> wen
OK rsadowski@
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/math/z3/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile 12 Jul 2019 20:47:47 -0000 1.17
> +++ Makefile 16 Oct 2019 02:55:38 -0000
> @@ -2,15 +2,14 @@
>
> COMMENT = Z3 theorem prover
>
> -VERSION = 4.8.5
> +VERSION = 4.8.6
>
> GH_ACCOUNT = Z3Prover
> GH_PROJECT = z3
> -GH_TAGNAME = ${GH_PROJECT:U}-${VERSION}
> +GH_TAGNAME = ${GH_PROJECT}-${VERSION}
>
> DISTNAME = ${GH_TAGNAME}
> PKGNAME = ${DISTNAME:L}
> -REVISION = 0
>
> SHARED_LIBS = z3 2.0 # 4.8
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/math/z3/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo 5 Jun 2019 05:44:54 -0000 1.6
> +++ distinfo 16 Oct 2019 02:55:38 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (Z3-4.8.5.tar.gz) = To4jKIfd+mQ622ow3NN0PLL6ZZFzX70wK0n3AozcA2M=
> -SIZE (Z3-4.8.5.tar.gz) = 4177051
> +SHA256 (z3-4.8.6.tar.gz) = N5IvpQhRcMrWUESY2XWPtjxh1ctbaGicEabF6E8DEbM=
> +SIZE (z3-4.8.6.tar.gz) = 4328752
> Index: patches/patch-scripts_mk_util_py
> ===================================================================
> RCS file: /cvs/ports/math/z3/patches/patch-scripts_mk_util_py,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-scripts_mk_util_py
> --- patches/patch-scripts_mk_util_py 3 Mar 2019 09:16:17 -0000 1.3
> +++ patches/patch-scripts_mk_util_py 16 Oct 2019 02:55:38 -0000
> @@ -1,18 +1,9 @@
> -$OpenBSD: patch-scripts_mk_util_py,v 1.3 2019/03/03 09:16:17 rsadowski Exp $
> +$OpenBSD$
>
> Index: scripts/mk_util.py
> --- scripts/mk_util.py.orig
> +++ scripts/mk_util.py
> -@@ -50,7 +50,7 @@ C_COMPILERS=['gcc', 'clang']
> - CSC_COMPILERS=['csc', 'mcs']
> - JAVAC=None
> - JAR=None
> --PYTHON_PACKAGE_DIR=distutils.sysconfig.get_python_lib()
> -+PYTHON_PACKAGE_DIR=distutils.sysconfig.get_python_lib(prefix=getenv("LOCALBASE",
> None))
> - BUILD_DIR='build'
> - REV_BUILD_DIR='..'
> - SRC_DIR='src'
> -@@ -2801,7 +2801,6 @@ def mk_config():
> +@@ -2538,7 +2538,6 @@ def mk_config():
> EXAMP_DEBUG_FLAG = '-g'
> CPPFLAGS = '%s -DZ3DEBUG -D_DEBUG' % CPPFLAGS
> else:
> @@ -20,16 +11,16 @@ Index: scripts/mk_util.py
> if GPROF:
> CXXFLAGS += '-fomit-frame-pointer'
> CPPFLAGS = '%s -DNDEBUG -D_EXTERNAL_RELEASE' % CPPFLAGS
> -@@ -2836,7 +2835,7 @@ def mk_config():
> - elif sysname == 'OpenBSD':
> - CXXFLAGS = '%s -D_OPENBSD_' % CXXFLAGS
> - OS_DEFINES = '-D_OPENBSD_'
> +@@ -2551,7 +2550,7 @@ def mk_config():
> + elif sysname == 'Linux':
> + CXXFLAGS = '%s -D_LINUX_' % CXXFLAGS
> + OS_DEFINES = '-D_LINUX_'
> - SO_EXT = '.so'
> + SO_EXT = '.so.${LIBz3_VERSION}'
> SLIBFLAGS = '-shared'
> - elif sysname.startswith('CYGWIN'):
> - CXXFLAGS = '%s -D_CYGWIN' % CXXFLAGS
> -@@ -2852,9 +2851,9 @@ def mk_config():
> + SLIBEXTRAFLAGS = '%s -Wl,-soname,libz3.so' % SLIBEXTRAFLAGS
> + elif sysname == 'FreeBSD':
> +@@ -2583,9 +2582,9 @@ def mk_config():
> LIB_EXT = '.lib'
> else:
> raise MKException('Unsupported platform: %s' % sysname)
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/math/z3/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST
> --- pkg/PLIST 3 Mar 2019 09:16:17 -0000 1.5
> +++ pkg/PLIST 16 Oct 2019 02:55:38 -0000
> @@ -17,6 +17,7 @@ include/z3_version.h
> lib/cmake/
> lib/cmake/z3/
> lib/cmake/z3/Z3Config.cmake
> +lib/cmake/z3/Z3ConfigVersion.cmake
> lib/cmake/z3/Z3Targets${MODCMAKE_BUILD_SUFFIX}
> lib/cmake/z3/Z3Targets.cmake
> @lib lib/libz3.so.${LIBz3_VERSION}
