Date: Sat, 5 Jun 2021 23:06:37 GMT From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c33cf04fe575 - main - biology/hyphy: Update to 2.5.31 Message-ID: <202106052306.155N6bdk027400@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=c33cf04fe57592ec5c03074f022d3bfa917fd2c7 commit c33cf04fe57592ec5c03074f022d3bfa917fd2c7 Author: Joseph Mingrone <jrm@FreeBSD.org> AuthorDate: 2021-06-05 22:58:36 +0000 Commit: Joseph Mingrone <jrm@FreeBSD.org> CommitDate: 2021-06-05 23:00:24 +0000 biology/hyphy: Update to 2.5.31 https://github.com/veg/hyphy/releases/tag/2.5.31 --- biology/hyphy/Makefile | 2 +- biology/hyphy/distinfo | 6 +++--- biology/hyphy/files/patch-CMakeLists.txt | 27 +++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/biology/hyphy/Makefile b/biology/hyphy/Makefile index 840581d4926e..34850adee62a 100644 --- a/biology/hyphy/Makefile +++ b/biology/hyphy/Makefile @@ -1,5 +1,5 @@ PORTNAME= hyphy -DISTVERSION= 2.5.30 +DISTVERSION= 2.5.31 CATEGORIES= biology MAINTAINER= jrm@FreeBSD.org diff --git a/biology/hyphy/distinfo b/biology/hyphy/distinfo index f4ad79792145..9300d52387fe 100644 --- a/biology/hyphy/distinfo +++ b/biology/hyphy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617844705 -SHA256 (veg-hyphy-2.5.30_GH0.tar.gz) = 8850964cfe75b0053af49994be7d847e7827a6117f926f45db5798d12e54bad1 -SIZE (veg-hyphy-2.5.30_GH0.tar.gz) = 5341483 +TIMESTAMP = 1622916930 +SHA256 (veg-hyphy-2.5.31_GH0.tar.gz) = 2fa27ba3c4464ee2239570ebf6a038c6a3e216350ba8c3c22e43de0cb9c5dbd7 +SIZE (veg-hyphy-2.5.31_GH0.tar.gz) = 5342292 diff --git a/biology/hyphy/files/patch-CMakeLists.txt b/biology/hyphy/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..704bbe9368b6 --- /dev/null +++ b/biology/hyphy/files/patch-CMakeLists.txt @@ -0,0 +1,27 @@ +--- CMakeLists.txt.orig 2021-06-05 18:31:25 UTC ++++ CMakeLists.txt +@@ -307,21 +307,16 @@ endif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + #------------------------------------------------------------------------------- + find_package(CURL) + if(${CURL_FOUND}) +- #if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +- # set(DEFAULT_LIBRARIES " crypto curl ssl") +- #else(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +- # set(DEFAULT_LIBRARIES "dl crypto curl ssl") +- #endif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + message(${CURL_LIBRARIES}) +- string(APPEND DEFAULT_LIBRARIES " " ${CURL_LIBRARIES}) ++ list(APPEND DEFAULT_LIBRARIES ${CURL_LIBRARIES}) + add_definitions (-D__HYPHYCURL__) + endif(${CURL_FOUND}) + + if(NOT NOZLIB) + find_package(ZLIB 1.2.9) + if(${ZLIB_FOUND}) +- string(APPEND DEFAULT_LIBRARIES " " ${ZLIB_LIBRARIES}) +- include_directories(${ZLIB_INCLUDE_DIRS}) ++ list(APPEND DEFAULT_LIBRARIES ${ZLIB_LIBRARIES}) ++ include_directories(${ZLIB_INCLUDE_DIRS}) + add_definitions (-D__ZLIB__) + endif(${ZLIB_FOUND}) + endif(NOT NOZLIB)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106052306.155N6bdk027400>