Rename libgtop2 to libgtop, to match upstream name.

29 files changed, 51 insertions, 51 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 5a1a82861bd..b8b3a2b5e0c 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.410 2007/09/20 00:08:07 wiz Exp $
+# $NetBSD: Makefile,v 1.411 2007/09/20 21:12:04 wiz Exp $
 #
 
 COMMENT=	System utilities
@@ -139,7 +139,7 @@ SUBDIR+=	kdirstat
 SUBDIR+=	krusader
 SUBDIR+=	lambd
 SUBDIR+=	lavaps
-SUBDIR+=	libgtop2
+SUBDIR+=	libgtop
 SUBDIR+=	libirman
 SUBDIR+=	libnotify
 SUBDIR+=	libol
diff --git a/sysutils/libgtop2/DESCR b/sysutils/libgtop/DESCR
index 55f3012d616..55f3012d616 100644
--- a/sysutils/libgtop2/DESCR
+++ b/sysutils/libgtop/DESCR
diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop/Makefile
index cf760a6d990..c81c2cf7a5b 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2007/09/19 23:19:08 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/20 21:12:04 wiz Exp $
 
 DISTNAME=		libgtop-2.14.2
-PKGNAME=		${DISTNAME:S/-/2-/}
 PKGREVISION=		5
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtop/2.14/}
@@ -20,6 +19,7 @@ PKGCONFIG_OVERRIDE=	libgtop-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	support/gnome-support-2.0.pc.in
 INFO_FILES=		YES
 TEXINFO_REQD=		4.6
+CONFLICTS+=		libgtop2-[0-9]*
 
 # The following flags are for debugging purposes.  They don't need to
 # be used unless you are actively developing/debugging libgtop.
diff --git a/sysutils/libgtop2/PLIST b/sysutils/libgtop/PLIST
index 5a9edac153d..8e9bf4e98a0 100644
--- a/sysutils/libgtop2/PLIST
+++ b/sysutils/libgtop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2007/05/29 12:45:14 obache Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/09/20 21:12:05 wiz Exp $
 ${LIBGTOP_SERVER}bin/libgtop_daemon2
 ${LIBGTOP_SERVER}bin/libgtop_server2
 include/libgtop-2.0/glibtop.h
diff --git a/sysutils/libgtop/buildlink3.mk b/sysutils/libgtop/buildlink3.mk
new file mode 100644
index 00000000000..eec7d85b026
--- /dev/null
+++ b/sysutils/libgtop/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.4 2007/09/20 21:12:05 wiz Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+LIBGTOP_BUILDLINK3_MK:=		${LIBGTOP_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libgtop
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgtop}
+BUILDLINK_PACKAGES+=	libgtop
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgtop
+
+.if !empty(LIBGTOP_BUILDLINK3_MK:M+)
+BUILDLINK_API_DEPENDS.libgtop+=	libgtop>=2.14.0
+BUILDLINK_PKGSRCDIR.libgtop?=	../../sysutils/libgtop
+.endif	# LIBGTOP_BUILDLINK3_MK
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/libgtop2/distinfo b/sysutils/libgtop/distinfo
index 13067d4bdb2..8fb19f4aa52 100644
--- a/sysutils/libgtop2/distinfo
+++ b/sysutils/libgtop/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2007/06/25 21:18:52 joerg Exp $
+$NetBSD: distinfo,v 1.4 2007/09/20 21:12:06 wiz Exp $
 
 SHA1 (libgtop-2.14.2.tar.bz2) = 20e79a58c08e06e5f5e68d8ebbd575471f754e96
 RMD160 (libgtop-2.14.2.tar.bz2) = cb51f7252e015e17dcf3f1f991b36bf3e5496efe
diff --git a/sysutils/libgtop2/patches/patch-aa b/sysutils/libgtop/patches/patch-aa
index bbe57514992..d04d24882ce 100644
--- a/sysutils/libgtop2/patches/patch-aa
+++ b/sysutils/libgtop/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2006/09/01 06:54:29 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2007/09/20 21:12:06 wiz Exp $
 
 --- configure.orig	2006-07-27 18:43:37.000000000 +0000
 +++ configure
