From 60b9c67ddab8444ef2d369507eb196e4693bcc3a Mon Sep 17 00:00:00 2001
From: jcs <jcs@openbsd.org>
Date: Sun, 20 Jan 2002 23:51:31 +0000
Subject: [PATCH] build with recent glib change regarding pthread noticed by
 naddy@

---
 .../gkrellm/patches/patch-Makefile_top_enable_nls   | 13 +++++++------
 sysutils/gkrellm/patches/patch-src_Makefile_src     | 11 +++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sysutils/gkrellm/patches/patch-Makefile_top_enable_nls b/sysutils/gkrellm/patches/patch-Makefile_top_enable_nls
index e5fbf3b6aa4..46ecb9a4e8d 100644
--- a/sysutils/gkrellm/patches/patch-Makefile_top_enable_nls
+++ b/sysutils/gkrellm/patches/patch-Makefile_top_enable_nls
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_top_enable_nls,v 1.1 2002/01/06 21:06:50 jcs Exp $
---- Makefile.top_enable_nls.orig	Sun Jan  6 14:35:55 2002
-+++ Makefile.top_enable_nls	Sun Jan  6 14:39:10 2002
+$OpenBSD: patch-Makefile_top_enable_nls,v 1.2 2002/01/20 23:51:31 jcs Exp $
+--- Makefile.top_enable_nls.orig	Wed Dec  5 01:41:15 2001
++++ Makefile.top_enable_nls	Sun Jan 20 17:36:54 2002
 @@ -79,15 +79,15 @@
  GTOP_LIBS = -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps -lXau
  
@@ -21,12 +21,13 @@ $OpenBSD: patch-Makefile_top_enable_nls,v 1.1 2002/01/06 21:06:50 jcs Exp $
  
  export GTK_CONFIG GTOP_INCLUDE GTOP_LIBS SYS_LIBS EXTRAOBJS BINMODE
  export INSTALLDIR INCLUDEDIR INCLUDEMODE INCLUDEDIRMODE LOCALEDIR
-@@ -139,7 +139,7 @@
+@@ -139,8 +139,7 @@
  openbsd:
  	(cd po && ${MAKE} all)
  	(cd src && ${MAKE} GTK_CONFIG=gtk-config GTOP_LIBS= GTOP_INCLUDE= \
 -		PTHREAD_INC=-I/usr/local/include EXTRAOBJS= \
-+		PTHREAD_INC=-I${LOCALBASE}/include/pth EXTRAOBJS= \
- 		SYS_LIBS="-lkvm" gkrellm )
+-		SYS_LIBS="-lkvm" gkrellm )
++		SYS_LIBS="-lkvm -pthread" gkrellm )
  
  solaris:
+ 	(cd po && ${MAKE} MSGFMT_OPT="-v -o" \
diff --git a/sysutils/gkrellm/patches/patch-src_Makefile_src b/sysutils/gkrellm/patches/patch-src_Makefile_src
index a6644ce3019..93a55edc7e2 100644
--- a/sysutils/gkrellm/patches/patch-src_Makefile_src
+++ b/sysutils/gkrellm/patches/patch-src_Makefile_src
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_Makefile_src,v 1.4 2002/01/06 21:06:50 jcs Exp $
---- src/Makefile.src.orig	Sun Jan  6 14:42:03 2002
-+++ src/Makefile.src	Sun Jan  6 14:46:26 2002
+$OpenBSD: patch-src_Makefile_src,v 1.5 2002/01/20 23:51:31 jcs Exp $
+--- src/Makefile.src.orig	Thu Dec 20 13:09:48 2001
++++ src/Makefile.src	Sun Jan 20 17:38:58 2002
 @@ -1,15 +1,15 @@
  GTK_CONFIG ?= gtk-config
  EXTRAOBJS ?= md5c.o
@@ -40,14 +40,13 @@ $OpenBSD: patch-src_Makefile_src,v 1.4 2002/01/06 21:06:50 jcs Exp $
  
  OBJS =	main.o alerts.o apm.o base64.o clock.o cpu.o disk.o fs.o hostname.o \
  	inet.o mail.o meminfo.o net.o proc.o sensors.o uptime.o \
-@@ -63,6 +62,10 @@
+@@ -63,6 +62,9 @@
  netbsd:
  	$(MAKE) PTHREAD_INC=-I/usr/local/include \
  	GTK_CONFIG=gtk-config GTOP_LIBS= EXTRAOBJS= SYS_LIBS="-lkvm" gkrellm
 +
 +openbsd:
-+	$(MAKE) PTHREAD_INC=-I${LOCALBASE}/include/pth \
-+	GTK_CONFIG=gtk-config GTOP_LIBS= SYS_LIBS="-lkvm" gkrellm
++	$(MAKE) GTK_CONFIG=gtk-config GTOP_LIBS= SYS_LIBS="-lkvm -pthread" gkrellm
  
  solaris:
  	$(MAKE) CFLAGS="-Wno-implicit-int" \