From fa177934f4ea05c00e393e865c9b7fc7d689203e Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 25 May 2008 17:20:54 +0000 Subject: Add sysutils/conky-awesome after a repocopy from sysutils/conky. Conky-awesome is the conky X-based system monitor ported to the awesome window manager. Submitted by: adamw Conky diffs approved by: novel --- sysutils/Makefile | 1 + sysutils/conky-awesome/Makefile | 113 +++---------------------- sysutils/conky-awesome/files/patch-src_conky.c | 11 +++ sysutils/conky-awesome/pkg-descr | 7 +- sysutils/conky/Makefile | 11 ++- 5 files changed, 36 insertions(+), 107 deletions(-) create mode 100644 sysutils/conky-awesome/files/patch-src_conky.c diff --git a/sysutils/Makefile b/sysutils/Makefile index 79c80555edc6..47f8bfc8ef76 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -100,6 +100,7 @@ SUBDIR += comiccron SUBDIR += condor SUBDIR += conky + SUBDIR += conky-awesome SUBDIR += consolehm SUBDIR += consolekit SUBDIR += contool diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile index 70d41eeb7d2e..5826e74bf524 100644 --- a/sysutils/conky-awesome/Makefile +++ b/sysutils/conky-awesome/Makefile @@ -5,110 +5,19 @@ # $FreeBSD$ # -PORTNAME= conky -PORTVERSION= 1.4.9 -PORTREVISION= 1 -CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +PKGNAMESUFFIX= -awesome -MAINTAINER= novel@FreeBSD.org -COMMENT= An advanced, highly configurable system monitor for X +MAINTAINER= adamw@FreeBSD.org +COMMENT= An advanced, highly configurable system monitor (configured for x11-wm/awesome) -USE_BZIP2= yes -GNU_CONFIGURE= yes -USE_XORG= x11 xext xdamage -USE_GNOME= pkgconfig -USE_ICONV= yes -CONFIGURE_ARGS+= --disable-portmon \ - --disable-proc-uptime \ - --disable-hddtemp -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +MASTERDIR= ${.CURDIR}/../conky +DESCR= ${.CURDIR}/pkg-descr +PATCHDIR= ${.CURDIR}/files -MAN1= conky.1 +CONFLICTS= conky-[0-9]* -PORTDOCS= README AUTHORS ChangeLog TODO NEWS \ - docs.html variables.html config_settings.html +USE_XORG= +USE_GNOME= +CONFIGURE_ARGS+= --disable-x11 -.if defined(WITH_AUDACIOUS) -LIB_DEPENDS+= audacious.5:${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_XFT) -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -CONFIGURE_ARGS+= --enable-xft -.else -CONFIGURE_ARGS+= --disable-xft -.endif - -#.if !defined(WITHOUT_OWN_WINDOW) -#CONFIGURE_ARGS+= --enable-own-window -#.else -#CONFIGURE_ARGS+= --disable-own-window -#.endif - -.if defined(WITH_MPD) -CONFIGURE_ARGS+= --enable-mpd -.else -CONFIGURE_ARGS+= --disable-mpd -.endif - -.if defined(WITH_XMMS2) -LIB_DEPENDS+= xmmsclient.3:${PORTSDIR}/audio/xmms2 -CONFIGURE_ARGS+= --enable-xmms2 -.else -CONFIGURE_ARGS+= --disable-xmms2 -.endif - -.if defined(WITHOUT_DOUBLE_BUFFER) -CONFIGURE_ARGS+= --disable-double-buffer -.endif - -.if defined(WITHOUT_SETI) -CONFIGURE_ARGS+= --disable-seti -.endif - -pre-everything:: - @${ECHO_MSG} "You may specify the following on the command line:" - @${ECHO_MSG} " " - @${ECHO_MSG} "WITH_AUDACIOUS=yes to enable Audacious support" - @${ECHO_MSG} "WITH_BMPX=yes to enable BMPx support" - @${ECHO_MSG} "WITH_XFT=yes to enable XFT support" - @${ECHO_MSG} "WITHOUT_OWN_WINDOW=yes to disable own window support" - @${ECHO_MSG} "WITH_MPD=yes to enable MPD support" - @${ECHO_MSG} "WITH_XMMS2=yes to enable XMMS2 support" - @${ECHO_MSG} "WITHOUT_DOUBLE_BUFFER=yes to disable double buffer support" - @${ECHO_MSG} " " - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/conky.1 ${PREFIX}/man/man1 - -post-install: - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/conkyrc.sample ${EXAMPLESDIR} - -.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 +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/conky-awesome/files/patch-src_conky.c b/sysutils/conky-awesome/files/patch-src_conky.c new file mode 100644 index 000000000000..e60d666ef278 --- /dev/null +++ b/sysutils/conky-awesome/files/patch-src_conky.c @@ -0,0 +1,11 @@ +--- src/conky.c.orig 2008-05-24 12:23:40.000000000 -0400 ++++ src/conky.c 2008-05-24 12:24:07.000000000 -0400 +@@ -5798,7 +5798,7 @@ + int added; + width_of_s = get_string_width(s); + if (out_to_console) { +- printf("%s\n", s); ++ printf("%s\n\n", s); + fflush(stdout); /* output immediately, don't buffer */ + } + memset(tmpstring1,0,TEXT_BUFFER_SIZE); diff --git a/sysutils/conky-awesome/pkg-descr b/sysutils/conky-awesome/pkg-descr index 67194efac674..541d2f386e50 100644 --- a/sysutils/conky-awesome/pkg-descr +++ b/sysutils/conky-awesome/pkg-descr @@ -1,3 +1,8 @@ -Conky is an advanced, highly configurable system monitor for X +Conky is an advanced, highly configurable system monitor. + +This port configures conky for use with the Awesome window manager +from x11-wm/awesome. Unless you're using Awesome or some other system +with a client pipe, you probably want the main version of Conky in +sysutils/conky. WWW: http://conky.sourceforge.net/ diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 70d41eeb7d2e..17efda2529c1 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -12,13 +12,16 @@ CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= novel@FreeBSD.org -COMMENT= An advanced, highly configurable system monitor for X +MAINTAINER?= novel@FreeBSD.org +COMMENT?= An advanced, highly configurable system monitor for X + +CONFLICTS?= conky-awesome-[0-9]* +SLAVEDIRS= sysutils/conky-awesome USE_BZIP2= yes GNU_CONFIGURE= yes -USE_XORG= x11 xext xdamage -USE_GNOME= pkgconfig +USE_XORG?= x11 xext xdamage +USE_GNOME?= pkgconfig USE_ICONV= yes CONFIGURE_ARGS+= --disable-portmon \ --disable-proc-uptime \ -- cgit