Importing initial version of my Solaris port.

Initial revision
Released the one and only final LibGTop 1.0.1.
1999-03-17 18:29:40 +00:00 · 1999-03-17 18:29:40 +00:00 · 1999-03-01 22:12:11 +00:00
289 changed files with 6739 additions and 71097 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -13,6 +13,7 @@ gtopConf.sh
 i386-bsdi
 i686-pc-linux-gnu
 intl
+libgtop-0.01.tar.gz
 libgtop-mirror.sh.swp
 libgtopConf.sh
 libtool
@@ -20,7 +21,6 @@ ltconfig
 ltmain.sh
 macros
 stamp-h
-stamp-h.in
 sun4
 sun4sol2
 support
@@ -30,6 +30,5 @@ i686-pc-linux-gnu-linux
 libgtop-config
 ABOUT-NLS
 libgtop.spec
-libgtop*.tar.gz
-*-debstamp
-libgtop*.pc
+libgtop-0.99.*.tar.gz
+libgtop-0.99.*
--- a/2
+++ b/2
@@ -1,2 +1,2 @@
 Martin Baulig (martin@home-of-linux.org)
-Drazen Kacar (dave@srce.hr)
+Josh Sled <jsled@scam.XCF.Berkeley.EDU>
--- a/408
+++ b/408
@@ -1,411 +1,3 @@
-2003-05-11  Andrew Sobala  <aes@gnome.org>
-
-	* configure.in: release 2.0.2
-
-2003-05-10  Danilo Šegan  <dsegan@gmx.net>
-
-	* configure.in: Added "sr" and "sr@Latn" to ALL_LINGUAS.
-
-2003-04-17  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in: Added "mk" to ALL_LINGUAS.
-
-2003-03-13  Christian Rose  <menthos@menthos.com>
-
-	* configure.in: Added "ml" to ALL_LINGUAS.
-
-2003-03-10  Roozbeh Pournader  <roozbeh@sharif.edu>
-
-	* configure.in: Added "fa" to ALL_LINGUAS.
-
-2003-03-08  Gil "Dolfin" Osher <dolfin@rpg.org.il>
-
-	* configure.in: Added he to ALL_LINGUAS.
-
-2003-02-25  T?µivo Leedj?¤rv  <toivo@linux.ee>
-
-	* configure.in: Added et to ALL_LINGUAS.
-
-2003-02-16  Mohammad DAMT  <mdamt@bisnisweb.com>
-
-	* po/id.po: Added Indonesian translation
-	* configure.in: Added "id" to ALL_LINGUAS
-
-2003-01-31  James Henstridge  <james@daa.com.au>
-
-	* acinclude.m4 (GNOME_SUPPORT_CHECKS): use AC_LIBOBJ() to set
-	LIBOBJS variable, since newer autoconf's barf on direct access.
-	This also takes care of setting LTLIBOBJS for us.
-
-2003-01-29  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in: Added ar to ALL_LINGUAS
-
-2003-01-25  Alessio Frusciante  <algol@firenze.linux.it>
-
-	* configure.in: Added "it" (Italian) to ALL_LINGUAS.
-
-2003-01-23  Marius Andreiana <marius galuna.ro>
-
-	* configure.in: Added "ro" to ALL_LINGUAS
-
-2003-01-22  Christian Rose  <menthos@menthos.com>
-
-	* configure.in: Added "mn" to ALL_LINGUAS.
-
-2003-01-16  Daniel Yacob <locales@geez.org>
-
-	* configure.in: added am to ALL_LINGUAS
-	
-2003-01-12  Kevin Vandersloot <kfv101@psu.edu>
-
-	* configure.in: release 2.0.1
-
-2002-12-30  Bastien Nocera <hadess@hadess.net>
-
-	* Added sysdeps/aix directory that was missing
-
-2002-10-08  Laurent Vivier <Laurent.Vivier@bull.net>
-
-	* Framework for AIX support
-
-2002-08-07  Vincent Berger <Vincent.Berger@ext.bull.net> 
-
-	* support/: Add alloca management for AIX
-	* configure.in: correct checking for nm
-
-2002-11-03  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
-
-	* configure.in: Added Belarusian to ALL_LINGUAS
-
-2002-09-26  Stanislav Brabec  <sbrabec@suse.cz>
-
-	* configure.in: Added cs to ALL_LINGUAS.
-
-2002-09-26  jacob berkman  <jacob@ximian.com>
-
-	* configure.in (ALL_LINGUAS): remove cs until the file actually
-	gets added
-
-2002-09-26  Stanislav Brabec  <sbrabec@suse.cz>
-
-	* configure.in: Added cs to ALL_LINGUAS.
-
-2002-08-20  Peteris Krisjanis <peteris.krisjanis@os.lv>
-
-	* configure.in: (ALL_LINGUAS) Added Latvian (lv).
-
-2002-06-25  Yanko Kaneti <yaneti@declera.com>
-
-	* configure.in: (ALL_LINGUAS) Added Bulgarian (bg).
-
-2002-05-10  Kevin Vandersloot <kfv101@psu.edu>
-
-	* configure.in: release 2.0.0
-
-2002-05-28  Carlos Perello Marin <carlos@gnome-db.org>
-
-	* configure.in (ALL_LINGUAS): Removed all es_* and added only es_ES.
-
-2002-05-08  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* configure.in: Added Vietnamese (vi) to ALL_LINGUAS
-
-2002-03-12  James Henstridge  <james@daa.com.au>
-
-	* acinclude.m4 (LIBGTOP_HEACKER_TESTS): AM_CONDITIONAL()
-	statements can't be conditionally executed (automake compat fix).
-	(GNOME_LIBGTOP_SYSDEPS): move the conditional here so that it is
-	always executed.
-
-2002-02-10  Kevin Vandersloot <kfv101@psu.edu>
-
-	* configure.in: bump version
-
-	* release 1.90.2
-
-2002-02-09  Bastien Nocera  <hadess@hadess.net>
-
-	reviewed by: Kevin Vandersloot <kfv101@psu.edu>
-
-	* configure.in: remove need for dc, and clean up
-	* stamp-h.in, .cvsignore: remove
-
-2002-02-05  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in (ALL_LINGUAS): zh_CN.GB2312 -> zh_CN
-
-2001-01-14  Hasbullah bin Pit <sebol@ikhlas.com>
-
-	* configure.in: Added ms in ALL_LINGUAS.
-	* po/ms.po: Added Malay Translation.
-	* po/.cvsignore: Added 'libgtop-2.0.pot'.
-
-2001-01-14  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in: Sync'ed ALL_LINGUAS with files in po directory,
-	and renamed GETTEXT_PACKAGE to avoid conflict with libgtop 1.0.x.
-
-2002-01-10  Kevin Vandersloot <kfv101@psu.edu>
-
-	* acininclude.m4: add back the support stuf but make it really
-	work
-
-	* configure.in: bump version number, add back GNOME_SUPPORT 
-	check since that was causing a build failure
-
-	* release 1.90.1
-
-2002-01-09  Kevin Vandersloot <kfv101@psu.edu>
-
-	* acinclude.m4: remove gnome support check. Fixes the build
-	for those with automake < 1.4p5.
-
-	* configure.in: remove check for GNOME_SUPPORT
-
-2001-14-27  Miles Lane <miles@megapathdsl.net>
-
-	* acconfig.h:  Added "#undef HAVE_GETTEXT" entry.
-	* LIBGTOP_VERSION:  Removed file.
-	* configure.in:  added glib-gettextize support and
-	  moved in the *VERSION* stuff from LIBGTOP_VERSION.
-
-2001-11-27  Kevin Vandersloot <kfv101@psu.edu>
-
-	* acinclude.m4: copy some of the macros that were formerly
-	in gnome-macros
-
-	* configure.in, sysdeps/Makefile.am: comment out guile
-	support for now.
-
-	* release 1.90.0
-
-2001-11-26  Kevin Vandersloot <kfv101@psu.edu>
-
-	* src/daemon/gnuserv.c:  Apply patch fixing security issue from
-        intexxia labs - #1048-261101
-
-2001-11-26  Abel Cheung <maddog@linux.org.hk>
-
-	* src/inodedb/file_by_inode.c: Rename to file_by_inode2.c
-	* src/inodedb/mkinodedb.c: Rename to mkinodedb2.c
-
-	* po/POTFILES.in: Reflect above change
-
-	* */.cvsignore: Add various files
-
-2001-11-25  Kevin Vandersloot <kfv101@psu.edu>
-
-	* port stable libgtop to GNOME 2.0. Too much to detail.
-	pkgconfig is now used. Libs are named libgtop-2.0 etc for
-	parallel install. 
-
-2001-10-17  Abel Chueng  <maddog@linux.org.hk>
-
-	* configure.in, Makefile.am, include/glibtop/Makefile.am: headers
-	moved to $(includedir)/libgtop-1.0/glibtop.
-
-2001-09-16  Abel Chueng  <maddog@linux.org.hk>
-
-	* configure.in: Added "zh_TW" to ALL_LINGUAS.
-
-2001-02-13  Martin Baulig  <baulig@suse.de>
-
-	Released LibGTop 1.0.12 "Gerolzhofen".
-
-	* NEWS: Added news entry to 1.0.12.
-
-	* LIBGTOP-VERSION: Set version number to 1.0.12, binary age 11,
-	interface age 11.
-
-2001-02-19  Simos Xenitellis  <simos@hellug.gr>
-
-	* configure.in: Added "el" to ALL_LINGUAS.
-
-2001-02-15  Martin Baulig  <baulig@suse.de>
-
-	Released LibGTop 1.0.11 "Jasmin".
-
-	* NEWS: Added news entry for 1.0.11.
-
-2001-02-14  Martin Baulig  <baulig@suse.de>
-
-	Merged from LIBGTOP_1_1_2_PATCHES.
-
-	* libgtop-sysdeps.m4 (GLIBTOP_SOLARIS_RELEASE): Define this on Solaris;
-	we use version codes like 270 for SunOS 5.7 and 251 for SunOS 2.5.1.
-
-	* LIBGTOP-VERSION (LIBGTOP_VERSION_SUFFIX): Added this so you can
-	have your tarballs called `libgtop-1.x.y-snap.tar.gz' or whatever.
-	This only affects the `VERSION' variable and thus how the resulting
-	tarball will be called, but not `LIBGTOP_VERSION_CODE' etc.
-
-	* configure.in, acconfig.h: Added checks for <procfs.h>
-	and <sys/procfs.h>
-
-	* configure.in (DL_LIB): Check for dlopen() and AC_SUBST this.
-
-	* Makefile.am: Make `aclocal.m4' also depend on `LIBGTOP-VERSION'
-	when in maintainer-mode.
-
-2001-02-14  Martin Baulig  <baulig@suse.de>
-
-	* include/glibtop/limits.h: Removed; this file doesn't exist
-	in the stable branch.
-
-2001-02-13  Martin Baulig  <baulig@suse.de>
-
-	* LIBGTOP-VERSION: Set version number to 1.0.11, binary age 10,
-	interface age 10.
-
-2001-02-13  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* configure.in: Added sk to ALL_LINGUAS
-
-2001-02-08  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
-
-	* configure.in (ALL_LINGUAS): Added pt_BR to ALL_LINGUAS.
-
-2000-11-21  Martin Baulig  <baulig@suse.de>
-
-	* libgtop-config.h.in: Added `--cflags', `--libs' and `--extra-libs'
-	parameters.
-
-2000-11-20  Martin Baulig  <baulig@suse.de>
-
-	Released LibGTop 1.0.10 "November Rain".
-
-	* LIBGTOP-VERSION: Set version number to 1.0.10, binary age 9,
-	interface age 9.
-
-2000-05-25  Martin Baulig  <baulig@suse.de>
-
-	Released LibGTop 1.0.9 "Stuttgart".
-
-	* LIBGTOP-VERSION: Set version number to 1.0.9 binary age 8,
-	interface age 8.
-
-	(LibGTop 1.0.8 "Frankfurt" was not publically released.)
-
-2000-02-20  Martin Baulig  <martin@home-of-linux.org>
-
-	* LIBGTOP-VERSION: Set version number to 1.0.8 binary age 7,
-	interface age 7.
-
-2000-02-15  Martin Baulig  <martin@home-of-linux.org>
-
-	Released LibGTop 1.0.7 "Copenhagen".
-
-1999-10-19  Martin Baulig  <martin@home-of-linux.org>
-
-	* LIBGTOP-VERSION: Set version number to 1.0.7 binary age 6,
-	interface age 6.
-
-1999-10-18  Martin Baulig  <martin@home-of-linux.org>
-
-	Released LibGTop 1.0.6 "October LibGTop".
-
-1999-10-18  Martin Baulig  <martin@home-of-linux.org>
-
-	* NEWS.old: Removed obsolete file.
-
-	* RELNOTES-1.0.x: Added release notes for LibGTop 1.0.6.
-
-	* TODO: Removed obsolete file.
-
-	* NEWS: We start maintaining a NEWS file now :)
-
-1999-10-16  Martin Baulig  <martin@home-of-linux.org>
-
-	* LIBGTOP-VERSION: Set version number to 1.0.6 binary age 5,
-	interface age 5.
-
-1999-10-09  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in (ALL_LINGUAS): Added Galician (gl)
-
-1999-09-29  Martin Baulig  <martin@home-of-linux.org>
-
-	Released LibGTop 1.0.5.
-
-1999-09-29  Martin Baulig  <martin@home-of-linux.org>
-
-	* configure.in (libgtop_top_builddir): AC_SUBST this.
-
-1999-09-24  Martin Baulig  <martin@home-of-linux.org>
-
-	* LIBGTOP-VERSION: Set version number to 1.0.5 binary age 4,
-	interface age 4.
-
-1999-09-24  Martin Baulig  <martin@home-of-linux.org>
-
-	Released LibGTop 1.0.4.
-
-1999-09-22  Kjartan Maraas  <kmaraas@online.no>
-
-	* configure.in: Added "da" to ALL_LINGUAS.
-	
-1999-09-19  Martin Baulig  <martin@home-of-linux.org>
-
-	* libgtopConf.sh.in: Added MODULE_VERSION on Miguel's
-	request (set it to "libgtop-@LIBGTOP_VERSION@").
-
-1999-09-18  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* configure.in, po/*.po: merged *.po files from HEAD CVS
-
-1999-09-17  Martin Baulig  <martin@home-of-linux.org>
-
-	* configure.in: Make it work if we have GNOME and the user
-	gave use --without-gnome (fixes bug #1735).
-
-1999-09-17  Martin Baulig  <martin@home-of-linux.org>
-
-	* LIBGTOP-VERSION: Set version number to 1.0.4 binary age 3,
-	interface age 3.
-
-1999-09-16  Martin Baulig  <martin@home-of-linux.org>
-
-	Merged everything since May 31 from HEAD and released
- 	LibGTop 1.0.3.
-
-1999-07-29  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/error.h: Use G_GNUC_UNUSED.
-
-	* configure.in (ENABLE_STATIC, ENABLE_SHARED): New automake
-	conditionals.
-
-1999-07-11  Tomas Ogren  <stric@ing.umu.se>
-
-	* configure.in: Added sv to ALL_LINGUAS
-
-1999-07-11  Tomas Ogren  <stric@ing.umu.se>
-
-	* sysdeps/names/procmem.c: Fixed a tyop
-
-1999-05-31  Martin Baulig  <martin@home-of-linux.org>
-
-	* LIBGTOP-VERSION: Set version number to 1.0.3 binary age 2,
-	interface age 2.
-
-1999-05-31  Martin Baulig  <martin@home-of-linux.org>
-
-	Released LibGTop 1.0.2.
-
-1999-05-26  Martin Baulig  <martin@home-of-linux.org>
-
-	* configure.in (INCLUDES): Define `LIBGTOP_VERSION_CODE' here so we
-	can use version conditionals in the sysdeps code.
-
-1999-05-25  Martin Baulig  <martin@home-of-linux.org>
-
-	* libgtop-sysdeps.m4: Make the I4B check work for NetBSD.
-
-1999-05-16  Martin Baulig  <martin@home-of-linux.org>
-
-	* doc: Merged the LibGTop Manual from the HEAD.
-
 1999-03-01  Martin Baulig  <martin@home-of-linux.org>

 	Released LibGTop 1.0.1.
--- a/9
+++ b/9
@@ -7,14 +7,11 @@
 # set LIBGTOP_BINARY_AGE and LIBGTOP_INTERFACE_AGE to 0.
 #
 LIBGTOP_MAJOR_VERSION=1
-LIBGTOP_MINOR_VERSION=90
-LIBGTOP_MICRO_VERSION=0
+LIBGTOP_MINOR_VERSION=0
+LIBGTOP_MICRO_VERSION=1

 LIBGTOP_INTERFACE_AGE=0
 LIBGTOP_BINARY_AGE=0
-# you can set this to `-snap' for instance to create
-# a `libgtop-1.x.y-snap.tar.gz' tarball.
-LIBGTOP_VERSION_SUFFIX=

 # Increase each time you change the client/server protocol.
 LIBGTOP_SERVER_VERSION=5
@@ -24,5 +21,5 @@ LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VER
 LIBGTOP_VERSION_CODE=`echo "$LIBGTOP_MAJOR_VERSION 1000000 * $LIBGTOP_MINOR_VERSION 1000 * + $LIBGTOP_MICRO_VERSION + p q" | dc`

 # For automake.
-VERSION=$LIBGTOP_VERSION$LIBGTOP_VERSION_SUFFIX
+VERSION=$LIBGTOP_VERSION
 PACKAGE=libgtop
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,16 +10,14 @@ if BUILD_GNOME_SUPPORT
 support = support
 endif

-SUBDIRS = po $(support) misc include sysdeps lib src \
-	  $(examples_SUBDIRS) doc
+SUBDIRS = po intl $(support) macros misc include sysdeps lib src \
+	  $(examples_SUBDIRS)

-libgtopinclude_HEADERS = glibtop.h
-libgtopincludedir = $(includedir)/libgtop-2.0
+include_HEADERS = glibtop.h

 EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in \
 	LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 \
-	RELNOTES-1.0 RELNOTES-1.0.x libgtop-sysdeps.m4 README \
-	libgtop-mirror.sh libgtop-2.0.pc.in acinclude.m4
+	RELNOTES-1.0 libgtop-sysdeps.m4 README NEWS.old libgtop-mirror.sh

 dist-hook:
 	cp libgtop.spec $(distdir)
@@ -29,24 +27,19 @@ release:

 ## Put `exec' in the name because this should be installed by
 ## `install-exec', not `install-data'.
-## confexecdir	= $(libdir)
-## confexec_DATA	= $(top_builddir)/libgtopConf.sh \
-##		  $(top_builddir)/libgtop-features.def
-		  
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgtop-2.0.pc
+confexecdir	= $(libdir)
+confexec_DATA	= $(top_builddir)/libgtopConf.sh \
+		  $(top_builddir)/libgtop-features.def

-CLEANFILES=libgtopConf.sh
-
-## bin_SCRIPTS = $(top_builddir)/libgtop-config
+bin_SCRIPTS = $(top_builddir)/libgtop-config

 ## to automatically rebuild aclocal.m4 if any of the macros in
 ## `macros/' change
-## @MAINT@ include macros/macros.dep
-## @MAINT@macros/macros.dep: macros/Makefile.am
-## @MAINT@	cd macros && $(MAKE) macros.dep
+@MAINT@ include macros/macros.dep
+@MAINT@macros/macros.dep: macros/Makefile.am
+@MAINT@	cd macros && $(MAKE) macros.dep

-@MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION
+@MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4

 ## We create libgtopConf.sh here and not from configure because we want
 ## to get the paths expanded correctly.  Macros like srcdir are given
@@ -55,7 +48,7 @@ CLEANFILES=libgtopConf.sh
 libgtopConf.sh: libgtopConf.sh.in Makefile
 ## Use sed and then mv to avoid problems if the user interrupts.
 	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
-	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)/libgtop-2.0#g' \
+	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \
 	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
 	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
 	  -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \
@@ -82,11 +75,11 @@ libgtopConf.sh: libgtopConf.sh.in Makefile
 	      < $(srcdir)/libgtopConf.sh.in > libgtopConf.tmp \
 	  && mv libgtopConf.tmp libgtopConf.sh

-# libgtop-config: libgtop-config.in Makefile
-#	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
-#	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
-#	  && mv libgtop-config.tmp libgtop-config && \
-#		chmod 755 libgtop-config
+libgtop-config: libgtop-config.in Makefile
+	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
+	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
+	  && mv libgtop-config.tmp libgtop-config && \
+		chmod 755 libgtop-config

 libgtop-features.def: features.def
 	@LN_S@ $< $@
--- a/68
+++ b/68
@@ -1,68 +0,0 @@
-February 27, 2001:
-=================
-
-* Released LibGTop 1.0.12 "Gerolzhofen".
-
-  - fix for Solaris 8 from Laszlo PETER (msg_limits, sem_limits).
-
-  - fix for FreeBSD 4.2 from Rolf Grossmann (FreeBSD now uses
-    `_KERNEL' instead of `KERNEL'). Bug #51334.
-
-  - for BSDI, comment out `subnet' field in netload; this should make
-    it compile, but there may be other problems. Bug #13345.
-
-  This release is for GNOME 1.4 Beta2.
-
-February 14, 2001:
-=================
-
-* Released LibGTop 1.0.11 "Jasmin":
-
-  [The release which was supposed to be called "Gerolzhofen".]
-
-  - merged in the Solaris code from LIBGTOP_1_1_2_PATCHES.
-
-  - minor OpenBSD fixes.
-
-  - again a bunch of updated translations.
-
-  Please test the Solaris stuff and report and bugs and
-  problems as soon as possible; I'll make a new release
-  for the 2nd beta of GNOME 1.4 if necessary.
-
-November 20, 2000:
-=================
-
-* Released LibGTop 1.0.10 "November Rain":
-
-  - this release contains a bunch of updated translations.
-
-May 25, 2000:
-============
-
-* Released LibGTop 1.0.9 "Stuttgart".
-
-  (LibGTop 1.0.8 "Frankfurt" was not publically released.)
-
-February 15, 2000:
-=================
-
-* Released LibGTop 1.0.7 "Copenhagen":
-
-  - this is a bug fix release for the GUADEC CD-ROM;
-    it contains fixes in both the Linux and *BSD sysdeps
-    directory.
-
-October 18, 1999:
-================
-
-* Released LibGTop 1.0.6 "October LibGTop":
-
-  - compilation fixes for FreeBSD.
-  - updated reference manual.
-
-September 29, 1999:
-==================
-
-* Released LibGTop 1.0.5.
-
--- a/NEWS.old
+++ b/NEWS.old
@@ -0,0 +1,244 @@
+$Id$
+
+Jun/01/1998
+===========
+
+	* We have some new ``suffix rules'':
+
+	  '__l' is a function defined in the client part;
+	  '__s' is a function defined in the sysdeps part and
+	  '__p' is a function that needs special priviledges.
+	  '__r' is mapped either on '__p' or on '__s'.
+	  the function without suffix is mapped on '__l'.
+
+	* We now decide at runtime whether or not using the server
+	is required for a particular function. All user programs
+	now call the '__l' function defined in '-lgtop' (in the lib
+	subdir). These functions either use 'glibtop_call__l' to
+	call the server or call the '__r' function.
+
+	* A function in the sysdeps directory now has the '__s' suffix
+	if it do not need any priviledges (and thus can be called directly
+	from client code) and the '__p' suffix otherwise (when it has to
+	be called from the server).
+
+	* If you call one of these functions:
+
+	  -> use the '__p' suffix to be sure to get the SUID-safe one
+	     (used in the server).
+	  -> use the '__s' suffix to be sure to get a function that
+	     doesn't need any priviledges.
+	  -> use the '__r' suffix otherwise (it is mapped either on the
+	     '__p' or on the '__s' one).
+
+	Only use the '__p' and '__s' functions in a 'GLIBTOP_SUID_<feature>'
+	conditional, otherwise you'll get undefined symbols !
+
+	* The server is now started from 'glibtop_init__r', but only when
+	it's really needed; for instance on DEC OSF/1 you only need it
+	for the proc* features - if you program only fetches the CPU usage,
+	now server will be started.
+
+	* Sorry, at the moment everything is a little bit unstable, I'm doing
+	heavy changes. I've just some great ideas which still need some work:
+
+	  -> I want to have a SUID server that only implements those features
+	     that need to be SUID; everything else uses the sysdeps code directly.
+
+	  -> If a program only uses stuff that do not need the server, the
+	     server will not be started at all.
+
+	  -> I'm working on some kind of proxy server that can be used on a remote
+	     host; in feature one can then use the MDI stuff from ghex in gtop to
+	     have notebook pages displaying processes from different hosts.
+
+	* Well it is as much unstable that it only works under Linux at the moment.
+
+1998-06-01  Martin Baulig  <martin@home-of-linux.org>
+
+	* sysdeps/common/sysdeps.c: now using '__r' functions,
+	they are #defined either as the '__p' or the '__s' ones.
+
+	* sysdeps/linux/*.c: changed call of 'glibtop_init__r',
+	it now takes two additional arguments.
+
+	* examples/{first.c, second.c}: now using 'glibtop_init'
+	instead of 'glibtop_init__r'.
+
+	* include/glibtop/sysdeps.h: added 'dummy' member so
+	'GLIBTOP_SYSDEPS_<feature>' now start with 1.
+
+	* include/glibtop/*.h: we now #define 'glibtop_get_<feature>'
+	as 'glibtop_get_<feature>__l' and 'glibtop_get_<feature>__r'
+	either as the '__p' or the '__s' function.
+
+	* lib/*.c: removed #if's - we now decide at runtime
+	whether to use the server or to call the appropriate
+	function for the sysdeps directory.
+
+1998-05-28  Martin Baulig  <baulig@merkur.uni-trier.de>
+
+	* src/server/main.c: we now use the '__p' functions,
+	but only if the appropriate 'GLIBTOP_SUID_<feature>'
+	has a non-zero value.
+	
+	* configure.in (@machine_incs@): always use 
+	`-I$(top_srcdir)/sysdeps/@sysdeps_dir@'; it's no
+	longer conditional.
+
+	* examples/Makefile.am: removed the '_linux' examples.
+	
+	* sysdeps/linux/*.c: renamed all functions implementing
+	features to '__s'.
+	
+	* lib/*.c: renamed all functions implementing features
+	to '__l'; we only emit code for those functions if the
+ 	corresponding 'GLIBTOP_SUID_<feature>' has a positive value.
+	
+	* include/glibtop/*.h: added some new function suffixes:
+	'__l' is a function defined in the client part;
+	'__s' is a function defined in the sysdeps part and
+	'__p' is a function that needs special priviledges.
+	'__r' is mapped either on '__l' or on '__s'.
+	
+	* sysdeps/linux/glibtop_server.h: New file -
+	defines system dependent constants 'GLIBTOP_SUID_<feature>'
+	being either 'GLIBTOP_SYSDEPS_<feature>'+1 depending upon
+ 	whether or not this feature requires using the server.
+
+	* lib/sysdeps.c: removed that file; it is no longer
+	needed.
+
+
+
+May/21/1998
+===========
+
+* doc/gnome-hackers.sgml: This is a short intro on how to use libgtop
+  in the GNOME project. It covers especially the use of its 'configure'
+  script and the automatically generated 'gtopConf.sh'.
+
+May/20/1998
+===========
+
+* 'gtopConf.sh' now defines 'GTOP_LIBS' and 'GTOP_INCS' in a manner
+  that they contain everything that is needed to link some program with
+  libgtop. It will use '-lgtop' only if the server is really needed and
+  '-lgtop_sysdeps' otherwise;
+
+* 'gtopConf.sh' additionally defines 'GTOP_GUILE_LIBS' and 'GTOP_GUILE_INCS'
+  containing everything that is needed to link some program both with
+  libgtop and its guile interface. They are identically to 'GTOP_LIBS'
+  and 'GTOP_INCS' if building the guile interface is disabled or guile
+  cannot be found on the system.
+
+* 'configure' takes additional arguments '--enable-libgtop-server' and
+  '--disable-libgtop-server' to use the server even when it's not needed
+  or to disable it's use where it's needed.
+
+* 'configure' takes an argument '--without-libgtop-guile' to disable
+  guile support.
+
+* 'configure takes an argument '--without-libgtop-names' to remove
+  '-lgtop_names' (and '-lgtop_guile_names' when we have guile) from
+  'GTOP_LIBS'; in this case these libraries are not even built.
+
+May/19/1998
+===========
+
+* Libgtop is now in the GNOME CVS Repository.
+
+May/17/1998
+===========
+
+* we have now 'const char *glibtop_types_* []' consisting
+  of the C types of the corresponding files of '_glibtop_*'.
+
+* added guile function '(glibtop-types-*)' and '(glibtop-descriptions-*)'.
+
+May/10/1998
+===========
+
+* Port to DEC OSF1 3.0 has been made:
+
+  cpu		(total, user, nice, sys, idle)
+  mem		(total, used, free)
+
+  loadavg	(loadavg)
+  uptime	(uptime)
+
+  msg_limits	(map, max, mnb, mni, tql)
+  sem_limits	(mni, msl, opm, vmx, aem)
+  shm_limits	(max, min, mni, seg)
+
+  The following need the server to be SUID root:
+
+  proclist	(total, number, size)
+  procdata	(cmd, state, uid, pid, ppid, pgrp, tty, k_flags,
+		 session, tpgid, sigignore, sigcatch, signal, nice, 
+		 priority, resident, rss, vsize, utime, stime,
+		 cutime, cstime, trs, drs)
+
+May/07/1998
+===========
+
+* 'flags' member of sysdeps/linux/procdata.c is now
+  'unsigned long flags [2]'.
+
+* When we give glibtop_get_procdata () a pid of zero, only
+  the flags are returned.
+
+* We now use static constants instead of #defines for sysdeps flags.
+
+May/03/1998
+===========
+
+* VPATH-Build now working; sometimes it's necessary to copy
+  $(top_srcdir)/po/cat-id-tbl.c to $(top_builddir)/po.
+
+* The library has been tested on the following systems:
+
+  - i686-pc-linux-gnu
+  - sparc-sun-sunos4.1.1
+  - alpha-dec-osf1 (that's DEC OSF1 3.0 and 3.2)
+
+* Compilation has been tested on the following systems (I have no root
+  access there and cannot test the library because of this):
+
+  - sparc-sun-solaris2
+  - i386-bsdi
+
+* Does no longer require Gnome.
+
+* Guile-Parts are compiled only if guile can be found.
+
+* Some of the executables are statically linked to copy them more easily
+  between machines.
+
+May/02/1998
+===========
+
+ * Global changes to the interfaces, all functions except glibtop_open()
+   and glibtop_close() that took a server argument have now a '__r' suffix;
+   the original name is now a macro that uses glibtop_global_server.
+
+Apr/10/1998
+===========
+Added new directory sysdeps/guile/names. It is the guile interface
+to the gtop_names library found in sysdeps/names. Changed
+GLIBTOP_DESCRIPTIONS to GLIBTOP_NAMES and added GLIBTOP_GUILE_NAMES
+to the header files.
+
+Apr/09/1998
+===========
+Added new directories guile and names to sysdeps. In names are
+some string constants about the data stored in the structures.
+guile is a guile interface for the library. It is used in
+examples/third (which has been completely rewritten).
+The header files define things from names when GLIBTOP_DESCRIPTIONS
+if defined and/or from guile when HAVE_GUILE is defined.
+
+Apr/08/1998
+===========
+
+Added guile wrapper for the library (see examples/third).
--- a/RELNOTES-1.0
+++ b/RELNOTES-1.0
@@ -87,7 +87,7 @@ LibGTop is currently used in various places in the GNOME Project,
 for instance in some of the applets in gnome-core and - of cause -
 this ultra-cool application called GTop ...

-Although LibGTop is not specific to GNOME and under GPL license, I
+Although LibGTop is not specific to GNOME and under LGPL license, I
 spent most my time during the last months to work in the GNOME project
 so this is the primary use for LibGTop (and currently the only one).

--- a/RELNOTES-1.0.x
+++ b/RELNOTES-1.0.x
@@ -1,172 +0,0 @@
-RELEASE NOTES FOR LIBGTOP 1.0.7
-===============================
-
-OVERVIEW
--------
-
-LibGTop is a library that read information about processes and the
-running systems. This information include:
-
-General System Information:
-
-cpu		- CPU Usage
-mem		- Memory Usage
-swap		- Swap Usage (including paging activity)
-loadavg		- Load average (including nr_running, nr_tasks, last_pid)
-uptime		- Uptime and Idle time, can be calculated from CPU usage
-
-SYS V IPC Limits:
-
-shm_limits	- Shared Memory Limits
-msg_limits	- Message Queue Limits
-sem_limits	- Semaphore Set Limits
-
-Network:
-
-netload		- Network load
-ppp		- PPP statistics
-
-Process List:
-
-proclist	- List of processes
-
-Process information:
-
-proc_state	- cmd, state, uid, gid
-proc_uid	- uid,euid,gid,egid,pid,ppid,pgrp
-		  session,tty,tpgid,priority,nice
-proc_mem	- size,vsize,resident,share,rss,rss_rlim
-proc_time	- start_time,rtime,utime,stime,cutime,cstime
-		  timeout,it_real_value,frequency
-proc_signal	- signal,blocked,sigignore,sigcatch
-proc_kernel	- k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt
-		  kstk_esp,kstk_eip,nwchan,wchan
-proc_segment	- text_rss,shlib_rss,data_rss,stack_rss,dirty_size
-		  start_code,end_code,start_stack
-
-Process maps:
-
-proc_args	- Command line arguments
-proc_map	- Process map (/proc/<pid>/maps under Linux)
-
-File system usage:
-
-mountlist	- List of currently mounted filesystems
-fsusage		- File system usage
-
-PORTABILITY:
-----------
-
-LibGTop is designed to be as portable as possible. None of the
-functions and retrieved information should be specific to a specific
-operating system. So you only need to port the system dependent part
-of the library to a new system and all application programs can then
-use libgtop on this new system.
-
-CLIENT/SERVER MODEL:
-------------------
-
-Some systems like DEC OSF/1 or BSD require special privileges for the
-calling process to fetch the required information (SUID root/SGID
-kmem). To solve this problem, I designed a client/server model which
-makes a call to a SUID/SGID server which fetches the required
-information whenever it is required. This server is only called for
-features that really require privileges, otherwise the sysdeps code
-is called directory (every user can get the CPU usage on DEC OSF/1,
-but only root can get information about processes other than the
-current one).
-
-There is also some kind of daemon which can be used to fetch
-information from remote systems (still experimental). This daemon
-normally runs as nobody and calls the SUID/SGID itself when needed.
-
-LIBGTOP AND GNOME:
-----------------
-
-Although LibGTop is part of the GNOME desktop environment, its main
-interface is totally independent from any particular desktop environment,
-so you can also use it as a standalone library in any piece of GPLed
-software which makes it also a valuable part of the GNU project.
-
-LibGTop is currently used in various places in the GNOME Project,
-for instance in some of the applets in gnome-core and - of cause -
-this ultra-cool application called GTop ...
-
-However, you need to give the configure.in script the `--without-gnome'
-parameter when you want to use LibGTop without GNOME (this is because,
-if you want to use it with GNOME, you need to compile it after the main
-GNOME libraries and I wanted to avoid getting unnecessary bug reports
-about this).
-
-LIBGTOP AND GNOME - PART II:
---------------------------
-
-LibGTop was tested with FreeBSD 3.0 but it should also work with
-FreeBSD 2.2.7, NetBSD and OpenBSD.
-
-Unfortunately, I don't have the power and disk space to install all
-possible operating systems out there on my machine and test things myself,
-so I depend on people telling me whether it works and sending me bug
-reports and patches if not.
-
-However, I consider FreeBSD, NetBSD and OpenBSD as supported systems for
-LibGTop and whenever I get bug reports I will do my best to fix them as
-quickly as possible.
-
-PLATFORM SPECIFIC NOTES FOR LINUX:
-==================================
-
-[I am speaking of the Linux kernel here.]
-
-Under Linux, LibGTop should work without problems and read everything
-from /proc.
-
-LibGTop 0.25 also had an experimental kernel interface to read this
-information directly from the kernel with a system call - but I have
-currently dropped support for this as I am too busy with GNOME
-development to keep current with kernel hacking.
-
-PLATFORM SPECIFIC NOTES FOR SOLARIS:
-====================================
-
-The development branch of LibGTop (the 1.1.x series) has a first version
-of the Solaris port which works at least on Solaris 7.
-
-If you are on a Solaris system and want to give it a try, just fetch the
-latest 1.1.x tarball from ftp://ftp.home-of-linux.org/pub/libgtop/1.1/
-and try it out.
-
-PLATFORM SPECIFIC NOTES FOR BSD:
-=================================
-
-There are a few caveats:
-
-* You need to manually make the `$(prefix)/bin/libgtop_server' SGID to
-  kmem after installation and mount the /proc file system of FreeBSD
-  (/proc/<pid>/mem is used within kvm_uread ()).
-
-* To get the filenames of the process maps displayed in GTop, you need
-  to configure with the `--with-libgtop-inodedb' option (you need GDBM
-  for this to work).
-
-  You have then to create an inode database which is used to look up
-  filenames. This is done using the `mkinodedb' program which comes
-  along with libgtop.
-
-  See the file src/inodedb/README for details:
-
-  The `mkinodedb' program which is build in this directory takes two
-  command line arguments: the full pathname of the database to be
-  created and the name of a configuration file consisting of directory
-  and file names each on a line by itself - see `/etc/ld.so.conf' for
-  an example.
-
-  Putting a directory name in this file means all regular files found
-  in this directory are included in the database, but it will not
-  recursively descend into subdirectories (for instance, we want
-  everything in `/usr/lib' but not every single file in `/usr/lib/sgml').
-  You can also use filenames to include a single file.
-
-Have fun,
-
-Martin <martin@home-of-linux.org>
--- a/46
+++ b/46
@@ -0,0 +1,46 @@
+This is LibGTop 0.99.2,
+
+a feature-freezed version of LibGTop for GNOME 1.0.
+
+You need to use the latest version of LibGTop from CVS for Gnome, it will
+no longer work with older releases.
+
+Martin
+
+--------------------------------------------------------------------------
+
+NOTE:  LibGTop is already feature-freezed for GNOME 1.0, so only bug fixes
+       are ok, no API changes !
+
+Sysdeps directory 'linux':
+==========================
+
+* Add implementation for `ppp' with modems.
+
+Sysdeps directory 'freebsd':
+============================
+
+* FreeBSD 3.0: It works fine on this system, so please make sure not
+               to break it here.
+
+* FreeBSD 2.2: Make sure it still works here.
+
+* NetBSD/OpenBSD: Support was added on Dec 6, but we need to check
+                  whether all data are valid.
+
+Sysdeps directories 'kernel', 'osf1' and 'sun4':
+================================================
+
+* You need to use the `--enable-hacker-mode' parameter to configure
+  to build this directories.
+
+--------------------------------------------------------------------------
+
+Everything except sysdeps directories:
+======================================
+
+* Ready for Gnome 1.0. [ALREADY FEATURE FREEZED]
+
+January 5, 1999
+
+Martin
--- a/acconfig.h
+++ b/acconfig.h
@@ -18,7 +18,6 @@

 #undef ENABLE_NLS
 #undef HAVE_CATGETS
-#undef GETTEXT_PACKAGE
 #undef HAVE_GETTEXT
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY
@@ -157,14 +156,6 @@
 */
 #undef GLIBTOP_LINUX_VERSION_CODE

