Attachment #174696 for bug #212629

View | Details | Raw Unified | Return to bug 212629
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	conky
PORTVERSION=	1.10.4
DISTVERSIONPREFIX=	v
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

LIB_DEPENDS=	libtolua++-5.1.so:lang/tolua++
BUILD_DEPENDS=	db2x_xsltproc:textproc/docbook2X \
		docbook-xsl>=0:textproc/docbook-xsl \
		xsltproc:textproc/libxslt
			--disable-alsa \
			--disable-bmpx \
			--disable-iostats

USES=           cpe cmake compiler:c++11-lib gettext-runtime iconv \
		localbase lua:51 pkgconfig tar:bzip2
CMAKE_ARGS+=	-DBUILD_PORT_MONITORS:BOOL=false \
		-DBUILD_IBM:BOOL=false \
		-DBUILD_HDDTEMP:BOOL=false \
		-DBUILD_IOSTATS:BOOL=false \
		-DBUILD_AUDACIOUS:BOOL=false

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 lua.html

USE_GITHUB=	yes
GH_ACCOUNT=	brndnmtthws

OPTIONS_DEFINE=	APCUPSD CURL IPV6 METAR MOC MPD NCURSES RSS \
		X11 XMMS2 XOAP

OPTIONS_GROUP?=	X11
OPTIONS_GROUP_X11=	ARGB DOUBLE_BUFFER IMLIB2 XFT XINERAMA LUA_CAIRO LUA_IMLIB2 LUA_RSVG
OPTIONS_DEFAULT?=	X11 ARGB DOUBLE_BUFFER XFT

APCUPSD_DESC=		Monitor APCUPSD
APCUPSD_CMAKE_BOOL=	BUILD_APCUPSD

ARGB_DESC=		Use an ARGB visual to draw on X11
ARGB_CMAKE_BOOL=	BUILD_ARGB
ARGB_IMPLIES=		X11

#AUDACIOUS_DESC=	Control Audacious sound player
#AUDACIOUS_CMAKE_BOOL=	BUILD_AUDACIOUS
#AUDACIOUS_LIB_DEPENDS=	libaudclient.so:multimedia/audacious
# Broken since r358707, update to audacious 3.5 which removed libaudclient.so.

DOUBLE_BUFFER_DESC=	X11 double buffering
DOUBLE_BUFFER_CMAKE_BOOL=BUILD_XDBE
DOUBLE_BUFFER_IMPLIES=	X11

IMLIB2_CMAKE_BOOL=	BUILD_IMLIB2
IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
IMLIB2_IMPLIES=		X11

INOTIFY_DESC=		Monitor file changes via Inotify
INOTIFY_CONFIGURE_ENABLE=inotify
INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify

LUA_USES=		lua:51
LUA_CONFIGURE_ENABLE=	lua
LUA_LIB_DEPENDS=	libtolua++-5.1.so:lang/tolua++

LUA_CAIRO_DESC=		Lua-Cairo binding
LUA_CAIRO_CMAKE_BOOL=	BUILD_LUA_CAIRO
LUA_CAIRO_USE=		gnome=cairo
LUA_CAIRO_IMPLIES=	X11

LUA_IMLIB2_DESC=	Lua-Imlib2 binding
LUA_IMLIB2_CMAKE_BOOL=	BUILD_LUA_IMLIB2
LUA_IMLIB2_IMPLIES=	IMLIB2 X11

LUA_RSVG_DESC=		Lua-rsvg binding
LUA_RSVG_CMAKE_BOOL=	BUILD_LUA_RSVG
LUA_RSVG_USE=		gnome=librsvg2
LUA_RSVG_IMPLIES=	X11

CURL_CMAKE_BOOL=	BUILD_CURL
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl

IPV6_CMAKE_BOOL=	BUILD_IPV6

METAR_DESC=		Display METAR weather reports
METAR_CMAKE_BOOL=	BUILD_WEATHER_METAR
METAR_IMPLIES=		CURL

MOC_DESC=		Control MOC (Music On Console)
MOC_CMAKE_BOOL=		BUILD_MOC

MPD_DESC=		Control MPD (Music Player Daemon)
MPD_CMAKE_BOOL=		BUILD_MPD

NCURSES_DESC=		Use ncurses to draw on terminals
NCURSES_CMAKE_BOOL=	BUILD_NCURSES
NCURSES_USES=		ncurses:port

RSS_DESC=		Display RSS feeds
RSS_CMAKE_BOOL=		BUILD_RSS
RSS_USE=		gnome=glib20,libxml2
RSS_IMPLIES=		CURL

X11_USE=		xorg=x11,xext,xdamage,xfixes
X11_CMAKE_BOOL=		BUILD_X11 OWN_WINDOW
X11_VARS=		EXAMPLE_CONF_FILE=${WRKSRC}/data/conky.conf
X11_VARS_OFF=		EXAMPLE_CONF_FILE=${WRKSRC}/data/conky_no_x11.conf

XFT_CMAKE_BOOL=		BUILD_XFT
XFT_USE=		xorg=xft
XFT_IMPLIES=		X11

XINERAMA_CMAKE_BOOL=	BUILD_XINERAMA
XINERAMA_USE=		xorg=xinerama
XINERAMA_IMPLIES=	X11

XMMS2_DESC=		Control XMMS2 media player
XMMS2_CMAKE_BOOL=	BUILD_XMMS2
XMMS2_LIB_DEPENDS=	libxmmsclient.so:audio/xmms2

XOAP_DESC=		Display XOAP weather reports
XOAP_CMAKE_BOOL=	BUILD_WEATHER_XOAP
XOAP_IMPLIES=		CURL
XOAP_USE=		gnome=libxml2

post-patch:
	@${REINPLACE_CMD} -e 's/^#\(set(RELEASE true\)/\1/' \
		-e 's/-D_POSIX_C_SOURCE=200809L/& -D__BSD_VISIBLE=1 -D_XOPEN_SOURCE=700/' \
		${WRKSRC}/cmake/Conky.cmake
	@${REINPLACE_CMD} -e 's,^set(INCLUDE_SEARCH_PATH \(.*\)),set(INCLUDE_SEARCH_PATH \1 ${LUA_INCDIR}),' \
		-e 's/ -lbsd/ -lintl/' \
		${WRKSRC}/cmake/ConkyPlatformChecks.cmake
	@${REINPLACE_CMD} -e 's,LOCALBASE,${LOCALBASE},' \
		${WRKSRC}/doc/docgen.sh \
		${WRKSRC}/doc/docs.xml

