Hi, here's an update to conky 1.9.0 tested on amd64 and sparc64.
OKs ?
Christopher
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/conky/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile 19 Sep 2012 08:15:09 -0000 1.34
+++ Makefile 23 Dec 2012 12:43:51 -0000
@@ -1,88 +1,87 @@
-# $OpenBSD: Makefile,v 1.34 2012/09/19 08:15:09 jasper Exp $
+# $OpenBSD: Makefile,v 1.32 2012/07/10 15:22:45 jasper Exp $
-ONLY_FOR_ARCHS= ${APM_ARCHS}
+ONLY_FOR_ARCHS = ${APM_ARCHS}
-COMMENT= light-weight system monitor
+COMMENT = light-weight system monitor
-DISTNAME= conky-1.8.1
-REVISION= 12
-CATEGORIES= sysutils
-HOMEPAGE= http://conky.sourceforge.net/
+DISTNAME = conky-1.9.0
+CATEGORIES = sysutils
+HOMEPAGE = http://conky.sourceforge.net/
-MAINTAINER= Benoit Lecocq <ben...@openbsd.org>
+MAINTAINER = Benoit Lecocq <ben...@openbsd.org>
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=conky/}
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=conky/}
# mostly GPLv3; see COPYING
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
-WANTLIB= c crypto kvm idn m ncurses ossaudio pthread ssl z \
+WANTLIB = c crypto kvm idn m ncurses ossaudio pthread ssl z \
glib-2.0 pcre curl xml2 ${MODLUA_WANTLIB}
-MODULES= devel/gettext \
+MODULES = devel/gettext \
lang/lua
-MODLUA_SA= Yes
+MODLUA_SA = Yes
-LIB_DEPENDS= devel/glib2 \
+LIB_DEPENDS = devel/glib2 \
devel/pcre \
net/curl \
textproc/libxml \
${MODLUA_LIB_DEPENDS}
-USE_LIBTOOL= Yes
+USE_LIBTOOL = Yes
-FLAVORS= no_x11 audacious xmms2
-FLAVOR?=
+FLAVORS = no_x11 audacious xmms2
+FLAVOR ?=
.if ${FLAVOR:L:Mno_x11}
. if ${FLAVOR:L:Maudacious} || ${FLAVOR:L:Mxmms2}
-ERRORS+="Fatal: nonsense combination of flavors"
+ERRORS += "Fatal: nonsense combination of flavors"
. else
-CONFIGURE_ARGS+=--disable-double-buffer \
- --disable-own-window \
- --disable-xdamage \
- --disable-xft \
- --disable-x11
+CONFIGURE_ARGS += --disable-double-buffer \
+ --disable-own-window \
+ --disable-xdamage \
+ --disable-xft \
+ --disable-x11
. endif
.else
-CONFIGURE_ARGS+=--enable-imlib2
-LIB_DEPENDS+= graphics/imlib2
-WANTLIB+= Imlib2 X11 Xau Xdamage Xdmcp Xext Xfixes Xft \
- Xrender expat fontconfig freetype \
- pthread-stubs xcb
+CONFIGURE_ARGS += --enable-imlib2
+LIB_DEPENDS += graphics/imlib2
+WANTLIB += Imlib2 X11 Xdamage Xext Xfixes Xft Xrender \
+ expat fontconfig freetype xcb
.endif
.if ${FLAVOR:L:Maudacious}
-CONFIGURE_ARGS+=--enable-audacious=yes
-LIB_DEPENDS+= audio/audacious
-WANTLIB += GL Xcomposite Xcursor Xi Xinerama Xrandr Xxf86vm \
- atk-1.0 audclient audcore audgui cairo \
- cairo-gobject dbus-1 dbus-glib-1 drm ffi \
- gdk-3 gdk_pixbuf-2.0 gio-2.0 gmodule-2.0 \
- gobject-2.0 gthread-2.0 gtk-3 pango-1.0 \
- pangocairo-1.0 pangoft2-1.0 pixman-1 png stdc++ \
- xcb-render xcb-shm
+CONFIGURE_ARGS += --enable-audacious=yes
+LIB_DEPENDS += audio/audacious devel/harfbuzz
+WANTLIB += GL ICE Xau Xcomposite Xcursor Xdmcp Xi Xinerama \
+ Xrandr Xxf86vm atk-1.0 atk-bridge-2.0 atspi \
+ audclient audcore audgui cairo cairo-gobject \
+ dbus-1 dbus-glib-1 drm ffi gdk-3 gdk_pixbuf-2.0 \
+ gio-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
+ gtk-3 harfbuzz icudata icule icuuc pango-1.0 \
+ pangocairo-1.0 pangoft2-1.0 pixman-1 png \
+ pthread-stubs SM stdc++ xcb-render xcb-shm
.endif
.if ${FLAVOR:L:Mxmms2}
-CONFIGURE_ARGS+=--enable-xmms2
-LIB_DEPENDS+= audio/xmms2
-WANTLIB+= xmmsclient
+CONFIGURE_ARGS += --enable-xmms2
+LIB_DEPENDS += audio/xmms2
+WANTLIB += xmmsclient
.endif
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=--enable-mpd \
- --enable-rss \
- --disable-config-output \
- --disable-moc \
- --disable-portmon \
- --enable-lua \
- --enable-curl \
- --with-libiconv-prefix="${LOCALBASE}"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS += --enable-mpd \
+ --enable-rss \
+ --disable-config-output \
+ --disable-moc \
+ --disable-portmon \
+ --enable-lua \
+ --enable-curl \
+ --with-libiconv-prefix="${LOCALBASE}"
+CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include"
LDFLAGS="-L${LOCALBASE}/lib" \
LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
@@ -91,6 +90,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/conky
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/conky
-FAKE_FLAGS= configdir=${PREFIX}/share/examples/conky
+FAKE_FLAGS = configdir=${PREFIX}/share/examples/conky
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/conky/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 27 Apr 2011 12:55:10 -0000 1.6
+++ distinfo 23 Dec 2012 12:43:51 -0000
@@ -1,5 +1,2 @@
-MD5 (conky-1.8.1.tar.gz) = mzMPfQAcvZ+Bjkhd78GQKQ==
-RMD160 (conky-1.8.1.tar.gz) = 7OQw+Jy0uF9mr244Ylam2KHN628=
-SHA1 (conky-1.8.1.tar.gz) = Brvpt+7YYD+nqXGyfFxh84QkrG8=
-SHA256 (conky-1.8.1.tar.gz) = x5aGmd6zkP4ru9TiujEo/BOrIu5QP5Uj5JRjwDlzyq0=
-SIZE (conky-1.8.1.tar.gz) = 775162
+SHA256 (conky-1.9.0.tar.gz) = HedU13smcfaHlf25/FBjKKFmjdbKAJhMP0l5CmbTaMo=
+SIZE (conky-1.9.0.tar.gz) = 800797
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 27 Apr 2011 12:55:10 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2011/04/27 12:55:10 dcoppa Exp $
---- configure.orig Tue Aug 25 00:01:58 2009
-+++ configure Tue Apr 27 19:50:09 2010
-@@ -11657,7 +11657,7 @@ $as_echo "#define APCUPSD 1" >>confdefs.h
-
- fi
- fi
-- if test x$want_apcupsd = xyes; then
-+ if test x"$want_apcupsd" = xyes; then
- BUILD_APCUPSD_TRUE=
- BUILD_APCUPSD_FALSE='#'
- else
Index: patches/patch-data_conky_no_x11_conf
===================================================================
RCS file: patches/patch-data_conky_no_x11_conf
diff -N patches/patch-data_conky_no_x11_conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-data_conky_no_x11_conf 23 Dec 2012 12:43:51 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- data/conky_no_x11.conf.orig Thu May 3 23:08:27 2012
++++ data/conky_no_x11.conf Fri Aug 10 13:47:45 2012
+@@ -27,7 +27,8 @@ background no
+ cpu_avg_samples 2
+ net_avg_samples 2
+ no_buffers yes
+-out_to_stderr no
++out_to_x no
++out_to_ncurses yes
+ update_interval 1.0
+ uppercase no
+ use_spacer none
Index: patches/patch-src_ccurl_thread_c
===================================================================
RCS file: patches/patch-src_ccurl_thread_c
diff -N patches/patch-src_ccurl_thread_c
--- patches/patch-src_ccurl_thread_c 5 Jul 2011 08:18:30 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_ccurl_thread_c,v 1.1 2011/07/05 08:18:30 jasper Exp $
---- src/ccurl_thread.c.orig Tue Jul 5 09:35:29 2011
-+++ src/ccurl_thread.c Tue Jul 5 09:35:34 2011
-@@ -33,7 +33,6 @@
- #endif /* DEBUG */
-
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
-
- /*
Index: patches/patch-src_conky_c
===================================================================
RCS file: /cvs/ports/sysutils/conky/patches/patch-src_conky_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_conky_c
--- patches/patch-src_conky_c 11 Sep 2011 18:53:28 -0000 1.5
+++ patches/patch-src_conky_c 23 Dec 2012 12:43:51 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_conky_c,v 1.5 2011/09/11 18:53:28 dcoppa Exp $
---- src/conky.c.orig Tue Oct 5 23:29:36 2010
-+++ src/conky.c Mon Jul 18 13:59:30 2011
+--- src/conky.c.orig Thu May 3 23:22:21 2012
++++ src/conky.c Tue Jul 24 18:10:39 2012
@@ -125,7 +125,7 @@
/* FIXME: apm_getinfo is unused here. maybe it's meant for common.c */
@@ -21,7 +21,7 @@ $OpenBSD: patch-src_conky_c,v 1.5 2011/0
long color0, color1, color2, color3, color4, color5, color6, color7, color8,
color9;
-@@ -1030,7 +1026,7 @@ void generate_text_internal(char *p, int p_max_size,
+@@ -1015,7 +1011,7 @@ void generate_text_internal(char *p, int p_max_size,
get_powerbook_batt_info(p, p_max_size,
obj->data.i);
}
#endif /* __linux__ */
@@ -30,7 +30,7 @@ $OpenBSD: patch-src_conky_c,v 1.5 2011/0
OBJ(if_up) {
if (!interface_up(obj)) {
DO_JUMP;
-@@ -1914,7 +1910,7 @@ void generate_text_internal(char *p, int p_max_size,
+@@ -1899,7 +1895,7 @@ void generate_text_internal(char *p, int p_max_size,
}
#endif /* __linux__ */
#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
@@ -39,7 +39,7 @@ $OpenBSD: patch-src_conky_c,v 1.5 2011/0
OBJ(apm_adapter) {
char *msg;
-@@ -3534,12 +3530,14 @@ static void main_loop(void)
+@@ -3496,12 +3492,14 @@ static void main_loop(void)
if(update_interval_bat != NOBATTERY && update_interval_bat !=
update_interval_old) {
char buf[max_user_text];
Index: patches/patch-src_core_c
===================================================================
RCS file: /cvs/ports/sysutils/conky/patches/patch-src_core_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_core_c
--- patches/patch-src_core_c 13 Apr 2012 21:21:10 -0000 1.3
+++ patches/patch-src_core_c 23 Dec 2012 12:43:51 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_core_c,v 1.3 2012/04/13 21:21:10 pascal Exp $
---- src/core.c.orig Tue Oct 5 17:29:36 2010
-+++ src/core.c Wed Apr 4 17:48:06 2012
+--- src/core.c.orig Thu May 3 23:08:27 2012
++++ src/core.c Tue Jul 24 18:10:39 2012
@@ -170,9 +170,9 @@ struct text_object *construct_text_object(const char *
#else
NORM_ERR("acpiacadapter: arg is only used on linux");
@@ -22,18 +22,7 @@ $OpenBSD: patch-src_core_c,v 1.3 2012/04
END OBJ_IF_ARG(if_up, 0, "if_up needs an argument")
parse_if_up_arg(obj, arg);
#endif
-@@ -541,8 +541,10 @@ struct text_object *construct_text_object(const char *
- parse_platform_sensor(obj, arg);
- END OBJ_ARG(hwmon, 0, "hwmon needs argumanets")
- parse_hwmon_sensor(obj, arg);
-+#endif
- END OBJ(addr, &update_net_stats)
- parse_net_stat_arg(obj, arg, free_at_crash);
-+#ifdef __linux__
- END OBJ(addrs, &update_net_stats)
- parse_net_stat_arg(obj, arg, free_at_crash);
- #endif /* __linux__ */
-@@ -860,7 +862,7 @@ struct text_object *construct_text_object(const char *
+@@ -860,7 +860,7 @@ struct text_object *construct_text_object(const char *
END OBJ(gw_ip, &update_gateway_info)
#endif /* !__linux__ */
#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
@@ -42,7 +31,7 @@ $OpenBSD: patch-src_core_c,v 1.3 2012/04
END OBJ(apm_adapter, 0)
END OBJ(apm_battery_life, 0)
END OBJ(apm_battery_time, 0)
-@@ -1516,7 +1518,7 @@ void free_text_objects(struct text_object *root, int i
+@@ -1523,7 +1523,7 @@ void free_text_objects(struct text_object *root, int i
free(data.s);
break;
#endif
Index: patches/patch-src_eve_c
===================================================================
RCS file: patches/patch-src_eve_c
diff -N patches/patch-src_eve_c
--- patches/patch-src_eve_c 5 Jul 2011 08:18:30 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_eve_c,v 1.1 2011/07/05 08:18:30 jasper Exp $
---- src/eve.c.orig Tue Jul 5 09:35:16 2011
-+++ src/eve.c Tue Jul 5 09:35:24 2011
-@@ -37,7 +37,6 @@
- #include <libxml/xmlwriter.h>
-
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
-
- #include <time.h>
Index: patches/patch-src_fs_c
===================================================================
RCS file: patches/patch-src_fs_c
diff -N patches/patch-src_fs_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_fs_c 23 Dec 2012 12:43:51 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- src/fs.c.orig Tue Jul 24 18:26:13 2012
++++ src/fs.c Tue Jul 24 18:32:23 2012
+@@ -118,16 +118,16 @@ struct fs_stat *prepare_fs_stat(const char *s)
+
+ static void update_fs_stat(struct fs_stat *fs)
+ {
+- struct statfs64 s;
++ struct statfs s;
+
+- if (statfs64(fs->path, &s) == 0) {
++ if (statfs(fs->path, &s) == 0) {
+ fs->size = (long long)s.f_blocks * s.f_bsize;
+ /* bfree (root) or bavail (non-roots) ? */
+ fs->avail = (long long)s.f_bavail * s.f_bsize;
+ fs->free = (long long)s.f_bfree * s.f_bsize;
+ get_fs_type(fs->path, fs->type);
+ } else {
+- NORM_ERR("statfs64 '%s': %s", fs->path, strerror(errno));
++ NORM_ERR("statfs '%s': %s", fs->path, strerror(errno));
+ fs->size = 0;
+ fs->avail = 0;
+ fs->free = 0;
Index: patches/patch-src_xmms2_c
===================================================================
RCS file: patches/patch-src_xmms2_c
diff -N patches/patch-src_xmms2_c
--- patches/patch-src_xmms2_c 27 Apr 2011 12:55:11 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_xmms2_c,v 1.1 2011/04/27 12:55:11 dcoppa Exp $
---- src/xmms2.c.orig Tue Apr 19 20:22:11 2011
-+++ src/xmms2.c Tue Apr 19 20:22:30 2011
-@@ -223,7 +223,7 @@ int handle_playback_state_change(xmmsv_t *value, void
- break;
- case XMMS_PLAYBACK_STATUS_STOP:
- strncpy(ptr->xmms2.status, "Stopped",
text_buffer_size - 1);
-- ptr->xmms2.elapsed = ptr->xmms2.progress =
ptr->xmms2.percent = 0;
-+ ptr->xmms2.elapsed = ptr->xmms2.progress = 0;
- break;
- default:
- strncpy(ptr->xmms2.status, "Unknown",
text_buffer_size - 1);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/conky/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 13 Jun 2011 10:11:05 -0000 1.8
+++ pkg/PLIST 23 Dec 2012 12:43:51 -0000
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.8 2011/06/13 10:11:05 dcoppa Exp $
@pkgpath ${BASE_PKGPATH},imlib2
@bin bin/conky
-lib/conky/
@man man/man1/conky.1
share/doc/conky/
share/doc/conky/README
pgp1hPKwXtWqT.pgp
Description: PGP signature
