math/SCIP: Update 5.0.1 -> 6.0.0; math/py-PySCIPOpt: Update 1.4.9 -> 2.0.0

SCIP and its python binding.

Reported by:	portscout

3 files changed, 73 insertions, 6 deletions

diff --git a/math/SCIP/Makefile b/math/SCIP/Makefile
index 98e708bbbc5f..a7a24bbb40c0 100644
--- a/math/SCIP/Makefile
+++ b/math/SCIP/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	SCIP
-DISTVERSION=	5.0.1
-PORTREVISION=	1
+DISTVERSION=	6.0.0
 CATEGORIES=	math science
 MASTER_SITES=	http://scip.zib.de/download/release/
 DISTNAME=	${PORTNAME:tl}-${DISTVERSION}
diff --git a/math/SCIP/distinfo b/math/SCIP/distinfo
index cb6a00f78dca..e81556d1b0c6 100644
--- a/math/SCIP/distinfo
+++ b/math/SCIP/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523777686
-SHA256 (scip-5.0.1.tgz) = cfdcbd8bef454e8813550992255746e657f708a6789d129a5000ef8e3815edf4
-SIZE (scip-5.0.1.tgz) = 7996808
+TIMESTAMP = 1530731440
+SHA256 (scip-6.0.0.tgz) = a668a787d72cafa6b46064f8ccdf4c5a8b29f7dab5e903719e4de3bfa6843ed9
+SIZE (scip-6.0.0.tgz) = 9353601
diff --git a/math/SCIP/pkg-plist b/math/SCIP/pkg-plist
index 77d0c9606247..ea16715f702f 100644
--- a/math/SCIP/pkg-plist
+++ b/math/SCIP/pkg-plist
@@ -17,6 +17,8 @@ include/nlpi/struct_nlpi.h
 include/nlpi/type_expr.h
 include/nlpi/type_exprinterpret.h
 include/nlpi/type_nlpi.h
+include/objscip/objbenders.h
+include/objscip/objbenderscut.h
 include/objscip/objbranchrule.h
 include/objscip/objcloneable.h
 include/objscip/objconshdlr.h
@@ -44,6 +46,14 @@ include/scip/bandit.h
 include/scip/bandit_epsgreedy.h
 include/scip/bandit_exp3.h
 include/scip/bandit_ucb.h
+include/scip/benders.h
+include/scip/benders_default.h
+include/scip/benderscut.h
+include/scip/benderscut_feas.h
+include/scip/benderscut_int.h
+include/scip/benderscut_nogood.h
+include/scip/benderscut_opt.h
+include/scip/bendersdefcuts.h
 include/scip/bitencode.h
 include/scip/boundstore.h
 include/scip/branch.h
@@ -53,6 +63,7 @@ include/scip/branch_distribution.h
 include/scip/branch_fullstrong.h
 include/scip/branch_inference.h
 include/scip/branch_leastinf.h
+include/scip/branch_lookahead.h
 include/scip/branch_mostinf.h
 include/scip/branch_multaggr.h
 include/scip/branch_nodereopt.h
@@ -71,6 +82,8 @@ include/scip/conflictstore.h
 include/scip/cons.h
 include/scip/cons_abspower.h
 include/scip/cons_and.h
+include/scip/cons_benders.h
+include/scip/cons_benderslp.h
 include/scip/cons_bivariate.h
 include/scip/cons_bounddisjunction.h
 include/scip/cons_cardinality.h
@@ -119,10 +132,12 @@ include/scip/heur_bound.h
 include/scip/heur_clique.h
 include/scip/heur_coefdiving.h
 include/scip/heur_completesol.h
+include/scip/heur_conflictdiving.h
 include/scip/heur_crossover.h
 include/scip/heur_dins.h
 include/scip/heur_distributiondiving.h
 include/scip/heur_dualval.h
+include/scip/heur_farkasdiving.h
 include/scip/heur_feaspump.h
 include/scip/heur_fixandinfer.h
 include/scip/heur_fracdiving.h
@@ -194,7 +209,6 @@ include/scip/presol_dualagg.h
 include/scip/presol_dualcomp.h
 include/scip/presol_dualinfer.h
 include/scip/presol_gateextraction.h
