From 35bba2473c08920c7f5cdedec7eb0eea9674c34f Mon Sep 17 00:00:00 2001
From: pav <pav@FreeBSD.org>
Date: Tue, 3 Jun 2008 22:03:31 +0000
Subject: - Update to 1.5.1

Submitted by:	adamw
Approved by:	maintainer (novel)
---
 sysutils/conky-awesome/Makefile                |  3 ++-
 sysutils/conky-awesome/files/patch-src_conky.c | 12 ++++++------
 sysutils/conky-awesome/pkg-plist               |  4 ----
 3 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 sysutils/conky-awesome/pkg-plist

(limited to 'sysutils/conky-awesome')

diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile
index 705c0e90a767..d0cccdc167b8 100644
--- a/sysutils/conky-awesome/Makefile
+++ b/sysutils/conky-awesome/Makefile
@@ -12,7 +12,8 @@ COMMENT=	An advanced, highly configurable system monitor (configured for x11-wm/
 
 MASTERDIR=	${.CURDIR}/../conky
 DESCR=		${.CURDIR}/pkg-descr
-PATCHDIR=	${.CURDIR}/files
+
+EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
 CONFLICTS=	conky-[0-9]*
 
diff --git a/sysutils/conky-awesome/files/patch-src_conky.c b/sysutils/conky-awesome/files/patch-src_conky.c
index e60d666ef278..ab0ef96ac80d 100644
--- a/sysutils/conky-awesome/files/patch-src_conky.c
+++ b/sysutils/conky-awesome/files/patch-src_conky.c
@@ -1,11 +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;
+--- 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)
+ 
  	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 */
+ 		fflush(stdout);	/* output immediately, don't buffer */
  	}
- 	memset(tmpstring1,0,TEXT_BUFFER_SIZE);
+ 	memset(tmpstring1, 0, text_buffer_size);
diff --git a/sysutils/conky-awesome/pkg-plist b/sysutils/conky-awesome/pkg-plist
deleted file mode 100644
index b9484c49cce2..000000000000
--- a/sysutils/conky-awesome/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $FreeBSD$
-bin/conky
-%%EXAMPLESDIR%%/conkyrc.sample
-@dirrm %%EXAMPLESDIR%%
-- 
cgit