From ad267be72efb50f81fa66b28e694e5df7aabf6e6 Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Wed, 25 Aug 2010 19:05:25 +0200
Subject: [PATCH] gkrellm: Updated (2.3.2 -> 2.3.4)

---
 gnome2/gkrellm/gkrellm.desc |  6 +++---
 gnome2/gkrellm/libsm.patch  | 25 +++++++++++++------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/gnome2/gkrellm/gkrellm.desc b/gnome2/gkrellm/gkrellm.desc
index aad26f664..c7d659f1c 100644
--- a/gnome2/gkrellm/gkrellm.desc
+++ b/gnome2/gkrellm/gkrellm.desc
@@ -3,7 +3,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../gkrellm/gkrellm.desc
-[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY]
@@ -55,10 +55,10 @@
 
 [L] GPL
 [S] Stable
-[V] 2.3.2
+[V] 2.3.4
 [P] X -----5---9 159.800
 
 [O] . $base/package/*/*/gnome2-conf.in
 
-[D] 4136761672 gkrellm-2.3.2.tar.bz2 http://members.dslextreme.com/users/billw/gkrellm/
+[D] 3251300126 gkrellm-2.3.4.tar.bz2 http://members.dslextreme.com/users/billw/gkrellm/
 
diff --git a/gnome2/gkrellm/libsm.patch b/gnome2/gkrellm/libsm.patch
index 0ad6077ad..14091198b 100644
--- a/gnome2/gkrellm/libsm.patch
+++ b/gnome2/gkrellm/libsm.patch
@@ -2,6 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gkrellm/libsm.patch
+# Copyright (C) 2010 The OpenSDE Project
 # Copyright (C) 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -14,10 +15,10 @@
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-diff -ur gkrellm-2.2.7/Makefile gkrellm-2.2.7-t2/Makefile
---- gkrellm-2.2.7/Makefile	2005-05-22 18:18:44.000000000 +0200
-+++ gkrellm-2.2.7-t2/Makefile	2006-01-25 14:10:16.000000000 +0100
-@@ -207,7 +207,7 @@
+diff -ruN gkrellm-2.3.4-orig/Makefile gkrellm-2.3.4/Makefile
+--- gkrellm-2.3.4-orig/Makefile	2010-01-05 00:13:13.000000000 +0100
++++ gkrellm-2.3.4/Makefile	2010-08-25 19:00:46.800005755 +0200
+@@ -247,7 +247,7 @@
  	(cd po && ${MAKE} all)
  	(cd src && ${MAKE} \
  		EXTRAOBJS= SYS_LIBS="-lkvm" \
@@ -26,7 +27,7 @@ diff -ur gkrellm-2.2.7/Makefile gkrellm-2.2.7-t2/Makefile
  		gkrellm )
  	(cd server && ${MAKE} \
  		EXTRAOBJS= SYS_LIBS="-lkvm" gkrellmd )
-@@ -216,7 +216,7 @@
+@@ -256,7 +256,7 @@
  	(cd po && ${MAKE} all)
  	(cd src && ${MAKE} \
  		EXTRAOBJS= SYS_LIBS="-lkvm -pthread" \
@@ -35,19 +36,19 @@ diff -ur gkrellm-2.2.7/Makefile gkrellm-2.2.7-t2/Makefile
  		gkrellm )
  	(cd server && ${MAKE} \
  		EXTRAOBJS= SYS_LIBS="-lkvm -pthread" gkrellmd )
-diff -ur gkrellm-2.2.7/src/Makefile gkrellm-2.2.7-t2/src/Makefile
---- gkrellm-2.2.7/src/Makefile	2005-05-09 18:54:03.000000000 +0200
-+++ gkrellm-2.2.7-t2/src/Makefile	2006-01-25 14:16:58.000000000 +0100
-@@ -17,7 +17,7 @@
+diff -ruN gkrellm-2.3.4-orig/src/Makefile gkrellm-2.3.4/src/Makefile
+--- gkrellm-2.3.4-orig/src/Makefile	2010-01-05 00:12:07.000000000 +0100
++++ gkrellm-2.3.4/src/Makefile	2010-08-25 19:00:46.800005755 +0200
+@@ -20,7 +20,7 @@
  MANDIRMODE ?= 755
  INSTALL ?= install
  LINK_FLAGS ?= -Wl,-E
 -SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE
 +SMC_LIBS ?= $(shell pkg-config --libs sm)
  
- ifeq ($(without-gnutls),1)
- 	CONFIGURE_ARGS += --without-gnutls
-@@ -128,11 +128,11 @@
+ X11_LIBS ?= -lX11
+ 
+@@ -188,11 +188,11 @@
  
  netbsd1:
  	$(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm" \