diff options
-rw-r--r-- | CVSROOT/modules | 2 | ||||
-rw-r--r-- | MOVED | 1 | ||||
-rw-r--r-- | x11/Makefile | 2 | ||||
-rw-r--r-- | x11/fast-user-switch-applet/Makefile | 12 | ||||
-rw-r--r-- | x11/fast-user-switch-applet/distinfo | 4 | ||||
-rw-r--r-- | x11/fast-user-switch-applet/files/patch-src::esco-gdm::esco-user.c | 11 | ||||
-rw-r--r-- | x11/fast-user-switch-applet/files/patch-src::esco-gdm::vi-misc.c | 17 | ||||
-rw-r--r-- | x11/fast-user-switch-applet/pkg-descr | 6 | ||||
-rw-r--r-- | x11/fast-user-switch-applet/pkg-plist | 13 | ||||
-rw-r--r-- | x11/user-selector-applet/Makefile | 24 | ||||
-rw-r--r-- | x11/user-selector-applet/distinfo | 2 | ||||
-rw-r--r-- | x11/user-selector-applet/files/patch-src::esco-gdm::esco-user.c | 11 | ||||
-rw-r--r-- | x11/user-selector-applet/files/patch-src::esco-gdm::vi-misc.c | 17 | ||||
-rw-r--r-- | x11/user-selector-applet/pkg-descr | 2 | ||||
-rw-r--r-- | x11/user-selector-applet/pkg-plist | 8 |
15 files changed, 21 insertions, 111 deletions
diff --git a/CVSROOT/modules b/CVSROOT/modules index 00a8815838e1..11081a1b21c7 100644 --- a/CVSROOT/modules +++ b/CVSROOT/modules @@ -2042,6 +2042,7 @@ fampp ports/devel/fampp fandango ports/cad/fandango farblazer ports/games/farblazer fargoal ports/games/fargoal +fast-user-switch-applet ports/x11/fast-user-switch-applet fasta ports/biology/fasta fasta3 ports/biology/fasta3 fastcrc ports/devel/fastcrc @@ -11590,7 +11591,6 @@ urwfonts-ttf ports/x11-fonts/urwfonts-ttf us-zipcodes ports/misc/us-zipcodes uschedule ports/sysutils/uschedule usendmail ports/mail/usendmail -user-selector-applet ports/x11/user-selector-applet useracc ports/databases/useracc userinfo ports/sysutils/userinfo userlist ports/sysutils/userlist @@ -1460,3 +1460,4 @@ sysutils/gdesklets-sysinfo||2005-04-26|Project abandoned mail/sendmail812|mail/sendmail|2005-04-26|obsolete net/licq-jons-gtk-gui||2005-04-26|Project abandoned mail/courier-authlib|security/courier-authlib|2005-04-26|moved into the right category +x11/user-selector-applet|x11/fast-user-switch-applet|2005-04-30|Project renamed diff --git a/x11/Makefile b/x11/Makefile index 10615448a0c7..57962c89ddb0 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -45,6 +45,7 @@ SUBDIR += erun SUBDIR += eterm SUBDIR += eweather + SUBDIR += fast-user-switch-applet SUBDIR += fbdesk SUBDIR += fbpanel SUBDIR += fbsd-icons @@ -174,7 +175,6 @@ SUBDIR += temperature.app SUBDIR += tkgoodstuff SUBDIR += tycoon - SUBDIR += user-selector-applet SUBDIR += vdesk SUBDIR += wdm SUBDIR += wmappl diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile index 4691bc952ee2..687383269a23 100644 --- a/x11/fast-user-switch-applet/Makefile +++ b/x11/fast-user-switch-applet/Makefile @@ -5,11 +5,10 @@ # $FreeBSD$ # -PORTNAME= user-selector-applet -PORTVERSION= 0.0.7 -PORTREVISION= 3 +PORTNAME= fast-user-switch-applet +PORTVERSION= 0.2.1 CATEGORIES= x11 gnome -MASTER_SITES= http://esco.mine.nu/downloads/ \ +MASTER_SITES= http://ignore-your.tv/downloads/fusa/ \ ${MASTER_SITE_LOCAL:S/%SUBDIR%/bland/} DIST_SUBDIR= gnome2 @@ -18,7 +17,10 @@ COMMENT= Fast user switching applet for GNOME USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gtk20 gnomepanel +USE_GNOME= gnomehack intlhack gnomeprefix gtk20 gnomepanel USE_LIBTOOL_VER= 15 +CONFIGURE_ARGS= --with-gdm-config=${X11BASE}/etc/gdm/gdm.conf + +GCONF_SCHEMAS= fast-user-switch-applet.schemas .include <bsd.port.mk> diff --git a/x11/fast-user-switch-applet/distinfo b/x11/fast-user-switch-applet/distinfo index 174f7655c7bc..d58f8565f808 100644 --- a/x11/fast-user-switch-applet/distinfo +++ b/x11/fast-user-switch-applet/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/user-selector-applet-0.0.7.tar.gz) = 8ee0515a0d3454831d4a1a5562b67415 -SIZE (gnome2/user-selector-applet-0.0.7.tar.gz) = 413494 +MD5 (gnome2/fast-user-switch-applet-0.2.1.tar.gz) = 8fa4558d685f359b33223c1a9edc6cb3 +SIZE (gnome2/fast-user-switch-applet-0.2.1.tar.gz) = 399313 diff --git a/x11/fast-user-switch-applet/files/patch-src::esco-gdm::esco-user.c b/x11/fast-user-switch-applet/files/patch-src::esco-gdm::esco-user.c deleted file mode 100644 index f0a027376276..000000000000 --- a/x11/fast-user-switch-applet/files/patch-src::esco-gdm::esco-user.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/esco-gdm/esco-user.c.orig Mon Jun 21 00:47:26 2004 -+++ src/esco-gdm/esco-user.c Mon Jun 21 00:40:35 2004 -@@ -611,6 +611,8 @@ - - mgr = esco_screen_manager_get_default (); - -+ user->screen_changed_id = g_signal_connect (mgr, "new-screen", -+ G_CALLBACK (screen_changed_cb), user); - user->screen_changed_id = g_signal_connect (mgr, "screen-changed", - G_CALLBACK (screen_changed_cb), user); - user->screen_closed_id = g_signal_connect (mgr, "screen-closed", G_CALLBACK (screen_closed_cb), diff --git a/x11/fast-user-switch-applet/files/patch-src::esco-gdm::vi-misc.c b/x11/fast-user-switch-applet/files/patch-src::esco-gdm::vi-misc.c deleted file mode 100644 index fef6cca0aa73..000000000000 --- a/x11/fast-user-switch-applet/files/patch-src::esco-gdm::vi-misc.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/esco-gdm/ve-misc.c.orig Sat May 8 23:13:22 2004 -+++ src/esco-gdm/ve-misc.c Sat May 8 23:23:40 2004 -@@ -431,13 +431,13 @@ - * of environment. - * - **/ -+extern char **environ; - void - ve_clearenv (void) - { - #ifdef HAVE_CLEARENV - clearenv (); - #else -- extern char **environ; - environ[0] = NULL; - #endif - } diff --git a/x11/fast-user-switch-applet/pkg-descr b/x11/fast-user-switch-applet/pkg-descr index e7c7ec80f6cf..da069d11fc00 100644 --- a/x11/fast-user-switch-applet/pkg-descr +++ b/x11/fast-user-switch-applet/pkg-descr @@ -1,2 +1,4 @@ -The User Selector Applet is an applet for the GNOME 2.6 panel which allows for -MacOS X-style fast-user-switching. +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 index a4b21555b5e7..c81f6d85674b 100644 --- a/x11/fast-user-switch-applet/pkg-plist +++ b/x11/fast-user-switch-applet/pkg-plist @@ -1,8 +1,5 @@ -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/user-selector-applet.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/user-selector-applet.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/user-selector-applet.schemas > /dev/null || /usr/bin/true -libdata/bonobo/servers/GNOME_UserSelectorApplet.server -libexec/user-selector-applet -share/icons/hicolor/16x16/apps/gdm-xnest.png -share/icons/hicolor/32x32/apps/gdm-xnest.png -share/icons/hicolor/48x48/apps/gdm-xnest.png +libdata/bonobo/servers/GNOME_FastUserSwitchApplet.server +libexec/fast-user-switch-applet +share/gnome/fast-user-switch-applet/ui.glade +share/gnome/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml +@dirrm share/gnome/fast-user-switch-applet diff --git a/x11/user-selector-applet/Makefile b/x11/user-selector-applet/Makefile deleted file mode 100644 index 4691bc952ee2..000000000000 --- a/x11/user-selector-applet/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# New ports collection makefile for: user-selector-applet -# Date created: 8 May 2004 -# Whom: Alexander Nedotsukov <bland@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= user-selector-applet -PORTVERSION= 0.0.7 -PORTREVISION= 3 -CATEGORIES= x11 gnome -MASTER_SITES= http://esco.mine.nu/downloads/ \ - ${MASTER_SITE_LOCAL:S/%SUBDIR%/bland/} -DIST_SUBDIR= gnome2 - -MAINTAINER= bland@FreeBSD.org -COMMENT= Fast user switching applet for GNOME - -USE_X_PREFIX= yes -USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gtk20 gnomepanel -USE_LIBTOOL_VER= 15 - -.include <bsd.port.mk> diff --git a/x11/user-selector-applet/distinfo b/x11/user-selector-applet/distinfo deleted file mode 100644 index 174f7655c7bc..000000000000 --- a/x11/user-selector-applet/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (gnome2/user-selector-applet-0.0.7.tar.gz) = 8ee0515a0d3454831d4a1a5562b67415 -SIZE (gnome2/user-selector-applet-0.0.7.tar.gz) = 413494 diff --git a/x11/user-selector-applet/files/patch-src::esco-gdm::esco-user.c b/x11/user-selector-applet/files/patch-src::esco-gdm::esco-user.c deleted file mode 100644 index f0a027376276..000000000000 --- a/x11/user-selector-applet/files/patch-src::esco-gdm::esco-user.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/esco-gdm/esco-user.c.orig Mon Jun 21 00:47:26 2004 -+++ src/esco-gdm/esco-user.c Mon Jun 21 00:40:35 2004 -@@ -611,6 +611,8 @@ - - mgr = esco_screen_manager_get_default (); - -+ user->screen_changed_id = g_signal_connect (mgr, "new-screen", -+ G_CALLBACK (screen_changed_cb), user); - user->screen_changed_id = g_signal_connect (mgr, "screen-changed", - G_CALLBACK (screen_changed_cb), user); - user->screen_closed_id = g_signal_connect (mgr, "screen-closed", G_CALLBACK (screen_closed_cb), diff --git a/x11/user-selector-applet/files/patch-src::esco-gdm::vi-misc.c b/x11/user-selector-applet/files/patch-src::esco-gdm::vi-misc.c deleted file mode 100644 index fef6cca0aa73..000000000000 --- a/x11/user-selector-applet/files/patch-src::esco-gdm::vi-misc.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/esco-gdm/ve-misc.c.orig Sat May 8 23:13:22 2004 -+++ src/esco-gdm/ve-misc.c Sat May 8 23:23:40 2004 -@@ -431,13 +431,13 @@ - * of environment. - * - **/ -+extern char **environ; - void - ve_clearenv (void) - { - #ifdef HAVE_CLEARENV - clearenv (); - #else -- extern char **environ; - environ[0] = NULL; - #endif - } diff --git a/x11/user-selector-applet/pkg-descr b/x11/user-selector-applet/pkg-descr deleted file mode 100644 index e7c7ec80f6cf..000000000000 --- a/x11/user-selector-applet/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -The User Selector Applet is an applet for the GNOME 2.6 panel which allows for -MacOS X-style fast-user-switching. diff --git a/x11/user-selector-applet/pkg-plist b/x11/user-selector-applet/pkg-plist deleted file mode 100644 index a4b21555b5e7..000000000000 --- a/x11/user-selector-applet/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/user-selector-applet.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/user-selector-applet.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/user-selector-applet.schemas > /dev/null || /usr/bin/true -libdata/bonobo/servers/GNOME_UserSelectorApplet.server -libexec/user-selector-applet -share/icons/hicolor/16x16/apps/gdm-xnest.png -share/icons/hicolor/32x32/apps/gdm-xnest.png -share/icons/hicolor/48x48/apps/gdm-xnest.png |