16 files changed, 5 insertions, 6 deletions

diff --git a/x11/Makefile b/x11/Makefile
index c6296d9daf6d..3e9b17af6796 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -53,7 +53,7 @@
     SUBDIR += gcursor
     SUBDIR += gdesklets-tasklist
     SUBDIR += gdkxft
-    SUBDIR += gdm2
+    SUBDIR += gdm
     SUBDIR += ggiterm
     SUBDIR += gmessage
     SUBDIR += gmrun
diff --git a/x11/gdm2/Makefile b/x11/gdm/Makefile
index 1c6cc36e2087..d0f7e38ebf9b 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gdm2
+PORTNAME=	gdm
 PORTVERSION=	2.6.0.6
 PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.6
-DISTNAME=	gdm-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/gdm2/distinfo b/x11/gdm/distinfo
index ff06b0d61aef..ff06b0d61aef 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm/distinfo
diff --git a/x11/gdm2/files/gdm.sh.sample b/x11/gdm/files/gdm.sh.sample
index 1b9f904996e0..1b9f904996e0 100644
--- a/x11/gdm2/files/gdm.sh.sample
+++ b/x11/gdm/files/gdm.sh.sample
diff --git a/x11/gdm2/files/patch-config_Makefile.in b/x11/gdm/files/patch-config_Makefile.in
index 9678f710c061..9678f710c061 100644
--- a/x11/gdm2/files/patch-config_Makefile.in
+++ b/x11/gdm/files/patch-config_Makefile.in
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm/files/patch-config_gdm.conf.in
index 6f1a1e6f562e..6f1a1e6f562e 100644
--- a/x11/gdm2/files/patch-ab
+++ b/x11/gdm/files/patch-config_gdm.conf.in
diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias
index 27ffdec94143..27ffdec94143 100644
--- a/x11/gdm2/files/patch-config_locale.alias
+++ b/x11/gdm/files/patch-config_locale.alias
diff --git a/x11/gdm2/files/patch-configure b/x11/gdm/files/patch-configure
index cbbc44334163..cbbc44334163 100644
--- a/x11/gdm2/files/patch-configure
+++ b/x11/gdm/files/patch-configure
diff --git a/x11/gdm2/files/patch-gui_gdmsetup.c b/x11/gdm/files/patch-gui_gdmsetup.c
index c1eedd5cb703..c1eedd5cb703 100644
--- a/x11/gdm2/files/patch-gui_gdmsetup.c
+++ b/x11/gdm/files/patch-gui_gdmsetup.c
diff --git a/x11/gdm2/pkg-descr b/x11/gdm/pkg-descr
index 6462c8bc7e60..6462c8bc7e60 100644
--- a/x11/gdm2/pkg-descr
+++ b/x11/gdm/pkg-descr
diff --git a/x11/gdm2/pkg-install b/x11/gdm/pkg-install
index 135a9286b5c1..135a9286b5c1 100644
--- a/x11/gdm2/pkg-install
+++ b/x11/gdm/pkg-install
diff --git a/x11/gdm2/pkg-message b/x11/gdm/pkg-message
index 0cb31d808339..0cb31d808339 100644
--- a/x11/gdm2/pkg-message
+++ b/x11/gdm/pkg-message
diff --git a/x11/gdm2/pkg-plist b/x11/gdm/pkg-plist
index 754dfa3ae944..754dfa3ae944 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm/pkg-plist
diff --git a/x11/gnome2-lite/pkg-install b/x11/gnome2-lite/pkg-install
index e14114b1efe6..68700918caaa 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 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 37ca46a7ab51..4bc0f76bde6d 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
 		gnome-system-monitor:${PORTSDIR}/sysutils/gnomesystemmonitor \
 		nautilus:${PORTSDIR}/x11-fm/nautilus2 \
 		yelp:${PORTSDIR}/x11/yelp \
-		gdm:${PORTSDIR}/x11/gdm2 \
+		gdm:${PORTSDIR}/x11/gdm \
 		screensaver-properties-capplet:${PORTSDIR}/x11/xscreensaver-gnome \
 		${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \
 		${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \
diff --git a/x11/gnome2/pkg-install b/x11/gnome2/pkg-install
index 2bd32b570251..a4ae8c2ca1c0 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 ggv gnomeaudio"
+     GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus gedit 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"