- Move x11/gdm2 to x11/gdm

svn path=/head/; revision=127239

MOVED

@@ -391,7 +391,6 @@ www/xswallow||2003-07-12|port is obsolete
 net/gnut||2003-07-12|security vulnerability, and no active development
 www/mod_log_mysql|www/mod_log_sql|2003-07-12|renamed by author in new version
 x11/gnomecore||2003-07-15|removed as part of GNOME 1.4 desktop phase out
-x11/gdm||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11/gnomeapplets||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 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
@@ -1379,3 +1378,4 @@ 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
+x11/gdm2|x11/gdm|2005-01-25|moved to non-versioned directory

x11-wm/xfce4/Makefile

@@ -31,7 +31,7 @@ WITH_GDM=	yes
 .endif
 
 .if defined(WITH_GDM)
-RUN_DEPENDS+=	${X11BASE}/bin/gdm:${PORTSDIR}/x11/gdm2
+RUN_DEPENDS+=	${X11BASE}/bin/gdm:${PORTSDIR}/x11/gdm
 PLIST_SUB+=	GDM=""
 .else
 PLIST_SUB+=	GDM="@comment "

x11/Makefile

@@ -53,7 +53,7 @@
     SUBDIR += gcursor
     SUBDIR += gdesklets-tasklist
     SUBDIR += gdkxft
-    SUBDIR += gdm2
+    SUBDIR += gdm
     SUBDIR += ggiterm
     SUBDIR += gmessage
     SUBDIR += gmrun

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

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"

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 \

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"