make it compilable with gcc 4.1.

Reported by:	pointyhat via kris

3 files changed, 36 insertions, 0 deletions

diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index d3531685665e..123ea2a9d7ca 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -26,6 +26,8 @@ USE_GNOME=	imlib
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 
+MAKE_ENV+=	CC="${CC}"
+
 INCLUDES=	gkrellm.h gkrellm_public_proto.h
 MAN1=		gkrellm.1
 
diff --git a/sysutils/gkrellm/files/patch-src::chart.c b/sysutils/gkrellm/files/patch-src::chart.c
new file mode 100644
index 000000000000..acb0201b5d52
--- /dev/null
+++ b/sysutils/gkrellm/files/patch-src::chart.c
@@ -0,0 +1,21 @@
+Index: src/chart.c
+diff -u -p src/chart.c.orig src/chart.c
+--- src/chart.c.orig	Sun Mar 17 10:44:49 2002
++++ src/chart.c	Sun Dec 17 00:10:41 2006
+@@ -22,6 +22,8 @@
+ #include "gkrellm.h"
+ #include "gkrellm_private_proto.h"
+ 
++static void	set_grid_resolution_spin_button(Chart *, gint);
++
+   /* For grid images of height 2 pixels, make room at bottom of chartdata
+   |  window so both pixel lines will show.
+   */
+@@ -470,7 +472,6 @@ draw_chartdata_lines(Chart *cp, ChartDat
+ static void
+ set_auto_grid_resolution(Chart *cp, gint maxval)
+ 	{
+-	static void	set_grid_resolution_spin_button(Chart *, gint);
+ 	ChartConfig	*cf = cp->config;
+ 	gint		grids, grid_res, maxval_base;
+ 
diff --git a/sysutils/gkrellm/files/patch-src::gkrellm_private_proto.h b/sysutils/gkrellm/files/patch-src::gkrellm_private_proto.h
new file mode 100644
index 000000000000..0c60cb30581d
--- /dev/null
+++ b/sysutils/gkrellm/files/patch-src::gkrellm_private_proto.h
@@ -0,0 +1,13 @@
+Index: src/gkrellm_private_proto.h
+diff -u src/gkrellm_private_proto.h.orig src/gkrellm_private_proto.h
+--- src/gkrellm_private_proto.h.orig	Thu May 23 06:53:12 2002
++++ src/gkrellm_private_proto.h	Sun Dec 17 00:14:56 2006
+@@ -30,8 +30,6 @@
+ extern gint			window_decorations;
+ extern gint			n_system_plugins;
+ 
+-extern GdkImlibBorder zero_border;
+-
+ void load_plugin_monitors(void);
+ 
+ void	create_plugin_config(GtkWidget *);