Merge import of gkrellm2.

6 files changed, 36 insertions, 226 deletions

diff --git a/sysutils/gkrellm/PLIST b/sysutils/gkrellm/PLIST
index f6902fcba63..5aaa6bc1d88 100644
--- a/sysutils/gkrellm/PLIST
+++ b/sysutils/gkrellm/PLIST
@@ -1,20 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2003/02/15 09:33:03 salo Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/02/24 22:21:15 cube Exp $
 bin/gkrellm
-include/gkrellm/gkrellm.h
-include/gkrellm/gkrellm_public_proto.h
+include/gkrellm2/gkrellm.h
+include/gkrellm2/gkrellm-public-proto.h
+lib/pkgconfig/gkrellm.pc
 man/man1/gkrellm.1
-@exec ${MKDIR} %D/share/gkrellm/themes
-@exec ${MKDIR} %D/lib/gkrellm/plugins
-share/gkrellm/README
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gkrellm.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gkrellm.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gkrellm.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gkrellm.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gkrellm.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gkrellm.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gkrellm.mo
-@dirrm include/gkrellm
-@dirrm lib/gkrellm/plugins
-@dirrm lib/gkrellm
-@dirrm share/gkrellm/themes
-@dirrm share/gkrellm
+@dirrm include/gkrellm2
+@dirrm lib/gkrellm2/plugins
+@dirrm lib/gkrellm2
+@dirrm share/gkrellm2/themes
diff --git a/sysutils/gkrellm/buildlink2.mk b/sysutils/gkrellm/buildlink2.mk
index a2d2d83b7c2..b0f656d4ceb 100644
--- a/sysutils/gkrellm/buildlink2.mk
+++ b/sysutils/gkrellm/buildlink2.mk
@@ -1,22 +1,23 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/01/03 18:49:52 reed Exp $
-#
+# $NetBSD: buildlink2.mk,v 1.5 2004/02/24 22:21:15 cube Exp $
 
 .if !defined(GKRELLM_BUILDLINK2_MK)
 GKRELLM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gkrellm
-BUILDLINK_DEPENDS.gkrellm?=		gkrellm>=1.2.13nb3
+BUILDLINK_DEPENDS.gkrellm?=		gkrellm>=2.1.22
 BUILDLINK_PKGSRCDIR.gkrellm?=		../../sysutils/gkrellm
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gkrellm=gkrellm
 BUILDLINK_PREFIX.gkrellm_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.gkrellm+=	include/gkrellm/gkrellm.h
-BUILDLINK_FILES.gkrellm+=	include/gkrellm/gkrellm_public_proto.h
+BUILDLINK_FILES.gkrellm+=	include/gkrellm2/gkrellm.h
+BUILDLINK_FILES.gkrellm+=	include/gkrellm2/gkrellm-public-proto.h
 
-.include "../../graphics/imlib/buildlink2.mk"
+PTHREAD_OPTS+=		require
+
+.include "../../x11/gtk2/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gkrellm-buildlink
 
 gkrellm-buildlink: _BUILDLINK_USE
 
-.endif	# GKRELLM_BUILDLINK2_MK
+.endif	# GKRELLM2_BUILDLINK2_MK
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 23811534f09..c0ddabadf06 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.15 2003/02/15 09:33:03 salo Exp $
+$NetBSD: distinfo,v 1.16 2004/02/24 22:21:15 cube Exp $
 
