12 files changed, 8 insertions, 9 deletions

diff --git a/MOVED b/MOVED
index 18bc210b14c5..3456dc65f5aa 100644
--- a/MOVED
+++ b/MOVED
@@ -404,7 +404,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
-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
 x11-toolkits/eazel-themes||2003-07-15|removed as it depends on sawfish
@@ -1379,3 +1378,4 @@ 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
+print/ggv2|print/ggv|2005-01-25|moved to non-versioned directory
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 445512f2a4ac..92ba51763013 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -17,7 +17,7 @@ COMMENT=		GUI front end for the efax fax program
 
 LIB_DEPENDS=		sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
 LIB_DEPENDS+=		gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtk--2
-RUN_DEPENDS=		${X11BASE}/bin/ggv:${PORTSDIR}/print/ggv2
+RUN_DEPENDS=		${X11BASE}/bin/ggv:${PORTSDIR}/print/ggv
 RUN_DEPENDS+=		${LOCALBASE}/bin/gs:${PORTSDIR}/print/ghostscript-gnu
 
 USE_X_PREFIX=		YES
diff --git a/print/Makefile b/print/Makefile
index 6ca4fb66a036..4e6b1e662f2d 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -68,7 +68,7 @@
     SUBDIR += freetype2
     SUBDIR += ft2demos
     SUBDIR += gfontview
-    SUBDIR += ggv2
+    SUBDIR += ggv
     SUBDIR += ghostscript-afpl
     SUBDIR += ghostscript-afpl-nox11
     SUBDIR += ghostscript-gnu
diff --git a/print/ggv2/Makefile b/print/ggv/Makefile
index 47cf10fe270b..a9b6bf275ce2 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ggv2
+PORTNAME=	ggv
 PORTVERSION=	2.8.2
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
-DISTNAME=	ggv-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/print/ggv2/distinfo b/print/ggv/distinfo
index 62f2c8ea62b2..62f2c8ea62b2 100644
--- a/print/ggv2/distinfo
+++ b/print/ggv/distinfo
diff --git a/print/ggv2/files/patch-src_Makefile.in b/print/ggv/files/patch-src_Makefile.in
index 76847cf3e9b2..76847cf3e9b2 100644
--- a/print/ggv2/files/patch-src_Makefile.in
+++ b/print/ggv/files/patch-src_Makefile.in
diff --git a/print/ggv2/pkg-descr b/print/ggv/pkg-descr
index c59727e1facc..c59727e1facc 100644
--- a/print/ggv2/pkg-descr
+++ b/print/ggv/pkg-descr
diff --git a/print/ggv2/pkg-plist b/print/ggv/pkg-plist
index bb916303feb0..bb916303feb0 100644
--- a/print/ggv2/pkg-plist
+++ b/print/ggv/pkg-plist
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 961f02b9ad5c..57cd6ca5365c 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -32,7 +32,7 @@ RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
 		${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \
 		file-roller:${PORTSDIR}/archivers/fileroller \
 		${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
-		ggv:${PORTSDIR}/print/ggv2 \
+		ggv:${PORTSDIR}/print/ggv \
 		gcalctool:${PORTSDIR}/math/gcalctool \
 		gucharmap:${PORTSDIR}/deskutils/gucharmap \
 		gst-thumbnail:${PORTSDIR}/multimedia/nautilus-media \
diff --git a/x11/gnome2-lite/pkg-install b/x11/gnome2-lite/pkg-install
index 9fd2c0a2a302..cbcc46bbdc38 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 xalf gnomegames eog ggv gnomeaudio"
+     GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus xalf gnomegames eog 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 3fce2e8a48a0..c3445206dc10 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -36,7 +36,7 @@ RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
 		${X11BASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \
 		file-roller:${PORTSDIR}/archivers/fileroller \
 		${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
-		ggv:${PORTSDIR}/print/ggv2 \
+		ggv:${PORTSDIR}/print/ggv \
 		gok:${PORTSDIR}/accessibility/gok \
 		gpdf:${PORTSDIR}/graphics/gpdf \
 		nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \
diff --git a/x11/gnome2/pkg-install b/x11/gnome2/pkg-install
index f895a8a6c107..bfdf05775d46 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 xalf gnomegames ggv gnomeaudio"
+     GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus xalf gnomegames 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"