Update the MATE DE to 1.12.

* Still build MATE against gtk+ 2 due to gtk+ 3 support not ready
  for prime time.
* Fix loading of a number of applets. We rename a number of applets
  but didn't change the "config" files the "add applet to panel" dialog
  uses. [1]
* Unbreak the creation of new notes with the stickynotes applet [2]

PR:		205391 [1], 200349 [2]
Obtained from:	GNOME devel repo

14 files changed, 64 insertions, 33 deletions

diff --git a/sysutils/mate-control-center/Makefile b/sysutils/mate-control-center/Makefile
index 3b72b6a24988..e6f5a9000b8c 100644
--- a/sysutils/mate-control-center/Makefile
+++ b/sysutils/mate-control-center/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-control-center
-PORTVERSION=	1.10.1
+PORTVERSION=	1.12.1
 CATEGORIES=	sysutils mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/sysutils/mate-control-center/distinfo b/sysutils/mate-control-center/distinfo
index eef5a0aaff77..e8615e8e9abc 100644
--- a/sysutils/mate-control-center/distinfo
+++ b/sysutils/mate-control-center/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-control-center-1.10.1.tar.xz) = f3804c337011e9e00e3e93ad9e28fc7c8103b98e0dc0fdf897113cf02e6366eb
-SIZE (mate/mate-control-center-1.10.1.tar.xz) = 1328008
+SHA256 (mate/mate-control-center-1.12.1.tar.xz) = 851f08e69ec8f513b8971262a439c83ef837b2a7467690313672b6a9d9a179fb
+SIZE (mate/mate-control-center-1.12.1.tar.xz) = 1304732
diff --git a/sysutils/mate-control-center/files/patch-capplets_common_theme-thumbnail.c b/sysutils/mate-control-center/files/patch-capplets_common_theme-thumbnail.c
new file mode 100644
index 000000000000..96123ea4fa57
--- /dev/null
+++ b/sysutils/mate-control-center/files/patch-capplets_common_theme-thumbnail.c
@@ -0,0 +1,13 @@
+--- ./capplets/common/theme-thumbnail.c.orig	2016-01-09 18:24:24.817763000 +0100
++++ ./capplets/common/theme-thumbnail.c	2016-01-09 18:25:23.640259000 +0100
+@@ -145,9 +145,7 @@ static GdkPixmap* draw_window_on_pixbuf(
+ 
+ 	gtk_widget_hide(widget);
+ 
+-#if GTK_CHECK_VERSION (3, 0, 0)
+-	return pixbuf;
+-#else
++#if !GTK_CHECK_VERSION (3, 0, 0)
+ 	return pixmap;
+ #endif
+ }
diff --git a/sysutils/mate-control-center/pkg-plist b/sysutils/mate-control-center/pkg-plist
index 5c2c3ff1680c..50ad4fecd845 100644
--- a/sysutils/mate-control-center/pkg-plist
+++ b/sysutils/mate-control-center/pkg-plist
@@ -12,6 +12,7 @@ bin/mate-network-properties
 bin/mate-thumbnail-font
 bin/mate-typing-monitor
 bin/mate-window-properties
+etc/xdg/menus/mate-preferences-categories.menu
 etc/xdg/menus/matecc.menu
 include/libmate-slab/app-resizer.h
 include/libmate-slab/app-shell.h
diff --git a/sysutils/mate-polkit/Makefile b/sysutils/mate-polkit/Makefile
index 6efe6cc176b9..30d04ffde91d 100644
--- a/sysutils/mate-polkit/Makefile
+++ b/sysutils/mate-polkit/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-polkit
-PORTVERSION=	1.10.1
+PORTVERSION=	1.12.0
 CATEGORIES=	sysutils mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -11,7 +11,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	MATE frontend to the PolicKit framework
 
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
+		libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice
 
 PORTSCOUT=	limitw:1,even
 
