Index: head/sysutils/conky/Makefile =================================================================== --- head/sysutils/conky/Makefile (revision 414043) +++ head/sysutils/conky/Makefile (revision 414044) @@ -1,143 +1,143 @@ # Created by: Roman Bogorodskiy # $FreeBSD$ PORTNAME= conky PORTVERSION= 1.9.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= SF MAINTAINER= ntarmos@ceid.upatras.gr COMMENT?= Advanced, highly configurable system monitor for X11 CONFLICTS?= conky-awesome-[0-9]* SLAVEDIRS= sysutils/conky-awesome USES= cpe gmake iconv pkgconfig tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-portmon \ --disable-hddtemp \ --disable-alsa \ --disable-bmpx \ --disable-iostats CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/conky man/man1/conky.1.gz PORTEXAMPLES= conkyrc.sample PORTDOCS= README AUTHORS ChangeLog TODO NEWS \ docs.html variables.html config_settings.html OPTIONS_DEFINE= APCUPSD AUDACIOUS INOTIFY LUA METAR MOC MPD NCURSES RSS \ X11 XMMS2 XOAP OPTIONS_GROUP?= X11 OPTIONS_GROUP_X11= ARGB DOUBLE_BUFFER IMLIB2 XFT LUA_CAIRO LUA_IMLIB2 OPTIONS_DEFAULT?= X11 ARGB DOUBLE_BUFFER XFT APCUPSD_DESC= Monitor APCUPSD APCUPSD_CONFIGURE_ENABLE=apcupsd ARGB_DESC= Use an ARGB visual to draw on X11 ARGB_CONFIGURE_ENABLE= argb AUDACIOUS_DESC= Control Audacious sound player AUDACIOUS_CONFIGURE_ENABLE=audacious AUDACIOUS_LIB_DEPENDS= libaudclient.so:multimedia/audacious DOUBLE_BUFFER_DESC= Enable X11 double buffering DOUBLE_BUFFER_CONFIGURE_ENABLE=double-buffer INOTIFY_DESC= Monitor file changes via Inotify INOTIFY_CONFIGURE_ENABLE=inotify INOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify LUA_CAIRO_DESC= Lua-Cairo binding LUA_CAIRO_CONFIGURE_ENABLE=lua-cairo LUA_CAIRO_LIB_DEPENDS= libcairo.so:graphics/cairo LUA_IMLIB2_DESC= Lua-Imlib2 binding LUA_IMLIB2_CONFIGURE_ENABLE=lua-imlib2 METAR_DESC= Display METAR weather reports METAR_CONFIGURE_ENABLE= weather-metar METAR_LIB_DEPENDS= libcurl.so:ftp/curl MOC_DESC= Control MOC (Music On Console) MOC_CONFIGURE_ENABLE= moc MPD_DESC= Control MPD (Music Player Daemon) MPD_CONFIGURE_ENABLE= mpd NCURSES_DESC= Use ncurses to draw on terminals NCURSES_CONFIGURE_ENABLE=ncurses RSS_DESC= Display RSS feeds RSS_CONFIGURE_ENABLE= rss RSS_USE= GNOME=glib20 RSS_LIB_DEPENDS= libcurl.so:ftp/curl \ libxml2.so:textproc/libxml2 XFT_CONFIGURE_ENABLE= xft XFT_LIB_DEPENDS= libXft.so:x11-fonts/libXft XMMS2_DESC= Control XMMS2 media player XMMS2_CONFIGURE_ENABLE= xmms2 XMMS2_LIB_DEPENDS= libxmmsclient.so:audio/xmms2 XOAP_DESC= Display XOAP weather reports XOAP_CONFIGURE_ENABLE= weather-xoap XOAP_LIB_DEPENDS= libcurl.so:ftp/curl \ libxml2.so:textproc/libxml2 .include .if ${PORT_OPTIONS:MARGB} || ${PORT_OPTIONS:MDOUBLE_BUFFER} || ${PORT_OPTIONS:MIMLIB2} || ${PORT_OPTIONS:MLUA_CAIRO} || ${PORT_OPTIONS:MLUA_IMLIB2} || ${PORT_OPTIONS:MXFT} || ${PORT_OPTIONS:MX11} USE_XORG= x11 xext xdamage CONFIGURE_ARGS+= --enable-x11 --enable-own-window EXAMPLE_CONF_FILE= ${WRKSRC}/data/conky.conf .else CONFIGURE_ARGS+= --disable-x11 --disable-own-window EXAMPLE_CONF_FILE= ${WRKSRC}/data/conky_no_x11.conf .endif .if ${PORT_OPTIONS:MIMLIB2} || ${PORT_OPTIONS:MLUA_IMLIB2} LIB_DEPENDS+= libImlib2.so:graphics/imlib2 CONFIGURE_ARGS+= --enable-imlib2 .else CONFIGURE_ARGS+= --disable-imlib2 .endif .if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUA_CAIRO} || ${PORT_OPTIONS:MLUA_IMLIB2} USES+= lua:51 CONFIGURE_ARGS+= --enable-lua .else CONFIGURE_ARGS+= --disable-lua .endif .if ${PORT_OPTIONS:MLUA_CAIRO} || ${PORT_OPTIONS:MLUA_IMLIB2} LIB_DEPENDS+= libtolua++-5.1.so:lang/tolua++ .endif post-patch: @${REINPLACE_CMD} -e 's,lua5\.1,lua-5.1,g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's,imlib_context_disconnect_display();,,g' \ ${WRKSRC}/src/imlib2.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/conky.1 ${STAGEDIR}${MANPREFIX}/man/man1 post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${EXAMPLE_CONF_FILE} ${STAGEDIR}${EXAMPLESDIR}/conkyrc.sample @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in README AUTHORS ChangeLog TODO NEWS ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .for i in docs.html variables.html config_settings.html ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/sysutils/conky/files/patch-configure =================================================================== --- head/sysutils/conky/files/patch-configure (revision 414043) +++ head/sysutils/conky/files/patch-configure (revision 414044) @@ -1,103 +1,303 @@ ---- configure.orig 2012-05-04 00:47:40.000000000 +0300 -+++ configure 2012-12-06 04:26:37.000000000 +0200 -@@ -895,6 +895,7 @@ +--- configure.orig 2012-05-03 21:47:40 UTC ++++ configure +@@ -895,6 +895,7 @@ enable_xdamage enable_xft enable_nvidia enable_alsa +enable_inotify enable_debug enable_testing enable_profiling -@@ -1620,6 +1621,7 @@ +@@ -1620,6 +1621,7 @@ Optional Features: --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 -@@ -11930,7 +11932,11 @@ +@@ -11930,7 +11932,11 @@ case $uname in Linux*) WANT_SYSINFO=yes ;; - FreeBSD*|GNU/kFreeBSD*) + FreeBSD*) + WANT_KVM=yes + WANT_DEVSTAT=yes + ;; + GNU/kFreeBSD*) WANT_KVM=yes WANT_DEVSTAT=yes WANT_OPTRESET=yes -@@ -16998,18 +17004,63 @@ +@@ -14046,12 +14052,12 @@ if test -n "$PKG_CONFIG"; then + 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 +14070,12 @@ if test -n "$PKG_CONFIG"; then + 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 +14094,14 @@ else + _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 +14145,12 @@ if test -n "$PKG_CONFIG"; then + 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 +14163,12 @@ if test -n "$PKG_CONFIG"; then + 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 +14187,14 @@ else + _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 +14308,12 @@ if test -n "$PKG_CONFIG"; then + 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 +14326,12 @@ if test -n "$PKG_CONFIG"; then + 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 +14350,14 @@ else + _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 +14401,12 @@ if test -n "$PKG_CONFIG"; then + 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 +14419,12 @@ if test -n "$PKG_CONFIG"; then + 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 +14443,14 @@ else + _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 + +@@ -16998,18 +17004,63 @@ fi + done -# check if we have inotify support -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" + +# Check whether --enable-inotify was given. +if test "${enable_inotify+set}" = set; then : + enableval=$enable_inotify; want_inotify="$enableval" +else + want_inotify=no +fi + +if test x$want_inotify = xyes; then + 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" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_INOTIFY_H 1 -_ACEOF + +else + want_inotify=no +fi - - fi ++ ++fi +if test x$want_inotify = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify_init in -linotify" >&5 +$as_echo_n "checking for inotify_init in -linotify... " >&6; } +if ${ac_cv_lib_inotify_inotify_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-linotify $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - --done -+#include + ++#include + +char inotify_init (); +int +main () +{ +return inotify_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_inotify_inotify_init=yes +else + ac_cv_lib_inotify_inotify_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inotify_inotify_init" >&5 +$as_echo "$ac_cv_lib_inotify_inotify_init" >&6; } +if test "x$ac_cv_lib_inotify_inotify_init" = xyes; then : + conky_LIBS="$conky_LIBS -linotify" +else + want_inotify=yes -+fi -+ + fi + +-done +fi Index: head/sysutils/conky/files/patch-lua-cairo.pkg =================================================================== --- head/sysutils/conky/files/patch-lua-cairo.pkg (revision 414043) +++ head/sysutils/conky/files/patch-lua-cairo.pkg (revision 414044) @@ -1,10 +1,10 @@ ---- lua/cairo.pkg.orig +--- lua/cairo.pkg.orig 2012-05-03 21:08:27 UTC +++ lua/cairo.pkg -@@ -4,6 +4,7 @@ +@@ -4,6 +4,7 @@ $#include $#include $#include $#include "libcairo-helper.h" +$#define tolua_outside /* * This code was mostly copied from cairo.h and cairo-xlib.h with comments * removed. The licence noticed below is present for the sake of clarity. Index: head/sysutils/conky/files/patch-src-conky.c =================================================================== --- head/sysutils/conky/files/patch-src-conky.c (revision 414043) +++ head/sysutils/conky/files/patch-src-conky.c (revision 414044) @@ -1,38 +1,38 @@ ---- src/conky.c.orig 2012-05-04 00:22:21.000000000 +0300 -+++ src/conky.c 2012-12-04 11:09:20.000000000 +0200 +--- src/conky.c.orig 2012-05-03 21:22:21 UTC ++++ src/conky.c @@ -119,7 +119,7 @@ #include "openbsd.h" #endif -#if defined(__FreeBSD_kernel__) +#if defined(__FreeBSD_kernel__) && (__FreeBSD_kernel__ + 0) #include #endif -@@ -4292,7 +4292,8 @@ +@@ -4292,7 +4292,8 @@ static void set_default_configurations(v free_templates(); - free(current_mail_spool); + if (current_mail_spool) + free(current_mail_spool); { char buf[256]; -@@ -5662,6 +5663,7 @@ +@@ -5662,6 +5663,7 @@ void initialisation(int argc, char **arg current_mail_spool = strndup(buf, text_buffer_size); } } + pthread_mutex_init(&kvm_proc_mutex, NULL); #endif /* handle other command line arguments */ -@@ -5971,7 +5973,7 @@ +@@ -5971,7 +5973,7 @@ int main(int argc, char **argv) void alarm_handler(void) { if(childpid > 0) { - kill(childpid, SIGTERM); + kill(childpid, SIGKILL); } } Index: head/sysutils/conky/files/patch-src-freebsd.c =================================================================== --- head/sysutils/conky/files/patch-src-freebsd.c (revision 414043) +++ head/sysutils/conky/files/patch-src-freebsd.c (revision 414044) @@ -1,64 +1,71 @@ ---- src/freebsd.c.orig 2012-05-04 06:08:27.000000000 +0900 -+++ src/freebsd.c 2013-08-05 09:02:37.000000000 +0900 -@@ -38,6 +38,11 @@ - #include - #include - -+#if defined(__FreeBSD__) && (!defined(__FreeBSD_kernel__) || !(__FreeBSD_kernel__ + 0)) -+# undef __FreeBSD_kernel__ -+# define __FreeBSD_kernel__ __FreeBSD__ -+#endif -+ - #include - #include - #include -@@ -283,7 +288,7 @@ +--- src/freebsd.c.orig 2012-05-03 21:08:27 UTC ++++ src/freebsd.c +@@ -283,11 +283,7 @@ int update_running_processes(void) 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 (defined(__FreeBSD__) && (__FreeBSD__ < 5)) || (defined(__FreeBSD_kernel__) && (__FreeBSD_kernel__ < 5)) - if (p[i].kp_proc.p_stat == SRUN) { - #else +- if (p[i].kp_proc.p_stat == SRUN) { +-#else if (p[i].ki_stat == SRUN) { -@@ -300,7 +305,9 @@ - void get_cpu_count(void) - { - int cpu_count = 0; -- size_t cpu_count_len = sizeof(cpu_count); -+ /* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */ -+ if ((cpu_setup == 1) && (info.cpu_usage)) -+ return; - - if (GETSYSCTL("hw.ncpu", cpu_count) == 0) { - info.cpu_count = cpu_count; -@@ -313,6 +320,7 @@ - if (info.cpu_usage == NULL) { - CRIT_ERR(NULL, NULL, "malloc"); +-#endif + cnt++; + } } -+ cpu_setup = 1; - } +@@ -464,7 +460,7 @@ void get_battery_stuff(char *buf, unsign + break; + case BATTERY_STATUS: + if (batstate == 1) // Discharging +- snprintf(buf, n, "remaining %d%%", batcapacity); ++ snprintf(buf, n, "remaining (%d%%)", batcapacity); + else + snprintf(buf, n, batstate == 2 ? "charging (%d%%)" : + (batstate == 7 ? "absent/on AC" : "charged (%d%%)"), +@@ -497,26 +493,10 @@ static int check_bat(const char *bat) - struct cpu_info { -@@ -330,11 +338,7 @@ - unsigned int malloc_cpu_size = 0; - extern void* global_cpu; + int get_battery_perct(const char *bat) + { +- union acpi_battery_ioctl_arg battio; +- int batnum, acpifd; +- int designcap, lastfulcap, batperct; ++ int batcapacity; -- /* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */ -- if ((cpu_setup == 0) || (!info.cpu_usage)) { -- get_cpu_count(); -- cpu_setup = 1; +- if ((battio.unit = batnum = check_bat(bat)) < 0) +- return 0; +- if ((acpifd = open("/dev/acpi", O_RDONLY)) < 0) { +- fprintf(stderr, "Can't open ACPI device\n"); +- return 0; - } -+ get_cpu_count(); +- if (ioctl(acpifd, ACPIIO_BATT_GET_BIF, &battio) == -1) { +- fprintf(stderr, "Unable to get info for battery unit %d\n", batnum); +- return 0; +- } +- close(acpifd); +- designcap = battio.bif.dcap; +- lastfulcap = battio.bif.lfcap; +- batperct = (designcap > 0 && lastfulcap > 0) ? +- (int) (((float) lastfulcap / designcap) * 100) : 0; +- return batperct > 100 ? 100 : batperct; ++ get_battery_stats(NULL, &batcapacity, NULL, NULL); ++ return batcapacity; + } - if (!global_cpu) { - malloc_cpu_size = (info.cpu_count + 1) * sizeof(struct cpu_info); -@@ -702,7 +706,7 @@ - free(dev_select); + int get_battery_perct_bar(const char *bar) +@@ -970,11 +950,14 @@ void get_battery_short_status(char *buff + if (0 == strncmp("charging", buffer, 8)) { + buffer[0] = 'C'; + memmove(buffer + 1, buffer + 8, n - 8); +- } else if (0 == strncmp("discharging", buffer, 11)) { ++ } else if (0 == strncmp("remaining", buffer, 9)) { + buffer[0] = 'D'; +- memmove(buffer + 1, buffer + 11, n - 11); ++ memmove(buffer + 1, buffer + 9, n - 9); ++ } else if (0 == strncmp("charged", buffer, 7)) { ++ buffer[0] = 'F'; ++ memmove(buffer + 1, buffer + 7, n - 7); + } else if (0 == strncmp("absent/on AC", buffer, 12)) { +- buffer[0] = 'A'; ++ buffer[0] = 'N'; + memmove(buffer + 1, buffer + 12, n - 12); } - -- free(statinfo_cur.dinfo); -+ free(statinfo_cur.dinfo->mem_ptr); - return 0; } - Index: head/sysutils/conky/files/patch-src-freebsd.h =================================================================== --- head/sysutils/conky/files/patch-src-freebsd.h (revision 414043) +++ head/sysutils/conky/files/patch-src-freebsd.h (revision 414044) @@ -1,10 +1,10 @@ ---- src/freebsd.h.orig 2012-12-04 04:24:41.000000000 +0200 -+++ src/freebsd.h 2012-12-04 04:24:52.000000000 +0200 +--- src/freebsd.h.orig 2012-05-03 21:08:27 UTC ++++ src/freebsd.h @@ -10,6 +10,7 @@ #include #include #include +#include #if (defined(i386) || defined(__i386__)) #include #endif /* i386 || __i386__ */ Index: head/sysutils/conky/files/patch-src-fs.c =================================================================== --- head/sysutils/conky/files/patch-src-fs.c (revision 414043) +++ head/sysutils/conky/files/patch-src-fs.c (revision 414044) @@ -1,18 +1,18 @@ ---- src/fs.c.orig 2012-05-04 00:08:27.000000000 +0300 -+++ src/fs.c 2012-07-18 20:24:10.000000000 +0300 -@@ -118,9 +118,15 @@ +--- src/fs.c.orig 2012-05-03 21:08:27 UTC ++++ src/fs.c +@@ -118,9 +118,15 @@ struct fs_stat *prepare_fs_stat(const ch static void update_fs_stat(struct fs_stat *fs) { +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + struct statfs s; + + if (statfs(fs->path, &s) == 0) { +#else struct statfs64 s; if (statfs64(fs->path, &s) == 0) { +#endif 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;