Remove fast-user-swtch-applet now that is part of GDM. It can be re-added

if it's separated later.


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

6 files changed, 2 insertions, 220 deletions

diff --git a/RMPORTS b/RMPORTS
index 30bf8bc91..e076762df 100644
--- a/RMPORTS
+++ b/RMPORTS
@@ -1 +1,2 @@
 accessibility/gail|x11-toolkits/gtk20|%%DATE%%|Now included with Gtk20
+x11/fast-user-switch-applet|x11/gdm|%%DATE%%|This is now part of GDM
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
deleted file mode 100644
index d426df9a9..000000000
--- a/x11/fast-user-switch-applet/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:	user-selector-applet
-# Date created:		8 May 2004
-# Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
-#
-# $FreeBSD: ports/x11/fast-user-switch-applet/Makefile,v 1.23 2008/03/24 03:50:23 marcus Exp $
-#   $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.31 2008/03/10 01:00:42 mezz Exp $
-#
-
-PORTNAME=	fast-user-switch-applet
-PORTVERSION=	2.22.0
-CATEGORIES=	x11 gnome
-MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Fast user switching applet for GNOME
-
-CONFLICTS=	gdm-2.21.*
-
-USE_BZIP2=	yes
-USE_XLIB=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix gtk20 gnomepanel
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
-		--with-gdm-setup=${LOCALBASE}/sbin/gdmsetup
-
-GCONF_SCHEMAS=	fast-user-switch-applet.schemas
-INSTALLS_OMF=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|\$$"\$$|"$$|' ${WRKSRC}/configure
-
-.include <bsd.port.mk>
diff --git a/x11/fast-user-switch-applet/distinfo b/x11/fast-user-switch-applet/distinfo
deleted file mode 100644
index f4a6dbe06..000000000
--- a/x11/fast-user-switch-applet/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/fast-user-switch-applet-2.22.0.tar.bz2) = 540f2567582e77cdd673dde3546b61db
-SHA256 (gnome2/fast-user-switch-applet-2.22.0.tar.bz2) = 8278823d988de6fc0b2d89ec3ad245c464e549d44f032f468fc6f2bdaf02c0d4
-SIZE (gnome2/fast-user-switch-applet-2.22.0.tar.bz2) = 763401
diff --git a/x11/fast-user-switch-applet/pkg-descr b/x11/fast-user-switch-applet/pkg-descr
deleted file mode 100644
index da069d11f..000000000
--- a/x11/fast-user-switch-applet/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-The Fast User-Switching Applet is an applet for the GNOME panel which
-provides a menu to switch between users. It integrates with GDM to
-switch between existing X11 sessions or create new ones as needed,
-and will show the same users as the GDM face browser.
diff --git a/x11/fast-user-switch-applet/pkg-plist b/x11/fast-user-switch-applet/pkg-plist
deleted file mode 100644
index ae4718935..000000000
--- a/x11/fast-user-switch-applet/pkg-plist
+++ /dev/null
@@ -1,173 +0,0 @@
-libdata/bonobo/servers/GNOME_FastUserSwitchApplet.server
-libexec/fast-user-switch-applet
-%%DATADIR%%/ui.glade
-share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
-share/gnome/help/fast-user-switch-applet/C/fast-user-switch-applet.xml
-share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-context.png
-share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-icon.png
-share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-prefs.png
-share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-text.png
-share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-username.png
-share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet.png
-share/gnome/help/fast-user-switch-applet/C/legal.xml
-share/gnome/help/fast-user-switch-applet/en_GB/fast-user-switch-applet.xml
-share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-context.png
-share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-icon.png
-share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-prefs.png
-share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-text.png
-share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-username.png
-share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet.png
-share/gnome/help/fast-user-switch-applet/es/fast-user-switch-applet.xml
-share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-context.png
-share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-icon.png
-share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-prefs.png
-share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-text.png
-share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-username.png
-share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet.png
-share/gnome/help/fast-user-switch-applet/fr/fast-user-switch-applet.xml
-share/gnome/help/fast-user-switch-applet/fr/figures/fast_user_switch_applet-context.png
-share/gnome/help/fast-user-switch-applet/fr/figures/fast_user_switch_applet-icon.png
-share/gnome/help/fast-user-switch-applet/fr/figures/fast_user_switch_applet-prefs.png
-share/gnome/help/fast-user-switch-applet/fr/figures/fast_user_switch_applet-text.png
-share/gnome/help/fast-user-switch-applet/fr/figures/fast_user_switch_applet-username.png
-share/gnome/help/fast-user-switch-applet/fr/figures/fast_user_switch_applet.png
-share/gnome/help/fast-user-switch-applet/oc/fast-user-switch-applet.xml
-share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-context.png
-share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-icon.png
-share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-prefs.png
-share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-text.png
-share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-username.png
-share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet.png
-share/gnome/help/fast-user-switch-applet/pa/fast-user-switch-applet.xml
-share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-context.png
-share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-icon.png
-share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-prefs.png
-share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-text.png
-share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-username.png
-share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet.png
-share/gnome/help/fast-user-switch-applet/sr/fast-user-switch-applet.xml
-share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-context.png
-share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-icon.png
-share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-prefs.png
-share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-text.png
-share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-username.png
-share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet.png
-share/gnome/help/fast-user-switch-applet/sv/fast-user-switch-applet.xml
-share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-context.png
-share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-icon.png
-share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-prefs.png
-share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-text.png
-share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-username.png
-share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet.png
-share/locale/ar/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/be@latin/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/bg/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/bn/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/bn_IN/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/ca/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/cs/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/cy/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/da/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/de/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/dz/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/el/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/en_CA/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/en_GB/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/es/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/et/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/eu/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/fa/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/fi/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/fr/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/gl/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/gu/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/he/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/hi/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/hu/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/id/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/it/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/ja/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/ka/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/ko/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/ku/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/lt/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/lv/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/mg/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/mk/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/ml/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/mn/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/mr/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/nb/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/ne/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/nl/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/nn/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/oc/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/or/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/pa/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/pl/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/ps/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/pt/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/pt_BR/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/ru/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/si/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/sk/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/sl/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/sq/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/sr/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/sr@Latn/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/sv/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/ta/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/th/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/tr/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/uk/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/vi/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/zh_CN/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/zh_HK/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/zh_TW/LC_MESSAGES/fast-user-switch-applet.mo
-share/omf/fast-user-switch-applet/fast-user-switch-applet-C.omf
-share/omf/fast-user-switch-applet/fast-user-switch-applet-en_GB.omf
-share/omf/fast-user-switch-applet/fast-user-switch-applet-es.omf
-share/omf/fast-user-switch-applet/fast-user-switch-applet-fr.omf
-share/omf/fast-user-switch-applet/fast-user-switch-applet-oc.omf
-share/omf/fast-user-switch-applet/fast-user-switch-applet-pa.omf
-share/omf/fast-user-switch-applet/fast-user-switch-applet-sr.omf
-share/omf/fast-user-switch-applet/fast-user-switch-applet-sv.omf
-@dirrm share/omf/fast-user-switch-applet
-@dirrm share/gnome/help/fast-user-switch-applet/sv/figures
-@dirrm share/gnome/help/fast-user-switch-applet/sv
-@dirrm share/gnome/help/fast-user-switch-applet/sr/figures
-@dirrm share/gnome/help/fast-user-switch-applet/sr
-@dirrm share/gnome/help/fast-user-switch-applet/pa/figures
-@dirrm share/gnome/help/fast-user-switch-applet/pa
-@dirrm share/gnome/help/fast-user-switch-applet/oc/figures
-@dirrm share/gnome/help/fast-user-switch-applet/oc
-@dirrm share/gnome/help/fast-user-switch-applet/fr/figures
-@dirrm share/gnome/help/fast-user-switch-applet/fr
-@dirrm share/gnome/help/fast-user-switch-applet/es/figures
-@dirrm share/gnome/help/fast-user-switch-applet/es
-@dirrm share/gnome/help/fast-user-switch-applet/en_GB/figures
-@dirrm share/gnome/help/fast-user-switch-applet/en_GB
-@dirrm share/gnome/help/fast-user-switch-applet/C/figures
-@dirrm share/gnome/help/fast-user-switch-applet/C
-@dirrm share/gnome/help/fast-user-switch-applet
-@dirrm %%DATADIR%%
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 32139bd62..334f5132d 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,7 +3,7 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/x11/gdm/Makefile,v 1.119 2008/03/24 14:15:11 kwm Exp $
 #
 
 PORTNAME=	gdm
@@ -21,8 +21,6 @@ LIB_DEPENDS=	ck-connector.0:${PORTSDIR}/sysutils/consolekit
 RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
 
-CONFLICTS=	fast-user-switch-applet-*
-
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes