From dab99da055766eeb61cff4d0064b02b3d0ac69c8 Mon Sep 17 00:00:00 2001 From: Joseph Mingrone Date: Fri, 20 Aug 2021 10:52:29 -0300 Subject: [PATCH] biology/hyphy: Update to 2.4.32 https://github.com/veg/hyphy/releases/tag/2.5.32 Port changes: - Remove USES=ssl since it's an indirect dependency from curl - Remove patch that was upstreamed --- biology/hyphy/Makefile | 4 ++-- biology/hyphy/distinfo | 6 +++--- biology/hyphy/files/patch-CMakeLists.txt | 27 ------------------------ biology/hyphy/pkg-plist | 1 + 4 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 biology/hyphy/files/patch-CMakeLists.txt diff --git a/biology/hyphy/Makefile b/biology/hyphy/Makefile index 34850adee62a6..99d7ada928510 100644 --- a/biology/hyphy/Makefile +++ b/biology/hyphy/Makefile @@ -1,5 +1,5 @@ PORTNAME= hyphy -DISTVERSION= 2.5.31 +DISTVERSION= 2.5.32 CATEGORIES= biology MAINTAINER= jrm@FreeBSD.org @@ -12,7 +12,7 @@ ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libcurl.so:ftp/curl -USES= cmake localbase:ldflags ssl +USES= cmake localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= veg diff --git a/biology/hyphy/distinfo b/biology/hyphy/distinfo index 9300d52387fe9..948d3cd0569a8 100644 --- a/biology/hyphy/distinfo +++ b/biology/hyphy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1622916930 -SHA256 (veg-hyphy-2.5.31_GH0.tar.gz) = 2fa27ba3c4464ee2239570ebf6a038c6a3e216350ba8c3c22e43de0cb9c5dbd7 -SIZE (veg-hyphy-2.5.31_GH0.tar.gz) = 5342292 +TIMESTAMP = 1629465228 +SHA256 (veg-hyphy-2.5.32_GH0.tar.gz) = e47be24b3de21a7a29eec6256cba7481ac8a98437d49eb682aefa5de2f4350ce +SIZE (veg-hyphy-2.5.32_GH0.tar.gz) = 5346015 diff --git a/biology/hyphy/files/patch-CMakeLists.txt b/biology/hyphy/files/patch-CMakeLists.txt deleted file mode 100644 index 704bbe9368b60..0000000000000 --- a/biology/hyphy/files/patch-CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ ---- 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) diff --git a/biology/hyphy/pkg-plist b/biology/hyphy/pkg-plist index e2daea3233e64..588863cbd1fd0 100644 --- a/biology/hyphy/pkg-plist +++ b/biology/hyphy/pkg-plist @@ -91,6 +91,7 @@ bin/hyphy %%DATADIR%%/TemplateBatchFiles/CodonModelCompare.bf %%DATADIR%%/TemplateBatchFiles/CodonToProtein.bf %%DATADIR%%/TemplateBatchFiles/ConvertDataFile.bf +%%DATADIR%%/TemplateBatchFiles/DirectionalREL.bf %%DATADIR%%/TemplateBatchFiles/DistanceMatrix.bf %%DATADIR%%/TemplateBatchFiles/Distances/CodonTools.def %%DATADIR%%/TemplateBatchFiles/Distances/CodonTools2.def