diff --git a/sysutils/libgtop2/patches/patch-ab b/sysutils/libgtop/patches/patch-ab
index c4721af64fd..26d01995973 100644
--- a/sysutils/libgtop2/patches/patch-ab
+++ b/sysutils/libgtop/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2007/06/25 21:18:52 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2007/09/20 21:12:06 wiz Exp $
 
 --- sysdeps/freebsd/proctime.c.orig	2006-04-04 20:01:43.000000000 +0000
 +++ sysdeps/freebsd/proctime.c
diff --git a/sysutils/libgtop2/patches/patch-ac b/sysutils/libgtop/patches/patch-ac
index 8dbdc008619..0e07b0f12d5 100644
--- a/sysutils/libgtop2/patches/patch-ac
+++ b/sysutils/libgtop/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2006/02/28 23:48:11 joerg Exp $
+$NetBSD: patch-ac,v 1.5 2007/09/20 21:12:07 wiz Exp $
 
 --- sysdeps/common/mountlist.c.orig	2003-10-20 09:29:03.000000000 -0500
 +++ sysdeps/common/mountlist.c
diff --git a/sysutils/libgtop2/patches/patch-ad b/sysutils/libgtop/patches/patch-ad
index b90d11b38a4..d4945f851bc 100644
--- a/sysutils/libgtop2/patches/patch-ad
+++ b/sysutils/libgtop/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.5 2006/08/06 19:06:44 jmmv Exp $
+$NetBSD: patch-ad,v 1.5 2007/09/20 21:12:07 wiz Exp $
 
 --- sysdeps/freebsd/fsusage.c.orig	2006-04-09 18:52:45.000000000 +0200
 +++ sysdeps/freebsd/fsusage.c
diff --git a/sysutils/libgtop2/patches/patch-ae b/sysutils/libgtop/patches/patch-ae
index f3025d2fe3d..ec08de45b8e 100644
--- a/sysutils/libgtop2/patches/patch-ae
+++ b/sysutils/libgtop/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2006/02/28 23:48:11 joerg Exp $
+$NetBSD: patch-ae,v 1.5 2007/09/20 21:12:08 wiz Exp $
 
 --- sysdeps/freebsd/cpu.c.orig	2005-07-08 19:49:56.000000000 +0000
 +++ sysdeps/freebsd/cpu.c
diff --git a/sysutils/libgtop2/patches/patch-af b/sysutils/libgtop/patches/patch-af
index 3756987754f..377d489ff19 100644
--- a/sysutils/libgtop2/patches/patch-af
+++ b/sysutils/libgtop/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2006/02/28 23:48:11 joerg Exp $
+$NetBSD: patch-af,v 1.5 2007/09/20 21:12:08 wiz Exp $
 
 --- sysdeps/freebsd/glibtop_machine.h.orig	2005-07-08 19:00:00.000000000 +0000
 +++ sysdeps/freebsd/glibtop_machine.h
diff --git a/sysutils/libgtop2/patches/patch-ag b/sysutils/libgtop/patches/patch-ag
index 615ba1eeae4..e71cc708693 100644
--- a/sysutils/libgtop2/patches/patch-ag
+++ b/sysutils/libgtop/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2006/09/22 15:57:47 drochner Exp $
+$NetBSD: patch-ag,v 1.5 2007/09/20 21:12:08 wiz Exp $
 
 --- sysdeps/freebsd/mem.c.orig	2005-12-12 11:09:39.000000000 +0100
 +++ sysdeps/freebsd/mem.c
diff --git a/sysutils/libgtop2/patches/patch-ah b/sysutils/libgtop/patches/patch-ah
index 278b3d7fc77..26fbce1068b 100644
--- a/sysutils/libgtop2/patches/patch-ah
+++ b/sysutils/libgtop/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2006/03/30 21:09:48 jmmv Exp $
+$NetBSD: patch-ah,v 1.3 2007/09/20 21:12:09 wiz Exp $
 
 --- sysdeps/freebsd/open.c.orig	2005-12-12 11:09:39.000000000 +0100
 +++ sysdeps/freebsd/open.c
diff --git a/sysutils/libgtop2/patches/patch-ai b/sysutils/libgtop/patches/patch-ai
index f17c085a48a..34b62efa818 100644
--- a/sysutils/libgtop2/patches/patch-ai
+++ b/sysutils/libgtop/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2006/02/28 23:48:12 joerg Exp $
+$NetBSD: patch-ai,v 1.3 2007/09/20 21:12:09 wiz Exp $
 
 --- sysdeps/freebsd/prockernel.c.orig	2004-09-24 22:49:06.000000000 +0000
 +++ sysdeps/freebsd/prockernel.c
