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

23 files changed, 219 insertions, 107 deletions

diff --git a/x11/libmatekbd/Makefile b/x11/libmatekbd/Makefile
index b3fc77ac7e6f..c6c63a84882e 100644
--- a/x11/libmatekbd/Makefile
+++ b/x11/libmatekbd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libmatekbd
-PORTVERSION=	1.10.0
+PORTVERSION=	1.12.1
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libxklavier.so:${PORTSDIR}/x11/libxklavier
 PORTSCOUT=	limitw:1,even
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME=	gtk20 intlhack
+USE_GNOME=	gtk20 intlhack introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtk=2.0
diff --git a/x11/libmatekbd/distinfo b/x11/libmatekbd/distinfo
index 87910a72d1ef..83eb561d2317 100644
--- a/x11/libmatekbd/distinfo
+++ b/x11/libmatekbd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/libmatekbd-1.10.0.tar.xz) = 09d9bb75d784083036e24a29120f5933f0dfdfe59050858dd353fd7572d7d2d1
-SIZE (mate/libmatekbd-1.10.0.tar.xz) = 365796
+SHA256 (mate/libmatekbd-1.12.1.tar.xz) = 58a0494fb23fd0ab47836aa35b3e5068e1d5ec63df0185a08ef8c2767bb64ea2
+SIZE (mate/libmatekbd-1.12.1.tar.xz) = 349492
diff --git a/x11/libmatekbd/pkg-plist b/x11/libmatekbd/pkg-plist
index 89611e9c0a48..fbbaaa126892 100644
--- a/x11/libmatekbd/pkg-plist
+++ b/x11/libmatekbd/pkg-plist
@@ -5,6 +5,7 @@ include/libmatekbd/matekbd-keyboard-config.h
 include/libmatekbd/matekbd-keyboard-drawing.h
 include/libmatekbd/matekbd-status.h
 include/libmatekbd/matekbd-util.h
+lib/girepository-1.0/Matekbd-1.0.typelib
 lib/libmatekbd.a
 lib/libmatekbd.so
 lib/libmatekbd.so.4
@@ -16,6 +17,7 @@ lib/libmatekbdui.so.4.2.0
 libdata/pkgconfig/libmatekbd.pc
 libdata/pkgconfig/libmatekbdui.pc
 share/MateConf/gsettings/matekbd.convert
+share/gir-1.0/Matekbd-1.0.gir
 %%DATADIR%%/ui/show-layout.ui
 share/locale/am/LC_MESSAGES/libmatekbd.mo
 share/locale/ar/LC_MESSAGES/libmatekbd.mo
@@ -51,6 +53,7 @@ share/locale/he/LC_MESSAGES/libmatekbd.mo
 share/locale/hi/LC_MESSAGES/libmatekbd.mo
 share/locale/hr/LC_MESSAGES/libmatekbd.mo
 share/locale/hu/LC_MESSAGES/libmatekbd.mo
+share/locale/hy/LC_MESSAGES/libmatekbd.mo
 share/locale/id/LC_MESSAGES/libmatekbd.mo
 share/locale/it/LC_MESSAGES/libmatekbd.mo
 share/locale/ja/LC_MESSAGES/libmatekbd.mo
diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile
index 50d57e9ef622..fc6cae2b6484 100644
--- a/x11/mate-applets/Makefile
+++ b/x11/mate-applets/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-applets
-PORTVERSION=	1.10.3
+PORTVERSION=	1.12.1
 PORTREVISION=	1
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
@@ -20,7 +20,6 @@ LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
 		libhal.so:${PORTSDIR}/sysutils/hal \
 		libupower-glib.so:${PORTSDIR}/sysutils/upower \
 		libnotify.so:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS=	gucharmap:${PORTSDIR}/deskutils/gucharmap
 
 PORTSCOUT=	limitw:1,even
 
@@ -32,7 +31,7 @@ USE_GNOME=	gdkpixbuf2 gtksourceview2 introspection:build \
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ARGS=	--disable-networkmanager
+CONFIGURE_ARGS=	--with-gtk=2.0
 CONFIGURE_ENV=	OS_SYS="/usr/include"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
