diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2008-08-19 23:10:55 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2008-08-19 23:10:55 +0000 |
| commit | d9aa6f5324e7b3537527baa181f944e80044b30c (patch) | |
| tree | 41787ea8178257f812c07f0760de76cea0afefa0 /sysutils/conky-awesome | |
| parent | df2ed5bf4e7e5cc6f58ce4e56275bc32171fd625 (diff) | |
| download | ports-d9aa6f5324e7b3537527baa181f944e80044b30c.tar.gz ports-d9aa6f5324e7b3537527baa181f944e80044b30c.zip | |
Re-roll the -awesome patch for the conky-1.6.1 release.
Notes
Notes:
svn path=/head/; revision=218884
Diffstat (limited to 'sysutils/conky-awesome')
| -rw-r--r-- | sysutils/conky-awesome/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/conky-awesome/files/patch-src_conky.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile index d0cccdc167b8..a1694f1767a2 100644 --- a/sysutils/conky-awesome/Makefile +++ b/sysutils/conky-awesome/Makefile @@ -10,15 +10,15 @@ PKGNAMESUFFIX= -awesome MAINTAINER= adamw@FreeBSD.org COMMENT= An advanced, highly configurable system monitor (configured for x11-wm/awesome) -MASTERDIR= ${.CURDIR}/../conky +MASTERDIR= ${.CURDIR}/../../sysutils/conky DESCR= ${.CURDIR}/pkg-descr EXTRA_PATCHES= ${.CURDIR}/files/patch-* CONFLICTS= conky-[0-9]* -USE_XORG= -USE_GNOME= pkgconfig +USE_XORG= # This is a comment +USE_GNOME= pkgconfig CONFIGURE_ARGS+= --disable-x11 .include "${MASTERDIR}/Makefile" diff --git a/sysutils/conky-awesome/files/patch-src_conky.c b/sysutils/conky-awesome/files/patch-src_conky.c index ab0ef96ac80d..e9d48cb9d33a 100644 --- a/sysutils/conky-awesome/files/patch-src_conky.c +++ b/sysutils/conky-awesome/files/patch-src_conky.c @@ -1,9 +1,9 @@ ---- src/conky.c.orig 2008-05-27 00:43:05.000000000 -0400 -+++ src/conky.c 2008-05-27 00:43:36.000000000 -0400 -@@ -6513,7 +6513,7 @@ static void draw_string(const char *s) +--- src/conky.c.orig 2008-08-19 16:02:53.000000000 -0700 ++++ src/conky.c 2008-08-19 16:03:36.000000000 -0700 +@@ -6672,7 +6672,7 @@ static void draw_string(const char *s) width_of_s = get_string_width(s); - if (out_to_console) { + if ((output_methods & TO_STDOUT) && draw_mode == FG) { - printf("%s\n", s); + printf("%s\n\n", s); fflush(stdout); /* output immediately, don't buffer */ |