Update libgtop to 1.0.13. Changes include:

	- a security fix we already had in patch-af
	- some additional localisations
	- moved header files to allow co-existence with GNOME2
	- some minor pkglint cleanups

6 files changed, 120 insertions, 127 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 7d6153f0066..e20d634ce3a 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.63 2002/10/21 14:59:59 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2002/11/04 00:48:32 rh Exp $
 
-DISTNAME=		libgtop-1.0.12
-PKGREVISION=		3
+DISTNAME=		libgtop-1.0.13
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtop/1.0/}
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.gnome.org/
 COMMENT=		library to retrieve system information, used in GNOME
 
-USE_BUILDLINK2=		yes
-USE_PERL5=		build
 BUILD_USES_MSGFMT=	yes
 
 NOT_FOR_PLATFORM=	SunOS-*-*
@@ -28,10 +27,12 @@ IGNORE+=		"(More information can be found in libgtop.info.)"
 .endif
 .endif
 
+USE_PERL5=		build
+USE_BUILDLINK2=		yes
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 # The following flags are for debugging purposes.  They don't need to
 # be used unless you are actively developing/debugging libgtop.
@@ -43,6 +44,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-glib-prefix=${BUILDLINK_PREFIX.glib} \
 			--with-catgets --with-libgtop-guile=no
 CONFIGURE_ENV+=		AWK="${AWK}" LN_S="${LN} -s" PERL="${PERL5}"
+CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../x11/gnome-libs/buildlink2.mk"
diff --git a/devel/libgtop/PLIST b/devel/libgtop/PLIST
index a392d3134e2..792c9bc46a5 100644
--- a/devel/libgtop/PLIST
+++ b/devel/libgtop/PLIST
@@ -1,51 +1,51 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/26 20:55:03 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/11/04 00:48:32 rh Exp $
 bin/libgtop-config
 bin/libgtop_daemon
 bin/libgtop_server