@@ -45,8 +44,8 @@ GLIB_SCHEMAS=	org.mate.panel.applet.charpick.gschema.xml \
 		org.mate.panel.applet.timer.gschema.xml \
 		org.mate.stickynotes.gschema.xml
 
-FIX_APPLETS=	accessx-status battstat charpick drivemount geyes \
-		invest-applet/data multiload stickynotes trashapplet
+FIX_APPLETS=	accessx-status battstat \
+		invest-applet/data stickynotes trashapplet
 
 .include <bsd.port.pre.mk>
 
@@ -76,5 +75,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|@LIBEXECDIR@/|@LIBEXECDIR@/mate-|g' \
 		${WRKSRC}/${dir}/org.mate.*
 .endfor
+.for dir in command timerapplet
+	@${REINPLACE_CMD} -e 's|(libexecdir)/|(libexecdir)/mate-|g' \
+		${WRKSRC}/${dir}/Makefile.in
+.endfor
 
 .include <bsd.port.post.mk>
diff --git a/x11/mate-applets/distinfo b/x11/mate-applets/distinfo
index 2e1344a9a3ab..5167dfc1d2c1 100644
--- a/x11/mate-applets/distinfo
+++ b/x11/mate-applets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-applets-1.10.3.tar.xz) = 4670b0e877639f9c585b84b27c3654880ed96aefea596a8b8c20c955a3c0266d
-SIZE (mate/mate-applets-1.10.3.tar.xz) = 6895936
+SHA256 (mate/mate-applets-1.12.1.tar.xz) = 0a3bc19e59c69eccdcc2342f29b7837563e51fbefdb232ca1884ca23d8f69c99
+SIZE (mate/mate-applets-1.12.1.tar.xz) = 6816716
diff --git a/x11/mate-applets/files/patch-configure b/x11/mate-applets/files/patch-configure
new file mode 100644
index 000000000000..d3c37d2071bd
--- /dev/null
+++ b/x11/mate-applets/files/patch-configure
@@ -0,0 +1,102 @@
+--- configure.orig	2016-01-24 14:18:29.899712000 +0100
++++ configure	2016-01-24 14:18:52.644710000 +0100
+@@ -15944,7 +15944,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${datadir}/locale"`
++  ac_define_dir=`eval echo $localedir`
+   ac_define_dir=`eval echo $ac_define_dir`
+   MATELOCALEDIR="$ac_define_dir"
+ 
+@@ -17078,7 +17078,7 @@
+ 
+ 	   ;;
+        # list of supported OS cores that do not use libapm
+-       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
++       *-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
+           if test -n "${OS_SYS}"; then
+ 	       ACPIINC="-I${OS_SYS}"
+ 	   else
+@@ -17327,6 +17327,9 @@
+       *linux*)
+          build_cpufreq_applet=yes
+ 	 ;;
++      i386-*-freebsd*|amd64-*-freebsd*)
++         build_cpufreq_applet=yes
++	 ;;
+       *)
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${host} is not supported by cpufreq applet, not building" >&5
+ $as_echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;}
+@@ -17557,7 +17560,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${iconsdir}"`
++  ac_define_dir=`eval echo $iconsdir`
+   ac_define_dir=`eval echo $ac_define_dir`
+   MATE_ICONDIR="$ac_define_dir"
+ 
+@@ -17570,7 +17573,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${pixmapsdir}"`
++  ac_define_dir=`eval echo $pixmapsdir`
+   ac_define_dir=`eval echo $ac_define_dir`
+   MATE_PIXMAPSDIR="$ac_define_dir"
+ 
+@@ -17583,7 +17586,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${pkgdatadir}"`
++  ac_define_dir=`eval echo $pkgdatadir`
+   ac_define_dir=`eval echo $ac_define_dir`
+   PKGDATADIR="$ac_define_dir"
+ 
+@@ -17596,7 +17599,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${builderdir}"`
++  ac_define_dir=`eval echo $builderdir`
+   ac_define_dir=`eval echo $ac_define_dir`
+   GTK_BUILDERDIR="$ac_define_dir"
+ 
+@@ -17609,7 +17612,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${datadir}"`
++  ac_define_dir=`eval echo $datadir`
+   ac_define_dir=`eval echo $ac_define_dir`
+   DATADIR="$ac_define_dir"
+ 
+@@ -17622,7 +17625,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${sysconfdir}"`
++  ac_define_dir=`eval echo $sysconfdir`
+   ac_define_dir=`eval echo $ac_define_dir`
+   SYSCONFDIR="$ac_define_dir"
+ 
+@@ -17635,7 +17638,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${libdir}"`
++  ac_define_dir=`eval echo $libdir`
+   ac_define_dir=`eval echo $ac_define_dir`
+   LIBDIR="$ac_define_dir"
+ 
+@@ -17648,7 +17651,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"$prefix"`
++  ac_define_dir=`eval echo $prefix`
+   ac_define_dir=`eval echo $ac_define_dir`
+   PREFIX="$ac_define_dir"
+ 
diff --git a/x11/mate-applets/files/patch-configure.ac b/x11/mate-applets/files/patch-configure.ac
index d54ad27bd730..34407387928a 100644
--- a/x11/mate-applets/files/patch-configure.ac
+++ b/x11/mate-applets/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2013-03-26 21:00:43.000000000 -0500
-+++ configure.ac	2013-03-26 21:06:27.000000000 -0500
-@@ -349,7 +349,7 @@
+--- configure.ac.orig	2015-11-29 20:13:23.000000000 +0100
++++ configure.ac	2016-01-08 23:56:37.487626000 +0100
+@@ -269,7 +269,7 @@
  GETTEXT_PACKAGE=mate-applets
  AC_SUBST(GETTEXT_PACKAGE)
  AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
@@ -9,18 +9,16 @@
  AM_GLIB_GNU_GETTEXT
  
  # this is the directory where the *.{mo,gmo} files are installed
-@@ -390,8 +390,8 @@
+@@ -310,7 +310,7 @@
  	   AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
  	   ;;
         # list of supported OS cores that do not use libapm
 -       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
--          if [ -n "${OS_SYS}" ]; then
-+       i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
-+          if test -n "${OS_SYS}" ; then
++       *-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
+           if test -n "${OS_SYS}"; then
  	       ACPIINC="-I${OS_SYS}"
  	   else
- 	       ACPIINC="-I/usr/src/sys"
-@@ -521,6 +521,9 @@
+@@ -418,6 +418,9 @@
        *linux*)
           build_cpufreq_applet=yes
  	 ;;
@@ -30,7 +28,7 @@
        *)
           AC_MSG_WARN([${host} is not supported by cpufreq applet, not building])
  	 build_cpufreq_applet=no
-@@ -623,14 +626,14 @@
+@@ -526,14 +529,14 @@
  builderdir="${pkgdatadir}/builder"
  AC_SUBST(builderdir)
  
diff --git a/x11/mate-applets/pkg-plist b/x11/mate-applets/pkg-plist
index a282230be130..33068e19e195 100644
--- a/x11/mate-applets/pkg-plist
+++ b/x11/mate-applets/pkg-plist
@@ -1299,12 +1299,12 @@ share/icons/hicolor/24x24/apps/mate-sticky-notes-applet.png
 %%CPUFREQ%%share/icons/hicolor/32x32/apps/mate-cpu-frequency-applet.png
 share/icons/hicolor/32x32/apps/mate-eyes-applet.png
 share/icons/hicolor/32x32/apps/mate-sticky-notes-applet.png
+share/icons/hicolor/48x48/apps/mate-ax-applet.png
 share/icons/hicolor/48x48/apps/mate-invest-applet.png
 %%CPUFREQ%%share/icons/hicolor/scalable/apps/mate-cpu-frequency-applet.svg
 share/icons/hicolor/scalable/apps/mate-eyes-applet.svg
 share/icons/hicolor/scalable/apps/mate-invest-applet.svg
 share/icons/hicolor/scalable/apps/mate-sticky-notes-applet.svg
-share/icons/mate/48x48/apps/ax-applet.png
 share/locale/af/LC_MESSAGES/mate-applets.mo
 share/locale/am/LC_MESSAGES/mate-applets.mo
 share/locale/ar/LC_MESSAGES/mate-applets.mo
@@ -1472,42 +1472,42 @@ share/mate-panel/applets/org.mate.applets.MultiLoadApplet.mate-panel-applet
 share/mate-panel/applets/org.mate.applets.StickyNotesApplet.mate-panel-applet
 share/mate-panel/applets/org.mate.applets.TimerApplet.mate-panel-applet
 share/mate-panel/applets/org.mate.applets.TrashApplet.mate-panel-applet
-share/pixmaps/mate-accessx-status-applet/ax-applet.png
-share/pixmaps/mate-accessx-status-applet/ax-bouncekeys.png
-share/pixmaps/mate-accessx-status-applet/ax-key-base.png
-share/pixmaps/mate-accessx-status-applet/ax-key-inverse.png
-share/pixmaps/mate-accessx-status-applet/ax-key-no.png
-share/pixmaps/mate-accessx-status-applet/ax-key-none.png
-share/pixmaps/mate-accessx-status-applet/ax-key-yes.png
-share/pixmaps/mate-accessx-status-applet/ax-slowkeys-no.png
-share/pixmaps/mate-accessx-status-applet/ax-slowkeys-pending.png
-share/pixmaps/mate-accessx-status-applet/ax-slowkeys-yes.png
-share/pixmaps/mate-accessx-status-applet/ax-slowkeys.png
-share/pixmaps/mate-accessx-status-applet/mousekeys-base.png
-share/pixmaps/mate-accessx-status-applet/mousekeys-default-left.png
-share/pixmaps/mate-accessx-status-applet/mousekeys-default-middle.png
-share/pixmaps/mate-accessx-status-applet/mousekeys-default-right.png
-share/pixmaps/mate-accessx-status-applet/mousekeys-pressed-left.png
-share/pixmaps/mate-accessx-status-applet/mousekeys-pressed-middle.png
-share/pixmaps/mate-accessx-status-applet/mousekeys-pressed-right.png
-share/pixmaps/mate-accessx-status-applet/sticky-alt-latched.png
-share/pixmaps/mate-accessx-status-applet/sticky-alt-locked.png
-share/pixmaps/mate-accessx-status-applet/sticky-alt-none.png
-share/pixmaps/mate-accessx-status-applet/sticky-ctrl-latched.png
-share/pixmaps/mate-accessx-status-applet/sticky-ctrl-locked.png
-share/pixmaps/mate-accessx-status-applet/sticky-ctrl-none.png
-share/pixmaps/mate-accessx-status-applet/sticky-hyper-latched.png
-share/pixmaps/mate-accessx-status-applet/sticky-hyper-locked.png
-share/pixmaps/mate-accessx-status-applet/sticky-hyper-none.png
-share/pixmaps/mate-accessx-status-applet/sticky-meta-latched.png
-share/pixmaps/mate-accessx-status-applet/sticky-meta-locked.png
-share/pixmaps/mate-accessx-status-applet/sticky-meta-none.png
-share/pixmaps/mate-accessx-status-applet/sticky-shift-latched.png
-share/pixmaps/mate-accessx-status-applet/sticky-shift-locked.png
-share/pixmaps/mate-accessx-status-applet/sticky-shift-none.png
-share/pixmaps/mate-accessx-status-applet/sticky-super-latched.png
-share/pixmaps/mate-accessx-status-applet/sticky-super-locked.png
-share/pixmaps/mate-accessx-status-applet/sticky-super-none.png
+share/pixmaps/mate-accessx-status-applet/mate-ax-applet.png
+share/pixmaps/mate-accessx-status-applet/mate-ax-bouncekeys.png
+share/pixmaps/mate-accessx-status-applet/mate-ax-key-base.png
+share/pixmaps/mate-accessx-status-applet/mate-ax-key-inverse.png
+share/pixmaps/mate-accessx-status-applet/mate-ax-key-no.png
+share/pixmaps/mate-accessx-status-applet/mate-ax-key-none.png
+share/pixmaps/mate-accessx-status-applet/mate-ax-key-yes.png
+share/pixmaps/mate-accessx-status-applet/mate-ax-slowkeys-no.png
+share/pixmaps/mate-accessx-status-applet/mate-ax-slowkeys-pending.png
+share/pixmaps/mate-accessx-status-applet/mate-ax-slowkeys-yes.png
+share/pixmaps/mate-accessx-status-applet/mate-ax-slowkeys.png
+share/pixmaps/mate-accessx-status-applet/mate-mousekeys-base.png
+share/pixmaps/mate-accessx-status-applet/mate-mousekeys-default-left.png
+share/pixmaps/mate-accessx-status-applet/mate-mousekeys-default-middle.png
+share/pixmaps/mate-accessx-status-applet/mate-mousekeys-default-right.png
+share/pixmaps/mate-accessx-status-applet/mate-mousekeys-pressed-left.png
+share/pixmaps/mate-accessx-status-applet/mate-mousekeys-pressed-middle.png
+share/pixmaps/mate-accessx-status-applet/mate-mousekeys-pressed-right.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-alt-latched.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-alt-locked.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-alt-none.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-ctrl-latched.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-ctrl-locked.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-ctrl-none.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-hyper-latched.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-hyper-locked.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-hyper-none.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-meta-latched.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-meta-locked.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-meta-none.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-shift-latched.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-shift-locked.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-shift-none.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-super-latched.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-super-locked.png
+share/pixmaps/mate-accessx-status-applet/mate-sticky-super-none.png
 %%CPUFREQ%%share/pixmaps/mate-cpufreq-applet/cpufreq-100.png
 %%CPUFREQ%%share/pixmaps/mate-cpufreq-applet/cpufreq-25.png
 %%CPUFREQ%%share/pixmaps/mate-cpufreq-applet/cpufreq-50.png
diff --git a/x11/mate-base/Makefile b/x11/mate-base/Makefile
index 3544be947b9f..b9bfad643f97 100644
--- a/x11/mate-base/Makefile
+++ b/x11/mate-base/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-base
-PORTVERSION=	1.10.0
+PORTVERSION=	1.12.0
 CATEGORIES=	x11 mate
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/mate-desktop/Makefile b/x11/mate-desktop/Makefile
index b0dd620221a6..389d99cd7a7a 100644
--- a/x11/mate-desktop/Makefile
+++ b/x11/mate-desktop/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-desktop
-PORTVERSION=	1.10.2
+PORTVERSION=	1.12.1
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/x11/mate-desktop/distinfo b/x11/mate-desktop/distinfo
index ce91a11be32f..8ac041f95fdc 100644
--- a/x11/mate-desktop/distinfo
+++ b/x11/mate-desktop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-desktop-1.10.2.tar.xz) = 8b09bc357f8fc874cda06944fee6fa828e2e6e45730bbc07dc0bb2eeed3cbad6
-SIZE (mate/mate-desktop-1.10.2.tar.xz) = 9100064
+SHA256 (mate/mate-desktop-1.12.1.tar.xz) = d9b96ac455340916a11b221d45a940c347e4428e5096035496d9f703eacf5a03
+SIZE (mate/mate-desktop-1.12.1.tar.xz) = 773332
diff --git a/x11/mate-desktop/pkg-plist b/x11/mate-desktop/pkg-plist
index bd1b8523d06a..5c907bbcdeae 100644
--- a/x11/mate-desktop/pkg-plist
+++ b/x11/mate-desktop/pkg-plist
@@ -28,34 +28,41 @@ man/man1/mpaste.1.gz
 share/MateConf/gsettings/mate-desktop.convert
 share/applications/mate-about.desktop
 share/applications/mate-color-select.desktop
-%%DOCSDIR%%/MateBG.html
-%%DOCSDIR%%/MateDesktopItem.html
-%%DOCSDIR%%/MateDesktopThumbnailFactory.html
-%%DOCSDIR%%/MateRRLabeler.html
-%%DOCSDIR%%/background.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/intro.html
-%%DOCSDIR%%/left-insensitive.png
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/libmate.html
-%%DOCSDIR%%/mate-desktop-Miscellaneous-Functions.html
-%%DOCSDIR%%/mate-desktop-Miscellaneous-Thumbnail-Functions.html
-%%DOCSDIR%%/mate-desktop-mate-rr-config.html
-%%DOCSDIR%%/mate-desktop-mate-rr-crtc.html
-%%DOCSDIR%%/mate-desktop-mate-rr-mode.html
-%%DOCSDIR%%/mate-desktop-mate-rr-output.html
-%%DOCSDIR%%/mate-desktop-mate-rr-screen.html
-%%DOCSDIR%%/mate-desktop.devhelp2
-%%DOCSDIR%%/randr.html
-%%DOCSDIR%%/right-insensitive.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/thumbnail.html
-%%DOCSDIR%%/up-insensitive.png
-%%DOCSDIR%%/up.png
+%%PORTDOCS%%%%DOCSDIR%%/MateBG.html
+%%PORTDOCS%%%%DOCSDIR%%/MateDesktopItem.html
+%%PORTDOCS%%%%DOCSDIR%%/MateDesktopThumbnailFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/MateRRLabeler.html
+%%PORTDOCS%%%%DOCSDIR%%/background.html
+%%PORTDOCS%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/libmate.html
+%%PORTDOCS%%%%DOCSDIR%%/mate-desktop-Miscellaneous-Functions.html
+%%PORTDOCS%%%%DOCSDIR%%/mate-desktop-Miscellaneous-Thumbnail-Functions.html
+%%PORTDOCS%%%%DOCSDIR%%/mate-desktop-mate-rr-config.html
+%%PORTDOCS%%%%DOCSDIR%%/mate-desktop-mate-rr-crtc.html
+%%PORTDOCS%%%%DOCSDIR%%/mate-desktop-mate-rr-mode.html
+%%PORTDOCS%%%%DOCSDIR%%/mate-desktop-mate-rr-output.html
+%%PORTDOCS%%%%DOCSDIR%%/mate-desktop-mate-rr-screen.html
+%%PORTDOCS%%%%DOCSDIR%%/mate-desktop.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/randr.html
+%%PORTDOCS%%%%DOCSDIR%%/right-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/thumbnail.html
+%%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/up.png
 share/gir-1.0/MateDesktop-2.0.gir
+share/icons/hicolor/16x16/apps/mate.png
+share/icons/hicolor/22x22/apps/mate.png
+share/icons/hicolor/24x24/apps/mate.png
+share/icons/hicolor/256x256/apps/mate.png
+share/icons/hicolor/32x32/apps/mate.png
+share/icons/hicolor/48x48/apps/mate.png
+share/icons/hicolor/scalable/apps/mate-symbolic.svg
 share/libmate-desktop/pnp.ids
 share/locale/af/LC_MESSAGES/mate-desktop.mo
 share/locale/am/LC_MESSAGES/mate-desktop.mo
diff --git a/x11/mate-menus/Makefile b/x11/mate-menus/Makefile
index 616928350383..7cf23f3e332e 100644
--- a/x11/mate-menus/Makefile
+++ b/x11/mate-menus/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-menus
-PORTVERSION=	1.10.0
-PORTREVISION=	1
+PORTVERSION=	1.12.0
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/x11/mate-menus/distinfo b/x11/mate-menus/distinfo
index 2f446dcb02d1..232fb2c7a06f 100644
--- a/x11/mate-menus/distinfo
+++ b/x11/mate-menus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-menus-1.10.0.tar.xz) = dc0832bdcc60354ccfc6e898cf167b7f45778825ef2011d7fe849c10ed0ae759
-SIZE (mate/mate-menus-1.10.0.tar.xz) = 342796
+SHA256 (mate/mate-menus-1.12.0.tar.xz) = b0b735be91cca632d7c63f254a9442201608b24f1d5588a1ff05b50da41b95c4
+SIZE (mate/mate-menus-1.12.0.tar.xz) = 342488
diff --git a/x11/mate-panel/Makefile b/x11/mate-panel/Makefile
index e43e9e72d752..0992341f98fe 100644
--- a/x11/mate-panel/Makefile
+++ b/x11/mate-panel/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mate-panel
-PORTVERSION=	1.10.1
+PORTVERSION=	1.12.1
+PORTREVISION=	1
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/x11/mate-panel/distinfo b/x11/mate-panel/distinfo
index ca22bf4806c3..765c66079ac5 100644
--- a/x11/mate-panel/distinfo
+++ b/x11/mate-panel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-panel-1.10.1.tar.xz) = 261702b4eaf5339a55629c5f31466fb7878d5a640f80f88edde54ed1b9eba444
-SIZE (mate/mate-panel-1.10.1.tar.xz) = 1934576
+SHA256 (mate/mate-panel-1.12.1.tar.xz) = 0d90078f07d6fe066b58f7d0c6b7d91828811f1364d62a4759e94075559ae944
+SIZE (mate/mate-panel-1.12.1.tar.xz) = 1930464
diff --git a/x11/mate-screensaver/Makefile b/x11/mate-screensaver/Makefile
index c545cf035032..4e754b7a121a 100644
--- a/x11/mate-screensaver/Makefile
+++ b/x11/mate-screensaver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-screensaver
-PORTVERSION=	1.10.2
+PORTVERSION=	1.12.0
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/x11/mate-screensaver/distinfo b/x11/mate-screensaver/distinfo
index 7a5f6739d206..2718106c65b0 100644
--- a/x11/mate-screensaver/distinfo
+++ b/x11/mate-screensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-screensaver-1.10.2.tar.xz) = 19b79dc4b4b5a6dcd407daf5b8f310b6da8210445a6271d265458e79a58d539d
-SIZE (mate/mate-screensaver-1.10.2.tar.xz) = 4888108
+SHA256 (mate/mate-screensaver-1.12.0.tar.xz) = 198cb5159bd6321c90e0069115909be52eb4382de25cb9c4ba33fa29e3fdc693
+SIZE (mate/mate-screensaver-1.12.0.tar.xz) = 4868924
diff --git a/x11/mate-session-manager/Makefile b/x11/mate-session-manager/Makefile
index f39002fe4293..32a02261b838 100644
--- a/x11/mate-session-manager/Makefile
+++ b/x11/mate-session-manager/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-session-manager
-PORTVERSION=	1.10.2
-PORTREVISION=	1
+PORTVERSION=	1.12.1
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/x11/mate-session-manager/distinfo b/x11/mate-session-manager/distinfo
index 7380797657c5..ab6e4b6110df 100644
--- a/x11/mate-session-manager/distinfo
+++ b/x11/mate-session-manager/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-session-manager-1.10.2.tar.xz) = ed9d622d0747521c5ef11bbaea85f40445ef68c06ef6d1626b53055b0185cf7a
-SIZE (mate/mate-session-manager-1.10.2.tar.xz) = 549568
+SHA256 (mate/mate-session-manager-1.12.1.tar.xz) = 2bad592d7dc0e6807f347bba1580c7c9f5d880aeedee2293d4c8947ab439e7e2
+SIZE (mate/mate-session-manager-1.12.1.tar.xz) = 538524
diff --git a/x11/mate-terminal/Makefile b/x11/mate-terminal/Makefile
index a7369e3a277c..256ec3c56912 100644
--- a/x11/mate-terminal/Makefile
+++ b/x11/mate-terminal/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-terminal
-PORTVERSION=	1.10.1
+PORTVERSION=	1.12.1
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/x11/mate-terminal/distinfo b/x11/mate-terminal/distinfo
index 64a584adb3db..019df12525ab 100644
--- a/x11/mate-terminal/distinfo
+++ b/x11/mate-terminal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-terminal-1.10.1.tar.xz) = a22a49dda08e2fc3430016b404b7d3da8524860cbcc66ab4c84954a0c9c00308
-SIZE (mate/mate-terminal-1.10.1.tar.xz) = 1184940
+SHA256 (mate/mate-terminal-1.12.1.tar.xz) = d4e16a7b2742e0a904e304b2251fb8e5028833a6813e75bd8214ee542cd86c0e
+SIZE (mate/mate-terminal-1.12.1.tar.xz) = 1143628
diff --git a/x11/mate/Makefile b/x11/mate/Makefile
index 6442167bcd11..5e43d7830633 100644
--- a/x11/mate/Makefile
+++ b/x11/mate/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate
-PORTVERSION=	1.10.0
+PORTVERSION=	1.12.0
 CATEGORIES=	x11 mate
 
 MAINTAINER=	gnome@FreeBSD.org