* Update to 2.8.0.3

* Fix a long-standing bug where gdmphotosetup would not work as a non-root
  user since it could not open the glade files

8 files changed, 54 insertions, 75 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 822339ed6842..ff657b357763 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.8.0.1
+PORTVERSION=	2.8.0.3
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.8
@@ -20,11 +21,15 @@ USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 USE_RC_SUBR=	gdm.sh
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui librsvg2
+USE_GNOME=	gnomehack intlhack gnomehier libgnomeui librsvg2
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
+CONFIGURE_ARGS=	--localstatedir=/var --datadir=${PREFIX}/share/gnome \
+		--with-html-dir=${GNOME_HTML_DIR} \
+		--disable-gtk-doc \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		GTKDOC="false"
 
 GDMDIR?=	${PREFIX}/etc/gdm
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 950135394007..be332480fbe8 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gdm-2.8.0.1.tar.bz2) = b3925c68b828fbb63994eba577c4b4fd
-SIZE (gnome2/gdm-2.8.0.1.tar.bz2) = 3522871
+MD5 (gnome2/gdm-2.8.0.3.tar.bz2) = e5fc040850ae90c456716d3dd6493f27
+SIZE (gnome2/gdm-2.8.0.3.tar.bz2) = 3920359
diff --git a/x11/gdm/files/patch-config_gdm.conf.in b/x11/gdm/files/patch-config_gdm.conf.in
index 69c304581ba2..2d680f75d17e 100644
--- a/x11/gdm/files/patch-config_gdm.conf.in
+++ b/x11/gdm/files/patch-config_gdm.conf.in
@@ -1,5 +1,5 @@
---- config/gdm.conf.in.orig	Mon Feb 14 17:49:35 2005
-+++ config/gdm.conf.in	Mon Mar  7 20:53:24 2005
+--- config/gdm.conf.in.orig	Fri Aug  5 00:34:59 2005
++++ config/gdm.conf.in	Tue Aug  9 02:02:44 2005
 @@ -76,7 +76,7 @@
  # To try to kill all clients started at greeter time or in the Init script.
  # doesn't always work, only if those clients have a window of their own
@@ -24,12 +24,12 @@
  # Should double login be treated with a warning (and possibility to change
  # vts on linux and freebsd systems for console logins)
  #DoubleLoginWarning=true
-@@ -240,7 +240,7 @@
+@@ -250,7 +250,7 @@
  # The specific gtkrc file we use.  It should be the full path to the gtkrc
  # that we need.  Unless you need a specific gtkrc that doesn't correspond to
  # a specific theme, then just use the GtkTheme key
--#GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc
-+GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc
+-#GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc
++#GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc
  
  # The GTK+ theme to use for the gui
  #GtkTheme=Default
diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias
index 60a61690277c..ca653e463eec 100644
--- a/x11/gdm/files/patch-config_locale.alias
+++ b/x11/gdm/files/patch-config_locale.alias
@@ -20,8 +20,8 @@
 -Breton			br_FR.UTF-8,br_FR
 -Bulgarian		bg_BG.UTF-8,bg_BG
 -Catalan			ca_ES.UTF-8,ca_ES
--Chinese(China Mainland)	zh_CN.UTF-8,zh_CN
--Chinese(Hong Kong)	zh_HK.UTF-8,zh_HK
+-Chinese(ChinaMainland)	zh_CN.UTF-8,zh_CN
+-Chinese(Hong-Kong)	zh_HK.UTF-8,zh_HK
 -Chinese(Singapore)	zh_SG.UTF-8,zh_SG
 -Chinese(Taiwan)		zh_TW.UTF-8,zh_TW
 -Croatian		hr_HR.UTF-8,hr_HR
@@ -114,7 +114,7 @@
 +Catalan                ca_ES.UTF-8,ca_ES.ISO8859-15,ca_ES.ISO8859-1
 +Chinese(simplified)    zh_CN.UTF-8,zh_CN.EUC,zh_CN.eucCN
 +Chinese(traditional)   zh_TW.UTF-8,zh_TW.Big5
-+Chinese(Hong Kong)     zh_HK.UTF-8,zh_HK.Big5HKSCS
++Chinese(Hong-Kong)     zh_HK.UTF-8,zh_HK.Big5HKSCS
 +Croatian               hr_HR.UTF-8,hr_HR.ISO8859-2
 +Czech                  cs_CZ.UTF-8,cs_CZ.ISO8859-2
 +Danish                 da_DK.UTF-8,da_DK.ISO8859-15,da_DK.ISO8859-1
@@ -125,7 +125,7 @@
 +English(British)       en_GB.UTF-8,en_GB.ISO8859-1,en_GB.ISO8859-15
 +English(Canadian)      en_CA.UTF-8,en_CA.ISO8859-1,en_CA.ISO8859-15
 +English(Irish)         en_IE.UTF-8,en_IE.ISO8859-1,en_IE.ISO8859-15
