Update to 3.6.2.

This is still broken but gnome-shell needs it at run time so there isn't
much choice ..

Submitted by:	Gustau Perez


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

5 files changed, 146 insertions, 111 deletions

diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile
index 525091332..4b780ba03 100644
--- a/x11/gdm3/Makefile
+++ b/x11/gdm3/Makefile
@@ -3,8 +3,7 @@
 #   $MCom: ports/trunk/x11/gdm3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gdm
-PORTVERSION=	3.4.1
-PORTREVISION=	1
+PORTVERSION=	3.6.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -13,24 +12,29 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 version of xdm display manager
 
 BUILD_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity3 \
-		nss-config:${PORTSDIR}/security/nss \
+		itstool:${PORTSDIR}/textproc/itstool \
     		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	ck-connector:${PORTSDIR}/sysutils/consolekit \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		polkit-gtk-1:${PORTSDIR}/sysutils/polkit-gnome \
-    		execinfo:${PORTSDIR}/devel/libexecinfo \
-		upower-glib:${PORTSDIR}/sysutils/upower \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		accountsservice:${PORTSDIR}/sysutils/accountsservice \
-		xklavier:${PORTSDIR}/x11/libxklavier \
-		canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3
+LIB_DEPENDS=	libck-connector.so:${PORTSDIR}/sysutils/consolekit \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libpolkit-gtk-1.so:${PORTSDIR}/sysutils/polkit-gnome \
+		libupower-glib.so:${PORTSDIR}/sysutils/upower \
+		libnss3.so:${PORTSDIR}/security/nss \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \
+		libxklavier.so:${PORTSDIR}/x11/libxklavier \
+		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
 RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity3 \
 		gnome-settings-daemon>=3.0.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
-		nss-config:${PORTSDIR}/security/nss \
+		gnome-keyring-3:${PORTSDIR}/security/gnome-keyring3 \
 		gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session3 \
 		gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
 		${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core \
 		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+# used in scripts
+RUN_DEPENDS+=	xrdb:${PORTSDIR}/x11/xrdb \
+		setxkbmap:${PORTSDIR}/x11/setxkbmap \
+		xmodmap:${PORTSDIR}/x11/xmodmap \
+		xterm:${PORTSDIR}/x11/xterm
 
 CONFLICTS=	gdm-2.[0-9]*
 
@@ -46,19 +50,23 @@ INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
 USES=		gettext gmake pathfix pkgconfig
-USE_GNOME=	intlhack gnomehier librsvg2 gnomeprefix gnomepanel3 dconf
+USE_GNOME=	dconf gnomehier gnomeprefix intlhack librsvg2 gnomepanel3
 GNU_CONFIGURE=	yes
 GLIB_SCHEMAS=	org.gnome.login-screen.gschema.xml
 CONFIGURE_ARGS=	--with-working-directory=${PREFIX}/etc/gdm/home \
 		--with-at-spi-registryd-directory=${LOCALBASE}/libexec \
 		--enable-authentication-scheme=pam \
 		--with-console-kit \
+		--with-initial-vt=9 \
 		--with-systemd=no
+# this is a hack until we can get our own pam dir and dir in order.
+CONFIGURE_ARGS+=--with-default-pam-config=redhat
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAS_SA_LEN
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGLIBS=	-lm -lexecinfo
+CONFIGLIBS=	-lm
 CONFIGURE_ENV=	LIBS="${CONFIGLIBS}" \
-		GTKDOC="false"
+		GTKDOC="false" \
+		ac_cv_header_execinfo_h=no
 
 SUB_FILES+=	gdm.pam
 
@@ -68,12 +76,12 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 GNOME_LOCALSTATEDIR=	/var
 
 OPTIONS_DEFINE=	IPV6 KEYRING
-OPTIONS_DEFAULt=KEYRING
-KEYRING_DESC=	GnomeKeyring/PAM integration
+OPTIONS_DEFAULT=KEYRING
+KEYRING_DESC=	Gnomekeyring/PAM integration
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDEBUG}
+.if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
@@ -95,8 +103,8 @@ post-patch:
 		${WRKSRC}/data/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    	-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-	    	${WRKSRC}/daemon/gdm-session-worker.c \
