14 files changed, 12 insertions, 13 deletions

diff --git a/MOVED b/MOVED
index 97fa89d1dde0..18bc210b14c5 100644
--- a/MOVED
+++ b/MOVED
@@ -396,7 +396,6 @@ x11/xalf||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11/linux-xalf||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11/gnome||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11/gnome-fifth-toe||2003-07-15|removed as part of GNOME 1.4 desktop phase out
-editors/gedit||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11-wm/sawfish||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 audio/gnomemedia||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 sysutils/gtop||2003-07-15|removed as part of GNOME 1.4 desktop phase out
@@ -1379,3 +1378,4 @@ devel/bugbuddy2|devel/bugbuddy|2005-01-24|moved to non-versioned directory
 x11-toolkits/eel2|x11-toolkits/eel|2005-01-25|moved to non-versioned directory
 graphics/eog2|graphics/eog|2005-01-25|moved to non-versioned directory
 x11/gdm2|x11/gdm|2005-01-25|moved to non-versioned directory
+editors/gedit2|editors/gedit|2005-01-25|moved to non-versioned directory
diff --git a/editors/Makefile b/editors/Makefile
index 4f51fc3ef105..a9521f618bd0 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -60,8 +60,8 @@
     SUBDIR += fpc-ide
     SUBDIR += fte
     SUBDIR += gate
+    SUBDIR += gedit
     SUBDIR += gedit-plugins
-    SUBDIR += gedit2
     SUBDIR += ghex2
     SUBDIR += glimmer
     SUBDIR += gmanedit
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 9bcd84eafb38..64449729bb98 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Plugins for gedit2
+COMMENT=	Plugins for gedit
 
-BUILD_DEPENDS=	gedit:${PORTSDIR}/editors/gedit2
+BUILD_DEPENDS=	gedit:${PORTSDIR}/editors/gedit
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_BZIP2=	yes
diff --git a/editors/gedit-plugins/pkg-descr b/editors/gedit-plugins/pkg-descr
index 9edebc33fc6b..a16be8d6cc2d 100644
--- a/editors/gedit-plugins/pkg-descr
+++ b/editors/gedit-plugins/pkg-descr
@@ -1 +1 @@
-Various plugins for gedit2.
+Various plugins for gedit.
diff --git a/editors/gedit2/Makefile b/editors/gedit/Makefile
index ee64130bca5a..0c04ee4f7382 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gedit2
+PORTNAME=	gedit
 PORTVERSION=	2.8.2
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
-DISTNAME=	gedit-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/editors/gedit2/distinfo b/editors/gedit/distinfo
index 1cc5ea137095..1cc5ea137095 100644
--- a/editors/gedit2/distinfo
+++ b/editors/gedit/distinfo
diff --git a/editors/gedit2/files/patch-configure b/editors/gedit/files/patch-configure
index 91c1e9a657d0..91c1e9a657d0 100644
--- a/editors/gedit2/files/patch-configure
+++ b/editors/gedit/files/patch-configure
diff --git a/editors/gedit2/pkg-descr b/editors/gedit/pkg-descr
index 85018482c6ed..85018482c6ed 100644
--- a/editors/gedit2/pkg-descr
+++ b/editors/gedit/pkg-descr
diff --git a/editors/gedit2/pkg-plist b/editors/gedit/pkg-plist
index ca0397040eed..ca0397040eed 100644
--- a/editors/gedit2/pkg-plist
+++ b/editors/gedit/pkg-plist
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 46d500ca4023..e320a2aaa9ff 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -37,8 +37,8 @@ OPTIONS=	GEDIT "Enable the gedit plug-in" on
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_GEDIT)
-BUILD_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit2
-RUN_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit2
+BUILD_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
+RUN_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
 PLIST_SUB+=	GEDIT=""
 .else
 PLIST_SUB+=	GEDIT="@comment "
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index a5e801701300..961f02b9ad5c 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
 	 	gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \
 		eog:${PORTSDIR}/graphics/eog \
 		gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
-		gedit:${PORTSDIR}/editors/gedit2 \
+		gedit:${PORTSDIR}/editors/gedit \
 		gnome-terminal:${PORTSDIR}/x11/gnometerminal \
 		gnome-session:${PORTSDIR}/x11/gnomesession \
 		gnome-system-monitor:${PORTSDIR}/sysutils/gnomesystemmonitor \
diff --git a/x11/gnome2-lite/pkg-install b/x11/gnome2-lite/pkg-install
index 68700918caaa..9fd2c0a2a302 100644
--- a/x11/gnome2-lite/pkg-install
+++ b/x11/gnome2-lite/pkg-install
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH}
 export PATH
 
 if [ "$2" = "PRE-INSTALL" ]; then
-     GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus gedit xalf gnomegames eog ggv gnomeaudio"
+     GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus xalf gnomegames eog ggv gnomeaudio"
      for package in ${GNOME_ONE_DESKTOP}; do
 	 if pkg_info | grep "^${package}-[0-9]" >/dev/null 2>&1; then
 	     echo "${package} was detected on the system.  This package is part of the GNOME 1.x"
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 4bc0f76bde6d..3fce2e8a48a0 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
 		gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
 		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
 		gnect:${PORTSDIR}/games/gnomegames2 \
-		gedit:${PORTSDIR}/editors/gedit2 \
+		gedit:${PORTSDIR}/editors/gedit \
 		gnome-terminal:${PORTSDIR}/x11/gnometerminal \
 		gnome-session:${PORTSDIR}/x11/gnomesession \
 		bug-buddy:${PORTSDIR}/devel/bugbuddy \
diff --git a/x11/gnome2/pkg-install b/x11/gnome2/pkg-install
index a4ae8c2ca1c0..f895a8a6c107 100644
--- a/x11/gnome2/pkg-install
+++ b/x11/gnome2/pkg-install
@@ -9,7 +9,7 @@ trap "rm -f ${tmp_pkg_info}" 0
 pkg_info > ${tmp_pkg_info}
 
 if [ "$2" = "PRE-INSTALL" ]; then
-     GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus gedit xalf gnomegames ggv gnomeaudio"
+     GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus xalf gnomegames ggv gnomeaudio"
      for package in ${GNOME_ONE_DESKTOP}; do
 	 if grep "^${package}-[0-9]" ${tmp_pkg_info} >/dev/null 2>&1; then
 	     echo "${package} was detected on the system.  This package is part of the GNOME 1.x"