Date: Fri, 7 Aug 2020 11:20:11 +0000 (UTC) From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544321 - in head/biology/diamond: . files Message-ID: <202008071120.077BKBFA048716@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jrm Date: Fri Aug 7 11:20:11 2020 New Revision: 544321 URL: https://svnweb.freebsd.org/changeset/ports/544321 Log: biology/diamond: Update to version 2.0.2 Upstream changes: https://github.com/bbuchfink/diamond/releases/tag/v2.0.1 https://github.com/bbuchfink/diamond/releases/tag/v2.0.2 Added: head/biology/diamond/files/ head/biology/diamond/files/patch-src_util_system_system.cpp (contents, props changed) Modified: head/biology/diamond/Makefile (contents, props changed) head/biology/diamond/distinfo (contents, props changed) Modified: head/biology/diamond/Makefile ============================================================================== --- head/biology/diamond/Makefile Fri Aug 7 10:43:55 2020 (r544320) +++ head/biology/diamond/Makefile Fri Aug 7 11:20:11 2020 (r544321) @@ -2,7 +2,7 @@ PORTNAME= diamond DISTVERSIONPREFIX= v -DISTVERSION= 2.0.0 +DISTVERSION= 2.0.2 CATEGORIES= biology MAINTAINER= jrm@FreeBSD.org Modified: head/biology/diamond/distinfo ============================================================================== --- head/biology/diamond/distinfo Fri Aug 7 10:43:55 2020 (r544320) +++ head/biology/diamond/distinfo Fri Aug 7 11:20:11 2020 (r544321) @@ -1,3 +1,3 @@ -TIMESTAMP = 1595902695 -SHA256 (bbuchfink-diamond-v2.0.0_GH0.tar.gz) = 0a2bbc8f0fc96d124d37e014f43dd5590a84eb2772428288e8b239b78e9a1058 -SIZE (bbuchfink-diamond-v2.0.0_GH0.tar.gz) = 1104518 +TIMESTAMP = 1596712682 +SHA256 (bbuchfink-diamond-v2.0.2_GH0.tar.gz) = fd22c2a1960cc1b4d02b66f87c66624c6e495de3128b73da70171fc134a508b5 +SIZE (bbuchfink-diamond-v2.0.2_GH0.tar.gz) = 1117286 Added: head/biology/diamond/files/patch-src_util_system_system.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/diamond/files/patch-src_util_system_system.cpp Fri Aug 7 11:20:11 2020 (r544321) @@ -0,0 +1,45 @@ +--- 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008071120.077BKBFA048716>