<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0679dd1f34c1c54db4c065ad9ee92e24943044d0">https://github.com/macports/macports-ports/commit/0679dd1f34c1c54db4c065ad9ee92e24943044d0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0679dd1 nusmv: Update to 2.6.0
</span>0679dd1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0679dd1f34c1c54db4c065ad9ee92e24943044d0
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Nov 1 05:31:02 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> nusmv: Update to 2.6.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/45839
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Disable universal variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/32627
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Conflicts with libcudd because it installs its own patched version.
</span>---
devel/libcudd/Portfile | 5 +-
devel/nusmv/Portfile | 67 +++++++++++-----------
.../files/MiniSat_minisat_core_SolverTypes.h.diff | 28 ---------
3 files changed, 36 insertions(+), 64 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libcudd/Portfile b/devel/libcudd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b6ccebe..a3d6950 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libcudd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libcudd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,8 @@ version 2.5.0
</span> categories devel
platforms darwin
maintainers caltech.edu:SCL openmaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts nusmv
</span>
description An efficient library for manipulating decision diagrams
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +23,8 @@ master_sites ftp://vlsi.colorado.edu/pub/
</span> distname cudd-${version}
checksums rmd160 2f7b1dc3118925de268a1f1396ba4e66b65c54e4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4f3bc49b35564af94b17135d8cb8c4063fb049cfaa442f80dc40ba73c6345a85
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4f3bc49b35564af94b17135d8cb8c4063fb049cfaa442f80dc40ba73c6345a85 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1053054
</span>
patchfiles patch-Makefile.diff \
patch-cudd-cudd.h.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nusmv/Portfile b/devel/nusmv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b295d8..ebdc057 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nusmv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nusmv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,59 +1,56 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
name nusmv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.5.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.6.0
</span> categories devel math
platforms darwin
maintainers nomaintainer
license LGPL-2.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts libcudd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description The NuSMV model checker
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://nusmv.fbk.eu/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://nusmv.fbk.eu/distrib/:nusmv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://minisat.se/downloads/:minisat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles NuSMV-${version}.tar.gz:nusmv minisat2-070721.zip:minisat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums NuSMV-2.5.4.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 60d2bf089c1dac179fd5dd54915da46bc585dea2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3c250624cba801b1f62f50733f9507b0f3b3ca557ce1cd65956178eb273f1bdf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- minisat2-070721.zip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a04236122afc4fba40b6e54da34b1b0d2ef4eda4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ddc2ed421a538a349ddab58d3958076d73813925ff08361e6292583d3b87248e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://nusmv.fbk.eu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}/distrib/:nusmv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/niklasso/minisat/archive/:minisat
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:readline port:expat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname NuSMV-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set nusmv_distfile ${distfiles}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set minisat_distfile 37dc6c67e2af26379d88ce349eb9c4c6160e8543.zip
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set minisatdir ${workpath}/NuSMV-${version}/MiniSat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir NuSMV-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${nusmv_distfile}:nusmv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${minisat_distfile}:minisat
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.only NuSMV-${version}.tar.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${minisatdir} "unzip ${distpath}/minisat2-070721.zip"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${nusmv_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3967791a7f5db2ed87749812ad809221e965c23b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dba953ed6e69965a68cd4992f9cdac6c449a3d15bf60d200f704d3a02e4bbcbb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4223312 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${minisat_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b2ad86d14debb70824aebff7f4e61d9e11b80a3e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 75f30bfd79669a6c788cbaecce867b49fa4c66c8158e98948077a09ef498a704 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 77725
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles MiniSat_minisat_core_SolverTypes.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # build included cudd first so that configure can pick it up
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/cudd-2.4.1.1 "mv Makefile_os_x_64bit Makefile_os_x"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/cudd-2.4.1.1 "make -f Makefile_os_x CPP=${configure.cxx} CC=${configure.cc} ICFLAGS=\"${configure.cc_archflags}\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${minisatdir} "CXX=\"${configure.cxx} ${configure.cxx_archflags}\" ./build.sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.only ${nusmv_distfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${distpath}/${minisat_distfile} ${worksrcpath}/MiniSat/
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.dir ${worksrcpath}/nusmv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-expat-libdir=${prefix}/lib --with-expat-incdir=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-zchaff --enable-minisat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-minisat-incdir=${minisatdir}/minisat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-minisat-libdir=${minisatdir}/minisat
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.dir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.source_dir ${worksrcpath}/NuSMV
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -DDOXYGEN_EXECUTABLE= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPDFLATEX_COMPILER=
</span>
livecheck.type regex
livecheck.url ${homepage}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nusmv/files/MiniSat_minisat_core_SolverTypes.h.diff b/devel/nusmv/files/MiniSat_minisat_core_SolverTypes.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 97cde9f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nusmv/files/MiniSat_minisat_core_SolverTypes.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- MiniSat/minisat/core/SolverTypes.h.orig 2006-11-11 08:54:30.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ MiniSat/minisat/core/SolverTypes.h 2012-07-06 01:55:39.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,11 +119,7 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // -- use this function instead:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template<class V>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- friend Clause* Clause_new(const V& ps, bool learnt = false) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- assert(sizeof(Lit) == sizeof(uint32_t));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- assert(sizeof(float) == sizeof(uint32_t));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return new (mem) Clause(ps, learnt); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ friend Clause* Clause_new(const V& ps, bool learnt = false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int size () const { return size_etc >> 3; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void shrink (int i) { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,6 +142,12 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void strengthen (Lit p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template<class V> Clause* Clause_new(const V& ps, bool learnt) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert(sizeof(Lit) == sizeof(uint32_t));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert(sizeof(float) == sizeof(uint32_t));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return new (mem) Clause(ps, learnt);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*_________________________________________________________________________________________________
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- |
</span></pre><pre style='margin:0'>
</pre>