diff --git a/sysutils/libgtop2/patches/patch-aj b/sysutils/libgtop/patches/patch-aj
index 8d3f28132e4..9c31f6e43ef 100644
--- a/sysutils/libgtop2/patches/patch-aj
+++ b/sysutils/libgtop/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2006/02/28 23:48:12 joerg Exp $
+$NetBSD: patch-aj,v 1.3 2007/09/20 21:12:09 wiz Exp $
 
 --- sysdeps/freebsd/proclist.c.orig	2004-09-23 22:44:19.000000000 +0000
 +++ sysdeps/freebsd/proclist.c
diff --git a/sysutils/libgtop2/patches/patch-ak b/sysutils/libgtop/patches/patch-ak
index dec52e266c8..d3b0728effc 100644
--- a/sysutils/libgtop2/patches/patch-ak
+++ b/sysutils/libgtop/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 2007/06/25 21:18:52 joerg Exp $
+$NetBSD: patch-ak,v 1.3 2007/09/20 21:12:10 wiz Exp $
 
 --- sysdeps/freebsd/procmap.c.orig	2005-12-12 10:09:39.000000000 +0000
 +++ sysdeps/freebsd/procmap.c
diff --git a/sysutils/libgtop2/patches/patch-al b/sysutils/libgtop/patches/patch-al
index 4fb66ec4d87..aae582128eb 100644
--- a/sysutils/libgtop2/patches/patch-al
+++ b/sysutils/libgtop/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.5 2007/06/25 21:18:52 joerg Exp $
+$NetBSD: patch-al,v 1.5 2007/09/20 21:12:10 wiz Exp $
 
 --- sysdeps/freebsd/procmem.c.orig	2005-12-12 10:09:39.000000000 +0000
 +++ sysdeps/freebsd/procmem.c
diff --git a/sysutils/libgtop2/patches/patch-am b/sysutils/libgtop/patches/patch-am
index 62843127ce3..1bc3876fd89 100644
--- a/sysutils/libgtop2/patches/patch-am
+++ b/sysutils/libgtop/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2007/04/04 18:53:45 gdt Exp $
+$NetBSD: patch-am,v 1.4 2007/09/20 21:12:11 wiz Exp $
 
 --- sysdeps/freebsd/procsignal.c.orig	2005-12-12 10:09:39.000000000 +0000
 +++ sysdeps/freebsd/procsignal.c
diff --git a/sysutils/libgtop2/patches/patch-an b/sysutils/libgtop/patches/patch-an
index 9faf88726bb..abf29aebeeb 100644
--- a/sysutils/libgtop2/patches/patch-an
+++ b/sysutils/libgtop/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1 2006/02/28 23:48:12 joerg Exp $
+$NetBSD: patch-an,v 1.3 2007/09/20 21:12:11 wiz Exp $
 
 --- sysdeps/freebsd/procstate.c.orig	2004-09-24 22:49:06.000000000 +0000
 +++ sysdeps/freebsd/procstate.c
diff --git a/sysutils/libgtop2/patches/patch-ao b/sysutils/libgtop/patches/patch-ao
index 0edb4a6a71d..72637764a62 100644
--- a/sysutils/libgtop2/patches/patch-ao
+++ b/sysutils/libgtop/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.2 2007/04/04 18:53:45 gdt Exp $
+$NetBSD: patch-ao,v 1.3 2007/09/20 21:12:11 wiz Exp $
 
 --- sysdeps/freebsd/procuid.c.orig	2005-12-12 10:09:39.000000000 +0000
 +++ sysdeps/freebsd/procuid.c
diff --git a/sysutils/libgtop2/patches/patch-ap b/sysutils/libgtop/patches/patch-ap
index 0c74639c754..fa113bcf882 100644
--- a/sysutils/libgtop2/patches/patch-ap
+++ b/sysutils/libgtop/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.1 2006/02/28 23:48:12 joerg Exp $
+$NetBSD: patch-ap,v 1.3 2007/09/20 21:12:12 wiz Exp $
 
 --- sysdeps/freebsd/swap.c.orig	2004-09-24 22:49:06.000000000 +0000
 +++ sysdeps/freebsd/swap.c
