math/minizinc: Update 2.5.0 -> 2.5.1

Reported by:	portscout

4 files changed, 56 insertions, 12 deletions

diff --git a/math/minizinc/Makefile b/math/minizinc/Makefile
index d8f4f4ccf59a..6425dcf0a76d 100644
--- a/math/minizinc/Makefile
+++ b/math/minizinc/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	minizinc
-DISTVERSION=	2.5.0
+DISTVERSION=	2.5.1
 CATEGORIES=	math lang
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -19,9 +19,10 @@ USES=		bison cmake compiler:c++11-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	MiniZinc
 GH_PROJECT=	libminizinc
-GH_TAGNAME=	01854690be366b964df9e25eaf5bd244759c4e76 # develop branch
 USE_LDCONFIG=	yes
 
+CXXFLAGS+=	-DFREEBSD_MZN_STDLIB_DIR="\\\"${DATADIR}\\\""
+
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 OPTIONS_DEFINE=		WITH_SCIP
@@ -33,6 +34,5 @@ WITH_SCIP_BROKEN=	Build failure: https://github.com/MiniZinc/libminizinc/issues/
 
 post-patch:
 	${REINPLACE_CMD} -e 's|string std_lib_dir;|string std_lib_dir = "${DATADIR}";|' ${WRKSRC}/mzn2doc.cpp
-	${REINPLACE_CMD} -e 's|std_lib_dir(stdlibDir) {}|std_lib_dir(stdlibDir.empty() ? "${DATADIR}" : stdlibDir) {}|' ${WRKSRC}/lib/flattener.cpp
 
 .include <bsd.port.mk>
