Update cinnamon to 2.4, this should fix [1] and [2].

Update totem to 3.14 now that we have gstreamer 1.4 and minor gnome updates.
Update evolution suite to 3.12.9.
Make sure gtk30 pulls in adwait-icon-theme, since it now the default theme [3].

PR:		195290 [1], 195289 [2], 195455 [3]
Obtained from:	gnome devel repo

13 files changed, 37 insertions, 54 deletions

diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index 8bf8db0cc68d..f939402eb56d 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -1,9 +1,8 @@
 # Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
 # $FreeBSD$
-#   $MCom: ports/trunk/sysutils/cinnamon-control-center/Makefile 20008 2014-10-21 15:13:35Z gusi $
 
 PORTNAME=	cinnamon-control-center
-PORTVERSION=	2.2.11
+PORTVERSION=	2.4.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
diff --git a/sysutils/cinnamon-control-center/distinfo b/sysutils/cinnamon-control-center/distinfo
index 400660147486..f4e6f3f2a34a 100644
--- a/sysutils/cinnamon-control-center/distinfo
+++ b/sysutils/cinnamon-control-center/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-control-center-2.2.11.tar.gz) = 9cd9d9dcad3a6f9a1957f3c92a2be5316dd74a91e9efa62a6e5f9fada110929f
-SIZE (gnome3/cinnamon-control-center-2.2.11.tar.gz) = 4855291
+SHA256 (gnome3/cinnamon-control-center-2.4.2.tar.gz) = 7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188
+SIZE (gnome3/cinnamon-control-center-2.4.2.tar.gz) = 4305006
diff --git a/sysutils/cinnamon-control-center/files/patch-configure.ac b/sysutils/cinnamon-control-center/files/patch-configure.ac
index fd14a647c451..d88cdc465cec 100644
--- a/sysutils/cinnamon-control-center/files/patch-configure.ac
+++ b/sysutils/cinnamon-control-center/files/patch-configure.ac
@@ -1,14 +1,16 @@
---- configure.ac.orig	2014-04-24 12:32:11.672097031 +0000
-+++ configure.ac	2014-04-24 12:32:19.716225256 +0000
-@@ -134,11 +134,6 @@
-                   libpulse-mainloop-glib >= $PA_REQUIRED_VERSION)
- PKG_CHECK_MODULES(UNIVERSAL_ACCESS_PANEL, $COMMON_MODULES)
+--- configure.ac.orig	2014-11-12 01:19:37.000000000 +0100
++++ configure.ac	2014-11-24 22:20:09.360210664 +0100
+@@ -138,13 +138,6 @@
+ #----------------------------------------------
+ # Network Manager Stuff
  
 -PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
 -                  libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
+-                  libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION
 -                  libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
--		  libnm-gtk >= $NETWORK_MANAGER_REQUIRED_VERSION)
--
- # Check for libnm-gtk + 0.9.9.0
- PKG_CHECK_MODULES(LIBNM_GTK_COMPAT, libnm-gtk >= $LIBNM_GTK_REQUIRED_VERSION
- 		  libnm-gtk >= $LIBNM_GTK_REQUIRED_VERSION,
+-                  libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
+-                  mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
+-                  [have_networkmanager=yes], have_networkmanager=no)
+ if test "x$have_networkmanager" = xno ; then
+         AC_MSG_WARN(*** Network panel will not be built (NetworkManager or ModemManager not found) ***)
+ else
diff --git a/sysutils/cinnamon-control-center/files/patch-panels_Makefile.am b/sysutils/cinnamon-control-center/files/patch-panels_Makefile.am
deleted file mode 100644
index d9b36e97ec52..000000000000
--- a/sysutils/cinnamon-control-center/files/patch-panels_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- panels/Makefile.am.orig	2014-04-24 12:43:38.968046979 +0000
-+++ panels/Makefile.am	2014-04-24 12:43:46.605454316 +0000
-@@ -10,7 +10,6 @@
- 	power \
- 	sound \
- 	sound-nua \
--	network \
- 	datetime
- 
- disabled_panels = $(NULL)
diff --git a/sysutils/cinnamon-control-center/files/patch-unused-panels_user-accounts_um-utils.c b/sysutils/cinnamon-control-center/files/patch-unused-panels_user-accounts_um-utils.c
deleted file mode 100644
index 58c72f61747d..000000000000
--- a/sysutils/cinnamon-control-center/files/patch-unused-panels_user-accounts_um-utils.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- unused-panels/user-accounts/um-utils.c.orig	2013-11-24 13:33:13.594698498 +0000
-+++ unused-panels/user-accounts/um-utils.c	2013-11-24 13:33:34.715696820 +0000
-@@ -25,7 +25,15 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <pwd.h>
--#include <utmp.h>
-+#include <sys/param.h>
-+#if __FreeBSD_version < 900000
-+ #include <utmp.h>
-+#else
-+#include <utmpx.h>
-+/* from the old utmp.h */
-+#define UT_NAMESIZE 16
-+#endif
-+
- 
- #include <glib.h>
- #include <glib/gi18n-lib.h>
diff --git a/sysutils/cinnamon-control-center/pkg-plist b/sysutils/cinnamon-control-center/pkg-plist
index c4c1d20bf470..568a538f9f29 100644
--- a/sysutils/cinnamon-control-center/pkg-plist
+++ b/sysutils/cinnamon-control-center/pkg-plist
@@ -22,6 +22,7 @@ lib/cinnamon-control-center-1/panels/libsoundnua.so
 lib/cinnamon-control-center-1/panels/libuniversal-access.a
 lib/cinnamon-control-center-1/panels/libuniversal-access.so
 lib/libcinnamon-control-center.so
