Update gkrellm to 1.2.11 (old distfile is no longer available):

many bug fixes; i18n support + translations for several languages;
mail-checker can now authenticate to an imap server; and a few new
configuration options.

6 files changed, 116 insertions, 48 deletions

diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 2e5a5009ba4..3cd2363b327 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2002/03/13 17:37:42 fredb Exp $
+# $NetBSD: Makefile,v 1.18 2002/05/02 20:45:35 fredb Exp $
 #
 
-DISTNAME=	gkrellm-1.2.4
-PKGNAME=	${DISTNAME}
-PKGREVISION=	2
+DISTNAME=	gkrellm-1.2.11
 CATEGORIES=	sysutils
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	anthony.mallet@ficus.yi.org
 HOMEPAGE=	http://gkrellm.net/
@@ -17,6 +16,8 @@ USE_GMAKE=		YES
 ALL_TARGET=		netbsd
 INSTALL_TARGET=		install_netbsd
 
+MAKE_ENV+=	PTHREAD_INC="-I${BUILDLINK_DIR}/include"
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/gkrellm
diff --git a/sysutils/gkrellm/PLIST b/sysutils/gkrellm/PLIST
index c6fdbae1f3d..134a97a5502 100644
--- a/sysutils/gkrellm/PLIST
+++ b/sysutils/gkrellm/PLIST
@@ -1,9 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2001/11/26 16:37:48 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/05/02 20:45:35 fredb Exp $
 bin/gkrellm
 include/gkrellm/gkrellm.h
 include/gkrellm/gkrellm_public_proto.h
 man/man1/gkrellm.1
 share/gkrellm/README
+share/locale/de/LC_MESSAGES/gkrellm.mo
+share/locale/es/LC_MESSAGES/gkrellm.mo
+share/locale/fr/LC_MESSAGES/gkrellm.mo
+share/locale/ja/LC_MESSAGES/gkrellm.mo
+share/locale/pl/LC_MESSAGES/gkrellm.mo
+share/locale/ru/LC_MESSAGES/gkrellm.mo
+share/locale/sv/LC_MESSAGES/gkrellm.mo
 @exec ${MKDIR} %D/share/gkrellm/themes
 @exec ${MKDIR} %D/lib/gkrellm/plugins
 @dirrm include/gkrellm
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index f78572e2065..02a5fb53961 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.10 2002/02/13 23:11:45 wiz Exp $
+$NetBSD: distinfo,v 1.11 2002/05/02 20:45:35 fredb Exp $
 
-SHA1 (gkrellm-1.2.4.tar.gz) = fb5076db2e2e4a804c0ca449676dfb2f8dea0879
-Size (gkrellm-1.2.4.tar.gz) = 546080 bytes
-SHA1 (patch-aa) = 95fd62e2a12c376303046b7196b803c49ceeadc3
-SHA1 (patch-ab) = f303ec22ab0e990b7382143a6e3d7b0a05490954
-SHA1 (patch-ac) = da677ecb30428cceac04f67ed5db2762e4108333
+SHA1 (gkrellm-1.2.11.tar.bz2) = 809d4bb0c983d65651919b7fd483b64b097a7bf3
+Size (gkrellm-1.2.11.tar.bz2) = 434998 bytes
+SHA1 (patch-aa) = 2e2cef9e105db082981e8357b83a0505a3e8cb54
+SHA1 (patch-ab) = f9fa96e47ad7fd47c2eaaf6b2a25b55cf1acb947
diff --git a/sysutils/gkrellm/patches/patch-aa b/sysutils/gkrellm/patches/patch-aa
index 921e4160c7e..19e4a4460af 100644
--- a/sysutils/gkrellm/patches/patch-aa
+++ b/sysutils/gkrellm/patches/patch-aa
@@ -1,30 +1,80 @@
-$NetBSD: patch-aa,v 1.5 2001/10/30 13:31:48 damon Exp $
+$NetBSD: patch-aa,v 1.6 2002/05/02 20:45:35 fredb Exp $
 
