From 2b5ddd66e9d0a3b8c9f4555c0fb352702020d992 Mon Sep 17 00:00:00 2001
From: yuri <yuri@FreeBSD.org>
Date: Mon, 12 Feb 2018 09:33:14 +0000
Subject: math/SoPlex: Update to 3.1.1

Changelog:
http://soplex.zib.de/doc-3.1.1/html/CHANGELOG.php

Reported by:	portscout
Approved by:	tcberner (mentor, implicit)
---
 math/SoPlex/Makefile                   |  2 +-
 math/SoPlex/distinfo                   |  6 ++--
 math/SoPlex/files/patch-CMakeLists.txt | 62 +---------------------------------
 3 files changed, 5 insertions(+), 65 deletions(-)

(limited to 'math')

diff --git a/math/SoPlex/Makefile b/math/SoPlex/Makefile
index 8d20810972d5..b392b963c09c 100644
--- a/math/SoPlex/Makefile
+++ b/math/SoPlex/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	SoPlex
-DISTVERSION=	3.0.1
+DISTVERSION=	3.1.1
 CATEGORIES=	math science
 MASTER_SITES=	http://soplex.zib.de/download/release/
 DISTNAME=	${PORTNAME:tl}-${DISTVERSION}
diff --git a/math/SoPlex/distinfo b/math/SoPlex/distinfo
index 844766abc25f..05c4f3b6f308 100644
--- a/math/SoPlex/distinfo
+++ b/math/SoPlex/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514183609
-SHA256 (soplex-3.0.1.tgz) = f97a6be9f890f723c046ac21b80d8781ee6155e49e0e6ae90d151d44a23b8676
-SIZE (soplex-3.0.1.tgz) = 1343714
+TIMESTAMP = 1518427232
+SHA256 (soplex-3.1.1.tgz) = 138d8af2aa8570ba6a755c24aa1c047682433a740fb5d8729b90b61eeb812c66
+SIZE (soplex-3.1.1.tgz) = 963447
diff --git a/math/SoPlex/files/patch-CMakeLists.txt b/math/SoPlex/files/patch-CMakeLists.txt
index 714e36e77d23..1d739c91b584 100644
--- a/math/SoPlex/files/patch-CMakeLists.txt
+++ b/math/SoPlex/files/patch-CMakeLists.txt
@@ -1,65 +1,5 @@
---- CMakeLists.txt.orig	2017-09-04 15:12:27 UTC
+--- CMakeLists.txt.orig	2017-12-26 18:14:03 UTC
 +++ CMakeLists.txt
-@@ -45,33 +45,33 @@ set(CMAKE_MACOSX_RPATH ON)
- set(CMAKE_CXX_STANDARD 11)
- 
- # create target to update the githash
--file(WRITE ${CMAKE_BINARY_DIR}/soplex_update_githash.cmake "
--find_program(GIT git)
--if(GIT)
--   execute_process(
--      COMMAND \${GIT} describe --always --dirty
--      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
--      OUTPUT_VARIABLE GITHASH OUTPUT_STRIP_TRAILING_WHITESPACE)
--   if(GITHASH STREQUAL \"\")
--      set(GITHASH \"------\")
--   endif()
--   string(REGEX REPLACE \"^.*-g\" \"\" GITHASH \${GITHASH})
--else()
--   set(GITHASH \"------\")
--endif()
--if(GITHASH STREQUAL \"------\")
--   # read stored hash from file
--   file(STRINGS \${DST} GITHASH)
--   string(REGEX REPLACE \"#define SPX_GITHASH \" \"\" GITHASH \${GITHASH})
--else()
--   file(WRITE \${DST} \"#define SPX_GITHASH \\\"\${GITHASH}\\\"\")
--endif()
--message(STATUS \"Git hash: \" \${GITHASH})
--")
-+#file(WRITE ${CMAKE_BINARY_DIR}/soplex_update_githash.cmake "
-+#find_program(GIT git)
-+#if(GIT)
-+#   execute_process(
-+#      COMMAND \${GIT} describe --always --dirty
-+#      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+#      OUTPUT_VARIABLE GITHASH OUTPUT_STRIP_TRAILING_WHITESPACE)
-+#   if(GITHASH STREQUAL \"\")
-+#      set(GITHASH \"------\")
-+#   endif()
-+#   string(REGEX REPLACE \"^.*-g\" \"\" GITHASH \${GITHASH})
-+#else()
-+#   set(GITHASH \"------\")
-+#endif()
-+#if(GITHASH STREQUAL \"------\")
-+#   # read stored hash from file
-+#   file(STRINGS \${DST} GITHASH)
-+#   string(REGEX REPLACE \"#define SPX_GITHASH \" \"\" GITHASH \${GITHASH})
-+#else()
-+#   file(WRITE \${DST} \"#define SPX_GITHASH \\\"\${GITHASH}\\\"\")
-+#endif()
-+#message(STATUS \"Git hash: \" \${GITHASH})
-+#")
- # encode the current git hash into the binary
--add_custom_target(soplex_update_githash
--                  COMMAND ${CMAKE_COMMAND} -DDST=${PROJECT_SOURCE_DIR}/src/git_hash.cpp
--                                           -P ${CMAKE_BINARY_DIR}/soplex_update_githash.cmake)
-+#add_custom_target(soplex_update_githash
-+#                  COMMAND ${CMAKE_COMMAND} -DDST=${PROJECT_SOURCE_DIR}/src/git_hash.cpp
-+#                                           -P ${CMAKE_BINARY_DIR}/soplex_update_githash.cmake)
- 
- option(LEGACY "Build SoPlex in legacy mode" OFF)
- if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 @@ -85,7 +85,7 @@ if(LEGACY)
      add_definitions(-DTHREADLOCAL=)
  endif()
-- 
cgit