diff options
| author | madpilot <madpilot@FreeBSD.org> | 2016-12-12 09:58:04 +0000 |
|---|---|---|
| committer | madpilot <madpilot@FreeBSD.org> | 2016-12-12 09:58:04 +0000 |
| commit | a6beb29bfd664e3c476806ac32ea08d64da567b3 (patch) | |
| tree | d04311837af3630bcda797568710a1ea3c6fd91c | |
| parent | 3950a68cdb2571cde3343bd41e53607a3da96d21 (diff) | |
| download | FreeBSD-ports-a6beb29bfd664e3c476806ac32ea08d64da567b3.zip FreeBSD-ports-a6beb29bfd664e3c476806ac32ea08d64da567b3.tar.gz | |
- Update conky to 1.10.6
- Remove patch submitted upstream
| -rw-r--r-- | sysutils/conky/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/conky/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/conky/files/patch-src_freebsd.cc | 24 |
3 files changed, 4 insertions, 29 deletions
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index f614aa1..bce910c 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= conky -PORTVERSION= 1.10.5 +PORTVERSION= 1.10.6 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= madpilot@FreeBSD.org diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index 33a76cf..2b0a36b 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475571819 -SHA256 (brndnmtthws-conky-v1.10.5_GH0.tar.gz) = 3bcf1ae93721e0575cd4ef8fd60da9e5bf1b2fbceb365fb9792f2aec6139f569 -SIZE (brndnmtthws-conky-v1.10.5_GH0.tar.gz) = 365176 +TIMESTAMP = 1481146772 +SHA256 (brndnmtthws-conky-v1.10.6_GH0.tar.gz) = 4c80982960b2a72e3e33cef33347c97b9239ed110d9584da4e7f17f28faf60ca +SIZE (brndnmtthws-conky-v1.10.6_GH0.tar.gz) = 365669 diff --git a/sysutils/conky/files/patch-src_freebsd.cc b/sysutils/conky/files/patch-src_freebsd.cc deleted file mode 100644 index e393539..0000000 --- a/sysutils/conky/files/patch-src_freebsd.cc +++ /dev/null @@ -1,24 +0,0 @@ ---- src/freebsd.cc.orig 2016-10-04 07:49:19 UTC -+++ src/freebsd.cc -@@ -426,13 +426,15 @@ double get_acpi_temperature(int fd) - int temp; - (void)fd; - -- if (GETSYSCTL("hw.acpi.thermal.tz0.temperature", temp)) { -- fprintf(stderr, -- "Cannot read sysctl \"hw.acpi.thermal.tz0.temperature\"\n"); -- return 0.0; -- } -+ if (GETSYSCTL("hw.acpi.thermal.tz0.temperature", temp) == 0) -+ return KELVTOC(temp); -+ if (GETSYSCTL("dev.cpu.0.temperature", temp) == 0) -+ return KELVTOC(temp); -+ if (GETSYSCTL("dev.amdtemp.0.core0.sensor0", temp) == 0) -+ return KELVTOC(temp); -+ fprintf(stderr, "Cannot get temperature from sysctl\n"); - -- return KELVTOC(temp); -+ return 0.0; - } - - static void get_battery_stats(int *battime, int *batcapacity, int *batstate, int *ac) { |