@@ -20,6 +21,8 @@ USE_GNOME=	gtk20 intlhack introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
+		--with-gtk=2.0 \
+		--enable-accountsservice \
 		--localstatedir=/var
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/sysutils/mate-polkit/distinfo b/sysutils/mate-polkit/distinfo
index 4285666c2b35..bf4650ef552e 100644
--- a/sysutils/mate-polkit/distinfo
+++ b/sysutils/mate-polkit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-polkit-1.10.1.tar.xz) = 1d128caa99f2180ab92688353ef366d7cfe3ba3db5267200a8659259e178fcaa
-SIZE (mate/mate-polkit-1.10.1.tar.xz) = 326556
+SHA256 (mate/mate-polkit-1.12.0.tar.xz) = c38f0a0c3d4e10fc95d27fa4e8d47eb6948e8c9279a82f316f563666571bf8b9
+SIZE (mate/mate-polkit-1.12.0.tar.xz) = 324708
diff --git a/sysutils/mate-power-manager/Makefile b/sysutils/mate-power-manager/Makefile
index 4b96eb04ddca..80932a631e97 100644
--- a/sysutils/mate-power-manager/Makefile
+++ b/sysutils/mate-power-manager/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-power-manager
-PORTVERSION=	1.10.2
+PORTVERSION=	1.12.1
 CATEGORIES=	sysutils mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/sysutils/mate-power-manager/distinfo b/sysutils/mate-power-manager/distinfo
index 0a24d980d1f0..2a437a505698 100644
--- a/sysutils/mate-power-manager/distinfo
+++ b/sysutils/mate-power-manager/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-power-manager-1.10.2.tar.xz) = 49eed514cb8507d3ae7699e701afb33a90002aa833bdc507f9ac0dd031ce04de
-SIZE (mate/mate-power-manager-1.10.2.tar.xz) = 3350616
+SHA256 (mate/mate-power-manager-1.12.1.tar.xz) = c43aa2ae75335a758d71cdab4b939141c352a7fb179c3e41a064ce9c007b587f
+SIZE (mate/mate-power-manager-1.12.1.tar.xz) = 3197824
diff --git a/sysutils/mate-settings-daemon/Makefile b/sysutils/mate-settings-daemon/Makefile
index 824264b960f0..bb158f913441 100644
--- a/sysutils/mate-settings-daemon/Makefile
+++ b/sysutils/mate-settings-daemon/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-settings-daemon
-PORTVERSION=	1.10.2
+PORTVERSION=	1.12.1
 CATEGORIES=	sysutils mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/sysutils/mate-settings-daemon/distinfo b/sysutils/mate-settings-daemon/distinfo
index 7e637c66e5bf..cf3a70dee076 100644
--- a/sysutils/mate-settings-daemon/distinfo
+++ b/sysutils/mate-settings-daemon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-settings-daemon-1.10.2.tar.xz) = 6c8e6a72bc2c52246eba46fa8c8d38cf49394a28c6f98cf86b4b9fbc937bc50b
-SIZE (mate/mate-settings-daemon-1.10.2.tar.xz) = 788748
+SHA256 (mate/mate-settings-daemon-1.12.1.tar.xz) = a0d9ea55ba5828500e873eff6c771dae645fa3218c1ba9d701c408f0eb71e988
+SIZE (mate/mate-settings-daemon-1.12.1.tar.xz) = 781388
diff --git a/sysutils/mate-settings-daemon/pkg-plist b/sysutils/mate-settings-daemon/pkg-plist
index 350f5d81f899..e505a4d76b1b 100644
--- a/sysutils/mate-settings-daemon/pkg-plist
+++ b/sysutils/mate-settings-daemon/pkg-plist
@@ -50,21 +50,21 @@ man/man1/msd-locate-pointer.1.gz
 share/MateConf/gsettings/mate-settings-daemon.convert
 share/dbus-1/services/org.mate.SettingsDaemon.service
 share/dbus-1/system-services/org.mate.SettingsDaemon.DateTimeMechanism.service
+share/icons/hicolor/16x16/apps/msd-xrandr.png
+share/icons/hicolor/22x22/apps/msd-xrandr.png
+share/icons/hicolor/24x24/apps/msd-xrandr.png
+share/icons/hicolor/32x32/apps/msd-xrandr.png
+share/icons/hicolor/scalable/apps/msd-xrandr.svg
 share/icons/mate/16x16/actions/touchpad-disabled.png
 share/icons/mate/16x16/actions/touchpad-enabled.png
-share/icons/mate/16x16/apps/msd-xrandr.png
 share/icons/mate/22x22/actions/touchpad-disabled.png
 share/icons/mate/22x22/actions/touchpad-enabled.png
-share/icons/mate/22x22/apps/msd-xrandr.png
 share/icons/mate/24x24/actions/touchpad-disabled.png
 share/icons/mate/24x24/actions/touchpad-enabled.png
-share/icons/mate/24x24/apps/msd-xrandr.png
 share/icons/mate/32x32/actions/touchpad-disabled.png
 share/icons/mate/32x32/actions/touchpad-enabled.png
-share/icons/mate/32x32/apps/msd-xrandr.png
 share/icons/mate/scalable/actions/touchpad-disabled.svg
 share/icons/mate/scalable/actions/touchpad-enabled.svg
