diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile index bc4408719a06..713b9c81d97d 100644 --- a/sysutils/conky-awesome/Makefile +++ b/sysutils/conky-awesome/Makefile @@ -1,22 +1,20 @@ # New ports collection makefile for: conky # Date created: 2005-08-27 # Whom: Roman Bogorodskiy # # $FreeBSD$ # PKGNAMESUFFIX= -awesome MAINTAINER= ntarmos@cs.uoi.gr COMMENT= An advanced, highly configurable system monitor (configured for x11-wm/awesome) -MASTERDIR= ${.CURDIR}/../../sysutils/conky +MASTERDIR= ${.CURDIR}/../conky DESCR= ${.CURDIR}/pkg-descr CONFLICTS= conky-[0-9]* USE_XORG= # This is a comment -USE_GNOME= pkgconfig -CONFIGURE_ARGS+= --disable-x11 --disable-own-window .include "${MASTERDIR}/Makefile" diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 6fe001800e03..2240d83b3926 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,139 +1,168 @@ # New ports collection makefile for: conky # Date created: 2005-08-27 # Whom: Roman Bogorodskiy # # $FreeBSD$ # PORTNAME= conky PORTVERSION= 1.7.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= SF MAINTAINER?= ntarmos@cs.uoi.gr COMMENT?= An advanced, highly configurable system monitor for X CONFLICTS?= conky-awesome-[0-9]* SLAVEDIRS= sysutils/conky-awesome +USE_ICONV= yes USE_BZIP2= yes GNU_CONFIGURE= yes USE_XORG?= x11 xext xdamage USE_GNOME?= pkgconfig USE_ICONV= yes USE_GMAKE= yes CONFIGURE_ARGS+= --disable-portmon \ - --disable-hddtemp + --disable-hddtemp \ + --disable-apcupsd \ + --disable-iostats CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" MAN1= conky.1 PLIST_FILES= bin/conky PORTEXAMPLES= conkyrc.sample PORTDOCS= README AUTHORS ChangeLog TODO NEWS \ docs.html variables.html config_settings.html OPTIONS+= AUDACIOUS "Enable Audacious support" Off \ BMPX "Enable BMPX support" Off \ - LUA "Enable Lua support" Off \ MPD "Enable MPD support" Off \ + RSS "Enable RSS support" Off \ XMMS2 "Enable XMMS2 support" Off .if !empty(USE_XORG) OPTIONS+= DOUBLE_BUFFER "Enable double buffering" On \ IMLIB2 "Enable Imlib2 support" Off \ + LUA "Enable Lua support" Off \ + LUA_CAIRO "Enable Lua-Cairo binding (impl. Lua)" Off \ + LUA_IMLIB2 "Enable Lua-Imlib2 binding (impl. Lua/Imlib2)" Off \ XFT "Enable Xft support" Off +.else +OPTIONS+= LUA "Enable Lua support" Off .endif .include .if empty(USE_XORG) WITHOUT_DOUBLE_BUFFER= On +CONFIGURE_ARGS+= --disable-x11 --disable-own-window .undef WITH_IMLIB2 +.undef WITH_LUA_CAIRO +.undef WITH_LUA_IMLIB2 .undef WITH_XFT .endif .if defined(WITH_AUDACIOUS) LIB_DEPENDS+= audclient.2:${PORTSDIR}/multimedia/audacious CONFIGURE_ARGS+= --enable-audacious .else CONFIGURE_ARGS+= --disable-audacious .endif .if defined(WITH_BMPX) BUILD_DEPENDS+= beep-media-player-2:${PORTSDIR}/multimedia/bmpx RUN_DEPENDS+= beep-media-player-2:${PORTSDIR}/multimedia/bmpx LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus CONFIGURE_ARGS+= --enable-bmpx .else CONFIGURE_ARGS+= --disable-bmpx .endif -.if defined(WITH_LUA) +.if defined(WITH_LUA) || defined(WITH_LUA_CAIRO) || defined(WITH_LUA_IMLIB2) USE_LUA= 5.1+ CONFIGURE_ARGS+= --enable-lua .else CONFIGURE_ARGS+= --disable-lua .endif -.if defined(WITH_IMLIB2) +.if defined(WITH_LUA_CAIRO) +LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo +BUILD_DEPENDS+= tolua++-5.1:${PORTSDIR}/lang/tolua++ +CONFIGURE_ARGS+= --enable-lua-cairo +.endif + +.if defined(WITH_IMLIB2) || defined(WITH_LUA_IMLIB2) LIB_DEPENDS+= Imlib2.5:${PORTSDIR}/graphics/imlib2 CONFIGURE_ARGS+= --enable-imlib2 .else CONFIGURE_ARGS+= --disable-imlib2 .endif +.if defined(WITH_LUA_IMLIB2) +BUILD_DEPENDS+= tolua++-5.1:${PORTSDIR}/lang/tolua++ +CONFIGURE_ARGS+= --enable-lua-imlib2 +.endif + .if defined(WITH_XFT) LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft CONFIGURE_ARGS+= --enable-xft .else CONFIGURE_ARGS+= --disable-xft .endif .if defined(WITHOUT_MPD) CONFIGURE_ARGS+= --disable-mpd .endif +.if defined(WITH_RSS) +LIB_DEPENDS+= curl.5:${PORTSDIR}/ftp/curl \ + xml2.5:${PORTSDIR}/textproc/libxml2 +CONFIGURE_ARGS+= --enable-rss +USE_GNOME+= glib20 +.endif + .if defined(WITH_XMMS2) LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2 CONFIGURE_ARGS+= --enable-xmms2 .else CONFIGURE_ARGS+= --disable-xmms2 .endif .if defined(WITHOUT_DOUBLE_BUFFER) CONFIGURE_ARGS+= --disable-double-buffer .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 ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/conky.1 ${PREFIX}/man/man1 post-install: .if !defined(NOPORTEXAMPLES) @${MKDIR} ${EXAMPLESDIR} . if !empty(USE_XORG) @${INSTALL_DATA} ${WRKSRC}/data/conky.conf ${EXAMPLESDIR}/conkyrc.sample . else @${INSTALL_DATA} ${WRKSRC}/data/conky_no_x11.conf ${EXAMPLESDIR}/conkyrc.sample . endif .endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for i in README AUTHORS ChangeLog TODO NEWS ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .for i in docs.html variables.html config_settings.html ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR} .endfor .endif .include diff --git a/sysutils/conky/files/patch-configure b/sysutils/conky/files/patch-configure index 9e5434264b55..74cd4d428180 100644 --- a/sysutils/conky/files/patch-configure +++ b/sysutils/conky/files/patch-configure @@ -1,10 +1,28 @@ ---- configure.orig 2009-09-17 09:53:21.000000000 +0300 -+++ configure 2009-09-17 10:13:11.000000000 +0300 +--- configure.orig ++++ configure +@@ -15930,7 +15930,7 @@ + + fi + fi +- for ac_prog in tolua++ tolua++5.1 ++ for ac_prog in tolua++ tolua++5.1 tolua++-5.1 + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -16006,7 +16006,7 @@ + return 0; + } + _ACEOF +-for ac_lib in '' tolua++ tolua++5.1; do ++for ac_lib in '' tolua++-5.1 tolua++ tolua++5.1; do + if test -z "$ac_lib"; then + ac_res="none required" + else @@ -19845,7 +19845,6 @@ ac_res=$ac_cv_search_clock_gettime if test "$ac_res" != no; then test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - conky_LIBS="$conky_LIBS -lrt" cat >>confdefs.h <<\_ACEOF #define HAVE_CLOCK_GETTIME 1 diff --git a/sysutils/conky/files/patch-data-conky_no_x11.conf b/sysutils/conky/files/patch-data-conky_no_x11.conf deleted file mode 100644 index 4f336303ae17..000000000000 --- a/sysutils/conky/files/patch-data-conky_no_x11.conf +++ /dev/null @@ -1,56 +0,0 @@ ---- /dev/null -+++ data/conky_no_x11.conf -@@ -0,0 +1,53 @@ -+# Conky, a system monitor, based on torsmo -+# -+# Any original torsmo code is licensed under the BSD license -+# -+# All code written since the fork of torsmo is licensed under the GPL -+# -+# Please see COPYING for details -+# -+# Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen -+# Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) -+# All rights reserved. -+# -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see . -+# -+ -+background no -+cpu_avg_samples 2 -+net_avg_samples 2 -+no_buffers yes -+out_to_console no -+out_to_stderr no -+update_interval 1.0 -+uppercase no -+use_spacer none -+ -+TEXT -+${scroll 16 $nodename - $sysname $kernel on $machine | } -+Uptime: $uptime -+Frequency (in MHz): $freq -+Frequency (in GHz): $freq_g -+RAM Usage: $mem/$memmax - $memperc% ${membar 4} -+Swap Usage: $swap/$swapmax - $swapperc% ${swapbar 4} -+CPU Usage: $cpu% ${cpubar 4} -+Processes: $processes Running: $running_processes -+File systems: -+ / ${fs_used /}/${fs_size /} ${fs_bar 6 /} -+Networking: -+Up: ${upspeed eth0} - Down: ${downspeed eth0} -+Name PID CPU% MEM% -+ ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1} -+ ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2} -+ ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3} -+ ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}