-+English(New Zealand)   en_NZ.UTF-8,en_NZ.ISO8859-1,en_NZ.ISO8859-15
++English(New-Zealand)   en_NZ.UTF-8,en_NZ.ISO8859-1,en_NZ.ISO8859-15
 +Estonian               et_EE.UTF-8,et_EE.ISO8859-15
 +Finnish                fi_FI.UTF-8,fi_FI.ISO8859-15,fi_FI.ISO8859-1
 +French                 fr_FR.UTF-8,fr_FR.ISO8859-15,fr_FR.ISO8859-1
diff --git a/x11/gdm/files/patch-gui_gdmsetup.c b/x11/gdm/files/patch-gui_gdmsetup.c
index a3ae03355fb9..423000cb6fec 100644
--- a/x11/gdm/files/patch-gui_gdmsetup.c
+++ b/x11/gdm/files/patch-gui_gdmsetup.c
@@ -1,35 +1,5 @@
 --- gui/gdmsetup.c.orig	Thu Jun 30 16:47:06 2005
 +++ gui/gdmsetup.c	Mon Jul  4 02:53:12 2005
-@@ -533,6 +533,7 @@ combobox_timeout (GtkWidget *combo_box)
- 		GtkTreeIter iter;
- 		GValue value  = {0, };
- 		gboolean val = ve_config_get_bool (config, key);
-+		gboolean GdmGraphicalThemeRand;
- 		GtkWidget *theme_list = glade_helper_get (xml, "gg_theme_list",
- 			GTK_TYPE_TREE_VIEW);
- 		GtkWidget *del_button = glade_helper_get (xml, "gg_delete_theme",
-@@ -565,7 +566,7 @@ combobox_timeout (GtkWidget *combo_box)
- 		}
- 
- 		/* Update Delete Button's sensitivity */
--	    gboolean GdmGraphicalThemeRand = ve_config_get_bool (
-+	    GdmGraphicalThemeRand = ve_config_get_bool (
-     	    ve_config_get (GDM_CONFIG_FILE),
-         	GDM_KEY_GRAPHICAL_THEME_RAND);
- 		selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (theme_list));
-@@ -575,11 +576,11 @@ combobox_timeout (GtkWidget *combo_box)
- 		{
- 			gtk_widget_set_sensitive (del_button, FALSE);
- 		} else {
-+			GtkTreeModel *model;
- 			/* Default to allow deleting of themes */
- 			gtk_widget_set_sensitive (del_button, TRUE);
- 
- 			/* Determine if the theme selected is currently active */
--			GtkTreeModel *model;
- 			model = gtk_tree_view_get_model (GTK_TREE_VIEW (theme_list));
- 			if (GdmGraphicalThemeRand) {
- 				gtk_tree_model_get_value (model, &iter,
 @@ -3270,7 +3271,7 @@ theme_install_response (GtkWidget *choos
  		/* HACK! */
  		argv[0] = chown;
@@ -39,20 +9,3 @@
  		argv[3] = quoted;
  		argv[4] = NULL;
  		simple_spawn_sync (argv);
-@@ -4024,6 +4025,7 @@ setup_graphical_themes (void)
- 	GtkTreeViewColumn *column;
- 	GtkTreeSelection *selection;
- 	GtkTreeIter *select_iter = NULL;
-+	gboolean GdmGraphicalThemeRand;
- 	GtkWidget *theme_list = glade_helper_get (xml, "gg_theme_list",
- 						  GTK_TYPE_TREE_VIEW);
- 	GtkWidget *button = glade_helper_get (xml, "gg_install_new_theme",
-@@ -4050,7 +4052,7 @@ setup_graphical_themes (void)
- 		  slash (/) character in them, so I just made GDM_DELIMITER_THEMES
- 		  equal to "/:" instead. */
- 
--	gboolean GdmGraphicalThemeRand = ve_config_get_bool (
-+	GdmGraphicalThemeRand = ve_config_get_bool (
- 		ve_config_get (GDM_CONFIG_FILE),
- 		GDM_KEY_GRAPHICAL_THEME_RAND);
- 
diff --git a/x11/gdm/pkg-descr b/x11/gdm/pkg-descr
index aa18f8661195..1699cf5b760f 100644
--- a/x11/gdm/pkg-descr
+++ b/x11/gdm/pkg-descr
@@ -1,4 +1,4 @@
 The GNOME 2.0 version of the xdm display manager.  It supports user
 icons, multiple sessions, and clean system shutdowns.
 
-WWW: http://yippi.hypermall.com/gdm/index.shtml
+WWW: http://www.gnome.org/projects/gdm/
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index 135a9286b5c1..bcce174fd151 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -34,8 +34,12 @@ POST-INSTALL)
 			exit 1
 		fi
 	fi
-	${CHOWN} -R root:${GROUP} ${PKG_PREFIX}/share/gnome/gdm
-	${CHMOD} 1770 ${PKG_PREFIX}/share/gnome/gdm
+	${MKDIR} -p /var/gdm
+	${MKDIR} -p /var/log/gdm
+	${CHOWN} -R root:${GROUP} /var/gdm
+	${CHMOD} 1770 /var/gdm
+	${CHOWN} root:wheel ${PKG_PREFIX}/share/gnome/gdm
+	${CHMOD} 0755 ${PKG_PREFIX}/share/gnome/gdm
 
 	${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions
 	exit 0
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 6379034e91e0..39b0dcb8880c 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -36,10 +36,11 @@ sbin/gdm-stop
 sbin/gdmsetup
 share/gnome/applications/gdmflexiserver-xnest.desktop
 share/gnome/applications/gdmflexiserver.desktop
+share/gnome/applications/gdmphotosetup.desktop
 share/gnome/applications/gdmsetup.desktop
-share/gnome/capplets/gdmphotosetup.desktop
 share/gnome/gdm/BuiltInSessions/default.desktop
 share/gnome/gdm/gdmchooser.glade
+share/gnome/gdm/gdmphotosetup.glade
 share/gnome/gdm/gdmsetup.glade
 share/gnome/gdm/themes/circles/GdmGreeterTheme.desktop
 share/gnome/gdm/themes/circles/background.svg
@@ -109,6 +110,30 @@ share/gnome/omf/gdm/gdm-sv.omf
 share/gnome/omf/gdm/gdm-zh_CN.omf
 share/gnome/omf/gdm/gdm-zh_HK.omf
 share/gnome/omf/gdm/gdm-zh_TW.omf
+share/gnome/pixmaps/faces/astronaut.jpg
+share/gnome/pixmaps/faces/baseball.png
+share/gnome/pixmaps/faces/butterfly.png
+share/gnome/pixmaps/faces/cat-eye.jpg
+share/gnome/pixmaps/faces/chess.jpg
+share/gnome/pixmaps/faces/coffee.jpg
+share/gnome/pixmaps/faces/dice.jpg
+share/gnome/pixmaps/faces/energy-arc.jpg
+share/gnome/pixmaps/faces/fish.jpg
+share/gnome/pixmaps/faces/flake.jpg
+share/gnome/pixmaps/faces/flower.jpg
+share/gnome/pixmaps/faces/grapes.jpg
+share/gnome/pixmaps/faces/guitar.jpg
+share/gnome/pixmaps/faces/launch.jpg
+share/gnome/pixmaps/faces/leaf.jpg
+share/gnome/pixmaps/faces/lightning.jpg
+share/gnome/pixmaps/faces/penguin.jpg
+share/gnome/pixmaps/faces/puppy.jpg
+share/gnome/pixmaps/faces/sky.jpg
+share/gnome/pixmaps/faces/soccerball.png
+share/gnome/pixmaps/faces/sunflower.jpg
+share/gnome/pixmaps/faces/sunset.jpg
+share/gnome/pixmaps/faces/tennis-ball.png
+share/gnome/pixmaps/faces/yellow-rose.jpg
 share/gnome/pixmaps/gdm-foot-logo.png
 share/gnome/pixmaps/gdm-setup.png
 share/gnome/pixmaps/gdm-xnest.png
@@ -116,16 +141,6 @@ share/gnome/pixmaps/gdm.png
 share/gnome/pixmaps/login-photo.png
 share/gnome/pixmaps/nobody.png
 share/gnome/pixmaps/nohost.png
-share/gnome/pixmaps/faces/bonfire.jpg
-share/gnome/pixmaps/faces/cdrom.jpg
-share/gnome/pixmaps/faces/clock.jpg
-share/gnome/pixmaps/faces/daisy.jpg
-share/gnome/pixmaps/faces/dice.jpg
-share/gnome/pixmaps/faces/hollyleaf.jpg
-share/gnome/pixmaps/faces/lamas.jpg
-share/gnome/pixmaps/faces/seal.jpg
-share/gnome/pixmaps/faces/sky.jpg
-share/gnome/pixmaps/faces/skyline.jpg
 share/gnome/xsessions/gnome.desktop
 share/icons/hicolor/16x16/apps/gdm-xnest.png
 share/icons/hicolor/32x32/apps/gdm-setup.png
@@ -245,3 +260,5 @@ share/locale/zu/LC_MESSAGES/gdm.mo
 @unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/share/gnome/log/gdm 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/share/gnome/log 2>/dev/null || /usr/bin/true
+@unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
+@unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true