Index: head/math/SCIP/Makefile =================================================================== --- head/math/SCIP/Makefile (revision 544585) +++ head/math/SCIP/Makefile (revision 544586) @@ -1,32 +1,30 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= SCIP -DISTVERSION= 6.0.1 -PORTREVISION= 2 +DISTVERSION= 7.0.1 CATEGORIES= math science MASTER_SITES= http://scip.zib.de/download/release/ DISTNAME= ${PORTNAME:tl}-${DISTVERSION} MAINTAINER= yuri@FreeBSD.org COMMENT= Solver for mixed integer, mixed integer nonlinear programming LICENSE= ZIB LICENSE_NAME= ZIB ACADEMIC LICENSE LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror pkg-mirror auto-accept EXTRACT_DEPENDS= gtar:archivers/gtar LIB_DEPENDS= libgmp.so:math/gmp \ libsoplex.so:math/SoPlex -CONFLICTS_BUILD= Ipopt - USES= compiler:c11 cmake readline tar:tgz EXTRACT_CMD= gtar USE_LDCONFIG= yes -PLIST_SUB= SHL4=${DISTVERSION}.0 SHL2=${DISTVERSION:R} CXXFLAGS+= -I${LOCALBASE}/include/soplex + +CONFLICTS_BUILD= Ipopt .include Index: head/math/SCIP/distinfo =================================================================== --- head/math/SCIP/distinfo (revision 544585) +++ head/math/SCIP/distinfo (revision 544586) @@ -1,3 +1,3 @@ -TIMESTAMP = 1548093622 -SHA256 (scip-6.0.1.tgz) = 06895fc829e12d6a3fbfeacc443c0754076057386d0b9ebf16152fdf65569845 -SIZE (scip-6.0.1.tgz) = 9359020 +TIMESTAMP = 1597035597 +SHA256 (scip-7.0.1.tgz) = 033bf240298d3a1c92e8ddb7b452190e0af15df2dad7d24d0572f10ae8eec5aa +SIZE (scip-7.0.1.tgz) = 10256085 Index: head/math/SCIP/pkg-plist =================================================================== --- head/math/SCIP/pkg-plist (revision 544585) +++ head/math/SCIP/pkg-plist (revision 544586) @@ -1,505 +1,522 @@ bin/scip include/blockmemshell/memory.h include/dijkstra/dijkstra.h include/lpi/lpi.h include/lpi/type_lpi.h include/nlpi/exprinterpret.h include/nlpi/intervalarithext.h include/nlpi/nlpi.h include/nlpi/nlpi_all.h include/nlpi/nlpi_filtersqp.h include/nlpi/nlpi_ipopt.h include/nlpi/nlpi_worhp.h include/nlpi/nlpioracle.h include/nlpi/pub_expr.h include/nlpi/struct_expr.h 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 include/objscip/objdialog.h include/objscip/objdisp.h include/objscip/objeventhdlr.h include/objscip/objheur.h include/objscip/objmessagehdlr.h include/objscip/objnodesel.h include/objscip/objpresol.h include/objscip/objpricer.h include/objscip/objprobcloneable.h include/objscip/objprobdata.h include/objscip/objprop.h include/objscip/objreader.h include/objscip/objrelax.h include/objscip/objscip.h include/objscip/objscipdefplugins.h include/objscip/objsepa.h include/objscip/objtable.h include/objscip/objvardata.h include/objscip/type_objcloneable.h include/objscip/type_objprobcloneable.h 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_feasalt.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 include/scip/branch_allfullstrong.h include/scip/branch_cloud.h 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 include/scip/branch_pscost.h include/scip/branch_random.h include/scip/branch_relpscost.h +include/scip/branch_vanillafullstrong.h include/scip/clock.h include/scip/compr.h include/scip/compr_largestrepr.h include/scip/compr_weakcompr.h include/scip/concsolver.h include/scip/concsolver_scip.h include/scip/concurrent.h include/scip/config.h include/scip/conflict.h 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 include/scip/cons_components.h include/scip/cons_conjunction.h include/scip/cons_countsols.h include/scip/cons_cumulative.h include/scip/cons_disjunction.h include/scip/cons_indicator.h include/scip/cons_integral.h include/scip/cons_knapsack.h include/scip/cons_linear.h include/scip/cons_linking.h include/scip/cons_logicor.h include/scip/cons_nonlinear.h include/scip/cons_or.h include/scip/cons_orbisack.h include/scip/cons_orbitope.h include/scip/cons_pseudoboolean.h include/scip/cons_quadratic.h include/scip/cons_setppc.h include/scip/cons_soc.h include/scip/cons_sos1.h include/scip/cons_sos2.h include/scip/cons_superindicator.h include/scip/cons_symresack.h include/scip/cons_varbound.h include/scip/cons_xor.h include/scip/cutpool.h include/scip/cuts.h include/scip/dbldblarith.h +include/scip/dcmp.h include/scip/debug.h include/scip/def.h include/scip/dialog.h include/scip/dialog_default.h include/scip/disp.h include/scip/disp_default.h include/scip/event.h +include/scip/event_estim.h include/scip/event_globalbnd.h include/scip/event_softtimelimit.h include/scip/event_solvingphase.h include/scip/heur.h include/scip/heur_actconsdiving.h +include/scip/heur_adaptivediving.h include/scip/heur_alns.h 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 include/scip/heur_gins.h include/scip/heur_guideddiving.h include/scip/heur_indicator.h include/scip/heur_intdiving.h include/scip/heur_intshifting.h include/scip/heur_linesearchdiving.h include/scip/heur_localbranching.h include/scip/heur_locks.h include/scip/heur_lpface.h include/scip/heur_mpec.h include/scip/heur_multistart.h include/scip/heur_mutation.h include/scip/heur_nlpdiving.h include/scip/heur_objpscostdiving.h include/scip/heur_octane.h include/scip/heur_ofins.h include/scip/heur_oneopt.h +include/scip/heur_padm.h include/scip/heur_proximity.h include/scip/heur_pscostdiving.h include/scip/heur_randrounding.h include/scip/heur_rens.h include/scip/heur_reoptsols.h include/scip/heur_repair.h include/scip/heur_rins.h include/scip/heur_rootsoldiving.h include/scip/heur_rounding.h include/scip/heur_shiftandpropagate.h include/scip/heur_shifting.h include/scip/heur_simplerounding.h include/scip/heur_subnlp.h include/scip/heur_sync.h include/scip/heur_trivial.h include/scip/heur_trivialnegation.h +include/scip/heur_trustregion.h include/scip/heur_trysol.h include/scip/heur_twoopt.h include/scip/heur_undercover.h include/scip/heur_vbounds.h include/scip/heur_veclendiving.h include/scip/heur_zeroobj.h include/scip/heur_zirounding.h include/scip/heuristics.h include/scip/history.h include/scip/implics.h include/scip/interrupt.h include/scip/intervalarith.h include/scip/lp.h include/scip/mem.h include/scip/message.h include/scip/message_default.h include/scip/misc.h include/scip/nlp.h include/scip/nodesel.h include/scip/nodesel_bfs.h include/scip/nodesel_breadthfirst.h include/scip/nodesel_dfs.h include/scip/nodesel_estimate.h include/scip/nodesel_hybridestim.h include/scip/nodesel_restartdfs.h include/scip/nodesel_uct.h include/scip/paramset.h include/scip/presol.h include/scip/presol_boundshift.h include/scip/presol_convertinttobin.h include/scip/presol_domcol.h include/scip/presol_dualagg.h include/scip/presol_dualcomp.h include/scip/presol_dualinfer.h +include/scip/presol_dualsparsify.h include/scip/presol_gateextraction.h include/scip/presol_implics.h include/scip/presol_inttobinary.h +include/scip/presol_milp.h include/scip/presol_qpkktref.h include/scip/presol_redvub.h include/scip/presol_sparsify.h include/scip/presol_stuffing.h -include/scip/presol_symbreak.h -include/scip/presol_symmetry.h include/scip/presol_trivial.h include/scip/presol_tworowbnd.h include/scip/presolve.h include/scip/pricer.h include/scip/pricestore.h include/scip/primal.h include/scip/prob.h include/scip/prop.h include/scip/prop_dualfix.h include/scip/prop_genvbounds.h include/scip/prop_nlobbt.h include/scip/prop_obbt.h -include/scip/prop_orbitalfixing.h include/scip/prop_probing.h include/scip/prop_pseudoobj.h include/scip/prop_redcost.h include/scip/prop_rootredcost.h +include/scip/prop_symmetry.h include/scip/prop_sync.h include/scip/prop_vbounds.h 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 include/scip/pub_cons.h include/scip/pub_cutpool.h +include/scip/pub_dcmp.h include/scip/pub_dialog.h include/scip/pub_disp.h include/scip/pub_event.h include/scip/pub_fileio.h include/scip/pub_heur.h include/scip/pub_history.h include/scip/pub_implics.h 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_nonlinear.h include/scip/pub_misc_select.h include/scip/pub_misc_sort.h include/scip/pub_nlp.h include/scip/pub_nodesel.h include/scip/pub_paramset.h include/scip/pub_presol.h include/scip/pub_pricer.h include/scip/pub_prop.h include/scip/pub_reader.h include/scip/pub_relax.h include/scip/pub_reopt.h include/scip/pub_sepa.h include/scip/pub_sol.h include/scip/pub_table.h include/scip/pub_tree.h include/scip/pub_var.h include/scip/rbtree.h include/scip/reader.h 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_dec.h include/scip/reader_diff.h include/scip/reader_fix.h include/scip/reader_fzn.h include/scip/reader_gms.h include/scip/reader_lp.h include/scip/reader_mps.h include/scip/reader_mst.h include/scip/reader_opb.h include/scip/reader_osil.h 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_dcmp.h include/scip/scip_debug.h include/scip/scip_dialog.h include/scip/scip_disp.h include/scip/scip_event.h +include/scip/scip_export.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 include/scip/scipgithash.h include/scip/scipshell.h include/scip/sepa.h include/scip/sepa_aggregation.h include/scip/sepa_cgmip.h include/scip/sepa_clique.h include/scip/sepa_closecuts.h include/scip/sepa_convexproj.h include/scip/sepa_disjunctive.h include/scip/sepa_eccuts.h include/scip/sepa_gauge.h include/scip/sepa_gomory.h include/scip/sepa_impliedbounds.h include/scip/sepa_intobj.h include/scip/sepa_mcf.h include/scip/sepa_oddcycle.h include/scip/sepa_rapidlearning.h include/scip/sepa_strongcg.h include/scip/sepa_zerohalf.h include/scip/sepastore.h include/scip/set.h 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 include/scip/struct_concsolver.h include/scip/struct_concurrent.h include/scip/struct_conflict.h include/scip/struct_conflictstore.h include/scip/struct_cons.h include/scip/struct_cutpool.h include/scip/struct_cuts.h +include/scip/struct_dcmp.h include/scip/struct_dialog.h include/scip/struct_disp.h include/scip/struct_event.h include/scip/struct_heur.h include/scip/struct_history.h include/scip/struct_implics.h include/scip/struct_lp.h include/scip/struct_matrix.h include/scip/struct_mem.h include/scip/struct_message.h include/scip/struct_misc.h include/scip/struct_nlp.h include/scip/struct_nodesel.h include/scip/struct_paramset.h include/scip/struct_presol.h include/scip/struct_pricer.h include/scip/struct_pricestore.h include/scip/struct_primal.h include/scip/struct_prob.h include/scip/struct_prop.h include/scip/struct_reader.h include/scip/struct_relax.h include/scip/struct_reopt.h include/scip/struct_scip.h include/scip/struct_sepa.h include/scip/struct_sepastore.h include/scip/struct_set.h include/scip/struct_sol.h include/scip/struct_stat.h include/scip/struct_syncstore.h include/scip/struct_table.h include/scip/struct_tree.h include/scip/struct_var.h include/scip/struct_visual.h +include/scip/symmetry.h include/scip/syncstore.h include/scip/table.h include/scip/table_default.h include/scip/tree.h +include/scip/treemodel.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 include/scip/type_concsolver.h include/scip/type_concurrent.h include/scip/type_conflict.h include/scip/type_conflictstore.h include/scip/type_cons.h include/scip/type_cutpool.h include/scip/type_cuts.h +include/scip/type_dcmp.h include/scip/type_dialog.h include/scip/type_disp.h include/scip/type_event.h include/scip/type_heur.h include/scip/type_history.h include/scip/type_implics.h include/scip/type_interrupt.h include/scip/type_lp.h include/scip/type_matrix.h include/scip/type_mem.h include/scip/type_message.h include/scip/type_misc.h include/scip/type_nlp.h include/scip/type_nodesel.h include/scip/type_paramset.h include/scip/type_presol.h include/scip/type_pricer.h include/scip/type_pricestore.h include/scip/type_primal.h include/scip/type_prob.h include/scip/type_prop.h include/scip/type_reader.h include/scip/type_relax.h include/scip/type_reopt.h include/scip/type_result.h include/scip/type_retcode.h include/scip/type_scip.h include/scip/type_sepa.h include/scip/type_sepastore.h include/scip/type_set.h include/scip/type_sol.h include/scip/type_stat.h include/scip/type_syncstore.h include/scip/type_table.h include/scip/type_timing.h include/scip/type_tree.h include/scip/type_var.h include/scip/type_visual.h include/scip/var.h include/scip/visual.h include/symmetry/compute_symmetry.h include/symmetry/type_symmetry.h include/tclique/tclique.h include/tclique/tclique_coloring.h include/tclique/tclique_def.h include/tinycthread/tinycthread.h include/tpi/def_openmp.h include/tpi/tpi.h include/tpi/tpi_none.h include/tpi/tpi_openmp.h include/tpi/tpi_tnycthrd.h include/tpi/type_tpi.h include/tpi/type_tpi_none.h include/tpi/type_tpi_openmp.h include/tpi/type_tpi_tnycthrd.h include/xml/xml.h include/xml/xmldef.h +lib/cmake/scip/scip-config-version.cmake lib/cmake/scip/scip-config.cmake lib/cmake/scip/scip-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/scip/scip-targets.cmake lib/libscip.so -lib/libscip.so.%%SHL2%% -lib/libscip.so.%%SHL4%% +lib/libscip.so.7.0 +lib/libscip.so.7.0.1.0