3 files changed, 42 insertions, 10 deletions

diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index d935dbf4fe31..a5066dfde616 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -3,24 +3,25 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.12 2006/04/13 07:52:39 bland Exp $
 
 PORTNAME=	fast-user-switch-applet
-PORTVERSION=	0.2.4
+PORTVERSION=	2.14.1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	http://ignore-your.tv/downloads/fusa/ \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%/bland/}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	bland@FreeBSD.org
+MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Fast user switching applet for GNOME
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix gtk20 gnomepanel
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gdm-config=${X11BASE}/etc/gdm/gdm.conf
-USE_REINPLACE=	yes
+CONFIGURE_ARGS=	--with-gdm-config=${X11BASE}/etc/gdm/custom.conf \
+		--with-gdm-setup=${X11BASE}/sbin/gdmsetup
 
 GCONF_SCHEMAS=	fast-user-switch-applet.schemas
 INSTALLS_OMF=	yes
diff --git a/x11/fast-user-switch-applet/distinfo b/x11/fast-user-switch-applet/distinfo
index 01a8ddca1a30..8a83abaae87f 100644
--- a/x11/fast-user-switch-applet/distinfo
+++ b/x11/fast-user-switch-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/fast-user-switch-applet-0.2.4.tar.gz) = 263c12c7a0a043582ec4a0c900e84961
-SHA256 (gnome2/fast-user-switch-applet-0.2.4.tar.gz) = ff7348db5020852aca15f6034af1706b9254a87c86c2a4ec8c35a423aa79ab3e
-SIZE (gnome2/fast-user-switch-applet-0.2.4.tar.gz) = 530165
+MD5 (gnome2/fast-user-switch-applet-2.14.1.tar.bz2) = 2cca4e96a27810738ce4def15bd49c8a
+SHA256 (gnome2/fast-user-switch-applet-2.14.1.tar.bz2) = cc3373b2079a4b0358a62040eb6d82cb8292cf2bbb5f2c56167f2c415a85c3b0
+SIZE (gnome2/fast-user-switch-applet-2.14.1.tar.bz2) = 491189
diff --git a/x11/fast-user-switch-applet/pkg-plist b/x11/fast-user-switch-applet/pkg-plist
index b0a9470b7bb9..f68644981ae3 100644
--- a/x11/fast-user-switch-applet/pkg-plist
+++ b/x11/fast-user-switch-applet/pkg-plist
@@ -3,15 +3,46 @@ libexec/fast-user-switch-applet
 share/gnome/fast-user-switch-applet/ui.glade
 share/gnome/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/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/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/omf/fast-user-switch-applet/fast-user-switch-applet-C.omf
 share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-es.omf
+share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-pa.omf
 share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-sr.omf
 @dirrm share/gnome/omf/fast-user-switch-applet
+@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/es/figures
 @dirrm share/gnome/help/fast-user-switch-applet/es
+@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 share/gnome/fast-user-switch-applet