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

4 files changed, 29 insertions, 39 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 4fdf540f5f2c..d3bedcac2275 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports/trunk/multimedia/totem/Makefile 20031 2014-11-02 21:47:55Z kwm $
 
 PORTNAME=	totem
-PORTVERSION=	3.12.2
+PORTVERSION=	3.14.1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -52,21 +52,21 @@ GLIB_SCHEMAS=	org.gnome.totem.enums.xml \
 		org.gnome.totem.gschema.xml \
 		org.gnome.totem.plugins.opensubtitles.gschema.xml
 
-OPTIONS_DEFINE=	LIRC BROWSER_PLUGINS
-BROWSER_PLUGINS_DESC=	Web browser plugins
+OPTIONS_DEFINE=	LIRC
 
 PLIST_SUB+=	PYVER=${PYTHON_VER:S/.//}
 
-OPTIONS_DEFAULT=BROWSER_PLUGINS
+OPTIONS_DEFAULT=
 
 # check configure script for allowed_plugins="..." for new plugins
-TOTEM_PLUGINS=	brasero-disc-recorder chapters dbusservice im-status grilo gromit \
-		iplayer media-player-keys ontop opensubtitles properties \
-		screensaver screenshot sidebar-test skipto youtube
+TOTEM_PLUGINS=	apple-trailers autoload-subtitles brasero-disc-recorder chapters \
+		dbusservice im-status grilo gromit iplayer media-player-keys \
+		nautilus ontop opensubtitles properties recent \
+		save-file screensaver screenshot sidebar-test skipto vimeo \
+		youtube
 
 # pythonconsole samplepython
-# vala rotation sample-vala
-# nautilus save-file
+# vala sample-vala
 # iplayer zeitgeist-dp grilo
 
 .include <bsd.port.options.mk>
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index f18cc8dd40af..2e8b44358771 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/totem-3.12.2.tar.xz) = 76f9d8bb04813f5c19c0d09f946a2ba42647d10e174c27e8d848afcec7005cd1
-SIZE (gnome3/totem-3.12.2.tar.xz) = 3309904
+SHA256 (gnome3/totem-3.14.1.tar.xz) = 288150837fd2693a4b672210a1ffdd178d3e542df954af247dc04c666bf97536
+SIZE (gnome3/totem-3.14.1.tar.xz) = 3242624
diff --git a/multimedia/totem/files/patch-configure b/multimedia/totem/files/patch-configure
deleted file mode 100644
index eb555a5a7466..000000000000
--- a/multimedia/totem/files/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	2010-10-10 12:15:41.000000000 -0400
-+++ configure	2010-10-10 12:18:12.000000000 -0400
-@@ -21139,7 +21139,9 @@ if test "$enable_browser_plugins" = "yes
- $as_echo "#define ENABLE_BROWSER_PLUGINS 1" >>confdefs.h
- 
- 
-+if [ -z "${BROWSER_PLUGIN_DIR}" ]; then
- 	BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
-+fi
- 
- 
- 
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 5e10607ebcf3..69dabbbe6601 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -5,16 +5,6 @@ include/totem/1.0/totem-dirs.h
 include/totem/1.0/totem-interface.h
 include/totem/1.0/totem-plugin.h
 include/totem/1.0/totem.h
-%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-cone-plugin.a
-%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-cone-plugin.so
-%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-gmp-plugin.a
-%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-gmp-plugin.so
-%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-mully-plugin.a
-%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-mully-plugin.so
-%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-narrowspace-plugin.a
-%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-narrowspace-plugin.so
-%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-vegas-plugin.a
-%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-vegas-plugin.so
 lib/girepository-1.0/Totem-1.0.typelib
 lib/libtotem.a
 lib/libtotem.so
@@ -22,6 +12,12 @@ lib/libtotem.so.0
 lib/libtotem.so.0.0.0
 lib/nautilus/extensions-3.0/libtotem-properties-page.a
 lib/nautilus/extensions-3.0/libtotem-properties-page.so
+lib/totem/plugins/apple-trailers/apple-trailers.plugin
+lib/totem/plugins/apple-trailers/libapple-trailers.a
+lib/totem/plugins/apple-trailers/libapple-trailers.so
+lib/totem/plugins/autoload-subtitles/autoload-subtitles.plugin
+lib/totem/plugins/autoload-subtitles/libautoload-subtitles.a
+lib/totem/plugins/autoload-subtitles/libautoload-subtitles.so
 lib/totem/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin
 lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.a
 lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.so
@@ -58,6 +54,12 @@ lib/totem/plugins/opensubtitles/opensubtitles.ui
 lib/totem/plugins/properties/libmovie-properties.a
 lib/totem/plugins/properties/libmovie-properties.so
 lib/totem/plugins/properties/movie-properties.plugin
+lib/totem/plugins/recent/librecent.a
+lib/totem/plugins/recent/librecent.so
+lib/totem/plugins/recent/recent.plugin
+lib/totem/plugins/save-file/libsave-file.a
+lib/totem/plugins/save-file/libsave-file.so
+lib/totem/plugins/save-file/save-file.plugin
 lib/totem/plugins/screensaver/libscreensaver.a
 lib/totem/plugins/screensaver/libscreensaver.so
 lib/totem/plugins/screensaver/screensaver.plugin
@@ -69,15 +71,18 @@ lib/totem/plugins/skipto/libskipto.a
 lib/totem/plugins/skipto/libskipto.so
 lib/totem/plugins/skipto/skipto.plugin
 lib/totem/plugins/skipto/skipto.ui
+lib/totem/plugins/vimeo/libvimeo.a
+lib/totem/plugins/vimeo/libvimeo.so
+lib/totem/plugins/vimeo/vimeo.plugin
 libdata/pkgconfig/totem.pc
-%%BROWSER_PLUGINS%%libexec/totem-plugin-viewer
 libexec/totem/totem-bugreport.py
 man/man1/totem.1.gz
 man/man1/totem-video-thumbnailer.1.gz
 share/GConf/gsettings/opensubtitles.convert
 share/GConf/gsettings/totem.convert
-share/appdata/totem.appdata.xml
-share/applications/totem.desktop
+share/appdata/org.gnome.Totem.appdata.xml
+share/applications/org.gnome.Totem.desktop
+share/dbus-1/services/org.gnome.Totem.service
 %%DOCSDIR%%/BaconVideoWidget.html
 %%DOCSDIR%%/TotemObject.html
 %%DOCSDIR%%/annotation-glossary.html
@@ -502,9 +507,6 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
 share/locale/zu/LC_MESSAGES/totem.mo
 share/thumbnailers/totem.thumbnailer
 %%DATADIR%%/controls.ui
-%%DATADIR%%/mozilla-viewer.css
-%%DATADIR%%/mozilla-viewer.ui
-%%DATADIR%%/org_gnome_totem_PluginViewer.xml
 %%DATADIR%%/playlist.ui
 %%DATADIR%%/preferences.ui
 %%DATADIR%%/properties.ui