git: f9908f55f8c6 - main - math/or-tools: Add FLATZINC option; Add dependencies

[Yuri Victorovich]

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f9908f55f8c6310a0fc99c861042d87feaf06e21

commit f9908f55f8c6310a0fc99c861042d87feaf06e21
Author:     Yuri Victorovich <yuri at FreeBSD.org>
AuthorDate: 2021-05-04 00:31:08 +0000
Commit:     Yuri Victorovich <yuri at FreeBSD.org>
CommitDate: 2021-05-04 00:39:48 +0000

    math/or-tools: Add FLATZINC option; Add dependencies
---
 math/or-tools/Makefile  | 13 +++++++++++--
 math/or-tools/pkg-plist | 38 +++++++++++++++++++-------------------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile
index 7a5104c01b7d..33fbaf08d887 100644
--- a/math/or-tools/Makefile
+++ b/math/or-tools/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	or-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.2
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri at FreeBSD.org
@@ -12,6 +13,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE-2.0.txt
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
+		libcoinasl.so:math/asl \
+		libcoinmetis.so:math/ipopt \
+		libCoinUtils.so:math/coinutils \
+		libopenblas.so:math/openblas \
 		libOsiClp.so:math/clp \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
@@ -26,8 +31,12 @@ CMAKE_OFF=	BUILD_PYTHON BUILD_DEPS INSTALL_BUILD_DEPS BUILD_EXAMPLES BUILD_SAMPL
 CMAKE_ON=	BUILD_CXX
 CONFIGURE_ENV=	UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE}
 
-OPTIONS_DEFINE=		SCIP
-#OPTIONS_DEFAULT=	SCIP
+OPTIONS_DEFINE=		FLATZINC SCIP
+OPTIONS_DEFAULT=	FLATZINC #SCIP
+OPTIONS_SUB=		yes
+
+FLATZINC_DESC=		Build FlatZinc - MiniZinc interface
+FLATZINC_CMAKE_BOOL=	BUILD_FLATZINC
 
 SCIP_DESC=		Use the SCIP solver # SCIP package isn't built because of licensing restrictions
 SCIP_CMAKE_BOOL=	USE_SCIP
diff --git a/math/or-tools/pkg-plist b/math/or-tools/pkg-plist
index b4c4806dee67..523900ae8ffb 100644
--- a/math/or-tools/pkg-plist
+++ b/math/or-tools/pkg-plist
@@ -1,4 +1,4 @@
-bin/fz
+%%FLATZINC%%bin/fz
 include/ortools/algorithms/dense_doubly_linked_list.h
 include/ortools/algorithms/dynamic_partition.h
 include/ortools/algorithms/dynamic_permutation.h
@@ -286,24 +286,24 @@ lib/cmake/ortools/ortoolsConfig.cmake
 lib/cmake/ortools/ortoolsConfigVersion.cmake
 lib/cmake/ortools/ortoolsTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/ortools/ortoolsTargets.cmake
-lib/libflatzinc.so
-lib/libflatzinc.so.8
-lib/libflatzinc.so.8.2.9999
+%%FLATZINC%%lib/libflatzinc.so
+%%FLATZINC%%lib/libflatzinc.so.8
+%%FLATZINC%%lib/libflatzinc.so.8.2.9999
 lib/libortools.so
 lib/libortools.so.8
 lib/libortools.so.8.2.9999
-share/minizinc/ortools/fzn_all_different_int.mzn
-share/minizinc/ortools/fzn_circuit.mzn
-share/minizinc/ortools/fzn_cumulative.mzn
-share/minizinc/ortools/fzn_diffn.mzn
-share/minizinc/ortools/fzn_diffn_nonstrict.mzn
-share/minizinc/ortools/fzn_inverse.mzn
-share/minizinc/ortools/fzn_network_flow.mzn
-share/minizinc/ortools/fzn_network_flow_cost.mzn
-share/minizinc/ortools/fzn_regular.mzn
-share/minizinc/ortools/fzn_subcircuit.mzn
-share/minizinc/ortools/fzn_table_bool.mzn
-share/minizinc/ortools/fzn_table_int.mzn
-share/minizinc/ortools/nostrings.mzn
-share/minizinc/ortools/redefinitions-2.0.mzn
-share/minizinc/solvers/ortools.msc
+%%FLATZINC%%share/minizinc/ortools/fzn_all_different_int.mzn
+%%FLATZINC%%share/minizinc/ortools/fzn_circuit.mzn
+%%FLATZINC%%share/minizinc/ortools/fzn_cumulative.mzn
+%%FLATZINC%%share/minizinc/ortools/fzn_diffn.mzn
+%%FLATZINC%%share/minizinc/ortools/fzn_diffn_nonstrict.mzn
+%%FLATZINC%%share/minizinc/ortools/fzn_inverse.mzn
+%%FLATZINC%%share/minizinc/ortools/fzn_network_flow.mzn
+%%FLATZINC%%share/minizinc/ortools/fzn_network_flow_cost.mzn
+%%FLATZINC%%share/minizinc/ortools/fzn_regular.mzn
+%%FLATZINC%%share/minizinc/ortools/fzn_subcircuit.mzn
+%%FLATZINC%%share/minizinc/ortools/fzn_table_bool.mzn
+%%FLATZINC%%share/minizinc/ortools/fzn_table_int.mzn
+%%FLATZINC%%share/minizinc/ortools/nostrings.mzn
+%%FLATZINC%%share/minizinc/ortools/redefinitions-2.0.mzn
+%%FLATZINC%%share/minizinc/solvers/ortools.msc