-/* Solaris release code (eg. 251 for Solaris 2.5.1). */
-#undef GLIBTOP_SOLARIS_RELEASE
-
 /* Define if you want to use LibGTop without GNOME. */
 #undef WITHOUT_GNOME

-/* Define if you have the <procfs.h> header file */
-#undef HAVE_PROCFS_H
-
-/* Define if you have the <sys/procfs.h> header file */
-#undef HAVE_SYS_PROCFS_H
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,880 +0,0 @@
-dnl This is just copied m4s from need-declaration.m4 gnome-fileutils.m4
-dnl gnome-supprt-checks.m4 and a little from gnome-libgtop-check.m4
-dnl and finally libgtop-sysdeps.m4
-
-dnl
-dnl LIBGTOP_CHECK_TYPE
-dnl
-dnl Improved version of AC_CHECK_TYPE which takes into account
-dnl that we need to #include some other header files on some
-dnl systems to get some types.
-
-dnl AC_LIBGTOP_CHECK_TYPE(TYPE, DEFAULT)
-AC_DEFUN([AC_LIBGTOP_CHECK_TYPE],
-[AC_REQUIRE([AC_HEADER_STDC])dnl
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(ac_cv_type_$1,
-[AC_EGREP_CPP(dnl
-changequote(<<,>>)dnl
-<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl
-changequote([,]), [#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-
-/* For Tru64 */
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
-AC_MSG_RESULT($ac_cv_type_$1)
-if test $ac_cv_type_$1 = no; then
-  AC_DEFINE($1, $2)
-fi
-])
-
-dnl
-dnl GNOME_LIBGTOP_TYPES
-dnl
-dnl some typechecks for libgtop.
-dnl
-
-AC_DEFUN([GNOME_LIBGTOP_TYPES],
-[
-        AC_CHECK_HEADERS(sys/bitypes.h)
-        AC_LIBGTOP_CHECK_TYPE(u_int64_t, unsigned long long int)
-        AC_LIBGTOP_CHECK_TYPE(int64_t, signed long long int)
-])
-
-dnl See whether we need a declaration for a function.
-dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES])
-AC_DEFUN([GCC_NEED_DECLARATION],
-[AC_MSG_CHECKING([whether $1 must be declared])
-AC_CACHE_VAL(gcc_cv_decl_needed_$1,
-[AC_TRY_COMPILE([
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-$2],
-[char *(*pfn) = (char *(*)) $1],
-eval "gcc_cv_decl_needed_$1=no", eval "gcc_cv_decl_needed_$1=yes")])
-if eval "test \"`echo '$gcc_cv_decl_needed_'$1`\" = yes"; then
-  AC_MSG_RESULT(yes)
-  gcc_need_declarations="$gcc_need_declarations $1"
-  gcc_tr_decl=NEED_DECLARATION_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  AC_DEFINE_UNQUOTED($gcc_tr_decl)
-else
-  AC_MSG_RESULT(no)
-fi
-])dnl
-
-dnl Check multiple functions to see whether each needs a declaration.
-dnl GCC_NEED_DECLARATIONS(FUNCTION... [, EXTRA-HEADER-FILES])
-AC_DEFUN([GCC_NEED_DECLARATIONS],
-[for ac_func in $1
-do
-GCC_NEED_DECLARATION($ac_func, $2)
-done
-]
-)
-
-dnl
-dnl GNOME_FILEUTILS_CHECKS
-dnl
-dnl checks that are needed for the diskusage applet.
-dnl
-
-AC_DEFUN([GNOME_FILEUTILS_CHECKS],
-[
-AC_CHECK_HEADERS(fcntl.h sys/param.h sys/statfs.h sys/fstyp.h \
-mnttab.h mntent.h sys/statvfs.h sys/vfs.h sys/mount.h \
-sys/filsys.h sys/fs_types.h sys/fs/s5param.h)
-
-AC_CHECK_FUNCS(bcopy endgrent endpwent fchdir ftime ftruncate \
-getcwd getmntinfo gettimeofday isascii lchown \
-listmntent memcpy mkfifo strchr strerror strrchr vprintf)
-
-dnl Set some defaults when cross-compiling
-
-if test x$cross_compiling = xyes ; then
-        case "$host_os" in
-        linux*)
-          fu_cv_sys_mounted_getmntent1=yes
-          fu_cv_sys_stat_statfs2_bsize=yes
-          ;;
-        sunos*)
-          fu_cv_sys_stat_statfs4=yes
-          ;;
-        freebsd*)
-          fu_cv_sys_stat_statfs2_bsize=yes
-          ;;
-        osf*)
-          fu_cv_sys_stat_statfs3_osf1=yes
-          ;;
-        esac
-fi
-
-# Determine how to get the list of mounted filesystems.
-list_mounted_fs=
-
-# If the getmntent function is available but not in the standard library,
-# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
-AC_FUNC_GETMNTENT
-
-# This test must precede the ones for getmntent because Unicos-9 is
-# reported to have the getmntent function, but its support is incompatible
-# with other getmntent implementations.
-
-# NOTE: Normally, I wouldn't use a check for system type as I've done for
-# `CRAY' below since that goes against the whole autoconf philosophy.  But
-# I think there is too great a chance that some non-Cray system has a
-# function named listmntent to risk the false positive.
-
-if test -z "$list_mounted_fs"; then
-# Cray UNICOS 9
-AC_MSG_CHECKING([for listmntent of Cray/Unicos-9])
-AC_CACHE_VAL(fu_cv_sys_mounted_cray_listmntent,
-[fu_cv_sys_mounted_cray_listmntent=no
-AC_EGREP_CPP(yes,
-[#ifdef _CRAY
-yes
-#endif
-], [test $ac_cv_func_listmntent = yes \
-&& fu_cv_sys_mounted_cray_listmntent=yes]
-)
-]
-)
-AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
-if test $fu_cv_sys_mounted_cray_listmntent = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_LISTMNTENT)
-fi
-fi
-
-if test $ac_cv_func_getmntent = yes; then
-
-# This system has the getmntent function.
-# Determine whether it's the one-argument variant or the two-argument one.
-
-if test -z "$list_mounted_fs"; then
-# 4.3BSD, SunOS, HP-UX, Dynix, Irix
-AC_MSG_CHECKING([for one-argument getmntent function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1,
-[test $ac_cv_header_mntent_h = yes \
-&& fu_cv_sys_mounted_getmntent1=yes \
-|| fu_cv_sys_mounted_getmntent1=no])
-AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
-if test $fu_cv_sys_mounted_getmntent1 = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTENT1)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# SVR4
-AC_MSG_CHECKING([for two-argument getmntent function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2,
-[AC_EGREP_HEADER(getmntent, sys/mnttab.h,
-fu_cv_sys_mounted_getmntent2=yes,
-fu_cv_sys_mounted_getmntent2=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
-if test $fu_cv_sys_mounted_getmntent2 = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTENT2)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
-fi
-
-fi
-
-if test -z "$list_mounted_fs"; then
-# DEC Alpha running OSF/1.
-AC_MSG_CHECKING([for getfsstat function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getsstat,
-[AC_TRY_LINK([
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <sys/fs_types.h>],
-[struct statfs *stats;
-int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ],
-fu_cv_sys_mounted_getsstat=yes,
-fu_cv_sys_mounted_getsstat=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_getsstat)
-if test $fu_cv_sys_mounted_getsstat = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETFSSTAT)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# AIX.
-AC_MSG_CHECKING([for mntctl function and struct vmount])
-AC_CACHE_VAL(fu_cv_sys_mounted_vmount,
-[AC_TRY_CPP([#include <fshelp.h>],
-fu_cv_sys_mounted_vmount=yes,
-fu_cv_sys_mounted_vmount=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
-if test $fu_cv_sys_mounted_vmount = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_VMOUNT)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# SVR3
-AC_MSG_CHECKING([for FIXME existence of three headers])
-AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp,
-[AC_TRY_CPP([
-#include <sys/statfs.h>
-#include <sys/fstyp.h>
-#include <mnttab.h>],
-fu_cv_sys_mounted_fread_fstyp=yes,
-fu_cv_sys_mounted_fread_fstyp=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
-if test $fu_cv_sys_mounted_fread_fstyp = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_FREAD_FSTYP)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# 4.4BSD and DEC OSF/1.
-AC_MSG_CHECKING([for getmntinfo function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo,
-[
-ok=
-if test $ac_cv_func_getmntinfo = yes; then
-AC_EGREP_HEADER(f_type;, sys/mount.h,
-ok=yes)
-fi
-test -n "$ok" \
-&& fu_cv_sys_mounted_getmntinfo=yes \
-|| fu_cv_sys_mounted_getmntinfo=no
-])
-AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo)
-if test $fu_cv_sys_mounted_getmntinfo = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTINFO)
-fi
-fi
-
-# FIXME: add a test for netbsd-1.1 here
-
-if test -z "$list_mounted_fs"; then
-# Ultrix
-AC_MSG_CHECKING([for getmnt function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getmnt,
-[AC_TRY_CPP([
-#include <sys/fs_types.h>
-#include <sys/mount.h>],
-fu_cv_sys_mounted_getmnt=yes,
-fu_cv_sys_mounted_getmnt=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
-if test $fu_cv_sys_mounted_getmnt = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNT)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# SVR2
-AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab])
-AC_CACHE_VAL(fu_cv_sys_mounted_fread,
-[AC_TRY_CPP([#include <mnttab.h>],
-fu_cv_sys_mounted_fread=yes,
-fu_cv_sys_mounted_fread=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_fread)
-if test $fu_cv_sys_mounted_fread = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_FREAD)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
-# FIXME -- no need to abort building the whole package
-# Cannot build mountlist.c or anything that needs its functions
-fi
-
-AC_CHECKING(how to get filesystem space usage)
-space=no
-
-# Perform only the link test since it seems there are no variants of the
-# statvfs function.  This check is more than just AC_CHECK_FUNCS(statvfs)
-# because that got a false positive on SCO OSR5.  Adding the declaration
-# of a `struct statvfs' causes this test to fail (as it should) on such
-# systems.  That system is reported to work fine with STAT_STATFS4 which
-# is what it gets when this test fails.
-if test $space = no; then
-# SVR4
-AC_CACHE_CHECK([statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
-[AC_TRY_LINK([#include <sys/types.h>
-#include <sys/statvfs.h>],
-[struct statvfs fsd; statvfs (0, &fsd);],
-fu_cv_sys_stat_statvfs=yes,
-fu_cv_sys_stat_statvfs=no)])
-if test $fu_cv_sys_stat_statvfs = yes; then
-space=yes
-AC_DEFINE(STAT_STATVFS)
-fi
-fi
-
-if test $space = no; then
-# DEC Alpha running OSF/1
-AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
-AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1,
-[AC_TRY_RUN([
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-int main ()
-{
-struct statfs fsd;
-fsd.f_fsize = 0;
-return (statfs (".", &fsd, sizeof (struct statfs)));
-}],
-fu_cv_sys_stat_statfs3_osf1=yes,
-fu_cv_sys_stat_statfs3_osf1=no,
-fu_cv_sys_stat_statfs3_osf1=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
-if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS3_OSF1)
-fi
-fi
-
-if test $space = no; then
-# AIX
-AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
-member (AIX, 4.3BSD)])
-AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize,
-[AC_TRY_RUN([
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_VFS_H
-#include <sys/vfs.h>
-#endif
-int main ()
-{
-struct statfs fsd;
-fsd.f_bsize = 0;
-return (statfs (".", &fsd));
-}],
-fu_cv_sys_stat_statfs2_bsize=yes,
-fu_cv_sys_stat_statfs2_bsize=no,
-fu_cv_sys_stat_statfs2_bsize=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
-if test $fu_cv_sys_stat_statfs2_bsize = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS2_BSIZE)
-fi
-fi
-
-if test $space = no; then
-# SVR3
-AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
-AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
-[AC_TRY_RUN([#include <sys/types.h>
-#include <sys/statfs.h>
-int main ()
-{
-struct statfs fsd;
-return (statfs (".", &fsd, sizeof fsd, 0));
-}],
-fu_cv_sys_stat_statfs4=yes,
-fu_cv_sys_stat_statfs4=no,
-fu_cv_sys_stat_statfs4=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
-if test $fu_cv_sys_stat_statfs4 = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS4)
-fi
-fi
-
-if test $space = no; then
-# 4.4BSD and NetBSD
-AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
-member (4.4BSD and NetBSD)])
-AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize,
-[AC_TRY_RUN([#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-int main ()
-{
-struct statfs fsd;
-fsd.f_fsize = 0;
-return (statfs (".", &fsd));
-}],
-fu_cv_sys_stat_statfs2_fsize=yes,
-fu_cv_sys_stat_statfs2_fsize=no,
-fu_cv_sys_stat_statfs2_fsize=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
-if test $fu_cv_sys_stat_statfs2_fsize = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS2_FSIZE)
-fi
-fi
-
-if test $space = no; then
-# Ultrix
-AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
-AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
-[AC_TRY_RUN([#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_FS_TYPES_H
-#include <sys/fs_types.h>
-#endif
-int main ()
-{
-struct fs_data fsd;
-/* Ultrix's statfs returns 1 for success,
-0 for not mounted, -1 for failure.  */
-return (statfs (".", &fsd) != 1);
-}],
-fu_cv_sys_stat_fs_data=yes,
-fu_cv_sys_stat_fs_data=no,
-fu_cv_sys_stat_fs_data=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
-if test $fu_cv_sys_stat_fs_data = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS2_FS_DATA)
-fi
-fi
-
-if test $space = no; then
-# SVR2
-AC_TRY_CPP([#include <sys/filsys.h>],
-AC_DEFINE(STAT_READ_FILSYS) space=yes)
-fi
-
-if test -n "$list_mounted_fs" && test $space != no; then
-DF_PROG="df"
-# AC_LIBOBJ(fsusage)
-# AC_LIBOBJ(mountlist)
-fi
-
-# Check for SunOS statfs brokenness wrt partitions 2GB and larger.
-# If <sys/vfs.h> exists and struct statfs has a member named f_spare,
-# enable the work-around code in fsusage.c.
-AC_MSG_CHECKING([for statfs that truncates block counts])
-AC_CACHE_VAL(fu_cv_sys_truncating_statfs,
-[AC_TRY_COMPILE([
-#if !defined(sun) && !defined(__sun)
-choke -- this is a workaround for a Sun-specific problem
-#endif
-#include <sys/types.h>
-#include <sys/vfs.h>],
-[struct statfs t; long c = *(t.f_spare);],
-fu_cv_sys_truncating_statfs=yes,
-fu_cv_sys_truncating_statfs=no,
-)])
-if test $fu_cv_sys_truncating_statfs = yes; then
-AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS)
-fi
-AC_MSG_RESULT($fu_cv_sys_truncating_statfs)
-
-AC_CHECKING(for AFS)
-test -d /afs && AC_DEFINE(AFS)
-])
-
-dnl GNOME_SUPPORT_CHECKS
-dnl    Check for various support functions needed by the standard
-dnl    Gnome libraries.  Sets LIBOBJS, might define some macros.
-dnl    This should only be used when building the Gnome libs; 
-dnl    Gnome clients should not need this macro.
-AC_DEFUN([GNOME_SUPPORT_CHECKS],[
-  # we need an `awk' to build `gnomesupport.h'
-  AC_REQUIRE([AC_PROG_AWK])
-
-  # this should go away soon
-  need_gnome_support=yes
-
-  AC_CHECK_FUNCS(getopt_long,,
-   [AC_LIBOBJ(getopt)
-    AC_LIBOBJ(getopt1)])
-
-  # for `scandir'
-  AC_HEADER_DIRENT
-
-  # copied from `configure.in' of `libiberty'
-  vars="program_invocation_short_name program_invocation_name sys_errlist"
-  for v in $vars; do
-    AC_MSG_CHECKING([for $v])
-    AC_CACHE_VAL(gnome_cv_var_$v,
-      [AC_TRY_LINK([int *p;], [extern int $v; p = &$v;],
-		   [eval "gnome_cv_var_$v=yes"],
-		   [eval "gnome_cv_var_$v=no"])])
-    if eval "test \"`echo '$gnome_cv_var_'$v`\" = yes"; then
-      AC_MSG_RESULT(yes)
-      n=HAVE_`echo $v | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      AC_DEFINE_UNQUOTED($n)
-    else
-      AC_MSG_RESULT(no)
-    fi
-  done
-
-  AC_REPLACE_FUNCS(memmove mkstemp scandir strcasecmp strerror strndup strnlen)
-  AC_REPLACE_FUNCS(strtok_r strtod strtol strtoul vasprintf vsnprintf)
-
-  AC_CHECK_FUNCS(realpath,,AC_LIBOBJ(canonicalize))
-
-  # to include `error.c' error.c has some HAVE_* checks
-  AC_CHECK_FUNCS(vprintf doprnt strerror_r)
-  # stolen from am_func_error_at_line
-  AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
-  [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
-              am_cv_lib_error_at_line=yes,
-              am_cv_lib_error_at_line=no)])
-  if test $am_cv_lib_error_at_line = no; then
-    AC_LIBOBJ(error)
-  fi
-  
-  # This is required if we declare setreuid () and setregid ().
-  AC_TYPE_UID_T
-
-  # see if we need to declare some functions.  Solaris is notorious for
-  # putting functions into the `libc' but not listing them in the headers
-  AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h dirent.h)
-  GCC_NEED_DECLARATIONS(gethostname setreuid setregid getpagesize)
-  GCC_NEED_DECLARATION(scandir,[
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-])
-
-  AC_SUBST(need_gnome_support)
-
-  AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes)
-])
-
-
-dnl This file is intended for use both internally in libgtop and in every program
-dnl that wants to use it.
-dnl
-dnl It defines the following variables:
-dnl
-dnl * 'libgtop_sysdeps_dir'    - sysdeps dir for libgtop.
-dnl * 'libgtop_use_machine_h'  - some of system dependend parts of libgtop provide
-dnl                              their own header file. In this case we need to
-dnl                              define 'HAVE_GLIBTOP_MACHINE_H'.
-dnl * 'libgtop_need_server'    - is the server really needed? Defines 'NEED_LIBGTOP'
-dnl                              if true; defines conditional 'NEED_LIBGTOP'.
-
-AC_DEFUN([LIBGTOP_HACKER_TESTS],[
-	AC_REQUIRE([AC_CANONICAL_HOST])
-
-	AC_ARG_WITH(linux-table,
-      [  --with-linux-table      Use the table () function from Martin Baulig],
-	[linux_table="$withval"],[linux_table=auto])
-	case "$host_os" in
-	linux*)
-	  if test $linux_table = yes ; then
-	    AC_CHECK_HEADER(linux/table.h, linux_table=yes, linux_table=no)
-	  elif test $linux_table = auto ; then
-	    AC_MSG_CHECKING(for table function in Linux Kernel)
-	    AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <unistd.h>
-#include <linux/unistd.h>
-#include <linux/table.h>
-
-#include <syscall.h>
-
-static inline _syscall3 (int, table, int, type, union table *, tbl, const void *, param);
-
-int
-main (void)
-{
-	union table tbl;
-	int ret;
-
-	ret = table (TABLE_VERSION, NULL, NULL);
-
-	if (ret == -1)
-		exit (-errno);
-
-	exit (ret < 1 ? ret : 0);
-}
-], linux_table=yes, linux_table=no, linux_table=no)
-	    AC_MSG_RESULT($linux_table)
-	  fi
-	  if test $linux_table = yes ; then
-	    AC_DEFINE(HAVE_LINUX_TABLE)
-	  fi
-	  ;;
-	esac
-])
-
-AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
-	AC_REQUIRE([AC_CANONICAL_HOST])
-
-	AC_SUBST(libgtop_sysdeps_dir)
-	AC_SUBST(libgtop_use_machine_h)
-	AC_SUBST(libgtop_need_server)
-
-	AC_ARG_WITH(libgtop-examples,
-	[  --with-libgtop-examples Build the libgtop examples (default=no)],[
-	build_examples="$withval"], [build_examples=no])
-
-	AM_CONDITIONAL(EXAMPLES, test x"$build_examples" = xyes)
-
-	AC_ARG_ENABLE(hacker-mode,
-	[  --enable-hacker-mode    Enable building of unstable sysdeps],
-	[hacker_mode="$enableval"], [hacker_mode=no])
-
-	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)
-
-	linux_table=auto
-	if test x$hacker_mode = xyes ; then
-	  LIBGTOP_HACKER_TESTS
-	fi
-	AM_CONDITIONAL(LINUX_TABLE, test $linux_table = yes)
-
-	AC_ARG_WITH(libgtop-smp,
-	[  --with-libgtop-smp      Enable SMP support (default-auto)],[
-	libgtop_smp="$withval"],[libgtop_smp=auto])
-
-	if test $libgtop_smp = auto ; then
-	  AC_MSG_CHECKING(whether to enable SMP support)
-	  case "$host_os" in
-	  linux*)
-	    libgtop_smp=yes
-	    ;;
-	  aix*)
-	    libgtop_smp=yes
-	    ;;
-	  *)
-	    libgtop_smp=no
-	    ;;
-	  esac
-	  AC_MSG_RESULT($libgtop_smp)
-	fi
-
-	if test $libgtop_smp = yes ; then
-	  AC_DEFINE(HAVE_LIBGTOP_SMP)
-	fi
-
-	AM_CONDITIONAL(LIBGTOP_SMP, test $libgtop_smp = yes)
-
-	AC_MSG_CHECKING(for libgtop sysdeps directory)
-
-	case "$host_os" in
-	linux*)
-	  if test x$linux_table = xyes ; then
-	    libgtop_sysdeps_dir=kernel
-	    libgtop_use_machine_h=no
-	  else
-	    libgtop_sysdeps_dir=linux
-	    libgtop_use_machine_h=no
-	    libgtop_have_sysinfo=yes
-	  fi
-	  libgtop_need_server=no
-	  ;;
-	freebsd*|netbsd*|openbsd*|bsdi*)
-	  libgtop_sysdeps_dir=freebsd
-	  libgtop_use_machine_h=yes
-	  libgtop_need_server=yes
-	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
-	  ;;
-	solaris*)
-	  libgtop_sysdeps_dir=solaris
-	  libgtop_use_machine_h=yes
-	  libgtop_need_server=yes
-	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
-	  ;;
-        aix*)
-	  libgtop_sysdeps_dir=aix
-	  libgtop_use_machine_h=yes
-	  libgtop_need_server=yes
-	  libgtop_have_sysinfo=yes
-	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
-          ;;
-	*)
-	  if test x$hacker_mode = xyes ; then
-	    case "$host_os" in
-	    sunos4*)
-	      #Please note that this port is obsolete and not working at
-	      #all. It is only useful for people who want to fix it ... :-)
-	      libgtop_sysdeps_dir=sun4
-	      libgtop_use_machine_h=yes
-	      libgtop_need_server=yes
-	      ;;
-	    osf*)
-	      libgtop_sysdeps_dir=osf1
-	      libgtop_use_machine_h=yes
-	      libgtop_need_server=yes
-	      ;;
-	    *)
-	      libgtop_sysdeps_dir=stub
-	      libgtop_use_machine_h=no
-	      libgtop_need_server=no
-	      ;;
-	    esac
-	  else
-	    libgtop_sysdeps_dir=stub
-	    libgtop_use_machine_h=no
-	    libgtop_need_server=no
-	  fi
-	  ;;
-	esac
-
-	test -z "$libgtop_postinstall" && libgtop_postinstall=:
-
-	AC_MSG_RESULT($libgtop_sysdeps_dir)
-
-	AC_SUBST(libgtop_sysdeps_dir)
-	AC_SUBST(libgtop_postinstall)
-	AC_SUBST(libgtop_have_sysinfo)
-
-	case "$host_os" in
-	*bsd*)
-	  AC_CHECK_HEADERS(net/if_var.h)
-	  AC_MSG_CHECKING([for I4B])
-	  AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <net/if_types.h>
-
-#ifdef HAVE_NET_IF_VAR_H
-#include <net/if_var.h>
-#endif
-
-#include <net/netisr.h>
-#include <net/route.h>
-
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <net/if_sppp.h>
-#else
-#include <i4b/sppp/if_sppp.h>
-#endif
-],[
-	size_t size = sizeof (struct sppp);
-], have_i4b=yes, have_i4b=no)
-	  AC_MSG_RESULT($have_i4b)
-	  if test x$have_i4b = xyes; then
-	    AC_DEFINE(HAVE_I4B)
-	    AC_MSG_CHECKING([for I4B accounting])
-	    AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <net/if_types.h>
-
-#ifdef HAVE_NET_IF_VAR_H
-#include <net/if_var.h>
-#endif
-
-#include <net/netisr.h>
-#include <net/route.h>
-
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <net/if_sppp.h>
-#else
-#include <i4b/sppp/if_sppp.h>
-#endif
-
-#include <machine/i4b_acct.h>
-],[
-	size_t size = sizeof (struct i4bisppp_softc);
-], have_i4b_acct=yes, have_i4b_acct=no)
-	    AC_MSG_RESULT($have_i4b_acct)
-	    if test x$have_i4b_acct = xyes ; then
-	      AC_DEFINE(HAVE_I4B_ACCT)
-	    else
-	      AC_WARN([
-*** I4B accounting disabled - you won't get any PPP statistics.
-*** Read "misc/i4b_acct.txt" in the LibGTop source directory
-*** to see how to enable it.])
-	    fi
-	  fi
-	  ;;
-	linux*)
-	  os_major_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
-	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-	  os_minor_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
-	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-	  os_micro_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
-	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-	  os_version_expr="$os_major_version 65536 * $os_minor_version 256 * + $os_micro_version + p q"
-
-	  AC_CHECK_HEADERS(linux/version.h, have_linux_version_h=yes,
-	    have_linux_version_h=no)
-
-	  if test x$have_linux_version_h = xyes ; then
-	    version_code=`cat /usr/include/linux/version.h | \
-	      grep \#define | grep LINUX_VERSION_CODE`
-	    os_version_code=`echo $version_code | \
-	      sed 's/^.*LINUX_VERSION_CODE[[ \t]]*\([[0-9]]*\).*$/\1/'`
-	  else
-	    os_version_code=`echo "$os_version_expr" | dc`
-	  fi
-
-	  AC_MSG_CHECKING(for Linux kernel version code)
-	  AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code)
-	  AC_MSG_RESULT($os_version_code)
-	  ;;
-	solaris*)
-	  os_major_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\1/'`
-	  os_minor_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\2/'`
-	  os_micro_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\3/'`
-	  test -z "$os_micro_version" && os_micro_version=0
-	  os_version_expr="$os_major_version 100 * $os_minor_version 10 * + $os_micro_version + p q"
-	  os_version_code=`echo "$os_version_expr" | dc`
-
-	  AC_MSG_CHECKING(for Solaris release code)
-	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code)
-	  AC_MSG_RESULT($os_version_code)
-	  ;;
-	esac
-
-	AC_MSG_CHECKING(for machine.h in libgtop sysdeps dir)
-	AC_MSG_RESULT($libgtop_use_machine_h)
-
-	AC_MSG_CHECKING(whether we need libgtop)
-	AC_MSG_RESULT($libgtop_need_server)
-
-	if test x$libgtop_need_server = xyes ; then
-	  AC_DEFINE(NEED_LIBGTOP)
-	fi
-
-	if test x$libgtop_use_machine_h = xyes ; then
-	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H)
-	fi
-
-	AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes)
-])
-
-  
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,8 +14,4 @@ PKG_NAME="Gnome Top Library"
    exit 1
 }

