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

3 files changed, 125 insertions, 121 deletions

diff --git a/editors/pluma/Makefile b/editors/pluma/Makefile
index 028f92a1400e..8da013c99da4 100644
--- a/editors/pluma/Makefile
+++ b/editors/pluma/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pluma
-PORTVERSION=	1.10.2
+PORTVERSION=	1.12.1
 CATEGORIES=	editors mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -40,4 +40,6 @@ GLIB_SCHEMAS=	org.mate.pluma.gschema.xml \
 		org.mate.pluma.plugins.filebrowser.gschema.xml \
 		org.mate.pluma.plugins.time.gschema.xml
 
+PLIST_SUB+=	PYTHON=""
+
 .include <bsd.port.mk>
diff --git a/editors/pluma/distinfo b/editors/pluma/distinfo
index 2f7411998c4e..7f921fdce7e7 100644
--- a/editors/pluma/distinfo
+++ b/editors/pluma/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/pluma-1.10.2.tar.xz) = c0614334dc99e5dde73cbda6cb561cb1a5dc3e3269d74a4134095f9abf73c89a
-SIZE (mate/pluma-1.10.2.tar.xz) = 3442784
+SHA256 (mate/pluma-1.12.1.tar.xz) = f96cdc5415bb44b234ad9045520dd095c3f9d49dc965e7883d613d23af75e92c
+SIZE (mate/pluma-1.12.1.tar.xz) = 3396448
diff --git a/editors/pluma/pkg-plist b/editors/pluma/pkg-plist
index e1dea8820b45..c9be599ba7be 100644
--- a/editors/pluma/pkg-plist
+++ b/editors/pluma/pkg-plist
@@ -23,34 +23,34 @@ include/pluma/pluma-utils.h
 include/pluma/pluma-view.h
 include/pluma/pluma-window.h
 lib/pluma/plugin-loaders/libcloader.so
-lib/pluma/plugin-loaders/libpythonloader.so
+%%PYTHON%%lib/pluma/plugin-loaders/libpythonloader.so
 lib/pluma/plugins/changecase.pluma-plugin
 lib/pluma/plugins/docinfo.pluma-plugin
