diff options
-rw-r--r-- | sysutils/conky-awesome/Makefile | 6 | ||||
-rw-r--r-- | sysutils/conky-awesome/distinfo | 6 | ||||
-rw-r--r-- | sysutils/conky-awesome/files/patch-src-conky.c | 18 | ||||
-rw-r--r-- | sysutils/conky-awesome/files/patch-src-freebsd.c | 11 | ||||
-rw-r--r-- | sysutils/conky/Makefile | 6 | ||||
-rw-r--r-- | sysutils/conky/distinfo | 6 | ||||
-rw-r--r-- | sysutils/conky/files/patch-src-conky.c | 18 | ||||
-rw-r--r-- | sysutils/conky/files/patch-src-freebsd.c | 11 |
8 files changed, 12 insertions, 70 deletions
diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile index b98322e6591b..dd38a08deb78 100644 --- a/sysutils/conky-awesome/Makefile +++ b/sysutils/conky-awesome/Makefile @@ -6,7 +6,7 @@ # PORTNAME= conky -PORTVERSION= 1.4.4 +PORTVERSION= 1.4.5 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -26,7 +26,7 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ MAN1= conky.1 -PORTDOCS= README AUTHORS ChangeLog TODO \ +PORTDOCS= README AUTHORS ChangeLog TODO NEWS \ docs.html variables.html config_settings.html .if defined(WITH_AUDACIOUS) @@ -96,7 +96,7 @@ post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for i in README AUTHORS ChangeLog TODO +.for i in README AUTHORS ChangeLog TODO NEWS ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .for i in docs.html variables.html config_settings.html diff --git a/sysutils/conky-awesome/distinfo b/sysutils/conky-awesome/distinfo index bfe615626824..ffd9cc7046b2 100644 --- a/sysutils/conky-awesome/distinfo +++ b/sysutils/conky-awesome/distinfo @@ -1,3 +1,3 @@ -MD5 (conky-1.4.4.tar.bz2) = c856556d4372226f99cf7e9a888e9118 -SHA256 (conky-1.4.4.tar.bz2) = 2986b981fbe1e9c40cc16b4fa58194e7e8e300272633470d264a969a7a9a8140 -SIZE (conky-1.4.4.tar.bz2) = 386353 +MD5 (conky-1.4.5.tar.bz2) = 4625c052852f2919a5e7ce2eb7c31189 +SHA256 (conky-1.4.5.tar.bz2) = beb77ec55399dfa65f76330ba5ff65873028b24f3a768f4780e965d9bc5fd63b +SIZE (conky-1.4.5.tar.bz2) = 390741 diff --git a/sysutils/conky-awesome/files/patch-src-conky.c b/sysutils/conky-awesome/files/patch-src-conky.c deleted file mode 100644 index 4031371fa01c..000000000000 --- a/sysutils/conky-awesome/files/patch-src-conky.c +++ /dev/null @@ -1,18 +0,0 @@ ---- 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-awesome/files/patch-src-freebsd.c b/sysutils/conky-awesome/files/patch-src-freebsd.c deleted file mode 100644 index e08e55489d3f..000000000000 --- a/sysutils/conky-awesome/files/patch-src-freebsd.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index b98322e6591b..dd38a08deb78 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -6,7 +6,7 @@ # PORTNAME= conky -PORTVERSION= 1.4.4 +PORTVERSION= 1.4.5 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -26,7 +26,7 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ MAN1= conky.1 -PORTDOCS= README AUTHORS ChangeLog TODO \ +PORTDOCS= README AUTHORS ChangeLog TODO NEWS \ docs.html variables.html config_settings.html .if defined(WITH_AUDACIOUS) @@ -96,7 +96,7 @@ post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for i in README AUTHORS ChangeLog TODO +.for i in README AUTHORS ChangeLog TODO NEWS ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .for i in docs.html variables.html config_settings.html diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index bfe615626824..ffd9cc7046b2 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,3 @@ -MD5 (conky-1.4.4.tar.bz2) = c856556d4372226f99cf7e9a888e9118 -SHA256 (conky-1.4.4.tar.bz2) = 2986b981fbe1e9c40cc16b4fa58194e7e8e300272633470d264a969a7a9a8140 -SIZE (conky-1.4.4.tar.bz2) = 386353 +MD5 (conky-1.4.5.tar.bz2) = 4625c052852f2919a5e7ce2eb7c31189 +SHA256 (conky-1.4.5.tar.bz2) = beb77ec55399dfa65f76330ba5ff65873028b24f3a768f4780e965d9bc5fd63b +SIZE (conky-1.4.5.tar.bz2) = 390741 diff --git a/sysutils/conky/files/patch-src-conky.c b/sysutils/conky/files/patch-src-conky.c deleted file mode 100644 index 4031371fa01c..000000000000 --- a/sysutils/conky/files/patch-src-conky.c +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 deleted file mode 100644 index e08e55489d3f..000000000000 --- a/sysutils/conky/files/patch-src-freebsd.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) |