-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
-    exit 1
-}
-USE_GNOME2_MACROS=1 . gnome-autogen.sh
+. $srcdir/macros/autogen.sh
--- a/configure.in
+++ b/configure.in
@@ -6,23 +6,18 @@ AC_INIT(copyright.txt)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM

-LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=0
-LIBGTOP_MICRO_VERSION=2
-LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
-AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
-LIBGTOP_INTERFACE_AGE=1
-LIBGTOP_BINARY_AGE=1
+dnl This is required at several places
+AC_CHECK_PROG(ac_dc_found, dc, yes, no)
+if test x$ac_dc_found != xyes ; then
+AC_MSG_ERROR([
+*** The "dc" utility was not found on your system.
+***
+*** When using RedHat Linux, you need to install the "bc" package.
+***])
+fi

-# you can set this to `-snap' for instance to create
-# a `libgtop-1.x.y-snap.tar.gz' tarball.
-LIBGTOP_VERSION_SUFFIX=
-
-# Increase each time you change the client/server protocol.
-LIBGTOP_SERVER_VERSION=5
-
-# Version code calculation
-LIBGTOP_VERSION_CODE=`expr $LIBGTOP_MAJOR_VERSION \* 1000000 + $LIBGTOP_MINOR_VERSION \* 1000 + $LIBGTOP_MICRO_VERSION`
+. $srcdir/LIBGTOP-VERSION
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)

 AC_SUBST(LIBGTOP_MAJOR_VERSION)
 AC_SUBST(LIBGTOP_MINOR_VERSION)
@@ -32,7 +27,6 @@ AC_SUBST(LIBGTOP_BINARY_AGE)
 AC_SUBST(LIBGTOP_SERVER_VERSION)
 AC_SUBST(LIBGTOP_VERSION)
 AC_SUBST(LIBGTOP_VERSION_CODE)
-AC_SUBST(LIBGTOP_VERSION_SUFFIX)

 # libtool versioning
 LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
@@ -46,16 +40,12 @@ AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)

-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I ."
+AM_ACLOCAL_INCLUDE(. macros)

 AC_ISC_POSIX
 AC_PROG_CC
 AC_STDC_HEADERS
-dnl AC_ARG_PROGRAM
-
-dnl We need this at some places.
-libgtop_top_builddir=`pwd`
-AC_SUBST(libgtop_top_builddir)
+AC_ARG_PROGRAM

 dnl We don't use `AC_PROG_AWK' since it checks for mawk first which
 dnl does not work for libgtop.
@@ -70,8 +60,10 @@ AC_CHECK_TOOL(CC,gcc)
 AC_CHECK_TOOL(RANLIB,ranlib)
 AC_CHECK_TOOL(AS,as)
 AC_CHECK_TOOL(AR,ar)
+AC_CHECK_TOOL(NM,nm)

-export CC CXX RANLIB LD AS AR
+NM=`which $NM`
+export CC CXX RANLIB LD AS AR NM

 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -82,44 +74,37 @@ export cross_compiling
 AM_PROG_LIBTOOL

 dnl Let the user enable compiler warnings
-dnl GNOME_COMPILE_WARNINGS
+GNOME_COMPILE_WARNINGS

-dnl GNOME_INIT_HOOK(gnome_found=yes)
+GNOME_INIT_HOOK(gnome_found=yes)

-dnl if test "x$gnome_found" != xyes; then
-dnl   if test "x$want_gnome" != xno ; then
-dnl     AC_MSG_ERROR([
-dnl *** GNOME was not found on this system. ***
-dnl 
-dnl *** If you want to use LibGTop without GNOME, you need
-dnl *** to give configure the --without-gnome parameter.
-dnl ])
-dnl   else
-dnl     AC_DEFINE(WITHOUT_GNOME)
-dnl   fi
-dnl   GNOME_SUPPORT_CHECKS
-dnl else
-dnl   if test "x$want_gnome" != xno ; then
-dnl     AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
-dnl   else
-dnl     GNOME_SUPPORT_CHECKS
-dnl   fi
-dnl fi
+if test "x$gnome_found" != xyes; then
+  if test "x$want_gnome" != xno ; then
+    AC_MSG_ERROR([
+*** GNOME was not found on this system. ***

-AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
-
-AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
+*** If you want to use LibGTop without GNOME, you need
+*** to give configure the --without-gnome parameter.
+])
+  else
+    AC_DEFINE(WITHOUT_GNOME)
+  fi
+  GNOME_SUPPORT_CHECKS
+else
+  AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
+  AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
+fi

 GNOME_LIBGTOP_SYSDEPS
 GNOME_LIBGTOP_TYPES

-dnl AC_ARG_WITH(libgtop-guile,
-dnl [  --with-libgtop-guile    Build the libgtop guile interface (default=no)],
-dnl [build_guile="$withval"], [build_guile=yes])
+AC_ARG_WITH(libgtop-guile,
+[  --with-libgtop-guile    Build the libgtop guile interface (default=no)],
+[build_guile="$withval"], [build_guile=yes])

-dnl if test x$build_guile != xno ; then
-dnl  GNOME_CHECK_GUILE
-dnl fi
+if test x$build_guile != xno ; then
+  GNOME_CHECK_GUILE
+fi

 AC_ARG_WITH(libgtop-inodedb,
 [  --with-libgtop-inodedb  Build the inodedb stuff (default=no)],
@@ -162,14 +147,11 @@ else
 fi

 if test "x$enable_static" != xno; then
-  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $guile_static_examples $smp_static_examples"
+  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static $guile_static_examples $smp_static_examples"
 else
  static_targets=""
 fi

-AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes)
-AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
-
 AC_SUBST(static_targets)
 AC_SUBST(smp_examples)
 AC_SUBST(guile_examples)
@@ -177,17 +159,11 @@ AC_SUBST(guile_subdirs)

 AM_PROG_LIBTOOL

-GLIB_REQUIRED=2.0.0
-
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-dnl (1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))
+AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))

 dnl You need to uncomment the following line if you want to use
 dnl libGTop without Gnome.
-GNOME_SUPPORT_CHECKS
+dnl GNOME_SUPPORT_CHECKS

 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -205,65 +181,23 @@ AC_CHECK_TYPE(ssize_t, int)
 AC_CHECK_HEADERS(memory.h)
 AC_CHECK_HEADERS(string.h strings.h, break)
 AC_REPLACE_FUNCS(strerror)