+lib/libcinnamon-control-center.so.1
 lib/libcinnamon-control-center.so.1.0.0
 libdata/pkgconfig/libcinnamon-control-center.pc
 share/applications/cinnamon-color-panel.desktop
diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile
index 150b58571acc..b6bf8d1233f1 100644
--- a/sysutils/cinnamon-settings-daemon/Makefile
+++ b/sysutils/cinnamon-settings-daemon/Makefile
@@ -1,9 +1,8 @@
 # Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
 # $FreeBSD$
-#   $MCom: ports/trunk/sysutils/cinnamon-settings-daemon/Makefile 20031 2014-11-02 21:47:55Z kwm $
 
 PORTNAME=	cinnamon-settings-daemon
-PORTVERSION=	2.2.4
+PORTVERSION=	2.4.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
@@ -47,6 +46,7 @@ INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.cinnamon.settings-daemon.enums.xml \
 		org.cinnamon.settings-daemon.peripherals.gschema.xml \
+		org.cinnamon.settings-daemon.plugins.background.gschema.xml \
 		org.cinnamon.settings-daemon.plugins.color.gschema.xml \
 		org.cinnamon.settings-daemon.plugins.gschema.xml \
 		org.cinnamon.settings-daemon.plugins.housekeeping.gschema.xml \
diff --git a/sysutils/cinnamon-settings-daemon/distinfo b/sysutils/cinnamon-settings-daemon/distinfo
index 064c72545487..73a0f7ef245d 100644
--- a/sysutils/cinnamon-settings-daemon/distinfo
+++ b/sysutils/cinnamon-settings-daemon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-settings-daemon-2.2.4.tar.xz) = 5ee1f3d3af20fdadd5a6b948be667a0968c94f99f7b5a1992f03be0e876ff414
-SIZE (gnome3/cinnamon-settings-daemon-2.2.4.tar.xz) = 2995813
+SHA256 (gnome3/cinnamon-settings-daemon-2.4.2.tar.xz) = c5de5443136142b1a620142bc6aab5a2b72f001a52f23f9f74ef99f1ebc9180b
+SIZE (gnome3/cinnamon-settings-daemon-2.4.2.tar.xz) = 2998797
diff --git a/sysutils/cinnamon-settings-daemon/pkg-plist b/sysutils/cinnamon-settings-daemon/pkg-plist
index 45409c425eee..7fe8b75642be 100644
--- a/sysutils/cinnamon-settings-daemon/pkg-plist
+++ b/sysutils/cinnamon-settings-daemon/pkg-plist
@@ -4,6 +4,7 @@ include/cinnamon-settings-daemon-3.0/cinnamon-settings-daemon/csd-enums.h
 lib/cinnamon-settings-daemon-3.0/a11y-keyboard.cinnamon-settings-plugin
 lib/cinnamon-settings-daemon-3.0/a11y-settings.cinnamon-settings-plugin
 lib/cinnamon-settings-daemon-3.0/automount.cinnamon-settings-plugin
+lib/cinnamon-settings-daemon-3.0/background.cinnamon-settings-plugin
 lib/cinnamon-settings-daemon-3.0/clipboard.cinnamon-settings-plugin
 lib/cinnamon-settings-daemon-3.0/color.cinnamon-settings-plugin
 lib/cinnamon-settings-daemon-3.0/cursor.cinnamon-settings-plugin
@@ -15,6 +16,8 @@ lib/cinnamon-settings-daemon-3.0/liba11y-settings.a
 lib/cinnamon-settings-daemon-3.0/liba11y-settings.so
 lib/cinnamon-settings-daemon-3.0/libautomount.a
 lib/cinnamon-settings-daemon-3.0/libautomount.so
