Date: Thu, 6 May 2021 21:39:33 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 97e2d80eda48 - main - math/gecode: Update 6.2.0 -> 6.3.0 (from branch) Message-ID: <202105062139.146LdX1H001821@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=97e2d80eda48f6511d7d415338235b28240cd643 commit 97e2d80eda48f6511d7d415338235b28240cd643 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2021-05-06 21:37:15 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2021-05-06 21:39:31 +0000 math/gecode: Update 6.2.0 -> 6.3.0 (from branch) 6.3.0 is ready for a while but hasn't been released pending only Windows installer issues. --- math/gecode/Makefile | 19 ++----- math/gecode/distinfo | 14 ++--- math/gecode/files/gecode.msc.in | 9 ---- math/gecode/pkg-plist | 116 +++++++++++++++++++++------------------- 4 files changed, 70 insertions(+), 88 deletions(-) diff --git a/math/gecode/Makefile b/math/gecode/Makefile index 08ca1a287a5c..76cc4b86ab1c 100644 --- a/math/gecode/Makefile +++ b/math/gecode/Makefile @@ -2,15 +2,12 @@ PORTNAME= gecode DISTVERSIONPREFIX= release- -DISTVERSION= 6.2.0 -PORTREVISION= 1 +DISTVERSION= 6.3.0 CATEGORIES= math PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ -PATCHFILES= f08079c5df271869bc7c0799b3eccc52ca2f4d83.patch:-p1 # https://github.com/Gecode/gecode/pull/51 -PATCHFILES+= c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch:-p1 # fix C++ clang-10 problem with static field assignments -PATCHFILES+= bb1efcd8c4bf5d8d6c079a1b7704c51ea958bf06.patch:-p1 # suppress clang warnings about wrong array index -PATCHFILES+= 3b86d0dabc371d5976c5dafef0fc7f6c5f92640b.patch:-p1 # https://github.com/Gecode/gecode/pull/102: Fix MOC invocation in gist folder +PATCHFILES= 3b86d0dabc371d5976c5dafef0fc7f6c5f92640b.patch:-p1 # https://github.com/Gecode/gecode/pull/102: Fix MOC invocation in gist folder +PATCHFILES+= b8954e4e5a4c0faf65eb72d62f7e7b377bea14bb.patch:-p1 # https://github.com/Gecode/gecode/pull/104: Ready fzn-gecode as MiniZinc solver on make install MAINTAINER= yuri@FreeBSD.org COMMENT= Generic Constraint Development Environment @@ -22,15 +19,14 @@ NOT_FOR_ARCHS= aarch64 armv6 armv7 mips mips64 NOT_FOR_ARCHS_REASON= needs code written to specify rounding control mechanism in Boost.Numeric.Interval USES= bison:alias cmake compiler:c++11-lang -USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= Gecode +GH_TAGNAME= 9428cd8 # 6.3.0 branch is ready for a long time, but hasn't been tagged yet CMAKE_ON= BUILD_SHARED_LIBS -SUB_FILES= ${PORTNAME}.msc -SUB_LIST= PORTVERSION=${PORTVERSION} +DATADIR= ${PREFIX}/share/minizinc/gecode # it only installs the MiniZinc library into DATADIR OPTIONS_DEFINE= GIST OPTIONS_SUB= yes @@ -40,9 +36,4 @@ GIST_CMAKE_BOOL= ENABLE_GIST GIST_USES= qt:5 GIST_USE= qt=core,gui,printsupport,widgets,qmake_build,buildtools_build -post-install: # https://github.com/Gecode/gecode/issues/105 - # install MiniZinc configuration file - ${MKDIR} ${STAGEDIR}${PREFIX}/share/minizinc/solvers - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.msc ${STAGEDIR}${PREFIX}/share/minizinc/solvers - .include <bsd.port.mk> diff --git a/math/gecode/distinfo b/math/gecode/distinfo index 9206da3f3417..8f6b3dfa0c5e 100644 --- a/math/gecode/distinfo +++ b/math/gecode/distinfo @@ -1,11 +1,7 @@ -TIMESTAMP = 1614812825 -SHA256 (Gecode-gecode-release-6.2.0_GH0.tar.gz) = 27d91721a690db1e96fa9bb97cec0d73a937e9dc8062c3327f8a4ccb08e951fd -SIZE (Gecode-gecode-release-6.2.0_GH0.tar.gz) = 3672525 -SHA256 (f08079c5df271869bc7c0799b3eccc52ca2f4d83.patch) = 945e522a7204324ba9740a76fc3a3806f670932e6dd57629ff041afedd5eb70d -SIZE (f08079c5df271869bc7c0799b3eccc52ca2f4d83.patch) = 2005 -SHA256 (c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch) = 150cc0c725dc73b3404eff704055a641c6175b230d3c3d740ea617d2b44e7552 -SIZE (c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch) = 940 -SHA256 (bb1efcd8c4bf5d8d6c079a1b7704c51ea958bf06.patch) = fe8620826dc0e78d20c46493f17ec17067cf6ea399680ac99e0826a06c50ea86 -SIZE (bb1efcd8c4bf5d8d6c079a1b7704c51ea958bf06.patch) = 1366 +TIMESTAMP = 1620335351 +SHA256 (Gecode-gecode-release-6.3.0-9428cd8_GH0.tar.gz) = 8605ee3644afb8b9821d98fd3b930a3e593c31d0b239d42446fbdbfc39bd935e +SIZE (Gecode-gecode-release-6.3.0-9428cd8_GH0.tar.gz) = 5725805 SHA256 (3b86d0dabc371d5976c5dafef0fc7f6c5f92640b.patch) = 20b69c28be015dea2826f66cab7079b30768d23af9b1d30d91bb6137e3c22227 SIZE (3b86d0dabc371d5976c5dafef0fc7f6c5f92640b.patch) = 665 +SHA256 (b8954e4e5a4c0faf65eb72d62f7e7b377bea14bb.patch) = bdcf1daa59bb82b92582b4aa0d1813a0c3b580b3d8ad1d9e1f28afc105f53e54 +SIZE (b8954e4e5a4c0faf65eb72d62f7e7b377bea14bb.patch) = 7628 diff --git a/math/gecode/files/gecode.msc.in b/math/gecode/files/gecode.msc.in deleted file mode 100644 index 7e6cea346275..000000000000 --- a/math/gecode/files/gecode.msc.in +++ /dev/null @@ -1,9 +0,0 @@ -{ - "id" : "gecode", - "name" : "Gecode", - "executable" : "%%PREFIX%%/bin/fzn-gecode", - "version": "%%PORTVERSION%%", - "mznlib": "%%DATADIR%%/mznlib", - "supportsFzn":true, - "supportsNL":false -} diff --git a/math/gecode/pkg-plist b/math/gecode/pkg-plist index 2f638378e02c..0dd3b19c306d 100644 --- a/math/gecode/pkg-plist +++ b/math/gecode/pkg-plist @@ -10,7 +10,7 @@ include/gecode/flatzinc/branch.hpp include/gecode/flatzinc/conexpr.hh include/gecode/flatzinc/option.hh include/gecode/flatzinc/parser.hh -include/gecode/flatzinc/parser.tab.hh +include/gecode/flatzinc/parser.tab.hpp include/gecode/flatzinc/plugin.hh include/gecode/flatzinc/registry.hh include/gecode/flatzinc/symboltable.hh @@ -704,62 +704,66 @@ lib/libgecodeminimodel.so lib/libgecodesearch.so lib/libgecodeset.so lib/libgecodesupport.so -%%DATADIR%%/mznlib/all_different_int.mzn -%%DATADIR%%/mznlib/all_equal_int.mzn -%%DATADIR%%/mznlib/alldifferent_except_0.mzn -%%DATADIR%%/mznlib/among.mzn -%%DATADIR%%/mznlib/arg_max_bool.mzn -%%DATADIR%%/mznlib/arg_max_int.mzn -%%DATADIR%%/mznlib/arg_min_bool.mzn -%%DATADIR%%/mznlib/arg_min_int.mzn -%%DATADIR%%/mznlib/at_least_int.mzn -%%DATADIR%%/mznlib/at_least_set.mzn -%%DATADIR%%/mznlib/at_most_int.mzn -%%DATADIR%%/mznlib/at_most_set.mzn -%%DATADIR%%/mznlib/bin_packing.mzn -%%DATADIR%%/mznlib/bin_packing_capa.mzn -%%DATADIR%%/mznlib/bin_packing_load.mzn -%%DATADIR%%/mznlib/circuit.mzn -%%DATADIR%%/mznlib/count.mzn -%%DATADIR%%/mznlib/cumulative.mzn -%%DATADIR%%/mznlib/decreasing_bool.mzn -%%DATADIR%%/mznlib/decreasing_int.mzn -%%DATADIR%%/mznlib/diffn.mzn -%%DATADIR%%/mznlib/disjoint.mzn -%%DATADIR%%/mznlib/disjunctive_strict.mzn -%%DATADIR%%/mznlib/distribute.mzn -%%DATADIR%%/mznlib/exactly_int.mzn -%%DATADIR%%/mznlib/exactly_set.mzn +%%DATADIR%%/mznlib/fzn_all_different_int.mzn +%%DATADIR%%/mznlib/fzn_all_equal_int.mzn +%%DATADIR%%/mznlib/fzn_alldifferent_except_0.mzn +%%DATADIR%%/mznlib/fzn_among.mzn +%%DATADIR%%/mznlib/fzn_arg_max_bool.mzn +%%DATADIR%%/mznlib/fzn_arg_max_int.mzn +%%DATADIR%%/mznlib/fzn_arg_min_bool.mzn +%%DATADIR%%/mznlib/fzn_arg_min_int.mzn +%%DATADIR%%/mznlib/fzn_at_least_int.mzn +%%DATADIR%%/mznlib/fzn_at_least_set.mzn +%%DATADIR%%/mznlib/fzn_at_most_int.mzn +%%DATADIR%%/mznlib/fzn_at_most_set.mzn +%%DATADIR%%/mznlib/fzn_bin_packing.mzn +%%DATADIR%%/mznlib/fzn_bin_packing_capa.mzn +%%DATADIR%%/mznlib/fzn_bin_packing_load.mzn +%%DATADIR%%/mznlib/fzn_circuit.mzn +%%DATADIR%%/mznlib/fzn_count_eq.mzn +%%DATADIR%%/mznlib/fzn_count_eq_reif.mzn +%%DATADIR%%/mznlib/fzn_cumulative.mzn +%%DATADIR%%/mznlib/fzn_decreasing_bool.mzn +%%DATADIR%%/mznlib/fzn_decreasing_int.mzn +%%DATADIR%%/mznlib/fzn_diffn.mzn +%%DATADIR%%/mznlib/fzn_disjoint.mzn +%%DATADIR%%/mznlib/fzn_disjunctive_strict.mzn +%%DATADIR%%/mznlib/fzn_exactly_set.mzn +%%DATADIR%%/mznlib/fzn_global_cardinality.mzn +%%DATADIR%%/mznlib/fzn_global_cardinality_closed.mzn +%%DATADIR%%/mznlib/fzn_global_cardinality_low_up.mzn +%%DATADIR%%/mznlib/fzn_global_cardinality_low_up_closed.mzn +%%DATADIR%%/mznlib/fzn_increasing_bool.mzn +%%DATADIR%%/mznlib/fzn_increasing_int.mzn +%%DATADIR%%/mznlib/fzn_int_set_channel.mzn +%%DATADIR%%/mznlib/fzn_inverse.mzn +%%DATADIR%%/mznlib/fzn_inverse_set.mzn +%%DATADIR%%/mznlib/fzn_lex_less_bool.mzn +%%DATADIR%%/mznlib/fzn_lex_less_int.mzn +%%DATADIR%%/mznlib/fzn_lex_lesseq_bool.mzn +%%DATADIR%%/mznlib/fzn_lex_lesseq_int.mzn +%%DATADIR%%/mznlib/fzn_link_set_to_booleans.mzn +%%DATADIR%%/mznlib/fzn_member_bool.mzn +%%DATADIR%%/mznlib/fzn_member_bool_reif.mzn +%%DATADIR%%/mznlib/fzn_member_int.mzn +%%DATADIR%%/mznlib/fzn_member_int_reif.mzn +%%DATADIR%%/mznlib/fzn_nvalue.mzn +%%DATADIR%%/mznlib/fzn_partition_set.mzn +%%DATADIR%%/mznlib/fzn_range.mzn +%%DATADIR%%/mznlib/fzn_regular.mzn +%%DATADIR%%/mznlib/fzn_roots.mzn +%%DATADIR%%/mznlib/fzn_sort.mzn +%%DATADIR%%/mznlib/fzn_sum_pred.mzn +%%DATADIR%%/mznlib/fzn_sum_set.mzn +%%DATADIR%%/mznlib/fzn_table_bool.mzn +%%DATADIR%%/mznlib/fzn_table_bool_reif.mzn +%%DATADIR%%/mznlib/fzn_table_int.mzn +%%DATADIR%%/mznlib/fzn_table_int_reif.mzn +%%DATADIR%%/mznlib/fzn_value_precede_int.mzn +%%DATADIR%%/mznlib/fzn_value_precede_set.mzn %%DATADIR%%/mznlib/gecode.mzn -%%DATADIR%%/mznlib/global_cardinality.mzn -%%DATADIR%%/mznlib/global_cardinality_closed.mzn -%%DATADIR%%/mznlib/global_cardinality_low_up.mzn -%%DATADIR%%/mznlib/global_cardinality_low_up_closed.mzn -%%DATADIR%%/mznlib/increasing_bool.mzn -%%DATADIR%%/mznlib/increasing_int.mzn -%%DATADIR%%/mznlib/int_set_channel.mzn -%%DATADIR%%/mznlib/inverse.mzn -%%DATADIR%%/mznlib/inverse_set.mzn -%%DATADIR%%/mznlib/lex_less_bool.mzn -%%DATADIR%%/mznlib/lex_less_int.mzn -%%DATADIR%%/mznlib/lex_lesseq_bool.mzn -%%DATADIR%%/mznlib/lex_lesseq_int.mzn -%%DATADIR%%/mznlib/link_set_to_booleans.mzn -%%DATADIR%%/mznlib/maximum_int.mzn -%%DATADIR%%/mznlib/member_bool.mzn -%%DATADIR%%/mznlib/member_int.mzn -%%DATADIR%%/mznlib/minimum_int.mzn -%%DATADIR%%/mznlib/nvalue.mzn -%%DATADIR%%/mznlib/partition_set.mzn -%%DATADIR%%/mznlib/range.mzn +%%DATADIR%%/mznlib/redefinitions-2.0.2.mzn %%DATADIR%%/mznlib/redefinitions-2.0.mzn +%%DATADIR%%/mznlib/redefinitions-2.5.2.mzn %%DATADIR%%/mznlib/redefinitions.mzn -%%DATADIR%%/mznlib/regular.mzn -%%DATADIR%%/mznlib/roots.mzn -%%DATADIR%%/mznlib/sort.mzn -%%DATADIR%%/mznlib/sum_pred.mzn -%%DATADIR%%/mznlib/table_bool.mzn -%%DATADIR%%/mznlib/table_int.mzn -%%DATADIR%%/mznlib/value_precede_int.mzn -%%DATADIR%%/mznlib/value_precede_set.mzn share/minizinc/solvers/gecode.msc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105062139.146LdX1H001821>