-lib/pluma/plugins/externaltools.pluma-plugin
-lib/pluma/plugins/externaltools/__init__.py
-lib/pluma/plugins/externaltools/__init__.pyc
-lib/pluma/plugins/externaltools/__init__.pyo
-lib/pluma/plugins/externaltools/capture.py
-lib/pluma/plugins/externaltools/capture.pyc
-lib/pluma/plugins/externaltools/capture.pyo
-lib/pluma/plugins/externaltools/filelookup.py
-lib/pluma/plugins/externaltools/filelookup.pyc
-lib/pluma/plugins/externaltools/filelookup.pyo
-lib/pluma/plugins/externaltools/functions.py
-lib/pluma/plugins/externaltools/functions.pyc
-lib/pluma/plugins/externaltools/functions.pyo
-lib/pluma/plugins/externaltools/library.py
-lib/pluma/plugins/externaltools/library.pyc
-lib/pluma/plugins/externaltools/library.pyo
-lib/pluma/plugins/externaltools/linkparsing.py
-lib/pluma/plugins/externaltools/linkparsing.pyc
-lib/pluma/plugins/externaltools/linkparsing.pyo
-lib/pluma/plugins/externaltools/manager.py
-lib/pluma/plugins/externaltools/manager.pyc
-lib/pluma/plugins/externaltools/manager.pyo
-lib/pluma/plugins/externaltools/outputpanel.py
-lib/pluma/plugins/externaltools/outputpanel.pyc
-lib/pluma/plugins/externaltools/outputpanel.pyo
+%%PYTHON%%lib/pluma/plugins/externaltools.pluma-plugin
+%%PYTHON%%lib/pluma/plugins/externaltools/__init__.py
+%%PYTHON%%lib/pluma/plugins/externaltools/__init__.pyc
+%%PYTHON%%lib/pluma/plugins/externaltools/__init__.pyo
+%%PYTHON%%lib/pluma/plugins/externaltools/capture.py
+%%PYTHON%%lib/pluma/plugins/externaltools/capture.pyc
+%%PYTHON%%lib/pluma/plugins/externaltools/capture.pyo
+%%PYTHON%%lib/pluma/plugins/externaltools/filelookup.py
+%%PYTHON%%lib/pluma/plugins/externaltools/filelookup.pyc
+%%PYTHON%%lib/pluma/plugins/externaltools/filelookup.pyo
+%%PYTHON%%lib/pluma/plugins/externaltools/functions.py
+%%PYTHON%%lib/pluma/plugins/externaltools/functions.pyc
+%%PYTHON%%lib/pluma/plugins/externaltools/functions.pyo
+%%PYTHON%%lib/pluma/plugins/externaltools/library.py
+%%PYTHON%%lib/pluma/plugins/externaltools/library.pyc
+%%PYTHON%%lib/pluma/plugins/externaltools/library.pyo
+%%PYTHON%%lib/pluma/plugins/externaltools/linkparsing.py
+%%PYTHON%%lib/pluma/plugins/externaltools/linkparsing.pyc
+%%PYTHON%%lib/pluma/plugins/externaltools/linkparsing.pyo
+%%PYTHON%%lib/pluma/plugins/externaltools/manager.py
+%%PYTHON%%lib/pluma/plugins/externaltools/manager.pyc
+%%PYTHON%%lib/pluma/plugins/externaltools/manager.pyo
+%%PYTHON%%lib/pluma/plugins/externaltools/outputpanel.py
+%%PYTHON%%lib/pluma/plugins/externaltools/outputpanel.pyc
+%%PYTHON%%lib/pluma/plugins/externaltools/outputpanel.pyo
 lib/pluma/plugins/filebrowser.pluma-plugin
 lib/pluma/plugins/libchangecase.so
 lib/pluma/plugins/libdocinfo.so
@@ -60,77 +60,79 @@ lib/pluma/plugins/libsort.so
 lib/pluma/plugins/libspell.so
 lib/pluma/plugins/libtaglist.so
 lib/pluma/plugins/libtime.so
+lib/pluma/plugins/libtrailsave.so
 lib/pluma/plugins/modelines.pluma-plugin
