Update libgtop to 1.0.2.

It's supposed to be functional under NetBSD-1.4, but apparently still
doesn't quite work.  I'm checking this in, since it's possible to debug
this package, but I don't have the know-how to do so.  Perhaps someone
more knowledgeable will find this helpful.

6 files changed, 109 insertions, 82 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 17a0b2e0b63..5143aabc7d2 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,32 +1,36 @@
-# $NetBSD: Makefile,v 1.20 1999/08/22 22:02:32 tron Exp $
+# $NetBSD: Makefile,v 1.21 1999/08/30 08:54:03 jlam Exp $
 #
 
-DISTNAME=		libgtop-1.0.1
+DISTNAME=		libgtop-1.0.2
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=gnome-1.0/sources/}
 
 MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.gnome.org/
+HOMEPAGE=		http://www.home-of-linux.org/gnome/libgtop/
 
-DEPENDS+=		gettext-0.10.35:../../devel/gettext \
-			gnome-libs-1.0.5:../../x11/gnome-libs \
-			guile-1.3:../../lang/guile
+DEPENDS+=		gettext-0.10.35:../../devel/gettext
+DEPENDS+=		gnome-libs-1.0.14:../../x11/gnome-libs
+DEPENDS+=		guile-1.3.2:../../lang/guile
 
 NOT_FOR_PLATFORM=	*-*-alpha	# problems with gtk
 
-GNU_CONFIGURE=
-USE_X11BASE=
-USE_GMAKE=
-USE_LIBTOOL=
-
 IGNORE=			"got broken by removal of Mach VM"
 
+GNU_CONFIGURE=		yes
+USE_X11BASE=		yes
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
+
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib -lintl
+
+# The following CPPFLAGS are for debugging purposes.
+CPPFLAGS+=		-DLIBGTOP_ENABLE_DEBUG -DLIBGTOP_FATAL_WARNINGS
+
 CONFIGURE_ARGS+=	--with-glib-prefix=${LOCALBASE} \
 			--with-libgtop-guile --with-catgets
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"  \
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"  \
 			LOCALBASE=${LOCALBASE} \
 			X11BASE=${X11BASE}
 
-LDFLAGS+=		-L${LOCALBASE}/lib -lintl
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgtop/files/md5 b/devel/libgtop/files/md5
index 4d496d93e0c..31ce9d88351 100644
--- a/devel/libgtop/files/md5
+++ b/devel/libgtop/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/03/07 19:50:55 tron Exp $
+$NetBSD: md5,v 1.6 1999/08/30 08:54:03 jlam Exp $
 
-MD5 (libgtop-1.0.1.tar.gz) = f9b1c3c6f6eb178016a5213ab43a0219
+MD5 (libgtop-1.0.2.tar.gz) = 223d09d2c190e26109d731b1697f1bc8
diff --git a/devel/libgtop/files/patch-sum b/devel/libgtop/files/patch-sum
index 1f598393eec..1d7599c3049 100644
--- a/devel/libgtop/files/patch-sum
+++ b/devel/libgtop/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:37 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/30 08:54:03 jlam Exp $
 
-MD5 (patch-aa) = b28946cdc41d44722bbc9ef2a1f730f2
+MD5 (patch-aa) = 633903ff35ed178ac071904d1c750798
 MD5 (patch-ab) = 1be0d48b1e41fea46ee459a320fb11c7
+MD5 (patch-ac) = f84a83914548206edccb11e1f84bf1bf
diff --git a/devel/libgtop/patches/patch-aa b/devel/libgtop/patches/patch-aa
index b324a410ed6..1778f982116 100644
--- a/devel/libgtop/patches/patch-aa
+++ b/devel/libgtop/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.5 1999/03/07 19:50:55 tron Exp $
+$NetBSD: patch-aa,v 1.6 1999/08/30 08:54:03 jlam Exp $
 
