devel/libgtop2 -> devel/libgtop

Rename this ports to use the real vendor package name. The advantage of this
is to allow our users' keyword search works and easier for users to file the
Bugzilla report when they use our name of ports. Debian, Gentoo, NetBSD and
other OSs have the correct package name, but not in our ports tree.

My team, FreeBSD GNOME Team, have agreed with it.

As for other ports, chase the rename.

32 files changed, 16 insertions, 17 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 1adbb4414f64..eeb30edb5709 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -5753,7 +5753,7 @@ libgsf-gnome	ports/devel/libgsf-gnome
 libgtk-java	ports/x11-toolkits/libgtk-java
 libgtkeditor	ports/x11-toolkits/libgtkeditor
 libgtkhtml	ports/www/libgtkhtml
-libgtop2	ports/devel/libgtop2
+libgtop		ports/devel/libgtop
 libgutenfetch	ports/devel/libgutenfetch
 libhash		ports/devel/libhash
 libhoard	ports/devel/libhoard
diff --git a/MOVED b/MOVED
index 740d6943936f..a6373383a03d 100644
--- a/MOVED
+++ b/MOVED
@@ -770,7 +770,6 @@ net/platero||2004-02-01|Port broken for >2 months
 x11-fm/vide||2004-02-01|Port broken for >2 months
 devel/gettext-old|devel/gettext|2004-02-03|Switch to latest stable version of gettext
 x11/kgamma|graphics/kdegraphics3|2004-02-05|Kgamma is now a part of kdegraphics
-devel/libgtop||2004-02-06|Obsolete and no longer maintained
 devel/ruby-libgtop||2004-02-06|Obsolete and no longer maintained
 devel/p5-GTop||2004-02-06|Obsolete and no longer maintained
 www/p5-Apache-VMonitor||2004-02-06|Depends on obsolete libgtop
@@ -2312,3 +2311,4 @@ databases/gnomedb|databases/gnome-db|2006-05-27|Renamed to use real vendor packa
 deskutils/gnomeutils2|deskutils/gnome-utils|2006-05-27|Renamed to use real vendor package name
 devel/bugbuddy|devel/bug-buddy|2006-05-27|Renamed to use real vendor package name
 devel/gnomecrash|devel/gnome-crash|2006-05-27|Renamed to use real vendor package name
+devel/libgtop2|devel/libgtop|2006-05-27|Renamed to use real vendor package name
diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 3c49b7357da9..8e4f86d1d2ac 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	gDesklets-${PORTVERSION}
 MAINTAINER=	klammer@webonaut.com
 COMMENT=	A framework for Gnome 2.x for desktop applets
 
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile
index 9a51857a3d96..317a261c1e1e 100644
--- a/deskutils/mdh/Makefile
+++ b/deskutils/mdh/Makefile
@@ -28,7 +28,7 @@ LDFLAGS=	-L${LOCALBASE}/lib
 .if defined(WITHOUT_GTOP)
 CONFIGURE_ARGS+=	--disable-gtop
 .else
-LIB_DEPENDS+=	gtop-2.0:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS+=	gtop-2.0:${PORTSDIR}/devel/libgtop
 .endif
 
 .if defined(WITHOUT_CURL)
diff --git a/devel/libgtop2/Makefile b/devel/libgtop/Makefile
index afa5c4877336..1b471d91f5a9 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop/Makefile
@@ -6,13 +6,12 @@
 #   $MCom: ports/devel/libgtop2/Makefile,v 1.70 2006/04/15 05:49:08 marcus Exp $
 #
 
-PORTNAME=	libgtop2
+PORTNAME=	libgtop
 PORTVERSION=	2.14.1
 PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	libgtop-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libgtop2/distinfo b/devel/libgtop/distinfo
