Update to 2.6.0. Can't find the list of changes but, AFAICT, this

includes our patch for x86_64 support, some bug fixes, and updated
and new translations.

4 files changed, 11 insertions, 24 deletions

diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile
index 237fab66bc5..27052e32a24 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2004/04/06 09:24:56 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/07 11:39:48 jmmv Exp $
 
-DISTNAME=		libgtop-2.5.2
+DISTNAME=		libgtop-2.6.0
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		1
 CATEGORIES=		sysutils gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtop/2.5/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtop/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -28,7 +27,7 @@ USE_MSGFMT_PLURALS=	YES
 	(${MACHINE_ARCH} != x86_64)
 PKG_FAIL_REASON=	"${PKGNAME} has not yet been ported to ${MACHINE_ARCH}."
 PKG_FAIL_REASON+=	"Please look at /usr/include/${MACHINE_ARCH}/pcb.h"
-PKG_FAIL_REASON+=	"and update patches/patch-al appropriately."
+PKG_FAIL_REASON+=	"and update ${WRKSRC}/sysdeps/freebsd/prockernel.c appropriately."
 PKG_FAIL_REASON+=	"(More information can be found in libgtop.info.)"
 .  endif
 .endif
diff --git a/sysutils/libgtop2/PLIST b/sysutils/libgtop2/PLIST
index cbe061db53d..3cfb7dd736c 100644
--- a/sysutils/libgtop2/PLIST
+++ b/sysutils/libgtop2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/02 12:09:16 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/07 11:39:48 jmmv Exp $
 bin/libgtop_daemon2
 ${LIBGTOP_SERVER}bin/libgtop_server2
 include/libgtop-2.0/glibtop.h
@@ -62,6 +62,8 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/libgtop-2.0.mo
@@ -86,6 +88,7 @@ ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgtop-2.0.mo
diff --git a/sysutils/libgtop2/distinfo b/sysutils/libgtop2/distinfo
index a19a05acf98..f24d62d5850 100644
--- a/sysutils/libgtop2/distinfo
+++ b/sysutils/libgtop2/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/02 12:09:16 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2004/04/07 11:39:48 jmmv Exp $
 
-SHA1 (libgtop-2.5.2.tar.bz2) = 0ef139ccfd7a6a11b9f94c17e3a9d382ded1dad3
-Size (libgtop-2.5.2.tar.bz2) = 935545 bytes
+SHA1 (libgtop-2.6.0.tar.bz2) = e6c61a3f7d458b8afa6c9361e71bbdadeafe7e3b
+Size (libgtop-2.6.0.tar.bz2) = 946822 bytes
 SHA1 (patch-aa) = 5ebb407abdaedb77ed02c01adbaba70113b333b6
-SHA1 (patch-al) = 4fad51ee02aa13c8f53d8716fb230bef2f282d4d
diff --git a/sysutils/libgtop2/patches/patch-al b/sysutils/libgtop2/patches/patch-al
deleted file mode 100644
index 65b6af1d1b5..00000000000
--- a/sysutils/libgtop2/patches/patch-al
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2004/04/02 12:09:16 jmmv Exp $
-
---- sysdeps/freebsd/prockernel.c.orig	2004-03-11 03:23:52.000000000 +0100
-+++ sysdeps/freebsd/prockernel.c
-@@ -228,6 +228,9 @@ glibtop_get_proc_kernel_p (glibtop *serv
- #if defined(__m68k__)
- 			buf->kstk_esp = (u_int64_t) pcb.pcb_usp;
- 			buf->kstk_eip = (u_int64_t) 0;
-+#elif defined(__x86_64__)
-+			buf->kstk_esp = (u_int64_t) pcb.pcb_usersp;
-+			buf->kstk_eip = (u_int64_t) 0;
- #elif (defined(__arm32__) || defined(__powerpc__))
- 			buf->kstk_esp = (u_int64_t) pcb.pcb_sp;
- 			buf->kstk_eip = (u_int64_t) 0;