From 432cd995b5f29d52c4f85180e72658f87dcaf5f1 Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Mon, 24 Jan 2005 23:26:24 +0000 Subject: [PATCH] - Move x11/gdm2 to x11/gdm --- MOVED | 2 +- x11-wm/xfce4/Makefile | 2 +- x11/Makefile | 2 +- x11/{gdm2 => gdm}/Makefile | 3 +-- x11/{gdm2 => gdm}/distinfo | 0 x11/{gdm2 => gdm}/files/gdm.sh.sample | 0 x11/{gdm2 => gdm}/files/patch-config_Makefile.in | 0 .../files/patch-ab => gdm/files/patch-config_gdm.conf.in} | 0 x11/{gdm2 => gdm}/files/patch-config_locale.alias | 0 x11/{gdm2 => gdm}/files/patch-configure | 0 x11/{gdm2 => gdm}/files/patch-gui_gdmsetup.c | 0 x11/{gdm2 => gdm}/pkg-descr | 0 x11/{gdm2 => gdm}/pkg-install | 0 x11/{gdm2 => gdm}/pkg-message | 0 x11/{gdm2 => gdm}/pkg-plist | 0 x11/gnome2-lite/pkg-install | 2 +- x11/gnome2/Makefile | 2 +- x11/gnome2/pkg-install | 2 +- 18 files changed, 7 insertions(+), 8 deletions(-) rename x11/{gdm2 => gdm}/Makefile (97%) rename x11/{gdm2 => gdm}/distinfo (100%) rename x11/{gdm2 => gdm}/files/gdm.sh.sample (100%) rename x11/{gdm2 => gdm}/files/patch-config_Makefile.in (100%) rename x11/{gdm2/files/patch-ab => gdm/files/patch-config_gdm.conf.in} (100%) rename x11/{gdm2 => gdm}/files/patch-config_locale.alias (100%) rename x11/{gdm2 => gdm}/files/patch-configure (100%) rename x11/{gdm2 => gdm}/files/patch-gui_gdmsetup.c (100%) rename x11/{gdm2 => gdm}/pkg-descr (100%) rename x11/{gdm2 => gdm}/pkg-install (100%) rename x11/{gdm2 => gdm}/pkg-message (100%) rename x11/{gdm2 => gdm}/pkg-plist (100%) diff --git a/MOVED b/MOVED index 39a00f54dfac..97fa89d1dde0 100644 --- a/MOVED +++ b/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 diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile index 3ddb14dcfdc5..aa0de29f19a0 100644 --- a/x11-wm/xfce4/Makefile +++ b/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 " 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 similarity index 97% rename from x11/gdm2/Makefile rename to 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 similarity index 100% rename from x11/gdm2/distinfo rename to x11/gdm/distinfo diff --git a/x11/gdm2/files/gdm.sh.sample b/x11/gdm/files/gdm.sh.sample similarity index 100% rename from x11/gdm2/files/gdm.sh.sample rename to x11/gdm/files/gdm.sh.sample diff --git a/x11/gdm2/files/patch-config_Makefile.in b/x11/gdm/files/patch-config_Makefile.in similarity index 100% rename from x11/gdm2/files/patch-config_Makefile.in rename to x11/gdm/files/patch-config_Makefile.in diff --git a/x11/gdm2/files/patch-ab b/x11/gdm/files/patch-config_gdm.conf.in similarity index 100% rename from x11/gdm2/files/patch-ab rename to 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 similarity index 100% rename from x11/gdm2/files/patch-config_locale.alias rename to x11/gdm/files/patch-config_locale.alias diff --git a/x11/gdm2/files/patch-configure b/x11/gdm/files/patch-configure similarity index 100% rename from x11/gdm2/files/patch-configure rename to x11/gdm/files/patch-configure diff --git a/x11/gdm2/files/patch-gui_gdmsetup.c b/x11/gdm/files/patch-gui_gdmsetup.c similarity index 100% rename from x11/gdm2/files/patch-gui_gdmsetup.c rename to x11/gdm/files/patch-gui_gdmsetup.c diff --git a/x11/gdm2/pkg-descr b/x11/gdm/pkg-descr similarity index 100% rename from x11/gdm2/pkg-descr rename to x11/gdm/pkg-descr diff --git a/x11/gdm2/pkg-install b/x11/gdm/pkg-install similarity index 100% rename from x11/gdm2/pkg-install rename to x11/gdm/pkg-install diff --git a/x11/gdm2/pkg-message b/x11/gdm/pkg-message similarity index 100% rename from x11/gdm2/pkg-message rename to x11/gdm/pkg-message diff --git a/x11/gdm2/pkg-plist b/x11/gdm/pkg-plist similarity index 100% rename from x11/gdm2/pkg-plist rename to 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"