# This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # conky # conky/Makefile # conky/pkg-descr # conky/distinfo # conky/files # conky/files/patch-src-conky.c # conky/files/patch-configure # conky/files/patch-src-bmpx.c # conky/files/patch-src-xmms2.c # conky/files/patch-lua-cairo.pkg # conky/files/patch-src-core.c # echo c - conky mkdir -p conky > /dev/null 2>&1 echo x - conky/Makefile sed 's/^X//' >conky/Makefile << 'c6f03d61758ca6e484be3d23647891ea' X# New ports collection makefile for: conky X# Date created: 2005-08-27 X# Whom: Roman Bogorodskiy X# X# $FreeBSD: ports/sysutils/conky/Makefile,v 1.51 2010/01/28 01:59:34 amdmi3 Exp $ X# X XPORTNAME= conky XPORTVERSION= 1.8.1 XCATEGORIES= sysutils XMASTER_SITES= SF X XMAINTAINER= ntarmos@cs.uoi.gr XCOMMENT= An advanced, highly configurable system monitor for X X XCONFLICTS?= conky-awesome-[0-9]* XSLAVEDIRS= sysutils/conky-awesome X XUSE_ICONV= yes XUSE_BZIP2= yes XGNU_CONFIGURE= yes XUSE_XORG?= x11 xext xdamage XUSE_GNOME?= pkgconfig XUSE_ICONV= yes XUSE_GMAKE= yes XCONFIGURE_ARGS+= --disable-portmon \ X --disable-hddtemp XCONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ X LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" X XMAN1= conky.1 XPLIST_FILES= bin/conky XPORTEXAMPLES= conkyrc.sample XPORTDOCS= README AUTHORS ChangeLog TODO NEWS \ X docs.html variables.html config_settings.html X XOPTIONS+= APCUPSD "Enable APCUPSD support" Off \ X AUDACIOUS "Enable Audacious support" Off \ X BMPX "Enable BMPX support" Off \ X MPD "Enable MPD support" Off \ X NCURSES "Enable ncurses support" Off \ X RSS "Enable RSS support" Off \ X METAR "Enable METAR Weather support" Off \ X XOAP "Enable XOAP Weather support" Off \ X XMMS2 "Enable XMMS2 support" Off X X.if !empty(USE_XORG) XOPTIONS+= DOUBLE_BUFFER "Enable double buffering" On \ X IMLIB2 "Enable Imlib2 support" Off \ X LUA "Enable Lua support" Off \ X LUA_CAIRO "Enable Lua-Cairo binding (impl. Lua)" Off \ X LUA_IMLIB2 "Enable Lua-Imlib2 binding (impl. Lua/Imlib2)" Off \ X XFT "Enable Xft support" Off X.else XOPTIONS+= LUA "Enable Lua support" Off X.endif X X.include X X.if empty(USE_XORG) XWITHOUT_DOUBLE_BUFFER= On XCONFIGURE_ARGS+= --disable-x11 --disable-own-window X.undef WITH_IMLIB2 X.undef WITH_LUA_CAIRO X.undef WITH_LUA_IMLIB2 X.undef WITH_XFT X.endif X X.if defined(WITH_APCUPSD) XRUN_DEPENDS+= ${LOCALBASE}/sbin/apcupsd:${PORTSDIR}/sysutils/apcupsd XCONFIGURE_ARGS+= --enable-apcupsd X.else XCONFIGURE_ARGS+= --disable-apcupsd X.endif X X.if defined(WITH_AUDACIOUS) XLIB_DEPENDS+= audclient.2:${PORTSDIR}/multimedia/audacious XCONFIGURE_ARGS+= --enable-audacious X.else XCONFIGURE_ARGS+= --disable-audacious X.endif X X.if defined(WITH_BMPX) XBUILD_DEPENDS+= beep-media-player-2:${PORTSDIR}/multimedia/bmpx XRUN_DEPENDS+= beep-media-player-2:${PORTSDIR}/multimedia/bmpx XLIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus XCONFIGURE_ARGS+= --enable-bmpx X.else XCONFIGURE_ARGS+= --disable-bmpx X.endif X X.if defined(WITH_LUA) || defined(WITH_LUA_CAIRO) || defined(WITH_LUA_IMLIB2) XUSE_LUA= 5.1+ XCONFIGURE_ARGS+= --enable-lua X.else XCONFIGURE_ARGS+= --disable-lua X.endif X X.if defined(WITH_LUA_CAIRO) XLIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo XBUILD_DEPENDS+= tolua++-5.1:${PORTSDIR}/lang/tolua++ XRUN_DEPENDS+= tolua++-5.1:${PORTSDIR}/lang/tolua++ XCONFIGURE_ARGS+= --enable-lua-cairo X.endif X X.if defined(WITH_IMLIB2) || defined(WITH_LUA_IMLIB2) XLIB_DEPENDS+= Imlib2.5:${PORTSDIR}/graphics/imlib2 XCONFIGURE_ARGS+= --enable-imlib2 X.else XCONFIGURE_ARGS+= --disable-imlib2 X.endif X X.if defined(WITH_LUA_IMLIB2) XBUILD_DEPENDS+= tolua++-5.1:${PORTSDIR}/lang/tolua++ XRUN_DEPENDS+= tolua++-5.1:${PORTSDIR}/lang/tolua++ XCONFIGURE_ARGS+= --enable-lua-imlib2 X.endif X X.if defined(WITH_NCURSES) XCONFIGURE_ARGS+= --enable-ncurses X.else XCONFIGURE_ARGS+= --disable-ncurses X.endif X X.if defined(WITH_XFT) XLIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft XCONFIGURE_ARGS+= --enable-xft X.else XCONFIGURE_ARGS+= --disable-xft X.endif X X.if defined(WITHOUT_MPD) XCONFIGURE_ARGS+= --disable-mpd X.endif X X.if defined(WITH_RSS) XLIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl \ X xml2.5:${PORTSDIR}/textproc/libxml2 XCONFIGURE_ARGS+= --enable-rss XUSE_GNOME+= glib20 X.endif X X.if defined(WITH_METAR) XLIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl XCONFIGURE_ARGS+= --enable-weather-metar X.endif X X.if defined(WITH_XOAP) XLIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl \ X xml2.5:${PORTSDIR}/textproc/libxml2 XCONFIGURE_ARGS+= --enable-weather-xoap X.endif X X.if defined(WITH_XMMS2) XLIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2 XCONFIGURE_ARGS+= --enable-xmms2 X.else XCONFIGURE_ARGS+= --disable-xmms2 X.endif X X.if defined(WITHOUT_DOUBLE_BUFFER) XCONFIGURE_ARGS+= --disable-double-buffer X.endif X Xpost-patch: X @${REINPLACE_CMD} -e 's,lua5\.1,lua-5.1,g' \ X ${WRKSRC}/configure X @${REINPLACE_CMD} -e 's,imlib_context_disconnect_display();,,g' \ X ${WRKSRC}/src/imlib2.c X Xdo-install: X ${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${PREFIX}/bin X ${INSTALL_MAN} ${WRKSRC}/doc/conky.1 ${PREFIX}/man/man1 X Xpost-install: X.if !defined(NOPORTEXAMPLES) X @${MKDIR} ${EXAMPLESDIR} X. if !empty(USE_XORG) X @${INSTALL_DATA} ${WRKSRC}/data/conky.conf ${EXAMPLESDIR}/conkyrc.sample X. else X @${INSTALL_DATA} ${WRKSRC}/data/conky_no_x11.conf ${EXAMPLESDIR}/conkyrc.sample X. endif X.endif X X.if !defined(NOPORTDOCS) X @${MKDIR} ${DOCSDIR} X.for i in README AUTHORS ChangeLog TODO NEWS X ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} X.endfor X.for i in docs.html variables.html config_settings.html X ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR} X.endfor X.endif X X.include c6f03d61758ca6e484be3d23647891ea echo x - conky/pkg-descr sed 's/^X//' >conky/pkg-descr << '1dc47ddbf5208b510dd9392ba07bd8c1' XConky is an advanced, highly configurable system monitor for X X XWWW: http://conky.sourceforge.net/ 1dc47ddbf5208b510dd9392ba07bd8c1 echo x - conky/distinfo sed 's/^X//' >conky/distinfo << 'ca22fce68ddee350633d14dc535474a0' XMD5 (conky-1.8.1.tar.bz2) = 366dc6a5c2ebebfbe6f53da25061b5d6 XSHA256 (conky-1.8.1.tar.bz2) = f85a278f2869596b1fd68b6d26d58c93af8dcc39d5186bbcfd587d4c545e5e43 XSIZE (conky-1.8.1.tar.bz2) = 612481 ca22fce68ddee350633d14dc535474a0 echo c - conky/files mkdir -p conky/files > /dev/null 2>&1 echo x - conky/files/patch-src-conky.c sed 's/^X//' >conky/files/patch-src-conky.c << 'c59c590f71d1b0c018c091af48aee345' X--- src/conky.c.orig 2010-10-06 00:29:36.000000000 +0300 X+++ src/conky.c 2010-10-10 00:06:31.000000000 +0300 X@@ -2072,9 +2072,11 @@ X OBJ(xmms2_percent) { X snprintf(p, p_max_size, "%2.0f", cur->xmms2.progress * 100); X } X+#ifdef X11 X OBJ(xmms2_bar) { X new_bar(obj, p, p_max_size, (int) (cur->xmms2.progress * 255.0f)); X } X+#endif /* X11 */ X OBJ(xmms2_playlist) { X snprintf(p, p_max_size, "%s", cur->xmms2.playlist); X } X@@ -2150,6 +2152,7 @@ X snprintf(p, p_max_size, "%s", X cur->audacious.items[AUDACIOUS_MAIN_VOLUME]); X } X+#ifdef X11 X OBJ(audacious_bar) { X double progress; X X@@ -2158,6 +2161,7 @@ X atof(cur->audacious.items[AUDACIOUS_LENGTH_SECONDS]); X new_bar(obj, p, p_max_size, (int) (progress * 255.0f)); X } X+#endif /* X11 */ X #endif /* AUDACIOUS */ X X #ifdef BMPX X@@ -6007,7 +6011,7 @@ X X void alarm_handler(void) { X if(childpid > 0) { X- kill(childpid, SIGTERM); X+ kill(childpid, SIGKILL); X } X } X c59c590f71d1b0c018c091af48aee345 echo x - conky/files/patch-configure sed 's/^X//' >conky/files/patch-configure << '498e2a3501cfe7ff2362b87148767ae4' X--- configure.orig X+++ configure X@@ -11645,7 +11645,7 @@ X X X if test x$want_apcupsd = xyes; then X- if test x"$uname" != xLinux; then X+ if test x"$uname" != xLinux -a x"$uname" != xFreeBSD; then X { $as_echo "$as_me:${as_lineno-$LINENO}: apcupsd not supported on $uname... disabling" >&5 X $as_echo "$as_me: apcupsd not supported on $uname... disabling" >&6;} X want_apcupsd="not supported on $uname" X@@ -11675,7 +11675,7 @@ X X X if test x$want_iostats = xyes; then X- if test x"$uname" != xLinux; then X+ if test x"$uname" != xLinux -a x"$uname" != xFreeBSD; then X { $as_echo "$as_me:${as_lineno-$LINENO}: iostats not supported on $uname... disabling" >&5 X $as_echo "$as_me: iostats not supported on $uname... disabling" >&6;} X want_iostats="not supported on $uname" 498e2a3501cfe7ff2362b87148767ae4 echo x - conky/files/patch-src-bmpx.c sed 's/^X//' >conky/files/patch-src-bmpx.c << '7009353d4142186daa1a0cda0c310e52' X--- src/bmpx.c.orig X+++ src/bmpx.c X@@ -42,7 +42,7 @@ X static int connected = 0; X static char *unknown = "unknown"; X X-void fail(GError *error); X+void fail(GError *error, struct information *); X X void update_bmpx() X { X@@ -58,15 +58,15 @@ X bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); X if (bus == NULL) { X NORM_ERR("BMPx error 1: %s\n", error->message); X- fail(error); X+ fail(error, current_info); X return; X } X X remote_object = dbus_g_proxy_new_for_name(bus, BMP_DBUS_SERVICE, X- BMP_DBUS_PATH, BMP_DBUS_INTERFACE); X+ BMP_DBUS_PATH__BMP, BMP_DBUS_INTERFACE__BMP); X if (!remote_object) { X NORM_ERR("BMPx error 2: %s\n", error->message); X- fail(error); X+ fail(error, current_info); X return; X } X X@@ -78,7 +78,7 @@ X G_TYPE_INVALID, G_TYPE_INT, ¤t_track, G_TYPE_INVALID)) { X } else { X NORM_ERR("BMPx error 3: %s\n", error->message); X- fail(error); X+ fail(error, current_info); X return; X } X X@@ -112,17 +112,17 @@ X g_value_get_string(g_hash_table_lookup(metadata, "location")); X } else { X NORM_ERR("BMPx error 4: %s\n", error->message); X- fail(error); X+ fail(error, current_info); X return; X } X X g_hash_table_destroy(metadata); X } else { X- fail(error); X+ fail(error, current_info); X } X } X X-void fail(GError *error) X+void fail(GError *error, struct information *current_info) X { X if (error) { X g_error_free(error); 7009353d4142186daa1a0cda0c310e52 echo x - conky/files/patch-src-xmms2.c sed 's/^X//' >conky/files/patch-src-xmms2.c << '59f7c56abac946a5ee29a58b2a5dc9c0' X--- src/xmms2.c.orig 2010-09-29 04:54:10.000000000 +0300 X+++ src/xmms2.c 2010-09-29 04:55:19.000000000 +0300 X@@ -223,7 +223,7 @@ X break; X case XMMS_PLAYBACK_STATUS_STOP: X strncpy(ptr->xmms2.status, "Stopped", text_buffer_size - 1); X- ptr->xmms2.elapsed = ptr->xmms2.progress = ptr->xmms2.percent = 0; X+ ptr->xmms2.elapsed = ptr->xmms2.progress = 0; X break; X default: X strncpy(ptr->xmms2.status, "Unknown", text_buffer_size - 1); 59f7c56abac946a5ee29a58b2a5dc9c0 echo x - conky/files/patch-lua-cairo.pkg sed 's/^X//' >conky/files/patch-lua-cairo.pkg << 'b690010cd703ed9c276c87f5b62a0618' X--- lua/cairo.pkg.orig X+++ lua/cairo.pkg X@@ -4,6 +4,7 @@ X $#include X $#include X $#include "libcairo-helper.h" X+$#define tolua_outside X /* X * This code was mostly copied from cairo.h and cairo-xlib.h with comments X * removed. The licence noticed below is present for the sake of clarity. b690010cd703ed9c276c87f5b62a0618 echo x - conky/files/patch-src-core.c sed 's/^X//' >conky/files/patch-src-core.c << '00e630dd0ae98e36949f27098228d476' X--- src/core.c.orig 2010-10-06 00:29:36.000000000 +0300 X+++ src/core.c 2010-10-09 23:51:18.000000000 +0300 X@@ -541,11 +541,11 @@ X parse_platform_sensor(obj, arg); X END OBJ_ARG(hwmon, 0, "hwmon needs argumanets") X parse_hwmon_sensor(obj, arg); X- END OBJ(addr, &update_net_stats) X- parse_net_stat_arg(obj, arg, free_at_crash); X END OBJ(addrs, &update_net_stats) X parse_net_stat_arg(obj, arg, free_at_crash); X #endif /* __linux__ */ X+ END OBJ(addr, &update_net_stats) X+ parse_net_stat_arg(obj, arg, free_at_crash); X END X /* we have four different types of top (top, top_mem, top_time and top_io). To X * avoid having almost-same code four times, we have this special X@@ -577,7 +577,7 @@ X obj->data.s = strndup(arg, text_buffer_size); X END OBJ_IF_ARG(if_mounted, 0, "if_mounted needs an argument") X obj->data.s = strndup(arg, text_buffer_size); X-#ifdef __linux__ X+#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) X END OBJ_IF_ARG(if_running, &update_top, "if_running needs an argument") X top_running = 1; X obj->data.s = strndup(arg, text_buffer_size); X@@ -787,9 +787,9 @@ X obj->sub = malloc(sizeof(struct text_object)); X extract_variable_text_internal(obj->sub, arg); X END OBJ(processes, &update_total_processes) X+#ifdef __linux__ X END OBJ(running_processes, &update_top) X top_running = 1; X-#ifdef __linux__ X END OBJ(threads, &update_threads) X END OBJ(running_threads, &update_stat) X #else X@@ -967,8 +967,10 @@ X END OBJ(xmms2_size, &update_xmms2) X END OBJ(xmms2_status, &update_xmms2) X END OBJ(xmms2_percent, &update_xmms2) X+#ifdef X11 X END OBJ(xmms2_bar, &update_xmms2) X scan_bar(obj, arg); X+#endif X END OBJ(xmms2_smart, &update_xmms2) X END OBJ(xmms2_playlist, &update_xmms2) X END OBJ(xmms2_timesplayed, &update_xmms2) X@@ -994,9 +996,11 @@ X END OBJ(audacious_playlist_length, &update_audacious) X END OBJ(audacious_playlist_position, &update_audacious) X END OBJ(audacious_main_volume, &update_audacious) X+#ifdef X11 X END OBJ(audacious_bar, &update_audacious) X scan_bar(obj, arg); X #endif X+#endif X #ifdef BMPX X END OBJ(bmpx_title, &update_bmpx) X memset(&(info.bmpx), 0, sizeof(struct bmpx_s)); 00e630dd0ae98e36949f27098228d476 exit