games/gcompris2 -> games/gcompris

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.

8 files changed, 3 insertions, 4 deletions

diff --git a/MOVED b/MOVED
index 50a0305a9c5d..1fc6cf8ac816 100644
--- a/MOVED
+++ b/MOVED
@@ -937,7 +937,6 @@ japanese/vfxdvi300||2004-03-04|removed (obsolate)
 japanese/vfxdvi360||2004-03-04|removed (obsolate)
 japanese/vfxdvi400||2004-03-04|removed (obsolate)
 japanese/vfxdvi600||2004-03-04|removed (obsolate)
-games/gcompris|games/gcompris2|2004-03-05|removed, obsoleted, successor is gcompris2
 graphics/filmgimp|graphics/cinepaint|2004-03-06|renamed
 sysutils/xwatch||2004-03-09|obsolete-distfile deleted by author
 x11-toolkits/qt32|x11-toolkits/qt33|2004-03-09|qt32 replaced by qt33
@@ -2313,3 +2312,4 @@ devel/gnomecrash|devel/gnome-crash|2006-05-27|Renamed to use real vendor package
 devel/libgtop2|devel/libgtop|2006-05-27|Renamed to use real vendor package name
 devel/pkgconfig|devel/pkg-config|2006-05-27|Renamed to use real vendor package name
 devel/py-orbit2|devel/py-orbit|2006-05-28|Renamed to use real vendor package name
+games/gcompris2|games/gcompris|2006-05-28|Renamed to use real vendor package name
diff --git a/games/Makefile b/games/Makefile
index 5306fb206968..89a548c78532 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -210,7 +210,7 @@
     SUBDIR += galaxymage
     SUBDIR += garith
     SUBDIR += gbottler
-    SUBDIR += gcompris2
+    SUBDIR += gcompris
     SUBDIR += geki2
     SUBDIR += geki3
     SUBDIR += gemdropx
diff --git a/games/gcompris2/Makefile b/games/gcompris/Makefile
index 07fbcd0229f6..4e5033de7c51 100644
--- a/games/gcompris2/Makefile
+++ b/games/gcompris/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gcompris2
+PORTNAME=	gcompris
 PORTVERSION=	7.4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gcompris
-DISTNAME=	gcompris-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome2 educational games and activities for kids ages 2 to 10
diff --git a/games/gcompris2/distinfo b/games/gcompris/distinfo
index a7cfcc4b4aa9..a7cfcc4b4aa9 100644
--- a/games/gcompris2/distinfo
+++ b/games/gcompris/distinfo
diff --git a/games/gcompris2/files/patch-ac b/games/gcompris/files/patch-ac
index 91280defda73..91280defda73 100644
--- a/games/gcompris2/files/patch-ac
+++ b/games/gcompris/files/patch-ac
diff --git a/games/gcompris2/files/patch-configure b/games/gcompris/files/patch-configure
index 24c1dc04fe88..24c1dc04fe88 100644
--- a/games/gcompris2/files/patch-configure
+++ b/games/gcompris/files/patch-configure
diff --git a/games/gcompris2/pkg-descr b/games/gcompris/pkg-descr
index d86316573ffa..d86316573ffa 100644
--- a/games/gcompris2/pkg-descr
+++ b/games/gcompris/pkg-descr
diff --git a/games/gcompris2/pkg-plist b/games/gcompris/pkg-plist
index 45a2c222a48b..45a2c222a48b 100644
--- a/games/gcompris2/pkg-plist
+++ b/games/gcompris/pkg-plist