Update MC-ports to GNOME 3.12.

Dragons beware! Although most of them should be sleeping.


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

4 files changed, 29 insertions, 26 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 9b082e91d..1dd53f0ee 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,9 +1,9 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/gnome-session3/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#   $MCom: ports-experimental/trunk/x11/gnome-session/Makefile 19534 2014-04-15 20:23:23Z gusi $
 
 PORTNAME=	gnome-session
-PORTVERSION=	3.6.2
+PORTVERSION=	3.12.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -18,14 +18,15 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 RUN_DEPENDS=	${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
 		${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
-INSTALLS_ICONS=	yes
-USES=		gettext gmake pathfix pkgconfig
-USE_XZ=		yes
+USES=		gettext gmake pathfix pkgconfig tar:xz
+USE_GNOME=	gnomedesktop3 gnomeprefix gtk30 intlhack intltool \
+		libxslt:build
 USE_XORG=	ice sm xau xext xtst xrender xtrans xcomposite
 USE_GL=		gl
-USE_GNOME=	gnomeprefix intlhack gconf2 intltool gtk30
+INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-docbook-docs
+CONFIGURE_ARGS=	--disable-docbook-docs \
+		--enable-gconf=no
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 00924c963..ec98d82fd 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-session-3.6.2.tar.xz) = 2e3a3466eed4136826e150b639c63beb5c93710346dea2e538adfe5e18d701b4
-SIZE (gnome3/gnome-session-3.6.2.tar.xz) = 729676
+SHA256 (gnome3/gnome-session-3.12.1.tar.xz) = fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3
+SIZE (gnome3/gnome-session-3.12.1.tar.xz) = 718380
diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-consolekit.c b/x11/gnome-session/files/patch-gnome-session_gsm-consolekit.c
deleted file mode 100644
index 96e771191..000000000
--- a/x11/gnome-session/files/patch-gnome-session_gsm-consolekit.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- gnome-session/gsm-consolekit.c.orig	2013-06-27 14:49:15.000000000 +0200
-+++ gnome-session/gsm-consolekit.c	2013-06-27 15:09:02.000000000 +0200
-@@ -233,6 +233,9 @@
- 
-         manager->priv = GSM_CONSOLEKIT_GET_PRIVATE (manager);
- 
-+        /* init upower */
-+        manager->priv->up_client = up_client_new ();
-+
-         error = NULL;
- 
-         if (!gsm_consolekit_ensure_ck_connection (manager, &error)) {
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index a661f3754..03cdd71f9 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -1,17 +1,17 @@
 bin/gnome-session
-bin/gnome-session-properties
+bin/gnome-session-inhibit
 bin/gnome-session-quit
 libexec/gnome-session-check-accelerated
 libexec/gnome-session-check-accelerated-helper
+libexec/gnome-session-failed
 man/man1/gnome-session.1.gz
-man/man1/gnome-session-properties.1.gz
+man/man1/gnome-session-inhibit.1.gz
 man/man1/gnome-session-quit.1.gz
-share/applications/session-properties.desktop
 share/GConf/gsettings/gnome-session.convert
-%%DATADIR%%/gsm-inhibit-dialog.ui
 %%DATADIR%%/hardware-compatibility
+%%DATADIR%%/sessions/gnome-dummy.session
+%%DATADIR%%/sessions/gnome-wayland.session
 %%DATADIR%%/session-properties.ui
-%%DATADIR%%/sessions/gnome-fallback.session
 %%DATADIR%%/sessions/gnome.session
 share/icons/hicolor/16x16/apps/session-properties.png
 share/icons/hicolor/22x22/apps/session-properties.png
@@ -20,6 +20,7 @@ share/icons/hicolor/32x32/apps/session-properties.png
 share/icons/hicolor/48x48/apps/session-properties.png
 share/icons/hicolor/scalable/apps/session-properties.svg
 share/locale/af/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/an/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/am/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/ar/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/as/LC_MESSAGES/gnome-session-3.0.mo
@@ -55,6 +56,7 @@ share/locale/fr/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/fur/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/fy/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/ga/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/gd/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/gl/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/gu/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/ha/LC_MESSAGES/gnome-session-3.0.mo
@@ -69,6 +71,7 @@ share/locale/is/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/it/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/ja/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/ka/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/kk/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/km/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/kn/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/ko/LC_MESSAGES/gnome-session-3.0.mo
@@ -108,6 +111,7 @@ share/locale/sr@latin/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/sv/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/ta/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/te/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/tg/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/th/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/tk/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/tr/LC_MESSAGES/gnome-session-3.0.mo
@@ -123,8 +127,10 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/zu/LC_MESSAGES/gnome-session-3.0.mo
+share/wayland-sessions/gnome-wayland.desktop
 share/xsessions/gnome.desktop
 @dirrmtry share/xsessions
+@dirrm share/wayland-sessions
 @dirrm %%DATADIR%%/sessions
 @dirrm %%DATADIR%%
 @dirrmtry share/locale/zu/LC_MESSAGES
@@ -139,6 +145,8 @@ share/xsessions/gnome.desktop
 @dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/tg/LC_MESSAGES
+@dirrmtry share/locale/tg
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -163,6 +171,8 @@ share/xsessions/gnome.desktop
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/mai/LC_MESSAGES
 @dirrmtry share/locale/mai
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/ig/LC_MESSAGES
@@ -171,6 +181,8 @@ share/xsessions/gnome.desktop
 @dirrmtry share/locale/hy
 @dirrmtry share/locale/ha/LC_MESSAGES
 @dirrmtry share/locale/ha
+@dirrmtry share/locale/gd/LC_MESSAGES
+@dirrmtry share/locale/gd
 @dirrmtry share/locale/fy/LC_MESSAGES
 @dirrmtry share/locale/fy
 @dirrmtry share/locale/fur/LC_MESSAGES
@@ -193,3 +205,5 @@ share/xsessions/gnome.desktop
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an