diff --git a/sysutils/libgtop2/patches/patch-aq b/sysutils/libgtop/patches/patch-aq
index 6af8b40dece..b79ae12a297 100644
--- a/sysutils/libgtop2/patches/patch-aq
+++ b/sysutils/libgtop/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.3 2006/09/22 15:57:47 drochner Exp $
+$NetBSD: patch-aq,v 1.3 2007/09/20 21:12:12 wiz Exp $
 
 --- sysdeps/common/fsusage.c.orig	2006-09-22 16:31:47.000000000 +0200
 +++ sysdeps/common/fsusage.c
diff --git a/sysutils/libgtop2/patches/patch-ba b/sysutils/libgtop/patches/patch-ba
index 92a3d4177be..c8a6499f258 100644
--- a/sysutils/libgtop2/patches/patch-ba
+++ b/sysutils/libgtop/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.2 2006/08/06 19:06:44 jmmv Exp $
+$NetBSD: patch-ba,v 1.1 2007/09/20 21:12:13 wiz Exp $
 
 From FreeBSD's GNOME development repository.
 
diff --git a/sysutils/libgtop2/patches/patch-bb b/sysutils/libgtop/patches/patch-bb
index bc7ccdc621b..1ec47ecc761 100644
--- a/sysutils/libgtop2/patches/patch-bb
+++ b/sysutils/libgtop/patches/patch-bb
@@ -1,4 +1,4 @@
-$NetBSD: patch-bb,v 1.2 2006/08/06 19:06:44 jmmv Exp $
+$NetBSD: patch-bb,v 1.1 2007/09/20 21:12:13 wiz Exp $
 
 From FreeBSD's GNOME development repository.
 
diff --git a/sysutils/libgtop2/patches/patch-bc b/sysutils/libgtop/patches/patch-bc
index c8296aa5abc..822bbde914a 100644
--- a/sysutils/libgtop2/patches/patch-bc
+++ b/sysutils/libgtop/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.2 2006/03/30 21:09:48 jmmv Exp $
+$NetBSD: patch-bc,v 1.1 2007/09/20 21:12:13 wiz Exp $
 
 From FreeBSD's GNOME development repository.
 
diff --git a/sysutils/libgtop2/patches/patch-bd b/sysutils/libgtop/patches/patch-bd
index 14c6d546143..3fa5b05a0dc 100644
--- a/sysutils/libgtop2/patches/patch-bd
+++ b/sysutils/libgtop/patches/patch-bd
@@ -1,4 +1,4 @@
-$NetBSD: patch-bd,v 1.1 2005/10/12 21:49:39 jmmv Exp $
+$NetBSD: patch-bd,v 1.1 2007/09/20 21:12:14 wiz Exp $
 
 From FreeBSD's GNOME development repository.
 
diff --git a/sysutils/libgtop2/patches/patch-bg b/sysutils/libgtop/patches/patch-bg
index bea74aabdcf..b60c1d5c36a 100644
--- a/sysutils/libgtop2/patches/patch-bg
+++ b/sysutils/libgtop/patches/patch-bg
@@ -1,4 +1,4 @@
-$NetBSD: patch-bg,v 1.2 2006/06/26 12:14:25 drochner Exp $
+$NetBSD: patch-bg,v 1.1 2007/09/20 21:12:14 wiz Exp $
 
 --- sysdeps/freebsd/prockernel.c.orig	2006-06-13 22:20:53.000000000 +0200
 +++ sysdeps/freebsd/prockernel.c
diff --git a/sysutils/libgtop2/buildlink3.mk b/sysutils/libgtop2/buildlink3.mk
deleted file mode 100644
index f86e192a165..00000000000
--- a/sysutils/libgtop2/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:09 jlam Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGTOP2_BUILDLINK3_MK:=	${LIBGTOP2_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgtop2
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgtop2}
-BUILDLINK_PACKAGES+=	libgtop2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgtop2
-
-.if !empty(LIBGTOP2_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libgtop2+=	libgtop2>=2.14.0
-BUILDLINK_PKGSRCDIR.libgtop2?=	../../sysutils/libgtop2
-.endif	# LIBGTOP2_BUILDLINK3_MK
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}