Remove gkrellm1 and its dependencies from pkgsrc.

This has been replaced ages ago with gkrellm version 2.

No disagreement on pkgsrc-users.

10 files changed, 1 insertions, 324 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index cc7d0942144..c5cb3dae78d 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.390 2007/03/13 17:40:26 obache Exp $
+# $NetBSD: Makefile,v 1.391 2007/04/01 21:36:17 wiz Exp $
 #
 
 COMMENT=	System utilities
@@ -102,7 +102,6 @@ SUBDIR+=	gkrellm
 SUBDIR+=	gkrellm-est
 SUBDIR+=	gkrellm-server
 SUBDIR+=	gkrellm-share
-SUBDIR+=	gkrellm1
 SUBDIR+=	gkx86info
 SUBDIR+=	gnome-menus
 SUBDIR+=	gnome-pkgview
diff --git a/sysutils/gkrellm1/DESCR b/sysutils/gkrellm1/DESCR
deleted file mode 100644
index da90c4a04d6..00000000000
--- a/sysutils/gkrellm1/DESCR
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 6543ab60567..00000000000
--- a/sysutils/gkrellm1/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2006/06/27 21:55:04 wiz Exp $
-#
-
-DISTNAME=	gkrellm-1.2.13
-PKGREVISION=	6
-CATEGORIES=	sysutils
-MASTER_SITES=	http://web.wt.net/~billw/gkrellm/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://gkrellm.net/
-COMMENT=	GTK based system monitor
-
-OSVERSION_SPECIFIC=	YES
-USE_TOOLS+=		gmake msgfmt
-USE_PKGLOCALEDIR=	YES
-
-CONFLICTS+=	gkrellm-share>=2.0
-
-BUILD_TARGET=		netbsd
-INSTALL_TARGET=		install_netbsd
-
-MAKE_ENV+=	PTHREAD_INC="-I${LOCALBASE}/include"
-MAKE_ENV+=	EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
-
-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/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gkrellm1/PLIST b/sysutils/gkrellm1/PLIST
deleted file mode 100644
index 42954a15bc7..00000000000
--- a/sysutils/gkrellm1/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/17 07:07:34 jlam 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
-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
-@dirrm include/gkrellm
-@dirrm lib/gkrellm/plugins
-@dirrm lib/gkrellm
-@dirrm share/gkrellm/themes
-@dirrm share/gkrellm
diff --git a/sysutils/gkrellm1/buildlink3.mk b/sysutils/gkrellm1/buildlink3.mk
deleted file mode 100644
index bbd29184c5b..00000000000
--- a/sysutils/gkrellm1/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:09 jlam Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GKRELLM_BUILDLINK3_MK:=	${GKRELLM_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gkrellm
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngkrellm}
-BUILDLINK_PACKAGES+=	gkrellm
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gkrellm
-
-.if !empty(GKRELLM_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gkrellm+=	gkrellm<2.0
-BUILDLINK_ABI_DEPENDS.gkrellm?=	gkrellm>=1.2.13nb6
-BUILDLINK_PKGSRCDIR.gkrellm?=	../../sysutils/gkrellm1
-.endif	# GKRELLM_BUILDLINK3_MK
-
-.include "../../graphics/imlib/buildlink3.mk"
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/gkrellm1/distinfo b/sysutils/gkrellm1/distinfo
deleted file mode 100644
index 0b5b051f4b9..00000000000
--- a/sysutils/gkrellm1/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/09/06 08:10:59 abs Exp $
-
-SHA1 (gkrellm-1.2.13.tar.bz2) = ab0282e663b69ecf0d622ad7c02db0c72b793bd3
-RMD160 (gkrellm-1.2.13.tar.bz2) = a5d9b7e439788613ebab9718aa05eff0c39d0a9a
-Size (gkrellm-1.2.13.tar.bz2) = 438917 bytes
-SHA1 (patch-aa) = c2656b0d5372ef1e26479ccedcbd05f4e6dbb5e3
-SHA1 (patch-ab) = a2f1d4b4a253323b6623200c1fca4e0cee0d46f2
-SHA1 (patch-ac) = 0bdbe9b788e62e4732ec87a1d6d8dbcacde7da82
-SHA1 (patch-ad) = 4de2da50a6bd95c6e9d564f933ec19008771624c
diff --git a/sysutils/gkrellm1/patches/patch-aa b/sysutils/gkrellm1/patches/patch-aa
deleted file mode 100644
index daa8328d706..00000000000
--- a/sysutils/gkrellm1/patches/patch-aa
+++ /dev/null
@@ -1,80 +0,0 @@
-$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
deleted file mode 100644
index 96c21a83c41..00000000000
--- a/sysutils/gkrellm1/patches/patch-ab
+++ /dev/null
@@ -1,87 +0,0 @@
-$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
deleted file mode 100644
index 2428d85b7c1..00000000000
--- a/sysutils/gkrellm1/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$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 */
diff --git a/sysutils/gkrellm1/patches/patch-ad b/sysutils/gkrellm1/patches/patch-ad
deleted file mode 100644
index 407ff4eaf2e..00000000000
--- a/sysutils/gkrellm1/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/09/06 08:10:59 abs Exp $
-
---- src/fs.c.orig	2002-06-30 21:20:15.000000000 -0500
-+++ src/fs.c
-@@ -35,6 +35,10 @@
- #include "gkrellm_private_proto.h"
- #include "gkrellm_threads.h"
- 
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */
-+#define statfs statvfs
-+#endif
-+
- typedef struct
- 	{
- 	gchar	*directory;