Updated to version 1.2.3 based partly on Anthony Mallet's patches in PR pkg/14369.

4 files changed, 39 insertions, 29 deletions

diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 1ca24111942..ef022d78060 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:07 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/30 13:31:47 damon Exp $
 #
 
-DISTNAME=	gkrellm-1.2.2
+DISTNAME=	gkrellm-1.2.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/
 
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index d8930d08043..47a36b6ce1d 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2001/09/08 21:53:57 zuntum Exp $
+$NetBSD: distinfo,v 1.7 2001/10/30 13:31:47 damon Exp $
 
-SHA1 (gkrellm-1.2.2.tar.gz) = 99c73cef85e669b55891062a997053250da9848f
-Size (gkrellm-1.2.2.tar.gz) = 496063 bytes
-SHA1 (patch-aa) = 72941aadf630c1c0fb52fd10488c4cc8369149cb
-SHA1 (patch-ab) = ca1a2fdfff839abb99e1778b99bc06141636ac23
+SHA1 (gkrellm-1.2.3.tar.gz) = d2fab7761683201dff4789ed0e6fe1dae9cac7d6
+Size (gkrellm-1.2.3.tar.gz) = 542641 bytes
+SHA1 (patch-aa) = 95fd62e2a12c376303046b7196b803c49ceeadc3
+SHA1 (patch-ab) = 274a69da75c369ab07cb5c1568cb1b787dbc267c
diff --git a/sysutils/gkrellm/patches/patch-aa b/sysutils/gkrellm/patches/patch-aa
index 8be65813b7d..921e4160c7e 100644
--- a/sysutils/gkrellm/patches/patch-aa
+++ b/sysutils/gkrellm/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2001/09/08 21:53:57 zuntum Exp $
+$NetBSD: patch-aa,v 1.5 2001/10/30 13:31:48 damon Exp $
 
---- Makefile.top.orig	Sun Jun 17 17:28:19 2001
+--- Makefile.top.orig	Sat Oct 20 11:51:29 2001
 +++ Makefile.top
-@@ -30,7 +30,7 @@
- #
- # Default
- #--------
--GTK_CONFIG = gtk-config
-+#GTK_CONFIG = gtk-config
- BINMODE = 755
- 
- # FreeBSD 2.X
 @@ -74,11 +74,11 @@
  GTOP_LIBS = -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps -lXau
  
@@ -29,11 +20,11 @@ $NetBSD: patch-aa,v 1.4 2001/09/08 21:53:57 zuntum Exp $
 @@ -127,8 +127,8 @@
  
  netbsd:
- 	(cd locale && ${MAKE} all)
+ 	(cd po && ${MAKE} all)
 -	(cd src && ${MAKE} GTK_CONFIG=gtk-config GTOP_LIBS= GTOP_INCLUDE= \
 -		PTHREAD_INC=-I/usr/local/include SYS_LIBS="-lkvm" gkrellm )
 +	(cd src && ${MAKE} GTK_CONFIG=${GTK_CONFIG} GTOP_LIBS= GTOP_INCLUDE= \
 +		PTHREAD_INC=-I$(BUILDLINK_DIR)/include SYS_LIBS="-lkvm" gkrellm )
  
  openbsd:
- 	(cd locale && ${MAKE} all)
+ 	(cd po && ${MAKE} all)
diff --git a/sysutils/gkrellm/patches/patch-ab b/sysutils/gkrellm/patches/patch-ab
index 651640227dc..8570faac717 100644
--- a/sysutils/gkrellm/patches/patch-ab
+++ b/sysutils/gkrellm/patches/patch-ab
@@ -1,14 +1,22 @@
-$NetBSD: patch-ab,v 1.4 2001/09/08 21:53:57 zuntum Exp $
+$NetBSD: patch-ab,v 1.5 2001/10/30 13:31:48 damon Exp $
 
---- src/Makefile.src.orig	Sat Jul 21 20:59:58 2001
+--- src/Makefile.src.orig	Fri Oct 12 09:01:04 2001
 +++ src/Makefile.src
-@@ -1,4 +1,4 @@
--GTK_CONFIG ?= gtk-config
-+#GTK_CONFIG ?= gtk-config
+@@ -1,10 +1,10 @@
+ GTK_CONFIG ?= gtk-config
  BINMODE ?= 755
- INSTALLDIR ?= /usr/local/bin
- INCLUDEDIR ?= /usr/local/include
-@@ -12,15 +12,17 @@
+-INSTALLDIR ?= /usr/local/bin
+-INCLUDEDIR ?= /usr/local/include
++INSTALLDIR ?= ${PREFIX}/bin
++INCLUDEDIR ?= ${PREFIX}/include
+ INCLUDEMODE ?= 644
+ INCLUDEDIRMODE ?= 755
+-MANDIR ?= /usr/local/share/man/man1
++MANDIR ?= ${PREFIX}/man/man1
+ MANMODE ?= 644
+ MANDIRMODE ?= 755
+ INSTALL ?= install
+@@ -13,15 +13,17 @@
  GKRELLM_INCLUDES = gkrellm.h gkrellm_public_proto.h
  
  GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread`
@@ -30,7 +38,7 @@ $NetBSD: patch-ab,v 1.4 2001/09/08 21:53:57 zuntum Exp $
  
  ifeq ($(debug),1)
      FLAGS += -g
-@@ -35,7 +37,7 @@
+@@ -36,7 +38,7 @@
  endif
  
  
@@ -39,3 +47,14 @@ $NetBSD: patch-ab,v 1.4 2001/09/08 21:53:57 zuntum Exp $
  
  OBJS =	main.o alerts.o apm.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 \
+@@ -59,8 +61,8 @@
+ 		 SYS_LIBS="-lkvm -ldevstat" gkrellm
+ 
+ netbsd:
+-	$(MAKE) PTHREAD_INC=-I/usr/local/include \
+-	GTK_CONFIG=gtk-config GTOP_LIBS= SYS_LIBS="-lkvm" gkrellm
++	$(MAKE) PTHREAD_INC=-I$(BUILDLINK_DIR)/include \
++	GTK_CONFIG=$(GTK_CONFIG) GTOP_LIBS= SYS_LIBS="-lkvm" gkrellm
+ 
+ solaris:
+ 	$(MAKE) CFLAGS="-Wno-implicit-int" \