Re-import GKrellM-1 as sysutils/gkrellm1.

8 files changed, 307 insertions, 0 deletions

diff --git a/sysutils/gkrellm1/DESCR b/sysutils/gkrellm1/DESCR
new file mode 100644
index 00000000000..da90c4a04d6
--- /dev/null
+++ b/sysutils/gkrellm1/DESCR
@@ -0,0 +1,24 @@
+With a single process, GKrellM manages multiple stacked monitors and supports
+applying themes to match the monitors appearance to your window manager,
+Gtk, or any other theme.
+
+  * SMP CPU, Disk, Proc, and active net interface monitors with LEDs.
+  * Internet monitor that displays current and charts historical port hits
+
+  * Memory and swap space usage meters and a system uptime monitor.
+  * File system meters show capacity/free space and can mount/umount.
+  * A mailbox monitor which can launch mail reader, remote mail fetch.
+  * Clock/calendar and hostname display.
+  * APM laptop battery monitor.
+  * CPU/motherboard temperature display if lm_sensors modules installed.
+
+  * Multiple monitors managed by a single process to reduce system load.
+  * A timer button that can execute PPP or ISDN logon/logoff scripts.
+  * Charts are autoscaling with configurable grid line resolution, or
+    can be set to a fixed scale mode.
+  * Separate colors for "in" and "out" data.  The in color is used for
+    CPU user time, disk read, forks, and net receive data.  The out color
+    is used for CPU sys time, disk write, load, and net transmit data.
+  * Commands can be configured to run when monitor labels are clicked.
+  * GKrellM is plugin capable so special interest monitors can be created.
+  * A different theme can be created with the GIMP.
diff --git a/sysutils/gkrellm1/Makefile b/sysutils/gkrellm1/Makefile
new file mode 100644
index 00000000000..b324fa5c59d
--- /dev/null
+++ b/sysutils/gkrellm1/Makefile
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/02/24 22:06:56 cube Exp $
+#
+
+DISTNAME=	gkrellm-1.2.13
+PKGREVISION=	3
+CATEGORIES=	sysutils
+MASTER_SITES=	http://web.wt.net/~billw/gkrellm/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	anthony.mallet@ficus.yi.org
+HOMEPAGE=	http://gkrellm.net/
+COMMENT=	GTK based system monitor
+
+BUILD_USES_MSGFMT=	YES
+
+OSVERSION_SPECIFIC=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
+USE_GNU_TOOLS+=		make
+USE_PKGLOCALEDIR=	YES
+
+ALL_TARGET=		netbsd
+INSTALL_TARGET=		install_netbsd
+
+MAKE_ENV+=	PTHREAD_INC="-I${LOCALBASE}/include"
+MAKE_ENV+=	EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/gkrellm
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
+	${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm/themes
+
+.include "../../graphics/imlib/buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gkrellm1/PLIST b/sysutils/gkrellm1/PLIST
new file mode 100644
index 00000000000..0def784f9b6
--- /dev/null
+++ b/sysutils/gkrellm1/PLIST
@@ -0,0 +1,20 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 22:06:56 cube Exp $
+bin/gkrellm
+include/gkrellm/gkrellm.h
+include/gkrellm/gkrellm_public_proto.h
+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
diff --git a/sysutils/gkrellm1/buildlink2.mk b/sysutils/gkrellm1/buildlink2.mk
new file mode 100644
index 00000000000..38eaf136fb7
--- /dev/null
+++ b/sysutils/gkrellm1/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.1.1.1 2004/02/24 22:06:56 cube Exp $
+#
+
+.if !defined(GKRELLM_BUILDLINK2_MK)
+GKRELLM_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			gkrellm
+BUILDLINK_DEPENDS.gkrellm?=		gkrellm>=1.2.13nb3
+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
+
+.include "../../graphics/imlib/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	gkrellm-buildlink
+
+gkrellm-buildlink: _BUILDLINK_USE
+
+.endif	# GKRELLM_BUILDLINK2_MK
diff --git a/sysutils/gkrellm1/distinfo b/sysutils/gkrellm1/distinfo
new file mode 100644
index 00000000000..cf4012cc547
--- /dev/null
+++ b/sysutils/gkrellm1/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/02/24 22:06:56 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
diff --git a/sysutils/gkrellm1/patches/patch-aa b/sysutils/gkrellm1/patches/patch-aa
new file mode 100644
index 00000000000..daa8328d706
--- /dev/null
+++ b/sysutils/gkrellm1/patches/patch-aa
@@ -0,0 +1,80 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 22:06:57 cube 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/gkrellm1/patches/patch-ab b/sysutils/gkrellm1/patches/patch-ab
new file mode 100644
index 00000000000..96c21a83c41
--- /dev/null
+++ b/sysutils/gkrellm1/patches/patch-ab
@@ -0,0 +1,87 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/02/24 22:06:57 cube 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/gkrellm1/patches/patch-ac b/sysutils/gkrellm1/patches/patch-ac
new file mode 100644
index 00000000000..2428d85b7c1
--- /dev/null
+++ b/sysutils/gkrellm1/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/02/24 22:06:57 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... */
+ 
++	 /* 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
+ 
+ 	 composite_disk->rblk += disk->rblk;
+ 	 composite_disk->wblk += disk->wblk; /* useless, isn't it ? :-D */