-include/glibtop.h
-include/glibtop/close.h
-include/glibtop/command.h
-include/glibtop/cpu.h
-include/glibtop/error.h
-include/glibtop/fsusage.h
-include/glibtop/global.h
-include/glibtop/gnuserv.h
-include/glibtop/inodedb.h
-include/glibtop/loadavg.h
-include/glibtop/mem.h
-include/glibtop/mountlist.h
-include/glibtop/msg_limits.h
-include/glibtop/netload.h
-include/glibtop/open.h
-include/glibtop/parameter.h
-include/glibtop/ppp.h
-include/glibtop/procargs.h
-include/glibtop/prockernel.h
-include/glibtop/proclist.h
-include/glibtop/procmap.h
-include/glibtop/procmem.h
-include/glibtop/procsegment.h
-include/glibtop/procsignal.h
-include/glibtop/procstate.h
-include/glibtop/proctime.h
-include/glibtop/procuid.h
-include/glibtop/read.h
-include/glibtop/read_data.h
-include/glibtop/sem_limits.h
-include/glibtop/shm_limits.h
-include/glibtop/signal.h
-include/glibtop/swap.h
-include/glibtop/sysdeps.h
-include/glibtop/sysinfo.h
-include/glibtop/types.h
-include/glibtop/union.h
-include/glibtop/uptime.h
-include/glibtop/version.h
-include/glibtop/write.h
-include/glibtop/xmalloc.h
-include/glibtop_machine.h
-include/glibtop_server.h
-include/glibtop_suid.h
+include/libgtop-1.0/glibtop.h
+include/libgtop-1.0/glibtop/close.h
+include/libgtop-1.0/glibtop/command.h
+include/libgtop-1.0/glibtop/cpu.h
+include/libgtop-1.0/glibtop/error.h
+include/libgtop-1.0/glibtop/fsusage.h
+include/libgtop-1.0/glibtop/global.h
+include/libgtop-1.0/glibtop/gnuserv.h
+include/libgtop-1.0/glibtop/inodedb.h
+include/libgtop-1.0/glibtop/loadavg.h
+include/libgtop-1.0/glibtop/mem.h
+include/libgtop-1.0/glibtop/mountlist.h
+include/libgtop-1.0/glibtop/msg_limits.h
+include/libgtop-1.0/glibtop/netload.h
+include/libgtop-1.0/glibtop/open.h
+include/libgtop-1.0/glibtop/parameter.h
+include/libgtop-1.0/glibtop/ppp.h
+include/libgtop-1.0/glibtop/procargs.h
+include/libgtop-1.0/glibtop/prockernel.h
+include/libgtop-1.0/glibtop/proclist.h
+include/libgtop-1.0/glibtop/procmap.h
+include/libgtop-1.0/glibtop/procmem.h
+include/libgtop-1.0/glibtop/procsegment.h
+include/libgtop-1.0/glibtop/procsignal.h
+include/libgtop-1.0/glibtop/procstate.h
+include/libgtop-1.0/glibtop/proctime.h
+include/libgtop-1.0/glibtop/procuid.h
+include/libgtop-1.0/glibtop/read.h
+include/libgtop-1.0/glibtop/read_data.h
+include/libgtop-1.0/glibtop/sem_limits.h
+include/libgtop-1.0/glibtop/shm_limits.h
+include/libgtop-1.0/glibtop/signal.h
+include/libgtop-1.0/glibtop/swap.h
+include/libgtop-1.0/glibtop/sysdeps.h
+include/libgtop-1.0/glibtop/sysinfo.h
+include/libgtop-1.0/glibtop/types.h
+include/libgtop-1.0/glibtop/union.h
+include/libgtop-1.0/glibtop/uptime.h
+include/libgtop-1.0/glibtop/version.h
+include/libgtop-1.0/glibtop/write.h
+include/libgtop-1.0/glibtop/xmalloc.h
+include/libgtop-1.0/glibtop_machine.h
+include/libgtop-1.0/glibtop_server.h
+include/libgtop-1.0/glibtop_suid.h
 @unexec ${INSTALL_INFO} --delete %D/info/libgtop.info %D/info/dir
 info/libgtop.info
 @exec ${INSTALL_INFO} %D/info/libgtop.info %D/info/dir
@@ -54,55 +54,65 @@ lib/libgtop.a
 lib/libgtop.la
 lib/libgtop.so
 lib/libgtop.so.1
-lib/libgtop.so.1.11
+lib/libgtop.so.1.12
 lib/libgtopConf.sh
 lib/libgtop_common.a
 lib/libgtop_common.la
 lib/libgtop_common.so
 lib/libgtop_common.so.1
-lib/libgtop_common.so.1.11
+lib/libgtop_common.so.1.12
 lib/libgtop_names.a
 lib/libgtop_names.la
 lib/libgtop_names.so
 lib/libgtop_names.so.1
-lib/libgtop_names.so.1.11
+lib/libgtop_names.so.1.12
 lib/libgtop_suid_common.a
 lib/libgtop_suid_common.la
 lib/libgtop_suid_common.so
 lib/libgtop_suid_common.so.1
-lib/libgtop_suid_common.so.1.11
+lib/libgtop_suid_common.so.1.12
 lib/libgtop_sysdeps.a
 lib/libgtop_sysdeps.la
 lib/libgtop_sysdeps.so
 lib/libgtop_sysdeps.so.1
-lib/libgtop_sysdeps.so.1.11
+lib/libgtop_sysdeps.so.1.12
 lib/libgtop_sysdeps_suid.a
 lib/libgtop_sysdeps_suid.la
 lib/libgtop_sysdeps_suid.so
 lib/libgtop_sysdeps_suid.so.1