-
-dnl dlopen() and dlsym()
-DL_LIB=
-AC_CHECK_FUNCS(dlopen,,[
-  AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", [
-    AC_CHECK_LIB(dld, shl_load, DL_LIB="-ldld", [
-      AC_CHECK_FUNCS(dlopen, DL_LIB="", DL_LIB="")
-    ])
-  ])
-])
-oLIBS="$LIBS"
-LIBS="$LIBS $DL_LIB"
-AC_CHECK_FUNCS(dlerror,,)
-LIBS="$oLIBS"
-AC_SUBST(DL_LIB)
-
-dnl AIX
-AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the `vmgetinfo' function in libperfstat])
-AC_CHECK_LIB(perfstat, vmgetinfo, AC_DEFINE(HAVE_VMGETINFO))
-
-dnl Solaris
-AC_CHECK_LIB(kstat, kstat_open)
-AC_CHECK_FUNCS(getloadavg swapctl)
-AC_CHECK_HEADERS(procfs.h sys/procfs.h, break)
-
-dnl Some versions of Solaris require -lelf for -lkvm
-AC_CHECK_LIB(kvm, kvm_open,[
-  LIBS="-lkvm $LIBS"
-],[AC_MSG_CHECKING(for kvm_open in -lkvm with -lelf)
-   AC_CACHE_VAL(ac_cv_lib_kvm_with_elf,
-   [ac_save_LIBS="$LIBS"
-    LIBS="-lkvm -lelf $LIBS"
-    AC_TRY_LINK([char kvm_open();], [kvm_open()],
-                ac_cv_lib_kvm_with_elf=yes, ac_cv_lib_kvm_with_elf=no)
-    LIBS="$ac_save_LIBS"
-   ])
-   if test "$ac_cv_lib_kvm_with_elf" = "yes"; then
-     AC_MSG_RESULT(yes)
-     LIBS="-lkvm -lelf $LIBS"
-   else
-     AC_MSG_RESULT(no)
-   fi
-])
+AC_CHECK_LIB(kvm, kvm_open)

 dnl For DEC OSF1
 AC_CHECK_LIB(mach, vm_statistics)

-dnl For some broken libc5 systems (Debian 1.3)
-saved_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS -D_GNU_SOURCE"
+dnl For some broken libc5 systems (Debian 1.3)                                                           
+saved_CFLAGS=$CFLAGS                                                                                     
+CFLAGS="$CFLAGS -D_GNU_SOURCE"                                                                           
 GCC_NEED_DECLARATION(program_invocation_name, [                           
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-])
-
-CFLAGS=$saved_CFLAGS
-
+#include <errno.h>                                                                                       
+#include <stdio.h>                                                                                       
+#include <stdlib.h>                                                                                      
+#include <string.h>                                                                                      
+])                                                                                                       
+CFLAGS=$saved_CFLAGS                                                                                     
+                                                                                                         
+dnl Check for Internet sockets.
 AC_CHECK_FUNC(socket,
 [AC_CHECK_HEADER(netinet/in.h,
   [AC_CHECK_HEADER(arpa/inet.h, [
@@ -285,14 +219,9 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)

-dnl ## 'es_ES' is only needed for format numbers different of 'es'
-ALL_LINGUAS="am ar az be bg ca cs da de el es es_ES et fa fi fr ga gl he hu id it ja ko lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sr sr@Latn sv tr uk vi zh_CN zh_TW"
-
-GETTEXT_PACKAGE=libgtop-2.0
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
-
-AM_GLIB_GNU_GETTEXT
+dnl ## all 'es_??' are only needed for format numbers different of 'es'
+ALL_LINGUAS="de es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fr ko no ja"
+AM_GNOME_GETTEXT

 AC_PATH_XTRA

@@ -336,7 +265,7 @@ if test "x$gnome_found" = xyes ; then
  LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
  SUPPORTINCS="$GNOME_INCLUDEDIR"
 else
-  LIBSUPPORT='$(top_builddir)/support/libgnomesupport-2.0.la'
+  LIBSUPPORT='$(top_builddir)/support/libgnomesupport.la'
  SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
 fi

@@ -352,7 +281,7 @@ AC_SUBST(SUPPORTINCS)

 dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
-LIBGTOP_INCS='-I$(includedir)/libgtop-2.0'
+LIBGTOP_INCS='-I$(includedir)'

 if test x$libgtop_use_machine_h = xyes ; then
  LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H"
@@ -375,13 +304,13 @@ LIBGTOP_INCS="$LIBGTOP_INCS $SUPPORTINCS $GLIB_CFLAGS"
 LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
 LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
 LIBGTOP_BINDIR='$(bindir)'
-LIBGTOP_SERVER='$(bindir)/libgtop_server2'
+LIBGTOP_SERVER='$(bindir)/libgtop_server'

 sysdeps_dir="$libgtop_sysdeps_dir"
 AC_SUBST(sysdeps_dir)

 if test x$ac_cv_guile_found = xyes ; then
-  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile-2.0"
+  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile"
  libgtop_guile_found=yes
 else
  libgtop_guile_found=no
@@ -397,11 +326,11 @@ fi

 LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"

-LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
-LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
+LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop -lgtop_sysdeps -lgtop_common"
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop -lgtop_sysdeps -lgtop_common"

-LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names-2.0"
-LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names-2.0 -lgtop_names-2.0"
+LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names"
+LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names -lgtop_names"

 LIBGTOP_LIBS="$LIBGTOP_LIBS" 
 LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS"
@@ -425,12 +354,12 @@ else
  guile_def=""
 fi

-INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $SUPPORTINCS $GLIB_CFLAGS $CFLAGS $X_CFLAGS $guile_def "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
+INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include -I\$(top_srcdir)/intl $SUPPORTINCS $GLIB_CFLAGS $CFLAGS $X_CFLAGS $guile_def "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'

 AC_SUBST(INCLUDES)

 AC_SUBST(LIBGTOP_EXTRA_LIBS)
-AC_SUBST(GLIB_LIBS)
+
 AC_SUBST(LIBGTOP_LIBS)
 AC_SUBST(LIBGTOP_INCS)
 AC_SUBST(LIBGTOP_NAMES_LIBS)
@@ -443,8 +372,8 @@ AC_SUBST(LIBGTOP_BINDIR)
 AC_SUBST(LIBGTOP_SERVER)

 if test x$libgtop_need_server = xyes ; then
-   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la"
-   server_programs='libgtop_server2'
+   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid.la"
+   server_programs='libgtop_server'
 else
   sysdeps_suid_lib=
   server_programs=
@@ -456,6 +385,7 @@ AC_OUTPUT([
 Makefile
 libgtop.spec
 po/Makefile.in
+intl/Makefile
 misc/Makefile
 include/Makefile
 include/glibtop/Makefile
@@ -471,14 +401,10 @@ sysdeps/osf1/Makefile
 sysdeps/linux/Makefile
 sysdeps/kernel/Makefile
 sysdeps/freebsd/Makefile
-sysdeps/solaris/Makefile
-sysdeps/aix/Makefile
 src/Makefile
 src/daemon/Makefile
 src/inodedb/Makefile
 lib/Makefile
 examples/Makefile
-doc/Makefile
 support/Makefile
-libgtop-2.0.pc
-])
+macros/Makefile])
--- a/debian/.cvsignore
+++ b/debian/.cvsignore
@@ -1,9 +0,0 @@
-control
-rules
-build
-tmp
-*.postinst
-*.debhelper
-*.files
-files
-substvars
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,9 +0,0 @@
-LibGTop CVS snapshots for Debian
--------------------------------
-
-This is a debian package made from a stable release of LibGTop, but it
-should be considered "unofficial" since I'm not a Debian Maintainer.
-
-
-Martin Baulig <martin@home-of-linux.org>, Wed, 16 Feb 2000 16:40:50 +0100
-
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,121 +0,0 @@
-libgtop (1.0.7-1) unstable; urgency=low
-  * New upstream source (1.0.7 "Copenhagen" release)
-  * Non-maintainer upload; since I'm not a Debian maintainer, this is some
-    kind of "unofficial" debian package for LibGTop 1.0.7 - but I think it
-    can be considered stable and working.
-
- -- Martin Baulig <martin@home-of-linux.org>  Wed, 16 Feb 2000 16:40:50 +0100
-
-libgtop (1.0.6-1) unstable; urgency=low
-  * New upstream source
-
- -- Ian Lynagh (wibble) <igloo@debian.org>  Wed, 20 Oct 1999 16:16:27 +0100
-
-libgtop (1.0.4.5pre1-1) frozen unstable; urgency=low
-  * New upstream source (1.0.5 pre release)
-  * Maintainer e-mail address changed to igloo@debian.org
-
- -- Ian Lynagh (wibble) <igloo@debian.org>  Thu, 30 Sep 1999 22:37:33 +0100
-
-libgtop (1.0.4-1) frozen unstable; urgency=low
-  * New upstream source
-  * Removed nasty sed stuff from the rules in favour of make install prefix=...
-  * Added .la files to libgtop-dev
-  * Added info to the copyright file
-  * Wrote simple man page for libgtop-config.
-  * Recompiled with later debhelper so docs go to /usr/share/doc as per FHS
-  * changed infodir to /usr/share/info
-
- -- Ian Lynagh (wibble) <igloo@debian.org>  Mon, 20 Sep 1999 00:06:16 +0100
-
-libgtop (1.0.1-2) frozen unstable; urgency=low
-
-  * Didn't actually use wildcards in libgtop-dev.files because tar complained
-  * Set section names properly
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Sun,  7 Mar 1999 00:53:50 +0000
-
-libgtop (1.0.1-1) frozen unstable; urgency=low
-
-  * SONAME changed back to 1. Fun fun fun.
-  * Added RELNOTES-1.0 to debian/libgtop1.docs and debian/rules
-  * Changed libgtop1.README.Debian to at least make sense
-  * Used wildcards in libgtop-dev.files
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Sun,  7 Mar 1999 00:53:50 +0000
-
-libgtop (1.0.1-0.1) unstable; urgency=low
-
-  * Non-maintainer upload for GNOME 1.0
-
- -- Jules Bean <jules@debian.org>  Thu,  4 Mar 1999 22:34:12 +0000
-
-libgtop (0.99.2-0.2) unstable; urgency=low
-
-  * Oops, forgot some files.
-
- -- Jim Pick <jim@jimpick.com>  Sun, 24 Jan 1999 02:12:24 -0800
-
-libgtop (0.99.2-0.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * New upstream source.
-  * SONAME is now 0 again.  Hmmm.
-
- -- Jim Pick <jim@jimpick.com>  Sat, 23 Jan 1999 20:21:38 -0800
-
-libgtop (0.26.2-4) frozen unstable; urgency=low
-
-  * Upstream changelog installed as changelog
-  * debian/shlibs.local removed in favour of the LD_LIBRARY_PATH line
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Thu, 26 Nov 1998 17:20:24 +0000
-
-libgtop (0.26.2-3.1) frozen unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Upload to frozen, corrects Bug #29110, Bug #29111, which were
-    already fixed.
-  * Noticed that guile option is no longer being used, so I removed
-    the dependency.
-  * Added changelog (to fix lintian error).
-  * Changed control file to use macro substitutions.  This is a much
-    less error-prone way of building dependencies than doing them by
-    hand.
-  * Added -V option to dh_makeshlibs to put version number on shlibs
-    file.
-  * Added shlibs.local file with null entry for "libgtop 1" (and
-    others) so libgtop1 doesn't declare a relationship on itself.
-
- -- Jim Pick <jim@jimpick.com>  Wed, 25 Nov 1998 12:03:12 -0800
-
-libgtop (0.26.2-3) frozen unstable; urgency=low
-
-  * libgtop0 changed to libgtop1
-  * Added an #ifndef strstr around the prototype of strstr in
-    sysdeps/common/mountlist.c as this is a macro under glibc 2.1.
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Sun,  8 Nov 1998 12:06:09 +0000
-
-libgtop (0.26.2-2) frozen unstable; urgency=low
-
-  * Fixes minor bugs in debian/rules
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Fri, 16 Oct 1998 05:30:16 +0200
-
-libgtop (0.26.2-1) unstable; urgency=low
-
-  * New upstream version
-  * Non-maintainer release
-
- -- Martin Schulze <joey@finlandia.infodrom.north.de>  Fri, 16 Oct 1998 05:30:16 +0200
-
-libgtop (0.26.0-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Jim Pick <jim@jimpick.com>  Thu, 24 Sep 1998 18:42:48 -0700
-
-Local variables:
-mode: debian-changelog
-End:
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,33 +0,0 @@
-Source: libgtop@SUFFIX@
-Maintainer: Martin Baulig <martin@home-of-linux.org>
-Section: libs
-Priority: optional
-Standards-Version: 3.0.0
-
-Package: libgtop1@SUFFIX@
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Description: Portable system access library (part of Gnome)
- Gnome is the "GNU Network Object Model Environment"
- .
- It is a project to build a complete, user-friendly desktop based
- entirely on free software.
- .
- This package contains the gtop libraries which read information about
- processes and the running systems.
-
-Package: libgtop-dev@SUFFIX@
-Architecture: any
-Section: devel
-Depends: libgtop1@SUFFIX@ (= ${Source-Version})
-Description: Dev libraries for the portable system access library (part of Gnome)
- Gnome is the "GNU Network Object Model Environment"
- .
- It is a project to build a complete, user-friendly desktop based
- entirely on free software.
- .
- This package contains the include files and static library for the
- gtop libraries which read information about processes and the running
- systems.
-
--- a/debian/debconfigure
+++ b/debian/debconfigure
@@ -1,109 +0,0 @@
-#! /bin/sh
-#
-# debconfigure
-#
-# A script to generate a debian/rules file, with options.
-#
-# By Jim Pick <jim@jimpick.com>, GPL'd of course.
-# Adjusted for LibGTop by Martin Baulig <martin@home-of-linux.org>
-#
-
-if [ ! -r rules.in ]; then
-	echo "Please run the debconfigure script in the debian directory" 1>&2
-	exit 1
-fi
-
-debtype='official'
-prefix='/usr'
-gnomeprefix='/usr'
-localstatedir='/var/lib'
-pkgsuffix=''
-
-for dc_option
-do
-    case "$dc_option" in
-	-*=*) dc_optarg=`echo "$dc_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-	*) dc_optarg= ;;
-    esac
-
-    case "$dc_option" in
-
-	--clean)
-	    rm -f control rules *~ core *files *menu *substvars *.postinst *.debhelper
-	    exit ;;
-
-	--prefix=*)
-	    prefix="$dc_optarg" ;;
-
-        --localstatedir=*)
-	    prefix="$dc_optarg" ;;
-
-	--pkgsuffix=*)
-	    pkgsuffix="$dc_optarg" ;;
-
-	--gnome-prefix=*)
-	    gnomeprefix="$dc_optarg" ;;
-
-	--debtype=*)
-	    debtype="$dc_optarg" ;;
-
-	*)
-	    cat <<EOF 1>&2
-Usage: debconfigure [options]
-Options: [defaults in brackets after descriptions]
-  --help                  print this message
-  --clean		  remove generated files
-  --prefix=PREFIX         install files under under PREFIX dir [/usr]
-  --gnome-prefix=PREFIX   look for GNOME under PREFIX dir [/usr]
-  --localstatedir=DIR     directory for things like game scores [/var/lib]
-  --pkgsuffix=SUFFIX      append SUFFIX onto package names []
-  --debtype=DEBTYPE       enable macros with the name of DEBTYPE [official]
-EOF
-	    exit ;;
-
-    esac
-done
-
-# Strip leading slash
-prefix=`expr $prefix : '/\(.*\)'`
-gnomeprefix=`expr $gnomeprefix : '/\(.*\)'`
-localstatedir=`expr $localstatedir : '/\(.*\)'`
-
-for infile in `ls control.in rules.in`
-do
-    tofile=`expr $infile : '\(.*\)\.in'`
-    cat $infile | \
-       sed "s,@SUFFIX@,$pkgsuffix,g" | \
-       sed "s,@PREFIX@,$prefix,g" | \
-       sed "s,@GNOMEPREFIX@,$gnomeprefix,g" | \
-       sed "s,@LOCALSTATEDIR@,$localstatedir,g" | \
-       sed "s,%$debtype>,," | sed '/^%/d' > $tofile
-done
-chmod +x rules
-
-for filesfile in `ls *.files.in`
-do
-    tofile=`expr $filesfile : '\(.*\)\.files\.in'`
-    tofile=`echo $tofile$pkgsuffix.files`
-    cat $filesfile | \
-       sed "s,@SUFFIX@,$pkgsuffix,g" | \
-       sed "s,@PREFIX@,$prefix,g" | \
-       sed "s,@GNOMEPREFIX@,$gnomeprefix,g" | \
-       sed "s,@LOCALSTATEDIR@,$localstatedir,g" | \
-       sed "s,%$debtype>,," | sed '/^%/d' > $tofile
-done
-
-for postinst in libgtop1$pkgsuffix
-do
-
-cat > $postinst.postinst <<EOF
-#! /bin/sh
-
-set -e
-ldconfig
-
-#DEBHELPER#
-EOF
-
-done
-
--- a/debian/libgtop-config.1
+++ b/debian/libgtop-config.1
@@ -1,34 +0,0 @@
-.TH GTOP l "15 September 1999"
-.SH NAME
-\fBlibgtop-config\fP \- libgtop libraries and component information retrieval.
-.SH SYNTAX
-.B libgtop-config
-.RI [ --version ]
-.RI [ --config ]
-.RI [ --features-def-file ]
-.SH DESCRIPTION
-.B libgtop-config
-is used to retrieve information from installed libraries in the system.
-
-This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page.
-.LP
-.SH OPTIONS
-.TP
-.B \-\-version
-.PD
-Prints the version of libgtop that you're using.
-.TP
-.B \-\-config
-.PD
-Prints the location of libgtopConf.sh.
-.TP
-.B \-\-version
-.PD
-Prints the location of libgtop-features.def.
-.SH BUGS
-None known
-
-.SH AUTHORS
-Martin Baulig (martin@home-of-linux.org)
-.TP
-Josh Sled (jsled@scam.XCF.Berkeley.EDU)
--- a/debian/libgtop-dev.files.in
+++ b/debian/libgtop-dev.files.in
@@ -1,24 +0,0 @@
-@PREFIX@/lib/libgtop.a
-@PREFIX@/lib/libgtop_common.a
-@PREFIX@/lib/libgtop_names.a
-@PREFIX@/lib/libgtop_suid_common.a
-@PREFIX@/lib/libgtop_sysdeps.a
-@PREFIX@/lib/libgtop.la
-@PREFIX@/lib/libgtop_common.la
-@PREFIX@/lib/libgtop_names.la
-@PREFIX@/lib/libgtop_suid_common.la
-@PREFIX@/lib/libgtop_sysdeps.la
-@PREFIX@/lib/libgtopConf.sh
-@PREFIX@/lib/libgtop.so
-@PREFIX@/lib/libgtop_common.so
-@PREFIX@/lib/libgtop_names.so
-@PREFIX@/lib/libgtop_suid_common.so
-@PREFIX@/lib/libgtop_sysdeps.so
-@PREFIX@/lib/libgtop-features.def
-@PREFIX@/lib/libgtop/include/*.h
-@PREFIX@/include/glibtop/*.h
-@PREFIX@/include/glibtop.h
-@PREFIX@/include/glibtop_server.h
-@PREFIX@/include/glibtop_machine.h
-@PREFIX@/info/libgtop.info
-@PREFIX@/bin/libgtop-config
--- a/debian/libgtop1.README.Debian
+++ b/debian/libgtop1.README.Debian
@@ -1,5 +0,0 @@
-
-The Debian package of libgtop, a GNOME library.
-
-- 
-Martin Baulig <martin@home-of-linux.org>
--- a/debian/libgtop1.copyright
+++ b/debian/libgtop1.copyright
@@ -1,12 +0,0 @@
-
-libgtop is released under the GPL.
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in /usr/share/common-licenses/GPL
-
-Original authors: Martin Baulig <martin@home-of-linux.org>
-                  Drazen Kacar <dave@srce.hr>
-
-Originally Debianised by Jim Pick <jim@jimpick.com>
-Then re-Debianised in October 1998 by Martin Schulze
-<joey@finlandia.infodrom.north.de> before being taken over by Ian Lynagh
-<ian@lynagh.demon.co.uk> in November 1998.
--- a/debian/libgtop1.docs
+++ b/debian/libgtop1.docs
@@ -1,5 +0,0 @@
-RELNOTES-0.25
-RELNOTES-1.0.x
-NEWS
-AUTHORS
-debian/changelog
--- a/debian/libgtop1.files.in
+++ b/debian/libgtop1.files.in
@@ -1,4 +0,0 @@
-@PREFIX@/lib/libgtop*.so.[0-9].[0-9][0-9].[0-9]
-@PREFIX@/lib/libgtop*.so.[0-9].[0-9].[0-9]
-@PREFIX@/lib/libgtop*.so.[0-9]
-@PREFIX@/share/locale/*/*/libgtop.mo
--- a/debian/rules.in
+++ b/debian/rules.in
@@ -1,115 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# This version is for a hypothetical package that builds an
-# architecture-dependant package, as well as an architecture-independent
-# package.
-
-# Uncomment this to turn on verbose mode. 
-#export DH_VERBOSE=1
-
-i=$(shell pwd)/debian/tmp
-b=$(shell pwd)/debian/build
-
-configure: configure.in
-	@echo "--- Making configure script and configuring"
-	chmod +x autogen.sh
-	./autogen.sh --prefix=/@PREFIX@ --with-gnome=/@GNOMEPREFIX@ \
-	  --localstatedir=/@LOCALSTATEDIR@
-
-Makefile: configure
-	@echo "--- Configuring"
-	./configure --prefix=/@PREFIX@ --with-gnome=/@GNOMEPREFIX@ \
-	  --localstatedir=/@LOCALSTATEDIR@
-
-build: configure Makefile build-debstamp
-build-debstamp:
-	@echo "--- Compiling"
-	dh_testdir
-	$(MAKE) all
-	touch build-debstamp
-
-clean: Makefile
-	@echo "--- Cleaning"
-	dh_testdir
-	dh_clean
-	-rm -rf static shared
-	-rm -f build-debstamp install-debstamp
-	-make -k distclean
-	-rm -f `find . -name "*~"`
-	-rm -f `find . -name "*\.la"`
-	-rm -rf `find . -name "\.deps"`
-	-rm -rf `find . -name "\.libs"`
-	-rm -rf `find . -name "*\.rej"`
-	-rm -rf debian/tmp `find debian/* -type d ! -name CVS` debian/files* core
-	-rm -f debian/*substvars
-
-install: build install-debstamp
-install-debstamp:
-	@echo "--- Installing"
-	dh_testdir
-	dh_testroot
-	rm -rf $(b)
-	$(MAKE) install prefix=$(i)/@PREFIX@ exec_prefix=$(i)/@PREFIX@ \
-	  localstatedir=$(i)/@LOCALSTATEDIR@
-	touch install-debstamp
-
-install-save: install
-	rm -rf $(i).saved
-	cp -a $(i) $(i).saved
-
-install-saved:
-	rm -rf $(i)
-	cp -a $(i).saved $(i)
-	rm -rf $(b)
-	touch install-debstamp
-
-binary-indep: build install
-
-binary-arch: build install \
-		libgtop1@SUFFIX@ \
-		libgtop-dev@SUFFIX@
-
-#
-# libgtop1@SUFFIX@
-#
-
-libgtop1@SUFFIX@: install
-	@echo "--- Building: $@"
-	dh_installdocs       -p$@ -P$(b)/$@ README NEWS AUTHORS
-	dh_installchangelogs -p$@ -P$(b)/$@ ChangeLog
-	dh_movefiles         -p$@ -P$(b)/$@
-	dh_strip             -p$@ -P$(b)/$@ 
-	dh_compress          -p$@ -P$(b)/$@ 
-	dh_fixperms          -p$@ -P$(b)/$@ 
-	dh_installdeb        -p$@ -P$(b)/$@
-	dh_shlibdeps         -p$@ -P$(b)/$@
-	dh_gencontrol        -p$@ -P$(b)/$@
-	dh_makeshlibs        -p$@ -P$(b)/$@ -V
-	dh_md5sums           -p$@ -P$(b)/$@
-	dh_builddeb          -p$@ -P$(b)/$@
-
-#
-# libgtop-dev
-#
-
-libgtop-dev@SUFFIX@: install
-	@echo "--- Building: $@"
-	mkdir -p $(b)/$@/usr/doc
-	cd $(b)/$@/usr/doc; ln -s libgtop1@SUFFIX@ $@	
-	dh_movefiles         -p$@ -P$(b)/$@
-	dh_strip             -p$@ -P$(b)/$@ 
-	dh_compress          -p$@ -P$(b)/$@ 
-	dh_fixperms          -p$@ -P$(b)/$@ 
-	dh_installdeb        -p$@ -P$(b)/$@
-	dh_shlibdeps         -p$@ -P$(b)/$@
-	dh_gencontrol        -p$@ -P$(b)/$@
-	dh_makeshlibs        -p$@ -P$(b)/$@ -V
-	dh_undocumented      -p$@ -P$(b)/$@ \
-				libgtop-config.1
-	dh_md5sums           -p$@ -P$(b)/$@
-	dh_builddeb          -p$@ -P$(b)/$@
-
-binary: binary-indep binary-arch
-.PHONY: binary clean binary-indep binary-arch build install install-save install-saved
-
-
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,10 +0,0 @@
-texinfo.tex
-*.info
-Makefile.in
-Makefile
-*.log *.toc *.dvi *.aux *.cp *.fn *.vr *.tp *.ky *.pg
-*.ps
-auto-macros.texi
-version.texi
-stamp-vti
-*.html *.pdf
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,49 +0,0 @@
-2002-03-12  James Henstridge  <james@daa.com.au>
-
-	* Makefile.am (MAKEINFO): using += seems to screw up the build
-	with newer automakes.  Set it explicitly (using @MAKEINFO@) seems
-	to be compatible with both.
-
-2001-11-26  Abel Cheung  <maddog@linux.org.hk>
-
-	* libgtop.texi, Makefile.am: Renamed to libgtop2.texi
-	* about.texi: Very minor update.
-
-1999-10-18  Martin Baulig  <martin@home-of-linux.org>
-
-	* about.texi: Added a note about LibGTop and GNOME.
-
-	* reference.texi (glibtop_proc_state): Fix description of the `state'
- 	field for LibGTop 1.0.x.
-
-1999-09-29  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am (MAKEINFO): Add `-I @libgtop_top_builddir@/doc' here.
-
-1999-05-16  Martin Baulig  <martin@home-of-linux.org>
-
-	* main.texi: This is now the main file which will @include all
-	chapter files so we can use `texinfo-multiple-files-update'.
-
-	* reference.texi: Added all missing sections with a "not yet written"
-	notice.
-
-1999-05-16  Martin Baulig  <martin@home-of-linux.org>
-
-	* white-paper.texi: Initial version of the LibGTop White Paper.
-
-	* Makefile.am: Create `auto-macros.texi' from `auto-macros.texi.in'
- 	which will contain some `@set' commands for the LibGTop version etc.
-
-	* auto-macros.texi.in: New file. This is a template for
-	`auto-macros.texi' which will be automatically generated.
-
-1999-05-09  Martin Baulig  <martin@home-of-linux.org>
-
-	* about.texi: Split the `libgtop.texi' into one file pro chapter,
-	this is the "About LibGTop".
-
-	* reference.texi: The "LibGTop Reference Manual".
-
-	* libgtop.texi: Initial version of the new LibGTop Manual.
-
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,45 +0,0 @@
-info_TEXINFOS		= libgtop2.texi
-
-libgtop2_TEXINFOS	= libgtop2.texi about.texi reference.texi \
-			  auto-macros.texi version.texi main.texi \
-			  white-paper.texi
-
-MAKEINFO		= @MAKEINFO@ -I @libgtop_top_builddir@/doc
-
-EXTRA_DIST		= auto-macros.texi.in
-
-auto-macros.texi: auto-macros.texi.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's#\%LIBGTOP_LIBDIR\%#$(libdir)#g' \
-	  -e 's#\%LIBGTOP_INCLUDEDIR\%#$(includedir)/libgtop-2.0#g' \
-	  -e 's#\%LIBGTOP_DATADIR\%#$(datadir)#g' \
-	  -e 's#\%LIBGTOP_EXTRA_LIBS\%#$(LIBGTOP_EXTRA_LIBS)#g' \
-	  -e 's#\%LIBGTOP_LIBS\%#$(LIBGTOP_LIBS)#g' \
-	  -e 's#\%LIBGTOP_INCS\%#$(LIBGTOP_INCS)#g' \
-	  -e 's#\%LIBGTOP_NAMES_LIBS\%#$(LIBGTOP_NAMES_LIBS)#g' \
-	  -e 's#\%LIBGTOP_NAMES_INCS\%#$(LIBGTOP_NAMES_INCS)#g' \
-	  -e 's#\%LIBGTOP_GUILE_LIBS\%#$(LIBGTOP_GUILE_LIBS)#g' \
-	  -e 's#\%LIBGTOP_GUILE_INCS\%#$(LIBGTOP_GUILE_INCS)#g' \
-	  -e 's#\%LIBGTOP_GUILE_NAMES_LIBS\%#$(LIBGTOP_GUILE_NAMES_LIBS)#g' \
-	  -e 's#\%LIBGTOP_GUILE_NAMES_INCS\%#$(LIBGTOP_GUILE_NAMES_INCS)#g' \
-	  -e 's#\%LIBGTOP_BINDIR\%#$(LIBGTOP_BINDIR)#g' \
-	  -e 's#\%LIBGTOP_SERVER\%#$(LIBGTOP_SERVER)#g' \
-	  -e 's#\%LIBGTOP_MAJOR_VERSION\%#$(LIBGTOP_MAJOR_VERSION)#g' \
-	  -e 's#\%LIBGTOP_MINOR_VERSION\%#$(LIBGTOP_MINOR_VERSION)#g' \
-	  -e 's#\%LIBGTOP_MICRO_VERSION\%#$(LIBGTOP_MICRO_VERSION)#g' \
-	  -e 's#\%LIBGTOP_VERSION\%#$(LIBGTOP_VERSION)#g' \
-	  -e 's#\%LIBGTOP_VERSION_CODE\%#$(LIBGTOP_VERSION_CODE)#g' \
-	  -e 's#\%LIBGTOP_SERVER_VERSION\%#$(LIBGTOP_SERVER_VERSION)#g' \
-	  -e 's#\%libgtop_sysdeps_dir\%#$(libgtop_sysdeps_dir)#g' \
-	  -e 's#\%libgtop_need_server\%#$(libgtop_need_server)#g' \
-	  -e 's#\%libgtop_use_machine_h\%#$(libgtop_use_machine_h)#g' \
-	  -e 's#\%libgtop_guile_found\%#$(libgtop_guile_found)#g' \
-	  -e 's#\%libgtop_want_examples\%#$(libgtop_want_examples)#g' \
-	      < $(srcdir)/auto-macros.texi.in > auto-macros.tmp
-	echo '@c Set this if this is LibGTop 1.1.x' >> auto-macros.tmp
-	if [ $(LIBGTOP_VERSION_CODE) -ge 1001000 ] ; then \
-	  echo '@set LIBGTOP-1-1' >> auto-macros.tmp ; \
-	else \
-	  echo '@clear LIBGTOP-1-1' >> auto-macros.tmp ; \
-	fi
-	mv auto-macros.tmp auto-macros.texi
--- a/doc/about.texi
+++ b/doc/about.texi
@@ -1,123 +0,0 @@
-@node About, White Paper, Top, Top
-@chapter About LibGTop
-
-LibGTop is a library to get system specific data such as CPU and Memory Usage
-and information about running Processes.
-
-On Systems like Solaris or Digital Unix where you need special privileges to
-get those data, it uses a setuid/setgid server to do so.
-
-Even if LibGTop is a part of the GNOME desktop environment
-(@uref{http://www.gnome.org}), the main interface of LibGTop is totally
-independent from any particular desktop environment, so you can also use it
-as a standalone library in any piece of GPLed software.
-
-@menu
-* Availability::                Where to get LibGTop
-* Supported Platforms::         Supported Platforms
-* Mailing List::                Helping with LibGTop development
-* Thanks::                      People who contributed to LibGTop
-@end menu
-
-@node Availability, Supported Platforms, About, About
-@section Availability
-
-The master source of LibGTop is the GNOME CVS tree
-(see @uref{http://www.gnome.org} for details), but you can also get the
-latest release tarballs from
-
-@display
-@uref{ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/}
-@end display
-
-@noindent
-or any of its mirror sites.
-
-The latest stable version of LibGTop is 1.0.12 which is also the one that comes
-together with GNOME 1.0. It belongs to @code{LIBGTOP_STABLE_1_0} branch in CVS.
-Actual development occurs in the @code{libgtop-GNOME-2-0-port} which is
-currently versioned 1.90.0.
-
-@node Supported Platforms, Mailing List, Availability, About
-@section Supported Platforms
-
-The stable branch currently supports the following platforms:
-
-@itemize @bullet
-@item All versions of Linux
-
-LibGTop was tested under Linux 2.0.x and 2.2.x on the ix86 and the alpha, but
-it should also work without problems on SparcLinux or Linux 2.4.x.
-
-Note: I'm speaking of the Linux kernel here, not the GNU/Linux operating system.
-
-@item FreeBSD, NetBSD and OpenBSD
-
-LibGTop was tested under FreeBSD 2.2.6 and 3.0, NetBSD 1.3.2 and OpenBSD 2.4.
-Support for NetBSD 1.4 was added in LibGTop 1.0.2.
-
-@end itemize
-
-The platforms listed above are known to be stable and working. However, if
-you're using the latest development version, you can use it on the following
-platforms as well:
-
-@itemize @bullet
-@item BSD/OS
-
-There is a port for BSD/OS (aka BSDI) 2.x and 3.x from Timur Bakeyev which
-should also work with 4.x. This isn't tested very well, but it should be
-working.
-
-@item Digital Unix
-
-There is some basic support for Digital Unix (formerly DEC OSF/1) V3.2C, but
-this may still be a bit unstable. I'm currently working on this port as time
-permits so it should be fully supported soon.
-
-@item Solaris
-
-The Solaris port currently works on Solaris 7 and maybe also on other releases.
-Thanks a lot to Drazen Kacar and everyone who helped working on this port. They
-have really done excellent work here and I'm pretty sure that this port will be
-fully functional on most Solaris versions in near future.
-
-@end itemize
-
-@node Mailing List, Thanks, Supported Platforms, About
-@section Mailing List
-
-There is a @email{libgtop-devel-list@@egroups.com} mailing list for people who
-want to help with the development of LibGTop.
-
-It is meant as a low-traffic, but high content-list where we can discuss
-technical details such as adding new sysdeps ports etc. 
-
-Especially, I'd like to see people with a deeper knowledge of operating systems
-internals joining my list so we can discuss technical details of the sysdeps
-code. 
-
-It is *not* for users that want to know how to compile LibGTop etc.
-
-You can subscribe to this mailing list and view the mailing list archives
-on the LibGTop Page at @uref{http://www.home-of-linux.org/gnome/libgtop}.
-
-@node Thanks,  , Mailing List, About
-@section Thanks
-
-At the place I'd like to thank the following people who contributed to
-LibGTop (listed in chronological order):
-
-@itemize @bullet
-@item Sebastian Wilhelmi who had the initial idea of LibGTop and helped
-me a lot in the early beginning.
-@item Josh Sled for the initial FreeBSD port.
-@item Jeremy Lea for his BSD patches.
-@item Timur Bakeyev for the BSDI port.
-@item Drazen Kacar and the other people on the LibGTop development mailing
-list for the Solaris port.
-@item Kevin Vandersloot for the effort to port to GNOME 2.0.
-@item All people sending me patches, having good ideas, ...
-@item Everyone I have forgotten in this list ...
-@end itemize
-
--- a/doc/auto-macros.texi.in
+++ b/doc/auto-macros.texi.in
@@ -1,12 +0,0 @@
-@c LibGTop major, minor and micro version.
-@set LIBGTOP_MAJOR_VERSION %LIBGTOP_MAJOR_VERSION%
-@set LIBGTOP_MINOR_VERSION %LIBGTOP_MINOR_VERSION%
-@set LIBGTOP_MICRO_VERSION %LIBGTOP_MICRO_VERSION%
-
-@c LibGTop version and numerical version code ("1.234.567" -> 1234567).
-@set LIBGTOP_VERSION "%LIBGTOP_VERSION%"
-@set LIBGTOP_VERSION_CODE %LIBGTOP_VERSION_CODE%
-
-@c LibGTop server version, increased each time the protocol changes.
-@set LIBGTOP_SERVER_VERSION %LIBGTOP_SERVER_VERSION%
-
--- a/doc/libgtop2.texi
+++ b/doc/libgtop2.texi
@@ -1,89 +0,0 @@
-\input texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename libgtop2.info
-@settitle LibGTop Reference Manual
-@setchapternewpage odd
-@c %**end of header
-
-@include auto-macros.texi
-@include version.texi
-
-@ifinfo
-This is the LibGTop Reference Manual version @value{VERSION}
-(last modified @value{UPDATED}).
-
-Copyright 1999 Free Software Foundation, Inc.
-     
-Permission is granted to make and distribute verbatim
-copies of this manual provided the copyright notice and
-this permission notice are preserved on all copies.
-     
-@ignore
-Permission is granted to process this file through TeX
-and print the results, provided the printed document
-carries a copying permission notice identical to this
-one except for the removal of this paragraph (this
-paragraph not being relevant to the printed manual).
-     
-@end ignore
-Permission is granted to copy and distribute modified
-versions of this manual under the conditions for
-verbatim copying, provided also that the sections
-entitled ``Copying'' and ``GNU General Public License''
-are included exactly as in the original, and provided
-that the entire resulting derived work is distributed
-under the terms of a permission notice identical to this
-one.
-     
-Permission is granted to copy and distribute
-translations of this manual into another language,
-under the above conditions for modified versions,
-except that this permission notice may be stated in a
-translation approved by the Free Software Foundation.
-
-@format
-@dircategory Libraries:
-@direntry
-* LibGTop2: (libgtop2).			Library to get system specific data
-					such as cpu and memory usage, active
-					processes
-@end direntry
-@end format
-
-@end ifinfo
-
-@titlepage
-@title LibGTop Reference Manual
-@subtitle Version @value{VERSION} - @value{UPDATED}
-@author Martin Baulig
-
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1999 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim
-copies of this manual provided the copyright notice and
-this permission notice are preserved on all copies.
-     
-Permission is granted to copy and distribute modified
-versions of this manual under the conditions for
-verbatim copying, provided also that the sections
-entitled ``Copying'' and ``GNU General Public License''
-are included exactly as in the original, and provided
-that the entire resulting derived work is distributed
-under the terms of a permission notice identical to this
-one.
-     
-Permission is granted to copy and distribute
-translations of this manual into another language,
-under the above conditions for modified versions,
-except that this permission notice may be stated in a
-translation approved by the Free Software Foundation.
-@end titlepage
-
-@contents
-
-@include main.texi
-
-@bye
-
--- a/doc/main.texi
+++ b/doc/main.texi
@@ -1,68 +0,0 @@
-@node Top, About, (dir), (dir)
-
-@menu
-* About::                       About LibGTop
-* White Paper::                 LibGTop White Paper
-* Reference Manual::            LibGTop Reference Manual
-
- --- The Detailed Node Listing ---
-
-About LibGTop
-
-* Availability::                Where to get LibGTop
-* Supported Platforms::         Supported Platforms
-* Mailing List::                Helping with LibGTop development
-* Thanks::                      People who contributed to LibGTop
-
-LibGTop White Paper
-
-* Introduction::                Introduction
-* Overview::                    Overview
-
-Overview
-
-* Interface Design::            Things that need to be considered
-* Server Implementation::       The LibGTop "server"
-
-LibGTop Reference Manual
-
-* System Dependent::            System Dependent Functions.
-* Common Functions::            Common Functions.
-* Library Functions::           Library Functions.
-
-System Dependent Functions
-
-* glibtop_cpu::                 CPU Usage.
-* glibtop_mem::                 Memory Usage.
-* glibtop_swap::                Swap Usage.
-* glibtop_uptime::              System Uptime.
-* glibtop_loadavg::             Load Average.
-* glibtop_proclist::            Process List.
-* glibtop_proc_state::          Process State.
-* glibtop_proc_uid::            Process UID and TTY Information.
-* glibtop_proc_mem::            Process Memory Information.
-* glibtop_proc_time::           Process Time Information.
-* glibtop_proc_signal::         Process Signal Information.
-* glibtop_proc_kernel::         Process Kernel Data Information.
-* glibtop_proc_segment::        Process Segment Information.
-* glibtop_proc_args::           Process Arguments.
-* glibtop_proc_map::            Process Memory Maps.
-* glibtop_netload::             Network Load.
-* glibtop_ppp::                 PPP Usage.
-
-Common Functions
-
-* glibtop_mountlist::           Mount List.
-* glibtop_fsusage::             File System Usage.
-
-Library Functions
-
-* glibtop_init::                Server Initialization.
-* glibtop_sysdeps::             Server Sysdeps.
-* Library Parameters::          Library Parameters.
-@end menu
-
-@include about.texi
-@include white-paper.texi
-@include reference.texi
-
--- a/doc/reference.texi
+++ b/doc/reference.texi
--- a/doc/white-paper.texi
+++ b/doc/white-paper.texi
@@ -1,90 +0,0 @@
-@node White Paper, Reference Manual, About, Top
-@chapter LibGTop White Paper
-
-@menu
-* Introduction::                Introduction
-* Overview::                    Overview
-@end menu
-
-@node Introduction, Overview, White Paper, White Paper
-@section Introduction
-
-Many modern UNIX systems like Solaris, BSD or Digitial Unix only allow
-priviledged processes to read information like CPU and Memory Usage or
-information about running processes.
-
-@itemize @bullet
-@item
-BSD, for instance, doesn't have any other way to get those data than reading
-directly from @file{/dev/kmem} and you need to be in the @code{kmem} group to
-be able to read this.
-
-@item
-Other systems, like Digital Unix, allow all users to get things like CPU and
-Memory statistics, but only root may read information about any process other
-than the current one (you may not even get information about your own processes
-if you're not root).
-
-@item
-Linux has a very nice @file{/proc} filesystem, but reading and parsing
-@file{/proc} is very slow and inefficient.
-
-@item
-Solaris is a bit better, but you still need to be in the @code{sys} group or
-even root to get some data.
-@end itemize
-
-Because of this system utilities like @code{ps}, @code{uptime} or @code{top}
-often are setgid kmem or setuid root. Usually, they're also very specific to
-the system they're written for and not easily portable to other systems without
-a lot of work.
-
-This, of cause, becomes a problem for graphical tools like @code{gtop} - making
-a GTK+ program setgid or even setuid would be a security hole as big as you can
-drive the entire X11 source code through. For the GNOME project, we also needed
-some kind of library which provides all the required information in a portable
-since there's more than just one single program that wants to use them - for
-instance @code{gtop} and the @code{multiload}, @code{cpumemusage} and
-@code{netload} panel applets.
-
-@node Overview,  , Introduction, White Paper
-@section Overview
-
-This section should give you a short overview on how LibGTop was developed, which
-things needed to be considered and how it works.
-
-@menu
-* Interface Design::            Things that need to be considered
-* Server Implementation::       The LibGTop "server"
-@end menu
-
-@node Interface Design, Server Implementation, Overview, Overview
-@subsection Interface Design
-
-At the very beginning, it was necessary to collect all the data the library part
-should provide and put them into some C structures. This was not that easiy as it
-might sound since LibGTop should be portable to any modern UNIX system with a common
-library part on all those systems, but the data that should be returned vary from
-system to system. For instance some systems support shared memory, but some others
-may not.
-
-The header files where we define these C structures (which are system-independent) are
-shared between client and server. This way we can call the system dependent code
-directly where we do not need any special privileges to do so.
-
-All of those structures contain a @code{flags} member which is interpreted as a bit
-mask and tells the caller of the library functions which of the fields in the returned
-structure are valid and which are not.
-
-@node Server Implementation,  , Interface Design, Overview
-@subsection Server Implementation
-
-The LibGTop @dfn{server} is a setgid/setuid binary which contains all the system
-dependent code which needs special privileges. It is only build if it's required
-on the current system (for instance, the Linux kernel provides all the required
-data via its @file{/proc} filesystem so we do not need the server at all) and it
-only contains the @dfn{features} which need privileges.
-
-Whenever we do not need any privileges to get all the data for some of the requested
-structures (here called @dfn{features}) the library calls the sysdeps code directly
-rather than using the server.
--- a/examples/.cvsignore
+++ b/examples/.cvsignore
@@ -11,6 +11,4 @@ third_linux
 third_static
 second_static
 second_linux
-smp_static sysdeps_static netload_static procmap_static mountlist_static
 smp sysdeps netload procmap mountlist
-timings timings_static
--- a/examples/ChangeLog
+++ b/examples/ChangeLog
@@ -1,35 +1,3 @@
-2001-01-14  Abel Cheung  <maddog@linux.org.hk>
-
-	* \*.c: bindtextdomain and textdomain uses GETTEXT_PACKAGE.
-
-	* Makefile.am, first.c, second.c, sysdeps.c: Make them at least
-	compile for now, by disabling chunks which should belong to
-	HEAD branch.
-
-1999-05-28  Martin Baulig  <martin@home-of-linux.org>
-
-	* first.c, second.c, sysdeps.c: Use LibGTop version conditionals
- 	so we can more easily merge the code into LIBGTOP_STABLE_1_0.
-
-1999-05-07  Martin Baulig  <martin@home-of-linux.org>
-
-	* timings.c (timersub): Renamed this to `libgtop_timersub' and define
-	it on all systems.
-
-Fri Apr  9 00:14:52 1999 Timur Bakeyev  <timur@gnu.org>
-
-	* timings.c: Added timersub defenition, to make code compilable on 
-	BSDI.
-
-1999-03-24  Martin Baulig  <martin@home-of-linux.org>
-
-	* timings.c: New example.
-
-1999-03-17  Martin Baulig  <martin@home-of-linux.org>
-
-	* first.c, second.c: Fixed a bug that caused a core dump when
-	the sysdeps code does not return all data.
-
 1998-11-22  Martin Baulig  <baulig@taurus.uni-trier.de>

 	* netload.c: Call inet_ntoa () to get address and subnet
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -12,19 +12,18 @@ DEFS			= @DEFS@
 libgtopdir		= $(libexecdir)/libgtop

 libgtop_PROGRAMS	= first second\
-			  mountlist procmap netload sysdeps timings \
+			  mountlist procmap netload sysdeps\
 			  @static_targets@ @guile_examples@ @smp_examples@

 EXTRA_PROGRAMS		= first_static second_static \
 			  mountlist_static procmap_static \
 			  third third_static smp smp_static \
-			  netload_static sysdeps_static \
-			  timings_static
+			  netload_static sysdeps_static

 first_SOURCES		= first.c
-first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+first_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
 			  @LIBSUPPORT@ @INTLLIBS@

 first_static_SOURCES	= $(first_SOURCES)
@@ -32,9 +31,9 @@ first_static_LDADD	= $(first_LDADD)
 first_static_LDFLAGS	= -static

 second_SOURCES		= second.c
-second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+second_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
 			  @LIBSUPPORT@ @INTLLIBS@

 second_static_SOURCES	= $(second_SOURCES)
@@ -42,9 +41,9 @@ second_static_LDADD	= $(second_LDADD)
 second_static_LDFLAGS	= -static

 procmap_SOURCES		= procmap.c
-procmap_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+procmap_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
 			  @LIBSUPPORT@ @INTLLIBS@


@@ -54,9 +53,9 @@ procmap_static_LDADD	= $(procmap_LDADD)
 procmap_static_LDFLAGS	= -static

 netload_SOURCES		= netload.c
-netload_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+netload_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
 			  @LIBSUPPORT@ @INTLLIBS@

 netload_static_SOURCES	= $(netload_SOURCES)
@@ -64,24 +63,24 @@ netload_static_LDADD	= $(netload_LDADD)
 netload_static_LDFLAGS	= -static

 sysdeps_SOURCES		= sysdeps.c
-sysdeps_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+sysdeps_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
 			  @LIBSUPPORT@ @INTLLIBS@

 sysdeps_static_SOURCES	= $(sysdeps_SOURCES)
 sysdeps_static_LDADD	= $(sysdeps_LDADD)
 sysdeps_static_LDFLAGS	= -static

-third_guile_names_LIBS	= $(top_builddir)/sysdeps/guile/names/libgtop_guile_names-2.0.la
-third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names-2.0.la
+third_guile_names_LIBS	= $(top_builddir)/sysdeps/guile/names/libgtop_guile_names.la
+third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names.la

 third_SOURCES		= third.c
-third_LDADD		= $(top_builddir)/sysdeps/guile/libgtop_guile-2.0.la \
+third_LDADD		= $(top_builddir)/sysdeps/guile/libgtop_guile.la \
 			  $(third_guile_names_LIBS) $(third_names_LIBS) \
-			  $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+			  $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
 			  @GUILE_LIBS@ @LIBSUPPORT@ @INTLLIBS@

 third_static_SOURCES	= $(third_SOURCES)
@@ -89,9 +88,9 @@ third_static_LDADD	= $(third_LDADD)
 third_static_LDFLAGS	= -static

 mountlist_SOURCES	= mountlist.c
-mountlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+mountlist_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
 			  @LIBSUPPORT@ @INTLLIBS@

 mountlist_static_SOURCES= $(mountlist_SOURCES)
@@ -100,22 +99,12 @@ mountlist_static_LDFLAGS= -static


 smp_SOURCES		= smp.c
-smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+smp_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
 			  @LIBSUPPORT@ @INTLLIBS@

 smp_static_SOURCES	= $(smp_SOURCES)
 smp_static_LDADD	= $(smp_LDADD)
 smp_static_LDFLAGS	= -static

-timings_SOURCES		= timings.c
-timings_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
-			  @LIBSUPPORT@ @INTLLIBS@
-
-timings_static_SOURCES	= $(timings_SOURCES)
-timings_static_LDADD	= $(timings_LDADD)
-timings_static_LDFLAGS	= -static
-
--- a/examples/first.c
+++ b/examples/first.c
@@ -52,8 +52,8 @@ main (int argc, char *argv [])
 	count = PROFILE_COUNT;

 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
 	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

@@ -320,7 +320,7 @@ main (int argc, char *argv [])
 		glibtop_get_proc_kernel (&data.proc_kernel, pid);

 	printf ("Proc_Kernel  PID  %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx (%s)\n", (int) pid,
+		"%lu %lu %lu %lu %lu %lu %lu %lu (%s)\n", (int) pid,
 		(unsigned long) data.proc_kernel.flags,
 		(unsigned long) data.proc_kernel.k_flags,
 		(unsigned long) data.proc_kernel.min_flt,
@@ -344,7 +344,7 @@ main (int argc, char *argv [])
 	printf ("Proc_Args    PID  %5d (0x%08lx): %lu - '%s'\n", (int) pid,
 		(unsigned long) data.proc_args.flags,
 		(unsigned long) data.proc_args.size,
-		args ? args : "");
+		args);

 	glibtop_free (args);

@@ -430,7 +430,7 @@ main (int argc, char *argv [])
 		glibtop_get_proc_kernel (&data.proc_kernel, ppid);

 	printf ("Proc_Kernel  PPID %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx (%s)\n", (int) ppid,
+		"%lu %lu %lu %lu %lu %lu %lu %lu (%s)\n", (int) ppid,
 		(unsigned long) data.proc_kernel.flags,
 		(unsigned long) data.proc_kernel.k_flags,
 		(unsigned long) data.proc_kernel.min_flt,
@@ -454,7 +454,7 @@ main (int argc, char *argv [])
 	printf ("Proc_Args    PID  %5d (0x%08lx): %lu - '%s'\n", (int) ppid,
 		(unsigned long) data.proc_args.flags,
 		(unsigned long) data.proc_args.size,
-		args ? args : "");
+		args);

 	glibtop_free (args);

@@ -541,7 +541,7 @@ main (int argc, char *argv [])
 		glibtop_get_proc_kernel (&data.proc_kernel, 1);

 	printf ("Proc_Kernel  INIT %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx (%s)\n", 1,
+		"%lu %lu %lu %lu %lu %lu %lu %lu (%s)\n", 1,
 		(unsigned long) data.proc_kernel.flags,
 		(unsigned long) data.proc_kernel.k_flags,
 		(unsigned long) data.proc_kernel.min_flt,
@@ -565,7 +565,7 @@ main (int argc, char *argv [])
 	printf ("Proc_Args    PID  %5d (0x%08lx): %lu - '%s'\n", 1,
 		(unsigned long) data.proc_args.flags,
 		(unsigned long) data.proc_args.size,
-		args ? args : "");
+		args);

 	glibtop_free (args);

--- a/examples/mountlist.c
+++ b/examples/mountlist.c
@@ -47,8 +47,8 @@ main (int argc, char *argv [])
 	char buffer [BUFSIZ];

 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
 	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

--- a/examples/netload.c
+++ b/examples/netload.c
@@ -43,7 +43,7 @@ int
 main (int argc, char *argv [])
 {
 	glibtop_netload netload;
-	unsigned method, count, port;
+	unsigned method, count, port, i;
 	struct in_addr addr, subnet;
 	char *address_string, *subnet_string;
 	char buffer [BUFSIZ];
@@ -51,8 +51,8 @@ main (int argc, char *argv [])
 	count = PROFILE_COUNT;

 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
 	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

--- a/examples/procmap.c
+++ b/examples/procmap.c
@@ -58,8 +58,8 @@ main (int argc, char *argv [])
 	count = PROFILE_COUNT;

 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
 	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

@@ -97,7 +97,7 @@ main (int argc, char *argv [])
 		unsigned device, device_major, device_minor;
 		char perm [5];
 		
-		if (maps [i].flags & (1L << GLIBTOP_MAP_ENTRY_FILENAME))
+		if (maps [i].flags & (1 << GLIBTOP_MAP_ENTRY_FILENAME))
 			filename = maps [i].filename;

 #ifdef GLIBTOP_INODEDB
@@ -116,41 +116,24 @@ main (int argc, char *argv [])
 		device_minor = (device & 255);
 		device_major = ((device >> 8) & 255);

-		if (filename) {
-			char *format;
-
-			if (sizeof (void*) == 8)
-				format = "%016lx-%016lx %016lx - "
-					 "%02x:%02x %08lu - %4s - %s\n";
-			else
-				format = "%08lx-%08lx %08lx - "
-					 "%02x:%02x %08lu - %4s - %s\n";
-
-			fprintf (stderr, format,
+		if (filename)
+			fprintf (stderr, "%08lx-%08lx %08lx - "
+				 "%02x:%02x %08lu - %4s - %s\n",
 				 (unsigned long) maps [i].start,
 				 (unsigned long) maps [i].end,
 				 (unsigned long) maps [i].offset,
 				 device_major, device_minor,
 				 (unsigned long) maps [i].inode,
 				 perm, filename);
-		} else {
-			char * format;
-
-			if (sizeof (void*) == 8)
-				format = "%016lx-%016lx %016lx - "
-					 "%02x:%02x %08lu - %4s\n";
-			else
-				format = "%08lx-%08lx %08lx - "
-					 "%02x:%02x %08lu - %4s\n";
-
-			fprintf (stderr, format,
+		else
+			fprintf (stderr, "%08lx-%08lx %08lx - "
+				 "%02x:%02x %08lu - %4s\n",
 				 (unsigned long) maps [i].start,
 				 (unsigned long) maps [i].end,
 				 (unsigned long) maps [i].offset,
 				 device_major, device_minor,
 				 (unsigned long) maps [i].inode,
 				 perm);
-		}

 		if (filename && (filename != maps [i].filename))
 			glibtop_free (filename);
--- a/examples/second.c
+++ b/examples/second.c
@@ -22,7 +22,6 @@
 */

 #include <locale.h>
