9 files changed, 6 insertions, 7 deletions

diff --git a/MOVED b/MOVED
index eb4719b774bf..39a00f54dfac 100644
--- a/MOVED
+++ b/MOVED
@@ -406,7 +406,6 @@ audio/gnomeaudio||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 games/gnomegames||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 misc/gnomeutils||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 misc/gnomeuserdocs||2003-07-15|removed as part of GNOME 1.4 desktop phase out
-graphics/eog||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 print/ggv||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11-wm/spager||2003-07-15|removed as it depends on sawfish
 mail/gtkgrepmail||2003-07-15|removed as it depends on gnomecore
@@ -1379,3 +1378,4 @@ sysutils/task|sysutils/sleuthkit|2005-01-19|broken, unmaintained, better alterna
 graphics/gthumb2|graphics/gthumb|2005-01-23|moved to non-versioned directory
 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
diff --git a/graphics/Makefile b/graphics/Makefile
index dbc280f857d4..e7aaf84c4207 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -76,7 +76,7 @@
     SUBDIR += enblend
     SUBDIR += enfle
     SUBDIR += entice
-    SUBDIR += eog2
+    SUBDIR += eog
     SUBDIR += epeg
     SUBDIR += epix
     SUBDIR += eps2png
diff --git a/graphics/eog2/Makefile b/graphics/eog/Makefile
index 9ed06186a75b..ffe019d9203e 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	eog2
+PORTNAME=	eog
 PORTVERSION=	2.8.2
 PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
-DISTNAME=	eog-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/eog2/distinfo b/graphics/eog/distinfo
index 224d1571117e..224d1571117e 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog/distinfo
diff --git a/graphics/eog2/pkg-descr b/graphics/eog/pkg-descr
index fa7565d4c743..fa7565d4c743 100644
--- a/graphics/eog2/pkg-descr
+++ b/graphics/eog/pkg-descr
diff --git a/graphics/eog2/pkg-plist b/graphics/eog/pkg-plist
index 61b80e5a1daa..61b80e5a1daa 100644
--- a/graphics/eog2/pkg-plist
+++ b/graphics/eog/pkg-plist
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 3dab18231534..a5e801701300 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -19,7 +19,7 @@ COMMENT=	The "meta-port" of the GNOME desktop slimmed down for FreeBSD releases
 RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
 		gnome-cd:${PORTSDIR}/audio/gnomemedia2 \
 	 	gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \
-		eog:${PORTSDIR}/graphics/eog2 \
+		eog:${PORTSDIR}/graphics/eog \
 		gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
 		gedit:${PORTSDIR}/editors/gedit2 \
 		gnome-terminal:${PORTSDIR}/x11/gnometerminal \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 58850e2dd0bd..37ca46a7ab51 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -18,7 +18,7 @@ COMMENT=	The "meta-port" for the GNOME 2 integrated X11 desktop
 RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
 		gnome-cd:${PORTSDIR}/audio/gnomemedia2 \
 	 	gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \
-		eog:${PORTSDIR}/graphics/eog2 \
+		eog:${PORTSDIR}/graphics/eog \
 		gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
 		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
 		gnect:${PORTSDIR}/games/gnomegames2 \
diff --git a/x11/gnome2/pkg-install b/x11/gnome2/pkg-install
index 5e67f1e0e5de..2bd32b570251 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 gdm eog ggv gnomeaudio"
+     GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus gedit xalf gnomegames gdm 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"