Date: Sun, 20 May 2012 10:18:26 GMT From: lbartoletti <coder@tuxfamily.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/168161: [PATCH] sysutils/conky: update to 1.9.0 Message-ID: <201205201018.q4KAIQHa062210@red.freebsd.org> Resent-Message-ID: <201205201020.q4KAK1a9017264@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 168161
>Category: ports
>Synopsis: [PATCH] sysutils/conky: update to 1.9.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun May 20 10:20:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: lbartoletti
>Release:
>Organization:
>Environment:
>Description:
Update sysutils/conky 1.8.1_5 -> 1.9.0
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN /usr/ports/sysutils/conky/Makefile conky/Makefile
--- /usr/ports/sysutils/conky/Makefile 2012-03-08 06:07:13.000000000 +0100
+++ conky/Makefile 2012-05-20 12:10:17.000000000 +0200
@@ -6,8 +6,7 @@
#
PORTNAME= conky
-PORTVERSION= 1.8.1
-PORTREVISION= 5
+PORTVERSION= 1.9.0
CATEGORIES= sysutils
MASTER_SITES= SF
@@ -164,6 +163,7 @@
.endif
post-patch:
+ @${REINPLACE_CMD} -e 's|-lbsd| |' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's,lua5\.1,lua-5.1,g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's,imlib_context_disconnect_display();,,g' \
diff -ruN /usr/ports/sysutils/conky/distinfo conky/distinfo
--- /usr/ports/sysutils/conky/distinfo 2010-10-30 13:43:47.000000000 +0200
+++ conky/distinfo 2012-05-20 10:41:24.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (conky-1.8.1.tar.bz2) = f85a278f2869596b1fd68b6d26d58c93af8dcc39d5186bbcfd587d4c545e5e43
-SIZE (conky-1.8.1.tar.bz2) = 612481
+SHA256 (conky-1.9.0.tar.bz2) = baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f
+SIZE (conky-1.9.0.tar.bz2) = 626555
diff -ruN /usr/ports/sysutils/conky/files/patch-configure conky/files/patch-configure
--- /usr/ports/sysutils/conky/files/patch-configure 2012-03-08 06:07:14.000000000 +0100
+++ conky/files/patch-configure 2012-05-20 12:00:39.000000000 +0200
@@ -1,40 +1,240 @@
---- configure.orig
-+++ configure
-@@ -1002,6 +1002,7 @@
+--- configure.orig 2012-05-03 23:47:40.000000000 +0200
++++ configure 2012-05-20 12:00:15.000000000 +0200
+@@ -894,6 +894,7 @@
+ enable_xdamage
enable_xft
enable_nvidia
- enable_alsa
+enable_inotify
+ enable_alsa
enable_debug
enable_testing
- enable_profiling
-@@ -1729,6 +1730,7 @@
+@@ -1620,6 +1621,8 @@
--enable-nvidia enable if you want nvidia support [default=no]
--disable-alsa disable if you do not want ALSA support
[default=yes]
+ --enable-inotify enable if you want inotify support [default=no]
++
--enable-debug compile with debug symbols [default=no]
--enable-testing use strict compiler flags for testing [default=no]
--enable-profiling specify compiler flags for use with gprof and gcov
-@@ -11647,7 +11649,7 @@
-
+@@ -14046,12 +14049,12 @@
+ pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
++ pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -14064,12 +14067,12 @@
+ pkg_cv_LUA51_LIBS="$LUA51_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
++ pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -14088,14 +14091,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
++ LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
+ else
+- LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
++ LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LUA51_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met:
++ as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met:
+
+ $LUA51_PKG_ERRORS
+
+@@ -14139,12 +14142,12 @@
+ pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
++ pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -14157,12 +14160,12 @@
+ pkg_cv_LUA51_LIBS="$LUA51_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
++ pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -14181,14 +14184,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
++ LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
+ else
+- LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
++ LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LUA51_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met:
++ as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met:
+
+ $LUA51_PKG_ERRORS
+
+@@ -14302,12 +14305,12 @@
+ pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
++ pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -14320,12 +14323,12 @@
+ pkg_cv_LUA51_LIBS="$LUA51_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
++ pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -14344,14 +14347,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
++ LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
+ else
+- LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
++ LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LUA51_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met:
++ as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met:
+
+ $LUA51_PKG_ERRORS
+
+@@ -14395,12 +14398,12 @@
+ pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
++ pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -14413,12 +14416,12 @@
+ pkg_cv_LUA51_LIBS="$LUA51_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
++ pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -14437,14 +14440,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
++ LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
+ else
+- LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
++ LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LUA51_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met:
++ as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met:
+
+ $LUA51_PKG_ERRORS
+
+@@ -16766,13 +16769,13 @@
+
+
+ if test x$WANT_OPTRESET = xyes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optreset in -lbsd" >&5
+-$as_echo_n "checking for optreset in -lbsd... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optreset in -lc" >&5
++$as_echo_n "checking for optreset in -lc... " >&6; }
+ if ${ac_cv_lib_bsd_optreset+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lbsd $LIBS"
++LIBS="-lc $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
- if test x$want_apcupsd = xyes; then
-- if test x"$uname" != xLinux; then
-+ if test x"$uname" != xLinux -a x"$uname" != xFreeBSD; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: apcupsd not supported on $uname... disabling" >&5
- $as_echo "$as_me: apcupsd not supported on $uname... disabling" >&6;}
- want_apcupsd="not supported on $uname"
-@@ -11675,7 +11675,7 @@
-
-
- if test x$want_iostats = xyes; then
-- if test x"$uname" != xLinux; then
-+ if test x"$uname" != xLinux -a x"$uname" != xFreeBSD; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: iostats not supported on $uname... disabling" >&5
- $as_echo "$as_me: iostats not supported on $uname... disabling" >&6;}
- want_iostats="not supported on $uname"
-@@ -16071,20 +16073,65 @@
+@@ -16998,25 +17001,71 @@
done
@@ -42,17 +242,18 @@
-for ac_header in sys/inotify.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
--if test "x$ac_cv_header_sys_inotify_h" = x""yes; then :
+-if test "x$ac_cv_header_sys_inotify_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_INOTIFY_H 1
-_ACEOF
-
+-
+# Check whether --enable-inotify was given.
+if test "${enable_inotify+set}" = set; then :
+ enableval=$enable_inotify; want_inotify="$enableval"
+else
+ want_inotify=no
fi
++
-done
+if test x$want_inotify = xyes; then
@@ -62,8 +263,8 @@
+else
+ want_inotify=no
+fi
-
-
++
++
+fi
+if test x$want_inotify = xyes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify_init in -linotify" >&5
@@ -75,9 +276,9 @@
+LIBS="-linotify $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+
+
+#include <sys/inotify.h>
-+
+
+char inotify_init ();
+int
+main ()
@@ -103,18 +304,16 @@
+else
+ want_inotify=yes
+fi
-+
-+fi
-+
++fi
++
++
$as_echo "#define DEFAULTNETDEV \"eth0\"" >>confdefs.h
-@@ -16102,7 +16153,7 @@
- $as_echo "#define DEFAULT_TEXT_BUFFER_SIZE 256" >>confdefs.h
-
-
--$as_echo "#define MAX_NET_INTERFACES 16" >>confdefs.h
-+$as_echo "#define MAX_NET_INTERFACES 64" >>confdefs.h
+-
++$as_echo "#define DEFAULT_TEXT_BUFFER_SIZE 256" >>confdefs.h
++
+ $as_echo "#define CONFIG_FILE \"\$HOME/.conkyrc\"" >>confdefs.h
diff -ruN /usr/ports/sysutils/conky/files/patch-src-ccurl_thread.c conky/files/patch-src-ccurl_thread.c
--- /usr/ports/sysutils/conky/files/patch-src-ccurl_thread.c 2012-03-08 06:07:14.000000000 +0100
+++ conky/files/patch-src-ccurl_thread.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- src/ccurl_thread.c.orig 2010-10-06 00:29:36.000000000 +0300
-+++ src/ccurl_thread.c 2012-03-05 01:08:23.000000000 +0200
-@@ -33,7 +33,6 @@
- #endif /* DEBUG */
-
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
-
- /*
diff -ruN /usr/ports/sysutils/conky/files/patch-src-conky.c conky/files/patch-src-conky.c
--- /usr/ports/sysutils/conky/files/patch-src-conky.c 2012-03-08 06:07:14.000000000 +0100
+++ conky/files/patch-src-conky.c 2012-05-20 11:34:03.000000000 +0200
@@ -1,63 +1,9 @@
---- src/conky.c.orig 2010-10-06 00:29:36.000000000 +0300
-+++ src/conky.c 2012-03-05 01:03:43.000000000 +0200
-@@ -119,7 +119,7 @@
- #include "openbsd.h"
- #endif
-
--#if defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD_kernel__) && (__FreeBSD_kernel__ + 0)
- #include <bsd/bsd.h>
- #endif
-
-@@ -2072,9 +2072,11 @@
- OBJ(xmms2_percent) {
- snprintf(p, p_max_size, "%2.0f", cur->xmms2.progress * 100);
- }
-+#ifdef X11
- OBJ(xmms2_bar) {
- new_bar(obj, p, p_max_size, (int) (cur->xmms2.progress * 255.0f));
- }
-+#endif /* X11 */
- OBJ(xmms2_playlist) {
- snprintf(p, p_max_size, "%s", cur->xmms2.playlist);
- }
-@@ -2150,6 +2152,7 @@
- snprintf(p, p_max_size, "%s",
- cur->audacious.items[AUDACIOUS_MAIN_VOLUME]);
- }
-+#ifdef X11
- OBJ(audacious_bar) {
- double progress;
-
-@@ -2158,6 +2161,7 @@
- atof(cur->audacious.items[AUDACIOUS_LENGTH_SECONDS]);
- new_bar(obj, p, p_max_size, (int) (progress * 255.0f));
- }
-+#endif /* X11 */
- #endif /* AUDACIOUS */
-
- #ifdef BMPX
-@@ -5716,6 +5720,7 @@
- "kvm_open")) == NULL) {
- CRIT_ERR(NULL, NULL, "cannot read kvm");
- }
-+ pthread_mutex_init(&kvm_proc_mutex, NULL);
- #endif
-
- while (1) {
-@@ -5999,6 +6004,7 @@
-
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- kvm_close(kd);
-+ pthread_mutex_destroy(&kvm_proc_mutex);
- #endif
-
- return 0;
-@@ -6007,7 +6013,7 @@
-
+--- src/conky.c.orig 2012-05-20 11:33:05.000000000 +0200
++++ src/conky.c 2012-05-20 11:31:58.000000000 +0200
+@@ -5972,6 +5972,7 @@
void alarm_handler(void) {
if(childpid > 0) {
-- kill(childpid, SIGTERM);
+ kill(childpid, SIGTERM);
+ kill(childpid, SIGKILL);
}
}
diff -ruN /usr/ports/sysutils/conky/files/patch-src-core.c conky/files/patch-src-core.c
--- /usr/ports/sysutils/conky/files/patch-src-core.c 2010-10-19 03:12:52.000000000 +0200
+++ conky/files/patch-src-core.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,59 +0,0 @@
---- src/core.c.orig 2010-10-06 00:29:36.000000000 +0300
-+++ src/core.c 2010-10-09 23:51:18.000000000 +0300
-@@ -541,11 +541,11 @@
- parse_platform_sensor(obj, arg);
- END OBJ_ARG(hwmon, 0, "hwmon needs argumanets")
- parse_hwmon_sensor(obj, arg);
-- END OBJ(addr, &update_net_stats)
-- parse_net_stat_arg(obj, arg, free_at_crash);
- END OBJ(addrs, &update_net_stats)
- parse_net_stat_arg(obj, arg, free_at_crash);
- #endif /* __linux__ */
-+ END OBJ(addr, &update_net_stats)
-+ parse_net_stat_arg(obj, arg, free_at_crash);
- END
- /* we have four different types of top (top, top_mem, top_time and top_io). To
- * avoid having almost-same code four times, we have this special
-@@ -577,7 +577,7 @@
- obj->data.s = strndup(arg, text_buffer_size);
- END OBJ_IF_ARG(if_mounted, 0, "if_mounted needs an argument")
- obj->data.s = strndup(arg, text_buffer_size);
--#ifdef __linux__
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- END OBJ_IF_ARG(if_running, &update_top, "if_running needs an argument")
- top_running = 1;
- obj->data.s = strndup(arg, text_buffer_size);
-@@ -787,9 +787,9 @@
- obj->sub = malloc(sizeof(struct text_object));
- extract_variable_text_internal(obj->sub, arg);
- END OBJ(processes, &update_total_processes)
-+#ifdef __linux__
- END OBJ(running_processes, &update_top)
- top_running = 1;
--#ifdef __linux__
- END OBJ(threads, &update_threads)
- END OBJ(running_threads, &update_stat)
- #else
-@@ -967,8 +967,10 @@
- END OBJ(xmms2_size, &update_xmms2)
- END OBJ(xmms2_status, &update_xmms2)
- END OBJ(xmms2_percent, &update_xmms2)
-+#ifdef X11
- END OBJ(xmms2_bar, &update_xmms2)
- scan_bar(obj, arg);
-+#endif
- END OBJ(xmms2_smart, &update_xmms2)
- END OBJ(xmms2_playlist, &update_xmms2)
- END OBJ(xmms2_timesplayed, &update_xmms2)
-@@ -994,9 +996,11 @@
- END OBJ(audacious_playlist_length, &update_audacious)
- END OBJ(audacious_playlist_position, &update_audacious)
- END OBJ(audacious_main_volume, &update_audacious)
-+#ifdef X11
- END OBJ(audacious_bar, &update_audacious)
- scan_bar(obj, arg);
- #endif
-+#endif
- #ifdef BMPX
- END OBJ(bmpx_title, &update_bmpx)
- memset(&(info.bmpx), 0, sizeof(struct bmpx_s));
diff -ruN /usr/ports/sysutils/conky/files/patch-src-exec.c conky/files/patch-src-exec.c
--- /usr/ports/sysutils/conky/files/patch-src-exec.c 2010-10-30 13:43:47.000000000 +0200
+++ conky/files/patch-src-exec.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
---- src/exec.c.orig 2010-10-27 20:19:48.000000000 +0300
-+++ src/exec.c 2010-10-27 20:19:52.000000000 +0300
-@@ -93,6 +93,7 @@
- } else {
- close(1);
- }
-+ close(parentend);
- dup(childend); //by dupping childend, the returned fd will have close-on-exec turned off
- execl("/bin/sh", "sh", "-c", command, (char *) NULL);
- _exit(EXIT_FAILURE); //child should die here, (normally execl will take care of this but it can fail)
-@@ -156,7 +157,7 @@
- int length;
-
- length = fread(buf, 1, size, fp);
-- pclose(fp);
-+ fclose(fp);
- buf[length] = '\0';
- if (length > 0 && buf[length - 1] == '\n') {
- buf[length - 1] = '\0';
-@@ -320,7 +321,7 @@
- ed->buffer = malloc(text_buffer_size);
-
- length = fread(ed->buffer, 1, text_buffer_size, fp);
-- pclose(fp);
-+ fclose(fp);
-
- output = ed->buffer;
- output[length] = '\0';
diff -ruN /usr/ports/sysutils/conky/files/patch-src-freebsd.c conky/files/patch-src-freebsd.c
--- /usr/ports/sysutils/conky/files/patch-src-freebsd.c 2012-03-08 06:07:14.000000000 +0100
+++ conky/files/patch-src-freebsd.c 2012-05-20 11:47:43.000000000 +0200
@@ -1,48 +1,22 @@
---- src/freebsd.c.orig 2010-10-06 00:29:36.000000000 +0300
-+++ src/freebsd.c 2012-03-05 01:02:25.000000000 +0200
-@@ -38,6 +38,11 @@
- #include <sys/types.h>
- #include <sys/user.h>
-
-+#if defined(__FreeBSD__) && (!defined(__FreeBSD_kernel__) || !(__FreeBSD_kernel__ + 0))
-+# undef __FreeBSD_kernel__
-+# define __FreeBSD_kernel__ __FreeBSD__
-+#endif
-+
- #include <net/if.h>
- #include <net/if_mib.h>
- #include <net/if_media.h>
-@@ -266,7 +271,9 @@
- {
- int n_processes;
-
-+ pthread_mutex_lock(&kvm_proc_mutex);
- kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes);
-+ pthread_mutex_unlock(&kvm_proc_mutex);
-
- info.procs = n_processes;
- return 0;
-@@ -278,9 +285,10 @@
- int n_processes;
- int i, cnt = 0;
-
-+ pthread_mutex_lock(&kvm_proc_mutex);
+--- src/freebsd.c.orig 2012-05-20 11:45:06.000000000 +0200
++++ src/freebsd.c 2012-05-20 11:47:04.000000000 +0200
+@@ -288,10 +288,11 @@
+ pthread_mutex_lock(&kvm_proc_mutex);
p = kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes);
for (i = 0; i < n_processes; i++) {
-#if (__FreeBSD__ < 5) && (__FreeBSD_kernel__ < 5)
+- if (p[i].kp_proc.p_stat == SRUN) {
+-#else
+- if (p[i].ki_stat == SRUN) {
+#if (defined(__FreeBSD__) && (__FreeBSD__ < 5)) || (defined(__FreeBSD_kernel__) && (__FreeBSD_kernel__ < 5))
- if (p[i].kp_proc.p_stat == SRUN) {
- #else
- if (p[i].ki_stat == SRUN) {
-@@ -288,6 +296,7 @@
++ if (p[i].kp_proc.p_stat == SRUN) {
++ #else
++ if (p[i].ki_stat == SRUN) {
++
+ #endif
cnt++;
}
- }
-+ pthread_mutex_unlock(&kvm_proc_mutex);
-
- info.run_procs = cnt;
- return 0;
-@@ -296,7 +305,6 @@
+@@ -305,7 +306,6 @@
void get_cpu_count(void)
{
int cpu_count = 0;
@@ -50,19 +24,3 @@
if (GETSYSCTL("hw.ncpu", cpu_count) == 0) {
info.cpu_count = cpu_count;
-@@ -748,6 +756,7 @@
- CRIT_ERR(NULL, NULL, "Cannot read sysctl \"vm.stats.vm.v_page_count\"");
- }
-
-+ pthread_mutex_lock(&kvm_proc_mutex);
- p = kvm_getprocs(kd, KERN_PROC_PROC, 0, &n_processes);
- processes = malloc(n_processes * sizeof(struct process));
-
-@@ -764,6 +769,7 @@
- j++;
- }
- }
-+ pthread_mutex_unlock(&kvm_proc_mutex);
-
- qsort(processes, j - 1, sizeof(struct process), comparemem);
- for (i = 0; i < 10 && i < n_processes; i++) {
diff -ruN /usr/ports/sysutils/conky/files/patch-src-freebsd.h conky/files/patch-src-freebsd.h
--- /usr/ports/sysutils/conky/files/patch-src-freebsd.h 2010-10-30 13:43:47.000000000 +0200
+++ conky/files/patch-src-freebsd.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
---- src/freebsd.h.orig 2010-10-24 03:14:11.000000000 +0300
-+++ src/freebsd.h 2010-10-24 03:13:05.000000000 +0300
-@@ -9,11 +9,13 @@
- #include <sys/ucred.h>
- #include <fcntl.h>
- #include <kvm.h>
-+#include <pthread.h>
- #if (defined(i386) || defined(__i386__))
- #include <machine/apm_bios.h>
- #endif /* i386 || __i386__ */
-
- kvm_t *kd;
-+pthread_mutex_t kvm_proc_mutex;
-
- int get_entropy_avail(unsigned int *);
- int get_entropy_poolsize(unsigned int *);
diff -ruN /usr/ports/sysutils/conky/files/patch-src-fs.c conky/files/patch-src-fs.c
--- /usr/ports/sysutils/conky/files/patch-src-fs.c 1970-01-01 01:00:00.000000000 +0100
+++ conky/files/patch-src-fs.c 2012-05-20 12:07:56.000000000 +0200
@@ -0,0 +1,22 @@
+--- src/fs.c.orig 2012-05-03 23:08:27.000000000 +0200
++++ src/fs.c 2012-05-20 12:06:14.000000000 +0200
+@@ -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;
diff -ruN /usr/ports/sysutils/conky/files/patch-src-xmms2.c conky/files/patch-src-xmms2.c
--- /usr/ports/sysutils/conky/files/patch-src-xmms2.c 2010-10-19 03:12:52.000000000 +0200
+++ conky/files/patch-src-xmms2.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- src/xmms2.c.orig 2010-09-29 04:54:10.000000000 +0300
-+++ src/xmms2.c 2010-09-29 04:55:19.000000000 +0300
-@@ -223,7 +223,7 @@
- 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);
diff -ruN /usr/ports/sysutils/conky/pkg-plist conky/pkg-plist
--- /usr/ports/sysutils/conky/pkg-plist 1970-01-01 01:00:00.000000000 +0100
+++ conky/pkg-plist 2012-05-20 12:11:29.000000000 +0200
@@ -0,0 +1,13 @@
+bin/conky
+man/man1/conky.1.gz
+share/doc/conky/AUTHORS
+share/doc/conky/ChangeLog
+share/doc/conky/NEWS
+share/doc/conky/README
+share/doc/conky/TODO
+share/doc/conky/config_settings.html
+share/doc/conky/docs.html
+share/doc/conky/variables.html
+share/examples/conky/conkyrc.sample
+@dirrm share/examples/conky
+@dirrm share/doc/conky
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205201018.q4KAIQHa062210>