Index: head/math/SoPlex/Makefile =================================================================== --- head/math/SoPlex/Makefile (revision 461567) +++ head/math/SoPlex/Makefile (revision 461568) @@ -1,31 +1,31 @@ # Created by: Yuri Victorovich # $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} MAINTAINER= yuri@FreeBSD.org COMMENT= Optimization package for solving linear programming problems (LPs) LICENSE= ZIB LICENSE_NAME= ZIB ACADEMIC LICENSE LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror pkg-mirror auto-accept LIB_DEPENDS= libgmp.so:math/gmp USES= cmake:outsource,noninja tar:tgz USE_LDCONFIG= yes PLIST_SUB= SHL4=${DISTVERSION}.0 SHL2=${DISTVERSION:R} .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 CMAKE_ARGS= -DFREEBSD_NO_CXX_THREAD_LOCAL_BUG224581:BOOL=ON # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224581 # This also necessitates noninja above for some reason .endif .include Index: head/math/SoPlex/distinfo =================================================================== --- head/math/SoPlex/distinfo (revision 461567) +++ head/math/SoPlex/distinfo (revision 461568) @@ -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 Index: head/math/SoPlex/files/patch-CMakeLists.txt =================================================================== --- head/math/SoPlex/files/patch-CMakeLists.txt (revision 461567) +++ head/math/SoPlex/files/patch-CMakeLists.txt (revision 461568) @@ -1,71 +1,11 @@ ---- 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() -if(NOT "${CMAKE_CXX_COMPILE_FEATURES}" MATCHES "cxx_thread_local") +if(NOT "${CMAKE_CXX_COMPILE_FEATURES}" MATCHES "cxx_thread_local" OR FREEBSD_NO_CXX_THREAD_LOCAL_BUG224581) add_definitions(-DTHREADLOCAL=) endif()