post-build:
	(cd ${WRKSRC}/doc && ${SH} docgen.sh)

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${STAGEDIR}${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/doc/conky.1 ${STAGEDIR}${MANPREFIX}/man/man1

.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 lua.html
	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
.endfor


Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (conky-1.9.0.tar.bz2) = baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f	1	TIMESTAMP = 1470249422
2	SIZE (conky-1.9.0.tar.bz2) = 626555	2	SHA256 (brndnmtthws-conky-v1.10.4_GH0.tar.gz) = ed61ffb3be9fd24965d40401c7d54553e732038f3da2e03454915779384f59b4
		3	SIZE (brndnmtthws-conky-v1.10.4_GH0.tar.gz) = 365145




--- 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 @@ 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 @@ 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
@@ -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
+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.  */
+
+#include <sys/inotify.h>
 
+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
 
-done
+fi
 
 
 




--- doc/docgen.sh.orig	2016-07-20 16:53:48 UTC
+++ doc/docgen.sh
@@ -1,8 +1,11 @@
 #!/bin/sh
 
-xsltproc http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl docs.xml > docs.html && \
+xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl docs.xml > docs.html && \
+xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl variables.xml > variables.html && \
+xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl config_settings.xml > config_settings.html && \
+xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl lua.xml > lua.html && \
 db2x_xsltproc -s man docs.xml -o docs.mxml && \
-db2x_manxml docs.mxml && \
+db2x_manxml docs.mxml
 { echo ".TH CONKY 1 \"August 2005\" \"conky compiled August 2005\" \"User Commands\""; sed 1d < conky.1; } > conky.2 && \
 mv conky.2 conky.1 && \
 man ./conky.1 | col -b > README && \

Line 0 Link Here

(-)files/patch-doc_docs.xml (+10 lines)
	1	--- doc/docs.xml.orig 2016-07-20 16:53:48 UTC
	2	+++ doc/docs.xml
	3	@@ -1,6 +1,6 @@
	4	<?xml version="1.0" encoding="utf-8"?>
	5	<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
	6	-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
	7	+"LOCALBASE/share/xml/docbook/4.4/docbookx.dtd"
	8	[
	9	<!ENTITY command_options SYSTEM "command_options.xml">
	10	<!ENTITY config_settings SYSTEM "config_settings.xml">

Lines 1-10 Link Here

(-)files/patch-lua-cairo.pkg (-10 lines)
1	--- lua/cairo.pkg.orig 2012-05-03 21:08:27 UTC
2	+++ lua/cairo.pkg
3	@@ -4,6 +4,7 @@ $#include <cairo.h>
4	$#include <cairo-xlib.h>
5	$#include <X11/Xlib.h>
6	$#include "libcairo-helper.h"
7	+$#define tolua_outside
8	/*
9	* This code was mostly copied from cairo.h and cairo-xlib.h with comments
10	* removed. The licence noticed below is present for the sake of clarity.




--- 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 <bsd/bsd.h>
 #endif
 
@@ -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 @@ 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 @@ int main(int argc, char **argv)
 
 void alarm_handler(void) {
 	if(childpid > 0) {
-		kill(childpid, SIGTERM);
+		kill(childpid, SIGKILL);
 	}
 }
 




--- 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 (p[i].kp_proc.p_stat == SRUN) {
-#else
 		if (p[i].ki_stat == SRUN) {
-#endif
 			cnt++;
 		}
 	}
@@ -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)
 
 int get_battery_perct(const char *bat)
 {
-	union acpi_battery_ioctl_arg battio;
-	int batnum, acpifd;
-	int designcap, lastfulcap, batperct;
+	int batcapacity;
 
-	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;
-	}
-	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;
 }
 
 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);
 	}
 }

Lines 1-10 Link Here

(-)files/patch-src-freebsd.h (-10 lines)
1	--- src/freebsd.h.orig 2012-05-03 21:08:27 UTC
2	+++ src/freebsd.h
3	@@ -10,6 +10,7 @@
4	#include <fcntl.h>
5	#include <kvm.h>
6	#include <pthread.h>
7	+#include <stdbool.h>
8	#if (defined(i386) \|\| defined(__i386__))
9	#include <machine/apm_bios.h>
10	#endif /* i386 \|\| __i386__ */




--- 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;

Line 0 Link Here

(-)files/patch-src_c++wrap.cc (+10 lines)
	1	--- src/c++wrap.cc.orig 2016-07-20 16:53:48 UTC
	2	+++ src/c++wrap.cc
	3	@@ -26,6 +26,7 @@
	4	#include "c++wrap.hh"
	5
	6	#include <unistd.h>
	7	+#include <stdio.h>
	8
	9	/* force use of POSIX strerror_r instead of non-portable GNU specific */
	10	#ifdef _GNU_SOURCE




--- src/conky.cc.orig	2016-07-20 16:53:48 UTC
+++ src/conky.cc
@@ -129,7 +129,7 @@
 #include <microhttpd.h>
 #endif
 
-#if defined(__FreeBSD_kernel__)

 #include <bsd/bsd.h>
 #endif
 
@@ -728,13 +728,6 @@ int percent_print(char *buf, int size, u
 	return spaced_print(buf, size, "%u", pad_percents.get(*state), value);
 	free_templates();
 
-	free(current_mail_spool);
+	if (current_mail_spool)
+		free(current_mail_spool);
 	{
 		char buf[256];
 
@@ -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 @@ int main(int argc, char **argv)
 
 void alarm_handler(void) {
 	if(childpid > 0) {
-		kill(childpid, SIGTERM);
+		kill(childpid, SIGKILL);
 	}
 }
 
-#if defined(__FreeBSD__)
-unsigned long long llabs(long long num) {
-       if(num < 0) return -num;
-       else return num;
-}
-#endif
-
 /* converts from bytes to human readable format (K, M, G, T)
  *
  * The algorithm always divides by 1024, as unit-conversion of byte

Lines 1-10 Link Here

(-)files/patch-src_freebsd.h (-6 / +6 lines)
1	--- src/freebsd.h.orig 2012-05-03 21:08:27 UTC	1	--- src/freebsd.h.orig 2016-07-20 16:53:48 UTC
2	+++ src/freebsd.h	2	+++ src/freebsd.h
3	@@ -10,6 +10,7 @@	3	@@ -7,6 +7,7 @@
		4	#include <sys/param.h>
		5	#include <sys/mount.h>
		6	#include <sys/ucred.h>
		7	+#include <strings.h>
4	#include <fcntl.h>	8	#include <fcntl.h>
5	#include <kvm.h>	9	#include <kvm.h>
6	#include <pthread.h>
7	+#include <stdbool.h>
8	#if (defined(i386) \|\| defined(__i386__))	10	#if (defined(i386) \|\| defined(__i386__))
9	#include <machine/apm_bios.h>
10	#endif /* i386 \|\| __i386__ */




--- src/luamm.cc.orig	2016-07-20 16:53:48 UTC
+++ src/luamm.cc
@@ -57,7 +57,8 @@ namespace lua {
 				lua_pushstring(l, e.what());
 			}
 			catch(...) {
-				lua_pushstring(l, ptr->__cxa_exception_type()->name());
+//				lua_pushstring(l, ptr->__cxa_exception_type()->name());
+				lua_pushstring(l, "Unknown exception");
 			}
 			return 1;
 		}
@@ -344,7 +345,7 @@ namespace lua {
 		pushinteger(what);
 		pushinteger(data);
 		call(2, 1, 0);
-		assert(isnumber(-1));
+		assert(isanumber(-1));
 		int r = tointeger(-1);
 		pop();
 		return r;
@@ -427,7 +428,7 @@ namespace lua {
 
 		call(2, MULTRET, 0);
 
-		assert(isnumber(-1));
+		assert(isanumber(-1));
 		int r = tointeger(-1);
 		pop();
 		return r;
@@ -466,7 +467,7 @@ namespace lua {
 		pushvalue(index1);
 		pushvalue(index2);
 		call(2, 1, 0);
-		assert(isnumber(-1));
+		assert(isanumber(-1));
 		int r = tointeger(-1);
 		pop();
 		return r;




--- src/luamm.hh.orig	2016-07-20 16:53:48 UTC
+++ src/luamm.hh
@@ -25,7 +25,9 @@
 #include <assert.h>
 #include <memory>
 #include <mutex>
+#include <exception>
 #include <stdexcept>
+#include <string>
 
 #include <lua.hpp>
 
@@ -210,7 +212,7 @@ namespace lua {
 		bool islightuserdata(int index) throw() { return lua_islightuserdata(cobj.get(), index); }
 		bool isnil(int index) throw() { return lua_isnil(cobj.get(), index); }
 		bool isnone(int index) throw() { return lua_isnone(cobj.get(), index); }
-		bool isnumber(int index) throw() { return lua_isnumber(cobj.get(), index); }
+		bool isanumber(int index) throw() { return lua_isnumber(cobj.get(), index); }
 		bool isstring(int index) throw() { return lua_isstring(cobj.get(), index); }
 		void pop(int n = 1) throw() { lua_pop(cobj.get(), n); }
 		void pushboolean(bool b) throw() { lua_pushboolean(cobj.get(), b); }

Return to bug 212629

Lines 2-11 Link Here

(-)Makefile (-49 / +72 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= conky	4	PORTNAME= conky
5	PORTVERSION= 1.9.0	5	PORTVERSION= 1.10.4
6	PORTREVISION= 6	6	DISTVERSIONPREFIX= v
7	CATEGORIES= sysutils	7	CATEGORIES= sysutils
8	MASTER_SITES= SF
9		8
10	MAINTAINER= ntarmos@ceid.upatras.gr	9	MAINTAINER= ntarmos@ceid.upatras.gr
11	COMMENT?= Advanced, highly configurable system monitor for X11	10	COMMENT?= Advanced, highly configurable system monitor for X11
Lines 13-116 Link Here
13	CONFLICTS?= conky-awesome-[0-9]*	12	CONFLICTS?= conky-awesome-[0-9]*
14	SLAVEDIRS= sysutils/conky-awesome	13	SLAVEDIRS= sysutils/conky-awesome
15		14
16	USES= cpe gmake iconv localbase pkgconfig tar:bzip2	15	LIB_DEPENDS= libtolua++-5.1.so:lang/tolua++
17	GNU_CONFIGURE= yes	16	BUILD_DEPENDS= db2x_xsltproc:textproc/docbook2X \
18	CONFIGURE_ARGS+= --disable-portmon \	17	docbook-xsl>=0:textproc/docbook-xsl \
19	--disable-hddtemp \	18	xsltproc:textproc/libxslt
20	--disable-alsa \
21	--disable-bmpx \
22	--disable-iostats
23		19
		20	USES= cpe cmake compiler:c++11-lib gettext-runtime iconv \
		21	localbase lua:51 pkgconfig tar:bzip2
		22	CMAKE_ARGS+= -DBUILD_PORT_MONITORS:BOOL=false \
		23	-DBUILD_IBM:BOOL=false \
		24	-DBUILD_HDDTEMP:BOOL=false \
		25	-DBUILD_IOSTATS:BOOL=false \
		26	-DBUILD_AUDACIOUS:BOOL=false
		27
24	PLIST_FILES= bin/conky man/man1/conky.1.gz	28	PLIST_FILES= bin/conky man/man1/conky.1.gz
25	PORTEXAMPLES= conkyrc.sample	29	PORTEXAMPLES= conkyrc.sample
26	PORTDOCS= README AUTHORS ChangeLog TODO NEWS \	30	PORTDOCS= README AUTHORS ChangeLog TODO NEWS \
27	docs.html variables.html config_settings.html	31	docs.html variables.html config_settings.html lua.html
28		32
29	OPTIONS_DEFINE= APCUPSD AUDACIOUS INOTIFY LUA METAR MOC MPD NCURSES RSS \	33	USE_GITHUB= yes
		34	GH_ACCOUNT= brndnmtthws
		35
		36	OPTIONS_DEFINE= APCUPSD CURL IPV6 METAR MOC MPD NCURSES RSS \
30	X11 XMMS2 XOAP	37	X11 XMMS2 XOAP
31		38
32	OPTIONS_GROUP?= X11	39	OPTIONS_GROUP?= X11
33	OPTIONS_GROUP_X11= ARGB DOUBLE_BUFFER IMLIB2 XFT LUA_CAIRO LUA_IMLIB2	40	OPTIONS_GROUP_X11= ARGB DOUBLE_BUFFER IMLIB2 XFT XINERAMA LUA_CAIRO LUA_IMLIB2 LUA_RSVG
34	OPTIONS_DEFAULT?= X11 ARGB DOUBLE_BUFFER XFT	41	OPTIONS_DEFAULT?= X11 ARGB DOUBLE_BUFFER XFT
35		42
36	APCUPSD_DESC= Monitor APCUPSD	43	APCUPSD_DESC= Monitor APCUPSD
37	APCUPSD_CONFIGURE_ENABLE=apcupsd	44	APCUPSD_CMAKE_BOOL= BUILD_APCUPSD
38		45
39	ARGB_DESC= Use an ARGB visual to draw on X11	46	ARGB_DESC= Use an ARGB visual to draw on X11
40	ARGB_CONFIGURE_ENABLE= argb	47	ARGB_CMAKE_BOOL= BUILD_ARGB
41	ARGB_IMPLIES= X11	48	ARGB_IMPLIES= X11
42		49
43	AUDACIOUS_DESC= Control Audacious sound player	50	#AUDACIOUS_DESC= Control Audacious sound player
44	AUDACIOUS_CONFIGURE_ENABLE=audacious	51	#AUDACIOUS_CMAKE_BOOL= BUILD_AUDACIOUS
45	AUDACIOUS_LIB_DEPENDS= libaudclient.so:multimedia/audacious	52	#AUDACIOUS_LIB_DEPENDS= libaudclient.so:multimedia/audacious
		53	# Broken since r358707, update to audacious 3.5 which removed libaudclient.so.
46		54
47	DOUBLE_BUFFER_DESC= X11 double buffering	55	DOUBLE_BUFFER_DESC= X11 double buffering
48	DOUBLE_BUFFER_CONFIGURE_ENABLE=double-buffer	56	DOUBLE_BUFFER_CMAKE_BOOL=BUILD_XDBE
49	DOUBLE_BUFFER_IMPLIES= X11	57	DOUBLE_BUFFER_IMPLIES= X11
50		58
51	IMLIB2_CONFIGURE_ENABLE=imlib2	59	IMLIB2_CMAKE_BOOL= BUILD_IMLIB2
52	IMLIB2_LIB_DEPENDS= libImlib2.so:graphics/imlib2	60	IMLIB2_LIB_DEPENDS= libImlib2.so:graphics/imlib2
53	IMLIB2_IMPLIES= X11	61	IMLIB2_IMPLIES= X11
54		62
55	INOTIFY_DESC= Monitor file changes via Inotify
56	INOTIFY_CONFIGURE_ENABLE=inotify
57	INOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify
58
59	LUA_USES= lua:51
60	LUA_CONFIGURE_ENABLE= lua
61	LUA_LIB_DEPENDS= libtolua++-5.1.so:lang/tolua++
62
63	LUA_CAIRO_DESC= Lua-Cairo binding	63	LUA_CAIRO_DESC= Lua-Cairo binding
64	LUA_CAIRO_CONFIGURE_ENABLE=lua-cairo	64	LUA_CAIRO_CMAKE_BOOL= BUILD_LUA_CAIRO
65	LUA_CAIRO_USE= gnome=cairo	65	LUA_CAIRO_USE= gnome=cairo
66	LUA_CAIRO_IMPLIES= LUA X11	66	LUA_CAIRO_IMPLIES= X11
67		67
68	LUA_IMLIB2_DESC= Lua-Imlib2 binding	68	LUA_IMLIB2_DESC= Lua-Imlib2 binding
69	LUA_IMLIB2_CONFIGURE_ENABLE=lua-imlib2	69	LUA_IMLIB2_CMAKE_BOOL= BUILD_LUA_IMLIB2
70	LUA_IMLIB2_IMPLIES= IMLIB2 LUA X11	70	LUA_IMLIB2_IMPLIES= IMLIB2 X11
71		71
		72	LUA_RSVG_DESC= Lua-rsvg binding
		73	LUA_RSVG_CMAKE_BOOL= BUILD_LUA_RSVG
		74	LUA_RSVG_USE= gnome=librsvg2
		75	LUA_RSVG_IMPLIES= X11
		76
		77	CURL_CMAKE_BOOL= BUILD_CURL
		78	CURL_LIB_DEPENDS= libcurl.so:ftp/curl
		79
		80	IPV6_CMAKE_BOOL= BUILD_IPV6
		81
72	METAR_DESC= Display METAR weather reports	82	METAR_DESC= Display METAR weather reports
73	METAR_CONFIGURE_ENABLE= weather-metar	83	METAR_CMAKE_BOOL= BUILD_WEATHER_METAR
74	METAR_LIB_DEPENDS= libcurl.so:ftp/curl	84	METAR_IMPLIES= CURL
75		85
76	MOC_DESC= Control MOC (Music On Console)	86	MOC_DESC= Control MOC (Music On Console)
77	MOC_CONFIGURE_ENABLE= moc	87	MOC_CMAKE_BOOL= BUILD_MOC
78		88
79	MPD_DESC= Control MPD (Music Player Daemon)	89	MPD_DESC= Control MPD (Music Player Daemon)
80	MPD_CONFIGURE_ENABLE= mpd	90	MPD_CMAKE_BOOL= BUILD_MPD
81		91
82	NCURSES_DESC= Use ncurses to draw on terminals	92	NCURSES_DESC= Use ncurses to draw on terminals
83	NCURSES_CONFIGURE_ENABLE=ncurses	93	NCURSES_CMAKE_BOOL= BUILD_NCURSES
		94	NCURSES_USES= ncurses:port
84		95
85	RSS_DESC= Display RSS feeds	96	RSS_DESC= Display RSS feeds
86	RSS_CONFIGURE_ENABLE= rss	97	RSS_CMAKE_BOOL= BUILD_RSS
87	RSS_USE= gnome=glib20,libxml2	98	RSS_USE= gnome=glib20,libxml2
88	RSS_LIB_DEPENDS= libcurl.so:ftp/curl	99	RSS_IMPLIES= CURL
89		100
90	X11_USE= xorg=x11,xext,xdamage,xfixes	101	X11_USE= xorg=x11,xext,xdamage,xfixes
91	X11_CONFIGURE_ENABLE= x11 own-window	102	X11_CMAKE_BOOL= BUILD_X11 OWN_WINDOW
92	X11_VARS= EXAMPLE_CONF_FILE=${WRKSRC}/data/conky.conf	103	X11_VARS= EXAMPLE_CONF_FILE=${WRKSRC}/data/conky.conf
93	X11_VARS_OFF= EXAMPLE_CONF_FILE=${WRKSRC}/data/conky_no_x11.conf	104	X11_VARS_OFF= EXAMPLE_CONF_FILE=${WRKSRC}/data/conky_no_x11.conf
94		105
95	XFT_CONFIGURE_ENABLE= xft	106	XFT_CMAKE_BOOL= BUILD_XFT
96	XFT_USE= xorg=xft	107	XFT_USE= xorg=xft
97	XFT_IMPLIES= X11	108	XFT_IMPLIES= X11
98		109
		110	XINERAMA_CMAKE_BOOL= BUILD_XINERAMA
		111	XINERAMA_USE= xorg=xinerama
		112	XINERAMA_IMPLIES= X11
		113
99	XMMS2_DESC= Control XMMS2 media player	114	XMMS2_DESC= Control XMMS2 media player
100	XMMS2_CONFIGURE_ENABLE= xmms2	115	XMMS2_CMAKE_BOOL= BUILD_XMMS2
101	XMMS2_LIB_DEPENDS= libxmmsclient.so:audio/xmms2	116	XMMS2_LIB_DEPENDS= libxmmsclient.so:audio/xmms2
102		117
103	XOAP_DESC= Display XOAP weather reports	118	XOAP_DESC= Display XOAP weather reports
104	XOAP_CONFIGURE_ENABLE= weather-xoap	119	XOAP_CMAKE_BOOL= BUILD_WEATHER_XOAP
105	XOAP_LIB_DEPENDS= libcurl.so:ftp/curl	120	XOAP_IMPLIES= CURL
106	XOAP_USE= gnome=libxml2	121	XOAP_USE= gnome=libxml2
107		122
108	post-patch:	123	post-patch:
109	@${REINPLACE_CMD} -e 's,lua5\.1,lua-5.1,g' \	124	@${REINPLACE_CMD} -e 's/^#\(set(RELEASE true\)/\1/' \
110	${WRKSRC}/configure	125	-e 's/-D_POSIX_C_SOURCE=200809L/& -D__BSD_VISIBLE=1 -D_XOPEN_SOURCE=700/' \
111	@${REINPLACE_CMD} -e 's,imlib_context_disconnect_display();,,g' \	126	${WRKSRC}/cmake/Conky.cmake
112	${WRKSRC}/src/imlib2.c	127	@${REINPLACE_CMD} -e 's,^set(INCLUDE_SEARCH_PATH \(.*\)),set(INCLUDE_SEARCH_PATH \1 ${LUA_INCDIR}),' \
		128	-e 's/ -lbsd/ -lintl/' \
		129	${WRKSRC}/cmake/ConkyPlatformChecks.cmake
		130	@${REINPLACE_CMD} -e 's,LOCALBASE,${LOCALBASE},' \
		131	${WRKSRC}/doc/docgen.sh \
		132	${WRKSRC}/doc/docs.xml
113		133
		134	post-build:
		135	(cd ${WRKSRC}/doc && ${SH} docgen.sh)
		136
114	do-install:	137	do-install:
115	${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${STAGEDIR}${PREFIX}/bin	138	${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${STAGEDIR}${PREFIX}/bin
116	${INSTALL_MAN} ${WRKSRC}/doc/conky.1 ${STAGEDIR}${MANPREFIX}/man/man1	139	${INSTALL_MAN} ${WRKSRC}/doc/conky.1 ${STAGEDIR}${MANPREFIX}/man/man1
Lines 120-126 Link Here
120	.for i in README AUTHORS ChangeLog TODO NEWS	143	.for i in README AUTHORS ChangeLog TODO NEWS
121	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}	144	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
122	.endfor	145	.endfor
123	.for i in docs.html variables.html config_settings.html	146	.for i in docs.html variables.html config_settings.html lua.html
124	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}	147	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
125	.endfor	148	.endfor
126		149

Lines 1-303 Link Here

(-)files/patch-configure (-303 lines)
1	--- configure.orig 2012-05-03 21:47:40 UTC
2	+++ configure
3	@@ -895,6 +895,7 @@ enable_xdamage
4	enable_xft
5	enable_nvidia
6	enable_alsa
7	+enable_inotify
8	enable_debug
9	enable_testing
10	enable_profiling
11	@@ -1620,6 +1621,7 @@ Optional Features:
12	--enable-nvidia enable if you want nvidia support [default=no]
13	--disable-alsa disable if you do not want ALSA support
14	[default=yes]
15	+ --enable-inotify enable if you want inotify support [default=no]
16	--enable-debug compile with debug symbols [default=no]
17	--enable-testing use strict compiler flags for testing [default=no]
18	--enable-profiling specify compiler flags for use with gprof and gcov
19	@@ -11930,7 +11932,11 @@ case $uname in
20	Linux*)
21	WANT_SYSINFO=yes
22	;;
23	- FreeBSD\|GNU/kFreeBSD)
24	+ FreeBSD*)
25	+ WANT_KVM=yes
26	+ WANT_DEVSTAT=yes
27	+ ;;
28	+ GNU/kFreeBSD*)
29	WANT_KVM=yes
30	WANT_DEVSTAT=yes
31	WANT_OPTRESET=yes
32	@@ -14046,12 +14052,12 @@ if test -n "$PKG_CONFIG"; then
33	pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS"
34	else
35	if test -n "$PKG_CONFIG" && \
36	- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
37	- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
38	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
39	+ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
40	ac_status=$?
41	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
42	test $ac_status = 0; }; then
43	- pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
44	+ pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null`
45	else
46	pkg_failed=yes
47	fi
48	@@ -14064,12 +14070,12 @@ if test -n "$PKG_CONFIG"; then
49	pkg_cv_LUA51_LIBS="$LUA51_LIBS"
50	else
51	if test -n "$PKG_CONFIG" && \
52	- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
53	- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
54	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
55	+ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
56	ac_status=$?
57	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
58	test $ac_status = 0; }; then
59	- pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
60	+ pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null`
61	else
62	pkg_failed=yes
63	fi
64	@@ -14088,14 +14094,14 @@ else
65	_pkg_short_errors_supported=no
66	fi
67	if test $_pkg_short_errors_supported = yes; then
68	- LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
69	+ LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
70	else
71	- LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
72	+ LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
73	fi
74	# Put the nasty error message in config.log where it belongs
75	echo "$LUA51_PKG_ERRORS" >&5
76
77	- as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met:
78	+ as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met:
79
80	$LUA51_PKG_ERRORS
81
82	@@ -14139,12 +14145,12 @@ if test -n "$PKG_CONFIG"; then
83	pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS"
84	else
85	if test -n "$PKG_CONFIG" && \
86	- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
87	- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
88	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
89	+ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
90	ac_status=$?
91	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
92	test $ac_status = 0; }; then
93	- pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
94	+ pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null`
95	else
96	pkg_failed=yes
97	fi
98	@@ -14157,12 +14163,12 @@ if test -n "$PKG_CONFIG"; then
99	pkg_cv_LUA51_LIBS="$LUA51_LIBS"
100	else
101	if test -n "$PKG_CONFIG" && \
102	- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
103	- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
104	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
105	+ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
106	ac_status=$?
107	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
108	test $ac_status = 0; }; then
109	- pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
110	+ pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null`
111	else
112	pkg_failed=yes
113	fi
114	@@ -14181,14 +14187,14 @@ else
115	_pkg_short_errors_supported=no
116	fi
117	if test $_pkg_short_errors_supported = yes; then
118	- LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
119	+ LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
120	else
121	- LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
122	+ LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
123	fi
124	# Put the nasty error message in config.log where it belongs
125	echo "$LUA51_PKG_ERRORS" >&5
126
127	- as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met:
128	+ as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met:
129
130	$LUA51_PKG_ERRORS
131
132	@@ -14302,12 +14308,12 @@ if test -n "$PKG_CONFIG"; then
133	pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS"
134	else
135	if test -n "$PKG_CONFIG" && \
136	- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
137	- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
138	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
139	+ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
140	ac_status=$?
141	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
142	test $ac_status = 0; }; then
143	- pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
144	+ pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null`
145	else
146	pkg_failed=yes
147	fi
148	@@ -14320,12 +14326,12 @@ if test -n "$PKG_CONFIG"; then
149	pkg_cv_LUA51_LIBS="$LUA51_LIBS"
150	else
151	if test -n "$PKG_CONFIG" && \
152	- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
153	- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
154	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
155	+ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
156	ac_status=$?
157	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
158	test $ac_status = 0; }; then
159	- pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
160	+ pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null`
161	else
162	pkg_failed=yes
163	fi
164	@@ -14344,14 +14350,14 @@ else
165	_pkg_short_errors_supported=no
166	fi
167	if test $_pkg_short_errors_supported = yes; then
168	- LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
169	+ LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
170	else
171	- LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
172	+ LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
173	fi
174	# Put the nasty error message in config.log where it belongs
175	echo "$LUA51_PKG_ERRORS" >&5
176
177	- as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met:
178	+ as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met:
179
180	$LUA51_PKG_ERRORS
181
182	@@ -14395,12 +14401,12 @@ if test -n "$PKG_CONFIG"; then
183	pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS"
184	else
185	if test -n "$PKG_CONFIG" && \
186	- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
187	- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
188	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
189	+ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
190	ac_status=$?
191	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
192	test $ac_status = 0; }; then
193	- pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
194	+ pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null`
195	else
196	pkg_failed=yes
197	fi
198	@@ -14413,12 +14419,12 @@ if test -n "$PKG_CONFIG"; then
199	pkg_cv_LUA51_LIBS="$LUA51_LIBS"
200	else
201	if test -n "$PKG_CONFIG" && \
202	- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
203	- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
204	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
205	+ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
206	ac_status=$?
207	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
208	test $ac_status = 0; }; then
209	- pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
210	+ pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null`
211	else
212	pkg_failed=yes
213	fi
214	@@ -14437,14 +14443,14 @@ else
215	_pkg_short_errors_supported=no
216	fi
217	if test $_pkg_short_errors_supported = yes; then
218	- LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
219	+ LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
220	else
221	- LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
222	+ LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
223	fi
224	# Put the nasty error message in config.log where it belongs
225	echo "$LUA51_PKG_ERRORS" >&5
226
227	- as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met:
228	+ as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met:
229
230	$LUA51_PKG_ERRORS
231
232	@@ -16998,18 +17004,63 @@ fi
233
234	done
235
236	-# check if we have inotify support
237	-for ac_header in sys/inotify.h
238	-do :
239	- ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
240	+
241	+# Check whether --enable-inotify was given.
242	+if test "${enable_inotify+set}" = set; then :
243	+ enableval=$enable_inotify; want_inotify="$enableval"
244	+else
245	+ want_inotify=no
246	+fi
247	+
248	+if test x$want_inotify = xyes; then
249	+ ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
250	if test "x$ac_cv_header_sys_inotify_h" = xyes; then :
251	- cat >>confdefs.h <<_ACEOF
252	-#define HAVE_SYS_INOTIFY_H 1
253	-_ACEOF
254	+
255	+else
256	+ want_inotify=no
257	+fi
258	+
259	+fi
260	+if test x$want_inotify = xyes; then
261	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify_init in -linotify" >&5
262	+$as_echo_n "checking for inotify_init in -linotify... " >&6; }
263	+if ${ac_cv_lib_inotify_inotify_init+:} false; then :
264	+ $as_echo_n "(cached) " >&6
265	+else
266	+ ac_check_lib_save_LIBS=$LIBS
267	+LIBS="-linotify $LIBS"
268	+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
269	+/* end confdefs.h. */
270	+
271	+#include <sys/inotify.h>
272
273	+char inotify_init ();
274	+int
275	+main ()
276	+{
277	+return inotify_init ();
278	+ ;
279	+ return 0;
280	+}
281	+_ACEOF
282	+if ac_fn_c_try_link "$LINENO"; then :
283	+ ac_cv_lib_inotify_inotify_init=yes
284	+else
285	+ ac_cv_lib_inotify_inotify_init=no
286	+fi
287	+rm -f core conftest.err conftest.$ac_objext \
288	+ conftest$ac_exeext conftest.$ac_ext
289	+LIBS=$ac_check_lib_save_LIBS
290	+fi
291	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inotify_inotify_init" >&5
292	+$as_echo "$ac_cv_lib_inotify_inotify_init" >&6; }
293	+if test "x$ac_cv_lib_inotify_inotify_init" = xyes; then :
294	+ conky_LIBS="$conky_LIBS -linotify"
295	+else
296	+ want_inotify=yes
297	fi
298
299	-done
300	+fi
301
302
303