---- Makefile.top.orig	Sat Oct 20 11:51:29 2001
-+++ Makefile.top
-@@ -74,11 +74,11 @@
- GTOP_LIBS = -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps -lXau
+--- Makefile.top_enable_nls.orig	Wed Dec  5 01:41:15 2001
++++ Makefile.top_enable_nls
+@@ -31,8 +31,11 @@
+ # Default
+ #--------
+ GTK_CONFIG = gtk-config
++IMLIB_CONFIG = imlib-config
+ EXTRAOBJS = md5c.o
+ BINMODE = 755
++BINGRP = wheel
++PREFIX ?= /usr/local
+ 
+ # FreeBSD 2.X
+ #------------
+@@ -53,12 +56,17 @@
+ 
+ # NetBSD or OpenBSD
+ #------------------
+-#GTK_CONFIG= gtk-config
+-#GTOP_LIBS=
+-#PTHREAD_INC=-I/usr/local/include
+-#SYS_LIBS=-lkvm
+-#EXTRAOBJS =
+-#BINMODE=2755
++GTK_CONFIG ?= gtk-config
++IMLIB_CONFIG ?= imlib-config
++GTOP_INCLUDE =
++GTOP_LIBS =
++PTHREAD_INC ?= -I/usr/pkg/include
++EXTRAOBJS =
++LOCALEDIR = ${PREFIX}/share/locale
++MANDIR = ${PREFIX}/man/man1
++LINK_FLAGS = 
++BINMODE = 2755
++BINGRP = kmem
+ 
+ # Solaris 2.x
+ #------------
+@@ -75,21 +83,23 @@
+ # used if you "make gnome-gtop" or "make gtop".
+ #-----------------------------------
+ GTOP_PREFIX = /usr
+-GTOP_INCLUDE = -I$(GTOP_PREFIX)/include
+-GTOP_LIBS = -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps -lXau
++GTOP_INCLUDE ?= -I$(GTOP_PREFIX)/include
++GTOP_LIBS ?= -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps -lXau
  
  
 -INSTALLDIR=/usr/local/bin
 -MANDIR=/usr/local/share/man/man1
-+INSTALLDIR=${PREFIX}/bin
-+MANDIR=${PREFIX}/man/man1
++PREFIX ?= /usr/local
++INSTALLDIR ?= ${PREFIX}/bin
++MANDIR ?= ${PREFIX}/share/man/man1
  MANMODE = 644
  MANDIRMODE = 755
 -INCLUDEDIR=/usr/local/include
-+INCLUDEDIR=${PREFIX}/include
++INCLUDEDIR ?= ${PREFIX}/include
  INCLUDEMODE = 644
  INCLUDEDIRMODE = 755
  
-@@ -127,8 +127,8 @@
+ LOCALEDIR ?= /usr/share/locale
+ 
+ export GTK_CONFIG GTOP_INCLUDE GTOP_LIBS SYS_LIBS EXTRAOBJS BINMODE
++export BINGRP IMLIB_CONFIG LINK_FLAGS PREFIX
+ export INSTALLDIR INCLUDEDIR INCLUDEMODE INCLUDEDIRMODE LOCALEDIR
+ export MANDIR MANDIRMODE MANMODE
+ 
+@@ -132,9 +142,7 @@
  
  netbsd:
  	(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 )
+-		PTHREAD_INC=-I/usr/local/include EXTRAOBJS= \
+-		SYS_LIBS="-lkvm" gkrellm )
++	(cd src && ${MAKE} SYS_LIBS="-lkvm" gkrellm )
  
  openbsd:
  	(cd po && ${MAKE} all)
diff --git a/sysutils/gkrellm/patches/patch-ab b/sysutils/gkrellm/patches/patch-ab
index 61163baabcf..445bb1cd8ca 100644
--- a/sysutils/gkrellm/patches/patch-ab
+++ b/sysutils/gkrellm/patches/patch-ab
@@ -1,12 +1,16 @@
-$NetBSD: patch-ab,v 1.6 2001/11/01 14:08:02 hubertf Exp $
+$NetBSD: patch-ab,v 1.7 2002/05/02 20:45:35 fredb Exp $
 
---- src/Makefile.src.orig	Fri Oct 12 15:01:04 2001
+--- src/Makefile.src.orig	Thu Dec 20 13:09:48 2001
 +++ src/Makefile.src