-		${WRKSRC}/gui/simple-greeter/extensions/password/gdm-password.pam
+	    	${WRKSRC}/daemon/gdm-session-worker.c
+#		${WRKSRC}/gui/simple-greeter/extensions/password/gdm-password.pam
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
 		-e 's|/usr/bin/X|${LOCALBASE}/bin/X|g' \
 		-e 's|/usr/bin/Xorg|${LOCALBASE}/bin/Xorg|g' \
@@ -104,12 +112,18 @@ post-patch:
 	@${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
+	@${REINPLACE_CMD} -e 's|/etc/X11|${LOCALBASE}/etc/X11|g' \
+		${WRKSRC}/data/Init.in \
+		${WRKSRC}/data/PostLogin \
+		${WRKSRC}/data/PostSession.in \
+		${WRKSRC}/data/PreSession.in \
+		${WRKSRC}/data/Xsession.in
 	@${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
+		${WRKSRC}/data/applications/gok.desktop
+#		${WRKSRC}/data/applications/orca-screen-reader.desktop
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
diff --git a/x11/gdm3/distinfo b/x11/gdm3/distinfo
index c08503482..0c85c0dcd 100644
--- a/x11/gdm3/distinfo
+++ b/x11/gdm3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gdm-3.4.1.tar.xz) = 6292968dff5fc89877b5e1aaa3c7d1484dd3ed2d4f388e935841d053439be665
-SIZE (gnome3/gdm-3.4.1.tar.xz) = 1615612
+SHA256 (gnome3/gdm-3.6.2.tar.xz) = fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9
+SIZE (gnome3/gdm-3.6.2.tar.xz) = 1627356
diff --git a/x11/gdm3/files/patch-daemon_Makefile.in b/x11/gdm3/files/patch-daemon_Makefile.in
index 137352970..4b6e01c7f 100644
--- a/x11/gdm3/files/patch-daemon_Makefile.in
+++ b/x11/gdm3/files/patch-daemon_Makefile.in
@@ -1,14 +1,6 @@
---- daemon/Makefile.in.orig	2009-05-31 15:51:18.000000000 -0400
-+++ daemon/Makefile.in	2009-05-31 15:56:32.000000000 -0400
-@@ -525,6 +525,7 @@ test_session_LDADD = \
- 	$(XLIB_LIBS)		\
- 	$(EXTRA_DAEMON_LIBS)	\
- 	$(DAEMON_LIBS)		\
-+	$(EXTRA_DAEMON_LIBS)	\
- 	$(PAM_LIBS)		\
- 	$(NULL)
- 
-@@ -660,6 +661,7 @@ gdm_session_worker_SOURCES = session-wor
+--- daemon/Makefile.in.orig	2013-04-12 00:53:59.667693353 +0000
++++ daemon/Makefile.in	2013-04-12 00:54:27.682691596 +0000
+@@ -752,6 +752,7 @@
  gdm_session_worker_LDFLAGS = \
  	$(XLIB_LIBS)				\
  	$(PAM_LIBS)				\
diff --git a/x11/gdm3/files/patch-data_pam-redhat_gdm-password.pam b/x11/gdm3/files/patch-data_pam-redhat_gdm-password.pam
new file mode 100644
index 000000000..61737fae0
--- /dev/null
+++ b/x11/gdm3/files/patch-data_pam-redhat_gdm-password.pam
@@ -0,0 +1,30 @@
+--- data/pam-redhat/gdm-password.pam.orig	2012-10-03 22:03:41.000000000 +0000
++++ data/pam-redhat/gdm-password.pam	2013-05-02 09:48:30.000000000 +0000
+@@ -1,20 +1,10 @@
+-auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+-auth        substack      password-auth
+-auth        optional      pam_gnome_keyring.so
+-auth        include       postlogin
++auth        required      pam_unix.so
++auth        optional      %%LOCALBASE%%/lib/pam_gnome_keyring.so
+ 
+-account     required      pam_nologin.so
+-account     include       password-auth
++account     required      pam_unix.so
+ 
+-password    include       password-auth
++password    required      pam_unix.so
++
++session     include      system
++session     optional     %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start
+ 
+-session     required      pam_selinux.so close
+-session     required      pam_loginuid.so
+-session     optional      pam_console.so
+--session    optional    pam_ck_connector.so
+-session     required      pam_selinux.so open
+-session     optional      pam_keyinit.so force revoke
+-session     required      pam_namespace.so
+-session     include       password-auth
+-session     optional      pam_gnome_keyring.so auto_start
+-session     include       postlogin
diff --git a/x11/gdm3/pkg-plist b/x11/gdm3/pkg-plist
index 007f29246..e5e325dd3 100644
--- a/x11/gdm3/pkg-plist
+++ b/x11/gdm3/pkg-plist
@@ -13,12 +13,11 @@ 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/pam.d/gdm-fingerprint
-etc/pam.d/gdm-password
-etc/pam.d/gdm-smartcard
 etc/pam.d/gdm-welcome
-include/gdm/greeter/gdm-greeter-client.h
-include/gdm/greeter/gdm-greeter-sessions.h
+include/gdm/gdm-client-glue.h
+include/gdm/gdm-client.h
+include/gdm/gdm-sessions.h
+include/gdm/gdm-user-switching.h
 include/gdm/simple-greeter/gdm-login-extension.h
 lib/gdm/simple-greeter/extensions/libfingerprint.a
 lib/gdm/simple-greeter/extensions/libfingerprint.la
@@ -29,21 +28,19 @@ 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/girepository-1.0/Gdm-1.0.typelib
+lib/libgdm.a
+lib/libgdm.la
+lib/libgdm.so
+lib/libgdm.so.1
 lib/libgdmsimplegreeter.a
 lib/libgdmsimplegreeter.la
 lib/libgdmsimplegreeter.so
 lib/libgdmsimplegreeter.so.1
-libdata/pkgconfig/gdmgreeter.pc
+libdata/pkgconfig/gdm.pc
 libdata/pkgconfig/gdmsimplegreeter.pc
 libexec/gdm-crash-logger
-libexec/gdm-factory-slave
 libexec/gdm-host-chooser
-libexec/gdm-product-slave
 libexec/gdm-session-worker
 libexec/gdm-simple-chooser
 libexec/gdm-simple-greeter
@@ -61,34 +58,52 @@ sbin/gdm-binary
 %%DATADIR%%/greeter/applications/gok.desktop
 %%DATADIR%%/greeter/applications/mime-dummy-handler.desktop
 %%DATADIR%%/greeter/applications/mimeapps.list
-%%DATADIR%%/greeter/applications/orca-screen-reader.desktop
+%%DATADIR%%/greeter/applications/polkit-gnome-authentication-agent-1.desktop
+%%DATADIR%%/greeter/autostart/orca-autostart.desktop
 %%DATADIR%%/locale.alias
 %%DATADIR%%/simple-greeter/extensions/fingerprint/page.ui
 %%DATADIR%%/simple-greeter/extensions/password/page.ui
 %%DATADIR%%/simple-greeter/extensions/smartcard/page.ui
 %%DATADIR%%/simple-greeter/extensions/unified/page.ui
-share/gir-1.0/GdmGreeter-1.0.gir
+share/gir-1.0/Gdm-1.0.gir
 share/gnome-session/sessions/gdm-fallback.session
 share/gnome-session/sessions/gdm-shell.session
-share/gnome/help/gdm/C/gdm.xml
-share/gnome/help/gdm/C/legal.xml
-share/gnome/help/gdm/ca/gdm.xml
-share/gnome/help/gdm/de/gdm.xml
-share/gnome/help/gdm/el/gdm.xml
-share/gnome/help/gdm/en_GB/gdm.xml
-share/gnome/help/gdm/es/gdm.xml
-share/gnome/help/gdm/fr/gdm.xml
-share/gnome/help/gdm/gl/gdm.xml
-share/gnome/help/gdm/id/gdm.xml
-share/gnome/help/gdm/it/gdm.xml
-share/gnome/help/gdm/ko/gdm.xml
-share/gnome/help/gdm/oc/gdm.xml
-share/gnome/help/gdm/ru/gdm.xml
-share/gnome/help/gdm/sl/gdm.xml
-share/gnome/help/gdm/sv/gdm.xml
-share/gnome/help/gdm/te/gdm.xml
-share/gnome/help/gdm/uk/gdm.xml
-share/gnome/help/gdm/zh_CN/gdm.xml
+share/help/C/gdm/index.docbook
+share/help/C/gdm/legal.xml
+share/help/ca/gdm/index.docbook
+share/help/ca/gdm/legal.xml
+share/help/de/gdm/index.docbook
+share/help/de/gdm/legal.xml
+share/help/el/gdm/index.docbook
+share/help/el/gdm/legal.xml
+share/help/en_GB/gdm/index.docbook
+share/help/en_GB/gdm/legal.xml
+share/help/es/gdm/index.docbook
+share/help/es/gdm/legal.xml
+share/help/fr/gdm/index.docbook
+share/help/fr/gdm/legal.xml
+share/help/gl/gdm/index.docbook
+share/help/gl/gdm/legal.xml
+share/help/id/gdm/index.docbook
+share/help/id/gdm/legal.xml
+share/help/it/gdm/index.docbook
+share/help/it/gdm/legal.xml
+share/help/ko/gdm/index.docbook
+share/help/ko/gdm/legal.xml
+share/help/oc/gdm/index.docbook
+share/help/oc/gdm/legal.xml
+share/help/ru/gdm/index.docbook
+share/help/ru/gdm/legal.xml
+share/help/sl/gdm/index.docbook
+share/help/sl/gdm/legal.xml
+share/help/sv/gdm/index.docbook
+share/help/sv/gdm/legal.xml
+share/help/te/gdm/index.docbook
+share/help/te/gdm/legal.xml
+share/help/uk/gdm/index.docbook
+share/help/uk/gdm/legal.xml
+share/help/zh_CN/gdm/index.docbook
+share/help/zh_CN/gdm/legal.xml
 share/icons/hicolor/16x16/apps/gdm-fingerprint.png
 share/icons/hicolor/16x16/apps/gdm-smartcard.png
 share/icons/hicolor/16x16/apps/gdm-xnest.png
@@ -114,6 +129,7 @@ share/locale/ca/LC_MESSAGES/gdm.mo
 share/locale/ca@valencia/LC_MESSAGES/gdm.mo
 share/locale/crh/LC_MESSAGES/gdm.mo
 share/locale/cs/LC_MESSAGES/gdm.mo
+share/locale/csb/LC_MESSAGES/gdm.mo
 share/locale/cy/LC_MESSAGES/gdm.mo
 share/locale/da/LC_MESSAGES/gdm.mo
 share/locale/de/LC_MESSAGES/gdm.mo
@@ -150,6 +166,7 @@ share/locale/km/LC_MESSAGES/gdm.mo
 share/locale/kn/LC_MESSAGES/gdm.mo
 share/locale/ko/LC_MESSAGES/gdm.mo
 share/locale/ku/LC_MESSAGES/gdm.mo
+share/locale/ky/LC_MESSAGES/gdm.mo
 share/locale/lt/LC_MESSAGES/gdm.mo
 share/locale/lv/LC_MESSAGES/gdm.mo
 share/locale/mai/LC_MESSAGES/gdm.mo
@@ -198,24 +215,6 @@ share/locale/zh_CN/LC_MESSAGES/gdm.mo
 share/locale/zh_HK/LC_MESSAGES/gdm.mo
 share/locale/zh_TW/LC_MESSAGES/gdm.mo
 share/locale/zu/LC_MESSAGES/gdm.mo
-share/omf/gdm/gdm-C.omf
-share/omf/gdm/gdm-ca.omf
-share/omf/gdm/gdm-de.omf
-share/omf/gdm/gdm-el.omf
-share/omf/gdm/gdm-en_GB.omf
-share/omf/gdm/gdm-es.omf
-share/omf/gdm/gdm-fr.omf
-share/omf/gdm/gdm-gl.omf
-share/omf/gdm/gdm-id.omf
-share/omf/gdm/gdm-it.omf
-share/omf/gdm/gdm-ko.omf
-share/omf/gdm/gdm-oc.omf
-share/omf/gdm/gdm-ru.omf
-share/omf/gdm/gdm-sl.omf
-share/omf/gdm/gdm-sv.omf
-share/omf/gdm/gdm-te.omf
-share/omf/gdm/gdm-uk.omf
-share/omf/gdm/gdm-zh_CN.omf
 share/pixmaps/gdm-foot-logo.png
 share/pixmaps/gdm-setup.png
 share/pixmaps/gdm-xnest.png
@@ -223,27 +222,29 @@ share/pixmaps/gdm.png
 share/pixmaps/nobody.png
 share/pixmaps/nohost.png
 @exec mkdir -p %D/share/xsessions
+@dirrm /var/gdm
+@dirrm /var/cache/gdm
 @dirrmtry share/xsessions
-@dirrm share/omf/gdm
-@dirrm share/gnome/help/gdm/zh_CN
-@dirrm share/gnome/help/gdm/uk
-@dirrm share/gnome/help/gdm/te
-@dirrm share/gnome/help/gdm/sv
-@dirrm share/gnome/help/gdm/sl
-@dirrm share/gnome/help/gdm/ru
-@dirrm share/gnome/help/gdm/oc
-@dirrm share/gnome/help/gdm/ko
-@dirrm share/gnome/help/gdm/it
-@dirrm share/gnome/help/gdm/id
-@dirrm share/gnome/help/gdm/gl
-@dirrm share/gnome/help/gdm/fr
-@dirrm share/gnome/help/gdm/es
-@dirrm share/gnome/help/gdm/en_GB
-@dirrm share/gnome/help/gdm/el
-@dirrm share/gnome/help/gdm/de
-@dirrm share/gnome/help/gdm/ca
-@dirrm share/gnome/help/gdm/C
-@dirrm share/gnome/help/gdm
+@dirrmtry share/help/zh_CN/gdm
+@dirrmtry share/help/uk/gdm
+@dirrmtry share/help/te/gdm
+@dirrmtry share/help/sv/gdm
+@dirrmtry share/help/sl/gdm
+@dirrmtry share/help/ru/gdm
+@dirrmtry share/help/oc/gdm
+@dirrmtry share/help/ko/gdm
+@dirrmtry share/help/it/gdm
+@dirrmtry share/help/id/gdm
+@dirrmtry share/help/gl/gdm
+@dirrmtry share/help/fr/gdm
+@dirrmtry share/help/es/gdm
+@dirrmtry share/help/en_GB/gdm
+@dirrmtry share/help/el/gdm
+@dirrmtry share/help/de/gdm
+@dirrmtry share/help/ca/gdm
+@dirrmtry share/help/C/gdm
+@dirrmtry share/gnome-session/sessions
+@dirrmtry share/gnome-session
 @dirrm %%DATADIR%%/simple-greeter/extensions/unified
 @dirrm %%DATADIR%%/simple-greeter/extensions/smartcard
 @dirrm %%DATADIR%%/simple-greeter/extensions/password
@@ -251,13 +252,13 @@ share/pixmaps/nohost.png
 @dirrm %%DATADIR%%/simple-greeter/extensions
 @dirrm %%DATADIR%%/simple-greeter
 @dirrm %%DATADIR%%/greeter/applications
+@dirrm %%DATADIR%%/greeter/autostart
 @dirrm %%DATADIR%%/greeter
 @dirrm %%DATADIR%%
 @dirrm lib/gdm/simple-greeter/extensions
 @dirrm lib/gdm/simple-greeter
 @dirrm lib/gdm
 @dirrm include/gdm/simple-greeter
-@dirrm include/gdm/greeter
 @dirrm include/gdm
 @dirrmtry etc/gdm/home/.local/share/applications
 @dirrmtry etc/gdm/home/.local/share
@@ -342,5 +343,3 @@ share/pixmaps/nohost.png
 @dirrmtry share/locale/as
 @dirrmtry share/locale/an/LC_MESSAGES
 @dirrmtry share/locale/an
-@exec dconf update
-@unexec dconf update