index dd81ddab3cba..dd81ddab3cba 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop/distinfo
diff --git a/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop/files/extra-67-patch-sysdeps_freebsd_Makefile.in
index 1258d576f76d..1258d576f76d 100644
--- a/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in
+++ b/devel/libgtop/files/extra-67-patch-sysdeps_freebsd_Makefile.in
diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop/files/patch-configure
index 934f89e79fdc..934f89e79fdc 100644
--- a/devel/libgtop2/files/patch-configure
+++ b/devel/libgtop/files/patch-configure
diff --git a/devel/libgtop2/files/patch-lib::read.c b/devel/libgtop/files/patch-lib::read.c
index 18c837d377c2..18c837d377c2 100644
--- a/devel/libgtop2/files/patch-lib::read.c
+++ b/devel/libgtop/files/patch-lib::read.c
diff --git a/devel/libgtop2/files/patch-lib::write.c b/devel/libgtop/files/patch-lib::write.c
index acb63c489cc1..acb63c489cc1 100644
--- a/devel/libgtop2/files/patch-lib::write.c
+++ b/devel/libgtop/files/patch-lib::write.c
diff --git a/devel/libgtop2/files/patch-src::daemon::io.c b/devel/libgtop/files/patch-src::daemon::io.c
index f8fb71b0378b..f8fb71b0378b 100644
--- a/devel/libgtop2/files/patch-src::daemon::io.c
+++ b/devel/libgtop/files/patch-src::daemon::io.c
diff --git a/devel/libgtop2/files/patch-src_daemon_server.c b/devel/libgtop/files/patch-src_daemon_server.c
index bf0bba5c7f21..bf0bba5c7f21 100644
--- a/devel/libgtop2/files/patch-src_daemon_server.c
+++ b/devel/libgtop/files/patch-src_daemon_server.c
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c b/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c
index 85c9822f86f9..85c9822f86f9 100644
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h b/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_server.h
index 4955aed65da5..4955aed65da5 100644
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_server.h
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_netload.c b/devel/libgtop/files/patch-sysdeps_freebsd_netload.c
index bb6d286e03f6..bb6d286e03f6 100644
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_netload.c
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_netload.c
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_siglist.c b/devel/libgtop/files/patch-sysdeps_freebsd_siglist.c
index 6881723bd3ad..6881723bd3ad 100644
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_siglist.c
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_siglist.c
diff --git a/devel/libgtop2/files/patch-systeps::freebsd::prockernel.c b/devel/libgtop/files/patch-systeps::freebsd::prockernel.c
index f23b1cdaeb4e..f23b1cdaeb4e 100644
--- a/devel/libgtop2/files/patch-systeps::freebsd::prockernel.c
+++ b/devel/libgtop/files/patch-systeps::freebsd::prockernel.c
diff --git a/devel/libgtop2/files/patch-systeps::freebsd::procmap.c b/devel/libgtop/files/patch-systeps::freebsd::procmap.c
index 43923f3ba5a6..43923f3ba5a6 100644
--- a/devel/libgtop2/files/patch-systeps::freebsd::procmap.c
+++ b/devel/libgtop/files/patch-systeps::freebsd::procmap.c
diff --git a/devel/libgtop2/files/patch-systeps::freebsd::proctime.c b/devel/libgtop/files/patch-systeps::freebsd::proctime.c
index 9857d6cb856d..9857d6cb856d 100644
--- a/devel/libgtop2/files/patch-systeps::freebsd::proctime.c
+++ b/devel/libgtop/files/patch-systeps::freebsd::proctime.c
diff --git a/devel/libgtop2/files/pkg-message b/devel/libgtop/files/pkg-message
index dacaf62a9c39..dacaf62a9c39 100644
--- a/devel/libgtop2/files/pkg-message
+++ b/devel/libgtop/files/pkg-message
diff --git a/devel/libgtop2/pkg-descr b/devel/libgtop/pkg-descr
index f263f1127244..f263f1127244 100644
--- a/devel/libgtop2/pkg-descr
+++ b/devel/libgtop/pkg-descr
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop/pkg-plist
index 020a91183bd2..020a91183bd2 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop/pkg-plist
diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile
index 3aec1fe1e879..565434f7c595 100644
--- a/net/netspeed_applet/Makefile
+++ b/net/netspeed_applet/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Applet that shows how much network traffic occurs on an interface
 
-LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop
 
 USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
diff --git a/palm/synce-trayicon/Makefile b/palm/synce-trayicon/Makefile
index eba8fcff60e9..36c8760e9fcb 100644
--- a/palm/synce-trayicon/Makefile
+++ b/palm/synce-trayicon/Makefile
@@ -16,7 +16,7 @@ COMMENT=	GNOME tray icon showing battery and storage status of a WinCE device
 
 BUILD_DEPENDS=	${X11BASE}/lib/gnome-vfs-2.0/modules/libsyncevfs.so:${PORTSDIR}/palm/synce-gnomevfs
 RUN_DEPENDS=	${X11BASE}/lib/gnome-vfs-2.0/modules/libsyncevfs.so:${PORTSDIR}/palm/synce-gnomevfs
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
 
 USE_GMAKE=	yes
 USE_GNOME=	libgnomeui gnometarget
diff --git a/sysutils/bubblemon2/Makefile b/sysutils/bubblemon2/Makefile
index 61b4ab28b7ac..b28b65ea87fb 100644
--- a/sysutils/bubblemon2/Makefile
+++ b/sysutils/bubblemon2/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	bubblemon-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A system CPU and memory load monitor for GNOME2
 
-LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomepanel gnomeprefix gnometarget intlhack
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 5ec3fde90124..934f2b220023 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 system monitor program
 
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 5ec3fde90124..934f2b220023 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 system monitor program
 
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/sysutils/slmon/Makefile b/sysutils/slmon/Makefile
index 7ecc07d1420d..6020e9e9fff2 100644
--- a/sysutils/slmon/Makefile
+++ b/sysutils/slmon/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	S-Lang System Monitor
 
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop2 \
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		slang.1:${PORTSDIR}/devel/libslang
 
 USE_GETOPT_LONG=	yes
diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index 0e193b6ad255..2e079e928203 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.swanson.ukfsn.org/wmfire/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window Maker dock app showing load average as a flame
 
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnometarget gtk20
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 6d558c233f39..fcac446ac174 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -19,7 +19,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A set of Python bindings used by modules in the GNOME Desktop
 
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop2 \
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \
 		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
 
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index cf84f04a3b2e..fa6ef84626ca 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Applets components for the Gnome 2 Desktop Environment
 
 BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-system-tools.pc:${PORTSDIR}/sysutils/gnomesystemtools
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop2 \
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		xklavier.10:${PORTSDIR}/x11/libxklavier \
 		gucharmap.4:${PORTSDIR}/deskutils/gucharmap
 RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnomesystemtools
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index cf84f04a3b2e..fa6ef84626ca 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Applets components for the Gnome 2 Desktop Environment
 
 BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-system-tools.pc:${PORTSDIR}/sysutils/gnomesystemtools
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop2 \
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		xklavier.10:${PORTSDIR}/x11/libxklavier \
 		gucharmap.4:${PORTSDIR}/deskutils/gucharmap
 RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnomesystemtools