Update gkrellm to 1.2.2

Changes:

1.2.2 Wed Aug 22, 2001
----------------------
        * Hostname panel can also display system name.
        * Move krells out of the way only if data is displayed in panels,
        * Bugfixes:
          o Close open files before launching panel commands and net timer command.
          o Display and alert setting problems for negative voltages.
          o Allow "owner" as well as "user" for fstab mounting.
        * Contributions:
          o Anthony Mallet <anthony.mallet@ficus.yi.org> patch to fix some compile
            issues with defining INET6 and HAVE_GETADDRINFO for Solaris 7.  Also
            made removable disk media ioctl work for Solaris 7.
          o Przemyslaw Sulek <pbs@linux.net.pl> sent in a Polish translation.

o we don't use X11BASE any more, install to normal PREFIX
o clean up Makefile
o link gkrellm with --export-dynamic so now plugins work properly
  (fixes pkg/13884 by Jasper Wallace <jasper@pointless.net>

5 files changed, 47 insertions, 37 deletions

diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 15ee0774195..a1a6ae5e76d 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:21 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/08 21:53:57 zuntum Exp $
 #
 
-DISTNAME=	gkrellm-1.2.1
+DISTNAME=	gkrellm-1.2.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/
 
@@ -10,26 +10,16 @@ HOMEPAGE=	http://gkrellm.net/
 COMMENT=	GTK based system monitor
 
 USE_BUILDLINK_ONLY=	yes
-USE_X11BASE=	yes
 USE_GMAKE=	yes
 
-BINGRP=         kmem
-BINMODE=        2755
-
 ALL_TARGET=	netbsd
+INSTALL_TARGET=	install_netbsd
 
-MAKE_ENV+=	LOCALEDIR="${LOCALBASE}/locale"
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/gkrellm ${PREFIX}/bin/gkrellm
-	${INSTALL_MAN} ${WRKSRC}/gkrellm.1 ${PREFIX}/man/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gkrellm
-	cd ${WRKSRC} && ${INSTALL_DATA} COPYRIGHT README Themes.html	\
-		${PREFIX}/share/doc/gkrellm
-	${INSTALL_DATA_DIR} ${PREFIX}/include/gkrellm
-	cd ${WRKSRC}/src && ${INSTALL_DATA} gkrellm.h			\
-		gkrellm_public_proto.h gkrellm_private_proto.h 		\
-		${PREFIX}/include/gkrellm
+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
 
 .include "../../devel/pth/buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 429b7d3dcbc..d8930d08043 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2001/08/23 19:21:11 jlam Exp $
+$NetBSD: distinfo,v 1.6 2001/09/08 21:53:57 zuntum Exp $
 
-SHA1 (gkrellm-1.2.1.tar.gz) = 7fee49e1d9b7429567110dcb137d999687c2e560
-Size (gkrellm-1.2.1.tar.gz) = 470603 bytes
-SHA1 (patch-aa) = 53ccdb2fe72770909e6d6bc0abf512da8da54bc4
-SHA1 (patch-ab) = 22d96b92282316da36db8070e385b3a815386dc3
+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
diff --git a/sysutils/gkrellm/patches/patch-aa b/sysutils/gkrellm/patches/patch-aa
index c5f7623cab3..8be65813b7d 100644
--- a/sysutils/gkrellm/patches/patch-aa
+++ b/sysutils/gkrellm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2001/08/23 19:21:11 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2001/09/08 21:53:57 zuntum Exp $
 
---- Makefile.top.orig	Sun Jun 17 12:28:19 2001
+--- Makefile.top.orig	Sun Jun 17 17:28:19 2001
 +++ Makefile.top
 @@ -30,7 +30,7 @@
  #
@@ -11,6 +11,21 @@ $NetBSD: patch-aa,v 1.3 2001/08/23 19:21:11 jlam Exp $
  BINMODE = 755
  
  # FreeBSD 2.X
+@@ -74,11 +74,11 @@
+ 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
+ MANMODE = 644
+ MANDIRMODE = 755
+-INCLUDEDIR=/usr/local/include
++INCLUDEDIR=${PREFIX}/include
+ INCLUDEMODE = 644
+ INCLUDEDIRMODE = 755
+ 
 @@ -127,8 +127,8 @@
  
  netbsd:
diff --git a/sysutils/gkrellm/patches/patch-ab b/sysutils/gkrellm/patches/patch-ab
index 790953ee4a8..651640227dc 100644
--- a/sysutils/gkrellm/patches/patch-ab
+++ b/sysutils/gkrellm/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2001/08/23 19:21:11 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2001/09/08 21:53:57 zuntum Exp $
 
---- src/Makefile.src.orig	Sat Jul 21 15:59:58 2001
+--- src/Makefile.src.orig	Sat Jul 21 20:59:58 2001
 +++ src/Makefile.src
 @@ -1,4 +1,4 @@
 -GTK_CONFIG ?= gtk-config
@@ -8,7 +8,7 @@ $NetBSD: patch-ab,v 1.3 2001/08/23 19:21:11 jlam Exp $
  BINMODE ?= 755
  INSTALLDIR ?= /usr/local/bin
  INCLUDEDIR ?= /usr/local/include
-@@ -12,12 +12,12 @@
+@@ -12,15 +12,17 @@
  GKRELLM_INCLUDES = gkrellm.h gkrellm_public_proto.h
  
  GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread`
@@ -23,8 +23,14 @@ $NetBSD: patch-ab,v 1.3 2001/08/23 19:21:11 jlam Exp $
 +FLAGS = -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE)
  FLAGS+= $(PTHREAD_INC)
  
- LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS)
-@@ -35,7 +35,7 @@
+-LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS)
++FLAGS+= -DSYSTEM_PLUGINS_DIR=\"${PREFIX}/lib/gkrellm/plugins\"
++
++LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS) -Wl,-E
+ 
+ ifeq ($(debug),1)
+     FLAGS += -g
+@@ -35,7 +37,7 @@
  endif
  
  
diff --git a/sysutils/gkrellm/pkg/PLIST b/sysutils/gkrellm/pkg/PLIST
index 4f50648e954..0143ccd313b 100644
--- a/sysutils/gkrellm/pkg/PLIST
+++ b/sysutils/gkrellm/pkg/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2001/03/22 14:33:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/09/08 21:53:57 zuntum Exp $
 bin/gkrellm
 include/gkrellm/gkrellm.h
 include/gkrellm/gkrellm_public_proto.h
-include/gkrellm/gkrellm_private_proto.h
-@dirrm include/gkrellm
 man/man1/gkrellm.1
-share/doc/gkrellm/COPYRIGHT
-share/doc/gkrellm/README
-share/doc/gkrellm/Themes.html
-@dirrm share/doc/gkrellm
+share/gkrellm/README
+@dirrm include/gkrellm
+@dirrm lib/gkrellm/plugins
+@dirrm lib/gkrellm
+@dirrm share/gkrellm