-#include <math.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -32,6 +31,8 @@
 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>

+#include <math.h>
+
 static void
 output (pid_t pid)
 {
@@ -51,7 +52,7 @@ output (pid_t pid)
 	printf ("\n");
 		
 	glibtop_get_proc_state (&data.proc_state, pid);
-
+		
 	printf ("Proc_State   PID  %5d (0x%08lx): "
 		"'%s', %c, %lu, %lu\n", (int) pid,
 		(unsigned long) data.proc_state.flags,
@@ -60,7 +61,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_state.gid);
 		
 	glibtop_get_proc_uid (&data.proc_uid, pid);
-	
+		
 	printf ("Proc_Uid     PID  %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) pid,
 		(unsigned long) data.proc_uid.flags,
@@ -70,7 +71,7 @@ output (pid_t pid)
 		data.proc_uid.pgrp, data.proc_uid.session,
 		data.proc_uid.tty, data.proc_uid.tpgid,
 		data.proc_uid.priority, data.proc_uid.nice);
-
+		
 	glibtop_get_proc_mem (&data.proc_mem, pid);
 		
 	printf ("Proc_Mem     PID  %5d (0x%08lx): "
@@ -125,7 +126,7 @@ output (pid_t pid)
 	glibtop_get_proc_kernel (&data.proc_kernel, pid);

 	printf ("Proc_Kernel  PID  %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx (%s)\n", (int) pid,
+		"%lu %lu %lu %lu %lu %lu %lu %lu (%s)\n", (int) pid,
 		(unsigned long) data.proc_kernel.flags,
 		(unsigned long) data.proc_kernel.k_flags,
 		(unsigned long) data.proc_kernel.min_flt,
@@ -149,7 +150,7 @@ output (pid_t pid)
 	printf ("Proc_Args    PID  %5d (0x%08lx): %lu - '%s'\n", (int) pid,
 		(unsigned long) data.proc_args.flags,
 		(unsigned long) data.proc_args.size,
-		args ? args : "");
+		args);

 	glibtop_free (args);

@@ -239,8 +240,8 @@ main (int argc, char *argv [])
 	unsigned *ptr, pid, i;

 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
 	
 	glibtop_init ();

--- a/examples/smp.c
+++ b/examples/smp.c
@@ -22,12 +22,13 @@
 */

 #include <locale.h>
-#include <math.h>

 #include <glibtop.h>
 #include <glibtop/cpu.h>
 #include <glibtop/xmalloc.h>

+#include <math.h>
+
 int
 main (int argc, char *argv [])
 {
@@ -40,11 +41,9 @@ main (int argc, char *argv [])
 	int ncpu, i;

 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
 	
-	glibtop_init();
-
 	glibtop_get_cpu (&cpu);

 	ncpu = glibtop_global_server->ncpu ? glibtop_global_server->ncpu : 1;
@@ -68,7 +67,7 @@ main (int argc, char *argv [])
 	memset (separator, '-', 91);
 	separator [92] = '\0';

-	sprintf (buffer, _("Ticks (%ld per second):"), frequency);
+	sprintf (buffer, _("Ticks (%d per second):"), frequency);

 	printf ("\n\n%-26s %12s %12s %12s %12s %12s\n%s\n", buffer,
 		_("Total"), _("User"), _("Nice"), _("Sys"), _("Idle"), separator);
--- a/examples/sysdeps.c
+++ b/examples/sysdeps.c
@@ -38,14 +38,14 @@ int
 main (int argc, char *argv [])
 {
 	glibtop_sysdeps sysdeps;
-	unsigned method, count, port;
+	unsigned method, count, port, i;
 	char buffer [BUFSIZ];

 	count = PROFILE_COUNT;

 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
 	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

@@ -69,7 +69,7 @@ main (int argc, char *argv [])

 	glibtop_get_sysdeps (&sysdeps);

-#define FEATURE_CHECK(f) ((sysdeps.features & (1L << GLIBTOP_SYSDEPS_##f##)) ? 1 : 0)
+#define FEATURE_CHECK(f) ((sysdeps.features & (1 << GLIBTOP_SYSDEPS_##f##)) ? 1 : 0)

 	printf ("Sysdeps (0x%08lx):\n\n"
 		"\tfeatures:\t\t0x%08lx\n\n"
--- a/examples/third.c
+++ b/examples/third.c
@@ -38,8 +38,8 @@ int
 main (int argc, char *argv[])
 {
 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);

 	gh_enter (argc, argv, main_prog);
 	exit (0);
--- a/examples/timings.c
+++ b/examples/timings.c
@@ -1,357 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <locale.h>
-
-#include <glibtop.h>
-#include <glibtop/open.h>
-#include <glibtop/close.h>
-#include <glibtop/xmalloc.h>
-
-#include <glibtop/parameter.h>
-
-#include <glibtop/union.h>
-#include <glibtop/sysdeps.h>
-
-#include <sys/times.h>
-#include <sys/resource.h>
-
-#ifndef PROFILE_COUNT
-#define PROFILE_COUNT			100000L
-#endif
-
-#ifndef PROFILE_COUNT_EXPENSIVE
-#define PROFILE_COUNT_EXPENSIVE		10000L
-#endif
-
-#define ELAPSED_UTIME ((unsigned long) elapsed_utime.tv_sec * 1000000 +	(unsigned long) elapsed_utime.tv_usec)
-#define ELAPSED_STIME ((unsigned long) elapsed_stime.tv_sec * 1000000 + (unsigned long) elapsed_stime.tv_usec)
-
-#define libgtop_timeradd(tvp, uvp, vvp)						\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec >= 1000000) {			\
-			(vvp)->tv_sec++;				\
-			(vvp)->tv_usec -= 1000000;			\
-		}							\
-	} while (0)
-#define libgtop_timersub(tvp, uvp, vvp)						\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec < 0) {				\
-			(vvp)->tv_sec--;				\
-			(vvp)->tv_usec += 1000000;			\
-		}							\
-	} while (0)
-
-int
-main (int argc, char *argv [])
-{
-	glibtop_union data;
-	unsigned c, count, *ptr;
-	struct rusage total_start, total_end;
-	struct rusage rusage_start, rusage_end;
-	struct timeval elapsed_utime, elapsed_stime;
-	pid_t pid;
-
-	count = PROFILE_COUNT;
-
-	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-	printf ("%-12s (%-10s): %7s - %9s - %9s\n",
-		"Feature", "Flags", "Count", "utime", "stime");
-	printf ("-------------------------------------------"
-		"---------------\n");
-	
-	glibtop_init_r (&glibtop_global_server, 0, 0);
-
-	getrusage (RUSAGE_SELF, &total_start);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_cpu (&data.cpu);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("CPU          (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.cpu.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++)
-		glibtop_get_mem (&data.mem);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Memory       (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.mem.flags, PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_STIME / PROFILE_COUNT_EXPENSIVE);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++)
-		glibtop_get_swap (&data.swap);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Swap         (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.swap.flags, PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_STIME / PROFILE_COUNT_EXPENSIVE);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_uptime (&data.uptime);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Uptime       (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.uptime.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_loadavg (&data.loadavg);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Loadavg      (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.loadavg.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	printf ("\n");
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++) {
-		ptr = glibtop_get_proclist (&data.proclist, 0, 0);
-		glibtop_free (ptr);
-	}
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proclist     (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proclist.flags,
-		PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_STIME / PROFILE_COUNT_EXPENSIVE);
-
-	pid = getpid ();
-
-	printf ("\n");
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_state (&data.proc_state, pid);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_State   (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_state.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_uid (&data.proc_uid, pid);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_Uid     (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_uid.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_mem (&data.proc_mem, pid);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_Mem     (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_mem.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_segment (&data.proc_segment, pid);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_Segment (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_segment.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_time (&data.proc_time, pid);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_Time    (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_time.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_signal (&data.proc_signal, pid);
-	
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_Signal  (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_signal.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_kernel (&data.proc_kernel, pid);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_Kernel  (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_kernel.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-	
-	getrusage (RUSAGE_SELF, &total_end);
-
-	libgtop_timersub (&total_end.ru_utime, &total_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&total_end.ru_stime, &total_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("-------------------------------------------"
-		"---------------\n");
-
-	printf ("%-36s %9lu - %9lu\n\n", "TOTAL",
-		ELAPSED_UTIME, ELAPSED_STIME);
-
-	printf ("All timings are in clock ticks "
-		"(1000000 ticks per second).\n\n");
-
-	glibtop_close ();
-
-	exit (0);
-}
--- a/include/glibtop/Makefile.am
+++ b/include/glibtop/Makefile.am
@@ -1,4 +1,4 @@
-glibtopdir		= $(includedir)/libgtop-2.0/glibtop
+glibtopdir		= $(includedir)/glibtop

 glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  sem_limits.h uptime.h command.h mem.h proclist.h \
--- a/include/glibtop/error.h
+++ b/include/glibtop/error.h
@@ -28,22 +28,13 @@

 BEGIN_LIBGTOP_DECLS

-#ifndef G_GNUC_UNUSED
-#if	__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define G_GNUC_UNUSED				\
-  __attribute__((unused))
-#else	/* !__GNUC__ */
-#define	G_GNUC_UNUSED
-#endif	/* !__GNUC__ */
-#endif /* defined G_GNUC_UNUSED */
-
 void glibtop_error_vr (glibtop *server, char *format, va_list args);
 void glibtop_warn_vr (glibtop *server, char *format, va_list args);

 void glibtop_error_io_vr (glibtop *server, char *format, int, va_list args);
 void glibtop_warn_io_vr (glibtop *server, char *format, int, va_list args);

-static void G_GNUC_UNUSED
+static void
 glibtop_error_r (glibtop *server, char *format, ...)
 {
 	va_list args;
@@ -53,7 +44,7 @@ glibtop_error_r (glibtop *server, char *format, ...)
 	va_end (args);
 }

-static void G_GNUC_UNUSED
+static void
 glibtop_warn_r (glibtop *server, char *format, ...)
 {
 	va_list args;
@@ -63,7 +54,7 @@ glibtop_warn_r (glibtop *server, char *format, ...)
 	va_end (args);
 }

-static void G_GNUC_UNUSED
+static void
 glibtop_error_io_r (glibtop *server, char *format, ...)
 {
 	va_list args;
@@ -73,7 +64,7 @@ glibtop_error_io_r (glibtop *server, char *format, ...)
 	va_end (args);
 }

-static void G_GNUC_UNUSED
+static void
 glibtop_warn_io_r (glibtop *server, char *format, ...)
 {
 	va_list args;
--- a/kernel/sysctl/.cvsignore
+++ b/kernel/sysctl/.cvsignore
@@ -1 +0,0 @@
-*.flags
--- a/kernel/sysctl/Makefile
+++ b/kernel/sysctl/Makefile
@@ -1,22 +0,0 @@
-#
-# Makefile for the LibGTop linux sysctl interface.
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := kernel.o
-ifeq ($(CONFIG_LIBGTOP),y)
-O_OJBS   := main.o libgtop.o
-else
-O_OBJS   := main.o
-endif
-OX_OBJS  := libgtop_syms.o
-
-ifeq ($(CONFIG_LIBGTOP),m)
-M_OBJS   := libgtop.o
-endif
-
-include $(TOPDIR)/Rules.make
--- a/kernel/sysctl/libgtop.c
+++ b/kernel/sysctl/libgtop.c
--- a/kernel/sysctl/libgtop.h
+++ b/kernel/sysctl/libgtop.h
@@ -1,242 +0,0 @@
-#ifndef _LINUX_LIBGTOP_H
-#define _LINUX_LIBGTOP_H 1
-
-#include <linux/tasks.h>
-
-enum {
-    LIBGTOP_VERSION = 1,
-    LIBGTOP_UPDATE_EXPENSIVE,
-    LIBGTOP_STAT = 101,
-    LIBGTOP_MEM,
-    LIBGTOP_SWAP,
-    LIBGTOP_PROCLIST = 201,
-    LIBGTOP_PROC_STATE = 211,
-    LIBGTOP_PROC_KERNEL,
-    LIBGTOP_PROC_SEGMENT,
-    LIBGTOP_PROC_MEM,
-    LIBGTOP_PROC_SIGNAL,
-    LIBGTOP_PROC_ARGS = 251,
-    LIBGTOP_PROC_MAPS,
-    LIBGTOP_NETLOAD = 301
-};
-
-enum {
-    LIBGTOP_PROCLIST_ALL = 0,
-    LIBGTOP_PROCLIST_PID,
-    LIBGTOP_PROCLIST_PGRP,
-    LIBGTOP_PROCLIST_SESSION,
-    LIBGTOP_PROCLIST_TTY,
-    LIBGTOP_PROCLIST_UID,
-    LIBGTOP_PROCLIST_RUID
-};
-
-#define LIBGTOP_NSIG			4
-
-#define LIBGTOP_PROCLIST_MASK		15
-#define LIBGTOP_MAX_GROUPS		32
-
-#define LIBGTOP_EXCLUDE_IDLE		0x1000
-#define LIBGTOP_EXCLUDE_SYSTEM		0x2000
-#define LIBGTOP_EXCLUDE_NOTTY		0x4000
-
-#define LIBGTOP_TASK_RUNNING		1
-#define LIBGTOP_TASK_INTERRUPTIBLE	2
-#define LIBGTOP_TASK_UNINTERRUPTIBLE	4
-#define LIBGTOP_TASK_ZOMBIE		8
-#define LIBGTOP_TASK_STOPPED		16
-#define LIBGTOP_TASK_SWAPPING		32
-
-#define LIBGTOP_VM_READ		0x0001	/* currently active flags */
-#define LIBGTOP_VM_WRITE	0x0002
-#define LIBGTOP_VM_EXEC		0x0004
-#define LIBGTOP_VM_SHARED	0x0008
-
-#define LIBGTOP_VM_MAYREAD	0x0010	/* limits for mprotect() etc */
-#define LIBGTOP_VM_MAYWRITE	0x0020
-#define LIBGTOP_VM_MAYEXEC	0x0040
-#define LIBGTOP_VM_MAYSHARE	0x0080
-
-#define LIBGTOP_VM_GROWSDOWN	0x0100	/* general info on the segment */
-#define LIBGTOP_VM_GROWSUP	0x0200
-#define LIBGTOP_VM_SHM		0x0400	/* shared memory area, don't swap out */
-#define LIBGTOP_VM_DENYWRITE	0x0800	/* ETXTBSY on write attempts.. */
-
-#define LIBGTOP_VM_EXECUTABLE	0x1000
-#define LIBGTOP_VM_LOCKED	0x2000
-#define LIBGTOP_VM_IO		0x4000  /* Memory mapped I/O or similar */
-
-#define LIBGTOP_MAP_PATH_LEN	(PAGE_SIZE - sizeof (libgtop_proc_maps_header_t))
-
-#ifndef min
-#define min(a,b) ((a < b) ? a : b)
-#endif
-
-typedef struct libgtop_stat libgtop_stat_t;
-
-typedef struct libgtop_cpu libgtop_cpu_t;
-typedef struct libgtop_mem libgtop_mem_t;
-typedef struct libgtop_swap libgtop_swap_t;
-typedef struct libgtop_proclist libgtop_proclist_t;
-
-typedef struct libgtop_proc_state libgtop_proc_state_t;
-typedef struct libgtop_proc_kernel libgtop_proc_kernel_t;
-typedef struct libgtop_proc_segment libgtop_proc_segment_t;
-typedef struct libgtop_proc_mem libgtop_proc_mem_t;
-typedef struct libgtop_proc_signal libgtop_proc_signal_t;
-
-typedef struct libgtop_proc_maps_header libgtop_proc_maps_header_t;
-typedef struct libgtop_proc_maps libgtop_proc_maps_t;
-
-typedef struct libgtop_netload libgtop_netload_t;
-
-struct libgtop_cpu
-{
-    unsigned long total;		/* Total CPU Time		*/
-    unsigned long user;			/* CPU Time in User Mode	*/
-    unsigned long nice;			/* CPU Time in User Mode (nice)	*/
-    unsigned long sys;			/* CPU Time in System Mode	*/
-    unsigned long idle;			/* CPU Time in the Idle Task	*/
-};
-
-struct libgtop_mem
-{
-    unsigned long totalram;		/* Total usable main memory size */
-    unsigned long freeram;		/* Available memory size */
-    unsigned long sharedram;		/* Amount of shared memory */
-    unsigned long bufferram;		/* Memory used by buffers */
-    unsigned long cachedram;
-};
-
-struct libgtop_swap
-{
-    unsigned long totalswap;		/* Total swap space size */
-    unsigned long freeswap;		/* swap space still available */
-};
-
-struct libgtop_proclist
-{
-    int count;
-    int nr_running, nr_tasks, last_pid;
-    unsigned pids [NR_TASKS];
-};
-
-struct libgtop_stat
-{
-    int ncpu;				/* Number of CPUs		*/
-    unsigned long frequency;		/* Tick frequency (HZ)		*/
-    libgtop_cpu_t cpu;			/* CPU statistics		*/
-    libgtop_cpu_t xcpu [NR_CPUS];	/* SMP per-CPU statistics	*/
-    double loadavg [3];			/* Load average			*/
-    unsigned long total_forks;		/* Total # of forks		*/
-    unsigned int context_swtch;		/* Total # of context switches	*/
-    unsigned long boot_time;		/* Boot time (seconds s. epoch)	*/
-    unsigned int pgpgin, pgpgout;	/* # of pages paged in/out	*/
-    unsigned int pswpin, pswpout;	/* # of swap pgs brought in/out	*/
-};
-
-struct libgtop_proc_state
-{
-    long state;
-    unsigned long flags;
-    char comm [16];
-    int uid, euid, suid, fsuid;
-    int gid, egid, sgid, fsgid;
-    int pid, pgrp, ppid;
-    int session;
-    unsigned int tty;
-    int tpgid;
-    long priority, counter, def_priority;
-    long utime, stime, cutime, cstime, start_time;
-    long per_cpu_utime [NR_CPUS], per_cpu_stime [NR_CPUS];
-    int has_cpu, processor, last_processor;
-
-    unsigned long context;
-    unsigned long start_code, end_code, start_data, end_data;
-    unsigned long start_brk, brk, start_stack, start_mmap;
-    unsigned long arg_start, arg_end, env_start, env_end;
-    unsigned long rss, rlim, total_vm, locked_vm;
-
-    unsigned long policy, rt_priority;
-    unsigned long it_real_value, it_prof_value, it_virt_value;
-    unsigned long it_real_incr, it_prof_incr, it_virt_incr;
-
-    unsigned long keip, kesp;
-    unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
-    unsigned long nswap, cnswap;
-
-    int ngroups, groups [LIBGTOP_MAX_GROUPS];
-};
-
-struct libgtop_proc_kernel
-{
-    unsigned long wchan;
-};
-
-struct libgtop_proc_segment
-{
-    unsigned long vsize, data, exec, stack, lib;
-};
-
-struct libgtop_proc_mem
-{
-    libgtop_proc_segment_t segment;
-    int size, resident, share, trs, lrs, drs, dt;
-    unsigned long rss, rlim;
-};
-
-struct libgtop_proc_signal
-{
-    unsigned long signal [LIBGTOP_NSIG];
-    unsigned long blocked [LIBGTOP_NSIG];
-    unsigned long ignore [LIBGTOP_NSIG];
-    unsigned long catch [LIBGTOP_NSIG];
-};
-
-struct libgtop_proc_maps_header
-{
-    unsigned long start, end, offset, perm;
-    off_t filename_offset;
-    ino_t inode;
-    dev_t device;
-} __attribute__ ((aligned (64)));
-
-struct libgtop_proc_maps
-{
-    libgtop_proc_maps_header_t header;
-    char filename [LIBGTOP_MAP_PATH_LEN];
-};
-
-struct libgtop_netload
-{
-    unsigned long rx_packets;		/* total packets received	*/
-    unsigned long tx_packets;		/* total packets transmitted	*/
-    unsigned long rx_bytes;		/* total bytes received 	*/
-    unsigned long tx_bytes;		/* total bytes transmitted	*/
-    unsigned long rx_errors;		/* bad packets received		*/
-    unsigned long tx_errors;		/* packet transmit problems	*/
-    unsigned long rx_dropped;		/* no space in linux buffers	*/
-    unsigned long tx_dropped;		/* no space available in linux	*/
-    unsigned long multicast;		/* multicast packets received	*/
-    unsigned long collisions;
-    
-    /* detailed rx_errors: */
-    unsigned long rx_length_errors;
-    unsigned long rx_over_errors;	/* receiver ring buff overflow	*/
-    unsigned long rx_crc_errors;	/* recved pkt with crc error	*/
-    unsigned long rx_frame_errors;	/* recv'd frame alignment error */
-    unsigned long rx_fifo_errors;	/* recv'r fifo overrun		*/
-    unsigned long rx_missed_errors;	/* receiver missed packet	*/
-    
-    /* detailed tx_errors */
-    unsigned long tx_aborted_errors;
-    unsigned long tx_carrier_errors;
-    unsigned long tx_fifo_errors;
-    unsigned long tx_heartbeat_errors;
-    unsigned long tx_window_errors;
-    
-    /* for cslip etc */
-    unsigned long rx_compressed;
-    unsigned long tx_compressed;
-};
-
-#endif
--- a/kernel/sysctl/libgtop_syms.c
+++ b/kernel/sysctl/libgtop_syms.c
@@ -1,30 +0,0 @@
-/*
- * linux/libgtop/libgtop_syms.c
- * Copyright (C) 1999 Martin Baulig
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-
-#include <linux/sched.h>
-
-#include <linux/mm.h>
-#include <linux/pagemap.h>
-#include <linux/swap.h>
-
-extern unsigned long total_forks;
-
-EXPORT_SYMBOL(task);
-EXPORT_SYMBOL(init_mm);
-EXPORT_SYMBOL(pidhash);
-EXPORT_SYMBOL(avenrun);
-EXPORT_SYMBOL(nr_running);
-EXPORT_SYMBOL(nr_tasks);
-EXPORT_SYMBOL(last_pid);
-EXPORT_SYMBOL(total_forks);
-EXPORT_SYMBOL(si_swapinfo);
-
-extern void scheduling_functions_start_here(void);
-extern void scheduling_functions_end_here(void);
-EXPORT_SYMBOL(scheduling_functions_start_here);
-EXPORT_SYMBOL(scheduling_functions_end_here);
--- a/kernel/sysctl/main.c
+++ b/kernel/sysctl/main.c
@@ -1,4 +0,0 @@
-/*
- * linux/libgtop/main.c
- * Copyright (C) 1999 Martin Baulig
- */
--- a/kernel/sysctl/patch-2.2.1
+++ b/kernel/sysctl/patch-2.2.1
@@ -1,81 +0,0 @@
-diff -ru linux-2.2.1/Makefile hacker/Makefile
--- linux-2.2.1/Makefile	Sun Jan 31 22:45:42 1999
-+++ hacker/Makefile	Sun Mar 21 16:10:41 1999
-@@ -109,6 +109,7 @@
- DRIVERS		=drivers/block/block.a \
- 		 drivers/char/char.a \
- 	         drivers/misc/misc.a
-+EXTRAS		=
- LIBS		=$(TOPDIR)/lib/lib.a
- SUBDIRS		=kernel drivers mm fs net ipc lib
- 
-@@ -186,6 +187,11 @@
- DRIVERS := $(DRIVERS) drivers/net/irda/irda_drivers.a
- endif
- 
-+ifdef CONFIG_LIBGTOP
-+SUBDIRS := $(SUBDIRS) libgtop
-+EXTRAS  := $(EXTRAS) libgtop/kernel.o
-+endif
-+
- include arch/$(ARCH)/Makefile
- 
- .S.s:
-@@ -206,6 +212,7 @@
- 		$(FILESYSTEMS) \
- 		$(NETWORKS) \
- 		$(DRIVERS) \
-+		$(EXTRAS) \
- 		$(LIBS) \
- 		--end-group \
- 		-o vmlinux
-diff -ru linux-2.2.1/arch/i386/config.in hacker/arch/i386/config.in
--- linux-2.2.1/arch/i386/config.in	Sun Jan 31 22:25:25 1999
-+++ hacker/arch/i386/config.in	Sat Mar 20 18:26:18 1999
-@@ -84,6 +84,9 @@
- bool 'System V IPC' CONFIG_SYSVIPC
- bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
- bool 'Sysctl support' CONFIG_SYSCTL
-+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-+  tristate 'LibGTop support' CONFIG_LIBGTOP
-+fi
- tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
- tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
- tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
-diff -ru linux-2.2.1/include/linux/sysctl.h hacker/include/linux/sysctl.h
--- linux-2.2.1/include/linux/sysctl.h	Sun Jan 31 22:24:14 1999
-+++ hacker/include/linux/sysctl.h	Sat Mar 20 19:12:54 1999
-@@ -56,7 +56,8 @@
- 	CTL_PROC=4,		/* Process info */
- 	CTL_FS=5,		/* Filesystems */
- 	CTL_DEBUG=6,		/* Debugging */
-	CTL_DEV=7		/* Devices */
-+	CTL_DEV=7,		/* Devices */
-+	CTL_LIBGTOP=408		/* LibGTop */
- };
- 
- 
-diff -ru linux-2.2.1/kernel/sysctl.c hacker/kernel/sysctl.c
--- linux-2.2.1/kernel/sysctl.c	Sun Jan 31 22:24:43 1999
-+++ hacker/kernel/sysctl.c	Sat Mar 20 19:24:34 1999
-@@ -82,7 +82,9 @@
- static ctl_table fs_table[];
- static ctl_table debug_table[];
- static ctl_table dev_table[];
-
-+#ifdef CONFIG_LIBGTOP
-+extern ctl_table libgtop_table[];
-+#endif
- 
- /* /proc declarations: */
- 
-@@ -148,6 +150,9 @@
- 	{CTL_FS, "fs", NULL, 0, 0555, fs_table},
- 	{CTL_DEBUG, "debug", NULL, 0, 0555, debug_table},
-         {CTL_DEV, "dev", NULL, 0, 0555, dev_table},
-+#ifdef CONFIG_LIBGTOP
-+	{CTL_LIBGTOP, "libgtop", NULL, 0, 0555, libgtop_table},
-+#endif
- 	{0}
- };
- 
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,14 +2,13 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@

 INCLUDES			= @INCLUDES@

-lib_LTLIBRARIES			= libgtop-2.0.la
+lib_LTLIBRARIES			= libgtop.la

-libgtop_2_0_la_SOURCES		= init.c open.c close.c command.c read.c \
+libgtop_la_SOURCES		= init.c open.c close.c command.c read.c \
 				  read_data.c write.c lib.c parameter.c \
 				  sysdeps.c

-libgtop_2_0_la_LDFLAGS		= $(LT_VERSION_INFO)
-libgtop_2_0_la_LIBADD		= $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la $(sysdeps_suid_lib) $(INTLLIBS)
+libgtop_la_LDFLAGS		= $(LT_VERSION_INFO)

 BUILT_SOURCES			= lib.c

--- a/lib/lib.pl
+++ b/lib/lib.pl
@@ -36,26 +36,20 @@ print 'static void';
 print '_glibtop_missing_feature (glibtop *server, const char *feature,';
 print "\t\t\t  const u_int64_t present, u_int64_t *required)";
 print '{';
-print "\tu_int64_t old_required = *required;\n";
-print "\t/* Return if we have all required fields. */";
-print "\tif ((~present & old_required) == 0)";
-print "\t\treturn;\n";
 print "\tswitch (server->error_method) {";
 print "\tcase GLIBTOP_ERROR_METHOD_WARN_ONCE:";
 print "\t\t*required &= present;";
 print "\tcase GLIBTOP_ERROR_METHOD_WARN:";
 print "\t\tglibtop_warn_r (server,";
 print "\t\t\t\t_(\"glibtop_get_%s (): Client requested \"";
-print "\t\t\t\t  \"field mask %05lx, but only have %05lx.\"),";
-print "\t\t\t\t feature, (unsigned long) old_required,";
-print "\t\t\t\t (unsigned long) present);";
+print "\t\t\t\t  \"field mask %05Lx, but only have %05Lx.\"),";
+print "\t\t\t\t feature, required, present);";
 print "\t\tbreak;";
 print "\tcase GLIBTOP_ERROR_METHOD_ABORT:";
 print "\t\tglibtop_error_r (server,";
 print "\t\t\t\t _(\"glibtop_get_%s (): Client requested \"";
-print "\t\t\t\t  \"field mask %05lx, but only have %05lx.\"),";
-print "\t\t\t\t feature, (unsigned long) old_required,";
-print "\t\t\t\t (unsigned long) present);";
+print "\t\t\t\t   \"field mask %05x, but only have %05x.\"),";
+print "\t\t\t\t feature, required, present);";
 print "\t\tbreak;";
 print "\t}";
 print '}';
--- a/lib/read.c
+++ b/lib/read.c
@@ -30,7 +30,6 @@ do_read (int s, void *ptr, size_t total_size)
 {
 	int nread;
 	size_t already_read = 0, remaining = total_size;
-	char *tmp_ptr;
 	
 	while (already_read < total_size) {
 		nread = recv (s, ptr, remaining, 0);
@@ -47,10 +46,7 @@ do_read (int s, void *ptr, size_t total_size)
 		
 		already_read += nread;
 		remaining -= nread;
-		/* (char *) ptr += nread; */
-		tmp_ptr = ptr;
-		tmp_ptr += nread;
-		ptr = tmp_ptr;
+		(char *) ptr += nread;
 	}
 }

--- a/lib/sysdeps.c
+++ b/lib/sysdeps.c
@@ -40,7 +40,6 @@ GLIBTOP_SUID_PROC_TIME +
 GLIBTOP_SUID_PROC_SIGNAL +
 GLIBTOP_SUID_PROC_KERNEL +
 GLIBTOP_SUID_PROC_SEGMENT +
-GLIBTOP_SUID_PROC_ARGS +
 GLIBTOP_SUID_PROC_MAP +
 GLIBTOP_SUID_NETLOAD +
 GLIBTOP_SUID_PPP;
--- a/libgtop-2.0.pc.in
+++ b/libgtop-2.0.pc.in
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-          
-Name: libgtop
-Description: Portable System Access Library
-Requires: glib-2.0
-Version: @VERSION@
-Libs: -L${libdir} @LIBGTOP_LIBS@
-Cflags: -I${includedir}/libgtop-2.0
-
-
--- a/libgtop-config.in
+++ b/libgtop-config.in
@@ -1,7 +1,7 @@
 #!/bin/sh

 usage="\
-Usage: libgtop-config [--version] [--config] [--features-def-file] [--cflags] [--libs] [--extra-libs]"
+    Usage: libgtop-config [--version] [--config] [--features-def-file]"

 config_file="@LIBGTOP_LIBDIR@/libgtopConf.sh"
 . $config_file
@@ -29,15 +29,6 @@ while test $# -gt 0; do
    --features-def-file)
      echo $features_def_file
      ;;
-    --cflags)
-      echo $LIBGTOP_INCS
-      ;;
-    --libs)
-      echo $LIBGTOP_LIBS
-      ;;
-    --extra-libs)
-      echo $LIBGTOP_EXTRA_LIBS
-      ;;
    *)
      echo "${usage}" 1>&2
      exit 1
--- a/libgtop-sysdeps.m4
+++ b/libgtop-sysdeps.m4
@@ -73,7 +73,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[

 	AC_ARG_ENABLE(hacker-mode,
 	[  --enable-hacker-mode    Enable building of unstable sysdeps],
-	[hacker_mode="$enableval"], [hacker_mode=no])
+	[hacker_mode="$withval"], [hacker_mode=no])

 	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)

@@ -91,9 +91,6 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  linux*)
 	    libgtop_smp=yes
 	    ;;
-	  aix*)
-	    libgtop_smp=yes
-	    ;;
 	  *)
 	    libgtop_smp=no
 	    ;;
