diff --git a/math/py-spot/Makefile b/math/py-spot/Makefile index a1f112b3f8a4..4ca211134c37 100644 --- a/math/py-spot/Makefile +++ b/math/py-spot/Makefile @@ -1,37 +1,38 @@ PORTNAME= spot -DISTVERSION= 2.10.6 +DISTVERSION= 2.11 CATEGORIES= math MASTER_SITES= http://www.lrde.epita.fr/dload/${PORTNAME}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Python binding for 'Spot', the library for omega automata manipulation WWW= https://spot.lrde.epita.fr LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libspot.so:math/spot USES= compiler:c++14-lang gmake libtool python:3.4+ + GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-python --disable-static # otherwise shared libs aren't linked to spot libs for some reason LDFLAGS+= -L${LOCALBASE}/lib .for l in spot bddx spotgen spotltsmin LDFLAGS+= -l${l} .endfor post-configure: @${REINPLACE_CMD} ' \ s|^BUDDY_LDFLAGS =.*|BUDDY_LDFLAGS = ${LOCALBASE}/lib/libbddx.so|; \ s|$$(top_builddir)/spot/libspot.la|${LOCALBASE}/lib/libspot.so|; \ s|$$(top_builddir)/spot/ltsmin/libspotltsmin.la|${LOCALBASE}/lib/libspotltsmin.so|; \ s|$$(top_builddir)/spot/gen/libspotgen.la|${LOCALBASE}/lib/libspotgen.so|' \ ${WRKSRC}/python/Makefile post-install: @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name "*.so" | ${XARGS} ${STRIP_CMD} .include diff --git a/math/py-spot/distinfo b/math/py-spot/distinfo index c61161bdbadc..5e2f302d1eb1 100644 --- a/math/py-spot/distinfo +++ b/math/py-spot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652985587 -SHA256 (spot-2.10.6.tar.gz) = c588d1cb53ccea3e592f99402b14c2f4367b349ecef8e17b6d391df146bc8ba4 -SIZE (spot-2.10.6.tar.gz) = 7599871 +TIMESTAMP = 1665335836 +SHA256 (spot-2.11.tar.gz) = 5b20541f876b8cacb1df1a07fe18175e81345ac93030a11f3691d2b516b59679 +SIZE (spot-2.11.tar.gz) = 7547899 diff --git a/math/py-spot/files/patch-Makefile.in b/math/py-spot/files/patch-Makefile.in index 487034991a9c..776da2132059 100644 --- a/math/py-spot/files/patch-Makefile.in +++ b/math/py-spot/files/patch-Makefile.in @@ -1,22 +1,22 @@ ---- Makefile.in.orig 2018-08-04 07:35:57 UTC +--- Makefile.in.orig 2022-10-08 19:12:24 UTC +++ Makefile.in -@@ -223,8 +223,7 @@ am__define_uniq_tagged_files = \ - ETAGS = etags - CTAGS = ctags - CSCOPE = cscope +@@ -224,8 +224,7 @@ am__define_uniq_tagged_files = \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` -DIST_SUBDIRS = picosat buddy lib ltdl spot bin tests python doc bench \ - elisp +DIST_SUBDIRS = python am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/doc/org/.dir-locals.el.in \ $(top_srcdir)/doc/org/g++wrap.in \ -@@ -1153,8 +1152,7 @@ top_srcdir = @top_srcdir@ +@@ -1229,8 +1228,7 @@ top_srcdir = @top_srcdir@ @NEVER_TRUE@NEVER_SUBDIRS = bench elisp @USE_PYTHON_TRUE@PYTHON_SUBDIR = python DOC_SUBDIR = doc -SUBDIRS = picosat buddy lib ltdl spot bin tests $(PYTHON_SUBDIR) $(DOC_SUBDIR) \ - $(NEVER_SUBDIRS) +SUBDIRS = $(PYTHON_SUBDIR) - UTF8 = utf8/README.md utf8/utf8.h \ - utf8/utf8/checked.h utf8/utf8/core.h utf8/utf8/unchecked.h + UTF8 = utf8/README.md utf8/LICENSE utf8/utf8.h \ + utf8/utf8/checked.h utf8/utf8/core.h utf8/utf8/unchecked.h \ diff --git a/math/spot/Makefile b/math/spot/Makefile index 0c6dc6052147..53d406775a0d 100644 --- a/math/spot/Makefile +++ b/math/spot/Makefile @@ -1,30 +1,30 @@ PORTNAME= spot -DISTVERSION= 2.10.6 +DISTVERSION= 2.11 CATEGORIES= math MASTER_SITES= http://www.lrde.epita.fr/dload/${PORTNAME}/ MAINTAINER= yuri@FreeBSD.org COMMENT= Library for omega automata manipulation and model checking WWW= https://spot.lrde.epita.fr LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING USES= charsetfix compiler:c++17-lang gmake libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-python --disable-static INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS PORTDOCS= tl.pdf -TEST_TARGET= check +TEST_TARGET= check # at least one test fails to run, see https://gitlab.lre.epita.fr/spot/spot/-/issues/517 post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so .include diff --git a/math/spot/distinfo b/math/spot/distinfo index c769672f3c9a..7601ff9d3606 100644 --- a/math/spot/distinfo +++ b/math/spot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652985604 -SHA256 (spot-2.10.6.tar.gz) = c588d1cb53ccea3e592f99402b14c2f4367b349ecef8e17b6d391df146bc8ba4 -SIZE (spot-2.10.6.tar.gz) = 7599871 +TIMESTAMP = 1665334301 +SHA256 (spot-2.11.tar.gz) = 5b20541f876b8cacb1df1a07fe18175e81345ac93030a11f3691d2b516b59679 +SIZE (spot-2.11.tar.gz) = 7547899 diff --git a/math/spot/files/patch-spot_misc_tmpfile.cc b/math/spot/files/patch-spot_misc_tmpfile.cc index f3705f682eeb..063d33233e71 100644 --- a/math/spot/files/patch-spot_misc_tmpfile.cc +++ b/math/spot/files/patch-spot_misc_tmpfile.cc @@ -1,10 +1,10 @@ ---- spot/misc/tmpfile.cc.orig 2018-10-04 12:40:02 UTC +--- spot/misc/tmpfile.cc.orig 2022-10-08 19:11:32 UTC +++ spot/misc/tmpfile.cc @@ -23,6 +23,7 @@ - #include + #include #include #include +#include - namespace spot - { + using namespace std::string_literals; + diff --git a/math/spot/files/patch-spot_twaalgos_hoa.hh b/math/spot/files/patch-spot_twaalgos_hoa.hh new file mode 100644 index 000000000000..402f36099c4a --- /dev/null +++ b/math/spot/files/patch-spot_twaalgos_hoa.hh @@ -0,0 +1,12 @@ +- workaround for https://gitlab.lre.epita.fr/spot/spot/-/issues/515 + +--- spot/twaalgos/hoa.hh.orig 2022-10-09 17:09:51 UTC ++++ spot/twaalgos/hoa.hh +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/math/spot/pkg-plist b/math/spot/pkg-plist index e94c0e5e8cf5..927a9f807b45 100644 --- a/math/spot/pkg-plist +++ b/math/spot/pkg-plist @@ -1,228 +1,230 @@ bin/autcross bin/autfilt bin/dstar2tgba bin/genaut bin/genltl bin/ltl2tgba bin/ltl2tgta bin/ltlcross bin/ltldo bin/ltlfilt bin/ltlgrind bin/ltlsynt bin/randaut bin/randltl include/bddx.h include/bvecx.h include/fddx.h include/spot/bricks/brick-assert include/spot/bricks/brick-bitlevel include/spot/bricks/brick-hash include/spot/bricks/brick-hashset include/spot/bricks/brick-shmem include/spot/bricks/brick-types include/spot/gen/automata.hh include/spot/gen/formulas.hh include/spot/graph/graph.hh include/spot/graph/ngraph.hh include/spot/kripke/fairkripke.hh include/spot/kripke/fwd.hh include/spot/kripke/kripke.hh include/spot/kripke/kripkegraph.hh include/spot/ltsmin/ltsmin.hh include/spot/ltsmin/spins_interface.hh include/spot/ltsmin/spins_kripke.hh include/spot/ltsmin/spins_kripke.hxx include/spot/mc/bloemen.hh include/spot/mc/bloemen_ec.hh include/spot/mc/cndfs.hh include/spot/mc/deadlock.hh include/spot/mc/intersect.hh include/spot/mc/lpar13.hh include/spot/mc/mc.hh include/spot/mc/mc_instanciator.hh include/spot/mc/unionfind.hh include/spot/mc/utils.hh include/spot/misc/_config.h include/spot/misc/bareword.hh include/spot/misc/bddlt.hh include/spot/misc/bitset.hh include/spot/misc/bitvect.hh include/spot/misc/casts.hh include/spot/misc/clz.hh include/spot/misc/common.hh include/spot/misc/escape.hh include/spot/misc/fixpool.hh include/spot/misc/formater.hh include/spot/misc/hash.hh include/spot/misc/hashfunc.hh include/spot/misc/intvcmp2.hh include/spot/misc/intvcomp.hh include/spot/misc/location.hh include/spot/misc/ltstr.hh include/spot/misc/memusage.hh include/spot/misc/minato.hh include/spot/misc/mspool.hh include/spot/misc/optionmap.hh include/spot/misc/position.hh include/spot/misc/random.hh include/spot/misc/satsolver.hh include/spot/misc/timer.hh include/spot/misc/tmpfile.hh include/spot/misc/trival.hh include/spot/misc/version.hh include/spot/parseaut/public.hh include/spot/ta/ta.hh include/spot/ta/taexplicit.hh include/spot/ta/taproduct.hh include/spot/ta/tgta.hh include/spot/ta/tgtaexplicit.hh include/spot/ta/tgtaproduct.hh include/spot/taalgos/dot.hh include/spot/taalgos/emptinessta.hh include/spot/taalgos/minimize.hh include/spot/taalgos/reachiter.hh include/spot/taalgos/statessetbuilder.hh include/spot/taalgos/stats.hh include/spot/taalgos/tgba2ta.hh include/spot/tl/apcollect.hh include/spot/tl/contain.hh include/spot/tl/declenv.hh include/spot/tl/defaultenv.hh include/spot/tl/dot.hh include/spot/tl/environment.hh include/spot/tl/exclusive.hh include/spot/tl/formula.hh include/spot/tl/hierarchy.hh include/spot/tl/length.hh include/spot/tl/ltlf.hh include/spot/tl/mutation.hh include/spot/tl/nenoform.hh include/spot/tl/parse.hh include/spot/tl/print.hh include/spot/tl/randomltl.hh include/spot/tl/relabel.hh include/spot/tl/remove_x.hh include/spot/tl/simplify.hh include/spot/tl/snf.hh +include/spot/tl/sonf.hh include/spot/tl/unabbrev.hh include/spot/twa/acc.hh include/spot/twa/bdddict.hh include/spot/twa/bddprint.hh include/spot/twa/formula2bdd.hh include/spot/twa/fwd.hh include/spot/twa/taatgba.hh include/spot/twa/twa.hh include/spot/twa/twagraph.hh include/spot/twa/twaproduct.hh include/spot/twaalgos/aiger.hh include/spot/twaalgos/alternation.hh include/spot/twaalgos/are_isomorphic.hh include/spot/twaalgos/bfssteps.hh include/spot/twaalgos/canonicalize.hh include/spot/twaalgos/cleanacc.hh include/spot/twaalgos/cobuchi.hh include/spot/twaalgos/complement.hh include/spot/twaalgos/complete.hh include/spot/twaalgos/compsusp.hh include/spot/twaalgos/contains.hh include/spot/twaalgos/copy.hh include/spot/twaalgos/couvreurnew.hh include/spot/twaalgos/cycles.hh +include/spot/twaalgos/dbranch.hh include/spot/twaalgos/degen.hh include/spot/twaalgos/determinize.hh include/spot/twaalgos/dot.hh include/spot/twaalgos/dtbasat.hh include/spot/twaalgos/dtwasat.hh include/spot/twaalgos/dualize.hh include/spot/twaalgos/emptiness.hh include/spot/twaalgos/emptiness_stats.hh include/spot/twaalgos/game.hh include/spot/twaalgos/genem.hh include/spot/twaalgos/gfguarantee.hh include/spot/twaalgos/gtec/ce.hh include/spot/twaalgos/gtec/gtec.hh include/spot/twaalgos/gtec/sccstack.hh include/spot/twaalgos/gtec/status.hh include/spot/twaalgos/gv04.hh include/spot/twaalgos/hoa.hh include/spot/twaalgos/iscolored.hh include/spot/twaalgos/isdet.hh include/spot/twaalgos/isunamb.hh include/spot/twaalgos/isweakscc.hh include/spot/twaalgos/langmap.hh include/spot/twaalgos/lbtt.hh include/spot/twaalgos/ltl2taa.hh include/spot/twaalgos/ltl2tgba_fm.hh include/spot/twaalgos/magic.hh include/spot/twaalgos/mask.hh include/spot/twaalgos/mealy_machine.hh include/spot/twaalgos/minimize.hh include/spot/twaalgos/neverclaim.hh include/spot/twaalgos/parity.hh include/spot/twaalgos/postproc.hh include/spot/twaalgos/powerset.hh include/spot/twaalgos/product.hh include/spot/twaalgos/randomgraph.hh include/spot/twaalgos/randomize.hh include/spot/twaalgos/reachiter.hh include/spot/twaalgos/relabel.hh include/spot/twaalgos/remfin.hh include/spot/twaalgos/remprop.hh include/spot/twaalgos/sbacc.hh include/spot/twaalgos/sccfilter.hh include/spot/twaalgos/sccinfo.hh include/spot/twaalgos/se05.hh include/spot/twaalgos/sepsets.hh include/spot/twaalgos/simulation.hh include/spot/twaalgos/split.hh include/spot/twaalgos/stats.hh include/spot/twaalgos/strength.hh include/spot/twaalgos/stripacc.hh include/spot/twaalgos/stutter.hh include/spot/twaalgos/sum.hh include/spot/twaalgos/synthesis.hh include/spot/twaalgos/tau03.hh include/spot/twaalgos/tau03opt.hh include/spot/twaalgos/toparity.hh include/spot/twaalgos/totgba.hh include/spot/twaalgos/toweak.hh include/spot/twaalgos/translate.hh include/spot/twaalgos/word.hh include/spot/twaalgos/zlktree.hh include/spot/twacube/cube.hh include/spot/twacube/fwd.hh include/spot/twacube/twacube.hh include/spot/twacube_algos/convert.hh lib/libbddx.so lib/libbddx.so.0 lib/libbddx.so.0.0.0 lib/libspot.so lib/libspot.so.0 lib/libspot.so.0.0.0 lib/libspotgen.so lib/libspotgen.so.0 lib/libspotgen.so.0.0.0 lib/libspotltsmin.so lib/libspotltsmin.so.0 lib/libspotltsmin.so.0.0.0 libdata/pkgconfig/libbddx.pc libdata/pkgconfig/libspot.pc libdata/pkgconfig/libspotgen.pc libdata/pkgconfig/libspotltsmin.pc man/man1/autcross.1.gz man/man1/autfilt.1.gz man/man1/dstar2tgba.1.gz man/man1/genaut.1.gz man/man1/genltl.1.gz man/man1/ltl2tgba.1.gz man/man1/ltl2tgta.1.gz man/man1/ltlcross.1.gz man/man1/ltldo.1.gz man/man1/ltlfilt.1.gz man/man1/ltlgrind.1.gz man/man1/ltlsynt.1.gz man/man1/randaut.1.gz man/man1/randltl.1.gz man/man7/spot-x.7.gz man/man7/spot.7.gz