aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorericbsd <ericbsd@FreeBSD.org>2018-04-14 05:16:56 +0800
committerericbsd <ericbsd@FreeBSD.org>2018-04-14 05:16:56 +0800
commitcf3030916524e7a48bf65d7add88ba53c16e0f93 (patch)
treefe45484e4a0866ed2fea48abe3f221fc294f178a /x11
parent415c28aaeba76796a50de753443769522c1e58ee (diff)
downloadfreebsd-ports-gnome-cf3030916524e7a48bf65d7add88ba53c16e0f93.tar.gz
freebsd-ports-gnome-cf3030916524e7a48bf65d7add88ba53c16e0f93.tar.zst
freebsd-ports-gnome-cf3030916524e7a48bf65d7add88ba53c16e0f93.zip
Updating MATE ports to and patch for MATE 1.20
Reviewed by: kwm Approved by: bapt (mentor)
Diffstat (limited to 'x11')
-rw-r--r--x11/libmatekbd/Makefile2
-rw-r--r--x11/libmatekbd/distinfo6
-rw-r--r--x11/mate-applets/Makefile13
-rw-r--r--x11/mate-applets/distinfo6
-rw-r--r--x11/mate-applets/files/patch-configure.ac4
-rw-r--r--x11/mate-applets/files/patch-invest-applet_invest_invest-applet.py13
-rw-r--r--x11/mate-applets/files/patch-invest-applet_invest_invest-chart13
-rw-r--r--x11/mate-applets/pkg-plist86
-rw-r--r--x11/mate-base/Makefile2
-rw-r--r--x11/mate-desktop/Makefile3
-rw-r--r--x11/mate-desktop/distinfo6
-rw-r--r--x11/mate-desktop/pkg-plist2
-rw-r--r--x11/mate-menus/Makefile15
-rw-r--r--x11/mate-menus/distinfo6
-rw-r--r--x11/mate-menus/files/GNOME.directory5
-rw-r--r--x11/mate-menus/files/KDE.directory5
-rw-r--r--x11/mate-menus/files/patch-layout_mate-applications.menu459
-rw-r--r--x11/mate-menus/files/patch-layout_mate-settings.menu60
-rw-r--r--x11/mate-menus/pkg-plist2
-rw-r--r--x11/mate-panel/Makefile2
-rw-r--r--x11/mate-panel/distinfo6
-rw-r--r--x11/mate-panel/pkg-plist2
-rw-r--r--x11/mate-screensaver/Makefile2
-rw-r--r--x11/mate-screensaver/distinfo6
-rw-r--r--x11/mate-session-manager/Makefile2
-rw-r--r--x11/mate-session-manager/distinfo6
-rw-r--r--x11/mate-terminal/Makefile2
-rw-r--r--x11/mate-terminal/distinfo6
-rw-r--r--x11/mate-terminal/pkg-plist1
-rw-r--r--x11/mate/Makefile2
30 files changed, 45 insertions, 700 deletions
diff --git a/x11/libmatekbd/Makefile b/x11/libmatekbd/Makefile
index 22f33c7b4e9d..5393c44afaf6 100644
--- a/x11/libmatekbd/Makefile
+++ b/x11/libmatekbd/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libmatekbd
-PORTVERSION= 1.18.2
+PORTVERSION= 1.20.1
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
diff --git a/x11/libmatekbd/distinfo b/x11/libmatekbd/distinfo
index 1209793e50ae..3a9cd67a7821 100644
--- a/x11/libmatekbd/distinfo
+++ b/x11/libmatekbd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497538064
-SHA256 (mate/libmatekbd-1.18.2.tar.xz) = 03df100cf931a1f6880a32b0b3eb90e82e81f6d17085bb44a2a7ca8551a00b0c
-SIZE (mate/libmatekbd-1.18.2.tar.xz) = 369448
+TIMESTAMP = 1523141913
+SHA256 (mate/libmatekbd-1.20.1.tar.xz) = 4690737e3a572c4f31476d1536b19ef40ca0586fcbc7cfd266a170b496ed00b5
+SIZE (mate/libmatekbd-1.20.1.tar.xz) = 372428
diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile
index 68ef3a904783..4eddd9b4c621 100644
--- a/x11/mate-applets/Makefile
+++ b/x11/mate-applets/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mate-applets
-PORTVERSION= 1.18.1
+PORTVERSION= 1.20.1
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -24,16 +24,12 @@ LIB_DEPENDS= libgtop-2.0.so:devel/libgtop \
PORTSCOUT= limitw:1,even
-#USES= autoreconf:build gettext gmake libtool localbase pathfix \
-# pkgconfig python shebangfix tar:xz
USES= compiler:c11 gettext gmake libtool localbase pkgconfig \
- python:2.7 shebangfix tar:xz
+ python:2.7 tar:xz
USE_CSTD= c11
-#USE_MATE= desktop icontheme libmateweather panel polkit settingsdaemon
+
USE_MATE= libmateweather panel
USE_XORG= ice sm x11
-#USE_GNOME= cairo gdkpixbuf2 gtk30 gtksourceview3 introspection:build \
-# libwnck3 libxml2 libxslt pygobject pygobject3 intlhack
USE_GNOME= cairo gtk30 gtksourceview3 intltool libwnck3 libxml2 \
pygobject3
USE_LDCONFIG= yes
@@ -50,9 +46,6 @@ GLIB_SCHEMAS= org.mate.panel.applet.charpick.gschema.xml \
org.mate.panel.applet.timer.gschema.xml \
org.mate.stickynotes.gschema.xml
-SHEBANG_FILES= invest-applet/invest/*.py \
- invest-applet/invest/mate-invest-chart
-
.include <bsd.port.pre.mk>
.if ${ARCH} != "i386" && ${ARCH} != "amd64"
diff --git a/x11/mate-applets/distinfo b/x11/mate-applets/distinfo
index 5dbb8bf92ee1..cd324bcd4622 100644
--- a/x11/mate-applets/distinfo
+++ b/x11/mate-applets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491691806
-SHA256 (mate/mate-applets-1.18.1.tar.xz) = 05bae1324de35659b37307bb345bb9da16b19391c83388ef697df51a22caf4da
-SIZE (mate/mate-applets-1.18.1.tar.xz) = 7158716
+TIMESTAMP = 1523142281
+SHA256 (mate/mate-applets-1.20.1.tar.xz) = 8c0723644a49d465c616ab611e9b1e4f532cac3e7c891151cbf2649dc84b21a8
+SIZE (mate/mate-applets-1.20.1.tar.xz) = 7022772
diff --git a/x11/mate-applets/files/patch-configure.ac b/x11/mate-applets/files/patch-configure.ac
index 0923fcd11d0b..a9dd76cc8373 100644
--- a/x11/mate-applets/files/patch-configure.ac
+++ b/x11/mate-applets/files/patch-configure.ac
@@ -53,6 +53,6 @@
-AS_AC_EXPAND(DATADIR, "${datadir}")
+AS_AC_EXPAND(DATADIR, $datadir)
- AS_AC_EXPAND(PYTHONDIR, $pythondir)
AS_AC_EXPAND(BUILDERDIR, $builderdir)
-
+
+ AC_SUBST(VERSION)
diff --git a/x11/mate-applets/files/patch-invest-applet_invest_invest-applet.py b/x11/mate-applets/files/patch-invest-applet_invest_invest-applet.py
deleted file mode 100644
index 5cb46b6018bc..000000000000
--- a/x11/mate-applets/files/patch-invest-applet_invest_invest-applet.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- invest-applet/invest/invest-applet.py.orig 2008-03-15 19:39:32.000000000 -0400
-+++ invest-applet/invest/invest-applet.py 2008-04-28 13:27:46.000000000 -0400
-@@ -26,8 +26,8 @@ import mate_invest, mate_invest.applet, mate_invest.def
- import gettext, locale
- gettext.bindtextdomain(mate_invest.defs.GETTEXT_PACKAGE, mate_invest.defs.MATELOCALEDIR)
- gettext.textdomain(mate_invest.defs.GETTEXT_PACKAGE)
--locale.bindtextdomain(mate_invest.defs.GETTEXT_PACKAGE, mate_invest.defs.MATELOCALEDIR)
--locale.textdomain(mate_invest.defs.GETTEXT_PACKAGE)
-+#locale.bindtextdomain(mate_invest.defs.GETTEXT_PACKAGE, mate_invest.defs.MATELOCALEDIR)
-+#locale.textdomain(mate_invest.defs.GETTEXT_PACKAGE)
-
- from gettext import gettext as _
-
diff --git a/x11/mate-applets/files/patch-invest-applet_invest_invest-chart b/x11/mate-applets/files/patch-invest-applet_invest_invest-chart
deleted file mode 100644
index 2b6da07eb611..000000000000
--- a/x11/mate-applets/files/patch-invest-applet_invest_invest-chart
+++ /dev/null
@@ -1,13 +0,0 @@
---- invest-applet/invest/mate-invest-chart.orig 2008-03-15 16:34:50.000000000 -0400
-+++ invest-applet/invest/mate-invest-chart 2008-04-28 13:29:13.000000000 -0400
-@@ -6,8 +6,8 @@ import sys, mate_invest.chart, gtk
- import gettext, locale
- gettext.bindtextdomain(mate_invest.defs.GETTEXT_PACKAGE, mate_invest.defs.MATELOCALEDIR)
- gettext.textdomain(mate_invest.defs.GETTEXT_PACKAGE)
--locale.bindtextdomain(mate_invest.defs.GETTEXT_PACKAGE, mate_invest.defs.MATELOCALEDIR)
--locale.textdomain(mate_invest.defs.GETTEXT_PACKAGE)
-+#locale.bindtextdomain(mate_invest.defs.GETTEXT_PACKAGE, mate_invest.defs.MATELOCALEDIR)
-+#locale.textdomain(mate_invest.defs.GETTEXT_PACKAGE)
-
- if __name__ == "__main__":
- win = mate_invest.chart.show_chart(sys.argv[1:])
diff --git a/x11/mate-applets/pkg-plist b/x11/mate-applets/pkg-plist
index 3773204df56d..fbfe42e0750c 100644
--- a/x11/mate-applets/pkg-plist
+++ b/x11/mate-applets/pkg-plist
@@ -1,42 +1,7 @@
-bin/mate-invest-chart
%%BATTERY%%etc/sound/events/mate-battstat_applet.soundlist
-%%PYTHON_SITELIBDIR%%/mate_invest/__init__.py
-%%PYTHON_SITELIBDIR%%/mate_invest/__init__.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/__init__.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/mate_invest/about.py
-%%PYTHON_SITELIBDIR%%/mate_invest/about.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/about.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/mate_invest/applet.py
-%%PYTHON_SITELIBDIR%%/mate_invest/applet.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/applet.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/mate_invest/chart.py
-%%PYTHON_SITELIBDIR%%/mate_invest/chart.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/chart.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/mate_invest/currencies.py
-%%PYTHON_SITELIBDIR%%/mate_invest/currencies.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/currencies.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/mate_invest/defs.py
-%%PYTHON_SITELIBDIR%%/mate_invest/defs.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/defs.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/mate_invest/help.py
-%%PYTHON_SITELIBDIR%%/mate_invest/help.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/help.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/mate_invest/networkmanager.py
-%%PYTHON_SITELIBDIR%%/mate_invest/networkmanager.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/networkmanager.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/mate_invest/preferences.py
-%%PYTHON_SITELIBDIR%%/mate_invest/preferences.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/preferences.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/mate_invest/quotes.py
-%%PYTHON_SITELIBDIR%%/mate_invest/quotes.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/quotes.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/mate_invest/widgets.py
-%%PYTHON_SITELIBDIR%%/mate_invest/widgets.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/widgets.%%PYTHON_PYOEXTENSION%%
libexec/accessx-status-applet
%%BATTERY%%libexec/battstat-applet
libexec/command-applet
-libexec/invest-applet
libexec/mate-charpick-applet
libexec/mate-drivemount-applet
libexec/mate-geyes-applet
@@ -50,7 +15,6 @@ man/man1/mate-charpick-applet.1.gz
man/man1/mate-cpufreq-selector.1.gz
man/man1/mate-drivemount-applet.1.gz
man/man1/mate-geyes-applet.1.gz
-man/man1/mate-invest-chart.1.gz
man/man1/mate-multiload-applet.1.gz
man/man1/mateweather.1.gz
share/dbus-1/services/org.mate.panel.applet.AccessxStatusAppletFactory.service
@@ -59,7 +23,6 @@ share/dbus-1/services/org.mate.panel.applet.CharpickerAppletFactory.service
share/dbus-1/services/org.mate.panel.applet.CommandAppletFactory.service
share/dbus-1/services/org.mate.panel.applet.DriveMountAppletFactory.service
share/dbus-1/services/org.mate.panel.applet.GeyesAppletFactory.service
-share/dbus-1/services/org.mate.panel.applet.InvestAppletFactory.service
share/dbus-1/services/org.mate.panel.applet.MateWeatherAppletFactory.service
share/dbus-1/services/org.mate.panel.applet.MultiLoadAppletFactory.service
share/dbus-1/services/org.mate.panel.applet.NetspeedAppletFactory.service
@@ -102,9 +65,6 @@ share/help/C/mate-drivemount/legal.xml
share/help/C/mate-geyes/figures/geyes_applet.png
share/help/C/mate-geyes/index.docbook
share/help/C/mate-geyes/legal.xml
-share/help/C/mate-invest-applet/figures/symbol-search.png
-share/help/C/mate-invest-applet/index.docbook
-share/help/C/mate-invest-applet/legal.xml
share/help/C/mate-multiload/figures/multiload-preferences.png
share/help/C/mate-multiload/figures/system-monitor-applet_window.png
share/help/C/mate-multiload/figures/system_monitor.png
@@ -231,9 +191,6 @@ share/help/ca/mate-drivemount/legal.xml
share/help/ca/mate-geyes/figures/geyes_applet.png
share/help/ca/mate-geyes/index.docbook
share/help/ca/mate-geyes/legal.xml
-share/help/ca/mate-invest-applet/figures/symbol-search.png
-share/help/ca/mate-invest-applet/index.docbook
-share/help/ca/mate-invest-applet/legal.xml
share/help/ca/mate-multiload/figures/multiload-preferences.png
share/help/ca/mate-multiload/figures/system-monitor-applet_window.png
share/help/ca/mate-multiload/figures/system_monitor.png
@@ -388,9 +345,6 @@ share/help/de/mate-drivemount/legal.xml
share/help/de/mate-geyes/figures/geyes_applet.png
share/help/de/mate-geyes/index.docbook
share/help/de/mate-geyes/legal.xml
-share/help/de/mate-invest-applet/figures/symbol-search.png
-share/help/de/mate-invest-applet/index.docbook
-share/help/de/mate-invest-applet/legal.xml
share/help/de/mate-multiload/figures/multiload-preferences.png
share/help/de/mate-multiload/figures/system-monitor-applet_window.png
share/help/de/mate-multiload/figures/system_monitor.png
@@ -469,9 +423,6 @@ share/help/el/mate-drivemount/legal.xml
share/help/el/mate-geyes/figures/geyes_applet.png
share/help/el/mate-geyes/index.docbook
share/help/el/mate-geyes/legal.xml
-share/help/el/mate-invest-applet/figures/symbol-search.png
-share/help/el/mate-invest-applet/index.docbook
-share/help/el/mate-invest-applet/legal.xml
share/help/el/mate-multiload/figures/multiload-preferences.png
share/help/el/mate-multiload/figures/system-monitor-applet_window.png
share/help/el/mate-multiload/figures/system_monitor.png
@@ -550,9 +501,6 @@ share/help/en_GB/mate-drivemount/legal.xml
share/help/en_GB/mate-geyes/figures/geyes_applet.png
share/help/en_GB/mate-geyes/index.docbook
share/help/en_GB/mate-geyes/legal.xml
-share/help/en_GB/mate-invest-applet/figures/symbol-search.png
-share/help/en_GB/mate-invest-applet/index.docbook
-share/help/en_GB/mate-invest-applet/legal.xml
share/help/en_GB/mate-multiload/figures/multiload-preferences.png
share/help/en_GB/mate-multiload/figures/system-monitor-applet_window.png
share/help/en_GB/mate-multiload/figures/system_monitor.png
@@ -620,9 +568,6 @@ share/help/es/mate-drivemount/legal.xml
share/help/es/mate-geyes/figures/geyes_applet.png
share/help/es/mate-geyes/index.docbook
share/help/es/mate-geyes/legal.xml
-share/help/es/mate-invest-applet/figures/symbol-search.png
-share/help/es/mate-invest-applet/index.docbook
-share/help/es/mate-invest-applet/legal.xml
share/help/es/mate-multiload/figures/multiload-preferences.png
share/help/es/mate-multiload/figures/system-monitor-applet_window.png
share/help/es/mate-multiload/figures/system_monitor.png
@@ -757,9 +702,6 @@ share/help/fi/mate-drivemount/legal.xml
share/help/fi/mate-geyes/figures/geyes_applet.png
share/help/fi/mate-geyes/index.docbook
share/help/fi/mate-geyes/legal.xml
-share/help/fi/mate-invest-applet/figures/symbol-search.png
-share/help/fi/mate-invest-applet/index.docbook
-share/help/fi/mate-invest-applet/legal.xml
share/help/fi/mate-multiload/figures/multiload-preferences.png
share/help/fi/mate-multiload/figures/system-monitor-applet_window.png
share/help/fi/mate-multiload/figures/system_monitor.png
@@ -1202,9 +1144,6 @@ share/help/ru/mate-drivemount/legal.xml
share/help/ru/mate-geyes/figures/geyes_applet.png
share/help/ru/mate-geyes/index.docbook
share/help/ru/mate-geyes/legal.xml
-share/help/ru/mate-invest-applet/figures/symbol-search.png
-share/help/ru/mate-invest-applet/index.docbook
-share/help/ru/mate-invest-applet/legal.xml
share/help/ru/mate-multiload/figures/multiload-preferences.png
share/help/ru/mate-multiload/figures/system-monitor-applet_window.png
share/help/ru/mate-multiload/figures/system_monitor.png
@@ -1272,9 +1211,6 @@ share/help/sv/mate-drivemount/legal.xml
share/help/sv/mate-geyes/figures/geyes_applet.png
share/help/sv/mate-geyes/index.docbook
share/help/sv/mate-geyes/legal.xml
-share/help/sv/mate-invest-applet/figures/symbol-search.png
-share/help/sv/mate-invest-applet/index.docbook
-share/help/sv/mate-invest-applet/legal.xml
share/help/sv/mate-multiload/figures/multiload-preferences.png
share/help/sv/mate-multiload/figures/system-monitor-applet_window.png
share/help/sv/mate-multiload/figures/system_monitor.png
@@ -1420,9 +1356,6 @@ share/help/zh_CN/mate-drivemount/legal.xml
share/help/zh_CN/mate-geyes/figures/geyes_applet.png
share/help/zh_CN/mate-geyes/index.docbook
share/help/zh_CN/mate-geyes/legal.xml
-share/help/zh_CN/mate-invest-applet/figures/symbol-search.png
-share/help/zh_CN/mate-invest-applet/index.docbook
-share/help/zh_CN/mate-invest-applet/legal.xml
share/help/zh_CN/mate-multiload/figures/multiload-preferences.png
share/help/zh_CN/mate-multiload/figures/system-monitor-applet_window.png
share/help/zh_CN/mate-multiload/figures/system_monitor.png
@@ -1481,14 +1414,12 @@ share/help/zh_TW/mate-trashapplet/figures/trash-applet.png
share/help/zh_TW/mate-trashapplet/index.docbook
share/help/zh_TW/mate-trashapplet/legal.xml
share/icons/hicolor/16x16/apps/mate-eyes-applet.png
-share/icons/hicolor/16x16/apps/mate-invest-applet.png
share/icons/hicolor/16x16/apps/mate-netspeed-applet.png
share/icons/hicolor/16x16/apps/mate-sticky-notes-applet.png
share/icons/hicolor/16x16/devices/mate-netspeed-loopback.png
share/icons/hicolor/16x16/devices/mate-netspeed-plip.png
share/icons/hicolor/16x16/devices/mate-netspeed-ppp.png
share/icons/hicolor/22x22/apps/mate-eyes-applet.png
-share/icons/hicolor/22x22/apps/mate-invest-applet.png
share/icons/hicolor/22x22/apps/mate-netspeed-applet.png
share/icons/hicolor/22x22/apps/mate-sticky-notes-applet.png
share/icons/hicolor/24x24/apps/mate-eyes-applet.png
@@ -1502,10 +1433,8 @@ share/icons/hicolor/32x32/apps/mate-eyes-applet.png
share/icons/hicolor/32x32/apps/mate-netspeed-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
share/icons/hicolor/48x48/apps/mate-netspeed-applet.png
share/icons/hicolor/scalable/apps/mate-eyes-applet.svg
-share/icons/hicolor/scalable/apps/mate-invest-applet.svg
share/icons/hicolor/scalable/apps/mate-netspeed-applet.svg
share/icons/hicolor/scalable/apps/mate-sticky-notes-applet.svg
share/locale/af/LC_MESSAGES/mate-applets.mo
@@ -1594,6 +1523,7 @@ share/locale/oc/LC_MESSAGES/mate-applets.mo
share/locale/or/LC_MESSAGES/mate-applets.mo
share/locale/pa/LC_MESSAGES/mate-applets.mo
share/locale/pl/LC_MESSAGES/mate-applets.mo
+share/locale/pms/LC_MESSAGES/mate-applets.mo
share/locale/ps/LC_MESSAGES/mate-applets.mo
share/locale/pt/LC_MESSAGES/mate-applets.mo
share/locale/pt_BR/LC_MESSAGES/mate-applets.mo
@@ -1621,10 +1551,7 @@ share/locale/xh/LC_MESSAGES/mate-applets.mo
share/locale/zh_CN/LC_MESSAGES/mate-applets.mo
share/locale/zh_HK/LC_MESSAGES/mate-applets.mo
share/locale/zh_TW/LC_MESSAGES/mate-applets.mo
-%%DATADIR%%/Invest_Applet.xml
%%BATTERY%%%%DATADIR%%/builder/battstat_applet.ui
-%%DATADIR%%/builder/financialchart.ui
-%%DATADIR%%/builder/prefs-dialog.ui
%%DATADIR%%/builder/stickynotes.ui
%%DATADIR%%/builder/trashapplet-empty-progress.ui
%%DATADIR%%/geyes/Bizarre/Bizarre-eye.png
@@ -1639,6 +1566,9 @@ share/locale/zh_TW/LC_MESSAGES/mate-applets.mo
%%DATADIR%%/geyes/Default/Default-eye.png
%%DATADIR%%/geyes/Default/Default-pupil.png
%%DATADIR%%/geyes/Default/config
+%%DATADIR%%/geyes/Digital/Digital-eye.png
+%%DATADIR%%/geyes/Digital/Digital-pupil.png
+%%DATADIR%%/geyes/Digital/config
%%DATADIR%%/geyes/Horrid/config
%%DATADIR%%/geyes/Horrid/horrid_eye.png
%%DATADIR%%/geyes/Horrid/horrid_pupil.png
@@ -1650,20 +1580,12 @@ share/locale/zh_TW/LC_MESSAGES/mate-applets.mo
%%DATADIR%%/icons/hicolor/48x48/apps/stickynotes-stock-resize-se.png
%%DATADIR%%/icons/hicolor/48x48/apps/stickynotes-stock-resize-sw.png
%%DATADIR%%/icons/hicolor/48x48/apps/stickynotes-stock-unlocked.png
-%%DATADIR%%/invest-applet/invest-16_neutral.png
-%%DATADIR%%/invest-applet/invest-22_down.png
-%%DATADIR%%/invest-applet/invest-22_neutral.png
-%%DATADIR%%/invest-applet/invest-22_up.png
-%%DATADIR%%/invest-applet/invest_down.svg
-%%DATADIR%%/invest-applet/invest_neutral.svg
-%%DATADIR%%/invest-applet/invest_up.svg
share/mate-panel/applets/org.mate.applets.AccessxStatusApplet.mate-panel-applet
%%BATTERY%%share/mate-panel/applets/org.mate.applets.BattstatApplet.mate-panel-applet
share/mate-panel/applets/org.mate.applets.CharpickerApplet.mate-panel-applet
share/mate-panel/applets/org.mate.applets.CommandApplet.mate-panel-applet
share/mate-panel/applets/org.mate.applets.DriveMountApplet.mate-panel-applet
share/mate-panel/applets/org.mate.applets.GeyesApplet.mate-panel-applet
-share/mate-panel/applets/org.mate.applets.InvestApplet.mate-panel-applet
share/mate-panel/applets/org.mate.applets.MateWeatherApplet.mate-panel-applet
share/mate-panel/applets/org.mate.applets.MultiLoadApplet.mate-panel-applet
share/mate-panel/applets/org.mate.applets.NetspeedApplet.mate-panel-applet
diff --git a/x11/mate-base/Makefile b/x11/mate-base/Makefile
index eaeaf7068a38..f253e4e244f2 100644
--- a/x11/mate-base/Makefile
+++ b/x11/mate-base/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-base
-PORTVERSION= 1.18.0
+PORTVERSION= 1.20.0
CATEGORIES= x11 mate
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/mate-desktop/Makefile b/x11/mate-desktop/Makefile
index a7612a13f931..af6785c99f17 100644
--- a/x11/mate-desktop/Makefile
+++ b/x11/mate-desktop/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mate-desktop
-PORTVERSION= 1.18.0
-PORTREVISION= 1
+PORTVERSION= 1.20.1
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
diff --git a/x11/mate-desktop/distinfo b/x11/mate-desktop/distinfo
index c0b156451d2d..8f39e5c9de1a 100644
--- a/x11/mate-desktop/distinfo
+++ b/x11/mate-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491603387
-SHA256 (mate/mate-desktop-1.18.0.tar.xz) = 6f2dd9fc60bacd0ff27b8328c7addceb9e73a75c7dce7db4132659d588173b8a
-SIZE (mate/mate-desktop-1.18.0.tar.xz) = 827332
+TIMESTAMP = 1523143310
+SHA256 (mate/mate-desktop-1.20.1.tar.xz) = dd37a1ebbe7b9fd1bb9c54e367c9a3bef9583f5542beea8d82e857c39383b04b
+SIZE (mate/mate-desktop-1.20.1.tar.xz) = 816196
diff --git a/x11/mate-desktop/pkg-plist b/x11/mate-desktop/pkg-plist
index 70f9c29fc93c..28be78ec2377 100644
--- a/x11/mate-desktop/pkg-plist
+++ b/x11/mate-desktop/pkg-plist
@@ -1,6 +1,5 @@
bin/mate-about
bin/mate-color-select
-include/mate-desktop-2.0/libmate-desktop/mate-aboutdialog.h
include/mate-desktop-2.0/libmate-desktop/mate-bg-crossfade.h
include/mate-desktop-2.0/libmate-desktop/mate-bg.h
include/mate-desktop-2.0/libmate-desktop/mate-colorbutton.h
@@ -101,6 +100,7 @@ share/locale/fi/LC_MESSAGES/mate-desktop.mo
share/locale/fr/LC_MESSAGES/mate-desktop.mo
share/locale/frp/LC_MESSAGES/mate-desktop.mo
share/locale/fur/LC_MESSAGES/mate-desktop.mo
+share/locale/fy/LC_MESSAGES/mate-desktop.mo
share/locale/ga/LC_MESSAGES/mate-desktop.mo
share/locale/gl/LC_MESSAGES/mate-desktop.mo
share/locale/gu/LC_MESSAGES/mate-desktop.mo
diff --git a/x11/mate-menus/Makefile b/x11/mate-menus/Makefile
index e8fd62f2ff7f..77cc57c7ac07 100644
--- a/x11/mate-menus/Makefile
+++ b/x11/mate-menus/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-menus
-PORTVERSION= 1.18.0
+PORTVERSION= 1.20.0
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -24,17 +24,4 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-post-patch:
- @${REINPLACE_CMD} -e 's|/usr/share/mate|${LOCALBASE}/share/mate|g' \
- ${WRKSRC}/layout/mate-applications.menu \
- ${WRKSRC}/layout/mate-settings.menu
- @${SED} -e 's|/usr/local|${LOCALBASE}|g' \
- < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
- @${SED} -e 's|/usr/local|${LOCALBASE}|g' \
- < ${FILESDIR}/GNOME.directory > ${WRKSRC}/GNOME.directory
-
-post-install:
- @${INSTALL_DATA} ${WRKSRC}/*.directory \
- ${STAGEDIR}${PREFIX}/share/mate/desktop-directories/
-
.include <bsd.port.mk>
diff --git a/x11/mate-menus/distinfo b/x11/mate-menus/distinfo
index e07c889d829d..505aa4a36a73 100644
--- a/x11/mate-menus/distinfo
+++ b/x11/mate-menus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491694633
-SHA256 (mate/mate-menus-1.18.0.tar.xz) = f07cdb952934b732678ed37a9cd740c8860e9e2d0ddb4d73a8d06cdccfc87e16
-SIZE (mate/mate-menus-1.18.0.tar.xz) = 358032
+TIMESTAMP = 1519753633
+SHA256 (mate/mate-menus-1.20.0.tar.xz) = 0fdadb1ba0950c14a72802c8a5afae99c46ca20ef3c7b9f1854bd5a5da3433f0
+SIZE (mate/mate-menus-1.20.0.tar.xz) = 360776
diff --git a/x11/mate-menus/files/GNOME.directory b/x11/mate-menus/files/GNOME.directory
deleted file mode 100644
index f6c98fff65f3..000000000000
--- a/x11/mate-menus/files/GNOME.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Name=GNOME
-Comment=Some comment about GNOME menu
-Icon=/usr/local/share/icons/gnome/48x48/places/gnome-main-menu.png
-Type=Directory
diff --git a/x11/mate-menus/files/KDE.directory b/x11/mate-menus/files/KDE.directory
deleted file mode 100644
index d8cacb75019e..000000000000
--- a/x11/mate-menus/files/KDE.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Name=KDE
-Comment=Some comment about KDE menu
-Icon=/usr/local/share/icons/default.kde/48x48/apps/kmenu.png
-Type=Directory
diff --git a/x11/mate-menus/files/patch-layout_mate-applications.menu b/x11/mate-menus/files/patch-layout_mate-applications.menu
deleted file mode 100644
index b50b8267ee4a..000000000000
--- a/x11/mate-menus/files/patch-layout_mate-applications.menu
+++ /dev/null
@@ -1,459 +0,0 @@
---- layout/mate-applications.menu.orig 2013-03-31 16:16:30.000000000 -0500
-+++ layout/mate-applications.menu 2013-04-13 21:48:00.000000000 -0500
-@@ -6,9 +6,8 @@
- <Name>Applications</Name>
- <Directory>mate-menu-applications.directory</Directory>
-
-- <!-- Scan legacy dirs first, as later items take priority -->
-- <KDELegacyDirs/>
-- <LegacyDir>/etc/X11/applnk</LegacyDir>
-+ <!-- Scan legacy dirs first, as later items take priority
-+ <LegacyDir>/etc/X11/applnk</LegacyDir> -->
- <LegacyDir>/usr/share/mate/apps</LegacyDir>
-
- <!-- Read standard .directory and .desktop file locations -->
-@@ -31,6 +30,9 @@
- applications here -->
- <Not><Category>Accessibility</Category></Not>
- <Not><Category>System</Category></Not>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
-+ <Not><Category>GNOME</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Accessories -->
-@@ -43,6 +45,9 @@
- <And>
- <Category>Accessibility</Category>
- <Not><Category>Settings</Category></Not>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
-+ <Not><Category>GNOME</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Accessibility -->
-@@ -54,6 +59,9 @@
- <Include>
- <And>
- <Category>Development</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
-+ <Not><Category>GNOME</Category></Not>
- </And>
- <Filename>emacs.desktop</Filename>
- </Include>
-@@ -66,6 +74,9 @@
- <Include>
- <And>
- <Category>Education</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
-+ <Not><Category>GNOME</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Education -->
-@@ -77,6 +88,9 @@
- <Include>
- <And>
- <Category>Game</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
-+ <Not><Category>GNOME</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Games -->
-@@ -88,6 +102,9 @@
- <Include>
- <And>
- <Category>Graphics</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
-+ <Not><Category>GNOME</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Graphics -->
-@@ -99,6 +116,9 @@
- <Include>
- <And>
- <Category>Network</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
-+ <Not><Category>GNOME</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Internet -->
-@@ -110,6 +130,9 @@
- <Include>
- <And>
- <Category>AudioVideo</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
-+ <Not><Category>GNOME</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Multimedia -->
-@@ -121,6 +144,9 @@
- <Include>
- <And>
- <Category>Office</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
-+ <Not><Category>GNOME</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Office -->
-@@ -133,6 +159,9 @@
- <And>
- <Category>System</Category>
- <Not><Category>Settings</Category></Not>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
-+ <Not><Category>GNOME</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End System Tools -->
-@@ -147,8 +176,344 @@
- <Not><Category>Core</Category></Not>
- <Not><Category>Settings</Category></Not>
- <Not><Category>Screensaver</Category></Not>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
-+ <Not><Category>GNOME</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Other -->
-
-+ <!-- Read in overrides and child menus from applications-merged/ -->
-+ <DefaultMergeDirs/>
-+
-+ <!-- GNOME -->
-+ <Menu>
-+ <Name>GNOME</Name>
-+ <Directory>GNOME.directory</Directory>
-+
-+ <!-- GNOME Accessories submenu -->
-+ <Menu>
-+ <Name>Accessories</Name>
-+ <Directory>mate-utility.directory</Directory>
-+ <Include>
-+ <And>
-+ <Category>GNOME</Category>
-+ <Category>Utility</Category>
-+ <Not><Category>Accessibility</Category></Not>
-+ <Not><Category>System</Category></Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End GNOME Accessories -->
-+
-+ <!-- GNOME Accessibility submenu -->
-+ <Menu>
-+ <Name>Universal Access</Name>
-+ <Directory>mate-utility-accessibility.directory</Directory>
-+ <Include>
-+ <And>
-+ <Category>GNOME</Category>
-+ <Category>Accessibility</Category>
-+ <Not><Category>Settings</Category></Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End GNOME Accessibility -->
-+
-+ <!-- GNOME Development Tools -->
-+ <Menu>
-+ <Name>Development</Name>
-+ <Directory>mate-development.directory</Directory>
-+ <Include>
-+ <And>
-+ <Category>GNOME</Category>
-+ <Category>Development</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End GNOME Development Tools -->
-+
-+ <!-- GNOME Education -->
-+ <Menu>
-+ <Name>Education</Name>
-+ <Directory>mate-education.directory</Directory>
-+ <Include>
-+ <And>
-+ <Category>GNOME</Category>
-+ <Category>Education</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End GNOME Education -->
-+
-+ <!-- GNOME Games -->
-+ <Menu>
-+ <Name>Games</Name>
-+ <Directory>mate-game.directory</Directory>
-+ <Include>
-+ <And>
-+ <Category>GNOME</Category>
-+ <Category>Game</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End GNOME Games -->
-+
-+ <!-- GNOME Graphics -->
-+ <Menu>
-+ <Name>Graphics</Name>
-+ <Directory>mate-graphics.directory</Directory>
-+ <Include>
-+ <And>
-+ <Category>GNOME</Category>
-+ <Category>Graphics</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End GNOME Graphics -->
-+
-+ <!-- GNOME Internet -->
-+ <Menu>
-+ <Name>Internet</Name>
-+ <Directory>mate-network.directory</Directory>
-+ <Include>
-+ <And>
-+ <Category>GNOME</Category>
-+ <Category>Network</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End GNOME Internet -->
-+
-+ <!-- GNOME Multimedia -->
-+ <Menu>
-+ <Name>Multimedia</Name>
-+ <Directory>mate-audio-video.directory</Directory>
-+ <Include>
-+ <And>
-+ <Category>GNOME</Category>
-+ <Category>AudioVideo</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End GNOME Multimedia -->
-+
-+ <!-- GNOME Office -->
-+ <Menu>
-+ <Name>Office</Name>
-+ <Directory>mate-office.directory</Directory>
-+ <Include>
-+ <And>
-+ <Category>GNOME</Category>
-+ <Category>Office</Category>
-+ </And>
-+ </Include>
-+ </Menu><!-- End GNOME Office -->
-+
-+ <!-- GNOME System Tools-->
-+ <Menu>
-+ <Name>System</Name>
-+ <Directory>mate-system-tools.directory</Directory>
-+ <Include>
-+ <And>
-+ <Category>GNOME</Category>
-+ <Category>System</Category>
-+ <Not><Category>Settings</Category></Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End GNOME System Tools -->
-+
-+ <!-- GNOME Other -->
-+ <Menu>
-+ <Name>Other</Name>
-+ <Directory>mate-other.directory</Directory>
-+ <OnlyUnallocated/>
-+ <Include>
-+ <And>
-+ <Category>GNOME</Category>
-+ <Category>Application</Category>
-+ <Not><Category>Core</Category></Not>
-+ <Not><Category>Settings</Category></Not>
-+ <Not><Category>Screensaver</Category></Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End GNOME Other -->
-+ </Menu> <!-- GNOME -->
-+
-+ <!-- KDE -->
-+ <Menu>
-+ <KDELegacyDirs/>
-+ <Name>KDE</Name>
-+ <Directory>KDE.directory</Directory>
-+
-+ <!-- KAccessories submenu -->
-+ <Menu>
-+ <Name>Accessories</Name>
-+ <Directory>mate-utility.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Utility</Category>
-+ <Not>
-+ <Category>System</Category>
-+ </Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KAccessories -->
-+
-+ <!-- KAccessibility submenu -->
-+ <Menu>
-+ <Name>Accessibility</Name>
-+ <Directory>mate-utility-accessibility.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Accessibility</Category>
-+ <Not>
-+ <Category>Settings</Category>
-+ </Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KAccessibility -->
-+
-+ <!-- KDevelopment Tools -->
-+ <Menu>
-+ <Name>Development</Name>
-+ <Directory>mate-development.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Development</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KDevelopment Tools -->
-+
-+ <!-- KEducation -->
-+ <Menu>
-+ <Name>Education</Name>
-+ <Directory>mate-education.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Education</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KEducation -->
-+
-+ <!-- KGames -->
-+ <Menu>
-+ <Name>Games</Name>
-+ <Directory>mate-game.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Game</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KGames -->
-+
-+ <!-- KGraphics -->
-+ <Menu>
-+ <Name>Graphics</Name>
-+ <Directory>mate-graphics.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Graphics</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KGraphics -->
-+
-+ <!-- KInternet -->
-+ <Menu>
-+ <Name>Internet</Name>
-+ <Directory>mate-network.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Network</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KInternet -->
-+
-+ <!-- KMultimedia -->
-+ <Menu>
-+ <Name>Multimedia</Name>
-+ <Directory>mate-audio-video.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>AudioVideo</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KMultimedia -->
-+
-+ <!-- KOffice -->
-+ <Menu>
-+ <Name>Office</Name>
-+ <Directory>mate-office.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Or>
-+ <Category>Office</Category>
-+ </Or>
-+ </And>
-+ </Include>
-+ </Menu><!-- End KOffice -->
-+
-+ <!-- KSystem Tools-->
-+ <Menu>
-+ <Name>System</Name>
-+ <Directory>mate-system-tools.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>System</Category>
-+ <Not><Category>Settings</Category></Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KSystem Tools -->
-+
-+ <!-- KOther -->
-+ <Menu>
-+ <Name>Other</Name>
-+ <Directory>mate-other.directory</Directory>
-+ <OnlyUnallocated/>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Application</Category>
-+ <Not><Category>Core</Category></Not>
-+ <Not><Category>Settings</Category></Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KOther -->
-+ </Menu> <!-- KDE -->
-+
- </Menu> <!-- End Applications -->
diff --git a/x11/mate-menus/files/patch-layout_mate-settings.menu b/x11/mate-menus/files/patch-layout_mate-settings.menu
deleted file mode 100644
index 48b33c41dd04..000000000000
--- a/x11/mate-menus/files/patch-layout_mate-settings.menu
+++ /dev/null
@@ -1,60 +0,0 @@
---- layout/mate-settings.menu.orig 2013-04-13 22:55:06.000000000 -0500
-+++ layout/mate-settings.menu 2013-04-13 22:55:49.000000000 -0500
-@@ -27,6 +27,7 @@
- <Category>Settings</Category>
- <Not>
- <Or>
-+ <Category>GNOME</Category>
- <Category>System</Category>
- <Filename>matecc.desktop</Filename>
- </Or>
-@@ -43,10 +44,49 @@
- <And>
- <Category>Settings</Category>
- <Category>System</Category>
-+ <Not>
-+ <Or>
-+ <Category>GNOME</Category>
-+ </Or>
-+ </Not>
- </And>
- </Include>
- </Menu> <!-- End System Settings -->
-
-+ <Menu>
-+ <Name>GNOME</Name>
-+ <Directory>GNOME.directory</Directory>
-+ <Menu>
-+ <Name>Preferences</Name>
-+ <Directory>mate-settings.directory</Directory>
-+ <Include>
-+ <And>
-+ <Category>GNOME</Category>
-+ <Category>Settings</Category>
-+ <Not>
-+ <Or>
-+ <Category>System</Category>
-+ <Filename>matecc.desktop</Filename>
-+ </Or>
-+ </Not>
-+ </And>
-+ </Include>
-+ </Menu>
-+
-+ <!-- System Settings -->
-+ <Menu>
-+ <Name>Administration</Name>
-+ <Directory>mate-settings-system.directory</Directory>
-+ <Include>
-+ <And>
-+ <Category>GNOME</Category>
-+ <Category>Settings</Category>
-+ <Category>System</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End System Settings -->
-+ </Menu>
-+
- <Layout>
- <Menuname>Preferences</Menuname>
- <Menuname>Administration</Menuname>
diff --git a/x11/mate-menus/pkg-plist b/x11/mate-menus/pkg-plist
index 3ca0e810d73f..8aef6dfa1474 100644
--- a/x11/mate-menus/pkg-plist
+++ b/x11/mate-menus/pkg-plist
@@ -119,8 +119,6 @@ share/locale/zh_CN/LC_MESSAGES/mate-menus.mo
share/locale/zh_HK/LC_MESSAGES/mate-menus.mo
share/locale/zh_TW/LC_MESSAGES/mate-menus.mo
%%DATADIR%%/examples/mate-menus-ls.py
-share/mate/desktop-directories/GNOME.directory
-share/mate/desktop-directories/KDE.directory
share/mate/desktop-directories/mate-audio-video.directory
share/mate/desktop-directories/mate-development.directory
share/mate/desktop-directories/mate-education.directory
diff --git a/x11/mate-panel/Makefile b/x11/mate-panel/Makefile
index bce6cf2f3484..3be17d9e4ffa 100644
--- a/x11/mate-panel/Makefile
+++ b/x11/mate-panel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-panel
-PORTVERSION= 1.18.4
+PORTVERSION= 1.20.1
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
diff --git a/x11/mate-panel/distinfo b/x11/mate-panel/distinfo
index 009cdd1dbe61..e7ec191c5521 100644
--- a/x11/mate-panel/distinfo
+++ b/x11/mate-panel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507994435
-SHA256 (mate/mate-panel-1.18.4.tar.xz) = 81affb5de332d4a3f243766d6b40514df264eaa06cc4214477591e1b9c2ba6d8
-SIZE (mate/mate-panel-1.18.4.tar.xz) = 1955156
+TIMESTAMP = 1523143483
+SHA256 (mate/mate-panel-1.20.1.tar.xz) = 13798eda47bf004b349989bf582dc952bfbe98cdfe0f816aca06efab46b2bbee
+SIZE (mate/mate-panel-1.20.1.tar.xz) = 1992580
diff --git a/x11/mate-panel/pkg-plist b/x11/mate-panel/pkg-plist
index 95fcfdd790fb..e6c000f70934 100644
--- a/x11/mate-panel/pkg-plist
+++ b/x11/mate-panel/pkg-plist
@@ -29,7 +29,6 @@ share/dbus-1/services/org.mate.panel.applet.WnckletFactory.service
%%PORTDOCS%%%%DOCSDIR%%-applet/index.html
%%PORTDOCS%%%%DOCSDIR%%-applet/left-insensitive.png
%%PORTDOCS%%%%DOCSDIR%%-applet/left.png
-%%PORTDOCS%%%%DOCSDIR%%-applet/mate-panel-applet-Panel-Applet-MateConf-Utilities.html
%%PORTDOCS%%%%DOCSDIR%%-applet/mate-panel-applet-mate-panel-applet.html
%%PORTDOCS%%%%DOCSDIR%%-applet/mate-panel-applet.devhelp2
%%PORTDOCS%%%%DOCSDIR%%-applet/mate-panel-applet.html
@@ -301,6 +300,7 @@ share/locale/ko/LC_MESSAGES/mate-panel.mo
share/locale/ku/LC_MESSAGES/mate-panel.mo
share/locale/ku_IQ/LC_MESSAGES/mate-panel.mo
share/locale/ky/LC_MESSAGES/mate-panel.mo
+share/locale/la/LC_MESSAGES/mate-panel.mo
share/locale/li/LC_MESSAGES/mate-panel.mo
share/locale/lt/LC_MESSAGES/mate-panel.mo
share/locale/lv/LC_MESSAGES/mate-panel.mo
diff --git a/x11/mate-screensaver/Makefile b/x11/mate-screensaver/Makefile
index e8fb6c6d1f82..ad63ee4f423e 100644
--- a/x11/mate-screensaver/Makefile
+++ b/x11/mate-screensaver/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-screensaver
-PORTVERSION= 1.18.1
+PORTVERSION= 1.20.0
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
diff --git a/x11/mate-screensaver/distinfo b/x11/mate-screensaver/distinfo
index e9808e2f9f7f..25e8d7fbedb3 100644
--- a/x11/mate-screensaver/distinfo
+++ b/x11/mate-screensaver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497537052
-SHA256 (mate/mate-screensaver-1.18.1.tar.xz) = 32bd34ac058e4a9206da5eeea07902f8f9321e76961f766aded605a71c08d135
-SIZE (mate/mate-screensaver-1.18.1.tar.xz) = 4923504
+TIMESTAMP = 1519754497
+SHA256 (mate/mate-screensaver-1.20.0.tar.xz) = 69927e32b49b9723ab26a9cc0005f84ff904103d9eb71e926dc44d5311302899
+SIZE (mate/mate-screensaver-1.20.0.tar.xz) = 4930836
diff --git a/x11/mate-session-manager/Makefile b/x11/mate-session-manager/Makefile
index c4391f8693f4..cf5273349bdf 100644
--- a/x11/mate-session-manager/Makefile
+++ b/x11/mate-session-manager/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-session-manager
-PORTVERSION= 1.18.1
+PORTVERSION= 1.20.0
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
diff --git a/x11/mate-session-manager/distinfo b/x11/mate-session-manager/distinfo
index 145ed3f983d2..6b39f4bc256a 100644
--- a/x11/mate-session-manager/distinfo
+++ b/x11/mate-session-manager/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507994208
-SHA256 (mate/mate-session-manager-1.18.1.tar.xz) = 9402f181262c1f9daa8577f0d48d956fba8b41e76aa56ec4aa58f44080c11d44
-SIZE (mate/mate-session-manager-1.18.1.tar.xz) = 582732
+TIMESTAMP = 1519754601
+SHA256 (mate/mate-session-manager-1.20.0.tar.xz) = 4f5c4068f3e1f4d63bb86340b375c2f73dec8fb54066d7da589f70a89337f96f
+SIZE (mate/mate-session-manager-1.20.0.tar.xz) = 585048
diff --git a/x11/mate-terminal/Makefile b/x11/mate-terminal/Makefile
index 21aa5bea0c05..ada9522e7cca 100644
--- a/x11/mate-terminal/Makefile
+++ b/x11/mate-terminal/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-terminal
-PORTVERSION= 1.18.1
+PORTVERSION= 1.20.0
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
diff --git a/x11/mate-terminal/distinfo b/x11/mate-terminal/distinfo
index 0a50f7210e2e..da5c648dbb98 100644
--- a/x11/mate-terminal/distinfo
+++ b/x11/mate-terminal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494459097
-SHA256 (mate/mate-terminal-1.18.1.tar.xz) = 4135b2212a2ed5d6c20b645e17a76d814aa8212f68f83c0a67a9899680a930fe
-SIZE (mate/mate-terminal-1.18.1.tar.xz) = 1299492
+TIMESTAMP = 1519754746
+SHA256 (mate/mate-terminal-1.20.0.tar.xz) = 5f81ac98793880c03fea143c49b997c4c616d6bc77146faab15ff57a3434660c
+SIZE (mate/mate-terminal-1.20.0.tar.xz) = 1317068
diff --git a/x11/mate-terminal/pkg-plist b/x11/mate-terminal/pkg-plist
index 5c533bfc8412..663376830d00 100644
--- a/x11/mate-terminal/pkg-plist
+++ b/x11/mate-terminal/pkg-plist
@@ -103,6 +103,7 @@ share/locale/eu/LC_MESSAGES/mate-terminal.mo
share/locale/fa/LC_MESSAGES/mate-terminal.mo
share/locale/fi/LC_MESSAGES/mate-terminal.mo
share/locale/fr/LC_MESSAGES/mate-terminal.mo
+share/locale/fr_CA/LC_MESSAGES/mate-terminal.mo
share/locale/frp/LC_MESSAGES/mate-terminal.mo
share/locale/fur/LC_MESSAGES/mate-terminal.mo
share/locale/ga/LC_MESSAGES/mate-terminal.mo
diff --git a/x11/mate/Makefile b/x11/mate/Makefile
index 449d8932ca0e..f0aed2b6c746 100644
--- a/x11/mate/Makefile
+++ b/x11/mate/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate
-PORTVERSION= 1.18.0
+PORTVERSION= 1.20.0
CATEGORIES= x11 mate
MAINTAINER= gnome@FreeBSD.org