Hi, This diff updates conky to the latest release 1.9.0. Tested on amd64.
Comments ? OK ? Cheers, benoit
Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/conky/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- Makefile 13 Apr 2012 21:21:10 -0000 1.30 +++ Makefile 6 May 2012 07:02:57 -0000 @@ -4,8 +4,7 @@ COMMENT= light-weight system monitor -DISTNAME= conky-1.8.1 -REVISION= 8 +DISTNAME= conky-1.9.0 CATEGORIES= sysutils HOMEPAGE= http://conky.sourceforge.net/ Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/conky/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 27 Apr 2011 12:55:10 -0000 1.6 +++ distinfo 6 May 2012 07:02:57 -0000 @@ -1,5 +1,5 @@ -MD5 (conky-1.8.1.tar.gz) = mzMPfQAcvZ+Bjkhd78GQKQ== -RMD160 (conky-1.8.1.tar.gz) = 7OQw+Jy0uF9mr244Ylam2KHN628= -SHA1 (conky-1.8.1.tar.gz) = Brvpt+7YYD+nqXGyfFxh84QkrG8= -SHA256 (conky-1.8.1.tar.gz) = x5aGmd6zkP4ru9TiujEo/BOrIu5QP5Uj5JRjwDlzyq0= -SIZE (conky-1.8.1.tar.gz) = 775162 +MD5 (conky-1.9.0.tar.gz) = HI5xWieE1NeZ9fwCE+dtDw== +RMD160 (conky-1.9.0.tar.gz) = 7Q6cK+plbE6aeCl1BpnjL1i97gY= +SHA1 (conky-1.9.0.tar.gz) = qNJtACNwybh3rnetOju9JWazjl0= +SHA256 (conky-1.9.0.tar.gz) = HedU13smcfaHlf25/FBjKKFmjdbKAJhMP0l5CmbTaMo= +SIZE (conky-1.9.0.tar.gz) = 800797 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/sysutils/conky/patches/patch-configure,v retrieving revision 1.3 diff -u -r1.3 patch-configure --- patches/patch-configure 27 Apr 2011 12:55:10 -0000 1.3 +++ patches/patch-configure 6 May 2012 07:02:57 -0000 @@ -1,11 +1,11 @@ -$OpenBSD: patch-configure,v 1.3 2011/04/27 12:55:10 dcoppa Exp $ ---- configure.orig Tue Aug 25 00:01:58 2009 -+++ configure Tue Apr 27 19:50:09 2010 -@@ -11657,7 +11657,7 @@ $as_echo "#define APCUPSD 1" >>confdefs.h +$OpenBSD$ +--- configure.orig Thu May 3 23:47:40 2012 ++++ configure Sun May 6 08:41:20 2012 +@@ -12537,7 +12537,7 @@ fi fi -- if test x$want_apcupsd = xyes; then +- if test "x$want_apcupsd" = xyes; then + if test x"$want_apcupsd" = xyes; then BUILD_APCUPSD_TRUE= BUILD_APCUPSD_FALSE='#' Index: patches/patch-src_ccurl_thread_c =================================================================== RCS file: patches/patch-src_ccurl_thread_c diff -N patches/patch-src_ccurl_thread_c --- patches/patch-src_ccurl_thread_c 5 Jul 2011 08:18:30 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_ccurl_thread_c,v 1.1 2011/07/05 08:18:30 jasper Exp $ ---- src/ccurl_thread.c.orig Tue Jul 5 09:35:29 2011 -+++ src/ccurl_thread.c Tue Jul 5 09:35:34 2011 -@@ -33,7 +33,6 @@ - #endif /* DEBUG */ - - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - - /* Index: patches/patch-src_core_c =================================================================== RCS file: /cvs/ports/sysutils/conky/patches/patch-src_core_c,v retrieving revision 1.3 diff -u -r1.3 patch-src_core_c --- patches/patch-src_core_c 13 Apr 2012 21:21:10 -0000 1.3 +++ patches/patch-src_core_c 6 May 2012 07:02:57 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_core_c,v 1.3 2012/04/13 21:21:10 pascal Exp $ ---- src/core.c.orig Tue Oct 5 17:29:36 2010 -+++ src/core.c Wed Apr 4 17:48:06 2012 -@@ -170,9 +170,9 @@ struct text_object *construct_text_object(const char * +$OpenBSD$ +--- src/core.c.orig Thu May 3 23:08:27 2012 ++++ src/core.c Sun May 6 08:21:05 2012 +@@ -170,9 +170,9 @@ #else NORM_ERR("acpiacadapter: arg is only used on linux"); #endif @@ -13,7 +13,7 @@ get_cpu_count(); if (!arg || !isdigit(arg[0]) || strlen(arg) >= 2 || atoi(&arg[0]) == 0 || atoi(&arg[0]) > info.cpu_count) { -@@ -326,7 +326,7 @@ struct text_object *construct_text_object(const char * +@@ -326,7 +326,7 @@ obj->data.i = PB_BATT_STATUS; } #endif /* __linux__ */ @@ -22,18 +22,7 @@ END OBJ_IF_ARG(if_up, 0, "if_up needs an argument") parse_if_up_arg(obj, arg); #endif -@@ -541,8 +541,10 @@ struct text_object *construct_text_object(const char * - parse_platform_sensor(obj, arg); - END OBJ_ARG(hwmon, 0, "hwmon needs argumanets") - parse_hwmon_sensor(obj, arg); -+#endif - END OBJ(addr, &update_net_stats) - parse_net_stat_arg(obj, arg, free_at_crash); -+#ifdef __linux__ - END OBJ(addrs, &update_net_stats) - parse_net_stat_arg(obj, arg, free_at_crash); - #endif /* __linux__ */ -@@ -860,7 +862,7 @@ struct text_object *construct_text_object(const char * +@@ -860,7 +860,7 @@ END OBJ(gw_ip, &update_gateway_info) #endif /* !__linux__ */ #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ @@ -42,7 +31,7 @@ END OBJ(apm_adapter, 0) END OBJ(apm_battery_life, 0) END OBJ(apm_battery_time, 0) -@@ -1516,7 +1518,7 @@ void free_text_objects(struct text_object *root, int i +@@ -1523,7 +1523,7 @@ free(data.s); break; #endif Index: patches/patch-src_eve_c =================================================================== RCS file: patches/patch-src_eve_c diff -N patches/patch-src_eve_c --- patches/patch-src_eve_c 5 Jul 2011 08:18:30 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_eve_c,v 1.1 2011/07/05 08:18:30 jasper Exp $ ---- src/eve.c.orig Tue Jul 5 09:35:16 2011 -+++ src/eve.c Tue Jul 5 09:35:24 2011 -@@ -37,7 +37,6 @@ - #include <libxml/xmlwriter.h> - - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - - #include <time.h> Index: patches/patch-src_fs_c =================================================================== RCS file: patches/patch-src_fs_c diff -N patches/patch-src_fs_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_fs_c 6 May 2012 07:02:57 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ +--- src/fs.c.orig Thu May 3 23:08:27 2012 ++++ src/fs.c Sun May 6 08:50:06 2012 +@@ -118,16 +118,16 @@ + + static void update_fs_stat(struct fs_stat *fs) + { +- struct statfs64 s; ++ struct statfs s; + +- if (statfs64(fs->path, &s) == 0) { ++ if (statfs(fs->path, &s) == 0) { + fs->size = (long long)s.f_blocks * s.f_bsize; + /* bfree (root) or bavail (non-roots) ? */ + fs->avail = (long long)s.f_bavail * s.f_bsize; + fs->free = (long long)s.f_bfree * s.f_bsize; + get_fs_type(fs->path, fs->type); + } else { +- NORM_ERR("statfs64 '%s': %s", fs->path, strerror(errno)); ++ NORM_ERR("statfs '%s': %s", fs->path, strerror(errno)); + fs->size = 0; + fs->avail = 0; + fs->free = 0; Index: patches/patch-src_xmms2_c =================================================================== RCS file: patches/patch-src_xmms2_c diff -N patches/patch-src_xmms2_c --- patches/patch-src_xmms2_c 27 Apr 2011 12:55:11 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_xmms2_c,v 1.1 2011/04/27 12:55:11 dcoppa Exp $ ---- src/xmms2.c.orig Tue Apr 19 20:22:11 2011 -+++ src/xmms2.c Tue Apr 19 20:22:30 2011 -@@ -223,7 +223,7 @@ int handle_playback_state_change(xmmsv_t *value, void - break; - case XMMS_PLAYBACK_STATUS_STOP: - strncpy(ptr->xmms2.status, "Stopped", text_buffer_size - 1); -- ptr->xmms2.elapsed = ptr->xmms2.progress = ptr->xmms2.percent = 0; -+ ptr->xmms2.elapsed = ptr->xmms2.progress = 0; - break; - default: - strncpy(ptr->xmms2.status, "Unknown", text_buffer_size - 1);
