aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils/conky
diff options
context:
space:
mode:
authornovel <novel@FreeBSD.org>2006-12-04 02:39:23 +0800
committernovel <novel@FreeBSD.org>2006-12-04 02:39:23 +0800
commit261c5430352fea52c6c3a156b9543bfad36cafe6 (patch)
tree4a1ab661174d2eda2722cc02227db88b20c61220 /sysutils/conky
parenta4a595de99c57331c45683e2f6f0f02e56e85963 (diff)
downloadfreebsd-ports-gnome-261c5430352fea52c6c3a156b9543bfad36cafe6.tar.gz
freebsd-ports-gnome-261c5430352fea52c6c3a156b9543bfad36cafe6.tar.zst
freebsd-ports-gnome-261c5430352fea52c6c3a156b9543bfad36cafe6.zip
Fix ${freq} and ${freq_g} variables.
PR: ports/106261 Submitted by: Karsten Rothemund <karsten@photor.de> Obtained from: conky svn
Diffstat (limited to 'sysutils/conky')
-rw-r--r--sysutils/conky/files/patch-src-conky.c18
-rw-r--r--sysutils/conky/files/patch-src-freebsd.c11
2 files changed, 29 insertions, 0 deletions
diff --git a/sysutils/conky/files/patch-src-conky.c b/sysutils/conky/files/patch-src-conky.c
new file mode 100644
index 000000000000..4031371fa01c
--- /dev/null
+++ b/sysutils/conky/files/patch-src-conky.c
@@ -0,0 +1,18 @@
+--- src/conky.c.orig Sun Dec 3 21:22:49 2006
++++ src/conky.c Sun Dec 3 21:23:15 2006
+@@ -2046,7 +2046,6 @@
+ OBJ(acpitemp, 0) obj->data.i = open_acpi_temperature(arg);
+ END OBJ(acpitempf, 0) obj->data.i = open_acpi_temperature(arg);
+ END OBJ(acpiacadapter, 0)
+-#if defined(__linux__)
+ END OBJ(freq, 0)
+ get_cpu_count();
+ if (!arg
+@@ -2079,6 +2078,7 @@
+ obj->data.cpu_index=atoi(&arg[0]);
+ }
+ obj->a = 1;
++#if defined(__linux__)
+ END OBJ(voltage_mv, 0)
+ get_cpu_count();
+ if (!arg
diff --git a/sysutils/conky/files/patch-src-freebsd.c b/sysutils/conky/files/patch-src-freebsd.c
new file mode 100644
index 000000000000..e08e55489d3f
--- /dev/null
+++ b/sysutils/conky/files/patch-src-freebsd.c
@@ -0,0 +1,11 @@
+--- src/freebsd.c.orig Sun Dec 3 21:22:52 2006
++++ src/freebsd.c Sun Dec 3 21:23:33 2006
+@@ -514,7 +514,7 @@
+ if (freq_sysctl == NULL)
+ exit(-1);
+
+- snprintf(freq_sysctl, 16, "dev.cpu.%d.freq", cpu);
++ snprintf(freq_sysctl, 16, "dev.cpu.%d.freq", (cpu - 1));
+
+ if (!p_client_buffer || client_buffer_size <= 0 ||
+ !p_format || divisor <= 0)