-lib/libgtop_sysdeps_suid.so.1.11
-share/locale/az/LC_MESSAGES/libgtop.mo
-share/locale/da/LC_MESSAGES/libgtop.mo
-share/locale/de/LC_MESSAGES/libgtop.mo
-share/locale/el/LC_MESSAGES/libgtop.mo
-share/locale/es/LC_MESSAGES/libgtop.mo
-share/locale/es_DO/LC_MESSAGES/libgtop.mo
-share/locale/es_GT/LC_MESSAGES/libgtop.mo
-share/locale/es_HN/LC_MESSAGES/libgtop.mo
-share/locale/es_MX/LC_MESSAGES/libgtop.mo
-share/locale/es_PA/LC_MESSAGES/libgtop.mo
-share/locale/es_PE/LC_MESSAGES/libgtop.mo
-share/locale/es_SV/LC_MESSAGES/libgtop.mo
-share/locale/fi/LC_MESSAGES/libgtop.mo
-share/locale/fr/LC_MESSAGES/libgtop.mo
-share/locale/gl/LC_MESSAGES/libgtop.mo
-share/locale/ja/LC_MESSAGES/libgtop.mo
-share/locale/ko/LC_MESSAGES/libgtop.mo
-share/locale/no/LC_MESSAGES/libgtop.mo
-share/locale/nl/LC_MESSAGES/libgtop.mo
-share/locale/pl/LC_MESSAGES/libgtop.mo
-share/locale/pt_BR/LC_MESSAGES/libgtop.mo
-share/locale/sk/LC_MESSAGES/libgtop.mo
-share/locale/sl/LC_MESSAGES/libgtop.mo
-share/locale/sv/LC_MESSAGES/libgtop.mo
-@dirrm include/glibtop
+lib/libgtop_sysdeps_suid.so.1.12
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/es_DO/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/es_GT/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/es_HN/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/es_PA/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/es_PE/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/es_SV/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/libgtop.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgtop.mo
+@dirrm include/libgtop-1.0/glibtop
+@dirrm include/libgtop-1.0
diff --git a/devel/libgtop/buildlink2.mk b/devel/libgtop/buildlink2.mk
index 8a807106e02..013ad5b2db6 100644
--- a/devel/libgtop/buildlink2.mk
+++ b/devel/libgtop/buildlink2.mk
@@ -1,20 +1,21 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/10/06 13:59:22 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2002/11/04 00:48:32 rh Exp $
+#
+# This Makefile fragment is included by packages that use libgtop.
+#
+# This file was created automatically using createbuildlink 2.2.
 #
 
 .if !defined(LIBGTOP_BUILDLINK2_MK)
 LIBGTOP_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libgtop
-BUILDLINK_DEPENDS.libgtop?=		libgtop>=1.0.12nb3
+BUILDLINK_DEPENDS.libgtop?=		libgtop>=1.0.13
 BUILDLINK_PKGSRCDIR.libgtop?=		../../devel/libgtop
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgtop=libgtop
 BUILDLINK_PREFIX.libgtop_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.libgtop+=	include/glibtop.h
