From nobody Wed Jan 04 10:52:03 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nn5yW5rsVz2nrRT; Wed, 4 Jan 2023 10:52:03 +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 4Nn5yW4x0Gz3KRQ; Wed, 4 Jan 2023 10:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672829523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZP8CwsPc4I26mo3P2wj135cMF8NZhItIYddbrHthgw8=; b=Gvpd1X1rj4Qk51XLGK3TybsKYT7+Sa7vKIgCCYyqkjOS0xEuUJhiKExfPMfWOpJdeEY5FM mn7G//SexjADa1dXmYKCcG5xJu+C0u/4pOW7BIIG0/gDt9wCvrEwqGJpE8Xf9xodsY/2a+ 1wLY5ZKblGarSi/r5Q2KA+kt7SCl0+sEC+Ltf6YjxcHpO7whoOyfgNyqF1K2EQNjIMwlr7 8RSuIHhcRbsCPQpU6ZR5B1xtuHDWEOcGdNCHReBJj2dziZ1SdNYWLcnI5/P2pnxCt/sWZ9 6N6fUPdh+q02AZQdSu0TjQttA2U23fAH7FIE9V8BIV4kA0LoYfZNf/uPrzZeXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672829523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZP8CwsPc4I26mo3P2wj135cMF8NZhItIYddbrHthgw8=; b=RhObkqbTo87nM0hErO+KvW+A7hfmKcdcXxAtquCwBvcWTS67ybUHKZi7ebn4NHJ9/FY9xE EgrCO1jEZbMqpMGgI+EPXyXwcRFn6880RuOq7vkusSp8EVrucyVRcdIkp2ziHh2pJpyJ96 WkPm6Ro7MMTl06CYRkQ1KQR/wveFDKu8kXdLCtDWhTie/May4h6AMwZ5jVZTCRvSF2jSLz jxYHf8XiNkD2qXsolph1bM9urxac4KwB59+DLNQAYzNLd5QmNQbPk65rZUE989QdMi/Quv O3dknYfiT5YrxYt3rjzNKzT5aK09b3viHrLAHOIy1S8l3EuEovnSA00uCHRKVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672829523; a=rsa-sha256; cv=none; b=c2LLouvmxMuxeKcCbzNpwk9ypJO4UKxqPpNAnGdHq5bGk8EW1YORX8kBBxe+fhfonsBcEb w/0RV+jJ9lppexNGXTmYZbnygStqAzZ6QOj9o3X5f3ydCpLHSkLkQ0ahjN/lMRjCBL1EX4 veBWRYgoQDz+PMPN0lrgw8NNT/TNZzQGywPAvaY5yH4NgMx5MVT1/1lOB9o2qazU1kPLqu +bflNgMXUrZBUDvUKRoUB29/9vE3Axs0UzsbQpESLd6tRrhIq61PHc0c9X6ZbxXedAc1ax u9bWVfB61uVeFluEe7mQiAUvY194ko8BGCEhN64AQnzaps120885jz2ai1pe7A== 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 4Nn5yW3vz4z17Nh; Wed, 4 Jan 2023 10:52:03 +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 304Aq34K073186; Wed, 4 Jan 2023 10:52:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 304Aq3Ql073185; Wed, 4 Jan 2023 10:52:03 GMT (envelope-from git) Date: Wed, 4 Jan 2023 10:52:03 GMT Message-Id: <202301041052.304Aq3Ql073185@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 23e9c273cdbd - main - math/cadical: Update 1.0.3 -> 1.5.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23e9c273cdbdcb0e9fffeed64792d58d6a1782f8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=23e9c273cdbdcb0e9fffeed64792d58d6a1782f8 commit 23e9c273cdbdcb0e9fffeed64792d58d6a1782f8 Author: Yuri Victorovich AuthorDate: 2023-01-04 06:53:49 +0000 Commit: Yuri Victorovich CommitDate: 2023-01-04 10:51:58 +0000 math/cadical: Update 1.0.3 -> 1.5.3 --- math/cadical/Makefile | 16 +++++++++++----- math/cadical/distinfo | 6 +++--- math/cadical/files/patch-configure | 13 ++----------- math/cadical/files/patch-src_mobical.cpp | 18 ++++++++++++++++++ math/cadical/files/patch-src_random.cpp | 10 ++++++++++ 5 files changed, 44 insertions(+), 19 deletions(-) diff --git a/math/cadical/Makefile b/math/cadical/Makefile index c8f77dc1f404..815d8cb14cd1 100644 --- a/math/cadical/Makefile +++ b/math/cadical/Makefile @@ -1,9 +1,7 @@ PORTNAME= cadical -DISTVERSION= 1.0.3 -DISTVERSIONSUFFIX= -cb89cbf -PORTREVISION= 1 +DISTVERSIONPREFIX= rel- +DISTVERSION= 1.5.3 CATEGORIES= math devel -MASTER_SITES= http://fmv.jku.at/${PORTNAME}/ MAINTAINER= yuri@FreeBSD.org COMMENT= Simple CDCL satisfiability solver @@ -13,6 +11,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c++0x gmake tar:xz + +USE_GITHUB= yes +GH_ACCOUNT= arminbiere + GNU_CONFIGURE= yes CXXFLAGS+= -fPIC @@ -23,14 +25,18 @@ BINARY_ALIAS= make=${GMAKE} EXES= cadical mobical +TEST_TARGET= test + PLIST_FILES= ${EXES:S/^/bin\//} \ + include/cadical.hpp \ include/ccadical.h \ lib/libcadical.a -do-install: +do-install: # workaround for https://github.com/arminbiere/cadical/issues/49 .for e in ${EXES} ${INSTALL_PROGRAM} ${WRKSRC}/build/${e} ${STAGEDIR}${PREFIX}/bin .endfor + ${INSTALL_DATA} ${WRKSRC}/src/cadical.hpp ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/src/ccadical.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/build/libcadical.a ${STAGEDIR}${PREFIX}/lib diff --git a/math/cadical/distinfo b/math/cadical/distinfo index 5d02fcde86ad..ee0e226276a6 100644 --- a/math/cadical/distinfo +++ b/math/cadical/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1575437337 -SHA256 (cadical-1.0.3-cb89cbf.tar.xz) = d73879c649c8a7e685bec00f8bbdd0fa64cd325bb4c2a9e30b1b113043b703eb -SIZE (cadical-1.0.3-cb89cbf.tar.xz) = 340116 +TIMESTAMP = 1672780757 +SHA256 (arminbiere-cadical-rel-1.5.3_GH0.tar.gz) = 0ff521ed36d57478a8dbc610e0d27536c9d3a2154d859152f33f8733a6dca31e +SIZE (arminbiere-cadical-rel-1.5.3_GH0.tar.gz) = 596378 diff --git a/math/cadical/files/patch-configure b/math/cadical/files/patch-configure index 9fc9c43144fd..2dc98960144b 100644 --- a/math/cadical/files/patch-configure +++ b/math/cadical/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2019-07-12 20:22:02 UTC +--- configure.orig 2022-08-17 10:12:36 UTC +++ configure -@@ -154,7 +154,7 @@ do +@@ -169,7 +169,7 @@ do CXXFLAGS="`expr \"$1\" : 'CXXFLAGS=\(.*\)'`" ;; @@ -9,12 +9,3 @@ esac shift -@@ -396,7 +396,7 @@ sed \ - -e "2c\\ - # This 'makefile' is generated from '../makefile.in'." \ - -e "s,@CXX@,$CXX," \ ---e "s,@CXXFLAGS@,$CXXFLAGS," \ -+-e "s|@CXXFLAGS@|$CXXFLAGS|" \ - -e "s,@MAKEFLAGS@,$MAKEFLAGS," \ - ../makefile.in > makefile - diff --git a/math/cadical/files/patch-src_mobical.cpp b/math/cadical/files/patch-src_mobical.cpp new file mode 100644 index 000000000000..096b51f70222 --- /dev/null +++ b/math/cadical/files/patch-src_mobical.cpp @@ -0,0 +1,18 @@ +- workaround for https://github.com/arminbiere/cadical/issues/48 + +--- src/mobical.cpp.orig 2022-08-17 10:12:36 UTC ++++ src/mobical.cpp +@@ -2611,7 +2611,12 @@ Mobical::Mobical () + { + const int prot = PROT_READ | PROT_WRITE; + const int flags = MAP_ANONYMOUS | MAP_SHARED; +- shared = (Shared*) mmap (0, sizeof *shared, prot, flags, 0, 0); ++ void *m = mmap (0, sizeof *shared, prot, flags, -1, 0); ++ if (m == MAP_FAILED) { ++ perror("mmap failed"); ++ exit(1); ++ } ++ shared = (Shared*)m; + } + + Mobical::~Mobical () { diff --git a/math/cadical/files/patch-src_random.cpp b/math/cadical/files/patch-src_random.cpp new file mode 100644 index 000000000000..93c16a43d30b --- /dev/null +++ b/math/cadical/files/patch-src_random.cpp @@ -0,0 +1,10 @@ +--- src/random.cpp.orig 2023-01-03 21:27:48 UTC ++++ src/random.cpp +@@ -1,5 +1,7 @@ + #include "internal.hpp" + ++#include ++ + /*------------------------------------------------------------------------*/ + + // Our random number generator is seeded by default (i.e., in the default