Line 0 Link Here

(-)files/patch-doc_docgen.sh (+16 lines)
	1	--- doc/docgen.sh.orig 2016-07-20 16:53:48 UTC
	2	+++ doc/docgen.sh
	3	@@ -1,8 +1,11 @@
	4	#!/bin/sh
	5
	6	-xsltproc http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl docs.xml > docs.html && \
	7	+xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl docs.xml > docs.html && \
	8	+xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl variables.xml > variables.html && \
	9	+xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl config_settings.xml > config_settings.html && \
	10	+xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl lua.xml > lua.html && \
	11	db2x_xsltproc -s man docs.xml -o docs.mxml && \
	12	-db2x_manxml docs.mxml && \
	13	+db2x_manxml docs.mxml
	14	{ echo ".TH CONKY 1 \"August 2005\" \"conky compiled August 2005\" \"User Commands\""; sed 1d < conky.1; } > conky.2 && \
	15	mv conky.2 conky.1 && \
	16	man ./conky.1 \| col -b > README && \

Lines 1-38 Link Here

(-)files/patch-src-conky.c (-38 lines)
1	--- src/conky.c.orig 2012-05-03 21:22:21 UTC
2	+++ src/conky.c
3	@@ -119,7 +119,7 @@
4	#include "openbsd.h"
5	#endif
6
7	-#if defined(__FreeBSD_kernel__)
8	+#if defined(__FreeBSD_kernel__) && (__FreeBSD_kernel__ + 0)
9	#include <bsd/bsd.h>
10	#endif
11
12	@@ -4292,7 +4292,8 @@ static void set_default_configurations(v
13
14	free_templates();
15
16	- free(current_mail_spool);
17	+ if (current_mail_spool)
18	+ free(current_mail_spool);
19	{
20	char buf[256];
21
22	@@ -5662,6 +5663,7 @@ void initialisation(int argc, char **arg
23	current_mail_spool = strndup(buf, text_buffer_size);
24	}
25	}
26	+ pthread_mutex_init(&kvm_proc_mutex, NULL);
27	#endif
28
29	/* handle other command line arguments */
30	@@ -5971,7 +5973,7 @@ int main(int argc, char **argv)
31
32	void alarm_handler(void) {
33	if(childpid > 0) {
34	- kill(childpid, SIGTERM);
35	+ kill(childpid, SIGKILL);
36	}
37	}
38

Lines 1-71 Link Here

(-)files/patch-src-freebsd.c (-71 lines)
1	--- src/freebsd.c.orig 2012-05-03 21:08:27 UTC
2	+++ src/freebsd.c
3	@@ -283,11 +283,7 @@ int update_running_processes(void)
4	pthread_mutex_lock(&kvm_proc_mutex);
5	p = kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes);
6	for (i = 0; i < n_processes; i++) {
7	-#if (__FreeBSD__ < 5) && (__FreeBSD_kernel__ < 5)
8	- if (p[i].kp_proc.p_stat == SRUN) {
9	-#else
10	if (p[i].ki_stat == SRUN) {
11	-#endif
12	cnt++;
13	}
14	}
15	@@ -464,7 +460,7 @@ void get_battery_stuff(char *buf, unsign
16	break;
17	case BATTERY_STATUS:
18	if (batstate == 1) // Discharging
19	- snprintf(buf, n, "remaining %d%%", batcapacity);
20	+ snprintf(buf, n, "remaining (%d%%)", batcapacity);
21	else
22	snprintf(buf, n, batstate == 2 ? "charging (%d%%)" :
23	(batstate == 7 ? "absent/on AC" : "charged (%d%%)"),
24	@@ -497,26 +493,10 @@ static int check_bat(const char *bat)
25
26	int get_battery_perct(const char *bat)
27	{
28	- union acpi_battery_ioctl_arg battio;
29	- int batnum, acpifd;
30	- int designcap, lastfulcap, batperct;
31	+ int batcapacity;
32
33	- if ((battio.unit = batnum = check_bat(bat)) < 0)
34	- return 0;
35	- if ((acpifd = open("/dev/acpi", O_RDONLY)) < 0) {
36	- fprintf(stderr, "Can't open ACPI device\n");
37	- return 0;
38	- }
39	- if (ioctl(acpifd, ACPIIO_BATT_GET_BIF, &battio) == -1) {
40	- fprintf(stderr, "Unable to get info for battery unit %d\n", batnum);
41	- return 0;
42	- }
43	- close(acpifd);
44	- designcap = battio.bif.dcap;
45	- lastfulcap = battio.bif.lfcap;
46	- batperct = (designcap > 0 && lastfulcap > 0) ?
47	- (int) (((float) lastfulcap / designcap) * 100) : 0;
48	- return batperct > 100 ? 100 : batperct;
49	+ get_battery_stats(NULL, &batcapacity, NULL, NULL);
50	+ return batcapacity;
51	}
52
53	int get_battery_perct_bar(const char *bar)
54	@@ -970,11 +950,14 @@ void get_battery_short_status(char *buff
55	if (0 == strncmp("charging", buffer, 8)) {
56	buffer[0] = 'C';
57	memmove(buffer + 1, buffer + 8, n - 8);
58	- } else if (0 == strncmp("discharging", buffer, 11)) {
59	+ } else if (0 == strncmp("remaining", buffer, 9)) {
60	buffer[0] = 'D';
61	- memmove(buffer + 1, buffer + 11, n - 11);
62	+ memmove(buffer + 1, buffer + 9, n - 9);
63	+ } else if (0 == strncmp("charged", buffer, 7)) {
64	+ buffer[0] = 'F';
65	+ memmove(buffer + 1, buffer + 7, n - 7);
66	} else if (0 == strncmp("absent/on AC", buffer, 12)) {
67	- buffer[0] = 'A';
68	+ buffer[0] = 'N';
69	memmove(buffer + 1, buffer + 12, n - 12);
70	}
71	}

Lines 1-18 Link Here

(-)files/patch-src-fs.c (-18 lines)
1	--- src/fs.c.orig 2012-05-03 21:08:27 UTC
2	+++ src/fs.c
3	@@ -118,9 +118,15 @@ struct fs_stat *prepare_fs_stat(const ch
4
5	static void update_fs_stat(struct fs_stat *fs)
6	{
7	+#if defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__)
8	+ struct statfs s;
9	+
10	+ if (statfs(fs->path, &s) == 0) {
11	+#else
12	struct statfs64 s;
13
14	if (statfs64(fs->path, &s) == 0) {
15	+#endif
16	fs->size = (long long)s.f_blocks * s.f_bsize;
17	/* bfree (root) or bavail (non-roots) ? */
18	fs->avail = (long long)s.f_bavail * s.f_bsize;

Lines 1-7 Link Here

(-)files/patch-src_conky.cc (-29 / +16 lines)
1	--- src/conky.c.orig 2012-05-03 21:22:21 UTC	1	--- src/conky.cc.orig 2016-07-20 16:53:48 UTC
2	+++ src/conky.c	2	+++ src/conky.cc
3	@@ -119,7 +119,7 @@	3	@@ -129,7 +129,7 @@
4	#include "openbsd.h"	4	#include <microhttpd.h>
5	#endif	5	#endif
6		6
7	-#if defined(__FreeBSD_kernel__)	7	-#if defined(__FreeBSD_kernel__)
Lines 9-38 Link Here
9	#include <bsd/bsd.h>	9	#include <bsd/bsd.h>
10	#endif	10	#endif
11		11
12	@@ -4292,7 +4292,8 @@ static void set_default_configurations(v	12	@@ -728,13 +728,6 @@ int percent_print(char *buf, int size, u
13		13	return spaced_print(buf, size, "%u", pad_percents.get(*state), value);
14	free_templates();
15
16	- free(current_mail_spool);
17	+ if (current_mail_spool)
18	+ free(current_mail_spool);
19	{
20	char buf[256];
21
22	@@ -5662,6 +5663,7 @@ void initialisation(int argc, char **arg
23	current_mail_spool = strndup(buf, text_buffer_size);
24	}
25	}
26	+ pthread_mutex_init(&kvm_proc_mutex, NULL);
27	#endif
28
29	/* handle other command line arguments */
30	@@ -5971,7 +5973,7 @@ int main(int argc, char **argv)
31
32	void alarm_handler(void) {
33	if(childpid > 0) {
34	- kill(childpid, SIGTERM);
35	+ kill(childpid, SIGKILL);
36	}
37	}	14	}
38		15
		16	-#if defined(__FreeBSD__)
		17	-unsigned long long llabs(long long num) {
		18	- if(num < 0) return -num;
		19	- else return num;
		20	-}
		21	-#endif
		22	-
		23	/* converts from bytes to human readable format (K, M, G, T)
		24	*
		25	* The algorithm always divides by 1024, as unit-conversion of byte

Line 0 Link Here

(-)files/patch-src_luamm.cc (+39 lines)
	1	--- src/luamm.cc.orig 2016-07-20 16:53:48 UTC
	2	+++ src/luamm.cc
	3	@@ -57,7 +57,8 @@ namespace lua {
	4	lua_pushstring(l, e.what());
	5	}
	6	catch(...) {
	7	- lua_pushstring(l, ptr->__cxa_exception_type()->name());
	8	+// lua_pushstring(l, ptr->__cxa_exception_type()->name());
	9	+ lua_pushstring(l, "Unknown exception");
	10	}
	11	return 1;
	12	}
	13	@@ -344,7 +345,7 @@ namespace lua {
	14	pushinteger(what);
	15	pushinteger(data);
	16	call(2, 1, 0);
	17	- assert(isnumber(-1));
	18	+ assert(isanumber(-1));
	19	int r = tointeger(-1);
	20	pop();
	21	return r;
	22	@@ -427,7 +428,7 @@ namespace lua {
	23
	24	call(2, MULTRET, 0);
	25
	26	- assert(isnumber(-1));
	27	+ assert(isanumber(-1));
	28	int r = tointeger(-1);
	29	pop();
	30	return r;
	31	@@ -466,7 +467,7 @@ namespace lua {
	32	pushvalue(index1);
	33	pushvalue(index2);
	34	call(2, 1, 0);
	35	- assert(isnumber(-1));
	36	+ assert(isanumber(-1));
	37	int r = tointeger(-1);
	38	pop();
	39	return r;

Line 0 Link Here

(-)files/patch-src_luamm.hh (+21 lines)
	1	--- src/luamm.hh.orig 2016-07-20 16:53:48 UTC
	2	+++ src/luamm.hh
	3	@@ -25,7 +25,9 @@
	4	#include <assert.h>
	5	#include <memory>
	6	#include <mutex>
	7	+#include <exception>
	8	#include <stdexcept>
	9	+#include <string>
	10
	11	#include <lua.hpp>
	12
	13	@@ -210,7 +212,7 @@ namespace lua {
	14	bool islightuserdata(int index) throw() { return lua_islightuserdata(cobj.get(), index); }
	15	bool isnil(int index) throw() { return lua_isnil(cobj.get(), index); }
	16	bool isnone(int index) throw() { return lua_isnone(cobj.get(), index); }
	17	- bool isnumber(int index) throw() { return lua_isnumber(cobj.get(), index); }
	18	+ bool isanumber(int index) throw() { return lua_isnumber(cobj.get(), index); }
	19	bool isstring(int index) throw() { return lua_isstring(cobj.get(), index); }
	20	void pop(int n = 1) throw() { lua_pop(cobj.get(), n); }
	21	void pushboolean(bool b) throw() { lua_pushboolean(cobj.get(), b); }