-include/scip/presol_implfree.h
 include/scip/presol_implics.h
 include/scip/presol_inttobinary.h
 include/scip/presol_qpkktref.h
@@ -226,6 +240,8 @@ include/scip/pub_bandit.h
 include/scip/pub_bandit_epsgreedy.h
 include/scip/pub_bandit_exp3.h
 include/scip/pub_bandit_ucb.h
+include/scip/pub_benders.h
+include/scip/pub_benderscut.h
 include/scip/pub_branch.h
 include/scip/pub_compr.h
 include/scip/pub_conflict.h
@@ -242,6 +258,7 @@ include/scip/pub_lp.h
 include/scip/pub_matrix.h
 include/scip/pub_message.h
 include/scip/pub_misc.h
+include/scip/pub_misc_linear.h
 include/scip/pub_misc_select.h
 include/scip/pub_misc_sort.h
 include/scip/pub_nlp.h
@@ -264,6 +281,7 @@ include/scip/reader_bnd.h
 include/scip/reader_ccg.h
 include/scip/reader_cip.h
 include/scip/reader_cnf.h
+include/scip/reader_cor.h
 include/scip/reader_diff.h
 include/scip/reader_fix.h
 include/scip/reader_fzn.h
@@ -277,13 +295,59 @@ include/scip/reader_pbm.h
 include/scip/reader_pip.h
 include/scip/reader_ppm.h
 include/scip/reader_rlp.h
+include/scip/reader_smps.h
 include/scip/reader_sol.h
+include/scip/reader_sto.h
+include/scip/reader_tim.h
 include/scip/reader_wbo.h
 include/scip/reader_zpl.h
 include/scip/relax.h
 include/scip/reopt.h
 include/scip/retcode.h
 include/scip/scip.h
+include/scip/scip_bandit.h
+include/scip/scip_benders.h
+include/scip/scip_branch.h
+include/scip/scip_compr.h
+include/scip/scip_concurrent.h
+include/scip/scip_conflict.h
+include/scip/scip_cons.h
+include/scip/scip_copy.h
+include/scip/scip_cut.h
+include/scip/scip_datastructures.h
+include/scip/scip_debug.h
+include/scip/scip_dialog.h
+include/scip/scip_disp.h
+include/scip/scip_event.h
+include/scip/scip_expr.h
+include/scip/scip_general.h
+include/scip/scip_heur.h
+include/scip/scip_lp.h
+include/scip/scip_mem.h
+include/scip/scip_message.h
+include/scip/scip_nlp.h
+include/scip/scip_nodesel.h
+include/scip/scip_nonlinear.h
+include/scip/scip_numerics.h
+include/scip/scip_param.h
+include/scip/scip_presol.h
+include/scip/scip_pricer.h
+include/scip/scip_prob.h
+include/scip/scip_probing.h
+include/scip/scip_prop.h
+include/scip/scip_randnumgen.h
+include/scip/scip_reader.h
+include/scip/scip_relax.h
+include/scip/scip_reopt.h
+include/scip/scip_sepa.h
+include/scip/scip_sol.h
+include/scip/scip_solve.h
+include/scip/scip_solvingstats.h
+include/scip/scip_table.h
+include/scip/scip_timing.h
+include/scip/scip_tree.h
+include/scip/scip_validation.h
+include/scip/scip_var.h
 include/scip/scipbuildflags.h
 include/scip/scipcoreplugins.h
 include/scip/scipdefplugins.h
@@ -312,6 +376,8 @@ include/scip/sol.h
 include/scip/solve.h
 include/scip/stat.h
 include/scip/struct_bandit.h
+include/scip/struct_benders.h
+include/scip/struct_benderscut.h
 include/scip/struct_branch.h
 include/scip/struct_clock.h
 include/scip/struct_compr.h
@@ -361,6 +427,8 @@ include/scip/table.h
 include/scip/table_default.h
 include/scip/tree.h
 include/scip/type_bandit.h
+include/scip/type_benders.h
+include/scip/type_benderscut.h
 include/scip/type_branch.h
 include/scip/type_clock.h
 include/scip/type_compr.h