-@@ -1,10 +1,10 @@
+@@ -1,11 +1,14 @@
  GTK_CONFIG ?= gtk-config
++IMLIB_CONFIG ?= imlib-config
++PREFIX ?= /usr/local
+ EXTRAOBJS ?= md5c.o
  BINMODE ?= 755
 -INSTALLDIR ?= /usr/local/bin
 -INCLUDEDIR ?= /usr/local/include
++BINGRP ?= wheel
 +INSTALLDIR ?= ${PREFIX}/bin
 +INCLUDEDIR ?= ${PREFIX}/include
  INCLUDEMODE ?= 644
@@ -16,7 +20,7 @@ $NetBSD: patch-ab,v 1.6 2001/11/01 14:08:02 hubertf Exp $
  MANMODE ?= 644
  MANDIRMODE ?= 755
  INSTALL ?= install
-@@ -13,15 +13,18 @@
+@@ -14,15 +17,18 @@
  GKRELLM_INCLUDES = gkrellm.h gkrellm_public_proto.h
  
  GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread`
@@ -35,27 +39,46 @@ $NetBSD: patch-ab,v 1.6 2001/11/01 14:08:02 hubertf Exp $
 +FLAGS+= -DSYSTEM_PLUGINS_DIR=\"${PREFIX}/lib/gkrellm/plugins\"
 +FLAGS+= -DSYSTEM_THEMES_DIR=\"${PREFIX}/share/gkrellm/themes\"
 +
-+LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS) -Wl,-E
++LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS) $(LINK_FLAGS)
  
  ifeq ($(debug),1)
      FLAGS += -g
-@@ -36,7 +39,7 @@
+@@ -36,8 +42,9 @@
+     FLAGS += -DHAVE_GETADDRINFO
  endif
  
- 
+-
 -CC = gcc -Wall $(FLAGS) $(CFLAGS)
++CC ?= gcc
++CFLAGS ?= -O2
 +CC += -Wall $(FLAGS) $(CFLAGS)
  
- OBJS =	main.o alerts.o apm.o clock.o cpu.o disk.o fs.o hostname.o \
+ 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 \
-@@ -59,8 +62,8 @@
- 		 SYS_LIBS="-lkvm -ldevstat" gkrellm
+@@ -61,15 +68,14 @@
+ 		EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" 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
+-	GTK_CONFIG=gtk-config GTOP_LIBS= EXTRAOBJS= SYS_LIBS="-lkvm" gkrellm
++	$(MAKE) GTOP_LIBS= EXTRAOBJS= SYS_LIBS="-lkvm" gkrellm
  
  solaris:
  	$(MAKE) CFLAGS="-Wno-implicit-int" \
+ 		SYS_LIBS="-lkstat -lkvm -ldevinfo" gkrellm
+ 
+ install:
+-	$(INSTALL) -c -s -m $(BINMODE) gkrellm $(INSTALLDIR)/gkrellm
++	$(INSTALL) -c -s -m $(BINMODE) -g $(BINGRP) gkrellm $(INSTALLDIR)/gkrellm
+ 	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm
+ 	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm
+ 	$(INSTALL) -d -m $(MANDIRMODE) $(MANDIR)
+@@ -77,8 +83,6 @@
+ 
+ install_netbsd:
+ 	$(MAKE) install
+-	chgrp kmem $(INSTALLDIR)/gkrellm
+-	chmod g+s $(INSTALLDIR)/gkrellm
+ 
+ install_openbsd:
+ 	$(MAKE) install
diff --git a/sysutils/gkrellm/patches/patch-ac b/sysutils/gkrellm/patches/patch-ac
deleted file mode 100644
index 3c2024c3c60..00000000000
--- a/sysutils/gkrellm/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/02/13 23:11:45 wiz Exp $
-
---- src/apm.c.orig	Mon Oct 22 05:26:05 2001
-+++ src/apm.c
-@@ -145,6 +145,7 @@
-    struct apm_power_info info;
- 
-    if ((f = open(APMDEV, O_RDONLY)) == -1) return;
-+   memset(&info, 0, sizeof(info));
-    r = ioctl(f, APM_IOC_GETPOWER, &info);
-    close(f);
-    if (r == -1) return;