-lib/pluma/plugins/pythonconsole.pluma-plugin
-lib/pluma/plugins/pythonconsole/__init__.py
-lib/pluma/plugins/pythonconsole/__init__.pyc
-lib/pluma/plugins/pythonconsole/__init__.pyo
-lib/pluma/plugins/pythonconsole/config.py
-lib/pluma/plugins/pythonconsole/config.pyc
-lib/pluma/plugins/pythonconsole/config.pyo
-lib/pluma/plugins/pythonconsole/console.py
-lib/pluma/plugins/pythonconsole/console.pyc
-lib/pluma/plugins/pythonconsole/console.pyo
-lib/pluma/plugins/quickopen.pluma-plugin
-lib/pluma/plugins/quickopen/__init__.py
-lib/pluma/plugins/quickopen/__init__.pyc
-lib/pluma/plugins/quickopen/__init__.pyo
-lib/pluma/plugins/quickopen/popup.py
-lib/pluma/plugins/quickopen/popup.pyc
-lib/pluma/plugins/quickopen/popup.pyo
-lib/pluma/plugins/quickopen/virtualdirs.py
-lib/pluma/plugins/quickopen/virtualdirs.pyc
-lib/pluma/plugins/quickopen/virtualdirs.pyo
-lib/pluma/plugins/quickopen/windowhelper.py
-lib/pluma/plugins/quickopen/windowhelper.pyc
-lib/pluma/plugins/quickopen/windowhelper.pyo
-lib/pluma/plugins/snippets.pluma-plugin
-lib/pluma/plugins/snippets/Completion.py
-lib/pluma/plugins/snippets/Completion.pyc
-lib/pluma/plugins/snippets/Completion.pyo
-lib/pluma/plugins/snippets/Document.py
-lib/pluma/plugins/snippets/Document.pyc
-lib/pluma/plugins/snippets/Document.pyo
-lib/pluma/plugins/snippets/Exporter.py
-lib/pluma/plugins/snippets/Exporter.pyc
-lib/pluma/plugins/snippets/Exporter.pyo
-lib/pluma/plugins/snippets/Helper.py
-lib/pluma/plugins/snippets/Helper.pyc
-lib/pluma/plugins/snippets/Helper.pyo
-lib/pluma/plugins/snippets/Importer.py
-lib/pluma/plugins/snippets/Importer.pyc
-lib/pluma/plugins/snippets/Importer.pyo
-lib/pluma/plugins/snippets/LanguageManager.py
-lib/pluma/plugins/snippets/LanguageManager.pyc
-lib/pluma/plugins/snippets/LanguageManager.pyo
-lib/pluma/plugins/snippets/Library.py
-lib/pluma/plugins/snippets/Library.pyc
-lib/pluma/plugins/snippets/Library.pyo
-lib/pluma/plugins/snippets/Manager.py
-lib/pluma/plugins/snippets/Manager.pyc
-lib/pluma/plugins/snippets/Manager.pyo
-lib/pluma/plugins/snippets/Parser.py
-lib/pluma/plugins/snippets/Parser.pyc
-lib/pluma/plugins/snippets/Parser.pyo
-lib/pluma/plugins/snippets/Placeholder.py
-lib/pluma/plugins/snippets/Placeholder.pyc
-lib/pluma/plugins/snippets/Placeholder.pyo
-lib/pluma/plugins/snippets/Snippet.py
-lib/pluma/plugins/snippets/Snippet.pyc
-lib/pluma/plugins/snippets/Snippet.pyo
-lib/pluma/plugins/snippets/SubstitutionParser.py
-lib/pluma/plugins/snippets/SubstitutionParser.pyc
-lib/pluma/plugins/snippets/SubstitutionParser.pyo
-lib/pluma/plugins/snippets/WindowHelper.py
-lib/pluma/plugins/snippets/WindowHelper.pyc
-lib/pluma/plugins/snippets/WindowHelper.pyo
-lib/pluma/plugins/snippets/__init__.py
-lib/pluma/plugins/snippets/__init__.pyc
-lib/pluma/plugins/snippets/__init__.pyo
+%%PYTHON%%lib/pluma/plugins/pythonconsole.pluma-plugin
+%%PYTHON%%lib/pluma/plugins/pythonconsole/__init__.py
+%%PYTHON%%lib/pluma/plugins/pythonconsole/__init__.pyc
+%%PYTHON%%lib/pluma/plugins/pythonconsole/__init__.pyo
+%%PYTHON%%lib/pluma/plugins/pythonconsole/config.py
+%%PYTHON%%lib/pluma/plugins/pythonconsole/config.pyc
+%%PYTHON%%lib/pluma/plugins/pythonconsole/config.pyo
+%%PYTHON%%lib/pluma/plugins/pythonconsole/console.py
+%%PYTHON%%lib/pluma/plugins/pythonconsole/console.pyc
+%%PYTHON%%lib/pluma/plugins/pythonconsole/console.pyo
+%%PYTHON%%lib/pluma/plugins/quickopen.pluma-plugin
+%%PYTHON%%lib/pluma/plugins/quickopen/__init__.py
+%%PYTHON%%lib/pluma/plugins/quickopen/__init__.pyc
+%%PYTHON%%lib/pluma/plugins/quickopen/__init__.pyo
+%%PYTHON%%lib/pluma/plugins/quickopen/popup.py
+%%PYTHON%%lib/pluma/plugins/quickopen/popup.pyc
+%%PYTHON%%lib/pluma/plugins/quickopen/popup.pyo
+%%PYTHON%%lib/pluma/plugins/quickopen/virtualdirs.py
+%%PYTHON%%lib/pluma/plugins/quickopen/virtualdirs.pyc
+%%PYTHON%%lib/pluma/plugins/quickopen/virtualdirs.pyo
+%%PYTHON%%lib/pluma/plugins/quickopen/windowhelper.py
+%%PYTHON%%lib/pluma/plugins/quickopen/windowhelper.pyc
+%%PYTHON%%lib/pluma/plugins/quickopen/windowhelper.pyo
+%%PYTHON%%lib/pluma/plugins/snippets.pluma-plugin
+%%PYTHON%%lib/pluma/plugins/snippets/Completion.py
+%%PYTHON%%lib/pluma/plugins/snippets/Completion.pyc
+%%PYTHON%%lib/pluma/plugins/snippets/Completion.pyo
+%%PYTHON%%lib/pluma/plugins/snippets/Document.py
+%%PYTHON%%lib/pluma/plugins/snippets/Document.pyc
+%%PYTHON%%lib/pluma/plugins/snippets/Document.pyo
+%%PYTHON%%lib/pluma/plugins/snippets/Exporter.py
+%%PYTHON%%lib/pluma/plugins/snippets/Exporter.pyc
+%%PYTHON%%lib/pluma/plugins/snippets/Exporter.pyo
+%%PYTHON%%lib/pluma/plugins/snippets/Helper.py
+%%PYTHON%%lib/pluma/plugins/snippets/Helper.pyc
+%%PYTHON%%lib/pluma/plugins/snippets/Helper.pyo
+%%PYTHON%%lib/pluma/plugins/snippets/Importer.py
+%%PYTHON%%lib/pluma/plugins/snippets/Importer.pyc
+%%PYTHON%%lib/pluma/plugins/snippets/Importer.pyo
+%%PYTHON%%lib/pluma/plugins/snippets/LanguageManager.py
+%%PYTHON%%lib/pluma/plugins/snippets/LanguageManager.pyc
+%%PYTHON%%lib/pluma/plugins/snippets/LanguageManager.pyo
+%%PYTHON%%lib/pluma/plugins/snippets/Library.py
+%%PYTHON%%lib/pluma/plugins/snippets/Library.pyc
+%%PYTHON%%lib/pluma/plugins/snippets/Library.pyo
+%%PYTHON%%lib/pluma/plugins/snippets/Manager.py
+%%PYTHON%%lib/pluma/plugins/snippets/Manager.pyc
+%%PYTHON%%lib/pluma/plugins/snippets/Manager.pyo
+%%PYTHON%%lib/pluma/plugins/snippets/Parser.py
+%%PYTHON%%lib/pluma/plugins/snippets/Parser.pyc
+%%PYTHON%%lib/pluma/plugins/snippets/Parser.pyo
+%%PYTHON%%lib/pluma/plugins/snippets/Placeholder.py
+%%PYTHON%%lib/pluma/plugins/snippets/Placeholder.pyc
+%%PYTHON%%lib/pluma/plugins/snippets/Placeholder.pyo
+%%PYTHON%%lib/pluma/plugins/snippets/Snippet.py
+%%PYTHON%%lib/pluma/plugins/snippets/Snippet.pyc
+%%PYTHON%%lib/pluma/plugins/snippets/Snippet.pyo
+%%PYTHON%%lib/pluma/plugins/snippets/SubstitutionParser.py
+%%PYTHON%%lib/pluma/plugins/snippets/SubstitutionParser.pyc
+%%PYTHON%%lib/pluma/plugins/snippets/SubstitutionParser.pyo
+%%PYTHON%%lib/pluma/plugins/snippets/WindowHelper.py
+%%PYTHON%%lib/pluma/plugins/snippets/WindowHelper.pyc
+%%PYTHON%%lib/pluma/plugins/snippets/WindowHelper.pyo
+%%PYTHON%%lib/pluma/plugins/snippets/__init__.py
+%%PYTHON%%lib/pluma/plugins/snippets/__init__.pyc
+%%PYTHON%%lib/pluma/plugins/snippets/__init__.pyo
 lib/pluma/plugins/sort.pluma-plugin
 lib/pluma/plugins/spell.pluma-plugin
 lib/pluma/plugins/taglist.pluma-plugin
 lib/pluma/plugins/time.pluma-plugin