---- configure.orig	Mon Mar  1 22:52:44 1999
-+++ configure	Sun Mar  7 20:37:46 1999
-@@ -2451,6 +2451,7 @@
- fi
+--- configure.orig	Thu May 27 20:43:55 1999
++++ configure	Sun Aug 29 18:59:43 1999
+@@ -2466,6 +2466,7 @@
+ USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
  
  # Always use our own libtool.
 +if false; then
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
  # Check for any special flags to pass to ltconfig.
-@@ -2682,6 +2683,7 @@
+@@ -2697,6 +2698,7 @@
  ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
  $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
@@ -18,15 +18,16 @@ $NetBSD: patch-aa,v 1.5 1999/03/07 19:50:55 tron Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -5103,6 +5105,7 @@
+@@ -5116,7 +5118,7 @@
  
  
- # Always use our own libtool.
+ 
+-
 +if false; then
+ # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
- # Check for any special flags to pass to ltconfig.
-@@ -5334,6 +5337,7 @@
+@@ -5349,6 +5351,7 @@
  ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
  $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
diff --git a/devel/libgtop/patches/patch-ac b/devel/libgtop/patches/patch-ac
new file mode 100644
index 00000000000..bb1d292b1b2
--- /dev/null
+++ b/devel/libgtop/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.5 1999/08/30 08:54:03 jlam Exp $
+
+--- include/glibtop/procstate.h.orig	Tue Feb 23 06:43:11 1999
++++ include/glibtop/procstate.h	Sun Aug 29 19:50:34 1999
+@@ -36,6 +36,13 @@
+ 
+ #define GLIBTOP_MAX_PROC_STATE		4
+ 
++#define GLIBTOP_PROCESS_RUNNING			1
++#define GLIBTOP_PROCESS_INTERRUPTIBLE		2
++#define GLIBTOP_PROCESS_UNINTERRUPTIBLE		4
++#define GLIBTOP_PROCESS_ZOMBIE			8
++#define GLIBTOP_PROCESS_STOPPED			16
++#define GLIBTOP_PROCESS_SWAPPING		32
++
+ typedef struct _glibtop_proc_state	glibtop_proc_state;
+ 
+ /* Name and status */
diff --git a/devel/libgtop/pkg/PLIST b/devel/libgtop/pkg/PLIST
index 93bb565fcc2..606228e9864 100644
--- a/devel/libgtop/pkg/PLIST
+++ b/devel/libgtop/pkg/PLIST
@@ -1,75 +1,74 @@
-@comment $NetBSD: PLIST,v 1.6 1999/03/07 19:50:57 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 1999/08/30 08:54:04 jlam Exp $
+bin/libgtop-config
 bin/libgtop_daemon
 bin/libgtop_server
-bin/libgtop-config
-include/glibtop/sysinfo.h
-include/glibtop/ppp.h
-include/glibtop/procargs.h
-include/glibtop/netload.h
+include/glibtop.h
 include/glibtop/close.h
-include/glibtop/loadavg.h
-include/glibtop/prockernel.h
-include/glibtop/procstate.h
-include/glibtop/sem_limits.h
-include/glibtop/uptime.h
 include/glibtop/command.h
-include/glibtop/mem.h
-include/glibtop/proclist.h
-include/glibtop/proctime.h
-include/glibtop/shm_limits.h
-include/glibtop/version.h
 include/glibtop/cpu.h
-include/glibtop/msg_limits.h
-include/glibtop/procmem.h
-include/glibtop/procuid.h
-include/glibtop/swap.h
-include/glibtop/write.h
 include/glibtop/error.h
-include/glibtop/open.h
-include/glibtop/procsegment.h
-include/glibtop/read.h
-include/glibtop/sysdeps.h
-include/glibtop/xmalloc.h
+include/glibtop/fsusage.h
 include/glibtop/global.h
-include/glibtop/procsignal.h
-include/glibtop/read_data.h
-include/glibtop/union.h
-include/glibtop/types.h
 include/glibtop/gnuserv.h
-include/glibtop/parameter.h
+include/glibtop/inodedb.h
+include/glibtop/loadavg.h
+include/glibtop/mem.h
 include/glibtop/mountlist.h
