Update all MATE packages (except system-monitor) to 1.24.0.

This release contains plenty of new features, bug-fixes, and general
improvements. Some of the most important highlights include:

  * We did it again, the MATE desktop environment is easier to use than before,
    once the user starts the session. Do you want to hide applications startup?
    Now you can set which applications to show on startup.
  * Engrampa now has support for a handful of extra formats, as well as fixed
    support for passwords and unicode characters in some of them.
  * Eye of MATE now has support for Wayland and we’ve added support for
    embedded color profiles.
      * The thumbnail generation has been reworked and fixed in several places.
      * Added support for webp files.
  * Our window manager, marco, has gotten quite a few changes:
      * We’ve brought a bunch of window decorations from the past to feed
        your nostalgia.
      * Finally added invisible resize borders. No more struggling to find a
        border to grab with your mouse!
      * All window controls (you know, the min, max, close buttons) are now
        rendered in HiDPI.
      * The Alt+Tab and Workspace Switcher popups have been entirely reworked.
        Now they render in beautiful OSD style, are more configurable, and can
        respond to keyboard arrows.
      * Tiling windows with the keyboard now allows you to cycle through
        different window sizes. You no longer need to feel constrained by only
        half of your screen.
  * The System Monitor panel applet now has support for NVMe drives.
  * Calculator now supports using either “pi” or “π”.
      * Scientific notation has been improved.
      * Some fixes for supporting pre-defined physical constants.
  * The Control Center now displays its icons correctly on HiDPI displays.
  * A brand new Time And Date Manager app has been added.
  * The Mouse app now supports acceleration profiles.
  * The Preferred Applications app has been improved for accessibility, as well
    as better support for integration with IM clients.
  * The Indicator Applet has slightly better interaction with
    oddly-sized icons.
  * Speaking of icons, the network manager applet icons in our own themes have
    been entirely redesigned and can now be enjoyed on HiDPI displays.
  * If you’re the type of person that does not like to be disturbed when busy,
    or giving a presentation, or watching a movie, you’ll be happy to know that
    the notification daemon now supports a Do-Not-Disturb mode.
  * The MATE Panel had several bugs that caused crashes in the past when
    changing layouts. Those are now fixed!
      * Support for Wayland compatibility has improved considerably.
      * Status icons (a.k.a. notification area, or system tray) have support
        for HiDPI displays.
      * Wanda the Fish got a make-over and now you can enjoy her in full
        HiDPI glory.
      * The window list applet now supports window thumbnails on hover.
      * Various accessibility improvements throughout the panel and its
        core applets.
  * If your system doesn’t, uh, support systemd you might be interested in
    knowing that we’ve added support for elogind to both the MATE Screensaver
    and the MATE Session.
  * We’ve also added a brand new MATE Disk Image Mounter utility.
  * Mozo, the menu editor, now supports Undo and Redo actions.
  * Pluma plugins have now fully switched to Python 3.
  * Pluma no longer has to envy anything from other complex editors, since it
    can now show the formatting marks.
  * i18n: All applications have been migrated from intltools to gettext.

4 files changed, 17 insertions, 94 deletions

diff --git a/editors/pluma/Makefile b/editors/pluma/Makefile
index 649e6673a4f..eae020b0a1f 100644
--- a/editors/pluma/Makefile
+++ b/editors/pluma/Makefile
@@ -1,14 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2020/03/10 22:09:43 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2020/04/05 16:05:45 bsiegert Exp $
 
-# XXX: meta-pkgs/mate/Makefile.common includes pyversion.mk which sets the
-# python version too early and clashes with PYTHON_VERSIONS_INCOMPATIBLE
-# from libpeas bl3, so we include it early to ensure a valid version is
-# chosen.  This is not ideal, please fix it properly at some point.
-PKGREVISION= 2
-.include "../../devel/libpeas/buildlink3.mk"
-.include "../../meta-pkgs/mate/Makefile.common"
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-DISTNAME=	pluma-${VERSION:R}.2
+DISTNAME=	pluma-${VERSION:R}.0
 CATEGORIES=	editors
 
 COMMENT=	Small and lightweight UTF-8 text editor for MATE
@@ -19,16 +13,19 @@ TOOL_DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
 
 PKGCONFIG_OVERRIDE+=	data/pluma.pc.in
 
-CONFIGURE_ARGS+=	--disable-updater # only for OS X and Windows
-
 REPLACE_PYTHON+=	plugins/externaltools/data/switch-c.tool.in
 REPLACE_BASH+=		plugins/externaltools/data/search-recursive.tool.in
 
+post-install:
+	find ${DESTDIR}${PREFIX} -type d -name __pycache__ | xargs rm -rf
+
 .include "options.mk"
 
+.include "../../devel/libpeas/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../lang/python/application.mk"
 .include "../../x11/mate-desktop/buildlink3.mk"
 .include "../../x11/gtksourceview3/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../meta-pkgs/mate/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/pluma/PLIST b/editors/pluma/PLIST
