- Move graphics/eog2 to graphics/eog

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3489 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 5 insertions, 6 deletions

diff --git a/graphics/eog2/Makefile b/graphics/eog/Makefile
index 0fa69c3dd..e62f13025 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	eog2
+PORTNAME=	eog
 PORTVERSION=	2.9.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.9
-DISTNAME=	eog-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/eog2/distinfo b/graphics/eog/distinfo
index 998531959..998531959 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog/distinfo
diff --git a/graphics/eog2/pkg-descr b/graphics/eog/pkg-descr
index fa7565d4c..fa7565d4c 100644
--- a/graphics/eog2/pkg-descr
+++ b/graphics/eog/pkg-descr
diff --git a/graphics/eog2/pkg-plist b/graphics/eog/pkg-plist
index 52a7dd9f2..52a7dd9f2 100644
--- a/graphics/eog2/pkg-plist
+++ b/graphics/eog/pkg-plist
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index b28304120..a4f4dd871 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/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \
 		gnome-cd:${PORTSDIR}/audio/gnomemedia2 \
 	 	gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \
-		eog:${PORTSDIR}/graphics/eog2 \
+		eog:${PORTSDIR}/graphics/eog \
 		gedit:${PORTSDIR}/editors/gedit2 \
 		gnome-terminal:${PORTSDIR}/x11/gnometerminal \
 		gnome-session:${PORTSDIR}/x11/gnomesession \
diff --git a/x11/gnome2-lite/pkg-install b/x11/gnome2-lite/pkg-install
index e14114b1e..514bb6177 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 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 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 d27349680..1208610d5 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/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \
 		gnome-cd:${PORTSDIR}/audio/gnomemedia2 \
 	 	gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \
-		eog:${PORTSDIR}/graphics/eog2 \
+		eog:${PORTSDIR}/graphics/eog \
 		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
 		gnect:${PORTSDIR}/games/gnomegames2 \
 		gedit:${PORTSDIR}/editors/gedit2 \
diff --git a/x11/gnome2/pkg-install b/x11/gnome2/pkg-install
index 5e67f1e0e..2bd32b570 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"