@@ -121,33 +118,18 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  fi
 	  libgtop_need_server=no
 	  ;;
-	freebsd*|netbsd*|openbsd*|bsdi*)
+	freebsd*|netbsd*|openbsd*)
 	  libgtop_sysdeps_dir=freebsd
 	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
 	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
 	  ;;
-	solaris*)
-	  libgtop_sysdeps_dir=solaris
-	  libgtop_use_machine_h=yes
-	  libgtop_need_server=yes
-	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
-	  ;;
-	aix*)
-	  libgtop_sysdeps_dir=aix
-	  libgtop_use_machine_h=yes
-	  libgtop_need_server=yes
-	  libgtop_have_sysinfo=yes
-	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
-	  ;;
 	*)
 	  if test x$hacker_mode = xyes ; then
 	    case "$host_os" in
 	    sunos4*)
-	      #Please note that this port is obsolete and not working at
-	      #all. It is only useful for people who want to fix it ... :-)
 	      libgtop_sysdeps_dir=sun4
-	      libgtop_use_machine_h=yes
+	        libgtop_use_machine_h=yes
 	      libgtop_need_server=yes
 	      ;;
 	    osf*)
@@ -195,7 +177,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 #include <net/netisr.h>
 #include <net/route.h>

-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#ifdef __FreeBSD__
 #include <net/if_sppp.h>
 #else
 #include <i4b/sppp/if_sppp.h>
@@ -221,7 +203,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 #include <net/netisr.h>
 #include <net/route.h>

-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#ifdef __FreeBSD__
 #include <net/if_sppp.h>
 #else
 #include <i4b/sppp/if_sppp.h>
@@ -267,18 +249,6 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code)
 	  AC_MSG_RESULT($os_version_code)
 	  ;;
-	solaris*)
-	  os_major_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\1/'`
-	  os_minor_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\2/'`
-	  os_micro_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\3/'`
-	  test -z "$os_micro_version" && os_micro_version=0
-	  os_version_expr="$os_major_version 100 * $os_minor_version 10 * + $os_micro_version + p q"
-	  os_version_code=`echo "$os_version_expr" | dc`
-
-	  AC_MSG_CHECKING(for Solaris release code)
-	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code)
-	  AC_MSG_RESULT($os_version_code)
-	  ;;
 	esac

 	AC_MSG_CHECKING(for machine.h in libgtop sysdeps dir)
--- a/libgtop.spec.in
+++ b/libgtop.spec.in
@@ -1,7 +1,6 @@
 # Note that this is NOT a relocatable package
 %define ver      @VERSION@
-%define  RELEASE SNAP
-%define  rel     %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
+%define rel      SNAP
 %define prefix   /usr

 Summary: LibGTop library
@@ -123,4 +122,4 @@ rm -rf $RPM_BUILD_ROOT
 %files examples
 %defattr(-,root,root)