-SHA1 (gkrellm-1.2.13.tar.bz2) = ab0282e663b69ecf0d622ad7c02db0c72b793bd3
-Size (gkrellm-1.2.13.tar.bz2) = 438917 bytes
-SHA1 (patch-aa) = c2656b0d5372ef1e26479ccedcbd05f4e6dbb5e3
-SHA1 (patch-ab) = a2f1d4b4a253323b6623200c1fca4e0cee0d46f2
-SHA1 (patch-ac) = 0bdbe9b788e62e4732ec87a1d6d8dbcacde7da82
+SHA1 (gkrellm-2.1.25.tar.bz2) = e45cf8192de7dcc393742d97f8b9a78950e4a5c4
+Size (gkrellm-2.1.25.tar.bz2) = 633685 bytes
+SHA1 (patch-ac) = 577aecc480525f7ede6e8726308343c5ba90eca7
+SHA1 (patch-af) = c1879ccb5cb9adb1fe9822284fd7962c637daec7
diff --git a/sysutils/gkrellm/patches/patch-aa b/sysutils/gkrellm/patches/patch-aa
deleted file mode 100644
index 31d4d80c56a..00000000000
--- a/sysutils/gkrellm/patches/patch-aa
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2003/02/15 09:33:03 salo Exp $
-
---- Makefile.top_enable_nls.orig	Wed Dec  5 08: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 =
-+LINK_FLAGS = $(EXPORT_SYMBOLS_LDFLAGS)
-+LOCALEDIR = ${PREFIX}/share/locale
-+MANDIR = ${PREFIX}/man/man1
-+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
-+PREFIX ?= /usr/local
-+INSTALLDIR ?= ${PREFIX}/bin
-+MANDIR ?= ${PREFIX}/share/man/man1
- MANMODE = 644
- MANDIRMODE = 755
--INCLUDEDIR=/usr/local/include
-+INCLUDEDIR ?= ${PREFIX}/include
- INCLUDEMODE = 644
- INCLUDEDIRMODE = 755
- 
- 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 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
deleted file mode 100644
index bc14e7334b0..00000000000
--- a/sysutils/gkrellm/patches/patch-ab
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2003/02/15 09:33:03 salo Exp $
-
---- src/Makefile.src.orig	Mon Jul  1 04:13:04 2002
-+++ src/Makefile.src	Sat Feb 15 10:06:54 2003
-@@ -1,30 +1,36 @@
- 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
- INCLUDEDIRMODE ?= 755
--MANDIR ?= /usr/local/share/man/man1
-+MANDIR ?= ${PREFIX}/man/man1
- MANMODE ?= 644
- MANDIRMODE ?= 755
- INSTALL ?= install
--LINK_FLAGS ?= -Wl,-E
-+LINK_FLAGS ?= $(EXPORT_SYMBOLS_LDFLAGS)
- CC ?= gcc
- STRIP ?= -s
- 
- GKRELLM_INCLUDES = gkrellm.h gkrellm_public_proto.h
- 
- GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread`
--IMLIB_INCLUDE = `imlib-config --cflags-gdk`
-+IMLIB_INCLUDE = `$(IMLIB_CONFIG) --cflags-gdk`
- 
- GTK_LIB = `$(GTK_CONFIG) --libs gthread`
--IMLIB_LIB = `imlib-config --libs-gdk`
-+IMLIB_LIB = `$(IMLIB_CONFIG) --libs-gdk`
- 
--FLAGS = -O2 -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE)
-+FLAGS = -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE)
- FLAGS+= $(PTHREAD_INC)
-+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) $(LINK_FLAGS)
- 
--LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS)
- 
- ifeq ($(debug),1)
-     FLAGS += -g
-@@ -38,7 +44,9 @@
-     FLAGS += -DHAVE_GETADDRINFO
- endif
- 
--CC += -Wall $(FLAGS)
-+CC ?= gcc
-+CFLAGS ?= -O2
-+CC += -Wall $(FLAGS) $(CFLAGS)
- 
- 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 \
-@@ -68,15 +76,14 @@
- 		gkrellm
- 		
- netbsd:
--	$(MAKE) PTHREAD_INC=-I/usr/local/include \
--	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 $(STRIP) -m $(BINMODE) gkrellm $(INSTALLDIR)/gkrellm
-+	$(INSTALL) -c $(STRIP) -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)
-@@ -87,8 +94,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
index be0e2740b04..2c59ca8a584 100644
--- a/sysutils/gkrellm/patches/patch-ac
+++ b/sysutils/gkrellm/patches/patch-ac
@@ -1,31 +1,18 @@
-$NetBSD: patch-ac,v 1.3 2002/11/07 15:07:46 fredb Exp $
+$NetBSD: patch-ac,v 1.4 2004/02/24 22:21:15 cube Exp $
 
---- src/disk.c.orig	Tue Jan  1 15:08:07 2002
-+++ src/disk.c
-@@ -446,10 +446,24 @@
- 	  * d.xfer value (number of transfers) but there a scaling problem:
- 	  * d.xfer is usually much more smaller thant d.dk_bytes... */
+--- src/gkrellm.h.orig	2003-03-10 06:59:37.000000000 +0100
++++ src/gkrellm.h
+@@ -115,11 +115,11 @@
  
-+	 /* Separate read/write stats were implemented in NetBSD 1.6K. */
-+
- 	 disk = (DiskMon *) list->data;
--	 disk->rblk = d.dk_bytes / 512;	/* block size hardcoded :
--					 * d.dk_byteshift is always 0 ?? */
-+#if __NetBSD_Version__ >= 106110000
-+	 /* d.dk_byteshift is not set in, or used, by the kernel as of
-+	  * NetBSD 1.6K, but maybe one day... In the meantime, NetBSD
-+	  * only supports a blocksize of 512 == 2^^9, so assume that. */
-+	 if (d.dk_byteshift == 0) {
-+	    disk->rblk = d.dk_rbytes >> 9;
-+	    disk->wblk = d.dk_wbytes >> 9;
-+	 } else {
-+	    disk->rblk = d.dk_rbytes / d.dk_byteshift;
-+	    disk->wblk = d.dk_wbytes / d.dk_byteshift;
-+	 }
-+#else
-+	 disk->rblk = d.dk_bytes >> 9;
- 	 disk->wblk = 0;
-+#endif
+ #define	LOCAL_THEMES_DIR		"/usr/local/share/gkrellm2/themes"
+ #if !defined(SYSTEM_THEMES_DIR)
+-#define	SYSTEM_THEMES_DIR		"/usr/share/gkrellm2/themes"
++#define	SYSTEM_THEMES_DIR		"@@PREFIX@@/share/gkrellm2/themes"
+ #endif
+ #define	LOCAL_PLUGINS_DIR		"/usr/local/lib/gkrellm2/plugins"
+ #if !defined(SYSTEM_PLUGINS_DIR)
+-#define	SYSTEM_PLUGINS_DIR		"/usr/lib/gkrellm2/plugins"
++#define	SYSTEM_PLUGINS_DIR		"@@PREFIX@@/lib/gkrellm2/plugins"
+ #endif
  
- 	 composite_disk->rblk += disk->rblk;
- 	 composite_disk->wblk += disk->wblk; /* useless, isn't it ? :-D */
+ #else