index c80d9a31e29..bf544f9a857 100644
--- a/editors/pluma/PLIST
+++ b/editors/pluma/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2019/12/30 23:38:57 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/04/05 16:05:45 bsiegert Exp $
 bin/pluma
 include/pluma/pluma-app.h
 include/pluma/pluma-commands.h
@@ -27,29 +27,13 @@ lib/pluma/plugins/changecase.plugin
 lib/pluma/plugins/docinfo.plugin
 lib/pluma/plugins/externaltools.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
 lib/pluma/plugins/filebrowser.plugin
 lib/pluma/plugins/libchangecase.la
 lib/pluma/plugins/libdocinfo.la
@@ -63,70 +47,29 @@ lib/pluma/plugins/libtrailsave.la
 lib/pluma/plugins/modelines.plugin
 lib/pluma/plugins/pythonconsole.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.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.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
+lib/pluma/plugins/snippets/comment.py
 lib/pluma/plugins/sort.plugin
 lib/pluma/plugins/spell.plugin
 lib/pluma/plugins/taglist.plugin
@@ -138,6 +81,7 @@ share/applications/pluma.desktop
 share/gir-1.0/Pluma-1.0.gir
 share/glib-2.0/schemas/org.mate.pluma.gschema.xml
 share/glib-2.0/schemas/org.mate.pluma.plugins.filebrowser.gschema.xml
+share/glib-2.0/schemas/org.mate.pluma.plugins.pythonconsole.gschema.xml
 share/glib-2.0/schemas/org.mate.pluma.plugins.spell.gschema.xml
 share/glib-2.0/schemas/org.mate.pluma.plugins.time.gschema.xml
 share/gtk-doc/html/pluma/PlumaMessage.html
diff --git a/editors/pluma/distinfo b/editors/pluma/distinfo
index f43fce8d04f..ccc251c63ab 100644
--- a/editors/pluma/distinfo
+++ b/editors/pluma/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2019/12/30 23:38:57 gutteridge Exp $
+$NetBSD: distinfo,v 1.9 2020/04/05 16:05:45 bsiegert Exp $
 
-SHA1 (pluma-1.22.2.tar.xz) = f79e5fcfdba38aa5f1bfd595e121aec8e64b24b6
-RMD160 (pluma-1.22.2.tar.xz) = 511ddd4c90f59ea01d312d4802b9edbcf6b91e29
-SHA512 (pluma-1.22.2.tar.xz) = a68b79713f649def15ea29e58e041d70bb6d756a356743f6e06d8dd680f7b39e8bcdd90c68cbe5c517bead7f9263d7596954bc595c3a2501edf0d0ea421c9992
-Size (pluma-1.22.2.tar.xz) = 3262288 bytes
+SHA1 (pluma-1.24.0.tar.xz) = 29c15838e1d64930527f7234c75cb2ecd1af854e
+RMD160 (pluma-1.24.0.tar.xz) = eb67208f5b92404d091a11603033020cbcff8740
+SHA512 (pluma-1.24.0.tar.xz) = 390bf2949549baa0e3dc706526217fbc1513e2f9778917710da806e58cdfb0b7a36e95ed2186442490996cf76783acd4e0f4b8f1fedacee9ba356c0d466510be
+Size (pluma-1.24.0.tar.xz) = 3717544 bytes
 SHA1 (patch-configure) = c2f4aef21c7b23bafeb0c6d3f751e7d21e0a618e
diff --git a/editors/pluma/options.mk b/editors/pluma/options.mk
index 72e8c0a37b4..97658389e68 100644
--- a/editors/pluma/options.mk
+++ b/editors/pluma/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2019/12/30 23:38:57 gutteridge Exp $
+# $NetBSD: options.mk,v 1.14 2020/04/05 16:05:45 bsiegert Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pluma
 PKG_SUPPORTED_OPTIONS=	enchant
@@ -13,21 +13,3 @@ CONFIGURE_ARGS+=	--enable-spell
 .else
 CONFIGURE_ARGS+=	--disable-spell
 .endif
-
-# The python option is logically impossible right now.  This option sets python
-# 3.x as being incompatible, yet pluma depends on libpeas which itself sets 2.x
-# as being incompatible, leaving us with no remaining choices.
-.if !empty(PKG_OPTIONS:Mpython)
-CONFIGURE_ARGS+=	--enable-python
-PYTHON_VERSIONS_ACCEPTED=	 27 # py-gtk2, also via py-gtksourceview
-.include "../../devel/py-gobject/buildlink3.mk"
-.include "../../x11/py-gtk2/buildlink3.mk"
-.include "../../x11/py-gtksourceview/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-python
-# XXX: Due to the mess described above, and the fact that python is required
-# by the build process but is not python3 compatible, we need to override and
-# use python2.7 explicitly.
-TOOL_DEPENDS+=		python27-[0-9]*:../../lang/python27
-PYTHONBIN=		${PREFIX}/bin/python2.7
-.endif