biology/diamond: Update to version 2.0.4

Upstream changes:
https://github.com/bbuchfink/diamond/releases/tag/v2.0.3
https://github.com/bbuchfink/diamond/releases/tag/v2.0.4

Port changes:
Remove a patch that was upstreamed:
https://github.com/bbuchfink/diamond/pull/378
This commit is contained in:
Joseph Mingrone 2020-08-30 16:14:22 +00:00
parent cd5419ba06
commit bc66849a97
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=547066
3 changed files with 4 additions and 49 deletions

View File

@ -2,7 +2,7 @@
PORTNAME= diamond
DISTVERSIONPREFIX= v
DISTVERSION= 2.0.2
DISTVERSION= 2.0.4
CATEGORIES= biology
MAINTAINER= jrm@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1596712682
SHA256 (bbuchfink-diamond-v2.0.2_GH0.tar.gz) = fd22c2a1960cc1b4d02b66f87c66624c6e495de3128b73da70171fc134a508b5
SIZE (bbuchfink-diamond-v2.0.2_GH0.tar.gz) = 1117286
TIMESTAMP = 1598800137
SHA256 (bbuchfink-diamond-v2.0.4_GH0.tar.gz) = 94e8fe72bdc28b83fd0f2d90c439b58b63b38263aa1a3905582ef68f614ae95d
SIZE (bbuchfink-diamond-v2.0.4_GH0.tar.gz) = 1120470

View File

@ -1,45 +0,0 @@
--- src/util/system/system.cpp.orig 2020-08-05 17:04:09 UTC
+++ src/util/system/system.cpp
@@ -6,14 +6,19 @@
#include "../log_stream.h"
#ifdef _MSC_VER
-#include <windows.h>
+ #include <windows.h>
#else
-#include <unistd.h>
-#include <sys/stat.h>
-#ifndef __APPLE__
-#include <sys/sysinfo.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #ifndef __APPLE__
+ #ifdef __FreeBSD__
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #else
+ #include <sys/sysinfo.h>
+ #endif
+ #endif
#endif
-#endif
using std::string;
using std::cout;
@@ -129,6 +134,16 @@ void reset_color(bool err) {
double total_ram() {
#if defined(WIN32) || defined(__APPLE__)
return 0.0;
+#elif defined(__FreeBSD__)
+ int mib[2] = { CTL_HW, HW_REALMEM };
+ u_int namelen = sizeof(mib) / sizeof(mib[0]);
+ uint64_t oldp;
+ size_t oldlenp = sizeof(oldp);
+
+ if (sysctl(mib, namelen, &oldp, &oldlenp, NULL, 0) < 0)
+ return 0.0;
+ else
+ return oldp / 1e9;
#else
struct sysinfo info;
if (sysinfo(&info) != 0)