Received: by mail.netbsd.org (Postfix, from userid 605) id 5BFA484DAF; Tue, 20 Mar 2018 15:47:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D7AC784C77 for ; Tue, 20 Mar 2018 15:47:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Udodf6v6RrWd for ; Tue, 20 Mar 2018 15:47:37 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id F387184D99 for ; Tue, 20 Mar 2018 15:47:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E9DAEFB40; Tue, 20 Mar 2018 15:47:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_152156085669380" MIME-Version: 1.0 Date: Tue, 20 Mar 2018 15:47:36 +0000 From: "Pierre Pronchery" Subject: CVS commit: pkgsrc/math/py-z3solver To: pkgsrc-changes@NetBSD.org Reply-To: khorben@netbsd.org X-Mailer: log_accum Message-Id: <20180320154736.E9DAEFB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_152156085669380 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: khorben Date: Tue Mar 20 15:47:36 UTC 2018 Added Files: pkgsrc/math/py-z3solver: DESCR Makefile PLIST distinfo pkgsrc/math/py-z3solver/patches: patch-core_scripts_mk__util.py patch-core_src_util_stopwatch.h Log Message: Import math/py-z3solver version 4.5.0.1 Z3 is a theorem prover from Microsoft Research with support for bitvectors, booleans, arrays, floating point numbers, strings, and other data types. This is a fork of the original Z3. Unfortunately it conflicts with the math/z3 package as a result. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/math/py-z3solver/DESCR \ pkgsrc/math/py-z3solver/Makefile pkgsrc/math/py-z3solver/PLIST \ pkgsrc/math/py-z3solver/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/math/py-z3solver/patches/patch-core_scripts_mk__util.py \ pkgsrc/math/py-z3solver/patches/patch-core_src_util_stopwatch.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_152156085669380 Content-Disposition: inline Content-Length: 7022 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Added files: Index: pkgsrc/math/py-z3solver/DESCR diff -u /dev/null pkgsrc/math/py-z3solver/DESCR:1.1 --- /dev/null Tue Mar 20 15:47:36 2018 +++ pkgsrc/math/py-z3solver/DESCR Tue Mar 20 15:47:36 2018 @@ -0,0 +1,2 @@ +Z3 is a theorem prover from Microsoft Research with support for bitvectors, +booleans, arrays, floating point numbers, strings, and other data types. Index: pkgsrc/math/py-z3solver/Makefile diff -u /dev/null pkgsrc/math/py-z3solver/Makefile:1.1 --- /dev/null Tue Mar 20 15:47:36 2018 +++ pkgsrc/math/py-z3solver/Makefile Tue Mar 20 15:47:36 2018 @@ -0,0 +1,20 @@ +# $NetBSD: Makefile,v 1.1 2018/03/20 15:47:36 khorben Exp $ + +DISTNAME= z3-solver-4.5.1.0.post2 +PKGNAME= ${PYPKGPREFIX}-${EGG_NAME} +CATEGORIES= math +MASTER_SITES= ${MASTER_SITE_PYPI:=z/z3-solver/} + +MAINTAINER= khorben@defora.org +HOMEPAGE= https://pypi.python.org/pypi/z3-solver/ +COMMENT= Theorem prover from Microsoft Research +LICENSE= mit + +USE_LANGUAGES= c c++ + +PYTHON_VERSIONS_ACCEPTED= 27 + +CONFLICTS+= z3-[0-9]* + +.include "../../lang/python/egg.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/py-z3solver/PLIST diff -u /dev/null pkgsrc/math/py-z3solver/PLIST:1.1 --- /dev/null Tue Mar 20 15:47:36 2018 +++ pkgsrc/math/py-z3solver/PLIST Tue Mar 20 15:47:36 2018 @@ -0,0 +1,47 @@ +@comment $NetBSD: PLIST,v 1.1 2018/03/20 15:47:36 khorben Exp $ +bin/z3 +${PYSITELIB}/z3/__init__.py +${PYSITELIB}/z3/__init__.pyc +${PYSITELIB}/z3/__init__.pyo +${PYSITELIB}/z3/include/c++/z3++.h +${PYSITELIB}/z3/include/z3.h +${PYSITELIB}/z3/include/z3_algebraic.h +${PYSITELIB}/z3/include/z3_api.h +${PYSITELIB}/z3/include/z3_fpa.h +${PYSITELIB}/z3/include/z3_interp.h +${PYSITELIB}/z3/include/z3_macros.h +${PYSITELIB}/z3/include/z3_polynomial.h +${PYSITELIB}/z3/include/z3_rcf.h +${PYSITELIB}/z3/include/z3_v1.h +${PYSITELIB}/z3/lib/libz3.so +${PYSITELIB}/z3/z3.py +${PYSITELIB}/z3/z3.pyc +${PYSITELIB}/z3/z3.pyo +${PYSITELIB}/z3/z3consts.py +${PYSITELIB}/z3/z3consts.pyc +${PYSITELIB}/z3/z3consts.pyo +${PYSITELIB}/z3/z3core.py +${PYSITELIB}/z3/z3core.pyc +${PYSITELIB}/z3/z3core.pyo +${PYSITELIB}/z3/z3num.py +${PYSITELIB}/z3/z3num.pyc +${PYSITELIB}/z3/z3num.pyo +${PYSITELIB}/z3/z3poly.py +${PYSITELIB}/z3/z3poly.pyc +${PYSITELIB}/z3/z3poly.pyo +${PYSITELIB}/z3/z3printer.py +${PYSITELIB}/z3/z3printer.pyc +${PYSITELIB}/z3/z3printer.pyo +${PYSITELIB}/z3/z3rcf.py +${PYSITELIB}/z3/z3rcf.pyc +${PYSITELIB}/z3/z3rcf.pyo +${PYSITELIB}/z3/z3types.py +${PYSITELIB}/z3/z3types.pyc +${PYSITELIB}/z3/z3types.pyo +${PYSITELIB}/z3/z3util.py +${PYSITELIB}/z3/z3util.pyc +${PYSITELIB}/z3/z3util.pyo +${PYSITELIB}/${EGG_INFODIR}/PKG-INFO +${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt +${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt +${PYSITELIB}/${EGG_INFODIR}/top_level.txt Index: pkgsrc/math/py-z3solver/distinfo diff -u /dev/null pkgsrc/math/py-z3solver/distinfo:1.1 --- /dev/null Tue Mar 20 15:47:36 2018 +++ pkgsrc/math/py-z3solver/distinfo Tue Mar 20 15:47:36 2018 @@ -0,0 +1,8 @@ +$NetBSD: distinfo,v 1.1 2018/03/20 15:47:36 khorben Exp $ + +SHA1 (z3-solver-4.5.1.0.post2.tar.gz) = 6cc67617079010179308cf8ffe5b0098d4152fdd +RMD160 (z3-solver-4.5.1.0.post2.tar.gz) = 97055f883f7567a53517cceda915a4e34d058452 +SHA512 (z3-solver-4.5.1.0.post2.tar.gz) = babbca25de59638c52b91953030cd7af20d1e795af7da760f71bb43940116a4415fdf7208b967bf5eb54435780d21cdc7740faac9cf81cee59005f16f4af09a0 +Size (z3-solver-4.5.1.0.post2.tar.gz) = 3891600 bytes +SHA1 (patch-core_scripts_mk__util.py) = 45d2cd60977cfa6b89d9033586b8467af0a79cfd +SHA1 (patch-core_src_util_stopwatch.h) = 3163302c46a6315530f9bfb25be93a1efed814a7 Index: pkgsrc/math/py-z3solver/patches/patch-core_scripts_mk__util.py diff -u /dev/null pkgsrc/math/py-z3solver/patches/patch-core_scripts_mk__util.py:1.1 --- /dev/null Tue Mar 20 15:47:36 2018 +++ pkgsrc/math/py-z3solver/patches/patch-core_scripts_mk__util.py Tue Mar 20 15:47:36 2018 @@ -0,0 +1,65 @@ +$NetBSD: patch-core_scripts_mk__util.py,v 1.1 2018/03/20 15:47:36 khorben Exp $ + +Add support for NetBSD. + +--- core/scripts/mk_util.py.orig 2017-06-08 07:51:35.000000000 +0000 ++++ core/scripts/mk_util.py +@@ -69,6 +69,7 @@ IS_WINDOWS=False + IS_LINUX=False + IS_OSX=False + IS_FREEBSD=False ++IS_NETBSD=False + IS_OPENBSD=False + IS_CYGWIN=False + IS_CYGWIN_MINGW=False +@@ -138,6 +139,9 @@ def is_linux(): + def is_freebsd(): + return IS_FREEBSD + ++def is_netbsd(): ++ return IS_NETBSD ++ + def is_openbsd(): + return IS_OPENBSD + +@@ -598,6 +602,8 @@ elif os.name == 'posix': + IS_LINUX=True + elif os.uname()[0] == 'FreeBSD': + IS_FREEBSD=True ++ elif os.uname()[0] == 'NetBSD': ++ IS_NETBSD=True + elif os.uname()[0] == 'OpenBSD': + IS_OPENBSD=True + elif os.uname()[0][:6] == 'CYGWIN': +@@ -1223,7 +1229,7 @@ def get_so_ext(): + sysname = os.uname()[0] + if sysname == 'Darwin': + return 'dylib' +- elif sysname == 'Linux' or sysname == 'FreeBSD' or sysname == 'OpenBSD': ++ elif sysname == 'Linux' or sysname == 'FreeBSD' or sysname == 'NetBSD' or sysname == 'OpenBSD': + return 'so' + elif sysname == 'CYGWIN': + return 'dll' +@@ -1773,6 +1779,8 @@ class JavaDLLComponent(Component): + t = t.replace('PLATFORM', 'linux') + elif IS_FREEBSD: + t = t.replace('PLATFORM', 'freebsd') ++ elif IS_NETBSD: ++ t = t.replace('PLATFORM', 'netbsd') + elif IS_OPENBSD: + t = t.replace('PLATFORM', 'openbsd') + elif IS_CYGWIN: +@@ -2445,6 +2453,13 @@ def mk_config(): + LDFLAGS = '%s -lrt' % LDFLAGS + SLIBFLAGS = '-shared' + SLIBEXTRAFLAGS = '%s -lrt' % SLIBEXTRAFLAGS ++ elif sysname == 'NetBSD': ++ CXXFLAGS = '%s -fno-strict-aliasing -D_NETBSD_' % CXXFLAGS ++ OS_DEFINES = '-D_NETBSD_' ++ SO_EXT = '.so' ++ LDFLAGS = '%s -lrt' % LDFLAGS ++ SLIBFLAGS = '-shared' ++ SLIBEXTRAFLAGS = '%s -lrt' % SLIBEXTRAFLAGS + elif sysname == 'OpenBSD': + CXXFLAGS = '%s -fno-strict-aliasing -D_OPENBSD_' % CXXFLAGS + OS_DEFINES = '-D_OPENBSD_' Index: pkgsrc/math/py-z3solver/patches/patch-core_src_util_stopwatch.h diff -u /dev/null pkgsrc/math/py-z3solver/patches/patch-core_src_util_stopwatch.h:1.1 --- /dev/null Tue Mar 20 15:47:36 2018 +++ pkgsrc/math/py-z3solver/patches/patch-core_src_util_stopwatch.h Tue Mar 20 15:47:36 2018 @@ -0,0 +1,18 @@ +$NetBSD: patch-core_src_util_stopwatch.h,v 1.1 2018/03/20 15:47:36 khorben Exp $ + +Add support for NetBSD. + +--- core/src/util/stopwatch.h.orig 2017-01-26 02:18:17.000000000 +0000 ++++ core/src/util/stopwatch.h +@@ -130,6 +130,11 @@ public: + + #include + ++#ifndef CLOCK_PROCESS_CPUTIME_ID ++/* BSD */ ++# define CLOCK_PROCESS_CPUTIME_ID CLOCK_MONOTONIC ++#endif ++ + class stopwatch { + unsigned long long m_time; // elapsed time in ns + bool m_running; --_----------=_152156085669380--