+lib/pluma/plugins/trailsave.pluma-plugin
 libdata/pkgconfig/pluma.pc
 libexec/pluma/pluma-bugreport.sh
 man/man1/pluma.1.gz
@@ -476,32 +478,32 @@ share/locale/zh_TW/LC_MESSAGES/pluma.mo
 %%DATADIR%%/plugins/externaltools/ui/tools.ui
 %%DATADIR%%/plugins/filebrowser/pluma-file-browser-widget-ui.xml
 %%DATADIR%%/plugins/modelines/language-mappings
-%%DATADIR%%/plugins/pythonconsole/ui/config.ui
-%%DATADIR%%/plugins/snippets/c.xml
-%%DATADIR%%/plugins/snippets/chdr.xml
-%%DATADIR%%/plugins/snippets/cpp.xml
-%%DATADIR%%/plugins/snippets/css.xml
-%%DATADIR%%/plugins/snippets/docbook.xml
-%%DATADIR%%/plugins/snippets/fortran.xml
-%%DATADIR%%/plugins/snippets/global.xml
-%%DATADIR%%/plugins/snippets/haskell.xml
-%%DATADIR%%/plugins/snippets/html.xml
-%%DATADIR%%/plugins/snippets/idl.xml
-%%DATADIR%%/plugins/snippets/java.xml
-%%DATADIR%%/plugins/snippets/javascript.xml
-%%DATADIR%%/plugins/snippets/lang/snippets.lang
-%%DATADIR%%/plugins/snippets/latex.xml
-%%DATADIR%%/plugins/snippets/mallard.xml
-%%DATADIR%%/plugins/snippets/perl.xml
-%%DATADIR%%/plugins/snippets/php.xml
-%%DATADIR%%/plugins/snippets/python.xml
-%%DATADIR%%/plugins/snippets/ruby.xml
-%%DATADIR%%/plugins/snippets/sh.xml
-%%DATADIR%%/plugins/snippets/snippets.xml
-%%DATADIR%%/plugins/snippets/tcl.xml
-%%DATADIR%%/plugins/snippets/ui/snippets.ui
-%%DATADIR%%/plugins/snippets/xml.xml
-%%DATADIR%%/plugins/snippets/xslt.xml
+%%PYTHON%%%%DATADIR%%/plugins/pythonconsole/ui/config.ui
+%%PYTHON%%%%DATADIR%%/plugins/snippets/c.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/chdr.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/cpp.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/css.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/docbook.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/fortran.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/global.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/haskell.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/html.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/idl.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/java.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/javascript.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/lang/snippets.lang
+%%PYTHON%%%%DATADIR%%/plugins/snippets/latex.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/mallard.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/perl.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/php.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/python.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/ruby.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/sh.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/snippets.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/tcl.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/ui/snippets.ui
+%%PYTHON%%%%DATADIR%%/plugins/snippets/xml.xml
+%%PYTHON%%%%DATADIR%%/plugins/snippets/xslt.xml
 %%DATADIR%%/plugins/sort/sort.ui
 %%DATADIR%%/plugins/spell/languages-dialog.ui
 %%DATADIR%%/plugins/spell/spell-checker.ui