-share/icons/mate/scalable/apps/msd-xrandr.svg
 share/locale/af/LC_MESSAGES/mate-settings-daemon.mo
 share/locale/am/LC_MESSAGES/mate-settings-daemon.mo
 share/locale/ar/LC_MESSAGES/mate-settings-daemon.mo
@@ -161,14 +161,13 @@ share/locale/zh_HK/LC_MESSAGES/mate-settings-daemon.mo
 share/locale/zh_TW/LC_MESSAGES/mate-settings-daemon.mo
 share/locale/zu/LC_MESSAGES/mate-settings-daemon.mo
 share/mate-control-center/keybindings/50-accessibility.xml
-share/mate-settings-daemon/acme.ui
-share/mate-settings-daemon/icons/hicolor/64x64/devices/kbd-capslock-off.png
-share/mate-settings-daemon/icons/hicolor/64x64/devices/kbd-capslock-on.png
-share/mate-settings-daemon/icons/hicolor/64x64/devices/kbd-numlock-off.png
-share/mate-settings-daemon/icons/hicolor/64x64/devices/kbd-numlock-on.png
-share/mate-settings-daemon/icons/hicolor/64x64/devices/kbd-scrolllock-off.png
-share/mate-settings-daemon/icons/hicolor/64x64/devices/kbd-scrolllock-on.png
-share/mate-settings-daemon/msd-a11y-preferences-dialog.ui
+%%DATADIR%%/acme.ui
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-off.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-on.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-numlock-off.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-numlock-on.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-scrolllock-off.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-scrolllock-on.png
+%%DATADIR%%/msd-a11y-preferences-dialog.ui
 share/polkit-1/actions/org.mate.settingsdaemon.datetimemechanism.policy
-@dir etc/mate-settings-daemon/xrandr
-@dir etc/mate-settings-daemon
+@dir %%ETCDIR%%/xrandr
diff --git a/sysutils/mate-system-monitor/Makefile b/sysutils/mate-system-monitor/Makefile
index eb2c9d973784..3c091daa7278 100644
--- a/sysutils/mate-system-monitor/Makefile
+++ b/sysutils/mate-system-monitor/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-system-monitor
-PORTVERSION=	1.10.1
+PORTVERSION=	1.12.1
 CATEGORIES=	sysutils mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -16,12 +16,13 @@ LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		alias gettext gmake pathfix pkgconfig tar:xz
+USES=		alias compiler:c++11-lang gettext gmake pathfix \
+		pkgconfig tar:xz
 USE_MATE=	icontheme
 USE_GNOME=	gtk20 gtkmm24 intlhack librsvg2 libwnck libxml2
 CONFIGURE_ARGS=	--with-gtk=2.0
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-lutil"
+CONFIGURE_ENV=	LIBS="-lutil" DATADIRNAME="share"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/sysutils/mate-system-monitor/distinfo b/sysutils/mate-system-monitor/distinfo
index 9dc30a15cf4e..6b462172d5eb 100644
--- a/sysutils/mate-system-monitor/distinfo
+++ b/sysutils/mate-system-monitor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-system-monitor-1.10.1.tar.xz) = d5428990f9ba2a864a9c4af74c626c3e8f46f0b0468925209ad51f2d09304774
-SIZE (mate/mate-system-monitor-1.10.1.tar.xz) = 2129620
+SHA256 (mate/mate-system-monitor-1.12.1.tar.xz) = 7668ecba70b7f56f3bcfb143cb6b93a15daf8636fcf678491112afea1a49dea9
+SIZE (mate/mate-system-monitor-1.12.1.tar.xz) = 2113756
diff --git a/sysutils/mate-system-monitor/files/patch-src_lsof.cpp b/sysutils/mate-system-monitor/files/patch-src_lsof.cpp
new file mode 100644
index 000000000000..9c32166eb360
--- /dev/null
+++ b/sysutils/mate-system-monitor/files/patch-src_lsof.cpp
@@ -0,0 +1,14 @@
+--- src/lsof.cpp.orig	2015-09-25 13:36:19.000000000 +0200
++++ src/lsof.cpp	2016-01-09 12:32:53.892273000 +0100
+@@ -140,8 +140,9 @@
+ 
+         void update_count(unsigned count)
+         {
+-            string s = static_cast<std::ostringstream&>(std::ostringstream() << count).str();
+-            gtk_label_set_text(this->count, s.c_str());
++	    std::ostringstream ss;
++	    ss << count;;
++            gtk_label_set_text(this->count, ss.str().c_str());
+         }
+ 
+