-include/glibtop/fsusage.h
+include/glibtop/msg_limits.h
+include/glibtop/netload.h
+include/glibtop/open.h
+include/glibtop/parameter.h
+include/glibtop/ppp.h
+include/glibtop/procargs.h
+include/glibtop/prockernel.h
+include/glibtop/proclist.h
 include/glibtop/procmap.h
+include/glibtop/procmem.h
+include/glibtop/procsegment.h
+include/glibtop/procsignal.h
+include/glibtop/procstate.h
+include/glibtop/proctime.h
+include/glibtop/procuid.h
+include/glibtop/read.h
+include/glibtop/read_data.h
+include/glibtop/sem_limits.h
+include/glibtop/shm_limits.h
 include/glibtop/signal.h
-include/glibtop/inodedb.h
-include/glibtop_server.h
+include/glibtop/swap.h
+include/glibtop/sysdeps.h
+include/glibtop/sysinfo.h
+include/glibtop/types.h
+include/glibtop/union.h
+include/glibtop/uptime.h
+include/glibtop/version.h
+include/glibtop/write.h
+include/glibtop/xmalloc.h
 include/glibtop_machine.h
+include/glibtop_server.h
 include/glibtop_suid.h
-include/glibtop.h
+@unexec install-info --delete %D/info/libgtop.info %D/info/dir
+info/libgtop.info
+@exec install-info %D/info/libgtop.info %D/info/dir
 lib/libgtop-features.def
-lib/libgtop_sysdeps.so.1.0
-lib/libgtop_sysdeps.a
-lib/libgtop_sysdeps_suid.so.1.0
-lib/libgtop_sysdeps_suid.a
-lib/libgtop_common.so.1.0
-lib/libgtop_common.a
-lib/libgtop_suid_common.so.1.0
-lib/libgtop_suid_common.a
-lib/libgtop_names.so.1.0
-lib/libgtop_names.a
-lib/libgtop_guile_names.so.1.0
-lib/libgtop_guile_names.a
-lib/libgtop_guile.so.1.0
-lib/libgtop_guile.a
-lib/libgtop.so.1.0
 lib/libgtop.a
+lib/libgtop.so.1.1
 lib/libgtopConf.sh
+lib/libgtop_common.a
+lib/libgtop_common.so.1.1
+lib/libgtop_guile.a
+lib/libgtop_guile.so.1.1
+lib/libgtop_guile_names.a
+lib/libgtop_guile_names.so.1.1
+lib/libgtop_names.a
+lib/libgtop_names.so.1.1
+lib/libgtop_suid_common.a
+lib/libgtop_suid_common.so.1.1
+lib/libgtop_sysdeps.a
+lib/libgtop_sysdeps.so.1.1
+lib/libgtop_sysdeps_suid.a
+lib/libgtop_sysdeps_suid.so.1.1
 share/locale/de/LC_MESSAGES/libgtop.mo
-share/locale/fr/LC_MESSAGES/libgtop.mo
 share/locale/es/LC_MESSAGES/libgtop.mo
-share/locale/no/LC_MESSAGES/libgtop.mo
-share/locale/ko/LC_MESSAGES/libgtop.mo
-share/locale/ja/LC_MESSAGES/libgtop.mo
 share/locale/es_DO/LC_MESSAGES/libgtop.mo
 share/locale/es_GT/LC_MESSAGES/libgtop.mo
 share/locale/es_HN/LC_MESSAGES/libgtop.mo
@@ -77,4 +76,8 @@ share/locale/es_MX/LC_MESSAGES/libgtop.mo
 share/locale/es_PA/LC_MESSAGES/libgtop.mo
 share/locale/es_PE/LC_MESSAGES/libgtop.mo
 share/locale/es_SV/LC_MESSAGES/libgtop.mo
+share/locale/fr/LC_MESSAGES/libgtop.mo
+share/locale/ja/LC_MESSAGES/libgtop.mo
+share/locale/ko/LC_MESSAGES/libgtop.mo
+share/locale/no/LC_MESSAGES/libgtop.mo
 @dirrm include/glibtop