Update to 3.1.92.

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

8 files changed, 81 insertions, 65 deletions

diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile
index 413cc0fca..f82caa4ac 100644
--- a/x11/gdm3/Makefile
+++ b/x11/gdm3/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm3/Makefile,v 1.9 2011/06/10 22:59:10 mezz Exp $
+#   $MCom: ports/x11/gdm3/Makefile,v 1.10 2011/06/10 23:04:42 mezz Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	3.0.4
+PORTVERSION=	3.1.92
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -50,11 +50,12 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomehier gconf2 librsvg2 dconf \
 		gnomeprefix gnomepanel3
 GCONF_SCHEMAS=	gdm-simple-greeter.schemas
+GLIB_SCHEMAS=	org.gnome.login-screen.gschema.xml
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-working-directory=${PREFIX}/etc/gdm/home \
 		--with-at-spi-registryd-directory=${LOCALBASE}/libexec
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAS_SA_LEN" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
+CPPFLAGS=	-I${LOCALBASE}/include -DHAS_SA_LEN
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBS="-lm -lexecinfo" \
 		GTKDOC="false"
 
@@ -96,8 +97,15 @@ post-patch:
 		-e 's|/usr/bin/X|${LOCALBASE}/bin/X|g' \
 		-e 's|/usr/bin/Xorg|${LOCALBASE}/bin/Xorg|g' \
 		${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po
-	@${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|g' \
-		${WRKSRC}/data/greeter-autostart/*.desktop.in*
+	@${REINPLACE_CMD} -e 's|/at-spi-registryd|/at-spi2-registryd|g' \
+		${WRKSRC}/gui/simple-chooser/gdm-host-chooser.c \
+		${WRKSRC}/gui/simple-chooser/chooser-main.c
+	@${RM}	${WRKSRC}/data/applications/gdm-simple-greeter.desktop \
+		${WRKSRC}/data/applications/gdm-simple-greeter.desktop.in \
+		${WRKSRC}/data/applications/gnome-mag.desktop \
+		${WRKSRC}/data/applications/gnome-shell.desktop \
+		${WRKSRC}/data/applications/gok.desktop \
+		${WRKSRC}/data/applications/orca-screen-reader.desktop
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/gconf.path \
diff --git a/x11/gdm3/distinfo b/x11/gdm3/distinfo
index ac203e2f3..31a781c1e 100644
--- a/x11/gdm3/distinfo
+++ b/x11/gdm3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gdm-3.0.4.tar.xz) = 7d2947fbc96c43cc94fd5915882655820c5453a1b1b11643b3c1be361f4288fd
-SIZE (gnome3/gdm-3.0.4.tar.xz) = 1608480
+SHA256 (gnome3/gdm-3.1.92.tar.xz) = 0cb9dd720b1d2782c9b5108f0d9778d64ee4f9a8825cfa11a44a1368f7850f03
+SIZE (gnome3/gdm-3.1.92.tar.xz) = 1643508
diff --git a/x11/gdm3/files/patch-common_gdm-common.c b/x11/gdm3/files/patch-common_gdm-common.c
deleted file mode 100644
index 9fa4acafa..000000000
--- a/x11/gdm3/files/patch-common_gdm-common.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- common/gdm-common.c.orig	2007-12-23 10:29:20.000000000 +0100
-+++ common/gdm-common.c	2007-12-23 10:29:34.000000000 +0100
-@@ -33,6 +33,10 @@
- 
- #include "gdm-common.h"
- 
-+#ifndef ENODATA
-+#define ENODATA EAGAIN
-+#endif
-+
- void
- gdm_set_fatal_warnings_if_unstable (void)
- {
diff --git a/x11/gdm3/files/patch-data_greeter-autostart_at-spi-registryd-wrapper.desktop.in b/x11/gdm3/files/patch-data_greeter-autostart_at-spi-registryd-wrapper.desktop.in
deleted file mode 100644
index 9072b6d52..000000000
--- a/x11/gdm3/files/patch-data_greeter-autostart_at-spi-registryd-wrapper.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.orig	2011-03-31 16:27:11.000000000 +0200
-+++ data/greeter-autostart/at-spi-registryd-wrapper.desktop.in	2011-03-31 16:27:16.000000000 +0200
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Type=Application
- _Name=AT-SPI Registry Wrapper
--Exec=${exec_prefix}/libexec/at-spi-registryd
-+Exec=${exec_prefix}/libexec/at-spi2-registryd
- OnlyShowIn=GNOME;
- AutostartCondition=GNOME /desktop/gnome/interface/accessibility
- X-GNOME-Autostart-Phase=Initialization
diff --git a/x11/gdm3/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in b/x11/gdm3/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in
deleted file mode 100644
index 7febf5165..000000000
--- a/x11/gdm3/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- data/greeter-autostart/gdm-simple-greeter.desktop.in.in.orig	2008-11-23 22:22:04.000000000 -0500
-+++ data/greeter-autostart/gdm-simple-greeter.desktop.in.in	2008-11-23 22:22:09.000000000 -0500
-@@ -5,4 +5,3 @@ Exec=@LIBEXECDIR@/gdm-simple-greeter
- OnlyShowIn=GNOME;
- X-GNOME-Autostart-Phase=Application
- X-GNOME-Autostart-Notify=true
--X-GNOME-AutoRestart=true
diff --git a/x11/gdm3/files/patch-gui_simple-greeter_extensions_smartcard_gdm-smartcard-worker.c b/x11/gdm3/files/patch-gui_simple-greeter_extensions_smartcard_gdm-smartcard-worker.c
new file mode 100644
index 000000000..51b0d5492
--- /dev/null
+++ b/x11/gdm3/files/patch-gui_simple-greeter_extensions_smartcard_gdm-smartcard-worker.c
@@ -0,0 +1,12 @@
+--- gui/simple-greeter/extensions/smartcard/gdm-smartcard-worker.c.orig	2011-09-22 17:50:06.000000000 +0200
++++ gui/simple-greeter/extensions/smartcard/gdm-smartcard-worker.c	2011-09-22 17:51:09.000000000 +0200
+@@ -2,7 +2,9 @@
+ 
+ #include <fcntl.h>
+ #include <locale.h>
++#ifdef __linux__
+ #include <sys/prctl.h>
++#endif
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
diff --git a/x11/gdm3/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm3/files/patch-gui_simple-greeter_gdm-languages.c
deleted file mode 100644
index cd8a0f496..000000000
--- a/x11/gdm3/files/patch-gui_simple-greeter_gdm-languages.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/simple-greeter/gdm-languages.c.orig	2010-01-13 16:20:08.000000000 +0000
-+++ gui/simple-greeter/gdm-languages.c	2010-01-17 13:10:50.000000000 +0000
-@@ -365,7 +365,7 @@ add_locale (const char *language_name,
-         if (is_utf8) {
-                 name = g_strdup (language_name);
-         } else if (utf8_only) {
--                name = g_strdup_printf ("%s.utf8", language_name);
-+                name = g_strdup_printf ("%s.UTF-8", language_name);
- 
-                 language_name_get_codeset_details (name, NULL, &is_utf8);
-                 if (is_utf8) {
diff --git a/x11/gdm3/pkg-plist b/x11/gdm3/pkg-plist
index 08ef206ca..c40382f42 100644
--- a/x11/gdm3/pkg-plist
+++ b/x11/gdm3/pkg-plist
@@ -11,9 +11,33 @@ etc/gdm/Xsession
 @unexec if cmp -s %D/etc/gdm/custom.conf %D/etc/gdm/custom.conf.default; then rm -f %D/etc/gdm/custom.conf; fi
 etc/gdm/custom.conf.default
 @exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
-etc/gdm/home/.local/share/applications/mime-dummy-handler.desktop
-etc/gdm/home/.local/share/applications/mimeapps.list
 etc/pam.d/gdm
+etc/pam.d/gdm-fingerprint
+etc/pam.d/gdm-password
+etc/pam.d/gdm-smartcard
+include/gdm/greeter/gdm-greeter-client.h
+include/gdm/greeter/gdm-greeter-sessions.h
+include/gdm/simple-greeter/gdm-login-extension.h
+lib/gdm/simple-greeter/extensions/libfingerprint.a
+lib/gdm/simple-greeter/extensions/libfingerprint.la
+lib/gdm/simple-greeter/extensions/libfingerprint.so
+lib/gdm/simple-greeter/extensions/libpassword.a
+lib/gdm/simple-greeter/extensions/libpassword.la
+lib/gdm/simple-greeter/extensions/libpassword.so
+lib/gdm/simple-greeter/extensions/libsmartcard.a
+lib/gdm/simple-greeter/extensions/libsmartcard.la
+lib/gdm/simple-greeter/extensions/libsmartcard.so
+lib/girepository-1.0/GdmGreeter-1.0.typelib
+lib/libgdmgreeter.a
+lib/libgdmgreeter.la
+lib/libgdmgreeter.so
+lib/libgdmgreeter.so.1
+lib/libgdmsimplegreeter.a
+lib/libgdmsimplegreeter.la
+lib/libgdmsimplegreeter.so
+lib/libgdmsimplegreeter.so.1
+libdata/pkgconfig/gdmgreeter.pc
+libdata/pkgconfig/gdmsimplegreeter.pc
 libexec/gdm-crash-logger
 libexec/gdm-factory-slave
 libexec/gdm-host-chooser
@@ -22,26 +46,28 @@ libexec/gdm-session-worker
 libexec/gdm-simple-chooser
 libexec/gdm-simple-greeter
 libexec/gdm-simple-slave
+libexec/gdm-smartcard-worker
 libexec/gdm-xdmcp-chooser-slave
 sbin/gdm
 sbin/gdm-binary
-%%DATADIR%%/autostart/LoginWindow/at-spi-registryd-wrapper.desktop
-%%DATADIR%%/autostart/LoginWindow/gdm-simple-greeter.desktop
-%%DATADIR%%/autostart/LoginWindow/gnome-mag.desktop
-%%DATADIR%%/autostart/LoginWindow/gnome-power-manager.desktop
-%%DATADIR%%/autostart/LoginWindow/gnome-settings-daemon.desktop
-%%DATADIR%%/autostart/LoginWindow/gnome-session-check-accelerated.desktop
-%%DATADIR%%/autostart/LoginWindow/gok.desktop
-%%DATADIR%%/autostart/LoginWindow/metacity.desktop
-%%DATADIR%%/autostart/LoginWindow/orca-screen-reader.desktop
-%%DATADIR%%/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
 %%DATADIR%%/gconf.path
 %%DATADIR%%/gdb-cmd
 %%DATADIR%%/gdm-greeter-login-window.ui
 %%DATADIR%%/gdm.schemas
+share/gdm/greeter/applications/gdm-simple-greeter.desktop
+share/gdm/greeter/applications/gnome-mag.desktop
+share/gdm/greeter/applications/gnome-shell.desktop
+share/gdm/greeter/applications/gok.desktop
+share/gdm/greeter/applications/mime-dummy-handler.desktop
+share/gdm/greeter/applications/mimeapps.list
+share/gdm/greeter/applications/orca-screen-reader.desktop
 %%DATADIR%%/locale.alias
 %%DATADIR%%/session-setup.entries
-share/gnome-session/sessions/gdm.session
+share/gdm/simple-greeter/extensions/fingerprint/page.ui
+share/gdm/simple-greeter/extensions/password/page.ui
+share/gdm/simple-greeter/extensions/smartcard/page.ui
+share/gdm/simple-greeter/extensions/unified/page.ui
+share/gir-1.0/GdmGreeter-1.0.gir
 share/gnome/help/gdm/C/gdm.xml
 share/gnome/help/gdm/C/legal.xml
 share/gnome/help/gdm/de/gdm.xml
@@ -58,9 +84,15 @@ share/gnome/help/gdm/sl/gdm.xml
 share/gnome/help/gdm/sv/gdm.xml
 share/gnome/help/gdm/uk/gdm.xml
 share/gnome/help/gdm/zh_CN/gdm.xml
+share/gnome-session/sessions/gdm-fallback.session
+share/gnome-session/sessions/gdm-shell.session
+share/icons/hicolor/16x16/apps/gdm-fingerprint.png
+share/icons/hicolor/16x16/apps/gdm-smartcard.png
 share/icons/hicolor/16x16/apps/gdm-xnest.png
 share/icons/hicolor/32x32/apps/gdm-setup.png
 share/icons/hicolor/32x32/apps/gdm-xnest.png
+share/icons/hicolor/48x48/apps/gdm-fingerprint.png
+share/icons/hicolor/48x48/apps/gdm-smartcard.png
 share/locale/af/LC_MESSAGES/gdm.mo
 share/locale/am/LC_MESSAGES/gdm.mo
 share/locale/an/LC_MESSAGES/gdm.mo
@@ -202,8 +234,14 @@ share/pixmaps/nohost.png
 @dirrm share/gnome/help/gdm/de
 @dirrm share/gnome/help/gdm/C
 @dirrm share/gnome/help/gdm
-@dirrm %%DATADIR%%/autostart/LoginWindow
-@dirrm %%DATADIR%%/autostart
+@dirrm %%DATADIR%%/simple-greeter/extensions/unified
+@dirrm %%DATADIR%%/simple-greeter/extensions/smartcard
+@dirrm %%DATADIR%%/simple-greeter/extensions/password
+@dirrm %%DATADIR%%/simple-greeter/extensions/fingerprint
+@dirrm %%DATADIR%%/simple-greeter/extensions
+@dirrm %%DATADIR%%/simple-greeter
+@dirrm %%DATADIR%%/greeter/applications
+@dirrm %%DATADIR%%/greeter
 @dirrm %%DATADIR%%
 @dirrm etc/gdm/Sessions
 @dirrm etc/gdm/PreSession