-%{prefix}/libexec/libgtop
+%{prefix}/libexec/libgtop/*
--- a/libgtopConf.sh.in
+++ b/libgtopConf.sh.in
@@ -31,8 +31,6 @@ LIBGTOP_MICRO_VERSION="@LIBGTOP_MICRO_VERSION@"
 LIBGTOP_VERSION="@LIBGTOP_VERSION@"
 LIBGTOP_VERSION_CODE="@LIBGTOP_VERSION_CODE@"

-MODULE_VERSION="libgtop-@LIBGTOP_VERSION@"
-
 LIBGTOP_SERVER_VERSION="@LIBGTOP_SERVER_VERSION@"

 libgtop_sysdeps_dir="@libgtop_sysdeps_dir@"
--- a/misc/timings/timings.linux-proc
+++ b/misc/timings/timings.linux-proc
@@ -1,26 +0,0 @@
-This statistics were made on a PPRO 200 running Linux 2.2.1
-reading everything from /proc while the system was idle.
-
-
-Feature      (Flags     ):   Count -     utime -     stime
----------------------------------------------------------
-CPU          (0x000007ff):  100000 -     13.90 -    181.80
-Memory       (0x0000007f):   10000 -     32.00 -   8061.00
-Swap         (0x0000001f):   10000 -     46.00 -   8130.00
-Uptime       (0x00000003):  100000 -     19.60 -     72.20
-Loadavg      (0x0000000f):  100000 -     32.40 -     77.10
-
-Proclist     (0x00000007):   10000 -   2250.00 -   4419.00
-
-Proc_State   (0x0000000f):  100000 -     40.70 -    221.00
-Proc_Uid     (0x00000fff):  100000 -     72.40 -    327.30
-Proc_Mem     (0x0000003f):  100000 -     65.70 -    283.90
-Proc_Segment (0x000000f5):  100000 -     76.50 -    281.10
-Proc_Time    (0x000001ff):  100000 -     37.00 -    160.90
-Proc_Signal  (0x0000000f):  100000 -     52.50 -    148.50
-Proc_Kernel  (0x0000017f):  100000 -     56.70 -    153.50
----------------------------------------------------------
-TOTAL                                 70030000 - 396830000
-
-All timings are in clock ticks (1000000 ticks per second).
-
--- a/misc/timings/timings.linux-sysctl
+++ b/misc/timings/timings.linux-sysctl
@@ -1,27 +0,0 @@
-This statistics were made on a PPRO 200 running Linux 2.2.1
-(the same machine I made the timings.linux-proc on) with my
-new sysctl () based kernel module.
-
-
-Feature      (Flags     ):   Count -     utime -     stime
----------------------------------------------------------
-CPU          (0x0000003f):  100000 -      3.50 -      5.40
-Memory       (0x0000003f):   10000 -      3.00 -      6.00
-Swap         (0x0000001f):   10000 -     10.00 -      7.00
-Uptime       (0x00000003):  100000 -      2.30 -      7.00
-Loadavg      (0x00000001):  100000 -      3.00 -      5.60
-
-Proclist     (0x00000007):   10000 -     13.00 -     46.00
-
-Proc_State   (0x0000000d):  100000 -      3.20 -      7.70
-Proc_Uid     (0x00000fff):  100000 -      3.60 -      7.40
-Proc_Mem     (0x0000003f):  100000 -      4.10 -     34.30
-Proc_Segment (0x000000ff):  100000 -      5.90 -     41.50
-Proc_Time    (0x0000013d):  100000 -      3.50 -      7.50
-Proc_Signal  (0x0000000f):  100000 -      2.70 -      8.80
-Proc_Kernel  (0x000000fe):  100000 -      4.00 -     13.30
----------------------------------------------------------
-TOTAL                                  3840000 -  14440000
-
-All timings are in clock ticks (1000000 ticks per second).
-
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -3,11 +3,5 @@ Makefile.in
 POTFILES
 cat-id-tbl.c
 *.gmo
-*.mo
 libgtop.pot
-libgtop-2.0.pot
 Makefile.in.in
-messages
-stamp-cat-id
-po2tbl.sed
-missing
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,518 +1,3 @@
-2003-05-10  Danilo Segan  <dsegan@gmx.net>
-
-	* sr.po, sr@Latn.po: Added Serbian translation by Serbian team 
-	(Prevod.org).
-
-2003-04-20  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: Updated traditional Chinese translation.
-
-2003-03-18  Gil "Dolfin" Osher <dolfin@rpg.org.il>
-
-	* he.po: Updated Hebrew translation.
-
-2003-03-13  Christian Rose  <menthos@menthos.com>
-
-	* ml.po: Added Malayalam translation by
-	FSF-India <locale@gnu.org.in>.
-
-2003-03-10  Roozbeh Pournader  <roozbeh@sharif.edu>
-
-	* fa.po: Added Persian translation.
-
-2003-03-08  Gil "Dolfin" Osher <dolfin@rpg.org.il>
-
-	* he.po: Added Hebrew translation.
-
-2003-03-06  Yuriy Syrota  <rasta renome.rovno.ua>
-
-	* uk.po: Updated Ukrainian translation.
-
-2003-02-25  T?<3F>ivo Leedj?<3F>rv  <toivo@linux.ee>
-
-	* et.po: Added Estonian translation.
-
-2003-02-23  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: Updated traditional Chinese translation.
-
-2003-02-22  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Barbarism fixes from Jordi Mas.
-
-2003-02-22  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: Updated traditional Chinese translation.
-
-2003-02-16  Mohammad DAMT  <mdamt@bisnisweb.com>
-
-	* id.po: Added Indonesian translation
-
-2003-02-09  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Some fixes for problems catched in translation review.
-
-2003-02-07  Miloslav Trmac  <mitr@volny.cz>
-
-	* cs.po: Fixed typos in Czech translation.
-
-2003-01-25  Alessio Frusciante  <algol@firenze.linux.it>
-
-	* it.po: Added Italian translation.
-
-2003-01-23  Marius Andreiana <marius galuna.ro>
-
-	* ro.po: added ( thanks to Mi?<3F>u Moldovan )
-
-2003-01-22  Christian Rose  <menthos@menthos.com>
-
-	* mn.po: Added Mongolian translation by
-	Sanlig Badral <badral@chinggis.com>.
-
-2003-01-20  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* vi.po: Updated Vietnamese file
-
-2003-01-18  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: Updated traditional Chinese translation.
-
-2003-01-16  Daniel Yacob <locales@geez.org>
-
-	* am.po: Added Amharic translation.
-	
-2003-01-16  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* vi.po: Updated Vietnamese file
-
-2003-01-03  Andras Timar  <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2002-12-14  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* fr.po: Updated French translation and converted to UTF-8.
-
-2002-11-25  Yanko Kaneti  <yaneti@declera.com>
-
-	* *.po: Convert all to UTF-8.
-
-2002-11-07  Simos Xenitellis  <simos74@gmx.net>
-
-	* el.po: Updated Greek translation.
-
-2002-11-04  Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>
-
-	* nl.po: Jeroen van der Vegt updated Dutch translation.
-
-2002-11-03  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
-
-	* be.po: Added Belarusian translation
-	* from Belarusian team <i18n@infonet.by>.
-
-2002-09-26  Stanislav Brabec  <sbrabec@suse.cz>
-
-	* cs.po: Added Czech translation from Miloslav Trmac
-	<mitr@volny.cz>.
-
-2002-09-19  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Committed updated Turkish translation by ?<3F>mer.
-
-2002-09-02  Peteris Krisjanis <peteris.krisjanis@os.lv>
-
-	* lv.po: Updated Latvian translation.
-
-2002-08-22  Andras Timar  <timar@gnome.hu>
-
-        * hu.po: Updated Hungarian translation.
-
-2002-08-20  Peteris Krisjanis <peteris.krisjanis@os.lv>
-
-	* lv.po (added): Latvian translation.
-
-2002-08-07  Christian Neumair  <christian-neumair@web.de>
-
-	* de.po: Updated German translation.
-
-2002-07-13  Jordi Mallach  <jordi@sindominio.net>
-
-	* ca.po: Updated Catalan translation.
-
-2002-06-25  Yanko Kaneti <yaneti@declera.com>
-
-	* bg.po (added): Bulgarian translation by
-	Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>.
-
-2002-06-22  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* ca.po: Updated Catalan file
-
-2002-06-17  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* vi.po: Updated Vietnamese file
-
-2002-06-13  Takayuki KUSANO  <AE5T-KSN@asahi-net.or.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2002-06-10  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* vi.po: Updated Vientamese file
-
-2002-06-02  Germ??n Poo Caama?<3F>o <gpoo@ubiobio.cl>
-
-	* es.po: Updated Spanish translation from
-	Juan Manuel Garc?<3F>a Molina <juanma_gm@wanadoo.es>
-
-2002-06-02  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2002-06-02  Carlos Perell?<3F> Mar?<3F>n <carlos@gnome-db.org>
-
-	* es.po: Fixed.
-
-2002-05-28  Carlos Perello Marin <carlos@gnome-db.org>
-
-	* LEEME.es: Updated.
-
-2002-05-28  Carlos Perello Marin <carlos@gnome-db.org>
-
-	* es.po, es_ES.po: Updated so the contry dependent string is
-	placed at es_ES.po for Spain and the US like number notation is
-	stored at es.po. It's much more easy mantain the es_ES.po file than
-	4 or 5 files from American countries.
-	* es_DO.pom, es_GT.po, es_HN.po, es_MX.po, es_PA.po, es_PE.po,
-	es_SV.po: Removed, we only need to update es.po and es_ES.po now.
-
-2002-05-19  Vlad Harchev  <hvv@hippo.ru>
-
-	* ru.po: updated russian translation from Dmitry G. Mastrukov
-	<dmitry@taurussoft.org>.
-
-2002-05-10  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation from Dmitry Mastrukov.
-
-2002-05-08  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2002-05-08  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* vi.po: Added Vietnamese file
-
-2002-05-06  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * pt.po: Updated Portuguese translation and converted to UTF-8.
-
-2002-05-05  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2002-04-25  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2002-04-24  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation by Marcel Telka <marcel@telka.sk>.
-
-2002-04-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm?<3F>l) translation.
-	
-2002-04-19  Ole Laursen  <olau@hardworking.dk>
-
-	* da.po: Updated Danish translation.
-
-2002-04-19  Pauli Virtanen  <pauli.virtanen@hut.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2002-04-09  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation from Dmitry Mastrukov.
-
-2002-04-02  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * pt.po: Updated Portuguese translation.
-
-2002-03-31  Abel Cheung  <maddog@linux.org.hk>
-
-	* .cvsignore: Added file.
-	* POTFILES.in: Added missing popt files.
-
-2002-03-25  Duarte Loreto <happyguy_pt@hotmail.com>
-
-        * pt.po: Updated Portuguese translation. 
-
-2002-03-23  Hasbullah Bin Pit <sebol@ikhlas.com>
-
-	* ms.po: Updated Malay Translation.
-
-2002-03-15  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2002-03-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm?<3F>l) translation.
-	
-2002-03-06  Germ??n Poo-Caama?<3F>o <gpoo@ubiobio.cl>
-
-	* es.po: Fixed spanish translation encoding.
-
-2002-03-06  Germ??n Poo-Caama?<3F>o <gpoo@ubiobio.cl>
-
-	* es.po: Update spanish translation.
-
-2002-03-05  Matthias Warkus  <mawarkus@gnome.org>
-
-	* de.po: Fixed German translation.
-
-2002-03-01  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2002-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokm?<3F>l) translation.
-	
-2002-02-09  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: Updated traditional Chinese translation.
-
-2002-02-05  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_CN.GB2312.po -> zh_CN.po: Convert to UTF-8 encoding.
-
-2002-01-27  Christian Rose  <menthos@menthos.com>
-
-	* README.tools, update.pl, update.sh: Removed, they are
-	obsoleted by intltool.
-	* sv.po: Updated and converted to UTF-8.
-
-2002-01-25 Roy-Magne Mo <rmo@sunnmore.net>
-
-	* nn.po: Updated Norwegian (nynorsk) translation.
-
-2002-01-14 Hasbullah Bin Pit <sebol@ikhlas.com>
-
-	* ms.po: Added Malay Translation.
-
-2001-11-26  Abel Cheung  <maddog@linux.org.hk>
-
-	* stamp-cat-id: Removed, and add it to .cvsignore.
-
-2001-10-30  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2001-10-17  Carlos Perell?<3F> Mar?<3F>n <carlos@gnome-db.org>
-
-	* pt.po: Added by Duarte Loreto <happyguy_pt@hotmail.com>
-
-2001-09-16  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: Added traditoinal Chinese translation.
-
-2001-07-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nn.po: Added Norwegian (nynorsk) translation.
-	
-2001-03-25  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: %100'ification.
-
-2001-03-23  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Updated Turkish translation by G?<3F>rkem.
-
-2001-03-15  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2001-03-09  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* az.po: converted to 8bit encoding as requested for Gnome 1.4
-
-2001-02-25  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Updated Greek translation.
-
-2001-02-23  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Some more strings.
-
-2001-02-19  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Update of Greek translation.
-
-2001-02-15  Christian Meyer  <cm@ggtt.de>
-
-	* de.po: Some minor changes.
-
-2001-02-14  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation
-
-2001-02-14  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation from Marcel Telka <marcel@telka.sk>
-
-2001-02-13  Szabolcs Ban  <shooby@gnome.hu>
-
-	* hu.po: Updated Hungarian translation from Robert Vanyi
-
-2001-02-13  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Added Slovak translation from Marcel Telka <marcel@telka.sk>
-
-2001-02-13  Martin Baulig  <baulig@suse.de>
-
-	* fi.po: Reverted Jarkko Ranta's change; please do
-	not commit any compressed files in future.
-
-2001-02-10  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2001-02-09  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2001-02-08  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation by Pauli Virtanen
-
-2001-02-08  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2001-02-05  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2001-01-05  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* az.po: Added Azeri file
-	* ja.po: fixed a syntax error (missing %c )
-
-2000-10-15  Yukihiro Nakai  <nakai@gnome.gr.jp>
-
-	* ja.po: Update Japanese translation.
-
-2000-10-11  Yukihiro Nakai  <nakai@gnome.gr.jp>
-
-	* ja.po: Update Japanese translation.
-
-2000-09-19  Christian Meyer  <linux@chrisime.de>
-
-	* de.po: Minor fix.
-	
-2000-09-19  Christian Meyer  <linux@chrisime.de>
-
-	* de.po: Updated German translation.
-	
-2000-09-10  Christian Meyer  <linux@chrisime.de>
-
-	* de.po: Updated German translation.
-	* update.pl: Added update.pl from menesis.
-	* README.tools: Added text file.
-
-2000-08-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-06-25  Takayuki KUSANO  <AE5T-KSN@asahi-net.or.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2000-05-26  Yuri Syrota <rasta@renome.rovno.ua>
-
-	* uk.po: Updated Ukrainian translation.
-
-2000-05-20  Manuel de Vega Barreiro <barreiro@arrakis.es>
-
-	* es.po: Updated Spanish translation.
-
-2000-05-18  Martin Norb?<3F>ck  <d95mback@dtek.chalmers.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-05-18  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation.
-
-2000-05-17  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated translation.
-	
-2000-05-16  Kenneth Christiansen  <kenneth@gnome.org>
-
-        * POTFILES.in: New strings added
-
-2000-05-16  Kenneth Christiansen  <kenneth@gnome.org>
-
-        * da.po: New da translation
-	* update.sh: New update.sh script
-
-2000-05-16  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* *.po: Added and merged ca, el, ga, pt_BR, ru, uk and zh_CN
-		from HEAD branch
-
-2000-05-09  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* update.sh: Added update.sh script.
-
-2000-04-01  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation.
-
-1999-10-09  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Added Galician translation.
-
-1999-09-29  Kenneth ll?<3F>phaane Christiansen  <kenneth@ripen.dk>
-
-	* da.po: Updated.
-
-1999-09-27  Zbigniew Chyla  <chyla@alice.ci.pwr.wroc.pl>
-
-	* pl.po: Added translation.
-
-1999-09-22  Kjartan Maraas  <kmaraas@online.no>
-
-	* da.po: Added Danish translation from Kenneth
-	Christiansen <kenneth@ripen.dk>.
-
-1999-09-20  Vincent Renardias <vincent@ldsol.com>
-
-	* fr.po: 100% complete. removed ~40 old translations.
-
-1999-09-17  Zbigniew Chyla  <chyla@alice.ci.pwr.wroc.pl>
-
-	* pl.po: Added translation.
-
-1999-09-16  Tomas Ogren  <stric@ing.umu.se>
-
-	* sv.po: Synced
-
-1999-07-11  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated translation.
-	
-1999-07-11  Tomas Ogren  <stric@ing.umu.se>
-
-	* sv.po: New file
-
 1999-01-27  Kjartan Maraas  <kmaraas@fib.hl.no>

 	* no.po: Updated translation
--- a/po/LEEME.es
+++ b/po/LEEME.es
@@ -1,17 +1,17 @@
-[ This file explains why there is a incomplete es_ES.po in adition
+[ This file explains why there are various incomplete es_??.po in adition
  to the es.po; that is on purpose ]

-El archivo para el locale es_ES solo existe porque en este paises se usa
-una representaci<EFBFBD>n de los n<EFBFBD>meros diferente de la que se usa en los dem<EFBFBD>s
-paises de habla espa<EFBFBD>ola, en el continente americano usan el sistema
-anglosaj<EFBFBD>n, esdecir 1,000 en vez de 1.000 para 'mil' y como son m<EFBFBD>s los paises
-que usan el sistema anglosaj<EFBFBD>n se ha dejado esa representaci<EFBFBD>n en el es.po.
+Los diferentes archivos para las locales es_DO, es_GT, es_HN, es_MX, es_PA,
+es_PE y es_SV; solo existen porque en esos paises se usa una representaci<EFBFBD>n
+de los n<EFBFBD>meros diferente de la que se usa en los dem<EFBFBD>s paises de habla
+castellan (usan el sistema anglosaj<EFBFBD>n, esdecir 1,000 en vez de 1.000 para 
+'mil').

 Por ello solo es necesario traducir aquellas ocurrencias donde aparezcan
 n<EFBFBD>meros; no hace falta perder el tiempo traduciendo en doble lo dem<EFBFBD>s;
 el sistema de internacionalizaci<EFBFBD>n de GNU gettext es lo suficientemente
 inteligente como para buscar las traducciones en la locale 'es' cuando no
-las encuentra en una 'es_ES' m<EFBFBD>s espec<EFBFBD>fica.
+las encuentra en una 'es_XX' m<EFBFBD>s espec<EFBFBD>fica.

 Tambi<EFBFBD>n podriase crear un es_ES para traducir aquellos terminos que difieren
 en Espa<EFBFBD>a y Am<EFBFBD>rica (ej: computadora/ordenador, archivo/fichero, <EFBFBD>cono/icono),
@@ -23,7 +23,4 @@ dem
 Pablo Saratxaga
 <srtxg@chanae.alphanet.ch>

-Actualizado por
-Carlos Perell<EFBFBD> Mar<EFBFBD>n
-<carlos@gnome-db.org>

--- a/po/POTFILES.ignore
+++ b/po/POTFILES.ignore
@@ -1,6 +0,0 @@
-#Please remember + in front of the files that should be ignored
-#Please keep these files in alphabetic order
-
-#Shouldn't be translated according to Martin:
-+kernel/table20/unistd-i386.h
-+kernel/table21/unistd-i386.h
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,36 @@
-examples/smp.c
+sysdeps/names/cpu.c
+sysdeps/names/fsusage.c
+sysdeps/names/loadavg.c
+sysdeps/names/mem.c
+sysdeps/names/mountlist.c
+sysdeps/names/msg_limits.c
+sysdeps/names/prockernel.c
+sysdeps/names/proclist.c
+sysdeps/names/procmap.c
+sysdeps/names/procmem.c
+sysdeps/names/procsegment.c
+sysdeps/names/procsignal.c
+sysdeps/names/procstate.c
+sysdeps/names/proctime.c
+sysdeps/names/procuid.c
+sysdeps/names/sem_limits.c
+sysdeps/names/shm_limits.c
+sysdeps/names/swap.c
+sysdeps/names/sysdeps.c
+sysdeps/names/uptime.c
+support/easy-vsnprintf.c
+support/error.c
+support/error.h
+support/getopt.c
+lib/close.c
+lib/command.c
+lib/init.c
+lib/open.c
+lib/parameter.c
+lib/read.c
+lib/read_data.c
+lib/sysdeps.c
+lib/write.c
 include/glibtop/close.h
 include/glibtop/command.h
 include/glibtop/cpu.h
@@ -22,8 +54,8 @@ include/glibtop/procsignal.h
 include/glibtop/procstate.h
 include/glibtop/proctime.h
 include/glibtop/procuid.h
-include/glibtop/read_data.h
 include/glibtop/read.h
+include/glibtop/read_data.h
 include/glibtop/sem_limits.h
 include/glibtop/shm_limits.h
 include/glibtop/signal.h
@@ -36,42 +68,25 @@ include/glibtop/uptime.h
 include/glibtop/version.h
 include/glibtop/write.h
 include/glibtop/xmalloc.h
-lib/close.c
-lib/command.c
-lib/init.c
-lib/open.c
-lib/parameter.c
-lib/read.c
-lib/read_data.c
-lib/sysdeps.c
-lib/write.c
+src/inodedb/file_by_inode.c
+src/inodedb/mkinodedb.c
 src/daemon/gnuserv.c
 src/daemon/io.c
 src/daemon/main.c
 src/daemon/server.c
 src/daemon/slave.c
 src/daemon/version.c
-src/inodedb/file_by_inode2.c
-src/inodedb/mkinodedb2.c
-support/easy-vsnprintf.c
-support/error.c
-support/error.h
-support/getopt.c
-support/popt.c
-support/popthelp.c
 sysdeps/common/error.c
 sysdeps/common/fsusage.c
-sysdeps/common/fsusage.h
 sysdeps/common/gnuslib.c
 sysdeps/common/inodedb.c
 sysdeps/common/mountlist.c
-sysdeps/common/mountlist.h
 sysdeps/common/sysdeps_suid.c
 sysdeps/common/xmalloc.c
+sysdeps/common/fsusage.h
+sysdeps/common/mountlist.h
 sysdeps/linux/close.c
 sysdeps/linux/cpu.c
-sysdeps/linux/glibtop_machine.h
-sysdeps/linux/glibtop_server.h
 sysdeps/linux/loadavg.c
 sysdeps/linux/mem.c
 sysdeps/linux/msg_limits.c
@@ -91,28 +106,5 @@ sysdeps/linux/siglist.c
 sysdeps/linux/swap.c
 sysdeps/linux/sysinfo.c
 sysdeps/linux/uptime.c
-sysdeps/names/cpu.c
-sysdeps/names/fsusage.c
-sysdeps/names/loadavg.c
-sysdeps/names/mem.c
-sysdeps/names/mountlist.c
-sysdeps/names/msg_limits.c
-sysdeps/names/netload.c
-sysdeps/names/ppp.c
-sysdeps/names/procargs.c
-sysdeps/names/prockernel.c
-sysdeps/names/proclist.c
-sysdeps/names/procmap.c
-sysdeps/names/procmem.c
-sysdeps/names/procsegment.c
-sysdeps/names/procsignal.c
-sysdeps/names/procstate.c
-sysdeps/names/proctime.c
-sysdeps/names/procuid.c
-sysdeps/names/sem_limits.c
-sysdeps/names/shm_limits.c
-sysdeps/names/swap.c
-sysdeps/names/sysdeps.c
-sysdeps/names/uptime.c
-sysdeps/osf1/siglist.c
-sysdeps/sun4/siglist.c
+sysdeps/linux/glibtop_machine.h
+sysdeps/linux/glibtop_server.h
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/az.po
+++ b/po/az.po
--- a/po/be.po
+++ b/po/be.po
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/es_DO.po
+++ b/po/es_DO.po
@@ -1,223 +1,18 @@
-# Spain diffs with es.po for libgtop
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# Carlos Perelló Marín <carlos@gnome-db.org>, 2002.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: glibtop 1.90.2\n"
-"POT-Creation-Date: 2002-05-28 15:54+0200\n"
-"PO-Revision-Date: 2002-05-28 15:50+0200\n"
-"Last-Translator: Carlos Perelló Marín <carlos@gnome-db.org>\n"
-"Language-Team: Spanish <traductores@es.gnome.org>\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 1999-03-01 22:58+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: examples/smp.c:68
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Total"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/mem.c:47
-msgid "User"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Sys"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Idle"
-msgstr ""
-
-#: examples/smp.c:73
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:77
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr ""
-
-#: examples/smp.c:94
-msgid "Percent:"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Total (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "User (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Nice (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Sys (%)"
-msgstr ""
-
-#: examples/smp.c:96
-msgid "Idle (%)"
-msgstr ""
-
-#: examples/smp.c:98
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:114
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr ""
-
-#: examples/smp.c:120
-msgid "Spin:"
-msgstr ""
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr ""
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr ""
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr ""
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr ""
-
-#: src/daemon/gnuserv.c:488
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr ""
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:807 support/getopt.c:937
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/popthelp.c:35
-msgid "Show this help message"
-msgstr ""
-
-#: support/popthelp.c:36
-msgid "Display brief usage message"
-msgstr ""
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"

 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -367,6 +162,10 @@ msgstr ""
 msgid "Cached"
 msgstr ""

+#: sysdeps/names/mem.c:47
+msgid "User"
+msgstr ""
+
 #: sysdeps/names/mem.c:48
 msgid "Locked"
 msgstr ""
@@ -449,94 +248,6 @@ msgstr ""
 msgid "Number of system message headers"
 msgstr ""

-#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
-msgid "Interface Flags"
-msgstr ""
-
-#: sysdeps/names/netload.c:46
-msgid "MTU"
-msgstr ""
-
-#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
-msgid "Subnet"
-msgstr ""
-
-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Address"
-msgstr ""
-
-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Packets In"
-msgstr ""
-
-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-msgid "Packets Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
-msgid "Packets Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
-msgid "Bytes In"
-msgstr ""
-
-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
-msgid "Bytes Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
-msgid "Bytes Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-msgid "Errors In"
-msgstr ""
-
-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-msgid "Errors Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-msgid "Errors Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-msgid "Collisions"
-msgstr ""
-
-#: sysdeps/names/netload.c:64
-msgid "Maximum Transfer Unit"
-msgstr ""
-
-#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-msgid "PPP State"
-msgstr ""
-
-#: sysdeps/names/ppp.c:39
-msgid "Input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:40
-msgid "Output bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:46
-msgid "Number of input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:47
-msgid "Number of output bytes"
-msgstr ""
-
-#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr ""
-
-#: sysdeps/names/procargs.c:43
-msgid "Length in bytes of the returned string."
-msgstr ""
-
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
 msgstr ""
@@ -636,6 +347,10 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr ""

+#: sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr ""
+
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr ""
@@ -665,7 +380,7 @@ msgid "Number of pages of virtual memory"
 msgstr ""

 #: sysdeps/names/procmem.c:55
-msgid "Number of resident set (non-swapped) pages"
+msgid "Number of residnet set (non-swapped) pages"
 msgstr ""

 #: sysdeps/names/procmem.c:56
@@ -681,11 +396,11 @@ msgid ""
 msgstr ""

 #
-# In México, Dominican Republic, Guatemala, Honduras, Panama, Peru
+# In México, Dominican Republic, Guatemala, Honduras, Panama, Peru
 # and El Salvador, Number formats are the same as in the US, so no
-# translation is required for them (the use es.po string).
-# Spain use "." chars instead of "," so the msgstr MUST be filled; otherwise
-# it will default to es.po which uses the US format for numbers.
+# translation is required for them.
+# But the msgstr MUST be filled; otherwise it will default to es.po
+# which uses different, non US, format for numbers.
 # On the other hand, strings that are the same here and in es.po can
 # be left out.
 #
@@ -693,8 +408,8 @@ msgstr ""
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr ""
-"Límite actual en bytes de conjunto compartido (RSS) del proceso "
-"(habitualmente 2.147.483.647)."
+"Limite actual en bytes de conjunto compartido (RSS) del proceso "
+"(habitualmente 2,147,483,647)."

 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
@@ -958,6 +673,10 @@ msgstr ""
 msgid "Priority"
 msgstr ""

+#: sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr ""
+
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
 msgstr ""
@@ -1210,126 +929,123 @@ msgstr ""
 msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr ""

-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
-msgid "Hangup"
+#: support/error.c:109
+msgid "Unknown system error"
 msgstr ""

-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
-msgid "Interrupt"
+#: support/getopt.c:669
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
-msgid "Quit"
+#: support/getopt.c:693
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
-msgid "Illegal instruction"
+#: support/getopt.c:698
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
-msgid "Trace trap"
+#: support/getopt.c:715 support/getopt.c:888
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
-msgid "Abort"
+#. --option
+#: support/getopt.c:744
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
-msgid "EMT error"
+#. +option or -option
+#: support/getopt.c:748
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
-msgid "Floating-point exception"
+#. 1003.2 specifies the format of this message.
+#: support/getopt.c:774
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
-msgid "Kill"
+#: support/getopt.c:777
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
-msgid "Bus error"
+#. 1003.2 specifies the format of this message.
+#: support/getopt.c:807 support/getopt.c:937
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
-msgid "Segmentation violation"
+#: support/getopt.c:854
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
-msgid "Bad argument to system call"
+#: support/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
-msgid "Broken pipe"
+#: lib/read.c:71
+#, c-format
+msgid "read %d bytes"
 msgstr ""

-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
-msgid "Alarm clock"
+#: lib/read_data.c:49
+msgid "read data size"
 msgstr ""

-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
-msgid "Termination"
+#: lib/read_data.c:66
+#, c-format
+msgid "read data %d bytes"
 msgstr ""

-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
-msgid "Urgent condition on socket"
+#: lib/write.c:48
+#, c-format
+msgid "write %d bytes"
 msgstr ""

-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
-msgid "Stop"
+#: src/daemon/gnuserv.c:445
+msgid "Enable debugging"
 msgstr ""

-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
-msgid "Keyboard stop"
+#: src/daemon/gnuserv.c:445
+msgid "DEBUG"
 msgstr ""

-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
-msgid "Continue"
+#: src/daemon/gnuserv.c:447
+msgid "Enable verbose output"
 msgstr ""

-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
-msgid "Child status has changed"
+#: src/daemon/gnuserv.c:447
+msgid "VERBOSE"
 msgstr ""

-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
-msgid "Background read from tty"
+#: src/daemon/gnuserv.c:449
+msgid "Don't fork into background"
 msgstr ""

-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
-msgid "Background write to tty"
+#: src/daemon/gnuserv.c:449
+msgid "NO-DAEMON"
 msgstr ""

-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
-msgid "I/O now possible"
+#: src/daemon/gnuserv.c:451
+msgid "Invoked from inetd"
 msgstr ""

-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
-msgid "CPU limit exceeded"
+#: src/daemon/gnuserv.c:451
+msgid "INETD"
 msgstr ""

-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
-msgid "File size limit exceeded"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
-msgid "Virtual alarm clock"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
-msgid "Profiling alarm clock"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
-msgid "Window size change"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-msgid "Information request"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-msgid "User defined signal 1"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-msgid "User defined signal 2"
+#: src/daemon/gnuserv.c:485
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
--- a/po/es_GT.po
+++ b/po/es_GT.po
@@ -1,227 +1,18 @@
-# translation of mk.po to
-# translation of mk.po to Macedonian
-# translation of libgtop.libgtop-GNOME-2-0-port.po to Macedonian
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# Ivan Stojmirov <stojmir@linux.net.mk>, 2002,2003
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mk\n"
-"POT-Creation-Date: 2002-12-15 06:13+0100\n"
-"PO-Revision-Date: 2003-04-16 15:04+0200\n"
-"Last-Translator: Ivan Stojmirov <stojmir@linux.net.mk>\n"
-"Language-Team: Macedonian <gnomk-main@lists.sourceforge.net>\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 1999-03-01 22:58+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.1\n"
-
-#: examples/smp.c:68
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Total"
-msgstr "Вкупно"
-
-#: examples/smp.c:71 sysdeps/names/mem.c:47
-msgid "User"
-msgstr "Корисник"
-
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr "Убаво"
-
-#: examples/smp.c:71
-msgid "Sys"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Idle"
-msgstr "Без задача"
-
-#: examples/smp.c:73
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:77
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr ""
-
-#: examples/smp.c:94
-msgid "Percent:"
-msgstr "Проценти:"
-
-#: examples/smp.c:95
-msgid "Total (%)"
-msgstr "Вкупно (%)"
-
-#: examples/smp.c:95
-msgid "User (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Nice (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Sys (%)"
-msgstr ""
-
-#: examples/smp.c:96
-msgid "Idle (%)"
-msgstr ""
-
-#: examples/smp.c:98
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:114
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr ""
-
-#: examples/smp.c:120
-msgid "Spin:"
-msgstr ""
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr ""
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr ""
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr ""
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr ""
-
-#: src/daemon/gnuserv.c:488
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr ""
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:807 support/getopt.c:937
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/popthelp.c:35
-msgid "Show this help message"
-msgstr ""
-
-#: support/popthelp.c:36
-msgid "Display brief usage message"
-msgstr ""
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"

 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -349,19 +140,19 @@ msgstr ""

 #: sysdeps/names/mem.c:41
 msgid "Total Memory"
-msgstr "Вкупна меморија"
+msgstr ""

 #: sysdeps/names/mem.c:42
 msgid "Used Memory"
-msgstr "Искористена меморија"
+msgstr ""

 #: sysdeps/names/mem.c:43
 msgid "Free Memory"
-msgstr "Слободна меморија"
+msgstr ""

 #: sysdeps/names/mem.c:44
 msgid "Shared Memory"
-msgstr "Share-увана меморија"
+msgstr ""

 #: sysdeps/names/mem.c:45
 msgid "Buffers"
@@ -371,9 +162,13 @@ msgstr ""
 msgid "Cached"
 msgstr ""

+#: sysdeps/names/mem.c:47
+msgid "User"
+msgstr ""
+
 #: sysdeps/names/mem.c:48
 msgid "Locked"
-msgstr "Заклучено"
+msgstr ""

 #: sysdeps/names/mem.c:53
 msgid "Total physical memory in kB"
@@ -453,94 +248,6 @@ msgstr ""
 msgid "Number of system message headers"
 msgstr ""

-#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
-msgid "Interface Flags"
-msgstr ""
-
-#: sysdeps/names/netload.c:46
-msgid "MTU"
-msgstr ""
-
-#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
-msgid "Subnet"
-msgstr ""
-
-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Address"
-msgstr "Адреса"
-
-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Packets In"
-msgstr ""
-
-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-msgid "Packets Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
-msgid "Packets Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
-msgid "Bytes In"
-msgstr ""
-
-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
-msgid "Bytes Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
-msgid "Bytes Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-msgid "Errors In"
-msgstr ""
-
-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-msgid "Errors Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-msgid "Errors Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-msgid "Collisions"
-msgstr "Колизии"
-
-#: sysdeps/names/netload.c:64
-msgid "Maximum Transfer Unit"
-msgstr ""
-
-#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-msgid "PPP State"
-msgstr ""
-
-#: sysdeps/names/ppp.c:39
-msgid "Input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:40
-msgid "Output bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:46
-msgid "Number of input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:47
-msgid "Number of output bytes"
-msgstr ""
-
-#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr "Големина"
-
-#: sysdeps/names/procargs.c:43
-msgid "Length in bytes of the returned string."
-msgstr ""
-
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
 msgstr ""
@@ -640,6 +347,10 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr ""

+#: sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr ""
+
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr ""
@@ -650,7 +361,7 @@ msgstr ""

 #: sysdeps/names/procmem.c:47
 msgid "Share"
-msgstr "Заедничко"
+msgstr ""

 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size"
@@ -669,7 +380,7 @@ msgid "Number of pages of virtual memory"
 msgstr ""

 #: sysdeps/names/procmem.c:55
-msgid "Number of resident set (non-swapped) pages"
+msgid "Number of residnet set (non-swapped) pages"
 msgstr ""

 #: sysdeps/names/procmem.c:56
@@ -684,9 +395,21 @@ msgid ""
 "which are swapped out."
 msgstr ""

+#
+# In México, Dominican Republic, Guatemala, Honduras, Panama, Peru
+# and El Salvador, Number formats are the same as in the US, so no
+# translation is required for them.
+# But the msgstr MUST be filled; otherwise it will default to es.po
+# which uses different, non US, format for numbers.
+# On the other hand, strings that are the same here and in es.po can
+# be left out.
+#
 #: sysdeps/names/procmem.c:62
-msgid "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
+msgid ""
+"Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr ""
+"Limite actual en bytes de conjunto compartido (RSS) del proceso "
+"(habitualmente 2,147,483,647)."

 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
@@ -790,15 +513,15 @@ msgstr ""

 #: sysdeps/names/procstate.c:40
 msgid "State"
-msgstr "Состојба"
+msgstr ""

 #: sysdeps/names/procstate.c:40
 msgid "UID"
-msgstr "UID"
+msgstr ""

 #: sysdeps/names/procstate.c:40
 msgid "GID"
-msgstr "GID"
+msgstr ""

 #: sysdeps/names/procstate.c:45
 msgid "Basename of executable file in call to exec()"
@@ -850,7 +573,7 @@ msgstr ""

 #: sysdeps/names/proctime.c:46
 msgid "Frequency"
-msgstr "Фреквенција"
+msgstr ""

 #: sysdeps/names/proctime.c:46
 msgid "XCPU_UTime"
@@ -936,7 +659,7 @@ msgstr ""

 #: sysdeps/names/procuid.c:57
 msgid "Session"
-msgstr "Сесија"
+msgstr ""

 #: sysdeps/names/procuid.c:57
 msgid "Tty"
@@ -948,7 +671,11 @@ msgstr ""

 #: sysdeps/names/procuid.c:58
 msgid "Priority"
-msgstr "Приоритет"
+msgstr ""
+
+#: sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr ""

 #: sysdeps/names/procuid.c:63
 msgid "User ID"
@@ -1096,7 +823,7 @@ msgstr ""

 #: sysdeps/names/sysdeps.c:51 sysdeps/names/sysdeps.c:78
 msgid "Memory Usage"
-msgstr "Искористена меморија"
+msgstr ""

 #: sysdeps/names/sysdeps.c:52 sysdeps/names/sysdeps.c:79
 msgid "Swap Usage"
@@ -1188,7 +915,7 @@ msgstr ""

 #: sysdeps/names/uptime.c:38
 msgid "Uptime"
-msgstr "Време на Исправно Работење"
+msgstr ""

 #: sysdeps/names/uptime.c:39
 msgid "Idletime"
@@ -1202,127 +929,123 @@ msgstr ""
 msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr ""

-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
-msgid "Hangup"
+#: support/error.c:109
+msgid "Unknown system error"
 msgstr ""

-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
-msgid "Interrupt"
-msgstr "Прекин"
-
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
-msgid "Quit"
-msgstr "Напушти"
-
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
-msgid "Illegal instruction"
+#: support/getopt.c:669
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
-msgid "Trace trap"
+#: support/getopt.c:693
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
-msgid "Abort"
-msgstr "Прекини"
-
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
-msgid "EMT error"
+#: support/getopt.c:698
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
-msgid "Floating-point exception"
+#: support/getopt.c:715 support/getopt.c:888
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
-msgid "Kill"
+#. --option
+#: support/getopt.c:744
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
-msgid "Bus error"
+#. +option or -option
+#: support/getopt.c:748
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
-msgid "Segmentation violation"
+#. 1003.2 specifies the format of this message.
+#: support/getopt.c:774
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
-msgid "Bad argument to system call"
+#: support/getopt.c:777
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
-msgid "Broken pipe"
+#. 1003.2 specifies the format of this message.
+#: support/getopt.c:807 support/getopt.c:937
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
-msgid "Alarm clock"
+#: support/getopt.c:854
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
-msgid "Termination"
+#: support/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
-msgid "Urgent condition on socket"
+#: lib/read.c:71
+#, c-format
+msgid "read %d bytes"
 msgstr ""

-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
-msgid "Stop"
-msgstr "Стоп"
-
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
-msgid "Keyboard stop"
+#: lib/read_data.c:49
+msgid "read data size"
 msgstr ""

-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
-msgid "Continue"
-msgstr "Продолжи"
-
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
-msgid "Child status has changed"
+#: lib/read_data.c:66
+#, c-format
+msgid "read data %d bytes"
 msgstr ""

-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
-msgid "Background read from tty"
+#: lib/write.c:48
+#, c-format
+msgid "write %d bytes"
 msgstr ""

-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
-msgid "Background write to tty"
+#: src/daemon/gnuserv.c:445
+msgid "Enable debugging"
 msgstr ""

-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
-msgid "I/O now possible"
+#: src/daemon/gnuserv.c:445
+msgid "DEBUG"
 msgstr ""

-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
-msgid "CPU limit exceeded"
+#: src/daemon/gnuserv.c:447
+msgid "Enable verbose output"
 msgstr ""

-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
-msgid "File size limit exceeded"
+#: src/daemon/gnuserv.c:447
+msgid "VERBOSE"
 msgstr ""

-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
-msgid "Virtual alarm clock"
+#: src/daemon/gnuserv.c:449
+msgid "Don't fork into background"
 msgstr ""

-#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
-msgid "Profiling alarm clock"
+#: src/daemon/gnuserv.c:449
+msgid "NO-DAEMON"
 msgstr ""

-#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
-msgid "Window size change"
+#: src/daemon/gnuserv.c:451
+msgid "Invoked from inetd"
 msgstr ""

-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-msgid "Information request"
+#: src/daemon/gnuserv.c:451
+msgid "INETD"
 msgstr ""

-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-msgid "User defined signal 1"
+#: src/daemon/gnuserv.c:485
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-msgid "User defined signal 2"
-msgstr ""
-
--- a/po/es_HN.po
+++ b/po/es_HN.po
@@ -1,229 +1,18 @@
-# Translations into the Amharic Language.
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libgtop package.
-# Ge'ez Frontier Foundation <locales@geez.org>, 2002.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop VERSION\n"
-"POT-Creation-Date: 2003-01-16 08:20+0100\n"
-"PO-Revision-Date: 2003-01-16 08:39+EDT\n"
-"Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
-"Language-Team: Amharic <locales@geez.org>\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 1999-03-01 22:58+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: examples/smp.c:71
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr ""
-
-#: examples/smp.c:74
-msgid "Total"
-msgstr "አጠቃላይ"
-
-#: examples/smp.c:74 sysdeps/names/mem.c:47
-msgid "User"
-msgstr "ተጠቃሚ"
-
-#: examples/smp.c:74 sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr ""
-
-#: examples/smp.c:74
-msgid "Sys"
-msgstr ""
-
-#: examples/smp.c:74
-msgid "Idle"
-msgstr ""
-
-#: examples/smp.c:76
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-"ሲፒዩ          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-
-#: examples/smp.c:80
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr "ሲፒዩ %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-
-#: examples/smp.c:97
-msgid "Percent:"
-msgstr "መቶኛ፦"
-
-#: examples/smp.c:98
-msgid "Total (%)"
-msgstr "አጠቃላይ (%)"
-
-#: examples/smp.c:98
-msgid "User (%)"
-msgstr "ተጠቃሚ (%)"
-
-#: examples/smp.c:98
-msgid "Nice (%)"
-msgstr ""
-
-#: examples/smp.c:98
-msgid "Sys (%)"
-msgstr ""
-
-#: examples/smp.c:99
-msgid "Idle (%)"
-msgstr ""
-
-#: examples/smp.c:101
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-msgstr ""
-"ሲፒዩ          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-
-#: examples/smp.c:117
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr "ሲፒዩ %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-
-#: examples/smp.c:123
-msgid "Spin:"
-msgstr ""
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr ""
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr ""
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr ""
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr "አስተካክል"
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr ""
-
-#: src/daemon/gnuserv.c:488
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr ""
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:807 support/getopt.c:937
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/popthelp.c:35
-msgid "Show this help message"
-msgstr ""
-
-#: support/popthelp.c:36
-msgid "Display brief usage message"
-msgstr ""
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"

 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -373,6 +162,10 @@ msgstr ""
 msgid "Cached"
 msgstr ""

+#: sysdeps/names/mem.c:47
+msgid "User"
+msgstr ""
+
 #: sysdeps/names/mem.c:48
 msgid "Locked"
 msgstr ""
@@ -455,94 +248,6 @@ msgstr ""
 msgid "Number of system message headers"
 msgstr ""

-#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
-msgid "Interface Flags"
-msgstr ""
-
-#: sysdeps/names/netload.c:46
-msgid "MTU"
-msgstr "MTU"
-
-#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
-msgid "Subnet"
-msgstr ""
-
-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Address"
-msgstr "አድራሻ"
-
-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Packets In"
-msgstr ""
-
-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-msgid "Packets Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
-msgid "Packets Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
-msgid "Bytes In"
-msgstr ""
-
-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
-msgid "Bytes Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
-msgid "Bytes Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-msgid "Errors In"
-msgstr ""
-
-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-msgid "Errors Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-msgid "Errors Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-msgid "Collisions"
-msgstr ""
-
-#: sysdeps/names/netload.c:64
-msgid "Maximum Transfer Unit"
-msgstr ""
-
-#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-msgid "PPP State"
-msgstr ""
-
-#: sysdeps/names/ppp.c:39
-msgid "Input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:40
-msgid "Output bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:46
-msgid "Number of input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:47
-msgid "Number of output bytes"
-msgstr ""
-
-#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr "መጠን"
-
-#: sysdeps/names/procargs.c:43
-msgid "Length in bytes of the returned string."
-msgstr ""
-
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
 msgstr ""
@@ -642,6 +347,10 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr ""

+#: sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr ""
+
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr ""
@@ -671,7 +380,7 @@ msgid "Number of pages of virtual memory"
 msgstr ""

 #: sysdeps/names/procmem.c:55
-msgid "Number of resident set (non-swapped) pages"
+msgid "Number of residnet set (non-swapped) pages"
 msgstr ""

 #: sysdeps/names/procmem.c:56
@@ -686,26 +395,37 @@ msgid ""
 "which are swapped out."
 msgstr ""

+#
+# In México, Dominican Republic, Guatemala, Honduras, Panama, Peru
+# and El Salvador, Number formats are the same as in the US, so no
+# translation is required for them.
+# But the msgstr MUST be filled; otherwise it will default to es.po
+# which uses different, non US, format for numbers.
+# On the other hand, strings that are the same here and in es.po can
+# be left out.
+#
 #: sysdeps/names/procmem.c:62
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr ""
+"Limite actual en bytes de conjunto compartido (RSS) del proceso "
+"(habitualmente 2,147,483,647)."

 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
-msgstr "Text_RSS"
+msgstr ""

 #: sysdeps/names/procsegment.c:42
 msgid "ShLib_RSS"
-msgstr "ShLib_RSS"
+msgstr ""

 #: sysdeps/names/procsegment.c:42
 msgid "Data_RSS"
-msgstr "Data_RSS"
+msgstr ""

 #: sysdeps/names/procsegment.c:42
 msgid "Stack_RSS"
-msgstr "Stack_RSS"
+msgstr ""

 #: sysdeps/names/procsegment.c:43
 msgid "Dirty Size"
@@ -713,15 +433,15 @@ msgstr ""

 #: sysdeps/names/procsegment.c:43
 msgid "Start_Code"
-msgstr "Start_Code"
+msgstr ""

 #: sysdeps/names/procsegment.c:43
 msgid "End_Code"
-msgstr "End_Code"
+msgstr ""

 #: sysdeps/names/procsegment.c:43
 msgid "Start_Stack"
-msgstr "Start_Stack"
+msgstr ""

 #: sysdeps/names/procsegment.c:48
 msgid "Text resident set size"
@@ -757,7 +477,7 @@ msgstr ""

 #: sysdeps/names/procsignal.c:40
 msgid "Signal"
-msgstr "ሲግናል"
+msgstr ""

 #: sysdeps/names/procsignal.c:40
 msgid "Blocked"
@@ -765,11 +485,11 @@ msgstr ""

 #: sysdeps/names/procsignal.c:40
 msgid "SigIgnore"
-msgstr "SigIgnore"
+msgstr ""

 #: sysdeps/names/procsignal.c:40
 msgid "SigCatch"
-msgstr "SigCatch"
+msgstr ""

 #: sysdeps/names/procsignal.c:45
 msgid "Mask of pending signals"
@@ -789,19 +509,19 @@ msgstr ""

 #: sysdeps/names/procstate.c:40
 msgid "Cmd"
-msgstr "Cmd"
+msgstr ""

 #: sysdeps/names/procstate.c:40
 msgid "State"
-msgstr "ሁኔታ"
+msgstr ""

 #: sysdeps/names/procstate.c:40
 msgid "UID"
-msgstr "UID"
+msgstr ""

 #: sysdeps/names/procstate.c:40
 msgid "GID"
-msgstr "GID"
+msgstr ""

 #: sysdeps/names/procstate.c:45
 msgid "Basename of executable file in call to exec()"
@@ -813,43 +533,43 @@ msgstr ""

 #: sysdeps/names/procstate.c:47
 msgid "UID of process"
-msgstr "የሂደት UID"
+msgstr ""

 #: sysdeps/names/procstate.c:48
 msgid "GID of process"
-msgstr "የሂደት GID"
+msgstr ""

 #: sysdeps/names/proctime.c:44
 msgid "Start_Time"
-msgstr "Start_Time"
+msgstr ""

 #: sysdeps/names/proctime.c:44
 msgid "RTime"
-msgstr "Rሰዓት"
+msgstr ""

 #: sysdeps/names/proctime.c:44
 msgid "UTime"
-msgstr "Uሰዓት"
+msgstr ""

 #: sysdeps/names/proctime.c:44
 msgid "STime"
-msgstr "Sሰዓት"
+msgstr ""

 #: sysdeps/names/proctime.c:45
 msgid "CUTime"
-msgstr "CUሰዓት"
+msgstr ""

 #: sysdeps/names/proctime.c:45
 msgid "CSTime"
-msgstr "CSሰዓት"
+msgstr ""

 #: sysdeps/names/proctime.c:45
 msgid "TimeOut"
-msgstr "TimeOut"
+msgstr ""

 #: sysdeps/names/proctime.c:45
 msgid "It_Real_Value"
-msgstr "It_Real_Value"
+msgstr ""

 #: sysdeps/names/proctime.c:46
 msgid "Frequency"
@@ -857,11 +577,11 @@ msgstr ""

 #: sysdeps/names/proctime.c:46
 msgid "XCPU_UTime"
-msgstr "XCPU_UTime"
+msgstr ""

 #: sysdeps/names/proctime.c:46
 msgid "XCPU_STime"
-msgstr "XCPU_STime"
+msgstr ""

 #: sysdeps/names/proctime.c:51
 msgid "Start time of process in seconds since the epoch"
@@ -911,51 +631,55 @@ msgstr ""

 #: sysdeps/names/procuid.c:56
 msgid "Uid"
-msgstr "Uid"
+msgstr ""

 #: sysdeps/names/procuid.c:56
 msgid "EUid"
-msgstr "EUid"
+msgstr ""

 #: sysdeps/names/procuid.c:56
 msgid "Gid"
-msgstr "Gid"
+msgstr ""

 #: sysdeps/names/procuid.c:56
 msgid "EGid"
-msgstr "EGid"
+msgstr ""

 #: sysdeps/names/procuid.c:56
 msgid "Pid"
-msgstr "Pid"
+msgstr ""

 #: sysdeps/names/procuid.c:57
 msgid "PPid"
-msgstr "PPid"
+msgstr ""

 #: sysdeps/names/procuid.c:57
 msgid "PGrp"
-msgstr "PGrp"
+msgstr ""

 #: sysdeps/names/procuid.c:57
 msgid "Session"
-msgstr "ክፍለ ጊዜ"
+msgstr ""

 #: sysdeps/names/procuid.c:57
 msgid "Tty"
-msgstr "Tty"
+msgstr ""

 #: sysdeps/names/procuid.c:58
 msgid "TPGid"
-msgstr "TPGid"
+msgstr ""

 #: sysdeps/names/procuid.c:58
 msgid "Priority"
-msgstr "ቅድሚያ"
+msgstr ""
+
+#: sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr ""

 #: sysdeps/names/procuid.c:63
 msgid "User ID"
-msgstr "የተጠቃሚው id"
+msgstr ""

 #: sysdeps/names/procuid.c:64
 msgid "Effective User ID"
@@ -963,7 +687,7 @@ msgstr ""

 #: sysdeps/names/procuid.c:65
 msgid "Group ID"
-msgstr "የመድረክ ID"
+msgstr ""

 #: sysdeps/names/procuid.c:66
 msgid "Effective Group ID"
@@ -971,7 +695,7 @@ msgstr ""

 #: sysdeps/names/procuid.c:67
 msgid "Process ID"
-msgstr "የሂደት ID"
+msgstr ""

 #: sysdeps/names/procuid.c:68
 msgid "PID of parent process"
@@ -979,11 +703,11 @@ msgstr ""

 #: sysdeps/names/procuid.c:69
 msgid "Process group ID"
-msgstr "የሂደት መድረክ ID"
+msgstr ""

 #: sysdeps/names/procuid.c:70
 msgid "Session ID"
-msgstr "የአሁኑን ክፍለ ID"
+msgstr ""

 #: sysdeps/names/procuid.c:71
 msgid "Full device number of controlling terminal"
@@ -1075,11 +799,11 @@ msgstr ""

 #: sysdeps/names/swap.c:42
 msgid "Page In"
-msgstr "የማስታወሻ ገጽ አስገባ"
+msgstr ""

 #: sysdeps/names/swap.c:43
 msgid "Page Out"
-msgstr "የማስታወሻ ገጽ ውጤት"
+msgstr ""

 #: sysdeps/names/swap.c:51
 msgid "Total number of swap pages that have been brought in since system boot"
@@ -1091,7 +815,7 @@ msgstr ""

 #: sysdeps/names/sysdeps.c:49 sysdeps/names/sysdeps.c:76
 msgid "Server Features"
-msgstr "የሰርቨር ምርጫዎች"
+msgstr ""

 #: sysdeps/names/sysdeps.c:50 sysdeps/names/sysdeps.c:77
 msgid "CPU Usage"
@@ -1179,7 +903,7 @@ msgstr ""

 #: sysdeps/names/sysdeps.c:71 sysdeps/names/sysdeps.c:98
 msgid "PPP Statistics"
-msgstr "የPPP ቍጥር መረጃ ጥናት"
+msgstr ""

 #: sysdeps/names/sysdeps.c:93
 msgid "Command line arguments of the process"
@@ -1205,126 +929,123 @@ msgstr ""
 msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr ""

-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
-msgid "Hangup"
+#: support/error.c:109
+msgid "Unknown system error"
 msgstr ""

-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
-msgid "Interrupt"
+#: support/getopt.c:669
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
-msgid "Quit"
-msgstr "ውጣ"
-
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
-msgid "Illegal instruction"
+#: support/getopt.c:693
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
-msgid "Trace trap"
+#: support/getopt.c:698
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
-msgid "Abort"
-msgstr "ውድቅ"
-
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
-msgid "EMT error"
-msgstr "የEMT ስህተት"
-
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
-msgid "Floating-point exception"
+#: support/getopt.c:715 support/getopt.c:888
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
-msgid "Kill"
-msgstr "አቋርጥ"
-
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
-msgid "Bus error"
-msgstr "የBus ስህተት"
-
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
-msgid "Segmentation violation"
+#. --option
+#: support/getopt.c:744
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
-msgid "Bad argument to system call"
+#. +option or -option
+#: support/getopt.c:748
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
-msgid "Broken pipe"
-msgstr "የተሰበረ መተላለፊያ"
-
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
-msgid "Alarm clock"
+#. 1003.2 specifies the format of this message.
+#: support/getopt.c:774
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
-msgid "Termination"
+#: support/getopt.c:777
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
-msgid "Urgent condition on socket"
+#. 1003.2 specifies the format of this message.
+#: support/getopt.c:807 support/getopt.c:937
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
-msgid "Stop"
-msgstr "አቁም"
-
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
-msgid "Keyboard stop"
+#: support/getopt.c:854
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
-msgid "Continue"
-msgstr "ቀጥል"
-
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
-msgid "Child status has changed"
+#: support/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
-msgid "Background read from tty"
+#: lib/read.c:71
+#, c-format
+msgid "read %d bytes"
 msgstr ""

-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
-msgid "Background write to tty"
+#: lib/read_data.c:49
+msgid "read data size"
 msgstr ""

-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
-msgid "I/O now possible"
+#: lib/read_data.c:66
+#, c-format
+msgid "read data %d bytes"
 msgstr ""

-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
-msgid "CPU limit exceeded"
+#: lib/write.c:48
+#, c-format
+msgid "write %d bytes"
 msgstr ""

-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
-msgid "File size limit exceeded"
+#: src/daemon/gnuserv.c:445
+msgid "Enable debugging"
 msgstr ""

-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
-msgid "Virtual alarm clock"
+#: src/daemon/gnuserv.c:445
+msgid "DEBUG"
 msgstr ""

-#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
-msgid "Profiling alarm clock"
+#: src/daemon/gnuserv.c:447
+msgid "Enable verbose output"
 msgstr ""

-#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
-msgid "Window size change"
+#: src/daemon/gnuserv.c:447
+msgid "VERBOSE"
 msgstr ""

-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-msgid "Information request"
+#: src/daemon/gnuserv.c:449
+msgid "Don't fork into background"
 msgstr ""

-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-msgid "User defined signal 1"
+#: src/daemon/gnuserv.c:449
+msgid "NO-DAEMON"
 msgstr ""

-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-msgid "User defined signal 2"
+#: src/daemon/gnuserv.c:451
+msgid "Invoked from inetd"
+msgstr ""
+
+#: src/daemon/gnuserv.c:451
+msgid "INETD"
+msgstr ""
+
+#: src/daemon/gnuserv.c:485
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -1,248 +1,38 @@
-# libgtop eesti tõlge.
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libgtop package.
-# Tõivo Leedjärv <toivo@linux.ee>, 2003.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop\n"
-"POT-Creation-Date: 2003-02-24 22:57+0200\n"
-"PO-Revision-Date: 2003-02-25 01:05+0200\n"
-"Last-Translator: Tõivo Leedjärv <toivo@linux.ee>\n"
-"Language-Team: Estonian <gnome-et@linux.ee>\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 1999-03-01 22:58+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: examples/smp.c:71
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr ""
-
-#: examples/smp.c:74
-msgid "Total"
-msgstr "Kokku"
-
-#: examples/smp.c:74 sysdeps/names/mem.c:47
-msgid "User"
-msgstr "Kasutaja"
-
-#: examples/smp.c:74 sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr ""
-
-#: examples/smp.c:74
-msgid "Sys"
-msgstr "Süsteem"
-
-#: examples/smp.c:74
-msgid "Idle"
-msgstr "Kasutamata"
-
-#: examples/smp.c:76
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-"Protsessor   (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-
-#: examples/smp.c:80
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr "Prots. %3d   (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-
-#: examples/smp.c:97
-msgid "Percent:"
-msgstr "Protsenti:"
-
-#: examples/smp.c:98
-msgid "Total (%)"
-msgstr "Kokku (%)"
-
-#: examples/smp.c:98
-msgid "User (%)"
-msgstr "Kasutaja (%)"
-
-#: examples/smp.c:98
-msgid "Nice (%)"
-msgstr ""
-
-#: examples/smp.c:98
-msgid "Sys (%)"
-msgstr "Süsteem (%)"
-
-#: examples/smp.c:99
-msgid "Idle (%)"
-msgstr "Kasutamata (%)"
-
-#: examples/smp.c:101
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-msgstr ""
-"Protsessor   (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-
-#: examples/smp.c:117
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr "Prots. %3d   (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-
-#: examples/smp.c:123
-msgid "Spin:"
-msgstr ""
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr ""
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr ""
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr ""
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr ""
-
-#: src/daemon/gnuserv.c:488
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr ""
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:807 support/getopt.c:937
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/popthelp.c:35
-msgid "Show this help message"
-msgstr ""
-
-#: support/popthelp.c:36
-msgid "Display brief usage message"
-msgstr ""
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"

 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
-msgstr "Protsessori aeg kokku"
+msgstr ""

 #: sysdeps/names/cpu.c:44
 msgid "CPU Time in User Mode"
-msgstr "Protsessori aeg kasutajale"
+msgstr ""

 #: sysdeps/names/cpu.c:45
 msgid "CPU Time in User Mode (nice)"
-msgstr "Protsessori aeg kasutajale (nice)"
+msgstr ""

 #: sysdeps/names/cpu.c:46
 msgid "CPU Time in System Mode"
-msgstr "Protsessori aeg süsteemile"
+msgstr ""

 #: sysdeps/names/cpu.c:47
 msgid "CPU Time in the Idle Task"
-msgstr "Protsessori aeg jõude"
+msgstr ""

 #: sysdeps/names/cpu.c:48
 msgid "Tick Frequency"
@@ -250,23 +40,23 @@ msgstr ""

 #: sysdeps/names/cpu.c:49
 msgid "SMP Total CPU Time"
-msgstr "SMP protsessori aeg kokku"
+msgstr ""

 #: sysdeps/names/cpu.c:50
 msgid "SMP CPU Time in User Mode"
-msgstr "SMP Protsessori aeg kasutajale"
+msgstr ""

 #: sysdeps/names/cpu.c:51
 msgid "SMP CPU Time in User Mode (nice)"
-msgstr "SMP Protsessori aeg kasutajale (nice)"
+msgstr ""

 #: sysdeps/names/cpu.c:52
 msgid "SMP CPU Time in System Mode"
-msgstr "SMP Protsessori aeg süsteemile"
+msgstr ""

 #: sysdeps/names/cpu.c:53
 msgid "SMP CPU Time in the Idle Task"
-msgstr "SMP Protsessori aeg jõude"
+msgstr ""

 #: sysdeps/names/cpu.c:58 sysdeps/names/cpu.c:64
 msgid "Number of clock ticks since system boot"
@@ -294,35 +84,35 @@ msgstr ""

 #: sysdeps/names/fsusage.c:39 sysdeps/names/fsusage.c:48
 msgid "Total blocks"
-msgstr "Blokke kokku"
+msgstr ""

 #: sysdeps/names/fsusage.c:40
 msgid "Free blocks"
-msgstr "Blokke vaba"
+msgstr ""

 #: sysdeps/names/fsusage.c:41
 msgid "Available blocks"
-msgstr "Saadaval blokke"
+msgstr ""

 #: sysdeps/names/fsusage.c:42 sysdeps/names/fsusage.c:51
 msgid "Total file nodes"
-msgstr "Failisõlmi kokku"
+msgstr ""

 #: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
 msgid "Free file nodes"
-msgstr "Failisõlmi vaba"
+msgstr ""

 #: sysdeps/names/fsusage.c:49
 msgid "Free blocks available to the superuser"
-msgstr "Vabu blokke saadaval juurkasutajale"
+msgstr ""

 #: sysdeps/names/fsusage.c:50
 msgid "Free blocks available to non-superusers"
-msgstr "Vabu blokke saadaval tavakasutajatele"
+msgstr ""

 #: sysdeps/names/loadavg.c:39
 msgid "Load Average"
-msgstr "Keskmine koormus"
+msgstr ""

 #: sysdeps/names/loadavg.c:40
 msgid "Running Tasks"
@@ -350,55 +140,59 @@ msgstr ""

 #: sysdeps/names/mem.c:41
 msgid "Total Memory"
-msgstr "Mälu kokku"
+msgstr ""

 #: sysdeps/names/mem.c:42
 msgid "Used Memory"
-msgstr "Kasutatud mälu"
+msgstr ""

 #: sysdeps/names/mem.c:43
 msgid "Free Memory"
-msgstr "Vaba mälu"
+msgstr ""

 #: sysdeps/names/mem.c:44
 msgid "Shared Memory"
-msgstr "Jagatud mälu"
+msgstr ""

 #: sysdeps/names/mem.c:45
 msgid "Buffers"
-msgstr "Puhvrid"
+msgstr ""

 #: sysdeps/names/mem.c:46
 msgid "Cached"
-msgstr "Puhverdatud"
+msgstr ""
+
+#: sysdeps/names/mem.c:47
+msgid "User"
+msgstr ""

 #: sysdeps/names/mem.c:48
-msgid "Lukustatud"
+msgid "Locked"
 msgstr ""

 #: sysdeps/names/mem.c:53
 msgid "Total physical memory in kB"
-msgstr "Kokku füüsilist mälu kB"
+msgstr ""

 #: sysdeps/names/mem.c:54
 msgid "Used memory size in kB"
-msgstr "Kasutatud mälu kB"
+msgstr ""

 #: sysdeps/names/mem.c:55
 msgid "Free memory size in kB"
-msgstr "Vaba mälu kB"
+msgstr ""

 #: sysdeps/names/mem.c:56
 msgid "Shared memory size in kB"
-msgstr "Jagatud mälu kB"
+msgstr ""

 #: sysdeps/names/mem.c:57
 msgid "Size of buffers kB"
-msgstr "Puhvrite suurus kB"
+msgstr ""

 #: sysdeps/names/mem.c:58
 msgid "Size of cached memory in kB"
-msgstr "Puhverdatud mälu kB"
+msgstr ""

 #: sysdeps/names/mem.c:59
 msgid "Memory used from user processes in kB"
@@ -454,94 +248,6 @@ msgstr ""
 msgid "Number of system message headers"
 msgstr ""

-#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
-msgid "Interface Flags"
-msgstr ""
-
-#: sysdeps/names/netload.c:46
-msgid "MTU"
-msgstr ""
-
-#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
-msgid "Subnet"
-msgstr "Alamvõrk"
-
-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Address"
-msgstr "Aadress"
-
-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Packets In"
-msgstr "Pakette sisse"
-
-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-msgid "Packets Out"
-msgstr "Pakette välja"
-
-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
-msgid "Packets Total"
-msgstr "Kokku pakette"
-
-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
-msgid "Bytes In"
-msgstr "Baite sisse"
-
-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
-msgid "Bytes Out"
-msgstr "Baite välja"
-
-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
-msgid "Bytes Total"
-msgstr "Kokku baite"
-
-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-msgid "Errors In"
-msgstr "Vigu sisse"
-
-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-msgid "Errors Out"
-msgstr "Vigu välja"
-
-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-msgid "Errors Total"
-msgstr "Kokku vigu"
-
-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-msgid "Collisions"
-msgstr "Põrkumisi"
-
-#: sysdeps/names/netload.c:64
-msgid "Maximum Transfer Unit"
-msgstr ""
-
-#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-msgid "PPP State"
-msgstr ""
-
-#: sysdeps/names/ppp.c:39
-msgid "Input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:40
-msgid "Output bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:46
-msgid "Number of input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:47
-msgid "Number of output bytes"
-msgstr ""
-
-#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr ""
-
-#: sysdeps/names/procargs.c:43
-msgid "Length in bytes of the returned string."
-msgstr ""
-
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
 msgstr ""
@@ -641,6 +347,10 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr ""

+#: sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr ""
+
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr ""
@@ -670,7 +380,7 @@ msgid "Number of pages of virtual memory"
 msgstr ""

 #: sysdeps/names/procmem.c:55
-msgid "Number of resident set (non-swapped) pages"
+msgid "Number of residnet set (non-swapped) pages"
 msgstr ""

 #: sysdeps/names/procmem.c:56
@@ -685,10 +395,21 @@ msgid ""
 "which are swapped out."
 msgstr ""

+#
+# In México, Dominican Republic, Guatemala, Honduras, Panama, Peru
+# and El Salvador, Number formats are the same as in the US, so no
+# translation is required for them.
+# But the msgstr MUST be filled; otherwise it will default to es.po
+# which uses different, non US, format for numbers.
+# On the other hand, strings that are the same here and in es.po can
+# be left out.
+#
 #: sysdeps/names/procmem.c:62
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr ""
+"Limite actual en bytes de conjunto compartido (RSS) del proceso "
+"(habitualmente 2,147,483,647)."

 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
@@ -952,6 +673,10 @@ msgstr ""
 msgid "Priority"
 msgstr ""

+#: sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr ""
+
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
 msgstr ""
@@ -1094,23 +819,23 @@ msgstr ""

 #: sysdeps/names/sysdeps.c:50 sysdeps/names/sysdeps.c:77
 msgid "CPU Usage"
-msgstr "Protsessori koormus"
+msgstr ""

 #: sysdeps/names/sysdeps.c:51 sysdeps/names/sysdeps.c:78
 msgid "Memory Usage"
-msgstr "Mälukasutus"
+msgstr ""

 #: sysdeps/names/sysdeps.c:52 sysdeps/names/sysdeps.c:79
 msgid "Swap Usage"
-msgstr "Saale kasutus"
+msgstr ""

 #: sysdeps/names/sysdeps.c:53 sysdeps/names/sysdeps.c:80
 msgid "System Uptime"
-msgstr "Süsteemi tööaeg"
+msgstr ""

 #: sysdeps/names/sysdeps.c:54 sysdeps/names/sysdeps.c:81
 msgid "Load Averange"
-msgstr "Keskmine koormus"
+msgstr ""

 #: sysdeps/names/sysdeps.c:55 sysdeps/names/sysdeps.c:82
 msgid "Shared Memory Limits"
@@ -1170,11 +895,11 @@ msgstr ""

 #: sysdeps/names/sysdeps.c:69 sysdeps/names/sysdeps.c:96
 msgid "File System Usage"
-msgstr "Failisüsteemide kasutus"
+msgstr ""

 #: sysdeps/names/sysdeps.c:70 sysdeps/names/sysdeps.c:97
 msgid "Network Load"
-msgstr "Võrgu koormus"
+msgstr ""

 #: sysdeps/names/sysdeps.c:71 sysdeps/names/sysdeps.c:98
 msgid "PPP Statistics"
@@ -1190,140 +915,137 @@ msgstr ""

 #: sysdeps/names/uptime.c:38
 msgid "Uptime"
-msgstr "Tööaeg"
+msgstr ""

 #: sysdeps/names/uptime.c:39
 msgid "Idletime"
-msgstr "Puhkeaeg"
+msgstr ""

 #: sysdeps/names/uptime.c:44
 msgid "Time in seconds since system boot"
-msgstr "Aega süsteemi käivitamisest (sekundites)"
+msgstr ""

 #: sysdeps/names/uptime.c:45
 msgid "Time in seconds the system spent in the idle task since system boot"
-msgstr "Kui kaua on protsessor käivitamisest alates jõude seisnud (sekundites)"
-
-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
-msgid "Hangup"
 msgstr ""

-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
-msgid "Interrupt"
+#: support/error.c:109
+msgid "Unknown system error"
 msgstr ""

-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
-msgid "Quit"
+#: support/getopt.c:669
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
-msgid "Illegal instruction"
+#: support/getopt.c:693
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
-msgid "Trace trap"
+#: support/getopt.c:698
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
-msgid "Abort"
+#: support/getopt.c:715 support/getopt.c:888
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
-msgid "EMT error"
+#. --option
+#: support/getopt.c:744
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
-msgid "Floating-point exception"
+#. +option or -option
+#: support/getopt.c:748
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
-msgid "Kill"
+#. 1003.2 specifies the format of this message.
+#: support/getopt.c:774
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
-msgid "Bus error"
+#: support/getopt.c:777
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
-msgid "Segmentation violation"
+#. 1003.2 specifies the format of this message.
+#: support/getopt.c:807 support/getopt.c:937
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
-msgid "Bad argument to system call"
+#: support/getopt.c:854
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
-msgid "Broken pipe"
+#: support/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""

-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
-msgid "Alarm clock"
+#: lib/read.c:71
+#, c-format
+msgid "read %d bytes"
 msgstr ""

-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
-msgid "Termination"
+#: lib/read_data.c:49
+msgid "read data size"
 msgstr ""

-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
-msgid "Urgent condition on socket"
+#: lib/read_data.c:66
+#, c-format
+msgid "read data %d bytes"
 msgstr ""

-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
-msgid "Stop"
+#: lib/write.c:48
+#, c-format
+msgid "write %d bytes"
 msgstr ""

-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
-msgid "Keyboard stop"
+#: src/daemon/gnuserv.c:445
+msgid "Enable debugging"
 msgstr ""

-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
-msgid "Continue"
+#: src/daemon/gnuserv.c:445
+msgid "DEBUG"
 msgstr ""

-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
-msgid "Child status has changed"
+#: src/daemon/gnuserv.c:447
+msgid "Enable verbose output"
 msgstr ""

-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
-msgid "Background read from tty"
+#: src/daemon/gnuserv.c:447
+msgid "VERBOSE"
 msgstr ""

-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
-msgid "Background write to tty"
+#: src/daemon/gnuserv.c:449
+msgid "Don't fork into background"
 msgstr ""

-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
-msgid "I/O now possible"
+#: src/daemon/gnuserv.c:449
+msgid "NO-DAEMON"
 msgstr ""

-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
-msgid "CPU limit exceeded"
+#: src/daemon/gnuserv.c:451
+msgid "Invoked from inetd"
 msgstr ""

-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
-msgid "File size limit exceeded"
+#: src/daemon/gnuserv.c:451
+msgid "INETD"
 msgstr ""

-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
-msgid "Virtual alarm clock"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
-msgid "Profiling alarm clock"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
-msgid "Window size change"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-msgid "Information request"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-msgid "User defined signal 1"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-msgid "User defined signal 2"
+#: src/daemon/gnuserv.c:485
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
--- a/po/es_PA.po
+++ b/po/es_PA.po
--- a/po/es_PE.po
+++ b/po/es_PE.po
--- a/po/es_SV.po
+++ b/po/es_SV.po
--- a/po/fa.po
+++ b/po/fa.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/ga.po
+++ b/po/ga.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/ko.po
+++ b/po/ko.po
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Martin Baulig	26b4615262	Importing initial version of my Solaris port.	1999-03-17 18:29:40 +00:00
Martin Baulig	c4ccf53aad	Initial revision	1999-03-17 18:29:40 +00:00
Martin Baulig	8fe9163e6b	Released the one and only final LibGTop 1.0.1.	1999-03-01 22:12:11 +00:00