diff --git a/math/minizinc/distinfo b/math/minizinc/distinfo
index be0f358b8909..4c8d9c1d78f1 100644
--- a/math/minizinc/distinfo
+++ b/math/minizinc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602392297
-SHA256 (MiniZinc-libminizinc-2.5.0-01854690be366b964df9e25eaf5bd244759c4e76_GH0.tar.gz) = 7d7d7ebaef2dfb80aca467e6a5731d43b416921f40624137cbad37116a3a724e
-SIZE (MiniZinc-libminizinc-2.5.0-01854690be366b964df9e25eaf5bd244759c4e76_GH0.tar.gz) = 1547462
+TIMESTAMP = 1603648616
+SHA256 (MiniZinc-libminizinc-2.5.1_GH0.tar.gz) = 630d4c30100c3e765bca5272841dc9e8d31954e662b5bab181eac09cfaec410b
+SIZE (MiniZinc-libminizinc-2.5.1_GH0.tar.gz) = 1585207
diff --git a/math/minizinc/files/patch-lib_file__utils.cpp b/math/minizinc/files/patch-lib_file__utils.cpp
new file mode 100644
index 000000000000..f32d4a729fe2
--- /dev/null
+++ b/math/minizinc/files/patch-lib_file__utils.cpp
@@ -0,0 +1,20 @@
+--- lib/file_utils.cpp.orig	2020-10-25 18:29:35 UTC
++++ lib/file_utils.cpp
+@@ -310,6 +310,9 @@ std::string share_directory() {
+     return std::string(MZNSTDLIBDIR);
+   }
+ #endif
++#if defined(__FreeBSD__)
++  return FREEBSD_MZN_STDLIB_DIR;
++#else
+   std::string mypath = FileUtils::progpath();
+   int depth = 0;
+   for (char i : mypath) {
+@@ -324,6 +327,7 @@ std::string share_directory() {
+     mypath += "/..";
+   }
+   return "";
++#endif
+ }
+ 
+ std::string user_config_dir() {
diff --git a/math/minizinc/pkg-plist b/math/minizinc/pkg-plist
index 8082aa82bffa..8cd6978f0167 100644
--- a/math/minizinc/pkg-plist
+++ b/math/minizinc/pkg-plist
@@ -1,6 +1,11 @@
 bin/minizinc
 bin/mzn2doc
 include/minizinc/MIPdomains.hh
+include/minizinc/_thirdparty/b64/cdecode.h
+include/minizinc/_thirdparty/b64/cencode.h
+include/minizinc/_thirdparty/b64/decode.h
+include/minizinc/_thirdparty/b64/encode.h
+include/minizinc/_thirdparty/miniz.h
 include/minizinc/algorithms/min_cut.h
 include/minizinc/ast.hh
 include/minizinc/ast.hpp
@@ -30,6 +35,7 @@ include/minizinc/model.hh
 include/minizinc/optimize.hh
 include/minizinc/optimize_constraints.hh
 include/minizinc/output.hh
+include/minizinc/param_config.hh
 include/minizinc/parser.hh
 include/minizinc/parser.tab.hh
 include/minizinc/passes/compile_pass.hh
@@ -76,11 +82,6 @@ include/minizinc/solvers/nl/nl_solverinstance.hh
 include/minizinc/statistics.hh
 include/minizinc/support/regex.hh
 include/minizinc/support/regex_parser.tab.hh
-include/minizinc/thirdparty/b64/cdecode.h
-include/minizinc/thirdparty/b64/cencode.h
-include/minizinc/thirdparty/b64/decode.h
-include/minizinc/thirdparty/b64/encode.h
-include/minizinc/thirdparty/miniz.h
 include/minizinc/timer.hh
 include/minizinc/type.hh
 include/minizinc/typecheck.hh
@@ -219,6 +220,7 @@ lib/libmzn.so
 %%DATADIR%%/std/all_equal_int.mzn
 %%DATADIR%%/std/all_equal_set.mzn
 %%DATADIR%%/std/alldifferent.mzn
+%%DATADIR%%/std/alldifferent_except.mzn
 %%DATADIR%%/std/alldifferent_except_0.mzn
 %%DATADIR%%/std/alternative.mzn
 %%DATADIR%%/std/among.mzn
@@ -252,7 +254,6 @@ lib/libmzn.so
 %%DATADIR%%/std/bin_packing_load.mzn
 %%DATADIR%%/std/bin_packing_load_fn.mzn
 %%DATADIR%%/std/bounded_path.mzn
-%%DATADIR%%/std/builtins.mzn
 %%DATADIR%%/std/circuit.mzn
 %%DATADIR%%/std/comparison_rel_array.mzn
 %%DATADIR%%/std/connected.mzn
@@ -306,8 +307,10 @@ lib/libmzn.so
 %%DATADIR%%/std/fzn_all_equal_int_reif.mzn
 %%DATADIR%%/std/fzn_all_equal_set.mzn
 %%DATADIR%%/std/fzn_all_equal_set_reif.mzn
+%%DATADIR%%/std/fzn_alldifferent_except.mzn
 %%DATADIR%%/std/fzn_alldifferent_except_0.mzn
 %%DATADIR%%/std/fzn_alldifferent_except_0_reif.mzn
+%%DATADIR%%/std/fzn_alldifferent_except_reif.mzn
 %%DATADIR%%/std/fzn_alternative.mzn
 %%DATADIR%%/std/fzn_alternative_reif.mzn
 %%DATADIR%%/std/fzn_among.mzn
@@ -571,6 +574,7 @@ lib/libmzn.so
 %%DATADIR%%/std/fzn_strictly_increasing_bool.mzn
 %%DATADIR%%/std/fzn_strictly_increasing_bool_reif.mzn
 %%DATADIR%%/std/fzn_strictly_increasing_int.mzn
+%%DATADIR%%/std/fzn_strictly_increasing_int_opt.mzn
 %%DATADIR%%/std/fzn_strictly_increasing_int_reif.mzn
 %%DATADIR%%/std/fzn_subcircuit.mzn
 %%DATADIR%%/std/fzn_subcircuit_reif.mzn
@@ -587,6 +591,7 @@ lib/libmzn.so
 %%DATADIR%%/std/fzn_table_bool.mzn
 %%DATADIR%%/std/fzn_table_bool_reif.mzn
 %%DATADIR%%/std/fzn_table_int.mzn
+%%DATADIR%%/std/fzn_table_int_opt.mzn
 %%DATADIR%%/std/fzn_table_int_reif.mzn
 %%DATADIR%%/std/fzn_transitive_closure.mzn
 %%DATADIR%%/std/fzn_tree_enum.mzn
@@ -598,6 +603,7 @@ lib/libmzn.so
 %%DATADIR%%/std/fzn_value_precede_chain_set.mzn
 %%DATADIR%%/std/fzn_value_precede_chain_set_reif.mzn
 %%DATADIR%%/std/fzn_value_precede_int.mzn
+%%DATADIR%%/std/fzn_value_precede_int_opt.mzn
 %%DATADIR%%/std/fzn_value_precede_int_reif.mzn
 %%DATADIR%%/std/fzn_value_precede_set.mzn
 %%DATADIR%%/std/fzn_value_precede_set_reif.mzn
@@ -678,10 +684,28 @@ lib/libmzn.so
 %%DATADIR%%/std/seq_precede_chain.mzn
 %%DATADIR%%/std/set_member.mzn
 %%DATADIR%%/std/sliding_sum.mzn
+%%DATADIR%%/std/solver_redefinitions.mzn
 %%DATADIR%%/std/sort.mzn
 %%DATADIR%%/std/sort_fn.mzn
 %%DATADIR%%/std/span.mzn
 %%DATADIR%%/std/stdlib.mzn
+%%DATADIR%%/std/stdlib/stdlib_ann.mzn
+%%DATADIR%%/std/stdlib/stdlib_array.mzn
+%%DATADIR%%/std/stdlib/stdlib_coercion.mzn
+%%DATADIR%%/std/stdlib/stdlib_compare.mzn
+%%DATADIR%%/std/stdlib/stdlib_debug.mzn
+%%DATADIR%%/std/stdlib/stdlib_enum.mzn
+%%DATADIR%%/std/stdlib/stdlib_internal.mzn
+%%DATADIR%%/std/stdlib/stdlib_ite.mzn
+%%DATADIR%%/std/stdlib/stdlib_language.mzn
+%%DATADIR%%/std/stdlib/stdlib_logic.mzn
+%%DATADIR%%/std/stdlib/stdlib_math.mzn
+%%DATADIR%%/std/stdlib/stdlib_opt.mzn
+%%DATADIR%%/std/stdlib/stdlib_random.mzn
+%%DATADIR%%/std/stdlib/stdlib_reflect.mzn
+%%DATADIR%%/std/stdlib/stdlib_set.mzn
+%%DATADIR%%/std/stdlib/stdlib_sort.mzn
+%%DATADIR%%/std/stdlib/stdlib_string.mzn
 %%DATADIR%%/std/steiner.mzn
 %%DATADIR%%/std/strict_lex2.mzn
 %%DATADIR%%/std/strictly_decreasing.mzn