+lib/cinnamon-settings-daemon-3.0/libbackground.a
+lib/cinnamon-settings-daemon-3.0/libbackground.so
 lib/cinnamon-settings-daemon-3.0/libclipboard.a
 lib/cinnamon-settings-daemon-3.0/libclipboard.so
 lib/cinnamon-settings-daemon-3.0/libcolor.a
@@ -62,6 +65,7 @@ libexec/csd-locate-pointer
 libexec/csd-printer
 libexec/csd-test-a11y-keyboard
 libexec/csd-test-a11y-settings
+libexec/csd-test-background
 libexec/csd-test-input-helper
 libexec/csd-test-media-keys
 libexec/csd-test-mouse
@@ -181,3 +185,4 @@ share/locale/zh_TW/LC_MESSAGES/cinnamon-settings-daemon.mo
 share/locale/zu/LC_MESSAGES/cinnamon-settings-daemon.mo
 share/polkit-1/actions/org.cinnamon.settings-daemon.plugins.power.policy
 share/polkit-1/actions/org.cinnamon.settingsdaemon.datetimemechanism.policy
+@dir %%ETCDIR%%/xrandr
diff --git a/sysutils/consolekit/pkg-plist b/sysutils/consolekit/pkg-plist
index 00d5bbc0fc84..5f72043d17fa 100644
--- a/sysutils/consolekit/pkg-plist
+++ b/sysutils/consolekit/pkg-plist
@@ -33,3 +33,8 @@ share/polkit-1/actions/org.freedesktop.consolekit.policy
 @exec mkdir -p %D/lib/ConsoleKit/run-seat.d
 @dir /var/run/ConsoleKit
 @dir /var/log/ConsoleKit
+@dir etc/ConsoleKit/run-seat.d
+@dir etc/ConsoleKit/run-session.d
+@dir lib/ConsoleKit/run-seat.d
+@dir lib/ConsoleKit/run-session.d
+
diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index 44295b86de38..9b651a3ba1af 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -3,8 +3,8 @@
 #    $MCom: ports/trunk/sysutils/tracker/Makefile 20045 2014-11-10 06:23:59Z gusi $
 
 PORTNAME=	tracker
-PORTVERSION=	1.2.4
-PORTREVISION=	2
+PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 
diff --git a/sysutils/tracker/distinfo b/sysutils/tracker/distinfo
index 535a2162f085..523b7ab4bd7c 100644
--- a/sysutils/tracker/distinfo
+++ b/sysutils/tracker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tracker-1.2.4.tar.xz) = 438efa29ea1ff7546321d2eb0f7f9edc83c74be24a9d8bef4f993be243647bb7
-SIZE (tracker-1.2.4.tar.xz) = 6031936
+SHA256 (tracker-1.2.5.tar.xz) = 1e614bc33f93d5820f3c90510e11210bf34d02dba6ccbd3dc30097758a6d31aa
+SIZE (tracker-1.2.5.tar.xz) = 6033708
diff --git a/sysutils/tracker/pkg-plist b/sysutils/tracker/pkg-plist
index 8fc56c9803f7..fc158dabc87b 100644
--- a/sysutils/tracker/pkg-plist
+++ b/sysutils/tracker/pkg-plist
@@ -37,15 +37,15 @@ lib/girepository-%%TRACKER_VER%%/TrackerMiner-1.0.typelib
 lib/libtracker-control-%%TRACKER_VER%%.a
 lib/libtracker-control-%%TRACKER_VER%%.so
 lib/libtracker-control-%%TRACKER_VER%%.so.0
-lib/libtracker-control-%%TRACKER_VER%%.so.0.202.2
+lib/libtracker-control-%%TRACKER_VER%%.so.0.202.3
 lib/libtracker-miner-%%TRACKER_VER%%.a
 lib/libtracker-miner-%%TRACKER_VER%%.so
 lib/libtracker-miner-%%TRACKER_VER%%.so.0
-lib/libtracker-miner-%%TRACKER_VER%%.so.0.202.2
+lib/libtracker-miner-%%TRACKER_VER%%.so.0.202.3
 lib/libtracker-sparql-%%TRACKER_VER%%.a
 lib/libtracker-sparql-%%TRACKER_VER%%.so
 lib/libtracker-sparql-%%TRACKER_VER%%.so.0
-lib/libtracker-sparql-%%TRACKER_VER%%.so.0.202.2
+lib/libtracker-sparql-%%TRACKER_VER%%.so.0.202.3
 %%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-abw.a
 %%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-abw.so
 %%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-bmp.a