-BUILDLINK_FILES.libgtop+=	include/glibtop/*.h
-BUILDLINK_FILES.libgtop+=	include/glibtop_machine.h
-BUILDLINK_FILES.libgtop+=	include/glibtop_server.h
-BUILDLINK_FILES.libgtop+=	include/glibtop_suid.h
+BUILDLINK_FILES.libgtop+=	include/libgtop-1.0/*.h
+BUILDLINK_FILES.libgtop+=	include/libgtop-1.0/glibtop/*.h
 BUILDLINK_FILES.libgtop+=	lib/libgtop-features.def
 BUILDLINK_FILES.libgtop+=	lib/libgtop.*
 BUILDLINK_FILES.libgtop+=	lib/libgtopConf.sh
@@ -24,6 +25,9 @@ BUILDLINK_FILES.libgtop+=	lib/libgtop_suid_common.*
 BUILDLINK_FILES.libgtop+=	lib/libgtop_sysdeps.*
 BUILDLINK_FILES.libgtop+=	lib/libgtop_sysdeps_suid.*
 
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+
 BUILDLINK_TARGETS+=	libgtop-buildlink
 
 libgtop-buildlink: _BUILDLINK_USE
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 88306d44037..f7754c2fff7 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.8 2001/11/27 21:03:07 tron Exp $
+$NetBSD: distinfo,v 1.9 2002/11/04 00:48:33 rh Exp $
 
-SHA1 (libgtop-1.0.12.tar.gz) = 7ff6ae62b599db4bd51b54d4d549627eacfc8509
-Size (libgtop-1.0.12.tar.gz) = 882461 bytes
-SHA1 (patch-aa) = ee524ecb7394ad762ab907eaa3a2073efd1974a9
+SHA1 (libgtop-1.0.13.tar.bz2) = 7002d37ab43ebac14315298472a170ceaedbd072
+Size (libgtop-1.0.13.tar.bz2) = 733873 bytes
+SHA1 (patch-aa) = 21a55e4f2639037f03bf19f1c1e45c9a4a360d41
 SHA1 (patch-ab) = 3ce99bf4d72cf4e4203364d78361c8a2df081d8d
 SHA1 (patch-ac) = 644bfe717bdcc993a668a3d075acda8ef39571d8
 SHA1 (patch-ad) = 9522d20b1467b73678003d5c0f98dcac7d312893
 SHA1 (patch-ae) = cf277165382c17d938593934b59d8035175fd8d0
-SHA1 (patch-af) = c88fc8e4c887bd982daf433b8c0bddbcf9c44929
 SHA1 (patch-al) = e771b022a5c2176138c5f49561ac64a15ce11809
 SHA1 (patch-an) = 339df94fd374d99565be913d1f8b59ea2f7b7881
 SHA1 (patch-ao) = 09cb66ba7ee9a7368ec1cd1d4bd40ea3f6637a31
diff --git a/devel/libgtop/patches/patch-aa b/devel/libgtop/patches/patch-aa
index b405c4b04ce..1397f6c18eb 100644
--- a/devel/libgtop/patches/patch-aa
+++ b/devel/libgtop/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.10 2000/10/17 18:03:26 jlam Exp $
+$NetBSD: patch-aa,v 1.11 2002/11/04 00:48:33 rh Exp $
 
---- configure.orig	Thu May 25 10:35:06 2000
+--- configure.orig	Mon Nov  4 10:12:53 2002
 +++ configure
-@@ -8433,6 +8433,11 @@
+@@ -15379,6 +15379,11 @@ fi
+    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
  	< $srcdir/po/POTFILES.in > po/POTFILES
-   
  
-+# NetBSD: set DATADIRNAME to "share"
-+DATADIRNAME="share"
-+INTLDEPS=
-+INTLLIBS="-lintl"
++#
++# override DATADIRNAME with PKGLOCALEDIR if set
++#
++[ -z "$PKGLOCALEDIR" ] || DATADIRNAME=$PKGLOCALEDIR
 +
- # If we find X, set shell vars x_includes and x_libraries to the
- # paths, otherwise set no_x=yes.
- # Uses ac_ vars as temps to allow command line to override cache and checks.
+ echo "$as_me:15382: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
diff --git a/devel/libgtop/patches/patch-af b/devel/libgtop/patches/patch-af
deleted file mode 100644
index 8b9a11ea112..00000000000
--- a/devel/libgtop/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.6 2001/11/27 21:03:08 tron Exp $
-
---- src/daemon/gnuserv.c.orig	Sun Nov 28 17:43:00 1999
-+++ src/daemon/gnuserv.c	Tue Nov 27 21:58:17 2001
-@@ -93,7 +93,7 @@
-     vsnprintf (buffer, BUFSIZ-1, format, ap);
-     va_end (ap);
- 
--    syslog (priority, buffer);
-+    syslog (priority, "%s", buffer);
- }
- 
- void
-@@ -108,7 +108,7 @@
-     va_end (ap);
- 
-     snprintf (buffer2, BUFSIZ-1, "%s: %s", buffer, strerror (errno));
--    syslog (priority, buffer2);
-+    syslog (priority, "%s", buffer2);
- }
- 
- /*