aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--Mk/Uses/mate.mk7
-rw-r--r--archivers/engrampa/Makefile18
-rw-r--r--archivers/engrampa/distinfo5
-rw-r--r--archivers/engrampa/pkg-plist21
-rw-r--r--audio/libmatemixer/Makefile2
-rw-r--r--audio/libmatemixer/distinfo5
-rw-r--r--audio/libmatemixer/pkg-plist18
-rw-r--r--audio/mate-media/Makefile21
-rw-r--r--audio/mate-media/distinfo5
-rw-r--r--audio/mate-media/pkg-plist15
-rw-r--r--deskutils/caja-extensions/Makefile18
-rw-r--r--deskutils/caja-extensions/distinfo5
-rw-r--r--deskutils/caja-extensions/pkg-plist21
-rw-r--r--deskutils/mate-notification-daemon/Makefile15
-rw-r--r--deskutils/mate-notification-daemon/distinfo5
-rw-r--r--deskutils/mate-notification-daemon/pkg-plist15
-rw-r--r--deskutils/mate-utils/Makefile24
-rw-r--r--deskutils/mate-utils/distinfo5
-rw-r--r--deskutils/mate-utils/pkg-plist20
-rw-r--r--deskutils/mozo/Makefile9
-rw-r--r--deskutils/mozo/distinfo5
-rw-r--r--deskutils/mozo/files/patch-Mozo_util.py29
-rw-r--r--deskutils/mozo/pkg-plist26
-rw-r--r--devel/mate-common/Makefile5
-rw-r--r--devel/mate-common/distinfo5
-rw-r--r--devel/mate-common/files/patch-macros_mate-autogen16
-rw-r--r--editors/pluma/Makefile26
-rw-r--r--editors/pluma/distinfo5
-rw-r--r--editors/pluma/pkg-plist258
-rw-r--r--graphics/atril-lite/Makefile4
-rw-r--r--graphics/atril-lite/pkg-plist26
-rw-r--r--graphics/atril/Makefile79
-rw-r--r--graphics/atril/distinfo5
-rw-r--r--graphics/atril/pkg-plist22
-rw-r--r--graphics/eom/Makefile56
-rw-r--r--graphics/eom/distinfo5
-rw-r--r--graphics/eom/pkg-plist25
-rw-r--r--math/Makefile1
-rw-r--r--math/mate-calc/Makefile26
-rw-r--r--math/mate-calc/distinfo3
-rw-r--r--math/mate-calc/files/patch-src_mate-calc-cmd.c93
-rw-r--r--math/mate-calc/pkg-descr5
-rw-r--r--math/mate-calc/pkg-plist834
-rw-r--r--net/libmateweather/Makefile13
-rw-r--r--net/libmateweather/distinfo5
-rw-r--r--net/libmateweather/files/patch-libmateweather_weather-iwin.c11
-rw-r--r--net/libmateweather/files/patch-libmateweather_weather-metar.c39
-rw-r--r--net/libmateweather/pkg-plist56
-rw-r--r--sysutils/mate-control-center/Makefile21
-rw-r--r--sysutils/mate-control-center/distinfo5
-rw-r--r--sysutils/mate-control-center/files/patch-capplets_common_theme-thumbnail.c13
-rw-r--r--sysutils/mate-control-center/pkg-plist18
-rw-r--r--sysutils/mate-polkit/Makefile16
-rw-r--r--sysutils/mate-polkit/distinfo5
-rw-r--r--sysutils/mate-polkit/pkg-plist13
-rw-r--r--sysutils/mate-power-manager/Makefile16
-rw-r--r--sysutils/mate-power-manager/distinfo5
-rw-r--r--sysutils/mate-power-manager/files/patch-src_gpm-control.c26
-rw-r--r--sysutils/mate-power-manager/files/patch-src_gpm-engine.c14
-rw-r--r--sysutils/mate-power-manager/files/patch-src_gpm-statistics.c14
-rw-r--r--sysutils/mate-power-manager/pkg-plist15
-rw-r--r--sysutils/mate-settings-daemon/Makefile22
-rw-r--r--sysutils/mate-settings-daemon/distinfo5
-rw-r--r--sysutils/mate-settings-daemon/pkg-plist10
-rw-r--r--sysutils/mate-system-monitor/Makefile13
-rw-r--r--sysutils/mate-system-monitor/distinfo5
-rw-r--r--sysutils/mate-system-monitor/files/patch-src_lsof.cpp14
-rw-r--r--sysutils/mate-system-monitor/files/patch-src_procproperties.cpp20
-rw-r--r--sysutils/mate-system-monitor/pkg-plist16
-rw-r--r--x11-fm/caja/Makefile31
-rw-r--r--x11-fm/caja/distinfo5
-rw-r--r--x11-fm/caja/pkg-plist42
-rw-r--r--x11-themes/mate-backgrounds/Makefile4
-rw-r--r--x11-themes/mate-backgrounds/distinfo5
-rw-r--r--x11-themes/mate-backgrounds/pkg-plist6
-rw-r--r--x11-themes/mate-icon-theme-faenza/Makefile5
-rw-r--r--x11-themes/mate-icon-theme-faenza/distinfo5
-rw-r--r--x11-themes/mate-icon-theme-faenza/pkg-plist8
-rw-r--r--x11-themes/mate-icon-theme/Makefile12
-rw-r--r--x11-themes/mate-icon-theme/distinfo5
-rw-r--r--x11-themes/mate-icon-theme/pkg-plist266
-rw-r--r--x11-themes/mate-themes/Makefile12
-rw-r--r--x11-themes/mate-themes/distinfo6
-rw-r--r--x11-themes/mate-themes/pkg-plist1
-rw-r--r--x11-wm/marco/Makefile18
-rw-r--r--x11-wm/marco/distinfo5
-rw-r--r--x11-wm/marco/pkg-plist12
-rw-r--r--x11/libmatekbd/Makefile17
-rw-r--r--x11/libmatekbd/distinfo5
-rw-r--r--x11/libmatekbd/pkg-plist84
-rw-r--r--x11/mate-applets/Makefile59
-rw-r--r--x11/mate-applets/distinfo5
-rw-r--r--x11/mate-applets/files/accessx-status_Makefile.am19
-rw-r--r--x11/mate-applets/files/battstat_Makefile.am24
-rw-r--r--x11/mate-applets/files/command_Makefile.am17
-rw-r--r--x11/mate-applets/files/patch-accessx-status_Makefile.in64
-rw-r--r--x11/mate-applets/files/patch-battstat_Makefile.in113
-rw-r--r--x11/mate-applets/files/patch-command_Makefile.in114
-rw-r--r--x11/mate-applets/files/patch-configure44
-rw-r--r--x11/mate-applets/files/patch-configure.ac13
-rw-r--r--x11/mate-applets/files/patch-cpufreq-freebsd12
-rw-r--r--x11/mate-applets/files/patch-invest-applet_invest_Makefile.in29
-rw-r--r--x11/mate-applets/files/patch-stickynotes_Makefile.in121
-rw-r--r--x11/mate-applets/files/patch-timerapplet_Makefile.in114
-rw-r--r--x11/mate-applets/files/patch-trashapplet_src_Makefile.in111
-rw-r--r--x11/mate-applets/files/stickynotes_Makefile.am23
-rw-r--r--x11/mate-applets/files/timerapplet_Makefile.am17
-rw-r--r--x11/mate-applets/files/trashapplet_src_Makefile.am22
-rw-r--r--x11/mate-applets/pkg-plist317
-rw-r--r--x11/mate-base/Makefile2
-rw-r--r--x11/mate-desktop/Makefile29
-rw-r--r--x11/mate-desktop/distinfo5
-rw-r--r--x11/mate-desktop/pkg-plist47
-rw-r--r--x11/mate-menus/Makefile15
-rw-r--r--x11/mate-menus/distinfo5
-rw-r--r--x11/mate-menus/pkg-plist15
-rw-r--r--x11/mate-panel/Makefile32
-rw-r--r--x11/mate-panel/distinfo5
-rw-r--r--x11/mate-panel/pkg-plist149
-rw-r--r--x11/mate-screensaver/Makefile26
-rw-r--r--x11/mate-screensaver/distinfo5
-rw-r--r--x11/mate-screensaver/pkg-plist16
-rw-r--r--x11/mate-session-manager/Makefile13
-rw-r--r--x11/mate-session-manager/distinfo5
-rw-r--r--x11/mate-session-manager/files/patch-configure92
-rw-r--r--x11/mate-session-manager/files/patch-mate-session_gsm-autostart-app.c10
-rw-r--r--x11/mate-session-manager/files/patch-mate-session_gsm-logout-dialog.c26
-rw-r--r--x11/mate-session-manager/files/patch-mate-session_gsm-manager.c64
-rw-r--r--x11/mate-session-manager/pkg-plist19
-rw-r--r--x11/mate-terminal/Makefile18
-rw-r--r--x11/mate-terminal/distinfo5
-rw-r--r--x11/mate-terminal/pkg-plist12
-rw-r--r--x11/mate/Makefile4
134 files changed, 2530 insertions, 2105 deletions
diff --git a/MOVED b/MOVED
index ee1819f93736..17413662ef2a 100644
--- a/MOVED
+++ b/MOVED
@@ -7672,7 +7672,6 @@ devel/libiomp5-devel|devel/llvm-devel|2015-07-24|Merged with devel/llvm-devel
devel/p5-Test-Tester|devel/p5-Test-Simple|2015-07-25|Has expired: Part of p5-Test-Simple (use that instead), and included in perl 5.22
devel/p5-Test-use-ok|devel/p5-Test-Simple|2015-07-25|Has expired: Part of devel/p5-Test-Simple (use that instead), and included in perl 5.22
sysutils/libzeitgeist|sysutils/zeitgeist|2015-07-26|Merged into zeitgeist
-math/mate-calc||2015-07-27|Not part of MATE 1.10. Instead galculator is used
x11/mate-dialogs||2015-07-27|Not part of MATE 1.10
devel/automake14||2015-07-27|Has expired: Not used in the ports tree anymore
sysutils/slurm-hpc|sysutils/slurm-wlm|2015-07-28|Upstream is standardizing on the name "slurm-wlm"
diff --git a/Mk/Uses/mate.mk b/Mk/Uses/mate.mk
index bf9b34af4345..2431c0756469 100644
--- a/Mk/Uses/mate.mk
+++ b/Mk/Uses/mate.mk
@@ -48,7 +48,7 @@ _USE_MATE_ALL= autogen intlhack intltool
# the *.pc file instead.
_USE_MATE_ALL+= caja common controlcenter desktop dialogs docutils icontheme \
libmatekbd libmateweather \
- marco menus notificationdaemon panel polkit pluma \
+ marco menus mixer notificationdaemon panel polkit pluma \
session settingsdaemon
SCROLLKEEPER_DIR= /var/db/rarian
@@ -116,6 +116,11 @@ menus_BUILD_DEPENDS= ${menus_DETECT}:x11/mate-menus
menus_LIB_DEPENDS= libmate-menu.so:x11/mate-menus
menus_RUN_DEPENDS= ${menus_DETECT}:x11/mate-menus
+mixer_DETECT= ${LOCALBASE}/libdata/pkgconfig/libmatemixer.pc
+mixer_BUILD_DEPENDS= ${mixer_DETECT}:audio/libmatemixer
+mixer_LIB_DEPENDS= libmatemixer.so:audio/libmatemixer
+mixer_RUN_DEPENDS= ${mixer_DETECT}:audio/libmatemixer
+
notificationdaemon_DETECT= ${LOCALBASE}/libexec/mate-notification-daemon
notificationdaemon_BUILD_DEPENDS= ${notificationdaemon_DETECT}:deskutils/mate-notification-daemon
notificationdaemon_RUN_DEPENDS= ${notificationdaemon_DETECT}:deskutils/mate-notification-daemon
diff --git a/archivers/engrampa/Makefile b/archivers/engrampa/Makefile
index e619c159925d..c44d50666579 100644
--- a/archivers/engrampa/Makefile
+++ b/archivers/engrampa/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= engrampa
-PORTVERSION= 1.12.0
+PORTVERSION= 1.18.2
CATEGORIES= archivers mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,24 +10,24 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= Archive manager for zip files, tar, etc
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= itstool:textproc/itstool
+LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib
RUN_DEPENDS= ${LOCALBASE}/bin/gtar:archivers/gtar \
${LOCALBASE}/bin/unzip:archivers/unzip
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \
- tar:xz
+USES= desktop-file-utils gettext gmake libtool localbase \
+ pathfix pkgconfig tar:xz
USE_MATE= caja
-USE_XORG= sm
-USE_GNOME= glib20 gtk20 intlhack
+USE_GNOME= cairo gtk30 intltool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-packagekit \
- --with-gtk=2.0
+CONFIGURE_ARGS= --disable-packagekit
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.engrampa.gschema.xml
diff --git a/archivers/engrampa/distinfo b/archivers/engrampa/distinfo
index f6eb025d2b4f..ecd90f8c35a6 100644
--- a/archivers/engrampa/distinfo
+++ b/archivers/engrampa/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/engrampa-1.12.0.tar.xz) = 4f1f8b0829000f6bb2d8a53a8da098dc5b177638c6d8e5b3fb52402a4541759c
-SIZE (mate/engrampa-1.12.0.tar.xz) = 1380144
+TIMESTAMP = 1497519601
+SHA256 (mate/engrampa-1.18.2.tar.xz) = 286dcb75540db41f0c363663c1019311d64e409b2505e058b70d1f8631fc2835
+SIZE (mate/engrampa-1.18.2.tar.xz) = 1424404
diff --git a/archivers/engrampa/pkg-plist b/archivers/engrampa/pkg-plist
index 69a0d22db919..bedb14a6b54c 100644
--- a/archivers/engrampa/pkg-plist
+++ b/archivers/engrampa/pkg-plist
@@ -4,7 +4,6 @@ libexec/engrampa-server
libexec/engrampa/isoinfo.sh
libexec/engrampa/rpm2cpio
man/man1/engrampa.1.gz
-share/MateConf/gsettings/engrampa.convert
share/appdata/engrampa.appdata.xml
share/applications/engrampa.desktop
share/caja/extensions/libcaja-engrampa.caja-extension
@@ -16,15 +15,6 @@ share/dbus-1/services/org.mate.Engrampa.service
%%DATADIR%%/icons/hicolor/24x24/actions/add-folder-to-archive.png
%%DATADIR%%/icons/hicolor/24x24/actions/extract-archive.png
%%DATADIR%%/packages.match
-%%DATADIR%%/ui/add-options.ui
-%%DATADIR%%/ui/batch-add-files.ui
-%%DATADIR%%/ui/batch-password.ui
-%%DATADIR%%/ui/delete.ui
-%%DATADIR%%/ui/new.ui
-%%DATADIR%%/ui/open-with.ui
-%%DATADIR%%/ui/password.ui
-%%DATADIR%%/ui/properties.ui
-%%DATADIR%%/ui/update.ui
share/help/C/engrampa/figures/engrampa_home.png
share/help/C/engrampa/figures/engrampa_leftarrow.png
share/help/C/engrampa/figures/engrampa_main_window.png
@@ -170,7 +160,6 @@ share/locale/as/LC_MESSAGES/engrampa.mo
share/locale/ast/LC_MESSAGES/engrampa.mo
share/locale/az/LC_MESSAGES/engrampa.mo
share/locale/be/LC_MESSAGES/engrampa.mo
-share/locale/be@latin/LC_MESSAGES/engrampa.mo
share/locale/bg/LC_MESSAGES/engrampa.mo
share/locale/bn/LC_MESSAGES/engrampa.mo
share/locale/bn_IN/LC_MESSAGES/engrampa.mo
@@ -185,17 +174,20 @@ share/locale/da/LC_MESSAGES/engrampa.mo
share/locale/de/LC_MESSAGES/engrampa.mo
share/locale/dz/LC_MESSAGES/engrampa.mo
share/locale/el/LC_MESSAGES/engrampa.mo
-share/locale/en@shaw/LC_MESSAGES/engrampa.mo
share/locale/en_AU/LC_MESSAGES/engrampa.mo
share/locale/en_CA/LC_MESSAGES/engrampa.mo
share/locale/en_GB/LC_MESSAGES/engrampa.mo
share/locale/eo/LC_MESSAGES/engrampa.mo
share/locale/es/LC_MESSAGES/engrampa.mo
+share/locale/es_CO/LC_MESSAGES/engrampa.mo
+share/locale/es_MX/LC_MESSAGES/engrampa.mo
share/locale/et/LC_MESSAGES/engrampa.mo
share/locale/eu/LC_MESSAGES/engrampa.mo
share/locale/fa/LC_MESSAGES/engrampa.mo
share/locale/fi/LC_MESSAGES/engrampa.mo
share/locale/fr/LC_MESSAGES/engrampa.mo
+share/locale/fr_CA/LC_MESSAGES/engrampa.mo
+share/locale/frp/LC_MESSAGES/engrampa.mo
share/locale/fur/LC_MESSAGES/engrampa.mo
share/locale/fy/LC_MESSAGES/engrampa.mo
share/locale/ga/LC_MESSAGES/engrampa.mo
@@ -210,11 +202,13 @@ share/locale/id/LC_MESSAGES/engrampa.mo
share/locale/is/LC_MESSAGES/engrampa.mo
share/locale/it/LC_MESSAGES/engrampa.mo
share/locale/ja/LC_MESSAGES/engrampa.mo
+share/locale/jv/LC_MESSAGES/engrampa.mo
share/locale/ka/LC_MESSAGES/engrampa.mo
share/locale/kk/LC_MESSAGES/engrampa.mo
share/locale/kn/LC_MESSAGES/engrampa.mo
share/locale/ko/LC_MESSAGES/engrampa.mo
share/locale/ku/LC_MESSAGES/engrampa.mo
+share/locale/ku_IQ/LC_MESSAGES/engrampa.mo
share/locale/ky/LC_MESSAGES/engrampa.mo
share/locale/lt/LC_MESSAGES/engrampa.mo
share/locale/lv/LC_MESSAGES/engrampa.mo
@@ -234,6 +228,7 @@ share/locale/oc/LC_MESSAGES/engrampa.mo
share/locale/or/LC_MESSAGES/engrampa.mo
share/locale/pa/LC_MESSAGES/engrampa.mo
share/locale/pl/LC_MESSAGES/engrampa.mo
+share/locale/pms/LC_MESSAGES/engrampa.mo
share/locale/ps/LC_MESSAGES/engrampa.mo
share/locale/pt/LC_MESSAGES/engrampa.mo
share/locale/pt_BR/LC_MESSAGES/engrampa.mo
@@ -245,7 +240,6 @@ share/locale/sk/LC_MESSAGES/engrampa.mo
share/locale/sl/LC_MESSAGES/engrampa.mo
share/locale/sq/LC_MESSAGES/engrampa.mo
share/locale/sr/LC_MESSAGES/engrampa.mo
-share/locale/sr@ije/LC_MESSAGES/engrampa.mo
share/locale/sr@latin/LC_MESSAGES/engrampa.mo
share/locale/sv/LC_MESSAGES/engrampa.mo
share/locale/ta/LC_MESSAGES/engrampa.mo
@@ -257,6 +251,7 @@ share/locale/ug/LC_MESSAGES/engrampa.mo
share/locale/uk/LC_MESSAGES/engrampa.mo
share/locale/ur/LC_MESSAGES/engrampa.mo
share/locale/ur_PK/LC_MESSAGES/engrampa.mo
+share/locale/uz/LC_MESSAGES/engrampa.mo
share/locale/vi/LC_MESSAGES/engrampa.mo
share/locale/xh/LC_MESSAGES/engrampa.mo
share/locale/zh_CN/LC_MESSAGES/engrampa.mo
diff --git a/audio/libmatemixer/Makefile b/audio/libmatemixer/Makefile
index 8d1a5e7e101d..83396c6929e1 100644
--- a/audio/libmatemixer/Makefile
+++ b/audio/libmatemixer/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libmatemixer
-PORTVERSION= 1.12.1
+PORTVERSION= 1.18.0
CATEGORIES= audio mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
diff --git a/audio/libmatemixer/distinfo b/audio/libmatemixer/distinfo
index 0ba291d8d5cf..01545aafeb1b 100644
--- a/audio/libmatemixer/distinfo
+++ b/audio/libmatemixer/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/libmatemixer-1.12.1.tar.xz) = decddd15f3cfb7410428922a30e210d89ac9b87b4433919ae152f14a61ce0ff0
-SIZE (mate/libmatemixer-1.12.1.tar.xz) = 382444
+TIMESTAMP = 1491618757
+SHA256 (mate/libmatemixer-1.18.0.tar.xz) = b99209e310ba614c5b0bd6a97545ba974bc34a74cd29fd50189a5365a9ed7e27
+SIZE (mate/libmatemixer-1.18.0.tar.xz) = 418772
diff --git a/audio/libmatemixer/pkg-plist b/audio/libmatemixer/pkg-plist
index 5dee9d65d4d3..f79cdeda59f1 100644
--- a/audio/libmatemixer/pkg-plist
+++ b/audio/libmatemixer/pkg-plist
@@ -40,7 +40,6 @@ share/gtk-doc/html/libmatemixer/api-index-full.html
share/gtk-doc/html/libmatemixer/ch01.html
share/gtk-doc/html/libmatemixer/home.png
share/gtk-doc/html/libmatemixer/index.html
-share/gtk-doc/html/libmatemixer/index.sgml
share/gtk-doc/html/libmatemixer/left-insensitive.png
share/gtk-doc/html/libmatemixer/left.png
share/gtk-doc/html/libmatemixer/libmatemixer-MateMixer.html
@@ -53,27 +52,43 @@ share/gtk-doc/html/libmatemixer/up.png
share/locale/am/LC_MESSAGES/libmatemixer.mo
share/locale/ar/LC_MESSAGES/libmatemixer.mo
share/locale/be/LC_MESSAGES/libmatemixer.mo
+share/locale/bg/LC_MESSAGES/libmatemixer.mo
+share/locale/bs/LC_MESSAGES/libmatemixer.mo
+share/locale/ca/LC_MESSAGES/libmatemixer.mo
+share/locale/ca@valencia/LC_MESSAGES/libmatemixer.mo
share/locale/cs/LC_MESSAGES/libmatemixer.mo
+share/locale/cy/LC_MESSAGES/libmatemixer.mo
share/locale/da/LC_MESSAGES/libmatemixer.mo
share/locale/de/LC_MESSAGES/libmatemixer.mo
share/locale/el/LC_MESSAGES/libmatemixer.mo
share/locale/en_AU/LC_MESSAGES/libmatemixer.mo
share/locale/en_GB/LC_MESSAGES/libmatemixer.mo
share/locale/es/LC_MESSAGES/libmatemixer.mo
+share/locale/es_CO/LC_MESSAGES/libmatemixer.mo
+share/locale/es_MX/LC_MESSAGES/libmatemixer.mo
share/locale/et/LC_MESSAGES/libmatemixer.mo
share/locale/eu/LC_MESSAGES/libmatemixer.mo
+share/locale/fa/LC_MESSAGES/libmatemixer.mo
share/locale/fr/LC_MESSAGES/libmatemixer.mo
+share/locale/fr_CA/LC_MESSAGES/libmatemixer.mo
+share/locale/frp/LC_MESSAGES/libmatemixer.mo
share/locale/hr/LC_MESSAGES/libmatemixer.mo
share/locale/hu/LC_MESSAGES/libmatemixer.mo
share/locale/hy/LC_MESSAGES/libmatemixer.mo
share/locale/id/LC_MESSAGES/libmatemixer.mo
+share/locale/is/LC_MESSAGES/libmatemixer.mo
share/locale/it/LC_MESSAGES/libmatemixer.mo
share/locale/ja/LC_MESSAGES/libmatemixer.mo
+share/locale/jv/LC_MESSAGES/libmatemixer.mo
share/locale/ko/LC_MESSAGES/libmatemixer.mo
+share/locale/ku_IQ/LC_MESSAGES/libmatemixer.mo
share/locale/lt/LC_MESSAGES/libmatemixer.mo
share/locale/ms/LC_MESSAGES/libmatemixer.mo
+share/locale/nb/LC_MESSAGES/libmatemixer.mo
share/locale/nl/LC_MESSAGES/libmatemixer.mo
+share/locale/oc/LC_MESSAGES/libmatemixer.mo
share/locale/pl/LC_MESSAGES/libmatemixer.mo
+share/locale/pms/LC_MESSAGES/libmatemixer.mo
share/locale/pt/LC_MESSAGES/libmatemixer.mo
share/locale/pt_BR/LC_MESSAGES/libmatemixer.mo
share/locale/ro/LC_MESSAGES/libmatemixer.mo
@@ -84,5 +99,6 @@ share/locale/sr/LC_MESSAGES/libmatemixer.mo
share/locale/sv/LC_MESSAGES/libmatemixer.mo
share/locale/tr/LC_MESSAGES/libmatemixer.mo
share/locale/uk/LC_MESSAGES/libmatemixer.mo
+share/locale/uz/LC_MESSAGES/libmatemixer.mo
share/locale/zh_CN/LC_MESSAGES/libmatemixer.mo
share/locale/zh_TW/LC_MESSAGES/libmatemixer.mo
diff --git a/audio/mate-media/Makefile b/audio/mate-media/Makefile
index a653bbc42643..877747752c50 100644
--- a/audio/mate-media/Makefile
+++ b/audio/mate-media/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-media
-PORTVERSION= 1.12.1
+PORTVERSION= 1.18.0
CATEGORIES= audio mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -12,21 +12,22 @@ COMMENT= Multimedia applications for the MATE desktop
BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \
- libmatemixer.so:audio/libmatemixer \
- libunique-1.0.so:x11-toolkits/unique
+ libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
+ libstartup-notification-1.so:x11/startup-notification \
+ libunique-3.0.so:x11-toolkits/libunique3
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
-USE_MATE= desktop panel
-USE_GNOME= glib20 gtk20 intlhack libxml2
+USES= gettext gmake libtool localbase pathfix \
+ pkgconfig tar:xz
+USE_MATE= desktop mixer panel
+USE_GNOME= cairo glib20 gtk30 intlhack libxml2
+USE_XORG= x11
USE_LDCONFIG= yes
-USE_GSTREAMER= good
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gtk=2.0
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
.include <bsd.port.mk>
diff --git a/audio/mate-media/distinfo b/audio/mate-media/distinfo
index 54c6ceb451e6..32f8fb49a73f 100644
--- a/audio/mate-media/distinfo
+++ b/audio/mate-media/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-media-1.12.1.tar.xz) = c6d19a5d88e031156bcc0bc156c3eeaf4becb9953bb75b6f88e419154f393efc
-SIZE (mate/mate-media-1.12.1.tar.xz) = 507976
+TIMESTAMP = 1491777405
+SHA256 (mate/mate-media-1.18.0.tar.xz) = 94d26b96199a3b30e2050596d17e0125f86edf9ef009d4eb318308896f54296c
+SIZE (mate/mate-media-1.18.0.tar.xz) = 492648
diff --git a/audio/mate-media/pkg-plist b/audio/mate-media/pkg-plist
index 958ee63c7613..3e812d88e69a 100644
--- a/audio/mate-media/pkg-plist
+++ b/audio/mate-media/pkg-plist
@@ -11,7 +11,6 @@ share/locale/as/LC_MESSAGES/mate-media.mo
share/locale/ast/LC_MESSAGES/mate-media.mo
share/locale/az/LC_MESSAGES/mate-media.mo
share/locale/be/LC_MESSAGES/mate-media.mo
-share/locale/be@latin/LC_MESSAGES/mate-media.mo
share/locale/bg/LC_MESSAGES/mate-media.mo
share/locale/bn/LC_MESSAGES/mate-media.mo
share/locale/bn_IN/LC_MESSAGES/mate-media.mo
@@ -26,16 +25,21 @@ share/locale/da/LC_MESSAGES/mate-media.mo
share/locale/de/LC_MESSAGES/mate-media.mo
share/locale/dz/LC_MESSAGES/mate-media.mo
share/locale/el/LC_MESSAGES/mate-media.mo
-share/locale/en@shaw/LC_MESSAGES/mate-media.mo
share/locale/en_AU/LC_MESSAGES/mate-media.mo
share/locale/en_CA/LC_MESSAGES/mate-media.mo
share/locale/en_GB/LC_MESSAGES/mate-media.mo
share/locale/es/LC_MESSAGES/mate-media.mo
+share/locale/es_AR/LC_MESSAGES/mate-media.mo
+share/locale/es_CO/LC_MESSAGES/mate-media.mo
+share/locale/es_MX/LC_MESSAGES/mate-media.mo
+share/locale/es_PR/LC_MESSAGES/mate-media.mo
share/locale/et/LC_MESSAGES/mate-media.mo
share/locale/eu/LC_MESSAGES/mate-media.mo
share/locale/fa/LC_MESSAGES/mate-media.mo
share/locale/fi/LC_MESSAGES/mate-media.mo
share/locale/fr/LC_MESSAGES/mate-media.mo
+share/locale/fr_CA/LC_MESSAGES/mate-media.mo
+share/locale/frp/LC_MESSAGES/mate-media.mo
share/locale/ga/LC_MESSAGES/mate-media.mo
share/locale/gl/LC_MESSAGES/mate-media.mo
share/locale/gu/LC_MESSAGES/mate-media.mo
@@ -43,14 +47,18 @@ share/locale/he/LC_MESSAGES/mate-media.mo
share/locale/hi/LC_MESSAGES/mate-media.mo
share/locale/hr/LC_MESSAGES/mate-media.mo
share/locale/hu/LC_MESSAGES/mate-media.mo
+share/locale/hy/LC_MESSAGES/mate-media.mo
share/locale/id/LC_MESSAGES/mate-media.mo
+share/locale/is/LC_MESSAGES/mate-media.mo
share/locale/it/LC_MESSAGES/mate-media.mo
share/locale/ja/LC_MESSAGES/mate-media.mo
+share/locale/jv/LC_MESSAGES/mate-media.mo
share/locale/ka/LC_MESSAGES/mate-media.mo
share/locale/kk/LC_MESSAGES/mate-media.mo
share/locale/kn/LC_MESSAGES/mate-media.mo
share/locale/ko/LC_MESSAGES/mate-media.mo
share/locale/ku/LC_MESSAGES/mate-media.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-media.mo
share/locale/ky/LC_MESSAGES/mate-media.mo
share/locale/lt/LC_MESSAGES/mate-media.mo
share/locale/lv/LC_MESSAGES/mate-media.mo
@@ -70,11 +78,13 @@ share/locale/oc/LC_MESSAGES/mate-media.mo
share/locale/or/LC_MESSAGES/mate-media.mo
share/locale/pa/LC_MESSAGES/mate-media.mo
share/locale/pl/LC_MESSAGES/mate-media.mo
+share/locale/pms/LC_MESSAGES/mate-media.mo
share/locale/pt/LC_MESSAGES/mate-media.mo
share/locale/pt_BR/LC_MESSAGES/mate-media.mo
share/locale/ro/LC_MESSAGES/mate-media.mo
share/locale/ru/LC_MESSAGES/mate-media.mo
share/locale/rw/LC_MESSAGES/mate-media.mo
+share/locale/sc/LC_MESSAGES/mate-media.mo
share/locale/si/LC_MESSAGES/mate-media.mo
share/locale/sk/LC_MESSAGES/mate-media.mo
share/locale/sl/LC_MESSAGES/mate-media.mo
@@ -90,6 +100,7 @@ share/locale/tr/LC_MESSAGES/mate-media.mo
share/locale/ug/LC_MESSAGES/mate-media.mo
share/locale/uk/LC_MESSAGES/mate-media.mo
share/locale/ur/LC_MESSAGES/mate-media.mo
+share/locale/uz/LC_MESSAGES/mate-media.mo
share/locale/vi/LC_MESSAGES/mate-media.mo
share/locale/wa/LC_MESSAGES/mate-media.mo
share/locale/xh/LC_MESSAGES/mate-media.mo
diff --git a/deskutils/caja-extensions/Makefile b/deskutils/caja-extensions/Makefile
index 6744e847582c..ba59618c4c06 100644
--- a/deskutils/caja-extensions/Makefile
+++ b/deskutils/caja-extensions/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= caja-extensions
-PORTVERSION= 1.12.0
+PORTVERSION= 1.18.1
CATEGORIES= deskutils mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,18 +10,22 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= Set of extensions for Caja
-LIB_DEPENDS= libgupnp-1.0.so:net/gupnp
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+LIB_DEPENDS= libgupnp-1.0.so:net/gupnp \
+ libstartup-notification-1.so:x11/startup-notification \
+ libdbus-1.so:devel/dbus \
+ libdbus-glib-1.so:devel/dbus-glib
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
+USES= gettext gmake libtool localbase pathfix \
+ pkgconfig tar:xz
USE_MATE= caja desktop
-USE_GNOME= glib20 gtk20 intlhack
+USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gtk=2.0
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.Caja.Sendto.gschema.xml \
diff --git a/deskutils/caja-extensions/distinfo b/deskutils/caja-extensions/distinfo
index 5cfb8969127d..02161d411ba7 100644
--- a/deskutils/caja-extensions/distinfo
+++ b/deskutils/caja-extensions/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/caja-extensions-1.12.0.tar.xz) = efb76a8bcb9dd0d1fb47682e4cb018645e243d73ba9a6ebc3d06332e02c7fb36
-SIZE (mate/caja-extensions-1.12.0.tar.xz) = 370600
+TIMESTAMP = 1497534122
+SHA256 (mate/caja-extensions-1.18.1.tar.xz) = bcb2f355c883bdca06a28028ca9a832d84e693257a60ea24304abbf98fa2ea41
+SIZE (mate/caja-extensions-1.18.1.tar.xz) = 409948
diff --git a/deskutils/caja-extensions/pkg-plist b/deskutils/caja-extensions/pkg-plist
index c2aa14a0e94b..73a843df0852 100644
--- a/deskutils/caja-extensions/pkg-plist
+++ b/deskutils/caja-extensions/pkg-plist
@@ -12,10 +12,9 @@ lib/caja/extensions-2.0/libcaja-open-terminal.so
lib/caja/extensions-2.0/libcaja-sendto.so
lib/caja/extensions-2.0/libcaja-share.so
lib/caja/extensions-2.0/libcaja-wallpaper.so
+lib/caja/extensions-2.0/libcaja-xattr-tags.so
libdata/pkgconfig/caja-sendto.pc
man/man1/caja-sendto.1.gz
-share/MateConf/gsettings/caja-open-terminal.convert
-share/MateConf/gsettings/caja-sendto-convert
%%DATADIR%%/caja-image-resize.ui
%%DATADIR%%/caja-image-rotate.ui
%%DATADIR%%/caja-sendto.ui
@@ -26,6 +25,7 @@ share/caja/extensions/libcaja-open-terminal.caja-extension
share/caja/extensions/libcaja-sendto.caja-extension
share/caja/extensions/libcaja-share.caja-extension
share/caja/extensions/libcaja-wallpaper.caja-extension
+share/caja/extensions/libcaja-xattr-tags.caja-extension
share/gtk-doc/html/caja-sendto/annotation-glossary.html
share/gtk-doc/html/caja-sendto/api-index-full.html
share/gtk-doc/html/caja-sendto/caja-sendto-caja-sendto-plugin.html
@@ -33,7 +33,6 @@ share/gtk-doc/html/caja-sendto/caja-sendto.devhelp2
share/gtk-doc/html/caja-sendto/ch01.html
share/gtk-doc/html/caja-sendto/home.png
share/gtk-doc/html/caja-sendto/index.html
-share/gtk-doc/html/caja-sendto/index.sgml
share/gtk-doc/html/caja-sendto/left-insensitive.png
share/gtk-doc/html/caja-sendto/left.png
share/gtk-doc/html/caja-sendto/right-insensitive.png
@@ -45,33 +44,46 @@ share/locale/am/LC_MESSAGES/caja-extensions.mo
share/locale/ar/LC_MESSAGES/caja-extensions.mo
share/locale/be/LC_MESSAGES/caja-extensions.mo
share/locale/bg/LC_MESSAGES/caja-extensions.mo
+share/locale/br/LC_MESSAGES/caja-extensions.mo
+share/locale/bs/LC_MESSAGES/caja-extensions.mo
+share/locale/ca/LC_MESSAGES/caja-extensions.mo
+share/locale/ca@valencia/LC_MESSAGES/caja-extensions.mo
share/locale/cmn/LC_MESSAGES/caja-extensions.mo
share/locale/cs/LC_MESSAGES/caja-extensions.mo
+share/locale/cy/LC_MESSAGES/caja-extensions.mo
share/locale/da/LC_MESSAGES/caja-extensions.mo
share/locale/de/LC_MESSAGES/caja-extensions.mo
share/locale/el/LC_MESSAGES/caja-extensions.mo
share/locale/en_AU/LC_MESSAGES/caja-extensions.mo
share/locale/en_GB/LC_MESSAGES/caja-extensions.mo
share/locale/es/LC_MESSAGES/caja-extensions.mo
+share/locale/es_CO/LC_MESSAGES/caja-extensions.mo
share/locale/et/LC_MESSAGES/caja-extensions.mo
share/locale/eu/LC_MESSAGES/caja-extensions.mo
share/locale/fi/LC_MESSAGES/caja-extensions.mo
share/locale/fr/LC_MESSAGES/caja-extensions.mo
+share/locale/fr_CA/LC_MESSAGES/caja-extensions.mo
+share/locale/frp/LC_MESSAGES/caja-extensions.mo
share/locale/gl/LC_MESSAGES/caja-extensions.mo
+share/locale/he/LC_MESSAGES/caja-extensions.mo
share/locale/hi/LC_MESSAGES/caja-extensions.mo
share/locale/hr/LC_MESSAGES/caja-extensions.mo
share/locale/hu/LC_MESSAGES/caja-extensions.mo
share/locale/hy/LC_MESSAGES/caja-extensions.mo
share/locale/id/LC_MESSAGES/caja-extensions.mo
+share/locale/is/LC_MESSAGES/caja-extensions.mo
share/locale/it/LC_MESSAGES/caja-extensions.mo
share/locale/ja/LC_MESSAGES/caja-extensions.mo
share/locale/kk/LC_MESSAGES/caja-extensions.mo
share/locale/ko/LC_MESSAGES/caja-extensions.mo
+share/locale/ku_IQ/LC_MESSAGES/caja-extensions.mo
share/locale/lt/LC_MESSAGES/caja-extensions.mo
share/locale/mk/LC_MESSAGES/caja-extensions.mo
share/locale/mr/LC_MESSAGES/caja-extensions.mo
share/locale/ms/LC_MESSAGES/caja-extensions.mo
+share/locale/nb/LC_MESSAGES/caja-extensions.mo
share/locale/nl/LC_MESSAGES/caja-extensions.mo
+share/locale/oc/LC_MESSAGES/caja-extensions.mo
share/locale/pl/LC_MESSAGES/caja-extensions.mo
share/locale/pt/LC_MESSAGES/caja-extensions.mo
share/locale/pt_BR/LC_MESSAGES/caja-extensions.mo
@@ -82,8 +94,11 @@ share/locale/sl/LC_MESSAGES/caja-extensions.mo
share/locale/sq/LC_MESSAGES/caja-extensions.mo
share/locale/sr/LC_MESSAGES/caja-extensions.mo
share/locale/sv/LC_MESSAGES/caja-extensions.mo
+share/locale/ta/LC_MESSAGES/caja-extensions.mo
+share/locale/th/LC_MESSAGES/caja-extensions.mo
share/locale/tr/LC_MESSAGES/caja-extensions.mo
share/locale/uk/LC_MESSAGES/caja-extensions.mo
+share/locale/uz/LC_MESSAGES/caja-extensions.mo
share/locale/vi/LC_MESSAGES/caja-extensions.mo
share/locale/zh_CN/LC_MESSAGES/caja-extensions.mo
share/locale/zh_TW/LC_MESSAGES/caja-extensions.mo
diff --git a/deskutils/mate-notification-daemon/Makefile b/deskutils/mate-notification-daemon/Makefile
index 8fcdfb38d1e6..1a26447fba1b 100644
--- a/deskutils/mate-notification-daemon/Makefile
+++ b/deskutils/mate-notification-daemon/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-notification-daemon
-PORTVERSION= 1.12.1
+PORTVERSION= 1.18.0
CATEGORIES= deskutils mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -15,21 +15,20 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
- libcanberra-gtk.so:audio/libcanberra \
+ libcanberra.so:audio/libcanberra \
+ libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libnotify.so:devel/libnotify
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
+USES= gettext gmake libtool localbase pathfix \
+ pkgconfig tar:xz
USE_XORG= x11
-USE_GNOME= glib20 gtk20 librsvg2 intlhack libwnck
+USE_GNOME= cairo glib20 gtk30 librsvg2 libwnck3 intlhack
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-dbus-services=${PREFIX}/share/dbus-1/services \
- --disable-static \
- --with-gtk=2.0
+ --disable-static
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.NotificationDaemon.gschema.xml
diff --git a/deskutils/mate-notification-daemon/distinfo b/deskutils/mate-notification-daemon/distinfo
index 17d7ac26fcfe..9ee51f7791ec 100644
--- a/deskutils/mate-notification-daemon/distinfo
+++ b/deskutils/mate-notification-daemon/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-notification-daemon-1.12.1.tar.xz) = 856bad2bb90e2b7d1124c0ae197c07a321b3cc2767897b3e6b78e59a3096a7dd
-SIZE (mate/mate-notification-daemon-1.12.1.tar.xz) = 304752
+TIMESTAMP = 1491620341
+SHA256 (mate/mate-notification-daemon-1.18.0.tar.xz) = 4c1f08fa348cdba0b7786a4207b0b4a40d06deb878f3d71ca1c7f71b53da1066
+SIZE (mate/mate-notification-daemon-1.18.0.tar.xz) = 340828
diff --git a/deskutils/mate-notification-daemon/pkg-plist b/deskutils/mate-notification-daemon/pkg-plist
index 1393344fa3ea..012b408f7c00 100644
--- a/deskutils/mate-notification-daemon/pkg-plist
+++ b/deskutils/mate-notification-daemon/pkg-plist
@@ -5,7 +5,6 @@ lib/mate-notification-daemon/engines/libslider.so
lib/mate-notification-daemon/engines/libstandard.so
libexec/mate-notification-daemon
man/man1/mate-notification-properties.1.gz
-share/MateConf/gsettings/mate-notification-daemon.convert
share/applications/mate-notification-properties.desktop
share/dbus-1/services/org.freedesktop.mate.Notifications.service
share/icons/hicolor/16x16/apps/mate-notification-properties.png
@@ -20,9 +19,12 @@ share/locale/ar/LC_MESSAGES/mate-notification-daemon.mo
share/locale/ast/LC_MESSAGES/mate-notification-daemon.mo
share/locale/be/LC_MESSAGES/mate-notification-daemon.mo
share/locale/bg/LC_MESSAGES/mate-notification-daemon.mo
+share/locale/bs/LC_MESSAGES/mate-notification-daemon.mo
share/locale/ca/LC_MESSAGES/mate-notification-daemon.mo
+share/locale/ca@valencia/LC_MESSAGES/mate-notification-daemon.mo
share/locale/cmn/LC_MESSAGES/mate-notification-daemon.mo
share/locale/cs/LC_MESSAGES/mate-notification-daemon.mo
+share/locale/cy/LC_MESSAGES/mate-notification-daemon.mo
share/locale/da/LC_MESSAGES/mate-notification-daemon.mo
share/locale/de/LC_MESSAGES/mate-notification-daemon.mo
share/locale/el/LC_MESSAGES/mate-notification-daemon.mo
@@ -31,21 +33,28 @@ share/locale/en_GB/LC_MESSAGES/mate-notification-daemon.mo
share/locale/eo/LC_MESSAGES/mate-notification-daemon.mo
share/locale/es/LC_MESSAGES/mate-notification-daemon.mo
share/locale/es_CL/LC_MESSAGES/mate-notification-daemon.mo
+share/locale/es_CO/LC_MESSAGES/mate-notification-daemon.mo
share/locale/es_MX/LC_MESSAGES/mate-notification-daemon.mo
share/locale/et/LC_MESSAGES/mate-notification-daemon.mo
share/locale/eu/LC_MESSAGES/mate-notification-daemon.mo
+share/locale/fi/LC_MESSAGES/mate-notification-daemon.mo
share/locale/fr/LC_MESSAGES/mate-notification-daemon.mo
+share/locale/fr_CA/LC_MESSAGES/mate-notification-daemon.mo
+share/locale/frp/LC_MESSAGES/mate-notification-daemon.mo
share/locale/gl/LC_MESSAGES/mate-notification-daemon.mo
share/locale/he/LC_MESSAGES/mate-notification-daemon.mo
share/locale/hi/LC_MESSAGES/mate-notification-daemon.mo
share/locale/hr/LC_MESSAGES/mate-notification-daemon.mo
share/locale/hu/LC_MESSAGES/mate-notification-daemon.mo
+share/locale/hy/LC_MESSAGES/mate-notification-daemon.mo
share/locale/id/LC_MESSAGES/mate-notification-daemon.mo
share/locale/is/LC_MESSAGES/mate-notification-daemon.mo
share/locale/it/LC_MESSAGES/mate-notification-daemon.mo
share/locale/ja/LC_MESSAGES/mate-notification-daemon.mo
share/locale/kk/LC_MESSAGES/mate-notification-daemon.mo
+share/locale/kn/LC_MESSAGES/mate-notification-daemon.mo
share/locale/ko/LC_MESSAGES/mate-notification-daemon.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-notification-daemon.mo
share/locale/ky/LC_MESSAGES/mate-notification-daemon.mo
share/locale/lt/LC_MESSAGES/mate-notification-daemon.mo
share/locale/lv/LC_MESSAGES/mate-notification-daemon.mo
@@ -68,9 +77,13 @@ share/locale/sq/LC_MESSAGES/mate-notification-daemon.mo
share/locale/sr/LC_MESSAGES/mate-notification-daemon.mo
share/locale/sv/LC_MESSAGES/mate-notification-daemon.mo
share/locale/te/LC_MESSAGES/mate-notification-daemon.mo
+share/locale/th/LC_MESSAGES/mate-notification-daemon.mo
share/locale/tr/LC_MESSAGES/mate-notification-daemon.mo
share/locale/uk/LC_MESSAGES/mate-notification-daemon.mo
share/locale/ur/LC_MESSAGES/mate-notification-daemon.mo
+share/locale/uz/LC_MESSAGES/mate-notification-daemon.mo
+share/locale/vi/LC_MESSAGES/mate-notification-daemon.mo
share/locale/zh_CN/LC_MESSAGES/mate-notification-daemon.mo
+share/locale/zh_HK/LC_MESSAGES/mate-notification-daemon.mo
share/locale/zh_TW/LC_MESSAGES/mate-notification-daemon.mo
%%DATADIR%%/mate-notification-properties.ui
diff --git a/deskutils/mate-utils/Makefile b/deskutils/mate-utils/Makefile
index bdad8eec1a59..b8ad7d004f79 100644
--- a/deskutils/mate-utils/Makefile
+++ b/deskutils/mate-utils/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-utils
-PORTVERSION= 1.12.0
+PORTVERSION= 1.18.2
CATEGORIES= deskutils mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,25 +10,27 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= MATE support utilities
+LICENSE= GPLv2 GFDL LGPL21
+LICENSE_COMB= multi
+LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
+LICENSE_FILE_GFDL= ${WRKSRC}/COPYING.docs
+LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.libs
+
BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libgtop-2.0.so:devel/libgtop \
- libcanberra-gtk.so:audio/libcanberra
+ libcanberra-gtk.so:audio/libcanberra \
+ libcanberra-gtk3.so:audio/libcanberra-gtk3
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
+USES= gettext gmake libtool localbase pathfix \
+ pkgconfig tar:xz
USE_MATE= panel
-USE_XORG= x11 xext
-USE_GNOME= gtk20 intlhack
+USE_XORG= ice sm x11 xext
+USE_GNOME= cairo gnomeprefix gtk30 intltool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-maintainer-flags=no \
- --disable-gtk-doc \
- --with-gtk=2.0 \
- --with-html-dir=${PREFIX}/share/doc
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.dictionary.gschema.xml \
diff --git a/deskutils/mate-utils/distinfo b/deskutils/mate-utils/distinfo
index d9cfa46b3f88..d4bc789f2a6d 100644
--- a/deskutils/mate-utils/distinfo
+++ b/deskutils/mate-utils/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-utils-1.12.0.tar.xz) = 60da98d984065d5001ba23f7fb02fb2acd1c1ec864e4a2730274f8791a96d69f
-SIZE (mate/mate-utils-1.12.0.tar.xz) = 6482900
+TIMESTAMP = 1494458996
+SHA256 (mate/mate-utils-1.18.2.tar.xz) = bbd80f772d9f4dd379794105fd7a4f5452c71ff3e634a06f0af245875b492373
+SIZE (mate/mate-utils-1.18.2.tar.xz) = 6442576
diff --git a/deskutils/mate-utils/pkg-plist b/deskutils/mate-utils/pkg-plist
index 58ea755a4b9b..a18774a5fd95 100644
--- a/deskutils/mate-utils/pkg-plist
+++ b/deskutils/mate-utils/pkg-plist
@@ -29,11 +29,6 @@ man/man1/mate-panel-screenshot.1.gz
man/man1/mate-screenshot.1.gz
man/man1/mate-search-tool.1.gz
man/man1/mate-system-log.1.gz
-share/MateConf/gsettings/mate-dictionary.convert
-share/MateConf/gsettings/mate-disk-usage-analyzer.convert
-share/MateConf/gsettings/mate-screenshot.convert
-share/MateConf/gsettings/mate-search-tool.convert
-share/MateConf/gsettings/mate-system-log.convert
share/appdata/mate-dictionary.appdata.xml
share/appdata/mate-disk-usage-analyzer.appdata.xml
share/appdata/mate-screenshot.appdata.xml
@@ -62,12 +57,8 @@ share/doc/mate-dict/gdict.html
share/doc/mate-dict/gdictui.html
share/doc/mate-dict/home.png
share/doc/mate-dict/index.html
-share/doc/mate-dict/index.sgml
share/doc/mate-dict/introduction.html
share/doc/mate-dict/ix01.html
-share/doc/mate-dict/ix02.html
-share/doc/mate-dict/ix03.html
-share/doc/mate-dict/ix04.html
share/doc/mate-dict/left-insensitive.png
share/doc/mate-dict/left.png
share/doc/mate-dict/mate-dict-gdict-utils.html
@@ -546,7 +537,6 @@ share/locale/as/LC_MESSAGES/mate-utils.mo
share/locale/ast/LC_MESSAGES/mate-utils.mo
share/locale/az/LC_MESSAGES/mate-utils.mo
share/locale/be/LC_MESSAGES/mate-utils.mo
-share/locale/be@latin/LC_MESSAGES/mate-utils.mo
share/locale/bg/LC_MESSAGES/mate-utils.mo
share/locale/bn/LC_MESSAGES/mate-utils.mo
share/locale/bn_IN/LC_MESSAGES/mate-utils.mo
@@ -562,17 +552,19 @@ share/locale/da/LC_MESSAGES/mate-utils.mo
share/locale/de/LC_MESSAGES/mate-utils.mo
share/locale/dz/LC_MESSAGES/mate-utils.mo
share/locale/el/LC_MESSAGES/mate-utils.mo
-share/locale/en@shaw/LC_MESSAGES/mate-utils.mo
share/locale/en_AU/LC_MESSAGES/mate-utils.mo
share/locale/en_CA/LC_MESSAGES/mate-utils.mo
share/locale/en_GB/LC_MESSAGES/mate-utils.mo
share/locale/eo/LC_MESSAGES/mate-utils.mo
share/locale/es/LC_MESSAGES/mate-utils.mo
+share/locale/es_CO/LC_MESSAGES/mate-utils.mo
+share/locale/es_MX/LC_MESSAGES/mate-utils.mo
share/locale/et/LC_MESSAGES/mate-utils.mo
share/locale/eu/LC_MESSAGES/mate-utils.mo
share/locale/fa/LC_MESSAGES/mate-utils.mo
share/locale/fi/LC_MESSAGES/mate-utils.mo
share/locale/fr/LC_MESSAGES/mate-utils.mo
+share/locale/frp/LC_MESSAGES/mate-utils.mo
share/locale/ga/LC_MESSAGES/mate-utils.mo
share/locale/gl/LC_MESSAGES/mate-utils.mo
share/locale/gu/LC_MESSAGES/mate-utils.mo
@@ -580,14 +572,18 @@ share/locale/he/LC_MESSAGES/mate-utils.mo
share/locale/hi/LC_MESSAGES/mate-utils.mo
share/locale/hr/LC_MESSAGES/mate-utils.mo
share/locale/hu/LC_MESSAGES/mate-utils.mo
+share/locale/hy/LC_MESSAGES/mate-utils.mo
share/locale/id/LC_MESSAGES/mate-utils.mo
+share/locale/is/LC_MESSAGES/mate-utils.mo
share/locale/it/LC_MESSAGES/mate-utils.mo
share/locale/ja/LC_MESSAGES/mate-utils.mo
+share/locale/jv/LC_MESSAGES/mate-utils.mo
share/locale/ka/LC_MESSAGES/mate-utils.mo
share/locale/kk/LC_MESSAGES/mate-utils.mo
share/locale/kn/LC_MESSAGES/mate-utils.mo
share/locale/ko/LC_MESSAGES/mate-utils.mo
share/locale/ku/LC_MESSAGES/mate-utils.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-utils.mo
share/locale/ky/LC_MESSAGES/mate-utils.mo
share/locale/lt/LC_MESSAGES/mate-utils.mo
share/locale/lv/LC_MESSAGES/mate-utils.mo
@@ -607,6 +603,7 @@ share/locale/oc/LC_MESSAGES/mate-utils.mo
share/locale/or/LC_MESSAGES/mate-utils.mo
share/locale/pa/LC_MESSAGES/mate-utils.mo
share/locale/pl/LC_MESSAGES/mate-utils.mo
+share/locale/pms/LC_MESSAGES/mate-utils.mo
share/locale/ps/LC_MESSAGES/mate-utils.mo
share/locale/pt/LC_MESSAGES/mate-utils.mo
share/locale/pt_BR/LC_MESSAGES/mate-utils.mo
@@ -627,6 +624,7 @@ share/locale/tr/LC_MESSAGES/mate-utils.mo
share/locale/ug/LC_MESSAGES/mate-utils.mo
share/locale/uk/LC_MESSAGES/mate-utils.mo
share/locale/ur/LC_MESSAGES/mate-utils.mo
+share/locale/uz/LC_MESSAGES/mate-utils.mo
share/locale/vi/LC_MESSAGES/mate-utils.mo
share/locale/wa/LC_MESSAGES/mate-utils.mo
share/locale/xh/LC_MESSAGES/mate-utils.mo
diff --git a/deskutils/mozo/Makefile b/deskutils/mozo/Makefile
index d47bdc833260..c7485d9ce366 100644
--- a/deskutils/mozo/Makefile
+++ b/deskutils/mozo/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mozo
-PORTVERSION= 1.12.0
+PORTVERSION= 1.18.0
CATEGORIES= deskutils mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -12,13 +12,12 @@ COMMENT= Editor for the freedesktop.org menu specification
PORTSCOUT= limitw:1,even
-USES= gettext gmake pathfix pkgconfig python:2 tar:xz
+USES= gettext gmake localbase pathfix pkgconfig \
+ python:2 tar:xz
USE_MATE= menus
-USE_GNOME= intltool pygobject pygtk2
+USE_GNOME= gtk30 intltool pygobject3
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
diff --git a/deskutils/mozo/distinfo b/deskutils/mozo/distinfo
index 909b2207cc0e..c208c446eb61 100644
--- a/deskutils/mozo/distinfo
+++ b/deskutils/mozo/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mozo-1.12.0.tar.xz) = 59ab1c873064177e5515ba31c493fe9fd158c37b1054f7ae638c6571640aecc7
-SIZE (mate/mozo-1.12.0.tar.xz) = 163820
+TIMESTAMP = 1491619743
+SHA256 (mate/mozo-1.18.0.tar.xz) = ab24241d3203aca75974f0aeb96dbd215c5ac7ca67cd7af72caa6062f84ad613
+SIZE (mate/mozo-1.18.0.tar.xz) = 173432
diff --git a/deskutils/mozo/files/patch-Mozo_util.py b/deskutils/mozo/files/patch-Mozo_util.py
deleted file mode 100644
index 00241393047c..000000000000
--- a/deskutils/mozo/files/patch-Mozo_util.py
+++ /dev/null
@@ -1,29 +0,0 @@
---- Mozo/util.py.orig 2012-07-29 12:16:35.000000000 -0500
-+++ Mozo/util.py 2012-07-29 12:18:11.000000000 -0500
-@@ -141,7 +141,7 @@
- file_path = os.path.join(system_path, 'applications', file_id)
- if os.path.isfile(file_path):
- return file_path
-- file_path = os.path.join('/', 'usr', 'share', 'applications', file_id)
-+ file_path = os.path.join('/', '/usr/local', 'share', 'applications', file_id)
- if os.path.isfile(file_path):
- return file_path
- return False
-@@ -166,7 +166,7 @@
- file_path = os.path.join(system_path, 'desktop-directories', file_id)
- if os.path.isfile(file_path):
- return file_path
-- file_path = os.path.join('/', 'usr', 'share', 'desktop-directories', file_id)
-+ file_path = os.path.join('/', '/usr/local', 'share', 'desktop-directories', file_id)
- if os.path.isfile(file_path):
- return file_path
- return False
-@@ -187,7 +187,7 @@
- file_path = os.path.join(system_path, 'menus', file_name)
- if os.path.isfile(file_path):
- return file_path
-- file_path = os.path.join('/', 'etc', 'xdg', 'menus', file_name)
-+ file_path = os.path.join('/', '/usr/local', 'etc', 'xdg', 'menus', file_name)
- if os.path.isfile(file_path):
- return file_path
- return False
diff --git a/deskutils/mozo/pkg-plist b/deskutils/mozo/pkg-plist
index 4016ecc888bc..31fc703e213d 100644
--- a/deskutils/mozo/pkg-plist
+++ b/deskutils/mozo/pkg-plist
@@ -1,19 +1,19 @@
bin/mozo
%%PYTHON_SITELIBDIR%%/Mozo/MainWindow.py
%%PYTHON_SITELIBDIR%%/Mozo/MainWindow.pyc
-%%PYTHON_SITELIBDIR%%/Mozo/MainWindow.pyo
+%%PYTHON_SITELIBDIR%%/Mozo/MainWindow.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/Mozo/MenuEditor.py
%%PYTHON_SITELIBDIR%%/Mozo/MenuEditor.pyc
-%%PYTHON_SITELIBDIR%%/Mozo/MenuEditor.pyo
+%%PYTHON_SITELIBDIR%%/Mozo/MenuEditor.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/Mozo/__init__.py
%%PYTHON_SITELIBDIR%%/Mozo/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Mozo/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Mozo/__init__.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/Mozo/config.py
%%PYTHON_SITELIBDIR%%/Mozo/config.pyc
-%%PYTHON_SITELIBDIR%%/Mozo/config.pyo
+%%PYTHON_SITELIBDIR%%/Mozo/config.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/Mozo/util.py
%%PYTHON_SITELIBDIR%%/Mozo/util.pyc
-%%PYTHON_SITELIBDIR%%/Mozo/util.pyo
+%%PYTHON_SITELIBDIR%%/Mozo/util.%%PYTHON_PYOEXTENSION%%
man/man1/mozo.1.gz
share/applications/mozo.desktop
share/icons/hicolor/16x16/apps/mozo.png
@@ -29,12 +29,11 @@ share/locale/ar/LC_MESSAGES/mozo.mo
share/locale/as/LC_MESSAGES/mozo.mo
share/locale/ast/LC_MESSAGES/mozo.mo
share/locale/be/LC_MESSAGES/mozo.mo
-share/locale/be@latin/LC_MESSAGES/mozo.mo
-share/locale/bem/LC_MESSAGES/mozo.mo
share/locale/bg/LC_MESSAGES/mozo.mo
share/locale/bn/LC_MESSAGES/mozo.mo
share/locale/bn_IN/LC_MESSAGES/mozo.mo
share/locale/br/LC_MESSAGES/mozo.mo
+share/locale/bs/LC_MESSAGES/mozo.mo
share/locale/ca/LC_MESSAGES/mozo.mo
share/locale/ca@valencia/LC_MESSAGES/mozo.mo
share/locale/cmn/LC_MESSAGES/mozo.mo
@@ -45,19 +44,23 @@ share/locale/da/LC_MESSAGES/mozo.mo
share/locale/de/LC_MESSAGES/mozo.mo
share/locale/dz/LC_MESSAGES/mozo.mo
share/locale/el/LC_MESSAGES/mozo.mo
-share/locale/en@shaw/LC_MESSAGES/mozo.mo
share/locale/en_AU/LC_MESSAGES/mozo.mo
share/locale/en_CA/LC_MESSAGES/mozo.mo
share/locale/en_GB/LC_MESSAGES/mozo.mo
share/locale/eo/LC_MESSAGES/mozo.mo
share/locale/es/LC_MESSAGES/mozo.mo
+share/locale/es_AR/LC_MESSAGES/mozo.mo
share/locale/es_CL/LC_MESSAGES/mozo.mo
+share/locale/es_CO/LC_MESSAGES/mozo.mo
share/locale/es_MX/LC_MESSAGES/mozo.mo
+share/locale/es_VE/LC_MESSAGES/mozo.mo
share/locale/et/LC_MESSAGES/mozo.mo
share/locale/eu/LC_MESSAGES/mozo.mo
share/locale/fa/LC_MESSAGES/mozo.mo
share/locale/fi/LC_MESSAGES/mozo.mo
share/locale/fr/LC_MESSAGES/mozo.mo
+share/locale/fr_CA/LC_MESSAGES/mozo.mo
+share/locale/frp/LC_MESSAGES/mozo.mo
share/locale/fur/LC_MESSAGES/mozo.mo
share/locale/fy/LC_MESSAGES/mozo.mo
share/locale/ga/LC_MESSAGES/mozo.mo
@@ -69,7 +72,7 @@ share/locale/hr/LC_MESSAGES/mozo.mo
share/locale/hu/LC_MESSAGES/mozo.mo
share/locale/hy/LC_MESSAGES/mozo.mo
share/locale/id/LC_MESSAGES/mozo.mo
-share/locale/io/LC_MESSAGES/mozo.mo
+share/locale/is/LC_MESSAGES/mozo.mo
share/locale/it/LC_MESSAGES/mozo.mo
share/locale/ja/LC_MESSAGES/mozo.mo
share/locale/ka/LC_MESSAGES/mozo.mo
@@ -96,6 +99,7 @@ share/locale/oc/LC_MESSAGES/mozo.mo
share/locale/or/LC_MESSAGES/mozo.mo
share/locale/pa/LC_MESSAGES/mozo.mo
share/locale/pl/LC_MESSAGES/mozo.mo
+share/locale/pms/LC_MESSAGES/mozo.mo
share/locale/ps/LC_MESSAGES/mozo.mo
share/locale/pt/LC_MESSAGES/mozo.mo
share/locale/pt_BR/LC_MESSAGES/mozo.mo
@@ -114,9 +118,9 @@ share/locale/th/LC_MESSAGES/mozo.mo
share/locale/tr/LC_MESSAGES/mozo.mo
share/locale/ug/LC_MESSAGES/mozo.mo
share/locale/uk/LC_MESSAGES/mozo.mo
-share/locale/uz@cyrillic/LC_MESSAGES/mozo.mo
+share/locale/uz/LC_MESSAGES/mozo.mo
share/locale/vi/LC_MESSAGES/mozo.mo
share/locale/zh_CN/LC_MESSAGES/mozo.mo
share/locale/zh_HK/LC_MESSAGES/mozo.mo
share/locale/zh_TW/LC_MESSAGES/mozo.mo
-share/mozo/mozo.ui
+%%DATADIR%%/mozo.ui
diff --git a/devel/mate-common/Makefile b/devel/mate-common/Makefile
index bc9af3994bb7..84f998d33486 100644
--- a/devel/mate-common/Makefile
+++ b/devel/mate-common/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-common
-PORTVERSION= 1.12.0
+PORTVERSION= 1.18.0
CATEGORIES= devel mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,6 +10,9 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= Common automake macros for MATE
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
+
PORTSCOUT= limitw:1,even
USES= gmake pkgconfig:both tar:xz
diff --git a/devel/mate-common/distinfo b/devel/mate-common/distinfo
index 4c9105fcf491..5a59423c1b68 100644
--- a/devel/mate-common/distinfo
+++ b/devel/mate-common/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-common-1.12.0.tar.xz) = 7c178326ac810c6580647da16d13a8a36a5cc04725ce3a62419c5e2228c8b934
-SIZE (mate/mate-common-1.12.0.tar.xz) = 66156
+TIMESTAMP = 1491670734
+SHA256 (mate/mate-common-1.18.0.tar.xz) = d77c44546e748f94cf93707ab3593146109401c9bcde533fc308863f9ca20580
+SIZE (mate/mate-common-1.18.0.tar.xz) = 72608
diff --git a/devel/mate-common/files/patch-macros_mate-autogen b/devel/mate-common/files/patch-macros_mate-autogen
index 58a374b07e7c..cab3850fce83 100644
--- a/devel/mate-common/files/patch-macros_mate-autogen
+++ b/devel/mate-common/files/patch-macros_mate-autogen
@@ -1,9 +1,9 @@
https://bugs.gentoo.org/show_bug.cgi?id=427432
https://bugzilla.gnome.org/show_bug.cgi?id=680363
---- macros/mate-autogen.orig 2015-01-12 08:15:17.000000000 +0100
-+++ macros/mate-autogen 2015-01-13 07:59:16.690666241 +0100
-@@ -97,6 +97,7 @@
+--- macros/mate-autogen.orig 2016-09-17 07:36:20.000000000 +0200
++++ macros/mate-autogen 2016-11-23 20:00:33.508805000 +0100
+@@ -94,6 +94,7 @@
vc_min_version=$4
vc_source=$5
vc_status=1
@@ -11,11 +11,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=680363
local ${vc_variable}_VERSION
vc_checkprog=`eval echo "\\$$vc_variable"`
-@@ -110,11 +111,19 @@
- else
- vc_comparator=">="
+@@ -102,11 +103,18 @@
+ return 0
fi
-+
+
+- printbold "checking for $vc_package >= $vc_min_version..."
+ # The most reliable way to check pkg-config version is to query the actual
+ # virtual
+ # pkg-config package entry's modversion. This works in all known
@@ -23,7 +23,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=680363
+ if test "x$vc_package" = "xpkg-config"; then
+ vc_option="--modversion pkg-config"
+ fi
- printbold "checking for $vc_package $vc_comparator $vc_min_version..."
++ printbold "checking for $vc_package $vc_comparator $vc_min_version..."
for vc_checkprog in $vc_checkprogs; do
echo $ECHO_N " testing $vc_checkprog... " $ECHO_C
- if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
diff --git a/editors/pluma/Makefile b/editors/pluma/Makefile
index 9ee75715b315..c3bc3da20d68 100644
--- a/editors/pluma/Makefile
+++ b/editors/pluma/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pluma
-PORTVERSION= 1.12.2
+PORTVERSION= 1.18.2
CATEGORIES= editors mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,27 +10,24 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= Small but powerful text editor for MATE Desktop Environment
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= itstool:textproc/itstool \
${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
LIB_DEPENDS= libenchant.so:textproc/enchant \
- libsoup-2.4.so:devel/libsoup
+ libpeas-gtk-1.0.so:devel/libpeas
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \
- python:2 shebangfix tar:xz
-USE_MATE= desktop
-USE_XORG= sm x11
-USE_GNOME= gtk20 gtksourceview2 gvfs intlhack libxml2 \
- pygobject pygtk2 pygtksourceview
+USES= desktop-file-utils gmake libtool localbase \
+ pathfix pkgconfig python:3.3+ shebangfix tar:xz
+USE_XORG= ice sm x11
+USE_GNOME= cairo gdkpixbuf2 gnomeprefix gtk30 gtksourceview3 \
+ gvfs intltool introspection libxml2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-gtk-doc \
- --with-gtk=2.0 \
- --with-html-dir=${PREFIX}/share/doc
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
SHEBANG_FILES= ${WRKSRC}/plugins/externaltools/data/search-recursive.tool.in \
@@ -38,8 +35,7 @@ SHEBANG_FILES= ${WRKSRC}/plugins/externaltools/data/search-recursive.tool.in \
GLIB_SCHEMAS= org.mate.pluma.gschema.xml \
org.mate.pluma.plugins.filebrowser.gschema.xml \
+ org.mate.pluma.plugins.spell.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 8cf6a3f1a9b2..0e2435d567d8 100644
--- a/editors/pluma/distinfo
+++ b/editors/pluma/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/pluma-1.12.2.tar.xz) = eb74988a9fa9892f883b2ccdc9cf217478576815bcb02662d2e3cf2ae39ef870
-SIZE (mate/pluma-1.12.2.tar.xz) = 3397280
+TIMESTAMP = 1497524300
+SHA256 (mate/pluma-1.18.2.tar.xz) = ff0f29d4eaa946cbb2b26bbdc2b2d5a308b2d16ec99ea384bcb13f1f3d1a09fc
+SIZE (mate/pluma-1.18.2.tar.xz) = 3348500
diff --git a/editors/pluma/pkg-plist b/editors/pluma/pkg-plist
index c9be599ba7be..0a1bcf006dd4 100644
--- a/editors/pluma/pkg-plist
+++ b/editors/pluma/pkg-plist
@@ -5,14 +5,12 @@ include/pluma/pluma-debug.h
include/pluma/pluma-document.h
include/pluma/pluma-encodings-combo-box.h
include/pluma/pluma-encodings.h
-include/pluma/pluma-file-chooser-dialog.h
include/pluma/pluma-help.h
include/pluma/pluma-message-bus.h
include/pluma/pluma-message-type.h
include/pluma/pluma-message.h
include/pluma/pluma-notebook.h
include/pluma/pluma-panel.h
-include/pluma/pluma-plugin.h
include/pluma/pluma-prefs-manager-app.h
include/pluma/pluma-prefs-manager.h
include/pluma/pluma-progress-message-area.h
@@ -22,36 +20,29 @@ include/pluma/pluma-tab.h
include/pluma/pluma-utils.h
include/pluma/pluma-view.h
include/pluma/pluma-window.h
-lib/pluma/plugin-loaders/libcloader.so
-%%PYTHON%%lib/pluma/plugin-loaders/libpythonloader.so
-lib/pluma/plugins/changecase.pluma-plugin
-lib/pluma/plugins/docinfo.pluma-plugin
-%%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/girepository-1.0/Pluma-1.0.typelib
+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/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/externaltools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/externaltools/__pycache__/filelookup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/externaltools/__pycache__/filelookup.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/externaltools/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/externaltools/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/externaltools/capture.py
+lib/pluma/plugins/externaltools/filelookup.py
+lib/pluma/plugins/externaltools/functions.py
+lib/pluma/plugins/externaltools/library.py
+lib/pluma/plugins/externaltools/linkparsing.py
+lib/pluma/plugins/externaltools/manager.py
+lib/pluma/plugins/externaltools/outputpanel.py
+lib/pluma/plugins/filebrowser.plugin
lib/pluma/plugins/libchangecase.so
lib/pluma/plugins/libdocinfo.so
lib/pluma/plugins/libfilebrowser.so
@@ -61,92 +52,83 @@ 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
-%%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
+lib/pluma/plugins/modelines.plugin
+lib/pluma/plugins/pythonconsole.plugin
+lib/pluma/plugins/pythonconsole/__init__.py
+lib/pluma/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/pythonconsole/config.py
+lib/pluma/plugins/pythonconsole/console.py
+lib/pluma/plugins/quickopen.plugin
+lib/pluma/plugins/quickopen/__init__.py
+lib/pluma/plugins/quickopen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/quickopen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/quickopen/__pycache__/popup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/quickopen/__pycache__/popup.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/quickopen/__pycache__/windowhelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/quickopen/__pycache__/windowhelper.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/quickopen/popup.py
+lib/pluma/plugins/quickopen/virtualdirs.py
+lib/pluma/plugins/quickopen/windowhelper.py
+lib/pluma/plugins/snippets.plugin
+lib/pluma/plugins/snippets/Completion.py
+lib/pluma/plugins/snippets/Document.py
+lib/pluma/plugins/snippets/Exporter.py
+lib/pluma/plugins/snippets/Helper.py
+lib/pluma/plugins/snippets/Importer.py
+lib/pluma/plugins/snippets/LanguageManager.py
+lib/pluma/plugins/snippets/Library.py
+lib/pluma/plugins/snippets/Manager.py
+lib/pluma/plugins/snippets/Parser.py
+lib/pluma/plugins/snippets/Placeholder.py
+lib/pluma/plugins/snippets/Snippet.py
+lib/pluma/plugins/snippets/SubstitutionParser.py
+lib/pluma/plugins/snippets/WindowHelper.py
+lib/pluma/plugins/snippets/__init__.py
+lib/pluma/plugins/snippets/__pycache__/Completion.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Completion.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/Document.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Document.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/Exporter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Exporter.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/Helper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Helper.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/Importer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Importer.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/LanguageManager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/LanguageManager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/Manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Manager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/Parser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Parser.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/Snippet.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Snippet.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/SubstitutionParser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/SubstitutionParser.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/WindowHelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/WindowHelper.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/sort.plugin
+lib/pluma/plugins/spell.plugin
+lib/pluma/plugins/taglist.plugin
+lib/pluma/plugins/time.plugin
+lib/pluma/plugins/trailsave.plugin
libdata/pkgconfig/pluma.pc
libexec/pluma/pluma-bugreport.sh
man/man1/pluma.1.gz
-share/MateConf/gsettings/pluma.convert
share/appdata/pluma.appdata.xml
share/applications/pluma.desktop
%%PORTDOCS%%%%DOCSDIR%%/PlumaMessage.html
%%PORTDOCS%%%%DOCSDIR%%/PlumaMessageBus.html
%%PORTDOCS%%%%DOCSDIR%%/PlumaMessageType.html
-%%PORTDOCS%%%%DOCSDIR%%/PlumaPlugin.html
%%PORTDOCS%%%%DOCSDIR%%/ch01.html
%%PORTDOCS%%%%DOCSDIR%%/home.png
%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/index.sgml
%%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png
%%PORTDOCS%%%%DOCSDIR%%/left.png
%%PORTDOCS%%%%DOCSDIR%%/pluma-PlumaPrintJob.html
@@ -176,6 +158,7 @@ share/applications/pluma.desktop
%%PORTDOCS%%%%DOCSDIR%%/style.css
%%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png
%%PORTDOCS%%%%DOCSDIR%%/up.png
+share/gir-1.0/Pluma-1.0.gir
share/help/C/pluma/figures/pluma_format_bold.png
share/help/C/pluma/figures/pluma_format_italic.png
share/help/C/pluma/figures/pluma_format_strikethrough.png
@@ -375,7 +358,6 @@ share/locale/as/LC_MESSAGES/pluma.mo
share/locale/ast/LC_MESSAGES/pluma.mo
share/locale/az/LC_MESSAGES/pluma.mo
share/locale/be/LC_MESSAGES/pluma.mo
-share/locale/be@latin/LC_MESSAGES/pluma.mo
share/locale/bg/LC_MESSAGES/pluma.mo
share/locale/bn/LC_MESSAGES/pluma.mo
share/locale/bn_IN/LC_MESSAGES/pluma.mo
@@ -391,12 +373,14 @@ share/locale/da/LC_MESSAGES/pluma.mo
share/locale/de/LC_MESSAGES/pluma.mo
share/locale/dz/LC_MESSAGES/pluma.mo
share/locale/el/LC_MESSAGES/pluma.mo
-share/locale/en@shaw/LC_MESSAGES/pluma.mo
share/locale/en_AU/LC_MESSAGES/pluma.mo
share/locale/en_CA/LC_MESSAGES/pluma.mo
share/locale/en_GB/LC_MESSAGES/pluma.mo
share/locale/eo/LC_MESSAGES/pluma.mo
share/locale/es/LC_MESSAGES/pluma.mo
+share/locale/es_AR/LC_MESSAGES/pluma.mo
+share/locale/es_CO/LC_MESSAGES/pluma.mo
+share/locale/es_MX/LC_MESSAGES/pluma.mo
share/locale/et/LC_MESSAGES/pluma.mo
share/locale/eu/LC_MESSAGES/pluma.mo
share/locale/fa/LC_MESSAGES/pluma.mo
@@ -419,6 +403,7 @@ share/locale/kk/LC_MESSAGES/pluma.mo
share/locale/kn/LC_MESSAGES/pluma.mo
share/locale/ko/LC_MESSAGES/pluma.mo
share/locale/ku/LC_MESSAGES/pluma.mo
+share/locale/ku_IQ/LC_MESSAGES/pluma.mo
share/locale/ky/LC_MESSAGES/pluma.mo
share/locale/la/LC_MESSAGES/pluma.mo
share/locale/lt/LC_MESSAGES/pluma.mo
@@ -440,6 +425,7 @@ share/locale/oc/LC_MESSAGES/pluma.mo
share/locale/or/LC_MESSAGES/pluma.mo
share/locale/pa/LC_MESSAGES/pluma.mo
share/locale/pl/LC_MESSAGES/pluma.mo
+share/locale/pms/LC_MESSAGES/pluma.mo
share/locale/ps/LC_MESSAGES/pluma.mo
share/locale/pt/LC_MESSAGES/pluma.mo
share/locale/pt_BR/LC_MESSAGES/pluma.mo
@@ -460,6 +446,7 @@ share/locale/tk/LC_MESSAGES/pluma.mo
share/locale/tr/LC_MESSAGES/pluma.mo
share/locale/uk/LC_MESSAGES/pluma.mo
share/locale/ur/LC_MESSAGES/pluma.mo
+share/locale/uz/LC_MESSAGES/pluma.mo
share/locale/vi/LC_MESSAGES/pluma.mo
share/locale/wa/LC_MESSAGES/pluma.mo
share/locale/xh/LC_MESSAGES/pluma.mo
@@ -478,34 +465,35 @@ 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
-%%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/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
%%DATADIR%%/plugins/sort/sort.ui
%%DATADIR%%/plugins/spell/languages-dialog.ui
+%%DATADIR%%/plugins/spell/pluma-spell-setup-dialog.ui
%%DATADIR%%/plugins/spell/spell-checker.ui
%%DATADIR%%/plugins/taglist/HTML.tags.gz
%%DATADIR%%/plugins/taglist/Latex.tags.gz
diff --git a/graphics/atril-lite/Makefile b/graphics/atril-lite/Makefile
index cd4d4d976f2d..f4282aa44892 100644
--- a/graphics/atril-lite/Makefile
+++ b/graphics/atril-lite/Makefile
@@ -1,12 +1,12 @@
# Created by: Adam Weinberger <adamw@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 0
PKGNAMESUFFIX= -lite
COMMENT= MATE multi-format document viewer
-OPTIONS_EXCLUDE= CAJA
+OPTIONS_EXCLUDE= CAJA DBUS
MASTERDIR= ${.CURDIR}/../../graphics/atril
SLAVEPORT= lite
diff --git a/graphics/atril-lite/pkg-plist b/graphics/atril-lite/pkg-plist
index 116bfc96438a..aa7235a5b730 100644
--- a/graphics/atril-lite/pkg-plist
+++ b/graphics/atril-lite/pkg-plist
@@ -65,15 +65,13 @@ lib/atril/3/backends/tiffdocument.atril-backend
%%XPS%%lib/atril/3/backends/xpsdocument.atril-backend
lib/libatrildocument.so
lib/libatrildocument.so.3
-lib/libatrildocument.so.%%GTK3_VERSION%%
+lib/libatrildocument.so.3.0.0
lib/libatrilview.so
lib/libatrilview.so.3
-lib/libatrilview.so.%%GTK3_VERSION%%
+lib/libatrilview.so.3.0.0
libdata/pkgconfig/atril-document-1.5.0.pc
libdata/pkgconfig/atril-view-1.5.0.pc
-libexec/atril-convert-metadata
man/man1/atril.1.gz
-share/MateConf/gsettings/atril.convert
share/appdata/atril.appdata.xml
share/applications/atril.desktop
%%DATADIR%%/atril-toolbar.xml
@@ -150,7 +148,6 @@ share/gtk-doc/html/atril/atril-frontend.html
share/gtk-doc/html/atril/atril.devhelp2
share/gtk-doc/html/atril/home.png
share/gtk-doc/html/atril/index.html
-share/gtk-doc/html/atril/index.sgml
share/gtk-doc/html/atril/left-insensitive.png
share/gtk-doc/html/atril/left.png
share/gtk-doc/html/atril/licence.html
@@ -184,13 +181,13 @@ share/gtk-doc/html/libatrildocument-1.5.0/EvLayer.html
share/gtk-doc/html/libatrildocument-1.5.0/EvPage.html
share/gtk-doc/html/libatrildocument-1.5.0/EvRenderContext.html
share/gtk-doc/html/libatrildocument-1.5.0/EvSelection.html
+share/gtk-doc/html/libatrildocument-1.5.0/annotation-glossary.html
share/gtk-doc/html/libatrildocument-1.5.0/api-index-full.html
share/gtk-doc/html/libatrildocument-1.5.0/document-data.html
share/gtk-doc/html/libatrildocument-1.5.0/document-helpers.html
share/gtk-doc/html/libatrildocument-1.5.0/document-interfaces.html
share/gtk-doc/html/libatrildocument-1.5.0/home.png
share/gtk-doc/html/libatrildocument-1.5.0/index.html
-share/gtk-doc/html/libatrildocument-1.5.0/index.sgml
share/gtk-doc/html/libatrildocument-1.5.0/left-insensitive.png
share/gtk-doc/html/libatrildocument-1.5.0/left.png
share/gtk-doc/html/libatrildocument-1.5.0/libatrildocument-1.5.0.devhelp2
@@ -213,10 +210,10 @@ share/gtk-doc/html/libatrildocument-1.5.0/style.css
share/gtk-doc/html/libatrildocument-1.5.0/up-insensitive.png
share/gtk-doc/html/libatrildocument-1.5.0/up.png
share/gtk-doc/html/libatrilview-1.5.0/EvJob.html
+share/gtk-doc/html/libatrilview-1.5.0/annotation-glossary.html
share/gtk-doc/html/libatrilview-1.5.0/api-index-full.html
share/gtk-doc/html/libatrilview-1.5.0/home.png
share/gtk-doc/html/libatrilview-1.5.0/index.html
-share/gtk-doc/html/libatrilview-1.5.0/index.sgml
share/gtk-doc/html/libatrilview-1.5.0/left-insensitive.png
share/gtk-doc/html/libatrilview-1.5.0/left.png
share/gtk-doc/html/libatrilview-1.5.0/libatrilview-1.5.0.devhelp2
@@ -318,11 +315,11 @@ share/locale/ar/LC_MESSAGES/atril.mo
share/locale/as/LC_MESSAGES/atril.mo
share/locale/ast/LC_MESSAGES/atril.mo
share/locale/be/LC_MESSAGES/atril.mo
-share/locale/be@latin/LC_MESSAGES/atril.mo
share/locale/bg/LC_MESSAGES/atril.mo
share/locale/bn/LC_MESSAGES/atril.mo
share/locale/bn_IN/LC_MESSAGES/atril.mo
share/locale/br/LC_MESSAGES/atril.mo
+share/locale/bs/LC_MESSAGES/atril.mo
share/locale/ca/LC_MESSAGES/atril.mo
share/locale/ca@valencia/LC_MESSAGES/atril.mo
share/locale/cmn/LC_MESSAGES/atril.mo
@@ -332,17 +329,22 @@ share/locale/da/LC_MESSAGES/atril.mo
share/locale/de/LC_MESSAGES/atril.mo
share/locale/dz/LC_MESSAGES/atril.mo
share/locale/el/LC_MESSAGES/atril.mo
-share/locale/en@shaw/LC_MESSAGES/atril.mo
share/locale/en_AU/LC_MESSAGES/atril.mo
share/locale/en_CA/LC_MESSAGES/atril.mo
share/locale/en_GB/LC_MESSAGES/atril.mo
share/locale/eo/LC_MESSAGES/atril.mo
share/locale/es/LC_MESSAGES/atril.mo
+share/locale/es_CL/LC_MESSAGES/atril.mo
+share/locale/es_CO/LC_MESSAGES/atril.mo
+share/locale/es_MX/LC_MESSAGES/atril.mo
+share/locale/es_VE/LC_MESSAGES/atril.mo
share/locale/et/LC_MESSAGES/atril.mo
share/locale/eu/LC_MESSAGES/atril.mo
share/locale/fa/LC_MESSAGES/atril.mo
share/locale/fi/LC_MESSAGES/atril.mo
share/locale/fr/LC_MESSAGES/atril.mo
+share/locale/fr_CA/LC_MESSAGES/atril.mo
+share/locale/frp/LC_MESSAGES/atril.mo
share/locale/ga/LC_MESSAGES/atril.mo
share/locale/gl/LC_MESSAGES/atril.mo
share/locale/gu/LC_MESSAGES/atril.mo
@@ -351,15 +353,19 @@ share/locale/hi/LC_MESSAGES/atril.mo
share/locale/hr/LC_MESSAGES/atril.mo
share/locale/hu/LC_MESSAGES/atril.mo
share/locale/hy/LC_MESSAGES/atril.mo
+share/locale/ia/LC_MESSAGES/atril.mo
share/locale/id/LC_MESSAGES/atril.mo
+share/locale/is/LC_MESSAGES/atril.mo
share/locale/it/LC_MESSAGES/atril.mo
share/locale/ja/LC_MESSAGES/atril.mo
+share/locale/jv/LC_MESSAGES/atril.mo
share/locale/ka/LC_MESSAGES/atril.mo
share/locale/kk/LC_MESSAGES/atril.mo
share/locale/kn/LC_MESSAGES/atril.mo
share/locale/ko/LC_MESSAGES/atril.mo
share/locale/ks/LC_MESSAGES/atril.mo
share/locale/ku/LC_MESSAGES/atril.mo
+share/locale/ku_IQ/LC_MESSAGES/atril.mo
share/locale/ky/LC_MESSAGES/atril.mo
share/locale/lt/LC_MESSAGES/atril.mo
share/locale/lv/LC_MESSAGES/atril.mo
@@ -379,6 +385,7 @@ share/locale/oc/LC_MESSAGES/atril.mo
share/locale/or/LC_MESSAGES/atril.mo
share/locale/pa/LC_MESSAGES/atril.mo
share/locale/pl/LC_MESSAGES/atril.mo
+share/locale/pms/LC_MESSAGES/atril.mo
share/locale/ps/LC_MESSAGES/atril.mo
share/locale/pt/LC_MESSAGES/atril.mo
share/locale/pt_BR/LC_MESSAGES/atril.mo
@@ -398,6 +405,7 @@ share/locale/te/LC_MESSAGES/atril.mo
share/locale/th/LC_MESSAGES/atril.mo
share/locale/tr/LC_MESSAGES/atril.mo
share/locale/uk/LC_MESSAGES/atril.mo
+share/locale/uz/LC_MESSAGES/atril.mo
share/locale/vi/LC_MESSAGES/atril.mo
share/locale/wa/LC_MESSAGES/atril.mo
share/locale/zh_CN/LC_MESSAGES/atril.mo
diff --git a/graphics/atril/Makefile b/graphics/atril/Makefile
index 804cc9b6b8b7..24c746b2080a 100644
--- a/graphics/atril/Makefile
+++ b/graphics/atril/Makefile
@@ -1,9 +1,11 @@
# Created by: Adam Weinberger <adamw@FreeBSD.org>
# $FreeBSD$
+#
+# Please update update atril-lite also
PORTNAME= atril
-PORTVERSION= 1.12.2
-PORTREVISION?= 2
+PORTVERSION= 1.18.0
+PORTREVISION?= 0
CATEGORIES= graphics print mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -14,20 +16,24 @@ COMMENT?= MATE multi-format document viewer
BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib \
+ libsoup-2.4.so:devel/libsoup \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
+ libtiff.so:graphics/tiff \
libspectre.so:print/libspectre
PORTSCOUT= limitw:1,even
SLAVEPORT?= no
-USES= desktop-file-utils gettext gmake libtool pathfix \
+USES= desktop-file-utils gettext gmake libarchive libtool pathfix \
pkgconfig tar:xz
USE_MATE= icontheme
-USE_XORG= sm
-USE_GNOME= cairo gtk20 intlhack libxml2
+USE_XORG= ice sm x11
+USE_GNOME= cairo gtk30 intlhack libxml2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gtk=2.0 \
- --disable-static
+CONFIGURE_ARGS= --disable-static \
+ --with-gtk=3.0
INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -43,55 +49,44 @@ USE_MATE+= desktop
GLIB_SCHEMAS= org.mate.Atril.gschema.xml
-OPTIONS_DEFINE= CAJA COMICS DJVU DVI EPUB KEYRING T1LIB XPS
-OPTIONS_DEFAULT=CAJA COMICS DJVU EPUB KEYRING XPS
-DVI_DESC= DVI viewer support
-T1LIB_DESC= T1LIB for TYPE1 fonts to DVI (Enables DVI)
-CAJA_DESC= Caja plugin
-KEYRING_DESC= Keyring support
-COMICS_DESC= Comic book archives support
-DJVU_DESC= DJVU support
-XPS_DESC= XPS support
-EPUB_DESC= Epub support
+OPTIONS_DEFINE= CAJA COMICS DBUS DJVU DVI EPUB KEYRING T1LIB XPS
+OPTIONS_DEFAULT=CAJA COMICS DBUS DJVU EPUB KEYRING XPS
OPTIONS_SUB= yes
+CAJA_DESC= Caja plugin
CAJA_CONFIGURE_ENABLE= caja
CAJA_USE= MATE=caja
+
+DJVU_DESC= DJVU support
DJVU_LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre
DJVU_CONFIGURE_ENABLE= djvu
+
+COMICS_DESC= Comic book archives support
COMICS_CONFIGURE_ENABLE= comics
+
+DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
+DBUS_CONFIGURE_ENABLE= dbus
+
+KEYRING_DESC= Keyring support
KEYRING_CONFIGURE_WITH= keyring
KEYRING_LIB_DEPENDS= libsecret-1.so:security/libsecret
+
+XPS_DESC= XPS support
XPS_CONFIGURE_ENABLE= xps
XPS_LIB_DEPENDS= libgxps.so:graphics/libgxps
-EPUB_CONFIGURE_ENABLE= epub
-EPUB_LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2
-.include <bsd.port.options.mk>
-
-.if ${SLAVEPORT} == lite
-CONFIGURE_ARGS+=--disable-dbus
-.else
-CONFIGURE_ARGS+=--enable-dbus
-LIB_DEPENDS+= libdbus-glib-1.so:devel/dbus-glib
-.endif
+EPUB_DESC= Epub support
+EPUB_CONFIGURE_ENABLE= epub
+EPUB_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3
-.if ${PORT_OPTIONS:MDVI} || ${PORT_OPTIONS:MT1LIB}
-USE_TEX= base
-CONFIGURE_ARGS+=--enable-dvi
-PLIST_SUB+= DVI=""
+DVI_DESC= DVI viewer support
+DVI_USE= tex=base
+DVI_CONFIGURE_ENABLE= dvi
-. if ${PORT_OPTIONS:MT1LIB}
-LIB_DEPENDS+= libt1.so:devel/t1lib
-CONFIGURE_ARGS+=--enable-t1lib
-.else
-CONFIGURE_ARGS+=--disable-t1lib
-. endif
-
-.else
-CONFIGURE_ARGS+=--disable-dvi
-PLIST_SUB+= DVI="@comment "
-.endif
+T1LIB_DESC= T1LIB for TYPE1 fonts to DVI (Enables DVI)
+T1LIB_LIB_DEPENDS= libt1.so:devel/t1lib
+T1LIB_CONFIGURE_ENABLE= t1lib
+T1LIB_IMPLIES= DVI
.include <bsd.port.mk>
diff --git a/graphics/atril/distinfo b/graphics/atril/distinfo
index f2b5de71b0e4..7da88437f355 100644
--- a/graphics/atril/distinfo
+++ b/graphics/atril/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/atril-1.12.2.tar.xz) = 47cd22969d4ff6ef860a310a57f77f1fcc0c5674113a72ee507d2b1b5c780226
-SIZE (mate/atril-1.12.2.tar.xz) = 1663920
+TIMESTAMP = 1491698614
+SHA256 (mate/atril-1.18.0.tar.xz) = c2284f17f7b683efa22615f00cf2768ea07667981d8304566e49c3d863de80fd
+SIZE (mate/atril-1.18.0.tar.xz) = 1688144
diff --git a/graphics/atril/pkg-plist b/graphics/atril/pkg-plist
index fea297d9c338..de6e442af684 100644
--- a/graphics/atril/pkg-plist
+++ b/graphics/atril/pkg-plist
@@ -74,12 +74,10 @@ lib/libatrilview.so.3
lib/libatrilview.so.%%GTK3_VERSION%%
libdata/pkgconfig/atril-document-1.5.0.pc
libdata/pkgconfig/atril-view-1.5.0.pc
-libexec/atril-convert-metadata
libexec/atrild
man/man1/atril-previewer.1.gz
man/man1/atril-thumbnailer.1.gz
man/man1/atril.1.gz
-share/MateConf/gsettings/atril.convert
share/appdata/atril.appdata.xml
share/applications/atril.desktop
%%DATADIR%%/atril-previewer-ui.xml
@@ -159,7 +157,6 @@ share/gtk-doc/html/atril/atril-frontend.html
share/gtk-doc/html/atril/atril.devhelp2
share/gtk-doc/html/atril/home.png
share/gtk-doc/html/atril/index.html
-share/gtk-doc/html/atril/index.sgml
share/gtk-doc/html/atril/left-insensitive.png
share/gtk-doc/html/atril/left.png
share/gtk-doc/html/atril/licence.html
@@ -193,13 +190,13 @@ share/gtk-doc/html/libatrildocument-1.5.0/EvLayer.html
share/gtk-doc/html/libatrildocument-1.5.0/EvPage.html
share/gtk-doc/html/libatrildocument-1.5.0/EvRenderContext.html
share/gtk-doc/html/libatrildocument-1.5.0/EvSelection.html
+share/gtk-doc/html/libatrildocument-1.5.0/annotation-glossary.html
share/gtk-doc/html/libatrildocument-1.5.0/api-index-full.html
share/gtk-doc/html/libatrildocument-1.5.0/document-data.html
share/gtk-doc/html/libatrildocument-1.5.0/document-helpers.html
share/gtk-doc/html/libatrildocument-1.5.0/document-interfaces.html
share/gtk-doc/html/libatrildocument-1.5.0/home.png
share/gtk-doc/html/libatrildocument-1.5.0/index.html
-share/gtk-doc/html/libatrildocument-1.5.0/index.sgml
share/gtk-doc/html/libatrildocument-1.5.0/left-insensitive.png
share/gtk-doc/html/libatrildocument-1.5.0/left.png
share/gtk-doc/html/libatrildocument-1.5.0/libatrildocument-1.5.0.devhelp2
@@ -222,10 +219,10 @@ share/gtk-doc/html/libatrildocument-1.5.0/style.css
share/gtk-doc/html/libatrildocument-1.5.0/up-insensitive.png
share/gtk-doc/html/libatrildocument-1.5.0/up.png
share/gtk-doc/html/libatrilview-1.5.0/EvJob.html
+share/gtk-doc/html/libatrilview-1.5.0/annotation-glossary.html
share/gtk-doc/html/libatrilview-1.5.0/api-index-full.html
share/gtk-doc/html/libatrilview-1.5.0/home.png
share/gtk-doc/html/libatrilview-1.5.0/index.html
-share/gtk-doc/html/libatrilview-1.5.0/index.sgml
share/gtk-doc/html/libatrilview-1.5.0/left-insensitive.png
share/gtk-doc/html/libatrilview-1.5.0/left.png
share/gtk-doc/html/libatrilview-1.5.0/libatrilview-1.5.0.devhelp2
@@ -327,11 +324,11 @@ share/locale/ar/LC_MESSAGES/atril.mo
share/locale/as/LC_MESSAGES/atril.mo
share/locale/ast/LC_MESSAGES/atril.mo
share/locale/be/LC_MESSAGES/atril.mo
-share/locale/be@latin/LC_MESSAGES/atril.mo
share/locale/bg/LC_MESSAGES/atril.mo
share/locale/bn/LC_MESSAGES/atril.mo
share/locale/bn_IN/LC_MESSAGES/atril.mo
share/locale/br/LC_MESSAGES/atril.mo
+share/locale/bs/LC_MESSAGES/atril.mo
share/locale/ca/LC_MESSAGES/atril.mo
share/locale/ca@valencia/LC_MESSAGES/atril.mo
share/locale/cmn/LC_MESSAGES/atril.mo
@@ -341,17 +338,22 @@ share/locale/da/LC_MESSAGES/atril.mo
share/locale/de/LC_MESSAGES/atril.mo
share/locale/dz/LC_MESSAGES/atril.mo
share/locale/el/LC_MESSAGES/atril.mo
-share/locale/en@shaw/LC_MESSAGES/atril.mo
share/locale/en_AU/LC_MESSAGES/atril.mo
share/locale/en_CA/LC_MESSAGES/atril.mo
share/locale/en_GB/LC_MESSAGES/atril.mo
share/locale/eo/LC_MESSAGES/atril.mo
share/locale/es/LC_MESSAGES/atril.mo
+share/locale/es_CL/LC_MESSAGES/atril.mo
+share/locale/es_CO/LC_MESSAGES/atril.mo
+share/locale/es_MX/LC_MESSAGES/atril.mo
+share/locale/es_VE/LC_MESSAGES/atril.mo
share/locale/et/LC_MESSAGES/atril.mo
share/locale/eu/LC_MESSAGES/atril.mo
share/locale/fa/LC_MESSAGES/atril.mo
share/locale/fi/LC_MESSAGES/atril.mo
share/locale/fr/LC_MESSAGES/atril.mo
+share/locale/fr_CA/LC_MESSAGES/atril.mo
+share/locale/frp/LC_MESSAGES/atril.mo
share/locale/ga/LC_MESSAGES/atril.mo
share/locale/gl/LC_MESSAGES/atril.mo
share/locale/gu/LC_MESSAGES/atril.mo
@@ -360,15 +362,19 @@ share/locale/hi/LC_MESSAGES/atril.mo
share/locale/hr/LC_MESSAGES/atril.mo
share/locale/hu/LC_MESSAGES/atril.mo
share/locale/hy/LC_MESSAGES/atril.mo
+share/locale/ia/LC_MESSAGES/atril.mo
share/locale/id/LC_MESSAGES/atril.mo
+share/locale/is/LC_MESSAGES/atril.mo
share/locale/it/LC_MESSAGES/atril.mo
share/locale/ja/LC_MESSAGES/atril.mo
+share/locale/jv/LC_MESSAGES/atril.mo
share/locale/ka/LC_MESSAGES/atril.mo
share/locale/kk/LC_MESSAGES/atril.mo
share/locale/kn/LC_MESSAGES/atril.mo
share/locale/ko/LC_MESSAGES/atril.mo
share/locale/ks/LC_MESSAGES/atril.mo
share/locale/ku/LC_MESSAGES/atril.mo
+share/locale/ku_IQ/LC_MESSAGES/atril.mo
share/locale/ky/LC_MESSAGES/atril.mo
share/locale/lt/LC_MESSAGES/atril.mo
share/locale/lv/LC_MESSAGES/atril.mo
@@ -388,6 +394,7 @@ share/locale/oc/LC_MESSAGES/atril.mo
share/locale/or/LC_MESSAGES/atril.mo
share/locale/pa/LC_MESSAGES/atril.mo
share/locale/pl/LC_MESSAGES/atril.mo
+share/locale/pms/LC_MESSAGES/atril.mo
share/locale/ps/LC_MESSAGES/atril.mo
share/locale/pt/LC_MESSAGES/atril.mo
share/locale/pt_BR/LC_MESSAGES/atril.mo
@@ -407,6 +414,7 @@ share/locale/te/LC_MESSAGES/atril.mo
share/locale/th/LC_MESSAGES/atril.mo
share/locale/tr/LC_MESSAGES/atril.mo
share/locale/uk/LC_MESSAGES/atril.mo
+share/locale/uz/LC_MESSAGES/atril.mo
share/locale/vi/LC_MESSAGES/atril.mo
share/locale/wa/LC_MESSAGES/atril.mo
share/locale/zh_CN/LC_MESSAGES/atril.mo
diff --git a/graphics/eom/Makefile b/graphics/eom/Makefile
index 6ef4f0725d5f..0880a0ec0700 100644
--- a/graphics/eom/Makefile
+++ b/graphics/eom/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= eom
-PORTVERSION= 1.12.2
+PORTVERSION= 1.18.2
CATEGORIES= graphics mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,25 +10,26 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= Eye of MATE image viewer
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= itstool:textproc/itstool
+LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
+ libdbus-1.so:devel/dbus \
+ libdbus-glib-1.so:devel/dbus-glib \
+ libpeas-gtk-1.0.so:devel/libpeas
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gmake jpeg libtool pathfix pkgconfig \
- tar:xz
+USES= desktop-file-utils gettext gmake jpeg libtool localbase \
+ pathfix pkgconfig tar:xz
USE_MATE= desktop icontheme
USE_XORG= x11
-USE_GNOME= gdkpixbuf2 glib20 gtk20 intltool librsvg2 libxml2
+USE_GNOME= cairo gnomeprefix gtk30 intltool introspection \
+ librsvg2 libxml2
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-gtk-doc \
- --with-html-dir=${PREFIX}/share/doc \
- --disable-introspection \
- --with-gtk=2.0 \
- --disable-python \
- --without-cms
+CONFIGURE_ARGS= --without-cms
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.eom.gschema.xml \
@@ -36,33 +37,18 @@ GLIB_SCHEMAS= org.mate.eom.gschema.xml \
OPTIONS_DEFINE= EXIF EXEMPI
OPTIONS_DEFAULT=EXIF EXEMPI
-EXIF_DESC= Digital camera file meta-data support
-EXEMPI_DESC= XMP support
-
-.include <bsd.port.options.mk>
-_WITH_EXIF= no
-_WITH_EXEMPI= no
+EXEMPI_DESC= XMP support
+EXEMPI_CONFIGURE_WITH= xmp
+EXEMPI_LIB_DEPENDS= libexempi.so:textproc/exempi
-.if ${PORT_OPTIONS:MEXIF}
-CONFIGURE_ARGS+=--with-libexif
-LIB_DEPENDS+= libexif.so:graphics/libexif
-PLIST_SUB+= EXIF=""
-_WITH_EXIF= yes
-.else
-CONFIGURE_ARGS+=--without-libexif
-PLIST_SUB+= EXIF="@comment "
-.endif
+EXIF_DESC= Digital camera file meta-data support
+EXIF_CONFIGURE_WITH= libexif
+EXIF_LIB_DEPENDS= libexif.so:graphics/libexif
-.if ${PORT_OPTIONS:MEXEMPI}
-CONFIGURE_ARGS+=--with-xmp
-LIB_DEPENDS+= libexempi.so:textproc/exempi
-_WITH_EXEMPI= yes
-.else
-CONFIGURE_ARGS+=--without-xmp
-.endif
+.include <bsd.port.options.mk>
-.if ${_WITH_EXIF}=="yes" || ${_WITH_EXEMPI}=="yes"
+.if ${PORT_OPTIONS:MEXIF} || ${PORT_OPTIONS:MEXEMPI}
PLIST_SUB+= EXIFEXEMPI=""
.else
PLIST_SUB+= EXIFEXEMPI="@comment "
diff --git a/graphics/eom/distinfo b/graphics/eom/distinfo
index 17d4708daf17..c407084f3ec9 100644
--- a/graphics/eom/distinfo
+++ b/graphics/eom/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/eom-1.12.2.tar.xz) = 38ad10a6794e02e9e319a293393a36532e86572010442ba2f1d3773313c0a1da
-SIZE (mate/eom-1.12.2.tar.xz) = 2213260
+TIMESTAMP = 1494460910
+SHA256 (mate/eom-1.18.2.tar.xz) = 0755a43f48fe1a09b826cdd6ed239631f5e4f9163ccb481362534d8fcf3bda02
+SIZE (mate/eom-1.18.2.tar.xz) = 2196228
diff --git a/graphics/eom/pkg-plist b/graphics/eom/pkg-plist
index da5bd6f6f999..adcf042a5cff 100644
--- a/graphics/eom/pkg-plist
+++ b/graphics/eom/pkg-plist
@@ -13,7 +13,6 @@ include/eom-2.20/eom/eom-image.h
include/eom-2.20/eom/eom-job-queue.h
include/eom-2.20/eom/eom-jobs.h
include/eom-2.20/eom/eom-list-store.h
-include/eom-2.20/eom/eom-plugin.h
include/eom-2.20/eom/eom-properties-dialog.h
include/eom-2.20/eom/eom-scroll-view.h
include/eom-2.20/eom/eom-sidebar.h
@@ -23,15 +22,15 @@ include/eom-2.20/eom/eom-thumb-view.h
include/eom-2.20/eom/eom-thumbnail.h
include/eom-2.20/eom/eom-transform.h
include/eom-2.20/eom/eom-window.h
-lib/eom/plugins/fullscreen.eom-plugin
+lib/eom/plugins/fullscreen.plugin
lib/eom/plugins/libfullscreen.so
lib/eom/plugins/libreload.so
lib/eom/plugins/libstatusbar-date.so
-lib/eom/plugins/reload.eom-plugin
-lib/eom/plugins/statusbar-date.eom-plugin
+lib/eom/plugins/reload.plugin
+lib/eom/plugins/statusbar-date.plugin
+lib/girepository-1.0/Eom-1.0.typelib
libdata/pkgconfig/eom.pc
man/man1/eom.1.gz
-share/MateConf/gsettings/eom.convert
share/appdata/eom.appdata.xml
share/applications/eom.desktop
%%PORTDOCS%%%%DOCSDIR%%/EomDialog.html
@@ -40,7 +39,6 @@ share/applications/eom.desktop
%%PORTDOCS%%%%DOCSDIR%%/EomImageSaveInfo.html
%%PORTDOCS%%%%DOCSDIR%%/EomMetadataReaderJpg.html
%%PORTDOCS%%%%DOCSDIR%%/EomMetadataReaderPng.html
-%%PORTDOCS%%%%DOCSDIR%%/EomPluginManager.html
%%PORTDOCS%%%%DOCSDIR%%/EomPreferencesDialog.html
%%PORTDOCS%%%%DOCSDIR%%/EomPrintImageSetup.html
%%PORTDOCS%%%%DOCSDIR%%/EomPrintPreview.html
@@ -68,7 +66,6 @@ share/applications/eom.desktop
%%PORTDOCS%%%%DOCSDIR%%/eom-eom-metadata-reader.html
%%PORTDOCS%%%%DOCSDIR%%/eom-eom-pixbuf-util.html
%%PORTDOCS%%%%DOCSDIR%%/eom-eom-plugin-engine.html
-%%PORTDOCS%%%%DOCSDIR%%/eom-eom-plugin.html
%%PORTDOCS%%%%DOCSDIR%%/eom-eom-print.html
%%PORTDOCS%%%%DOCSDIR%%/eom-eom-properties-dialog.html
%%PORTDOCS%%%%DOCSDIR%%/eom-eom-save-as-dialog-helper.html
@@ -85,7 +82,6 @@ share/applications/eom.desktop
%%PORTDOCS%%%%DOCSDIR%%/eom.devhelp2
%%PORTDOCS%%%%DOCSDIR%%/home.png
%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/index.sgml
%%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png
%%PORTDOCS%%%%DOCSDIR%%/left.png
%%PORTDOCS%%%%DOCSDIR%%/pt01.html
@@ -95,6 +91,7 @@ share/applications/eom.desktop
%%PORTDOCS%%%%DOCSDIR%%/style.css
%%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png
%%PORTDOCS%%%%DOCSDIR%%/up.png
+%%DATADIR%%/eom-3.18.css
%%DATADIR%%/eom-image-properties-dialog.ui
%%DATADIR%%/eom-multiple-save-as-dialog.ui
%%DATADIR%%/eom-preferences-dialog.ui
@@ -118,6 +115,7 @@ share/applications/eom.desktop
%%DATADIR%%/icons/hicolor/scalable/actions/eom-plugin.svg
%%DATADIR%%/icons/hicolor/scalable/actions/slideshow-play.svg
%%DATADIR%%/pixmaps/thumbnail-frame.png
+share/gir-1.0/Eom-1.0.gir
share/help/C/eom/figures/eom_save_as_window.png
share/help/C/eom/figures/eom_start_window.png
share/help/C/eom/figures/eom_toolbar_editor_window.png
@@ -255,7 +253,6 @@ share/locale/as/LC_MESSAGES/eom.mo
share/locale/ast/LC_MESSAGES/eom.mo
share/locale/az/LC_MESSAGES/eom.mo
share/locale/be/LC_MESSAGES/eom.mo
-share/locale/be@latin/LC_MESSAGES/eom.mo
share/locale/bg/LC_MESSAGES/eom.mo
share/locale/bn/LC_MESSAGES/eom.mo
share/locale/bn_IN/LC_MESSAGES/eom.mo
@@ -270,18 +267,20 @@ share/locale/da/LC_MESSAGES/eom.mo
share/locale/de/LC_MESSAGES/eom.mo
share/locale/dz/LC_MESSAGES/eom.mo
share/locale/el/LC_MESSAGES/eom.mo
-share/locale/en@shaw/LC_MESSAGES/eom.mo
share/locale/en_AU/LC_MESSAGES/eom.mo
share/locale/en_CA/LC_MESSAGES/eom.mo
share/locale/en_GB/LC_MESSAGES/eom.mo
-share/locale/en_US/LC_MESSAGES/eom.mo
share/locale/eo/LC_MESSAGES/eom.mo
share/locale/es/LC_MESSAGES/eom.mo
+share/locale/es_CO/LC_MESSAGES/eom.mo
+share/locale/es_MX/LC_MESSAGES/eom.mo
share/locale/et/LC_MESSAGES/eom.mo
share/locale/eu/LC_MESSAGES/eom.mo
share/locale/fa/LC_MESSAGES/eom.mo
share/locale/fi/LC_MESSAGES/eom.mo
share/locale/fr/LC_MESSAGES/eom.mo
+share/locale/fr_CA/LC_MESSAGES/eom.mo
+share/locale/frp/LC_MESSAGES/eom.mo
share/locale/fur/LC_MESSAGES/eom.mo
share/locale/ga/LC_MESSAGES/eom.mo
share/locale/gl/LC_MESSAGES/eom.mo
@@ -295,12 +294,14 @@ share/locale/id/LC_MESSAGES/eom.mo
share/locale/is/LC_MESSAGES/eom.mo
share/locale/it/LC_MESSAGES/eom.mo
share/locale/ja/LC_MESSAGES/eom.mo
+share/locale/jv/LC_MESSAGES/eom.mo
share/locale/ka/LC_MESSAGES/eom.mo
share/locale/kk/LC_MESSAGES/eom.mo
share/locale/kn/LC_MESSAGES/eom.mo
share/locale/ko/LC_MESSAGES/eom.mo
share/locale/ks/LC_MESSAGES/eom.mo
share/locale/ku/LC_MESSAGES/eom.mo
+share/locale/ku_IQ/LC_MESSAGES/eom.mo
share/locale/ky/LC_MESSAGES/eom.mo
share/locale/lt/LC_MESSAGES/eom.mo
share/locale/lv/LC_MESSAGES/eom.mo
@@ -321,6 +322,7 @@ share/locale/oc/LC_MESSAGES/eom.mo
share/locale/or/LC_MESSAGES/eom.mo
share/locale/pa/LC_MESSAGES/eom.mo
share/locale/pl/LC_MESSAGES/eom.mo
+share/locale/pms/LC_MESSAGES/eom.mo
share/locale/ps/LC_MESSAGES/eom.mo
share/locale/pt/LC_MESSAGES/eom.mo
share/locale/pt_BR/LC_MESSAGES/eom.mo
@@ -342,7 +344,6 @@ share/locale/tr/LC_MESSAGES/eom.mo
share/locale/ug/LC_MESSAGES/eom.mo
share/locale/uk/LC_MESSAGES/eom.mo
share/locale/uz/LC_MESSAGES/eom.mo
-share/locale/uz@cyrillic/LC_MESSAGES/eom.mo
share/locale/vi/LC_MESSAGES/eom.mo
share/locale/wa/LC_MESSAGES/eom.mo
share/locale/xh/LC_MESSAGES/eom.mo
diff --git a/math/Makefile b/math/Makefile
index a8c5ddc1f3a6..1b11fb94ff6b 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -274,6 +274,7 @@
SUBDIR += ltl
SUBDIR += ltl2ba
SUBDIR += lybniz
+ SUBDIR += mate-calc
SUBDIR += math77
SUBDIR += mathmod
SUBDIR += mathomatic
diff --git a/math/mate-calc/Makefile b/math/mate-calc/Makefile
new file mode 100644
index 000000000000..94e8f3e5af41
--- /dev/null
+++ b/math/mate-calc/Makefile
@@ -0,0 +1,26 @@
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= mate-calc
+PORTVERSION= 1.18.0
+CATEGORIES= math mate
+MASTER_SITES= MATE
+DIST_SUBDIR= mate
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= MATE calculator tool based on the old calctool for OpenWindows
+
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool
+
+PORTSCOUT= limitw:1,even
+
+USES= gettext gmake pkgconfig localbase tar:xz
+USE_GNOME= cairo gdkpixbuf2 gtk30 intlhack libxml2
+GNU_CONFIGURE= yes
+
+GLIB_SCHEMAS= org.mate.calc.gschema.xml
+
+.include <bsd.port.mk>
diff --git a/math/mate-calc/distinfo b/math/mate-calc/distinfo
new file mode 100644
index 000000000000..dc36db7af6d0
--- /dev/null
+++ b/math/mate-calc/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499014432
+SHA256 (mate/mate-calc-1.18.0.tar.xz) = 9e02ea711000378d25274e532dd161f09172d1dcefdb3aa4b1ab7a2bfa34da61
+SIZE (mate/mate-calc-1.18.0.tar.xz) = 751780
diff --git a/math/mate-calc/files/patch-src_mate-calc-cmd.c b/math/mate-calc/files/patch-src_mate-calc-cmd.c
new file mode 100644
index 000000000000..86806b5f0b01
--- /dev/null
+++ b/math/mate-calc/files/patch-src_mate-calc-cmd.c
@@ -0,0 +1,93 @@
+--- src/mate-calc-cmd.c.orig 2013-03-24 20:56:44.000000000 -0500
++++ src/mate-calc-cmd.c 2013-03-24 20:58:28.000000000 -0500
+@@ -8,10 +8,12 @@
+ * license.
+ */
+
++#include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <sys/param.h>
+ #include <time.h>
+ #include <locale.h>
+
+@@ -22,6 +24,77 @@
+
+ static MpSerializer *result_serializer;
+
++#if __FreeBSD_version < 800067
++static ssize_t
++getline (char **lineptr, size_t *n, FILE *stream)
++{
++ char *line, *p;
++ long size, copy;
++
++ if (lineptr == NULL || n == NULL) {
++ errno = EINVAL;
++ return (ssize_t) -1;
++ }
++
++ if (ferror (stream))
++ return (ssize_t) -1;
++
++ /* Make sure we have a line buffer to start with. */
++ if (*lineptr == NULL || *n < 2) /* !seen and no buf yet need 2 chars. */ {
++#ifndef MAX_CANON
++#define MAX_CANON 256
++#endif
++ if (!*lineptr)
++ line = (char *) malloc (MAX_CANON);
++ else
++ line = (char *) realloc (*lineptr, MAX_CANON);
++ if (line == NULL)
++ return (ssize_t) -1;
++ *lineptr = line;
++ *n = MAX_CANON;
++ }
++
++ line = *lineptr;
++ size = *n;
++
++ copy = size;
++ p = line;
++
++ while (1) {
++ long len;
++
++ while (--copy > 0) {
++ int c = getc (stream);
++
++ if (c == EOF)
++ goto lose;
++ else if ((*p++ = c) == '\n')
++ goto win;
++ }
++
++ /* Need to enlarge the line buffer. */
++ len = p - line;
++ size *= 2;
++ line = (char *) realloc (line, size);
++ if (line == NULL)
++ goto lose;
++ *lineptr = line;
++ *n = size;
++ p = line + len;
++ copy = size - len;
++ }
++
++lose:
++ if (p == *lineptr)
++ return (ssize_t) -1;
++
++ /* Return a partial line since we got an error in the middle. */
++win:
++ *p = '\0';
++ return p - *lineptr;
++}
++#endif
++
+ static void
+ solve(const char *equation)
+ {
diff --git a/math/mate-calc/pkg-descr b/math/mate-calc/pkg-descr
new file mode 100644
index 000000000000..df9fa7a42b73
--- /dev/null
+++ b/math/mate-calc/pkg-descr
@@ -0,0 +1,5 @@
+Mate-calc is a powerful graphical calulator with financial, logical and
+scientific modes. It uses a multiple precision package to do its arithmetic to
+give a high degree of accuracy.
+
+WWW: http://mate-desktop.org/
diff --git a/math/mate-calc/pkg-plist b/math/mate-calc/pkg-plist
new file mode 100644
index 000000000000..4e2ff008b80a
--- /dev/null
+++ b/math/mate-calc/pkg-plist
@@ -0,0 +1,834 @@
+bin/mate-calc
+bin/mate-calc-cmd
+bin/mate-calculator
+man/man1/mate-calc-cmd.1.gz
+man/man1/mate-calc.1.gz
+share/appdata/mate-calc.appdata.xml
+share/applications/mate-calc.desktop
+share/help/C/mate-calc/absolute.page
+share/help/C/mate-calc/base.page
+share/help/C/mate-calc/boolean.page
+share/help/C/mate-calc/complex.page
+share/help/C/mate-calc/conv-base.page
+share/help/C/mate-calc/conv-character.page
+share/help/C/mate-calc/conv-currency.page
+share/help/C/mate-calc/conv-length.page
+share/help/C/mate-calc/conv-time.page
+share/help/C/mate-calc/conv-weight.page
+share/help/C/mate-calc/equation.page
+share/help/C/mate-calc/factorial.page
+share/help/C/mate-calc/factorize.page
+share/help/C/mate-calc/financial.page
+share/help/C/mate-calc/functions.page
+share/help/C/mate-calc/index.page
+share/help/C/mate-calc/keyboard.page
+share/help/C/mate-calc/legal.xml
+share/help/C/mate-calc/logarithm.page
+share/help/C/mate-calc/modulus.page
+share/help/C/mate-calc/mouse.page
+share/help/C/mate-calc/number-display.page
+share/help/C/mate-calc/percentage.page
+share/help/C/mate-calc/power.page
+share/help/C/mate-calc/scientific.page
+share/help/C/mate-calc/superscript.page
+share/help/C/mate-calc/trigonometry.page
+share/help/C/mate-calc/variables.page
+share/help/bg/mate-calc/absolute.page
+share/help/bg/mate-calc/base.page
+share/help/bg/mate-calc/boolean.page
+share/help/bg/mate-calc/complex.page
+share/help/bg/mate-calc/conv-base.page
+share/help/bg/mate-calc/conv-character.page
+share/help/bg/mate-calc/conv-currency.page
+share/help/bg/mate-calc/conv-length.page
+share/help/bg/mate-calc/conv-time.page
+share/help/bg/mate-calc/conv-weight.page
+share/help/bg/mate-calc/equation.page
+share/help/bg/mate-calc/factorial.page
+share/help/bg/mate-calc/factorize.page
+share/help/bg/mate-calc/financial.page
+share/help/bg/mate-calc/functions.page
+share/help/bg/mate-calc/index.page
+share/help/bg/mate-calc/keyboard.page
+share/help/bg/mate-calc/legal.xml
+share/help/bg/mate-calc/logarithm.page
+share/help/bg/mate-calc/modulus.page
+share/help/bg/mate-calc/mouse.page
+share/help/bg/mate-calc/number-display.page
+share/help/bg/mate-calc/percentage.page
+share/help/bg/mate-calc/power.page
+share/help/bg/mate-calc/scientific.page
+share/help/bg/mate-calc/superscript.page
+share/help/bg/mate-calc/trigonometry.page
+share/help/bg/mate-calc/variables.page
+share/help/ca/mate-calc/absolute.page
+share/help/ca/mate-calc/base.page
+share/help/ca/mate-calc/boolean.page
+share/help/ca/mate-calc/complex.page
+share/help/ca/mate-calc/conv-base.page
+share/help/ca/mate-calc/conv-character.page
+share/help/ca/mate-calc/conv-currency.page
+share/help/ca/mate-calc/conv-length.page
+share/help/ca/mate-calc/conv-time.page
+share/help/ca/mate-calc/conv-weight.page
+share/help/ca/mate-calc/equation.page
+share/help/ca/mate-calc/factorial.page
+share/help/ca/mate-calc/factorize.page
+share/help/ca/mate-calc/financial.page
+share/help/ca/mate-calc/functions.page
+share/help/ca/mate-calc/index.page
+share/help/ca/mate-calc/keyboard.page
+share/help/ca/mate-calc/legal.xml
+share/help/ca/mate-calc/logarithm.page
+share/help/ca/mate-calc/modulus.page
+share/help/ca/mate-calc/mouse.page
+share/help/ca/mate-calc/number-display.page
+share/help/ca/mate-calc/percentage.page
+share/help/ca/mate-calc/power.page
+share/help/ca/mate-calc/scientific.page
+share/help/ca/mate-calc/superscript.page
+share/help/ca/mate-calc/trigonometry.page
+share/help/ca/mate-calc/variables.page
+share/help/cs/mate-calc/absolute.page
+share/help/cs/mate-calc/base.page
+share/help/cs/mate-calc/boolean.page
+share/help/cs/mate-calc/complex.page
+share/help/cs/mate-calc/conv-base.page
+share/help/cs/mate-calc/conv-character.page
+share/help/cs/mate-calc/conv-currency.page
+share/help/cs/mate-calc/conv-length.page
+share/help/cs/mate-calc/conv-time.page
+share/help/cs/mate-calc/conv-weight.page
+share/help/cs/mate-calc/equation.page
+share/help/cs/mate-calc/factorial.page
+share/help/cs/mate-calc/factorize.page
+share/help/cs/mate-calc/financial.page
+share/help/cs/mate-calc/functions.page
+share/help/cs/mate-calc/index.page
+share/help/cs/mate-calc/keyboard.page
+share/help/cs/mate-calc/legal.xml
+share/help/cs/mate-calc/logarithm.page
+share/help/cs/mate-calc/modulus.page
+share/help/cs/mate-calc/mouse.page
+share/help/cs/mate-calc/number-display.page
+share/help/cs/mate-calc/percentage.page
+share/help/cs/mate-calc/power.page
+share/help/cs/mate-calc/scientific.page
+share/help/cs/mate-calc/superscript.page
+share/help/cs/mate-calc/trigonometry.page
+share/help/cs/mate-calc/variables.page
+share/help/de/mate-calc/absolute.page
+share/help/de/mate-calc/base.page
+share/help/de/mate-calc/boolean.page
+share/help/de/mate-calc/complex.page
+share/help/de/mate-calc/conv-base.page
+share/help/de/mate-calc/conv-character.page
+share/help/de/mate-calc/conv-currency.page
+share/help/de/mate-calc/conv-length.page
+share/help/de/mate-calc/conv-time.page
+share/help/de/mate-calc/conv-weight.page
+share/help/de/mate-calc/equation.page
+share/help/de/mate-calc/factorial.page
+share/help/de/mate-calc/factorize.page
+share/help/de/mate-calc/financial.page
+share/help/de/mate-calc/functions.page
+share/help/de/mate-calc/index.page
+share/help/de/mate-calc/keyboard.page
+share/help/de/mate-calc/legal.xml
+share/help/de/mate-calc/logarithm.page
+share/help/de/mate-calc/modulus.page
+share/help/de/mate-calc/mouse.page
+share/help/de/mate-calc/number-display.page
+share/help/de/mate-calc/percentage.page
+share/help/de/mate-calc/power.page
+share/help/de/mate-calc/scientific.page
+share/help/de/mate-calc/superscript.page
+share/help/de/mate-calc/trigonometry.page
+share/help/de/mate-calc/variables.page
+share/help/el/mate-calc/absolute.page
+share/help/el/mate-calc/base.page
+share/help/el/mate-calc/boolean.page
+share/help/el/mate-calc/complex.page
+share/help/el/mate-calc/conv-base.page
+share/help/el/mate-calc/conv-character.page
+share/help/el/mate-calc/conv-currency.page
+share/help/el/mate-calc/conv-length.page
+share/help/el/mate-calc/conv-time.page
+share/help/el/mate-calc/conv-weight.page
+share/help/el/mate-calc/equation.page
+share/help/el/mate-calc/factorial.page
+share/help/el/mate-calc/factorize.page
+share/help/el/mate-calc/financial.page
+share/help/el/mate-calc/functions.page
+share/help/el/mate-calc/index.page
+share/help/el/mate-calc/keyboard.page
+share/help/el/mate-calc/legal.xml
+share/help/el/mate-calc/logarithm.page
+share/help/el/mate-calc/modulus.page
+share/help/el/mate-calc/mouse.page
+share/help/el/mate-calc/number-display.page
+share/help/el/mate-calc/percentage.page
+share/help/el/mate-calc/power.page
+share/help/el/mate-calc/scientific.page
+share/help/el/mate-calc/superscript.page
+share/help/el/mate-calc/trigonometry.page
+share/help/el/mate-calc/variables.page
+share/help/es/mate-calc/absolute.page
+share/help/es/mate-calc/base.page
+share/help/es/mate-calc/boolean.page
+share/help/es/mate-calc/complex.page
+share/help/es/mate-calc/conv-base.page
+share/help/es/mate-calc/conv-character.page
+share/help/es/mate-calc/conv-currency.page
+share/help/es/mate-calc/conv-length.page
+share/help/es/mate-calc/conv-time.page
+share/help/es/mate-calc/conv-weight.page
+share/help/es/mate-calc/equation.page
+share/help/es/mate-calc/factorial.page
+share/help/es/mate-calc/factorize.page
+share/help/es/mate-calc/financial.page
+share/help/es/mate-calc/functions.page
+share/help/es/mate-calc/index.page
+share/help/es/mate-calc/keyboard.page
+share/help/es/mate-calc/legal.xml
+share/help/es/mate-calc/logarithm.page
+share/help/es/mate-calc/modulus.page
+share/help/es/mate-calc/mouse.page
+share/help/es/mate-calc/number-display.page
+share/help/es/mate-calc/percentage.page
+share/help/es/mate-calc/power.page
+share/help/es/mate-calc/scientific.page
+share/help/es/mate-calc/superscript.page
+share/help/es/mate-calc/trigonometry.page
+share/help/es/mate-calc/variables.page
+share/help/eu/mate-calc/absolute.page
+share/help/eu/mate-calc/base.page
+share/help/eu/mate-calc/boolean.page
+share/help/eu/mate-calc/complex.page
+share/help/eu/mate-calc/conv-base.page
+share/help/eu/mate-calc/conv-character.page
+share/help/eu/mate-calc/conv-currency.page
+share/help/eu/mate-calc/conv-length.page
+share/help/eu/mate-calc/conv-time.page
+share/help/eu/mate-calc/conv-weight.page
+share/help/eu/mate-calc/equation.page
+share/help/eu/mate-calc/factorial.page
+share/help/eu/mate-calc/factorize.page
+share/help/eu/mate-calc/financial.page
+share/help/eu/mate-calc/functions.page
+share/help/eu/mate-calc/index.page
+share/help/eu/mate-calc/keyboard.page
+share/help/eu/mate-calc/legal.xml
+share/help/eu/mate-calc/logarithm.page
+share/help/eu/mate-calc/modulus.page
+share/help/eu/mate-calc/mouse.page
+share/help/eu/mate-calc/number-display.page
+share/help/eu/mate-calc/percentage.page
+share/help/eu/mate-calc/power.page
+share/help/eu/mate-calc/scientific.page
+share/help/eu/mate-calc/superscript.page
+share/help/eu/mate-calc/trigonometry.page
+share/help/eu/mate-calc/variables.page
+share/help/fi/mate-calc/absolute.page
+share/help/fi/mate-calc/base.page
+share/help/fi/mate-calc/boolean.page
+share/help/fi/mate-calc/complex.page
+share/help/fi/mate-calc/conv-base.page
+share/help/fi/mate-calc/conv-character.page
+share/help/fi/mate-calc/conv-currency.page
+share/help/fi/mate-calc/conv-length.page
+share/help/fi/mate-calc/conv-time.page
+share/help/fi/mate-calc/conv-weight.page
+share/help/fi/mate-calc/equation.page
+share/help/fi/mate-calc/factorial.page
+share/help/fi/mate-calc/factorize.page
+share/help/fi/mate-calc/financial.page
+share/help/fi/mate-calc/functions.page
+share/help/fi/mate-calc/index.page
+share/help/fi/mate-calc/keyboard.page
+share/help/fi/mate-calc/legal.xml
+share/help/fi/mate-calc/logarithm.page
+share/help/fi/mate-calc/modulus.page
+share/help/fi/mate-calc/mouse.page
+share/help/fi/mate-calc/number-display.page
+share/help/fi/mate-calc/percentage.page
+share/help/fi/mate-calc/power.page
+share/help/fi/mate-calc/scientific.page
+share/help/fi/mate-calc/superscript.page
+share/help/fi/mate-calc/trigonometry.page
+share/help/fi/mate-calc/variables.page
+share/help/fr/mate-calc/absolute.page
+share/help/fr/mate-calc/base.page
+share/help/fr/mate-calc/boolean.page
+share/help/fr/mate-calc/complex.page
+share/help/fr/mate-calc/conv-base.page
+share/help/fr/mate-calc/conv-character.page
+share/help/fr/mate-calc/conv-currency.page
+share/help/fr/mate-calc/conv-length.page
+share/help/fr/mate-calc/conv-time.page
+share/help/fr/mate-calc/conv-weight.page
+share/help/fr/mate-calc/equation.page
+share/help/fr/mate-calc/factorial.page
+share/help/fr/mate-calc/factorize.page
+share/help/fr/mate-calc/financial.page
+share/help/fr/mate-calc/functions.page
+share/help/fr/mate-calc/index.page
+share/help/fr/mate-calc/keyboard.page
+share/help/fr/mate-calc/legal.xml
+share/help/fr/mate-calc/logarithm.page
+share/help/fr/mate-calc/modulus.page
+share/help/fr/mate-calc/mouse.page
+share/help/fr/mate-calc/number-display.page
+share/help/fr/mate-calc/percentage.page
+share/help/fr/mate-calc/power.page
+share/help/fr/mate-calc/scientific.page
+share/help/fr/mate-calc/superscript.page
+share/help/fr/mate-calc/trigonometry.page
+share/help/fr/mate-calc/variables.page
+share/help/gl/mate-calc/absolute.page
+share/help/gl/mate-calc/base.page
+share/help/gl/mate-calc/boolean.page
+share/help/gl/mate-calc/complex.page
+share/help/gl/mate-calc/conv-base.page
+share/help/gl/mate-calc/conv-character.page
+share/help/gl/mate-calc/conv-currency.page
+share/help/gl/mate-calc/conv-length.page
+share/help/gl/mate-calc/conv-time.page
+share/help/gl/mate-calc/conv-weight.page
+share/help/gl/mate-calc/equation.page
+share/help/gl/mate-calc/factorial.page
+share/help/gl/mate-calc/factorize.page
+share/help/gl/mate-calc/financial.page
+share/help/gl/mate-calc/functions.page
+share/help/gl/mate-calc/index.page
+share/help/gl/mate-calc/keyboard.page
+share/help/gl/mate-calc/legal.xml
+share/help/gl/mate-calc/logarithm.page
+share/help/gl/mate-calc/modulus.page
+share/help/gl/mate-calc/mouse.page
+share/help/gl/mate-calc/number-display.page
+share/help/gl/mate-calc/percentage.page
+share/help/gl/mate-calc/power.page
+share/help/gl/mate-calc/scientific.page
+share/help/gl/mate-calc/superscript.page
+share/help/gl/mate-calc/trigonometry.page
+share/help/gl/mate-calc/variables.page
+share/help/hu/mate-calc/absolute.page
+share/help/hu/mate-calc/base.page
+share/help/hu/mate-calc/boolean.page
+share/help/hu/mate-calc/complex.page
+share/help/hu/mate-calc/conv-base.page
+share/help/hu/mate-calc/conv-character.page
+share/help/hu/mate-calc/conv-currency.page
+share/help/hu/mate-calc/conv-length.page
+share/help/hu/mate-calc/conv-time.page
+share/help/hu/mate-calc/conv-weight.page
+share/help/hu/mate-calc/equation.page
+share/help/hu/mate-calc/factorial.page
+share/help/hu/mate-calc/factorize.page
+share/help/hu/mate-calc/financial.page
+share/help/hu/mate-calc/functions.page
+share/help/hu/mate-calc/index.page
+share/help/hu/mate-calc/keyboard.page
+share/help/hu/mate-calc/legal.xml
+share/help/hu/mate-calc/logarithm.page
+share/help/hu/mate-calc/modulus.page
+share/help/hu/mate-calc/mouse.page
+share/help/hu/mate-calc/number-display.page
+share/help/hu/mate-calc/percentage.page
+share/help/hu/mate-calc/power.page
+share/help/hu/mate-calc/scientific.page
+share/help/hu/mate-calc/superscript.page
+share/help/hu/mate-calc/trigonometry.page
+share/help/hu/mate-calc/variables.page
+share/help/it/mate-calc/absolute.page
+share/help/it/mate-calc/base.page
+share/help/it/mate-calc/boolean.page
+share/help/it/mate-calc/complex.page
+share/help/it/mate-calc/conv-base.page
+share/help/it/mate-calc/conv-character.page
+share/help/it/mate-calc/conv-currency.page
+share/help/it/mate-calc/conv-length.page
+share/help/it/mate-calc/conv-time.page
+share/help/it/mate-calc/conv-weight.page
+share/help/it/mate-calc/equation.page
+share/help/it/mate-calc/factorial.page
+share/help/it/mate-calc/factorize.page
+share/help/it/mate-calc/financial.page
+share/help/it/mate-calc/functions.page
+share/help/it/mate-calc/index.page
+share/help/it/mate-calc/keyboard.page
+share/help/it/mate-calc/legal.xml
+share/help/it/mate-calc/logarithm.page
+share/help/it/mate-calc/modulus.page
+share/help/it/mate-calc/mouse.page
+share/help/it/mate-calc/number-display.page
+share/help/it/mate-calc/percentage.page
+share/help/it/mate-calc/power.page
+share/help/it/mate-calc/scientific.page
+share/help/it/mate-calc/superscript.page
+share/help/it/mate-calc/trigonometry.page
+share/help/it/mate-calc/variables.page
+share/help/ja/mate-calc/absolute.page
+share/help/ja/mate-calc/base.page
+share/help/ja/mate-calc/boolean.page
+share/help/ja/mate-calc/complex.page
+share/help/ja/mate-calc/conv-base.page
+share/help/ja/mate-calc/conv-character.page
+share/help/ja/mate-calc/conv-currency.page
+share/help/ja/mate-calc/conv-length.page
+share/help/ja/mate-calc/conv-time.page
+share/help/ja/mate-calc/conv-weight.page
+share/help/ja/mate-calc/equation.page
+share/help/ja/mate-calc/factorial.page
+share/help/ja/mate-calc/factorize.page
+share/help/ja/mate-calc/financial.page
+share/help/ja/mate-calc/functions.page
+share/help/ja/mate-calc/index.page
+share/help/ja/mate-calc/keyboard.page
+share/help/ja/mate-calc/legal.xml
+share/help/ja/mate-calc/logarithm.page
+share/help/ja/mate-calc/modulus.page
+share/help/ja/mate-calc/mouse.page
+share/help/ja/mate-calc/number-display.page
+share/help/ja/mate-calc/percentage.page
+share/help/ja/mate-calc/power.page
+share/help/ja/mate-calc/scientific.page
+share/help/ja/mate-calc/superscript.page
+share/help/ja/mate-calc/trigonometry.page
+share/help/ja/mate-calc/variables.page
+share/help/ko/mate-calc/absolute.page
+share/help/ko/mate-calc/base.page
+share/help/ko/mate-calc/boolean.page
+share/help/ko/mate-calc/complex.page
+share/help/ko/mate-calc/conv-base.page
+share/help/ko/mate-calc/conv-character.page
+share/help/ko/mate-calc/conv-currency.page
+share/help/ko/mate-calc/conv-length.page
+share/help/ko/mate-calc/conv-time.page
+share/help/ko/mate-calc/conv-weight.page
+share/help/ko/mate-calc/equation.page
+share/help/ko/mate-calc/factorial.page
+share/help/ko/mate-calc/factorize.page
+share/help/ko/mate-calc/financial.page
+share/help/ko/mate-calc/functions.page
+share/help/ko/mate-calc/index.page
+share/help/ko/mate-calc/keyboard.page
+share/help/ko/mate-calc/legal.xml
+share/help/ko/mate-calc/logarithm.page
+share/help/ko/mate-calc/modulus.page
+share/help/ko/mate-calc/mouse.page
+share/help/ko/mate-calc/number-display.page
+share/help/ko/mate-calc/percentage.page
+share/help/ko/mate-calc/power.page
+share/help/ko/mate-calc/scientific.page
+share/help/ko/mate-calc/superscript.page
+share/help/ko/mate-calc/trigonometry.page
+share/help/ko/mate-calc/variables.page
+share/help/lv/mate-calc/absolute.page
+share/help/lv/mate-calc/base.page
+share/help/lv/mate-calc/boolean.page
+share/help/lv/mate-calc/complex.page
+share/help/lv/mate-calc/conv-base.page
+share/help/lv/mate-calc/conv-character.page
+share/help/lv/mate-calc/conv-currency.page
+share/help/lv/mate-calc/conv-length.page
+share/help/lv/mate-calc/conv-time.page
+share/help/lv/mate-calc/conv-weight.page
+share/help/lv/mate-calc/equation.page
+share/help/lv/mate-calc/factorial.page
+share/help/lv/mate-calc/factorize.page
+share/help/lv/mate-calc/financial.page
+share/help/lv/mate-calc/functions.page
+share/help/lv/mate-calc/index.page
+share/help/lv/mate-calc/keyboard.page
+share/help/lv/mate-calc/legal.xml
+share/help/lv/mate-calc/logarithm.page
+share/help/lv/mate-calc/modulus.page
+share/help/lv/mate-calc/mouse.page
+share/help/lv/mate-calc/number-display.page
+share/help/lv/mate-calc/percentage.page
+share/help/lv/mate-calc/power.page
+share/help/lv/mate-calc/scientific.page
+share/help/lv/mate-calc/superscript.page
+share/help/lv/mate-calc/trigonometry.page
+share/help/lv/mate-calc/variables.page
+share/help/oc/mate-calc/absolute.page
+share/help/oc/mate-calc/base.page
+share/help/oc/mate-calc/boolean.page
+share/help/oc/mate-calc/complex.page
+share/help/oc/mate-calc/conv-base.page
+share/help/oc/mate-calc/conv-character.page
+share/help/oc/mate-calc/conv-currency.page
+share/help/oc/mate-calc/conv-length.page
+share/help/oc/mate-calc/conv-time.page
+share/help/oc/mate-calc/conv-weight.page
+share/help/oc/mate-calc/equation.page
+share/help/oc/mate-calc/factorial.page
+share/help/oc/mate-calc/factorize.page
+share/help/oc/mate-calc/financial.page
+share/help/oc/mate-calc/functions.page
+share/help/oc/mate-calc/index.page
+share/help/oc/mate-calc/keyboard.page
+share/help/oc/mate-calc/legal.xml
+share/help/oc/mate-calc/logarithm.page
+share/help/oc/mate-calc/modulus.page
+share/help/oc/mate-calc/mouse.page
+share/help/oc/mate-calc/number-display.page
+share/help/oc/mate-calc/percentage.page
+share/help/oc/mate-calc/power.page
+share/help/oc/mate-calc/scientific.page
+share/help/oc/mate-calc/superscript.page
+share/help/oc/mate-calc/trigonometry.page
+share/help/oc/mate-calc/variables.page
+share/help/pt_BR/mate-calc/absolute.page
+share/help/pt_BR/mate-calc/base.page
+share/help/pt_BR/mate-calc/boolean.page
+share/help/pt_BR/mate-calc/complex.page
+share/help/pt_BR/mate-calc/conv-base.page
+share/help/pt_BR/mate-calc/conv-character.page
+share/help/pt_BR/mate-calc/conv-currency.page
+share/help/pt_BR/mate-calc/conv-length.page
+share/help/pt_BR/mate-calc/conv-time.page
+share/help/pt_BR/mate-calc/conv-weight.page
+share/help/pt_BR/mate-calc/equation.page
+share/help/pt_BR/mate-calc/factorial.page
+share/help/pt_BR/mate-calc/factorize.page
+share/help/pt_BR/mate-calc/financial.page
+share/help/pt_BR/mate-calc/functions.page
+share/help/pt_BR/mate-calc/index.page
+share/help/pt_BR/mate-calc/keyboard.page
+share/help/pt_BR/mate-calc/legal.xml
+share/help/pt_BR/mate-calc/logarithm.page
+share/help/pt_BR/mate-calc/modulus.page
+share/help/pt_BR/mate-calc/mouse.page
+share/help/pt_BR/mate-calc/number-display.page
+share/help/pt_BR/mate-calc/percentage.page
+share/help/pt_BR/mate-calc/power.page
+share/help/pt_BR/mate-calc/scientific.page
+share/help/pt_BR/mate-calc/superscript.page
+share/help/pt_BR/mate-calc/trigonometry.page
+share/help/pt_BR/mate-calc/variables.page
+share/help/ro/mate-calc/absolute.page
+share/help/ro/mate-calc/base.page
+share/help/ro/mate-calc/boolean.page
+share/help/ro/mate-calc/complex.page
+share/help/ro/mate-calc/conv-base.page
+share/help/ro/mate-calc/conv-character.page
+share/help/ro/mate-calc/conv-currency.page
+share/help/ro/mate-calc/conv-length.page
+share/help/ro/mate-calc/conv-time.page
+share/help/ro/mate-calc/conv-weight.page
+share/help/ro/mate-calc/equation.page
+share/help/ro/mate-calc/factorial.page
+share/help/ro/mate-calc/factorize.page
+share/help/ro/mate-calc/financial.page
+share/help/ro/mate-calc/functions.page
+share/help/ro/mate-calc/index.page
+share/help/ro/mate-calc/keyboard.page
+share/help/ro/mate-calc/legal.xml
+share/help/ro/mate-calc/logarithm.page
+share/help/ro/mate-calc/modulus.page
+share/help/ro/mate-calc/mouse.page
+share/help/ro/mate-calc/number-display.page
+share/help/ro/mate-calc/percentage.page
+share/help/ro/mate-calc/power.page
+share/help/ro/mate-calc/scientific.page
+share/help/ro/mate-calc/superscript.page
+share/help/ro/mate-calc/trigonometry.page
+share/help/ro/mate-calc/variables.page
+share/help/ru/mate-calc/absolute.page
+share/help/ru/mate-calc/base.page
+share/help/ru/mate-calc/boolean.page
+share/help/ru/mate-calc/complex.page
+share/help/ru/mate-calc/conv-base.page
+share/help/ru/mate-calc/conv-character.page
+share/help/ru/mate-calc/conv-currency.page
+share/help/ru/mate-calc/conv-length.page
+share/help/ru/mate-calc/conv-time.page
+share/help/ru/mate-calc/conv-weight.page
+share/help/ru/mate-calc/equation.page
+share/help/ru/mate-calc/factorial.page
+share/help/ru/mate-calc/factorize.page
+share/help/ru/mate-calc/financial.page
+share/help/ru/mate-calc/functions.page
+share/help/ru/mate-calc/index.page
+share/help/ru/mate-calc/keyboard.page
+share/help/ru/mate-calc/legal.xml
+share/help/ru/mate-calc/logarithm.page
+share/help/ru/mate-calc/modulus.page
+share/help/ru/mate-calc/mouse.page
+share/help/ru/mate-calc/number-display.page
+share/help/ru/mate-calc/percentage.page
+share/help/ru/mate-calc/power.page
+share/help/ru/mate-calc/scientific.page
+share/help/ru/mate-calc/superscript.page
+share/help/ru/mate-calc/trigonometry.page
+share/help/ru/mate-calc/variables.page
+share/help/sl/mate-calc/absolute.page
+share/help/sl/mate-calc/base.page
+share/help/sl/mate-calc/boolean.page
+share/help/sl/mate-calc/complex.page
+share/help/sl/mate-calc/conv-base.page
+share/help/sl/mate-calc/conv-character.page
+share/help/sl/mate-calc/conv-currency.page
+share/help/sl/mate-calc/conv-length.page
+share/help/sl/mate-calc/conv-time.page
+share/help/sl/mate-calc/conv-weight.page
+share/help/sl/mate-calc/equation.page
+share/help/sl/mate-calc/factorial.page
+share/help/sl/mate-calc/factorize.page
+share/help/sl/mate-calc/financial.page
+share/help/sl/mate-calc/functions.page
+share/help/sl/mate-calc/index.page
+share/help/sl/mate-calc/keyboard.page
+share/help/sl/mate-calc/legal.xml
+share/help/sl/mate-calc/logarithm.page
+share/help/sl/mate-calc/modulus.page
+share/help/sl/mate-calc/mouse.page
+share/help/sl/mate-calc/number-display.page
+share/help/sl/mate-calc/percentage.page
+share/help/sl/mate-calc/power.page
+share/help/sl/mate-calc/scientific.page
+share/help/sl/mate-calc/superscript.page
+share/help/sl/mate-calc/trigonometry.page
+share/help/sl/mate-calc/variables.page
+share/help/sv/mate-calc/absolute.page
+share/help/sv/mate-calc/base.page
+share/help/sv/mate-calc/boolean.page
+share/help/sv/mate-calc/complex.page
+share/help/sv/mate-calc/conv-base.page
+share/help/sv/mate-calc/conv-character.page
+share/help/sv/mate-calc/conv-currency.page
+share/help/sv/mate-calc/conv-length.page
+share/help/sv/mate-calc/conv-time.page
+share/help/sv/mate-calc/conv-weight.page
+share/help/sv/mate-calc/equation.page
+share/help/sv/mate-calc/factorial.page
+share/help/sv/mate-calc/factorize.page
+share/help/sv/mate-calc/financial.page
+share/help/sv/mate-calc/functions.page
+share/help/sv/mate-calc/index.page
+share/help/sv/mate-calc/keyboard.page
+share/help/sv/mate-calc/legal.xml
+share/help/sv/mate-calc/logarithm.page
+share/help/sv/mate-calc/modulus.page
+share/help/sv/mate-calc/mouse.page
+share/help/sv/mate-calc/number-display.page
+share/help/sv/mate-calc/percentage.page
+share/help/sv/mate-calc/power.page
+share/help/sv/mate-calc/scientific.page
+share/help/sv/mate-calc/superscript.page
+share/help/sv/mate-calc/trigonometry.page
+share/help/sv/mate-calc/variables.page
+share/help/te/mate-calc/absolute.page
+share/help/te/mate-calc/base.page
+share/help/te/mate-calc/boolean.page
+share/help/te/mate-calc/complex.page
+share/help/te/mate-calc/conv-base.page
+share/help/te/mate-calc/conv-character.page
+share/help/te/mate-calc/conv-currency.page
+share/help/te/mate-calc/conv-length.page
+share/help/te/mate-calc/conv-time.page
+share/help/te/mate-calc/conv-weight.page
+share/help/te/mate-calc/equation.page
+share/help/te/mate-calc/factorial.page
+share/help/te/mate-calc/factorize.page
+share/help/te/mate-calc/financial.page
+share/help/te/mate-calc/functions.page
+share/help/te/mate-calc/index.page
+share/help/te/mate-calc/keyboard.page
+share/help/te/mate-calc/legal.xml
+share/help/te/mate-calc/logarithm.page
+share/help/te/mate-calc/modulus.page
+share/help/te/mate-calc/mouse.page
+share/help/te/mate-calc/number-display.page
+share/help/te/mate-calc/percentage.page
+share/help/te/mate-calc/power.page
+share/help/te/mate-calc/scientific.page
+share/help/te/mate-calc/superscript.page
+share/help/te/mate-calc/trigonometry.page
+share/help/te/mate-calc/variables.page
+share/help/zh_CN/mate-calc/absolute.page
+share/help/zh_CN/mate-calc/base.page
+share/help/zh_CN/mate-calc/boolean.page
+share/help/zh_CN/mate-calc/complex.page
+share/help/zh_CN/mate-calc/conv-base.page
+share/help/zh_CN/mate-calc/conv-character.page
+share/help/zh_CN/mate-calc/conv-currency.page
+share/help/zh_CN/mate-calc/conv-length.page
+share/help/zh_CN/mate-calc/conv-time.page
+share/help/zh_CN/mate-calc/conv-weight.page
+share/help/zh_CN/mate-calc/equation.page
+share/help/zh_CN/mate-calc/factorial.page
+share/help/zh_CN/mate-calc/factorize.page
+share/help/zh_CN/mate-calc/financial.page
+share/help/zh_CN/mate-calc/functions.page
+share/help/zh_CN/mate-calc/index.page
+share/help/zh_CN/mate-calc/keyboard.page
+share/help/zh_CN/mate-calc/legal.xml
+share/help/zh_CN/mate-calc/logarithm.page
+share/help/zh_CN/mate-calc/modulus.page
+share/help/zh_CN/mate-calc/mouse.page
+share/help/zh_CN/mate-calc/number-display.page
+share/help/zh_CN/mate-calc/percentage.page
+share/help/zh_CN/mate-calc/power.page
+share/help/zh_CN/mate-calc/scientific.page
+share/help/zh_CN/mate-calc/superscript.page
+share/help/zh_CN/mate-calc/trigonometry.page
+share/help/zh_CN/mate-calc/variables.page
+share/help/zh_HK/mate-calc/absolute.page
+share/help/zh_HK/mate-calc/base.page
+share/help/zh_HK/mate-calc/boolean.page
+share/help/zh_HK/mate-calc/complex.page
+share/help/zh_HK/mate-calc/conv-base.page
+share/help/zh_HK/mate-calc/conv-character.page
+share/help/zh_HK/mate-calc/conv-currency.page
+share/help/zh_HK/mate-calc/conv-length.page
+share/help/zh_HK/mate-calc/conv-time.page
+share/help/zh_HK/mate-calc/conv-weight.page
+share/help/zh_HK/mate-calc/equation.page
+share/help/zh_HK/mate-calc/factorial.page
+share/help/zh_HK/mate-calc/factorize.page
+share/help/zh_HK/mate-calc/financial.page
+share/help/zh_HK/mate-calc/functions.page
+share/help/zh_HK/mate-calc/index.page
+share/help/zh_HK/mate-calc/keyboard.page
+share/help/zh_HK/mate-calc/legal.xml
+share/help/zh_HK/mate-calc/logarithm.page
+share/help/zh_HK/mate-calc/modulus.page
+share/help/zh_HK/mate-calc/mouse.page
+share/help/zh_HK/mate-calc/number-display.page
+share/help/zh_HK/mate-calc/percentage.page
+share/help/zh_HK/mate-calc/power.page
+share/help/zh_HK/mate-calc/scientific.page
+share/help/zh_HK/mate-calc/superscript.page
+share/help/zh_HK/mate-calc/trigonometry.page
+share/help/zh_HK/mate-calc/variables.page
+share/help/zh_TW/mate-calc/absolute.page
+share/help/zh_TW/mate-calc/base.page
+share/help/zh_TW/mate-calc/boolean.page
+share/help/zh_TW/mate-calc/complex.page
+share/help/zh_TW/mate-calc/conv-base.page
+share/help/zh_TW/mate-calc/conv-character.page
+share/help/zh_TW/mate-calc/conv-currency.page
+share/help/zh_TW/mate-calc/conv-length.page
+share/help/zh_TW/mate-calc/conv-time.page
+share/help/zh_TW/mate-calc/conv-weight.page
+share/help/zh_TW/mate-calc/equation.page
+share/help/zh_TW/mate-calc/factorial.page
+share/help/zh_TW/mate-calc/factorize.page
+share/help/zh_TW/mate-calc/financial.page
+share/help/zh_TW/mate-calc/functions.page
+share/help/zh_TW/mate-calc/index.page
+share/help/zh_TW/mate-calc/keyboard.page
+share/help/zh_TW/mate-calc/legal.xml
+share/help/zh_TW/mate-calc/logarithm.page
+share/help/zh_TW/mate-calc/modulus.page
+share/help/zh_TW/mate-calc/mouse.page
+share/help/zh_TW/mate-calc/number-display.page
+share/help/zh_TW/mate-calc/percentage.page
+share/help/zh_TW/mate-calc/power.page
+share/help/zh_TW/mate-calc/scientific.page
+share/help/zh_TW/mate-calc/superscript.page
+share/help/zh_TW/mate-calc/trigonometry.page
+share/help/zh_TW/mate-calc/variables.page
+share/locale/af/LC_MESSAGES/mate-calc.mo
+share/locale/am/LC_MESSAGES/mate-calc.mo
+share/locale/ar/LC_MESSAGES/mate-calc.mo
+share/locale/as/LC_MESSAGES/mate-calc.mo
+share/locale/ast/LC_MESSAGES/mate-calc.mo
+share/locale/az/LC_MESSAGES/mate-calc.mo
+share/locale/be/LC_MESSAGES/mate-calc.mo
+share/locale/be@latin/LC_MESSAGES/mate-calc.mo
+share/locale/bg/LC_MESSAGES/mate-calc.mo
+share/locale/bn/LC_MESSAGES/mate-calc.mo
+share/locale/bn_IN/LC_MESSAGES/mate-calc.mo
+share/locale/bs/LC_MESSAGES/mate-calc.mo
+share/locale/ca/LC_MESSAGES/mate-calc.mo
+share/locale/ca@valencia/LC_MESSAGES/mate-calc.mo
+share/locale/cmn/LC_MESSAGES/mate-calc.mo
+share/locale/cs/LC_MESSAGES/mate-calc.mo
+share/locale/cy/LC_MESSAGES/mate-calc.mo
+share/locale/da/LC_MESSAGES/mate-calc.mo
+share/locale/de/LC_MESSAGES/mate-calc.mo
+share/locale/dz/LC_MESSAGES/mate-calc.mo
+share/locale/el/LC_MESSAGES/mate-calc.mo
+share/locale/en@shaw/LC_MESSAGES/mate-calc.mo
+share/locale/en_AU/LC_MESSAGES/mate-calc.mo
+share/locale/en_CA/LC_MESSAGES/mate-calc.mo
+share/locale/en_GB/LC_MESSAGES/mate-calc.mo
+share/locale/en_US/LC_MESSAGES/mate-calc.mo
+share/locale/eo/LC_MESSAGES/mate-calc.mo
+share/locale/es/LC_MESSAGES/mate-calc.mo
+share/locale/es_AR/LC_MESSAGES/mate-calc.mo
+share/locale/et/LC_MESSAGES/mate-calc.mo
+share/locale/eu/LC_MESSAGES/mate-calc.mo
+share/locale/fa/LC_MESSAGES/mate-calc.mo
+share/locale/fi/LC_MESSAGES/mate-calc.mo
+share/locale/fr/LC_MESSAGES/mate-calc.mo
+share/locale/ga/LC_MESSAGES/mate-calc.mo
+share/locale/gl/LC_MESSAGES/mate-calc.mo
+share/locale/gu/LC_MESSAGES/mate-calc.mo
+share/locale/he/LC_MESSAGES/mate-calc.mo
+share/locale/hi/LC_MESSAGES/mate-calc.mo
+share/locale/hr/LC_MESSAGES/mate-calc.mo
+share/locale/hu/LC_MESSAGES/mate-calc.mo
+share/locale/hy/LC_MESSAGES/mate-calc.mo
+share/locale/id/LC_MESSAGES/mate-calc.mo
+share/locale/it/LC_MESSAGES/mate-calc.mo
+share/locale/ja/LC_MESSAGES/mate-calc.mo
+share/locale/ka/LC_MESSAGES/mate-calc.mo
+share/locale/kk/LC_MESSAGES/mate-calc.mo
+share/locale/km/LC_MESSAGES/mate-calc.mo
+share/locale/kn/LC_MESSAGES/mate-calc.mo
+share/locale/ko/LC_MESSAGES/mate-calc.mo
+share/locale/ku/LC_MESSAGES/mate-calc.mo
+share/locale/ky/LC_MESSAGES/mate-calc.mo
+share/locale/lt/LC_MESSAGES/mate-calc.mo
+share/locale/lv/LC_MESSAGES/mate-calc.mo
+share/locale/mai/LC_MESSAGES/mate-calc.mo
+share/locale/mg/LC_MESSAGES/mate-calc.mo
+share/locale/mk/LC_MESSAGES/mate-calc.mo
+share/locale/ml/LC_MESSAGES/mate-calc.mo
+share/locale/mn/LC_MESSAGES/mate-calc.mo
+share/locale/mr/LC_MESSAGES/mate-calc.mo
+share/locale/ms/LC_MESSAGES/mate-calc.mo
+share/locale/my/LC_MESSAGES/mate-calc.mo
+share/locale/nb/LC_MESSAGES/mate-calc.mo
+share/locale/ne/LC_MESSAGES/mate-calc.mo
+share/locale/nl/LC_MESSAGES/mate-calc.mo
+share/locale/nn/LC_MESSAGES/mate-calc.mo
+share/locale/oc/LC_MESSAGES/mate-calc.mo
+share/locale/or/LC_MESSAGES/mate-calc.mo
+share/locale/pa/LC_MESSAGES/mate-calc.mo
+share/locale/pl/LC_MESSAGES/mate-calc.mo
+share/locale/pt/LC_MESSAGES/mate-calc.mo
+share/locale/pt_BR/LC_MESSAGES/mate-calc.mo
+share/locale/ro/LC_MESSAGES/mate-calc.mo
+share/locale/ru/LC_MESSAGES/mate-calc.mo
+share/locale/rw/LC_MESSAGES/mate-calc.mo
+share/locale/si/LC_MESSAGES/mate-calc.mo
+share/locale/sk/LC_MESSAGES/mate-calc.mo
+share/locale/sl/LC_MESSAGES/mate-calc.mo
+share/locale/sq/LC_MESSAGES/mate-calc.mo
+share/locale/sr/LC_MESSAGES/mate-calc.mo
+share/locale/sr@latin/LC_MESSAGES/mate-calc.mo
+share/locale/sv/LC_MESSAGES/mate-calc.mo
+share/locale/ta/LC_MESSAGES/mate-calc.mo
+share/locale/te/LC_MESSAGES/mate-calc.mo
+share/locale/th/LC_MESSAGES/mate-calc.mo
+share/locale/tk/LC_MESSAGES/mate-calc.mo
+share/locale/tr/LC_MESSAGES/mate-calc.mo
+share/locale/ug/LC_MESSAGES/mate-calc.mo
+share/locale/uk/LC_MESSAGES/mate-calc.mo
+share/locale/vi/LC_MESSAGES/mate-calc.mo
+share/locale/xh/LC_MESSAGES/mate-calc.mo
+share/locale/zh_CN/LC_MESSAGES/mate-calc.mo
+share/locale/zh_HK/LC_MESSAGES/mate-calc.mo
+share/locale/zh_TW/LC_MESSAGES/mate-calc.mo
+%%DATADIR%%/buttons-advanced.ui
+%%DATADIR%%/buttons-basic.ui
+%%DATADIR%%/buttons-financial.ui
+%%DATADIR%%/buttons-programming.ui
+%%DATADIR%%/preferences.ui
diff --git a/net/libmateweather/Makefile b/net/libmateweather/Makefile
index 1f95f651c5ba..9058571523fc 100644
--- a/net/libmateweather/Makefile
+++ b/net/libmateweather/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libmateweather
-PORTVERSION= 1.12.1
-PORTREVISION= 1
+PORTVERSION= 1.18.1
CATEGORIES= net mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -14,20 +13,14 @@ COMMENT= Library to accessing online weather informations
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= itstool:textproc/itstool
-LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+LIB_DEPENDS= libsoup-2.4.so:devel/libsoup
PORTSCOUT= limitw:1,even
USES= gettext gmake libtool localbase pathfix pkgconfig tar:xz
-USE_GNOME= cairo gtk20 libxml2 intlhack
+USE_GNOME= cairo gnomeprefix gtk30 intltool libxml2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-gtk-doc \
- --with-gtk=2.0 \
- --with-html-dir=${PREFIX}/share/doc
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
diff --git a/net/libmateweather/distinfo b/net/libmateweather/distinfo
index 316763465f64..9b3567be14dc 100644
--- a/net/libmateweather/distinfo
+++ b/net/libmateweather/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/libmateweather-1.12.1.tar.xz) = 74aaeb844059ecf7f7aa4314676348750c50212a7c6e5dbbed71793bcd373863
-SIZE (mate/libmateweather-1.12.1.tar.xz) = 3526540
+TIMESTAMP = 1497518746
+SHA256 (mate/libmateweather-1.18.1.tar.xz) = 6af4ca73df3d0589481e74f8be843130359ba071d76195b3c4396d270874db7c
+SIZE (mate/libmateweather-1.18.1.tar.xz) = 3454820
diff --git a/net/libmateweather/files/patch-libmateweather_weather-iwin.c b/net/libmateweather/files/patch-libmateweather_weather-iwin.c
deleted file mode 100644
index ca02969da082..000000000000
--- a/net/libmateweather/files/patch-libmateweather_weather-iwin.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmateweather/weather-iwin.c.orig 2016-09-29 14:03:12.143111000 +0200
-+++ libmateweather/weather-iwin.c 2016-09-29 14:03:35.883636000 +0200
-@@ -462,7 +462,7 @@ iwin_start_open (WeatherInfo *info)
- zone = g_ascii_strdown (loc->zone, -1);
- state = g_strndup (zone, 2);
-
-- url = g_strdup_printf ("http://weather.noaa.gov/pub/data/forecasts/zone/%s/%s.txt", state, zone);
-+ url = g_strdup_printf ("http://tgftp.nws.noaa.gov/data/forecasts/zone/%s/%s.txt", state, zone);
-
- g_free (zone);
- g_free (state);
diff --git a/net/libmateweather/files/patch-libmateweather_weather-metar.c b/net/libmateweather/files/patch-libmateweather_weather-metar.c
deleted file mode 100644
index aa992cae6df4..000000000000
--- a/net/libmateweather/files/patch-libmateweather_weather-metar.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- libmateweather/weather-metar.c.orig 2016-09-29 14:03:25.503926000 +0200
-+++ libmateweather/weather-metar.c 2016-09-29 14:03:40.232655000 +0200
-@@ -510,7 +510,7 @@ metar_finish (SoupSession *session, Soup
-
- loc = info->location;
-
-- searchkey = g_strdup_printf ("\n%s", loc->code);
-+ searchkey = g_strdup_printf ("<raw_text>%s", loc->code);
- p = strstr (msg->response_body->data, searchkey);
- g_free (searchkey);
- if (p) {
-@@ -522,8 +522,8 @@ metar_finish (SoupSession *session, Soup
- metar = g_strdup (p);
- success = metar_parse (metar, info);
- g_free (metar);
-- } else if (!strstr (msg->response_body->data, "National Weather Service")) {
-- /* The response doesn't even seem to have come from NWS...
-+ } else if (!strstr (msg->response_body->data, "aviationweather.gov")) {
-+ /* The response doesn't even seem to have come from NOAA...
- * most likely it is a wifi hotspot login page. Call that a
- * network error.
- */
-@@ -550,8 +550,14 @@ metar_start_open (WeatherInfo *info)
- }
-
- msg = soup_form_request_new (
-- "GET", "http://weather.noaa.gov/mgetmetar.php",
-- "cccc", loc->code,
-+ "GET", "https://www.aviationweather.gov/adds/dataserver_current/httpparam",
-+ "dataSource", "metars",
-+ "requestType", "retrieve",
-+ "format", "xml",
-+ "hoursBeforeNow", "3",
-+ "mostRecent", "true",
-+ "fields", "raw_text",
-+ "stationString", loc->code,
- NULL);
- soup_session_queue_message (info->session, msg, metar_finish, info);
-
diff --git a/net/libmateweather/pkg-plist b/net/libmateweather/pkg-plist
index 902284915390..ac1f5e010cc9 100644
--- a/net/libmateweather/pkg-plist
+++ b/net/libmateweather/pkg-plist
@@ -10,30 +10,28 @@ lib/libmateweather.so
lib/libmateweather.so.1
lib/libmateweather.so.1.6.9
libdata/pkgconfig/mateweather.pc
-%%DOCSDIR%%/MateWeatherLocation.html
-%%DOCSDIR%%/MateWeatherLocationEntry.html
-%%DOCSDIR%%/MateWeatherTimezone.html
-%%DOCSDIR%%/MateWeatherTimezoneMenu.html
-%%DOCSDIR%%/annotation-glossary.html
-%%DOCSDIR%%/api-index-deprecated.html
-%%DOCSDIR%%/api-index-full.html
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left-insensitive.png
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/libmateweather-mateweather-mateconf.html
-%%DOCSDIR%%/libmateweather-mateweather-prefs.html
-%%DOCSDIR%%/libmateweather-mateweather-xml.html
-%%DOCSDIR%%/libmateweather-weather.html
-%%DOCSDIR%%/libmateweather.devhelp2
-%%DOCSDIR%%/object-tree.html
-%%DOCSDIR%%/right-insensitive.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up-insensitive.png
-%%DOCSDIR%%/up.png
+%%PORTDOCS%%%%DOCSDIR%%/MateWeatherLocation.html
+%%PORTDOCS%%%%DOCSDIR%%/MateWeatherLocationEntry.html
+%%PORTDOCS%%%%DOCSDIR%%/MateWeatherTimezone.html
+%%PORTDOCS%%%%DOCSDIR%%/MateWeatherTimezoneMenu.html
+%%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html
+%%PORTDOCS%%%%DOCSDIR%%/api-index-full.html
+%%PORTDOCS%%%%DOCSDIR%%/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/libmateweather-mateweather-mateconf.html
+%%PORTDOCS%%%%DOCSDIR%%/libmateweather-mateweather-prefs.html
+%%PORTDOCS%%%%DOCSDIR%%/libmateweather-mateweather-xml.html
+%%PORTDOCS%%%%DOCSDIR%%/libmateweather-weather.html
+%%PORTDOCS%%%%DOCSDIR%%/libmateweather.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/object-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/right-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/up.png
share/icons/mate/16x16/status/weather-clear-night-000.png
share/icons/mate/16x16/status/weather-clear-night-010.png
share/icons/mate/16x16/status/weather-clear-night-020.png
@@ -478,7 +476,6 @@ share/locale/as/LC_MESSAGES/libmateweather.mo
share/locale/ast/LC_MESSAGES/libmateweather.mo
share/locale/az/LC_MESSAGES/libmateweather.mo
share/locale/be/LC_MESSAGES/libmateweather.mo
-share/locale/be@latin/LC_MESSAGES/libmateweather.mo
share/locale/bg/LC_MESSAGES/libmateweather.mo
share/locale/bn/LC_MESSAGES/libmateweather.mo
share/locale/bn_IN/LC_MESSAGES/libmateweather.mo
@@ -494,7 +491,6 @@ share/locale/da/LC_MESSAGES/libmateweather.mo
share/locale/de/LC_MESSAGES/libmateweather.mo
share/locale/dz/LC_MESSAGES/libmateweather.mo
share/locale/el/LC_MESSAGES/libmateweather.mo
-share/locale/en@shaw/LC_MESSAGES/libmateweather.mo
share/locale/en_AU/LC_MESSAGES/libmateweather.mo
share/locale/en_CA/LC_MESSAGES/libmateweather.mo
share/locale/en_GB/LC_MESSAGES/libmateweather.mo
@@ -507,8 +503,6 @@ share/locale/es_CR/LC_MESSAGES/libmateweather.mo
share/locale/es_DO/LC_MESSAGES/libmateweather.mo
share/locale/es_EC/LC_MESSAGES/libmateweather.mo
share/locale/es_ES/LC_MESSAGES/libmateweather.mo
-share/locale/es_GT/LC_MESSAGES/libmateweather.mo
-share/locale/es_HN/LC_MESSAGES/libmateweather.mo
share/locale/es_MX/LC_MESSAGES/libmateweather.mo
share/locale/es_NI/LC_MESSAGES/libmateweather.mo
share/locale/es_PA/LC_MESSAGES/libmateweather.mo
@@ -522,6 +516,8 @@ share/locale/eu/LC_MESSAGES/libmateweather.mo
share/locale/fa/LC_MESSAGES/libmateweather.mo
share/locale/fi/LC_MESSAGES/libmateweather.mo
share/locale/fr/LC_MESSAGES/libmateweather.mo
+share/locale/fr_CA/LC_MESSAGES/libmateweather.mo
+share/locale/frp/LC_MESSAGES/libmateweather.mo
share/locale/ga/LC_MESSAGES/libmateweather.mo
share/locale/gl/LC_MESSAGES/libmateweather.mo
share/locale/gu/LC_MESSAGES/libmateweather.mo
@@ -534,11 +530,13 @@ share/locale/id/LC_MESSAGES/libmateweather.mo
share/locale/is/LC_MESSAGES/libmateweather.mo
share/locale/it/LC_MESSAGES/libmateweather.mo
share/locale/ja/LC_MESSAGES/libmateweather.mo
+share/locale/jv/LC_MESSAGES/libmateweather.mo
share/locale/ka/LC_MESSAGES/libmateweather.mo
share/locale/kk/LC_MESSAGES/libmateweather.mo
share/locale/kn/LC_MESSAGES/libmateweather.mo
share/locale/ko/LC_MESSAGES/libmateweather.mo
share/locale/ku/LC_MESSAGES/libmateweather.mo
+share/locale/ku_IQ/LC_MESSAGES/libmateweather.mo
share/locale/ky/LC_MESSAGES/libmateweather.mo
share/locale/lt/LC_MESSAGES/libmateweather.mo
share/locale/lv/LC_MESSAGES/libmateweather.mo
@@ -550,7 +548,6 @@ share/locale/mn/LC_MESSAGES/libmateweather.mo
share/locale/mr/LC_MESSAGES/libmateweather.mo
share/locale/ms/LC_MESSAGES/libmateweather.mo
share/locale/nb/LC_MESSAGES/libmateweather.mo
-share/locale/nds/LC_MESSAGES/libmateweather.mo
share/locale/ne/LC_MESSAGES/libmateweather.mo
share/locale/nl/LC_MESSAGES/libmateweather.mo
share/locale/nn/LC_MESSAGES/libmateweather.mo
@@ -575,6 +572,7 @@ share/locale/te/LC_MESSAGES/libmateweather.mo
share/locale/th/LC_MESSAGES/libmateweather.mo
share/locale/tr/LC_MESSAGES/libmateweather.mo
share/locale/uk/LC_MESSAGES/libmateweather.mo
+share/locale/uz/LC_MESSAGES/libmateweather.mo
share/locale/vi/LC_MESSAGES/libmateweather.mo
share/locale/wa/LC_MESSAGES/libmateweather.mo
share/locale/xh/LC_MESSAGES/libmateweather.mo
diff --git a/sysutils/mate-control-center/Makefile b/sysutils/mate-control-center/Makefile
index 3666ac9a3296..ced41405ac8a 100644
--- a/sysutils/mate-control-center/Makefile
+++ b/sysutils/mate-control-center/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-control-center
-PORTVERSION= 1.12.1
+PORTVERSION= 1.18.1
CATEGORIES= sysutils mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -12,27 +12,28 @@ COMMENT= Control center for MATE project
BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \
+ libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
- libunique-1.0.so:x11-toolkits/unique \
libxklavier.so:x11/libxklavier \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
+ libstartup-notification-1.so:x11/startup-notification \
+ libunique-3.0.so:x11-toolkits/libunique3 \
libpolkit-gobject-1.so:sysutils/polkit
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \
- shared-mime-info tar:xz
+USES= desktop-file-utils gettext gmake libtool localbase \
+ pathfix pkgconfig shared-mime-info tar:xz
USE_MATE= desktop libmatekbd marco menus settingsdaemon
-USE_XORG= x11 xcursor xext xxf86misc xft xi xrandr xscrnsaver
-USE_GNOME= dconf glib20 gtk20 intlhack libxml2 librsvg2 \
- pango
+USE_XORG= ice sm x11 xcursor xext xxf86misc xft xi xrandr xscrnsaver
+USE_GNOME= cairo dconf glib20 gtk30 intlhack libxml2 librsvg2 pango
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-appindicator=no \
- --with-gtk=2.0
+ --with-gtk=3.0
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.control-center.gschema.xml \
diff --git a/sysutils/mate-control-center/distinfo b/sysutils/mate-control-center/distinfo
index e8615e8e9abc..ffd3bf61d260 100644
--- a/sysutils/mate-control-center/distinfo
+++ b/sysutils/mate-control-center/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-control-center-1.12.1.tar.xz) = 851f08e69ec8f513b8971262a439c83ef837b2a7467690313672b6a9d9a179fb
-SIZE (mate/mate-control-center-1.12.1.tar.xz) = 1304732
+TIMESTAMP = 1491671361
+SHA256 (mate/mate-control-center-1.18.1.tar.xz) = 1d5c1fe4da8fc5c453d4d3d2b91e18c4dadd2baf65f4da167b27292e34874bd5
+SIZE (mate/mate-control-center-1.18.1.tar.xz) = 1343276
diff --git a/sysutils/mate-control-center/files/patch-capplets_common_theme-thumbnail.c b/sysutils/mate-control-center/files/patch-capplets_common_theme-thumbnail.c
deleted file mode 100644
index 96123ea4fa57..000000000000
--- a/sysutils/mate-control-center/files/patch-capplets_common_theme-thumbnail.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./capplets/common/theme-thumbnail.c.orig 2016-01-09 18:24:24.817763000 +0100
-+++ ./capplets/common/theme-thumbnail.c 2016-01-09 18:25:23.640259000 +0100
-@@ -145,9 +145,7 @@ static GdkPixmap* draw_window_on_pixbuf(
-
- gtk_widget_hide(widget);
-
--#if GTK_CHECK_VERSION (3, 0, 0)
-- return pixbuf;
--#else
-+#if !GTK_CHECK_VERSION (3, 0, 0)
- return pixmap;
- #endif
- }
diff --git a/sysutils/mate-control-center/pkg-plist b/sysutils/mate-control-center/pkg-plist
index 50ad4fecd845..26c58243a26b 100644
--- a/sysutils/mate-control-center/pkg-plist
+++ b/sysutils/mate-control-center/pkg-plist
@@ -12,7 +12,6 @@ bin/mate-network-properties
bin/mate-thumbnail-font
bin/mate-typing-monitor
bin/mate-window-properties
-etc/xdg/menus/mate-preferences-categories.menu
etc/xdg/menus/matecc.menu
include/libmate-slab/app-resizer.h
include/libmate-slab/app-shell.h
@@ -68,7 +67,6 @@ man/man1/mate-thumbnail-font.1.gz
man/man1/mate-typing-monitor.1.gz
man/man1/mate-window-properties.1.gz
sbin/mate-display-properties-install-systemwide
-share/MateConf/gsettings/mate-control-center.convert
share/applications/mate-about-me.desktop
share/applications/mate-appearance-properties.desktop
share/applications/mate-at-properties.desktop
@@ -426,7 +424,6 @@ share/locale/as/LC_MESSAGES/mate-control-center.mo
share/locale/ast/LC_MESSAGES/mate-control-center.mo
share/locale/az/LC_MESSAGES/mate-control-center.mo
share/locale/be/LC_MESSAGES/mate-control-center.mo
-share/locale/be@latin/LC_MESSAGES/mate-control-center.mo
share/locale/bg/LC_MESSAGES/mate-control-center.mo
share/locale/bn/LC_MESSAGES/mate-control-center.mo
share/locale/bn_IN/LC_MESSAGES/mate-control-center.mo
@@ -442,17 +439,20 @@ share/locale/da/LC_MESSAGES/mate-control-center.mo
share/locale/de/LC_MESSAGES/mate-control-center.mo
share/locale/dz/LC_MESSAGES/mate-control-center.mo
share/locale/el/LC_MESSAGES/mate-control-center.mo
-share/locale/en@shaw/LC_MESSAGES/mate-control-center.mo
share/locale/en_AU/LC_MESSAGES/mate-control-center.mo
share/locale/en_CA/LC_MESSAGES/mate-control-center.mo
share/locale/en_GB/LC_MESSAGES/mate-control-center.mo
share/locale/eo/LC_MESSAGES/mate-control-center.mo
share/locale/es/LC_MESSAGES/mate-control-center.mo
+share/locale/es_CO/LC_MESSAGES/mate-control-center.mo
+share/locale/es_MX/LC_MESSAGES/mate-control-center.mo
share/locale/et/LC_MESSAGES/mate-control-center.mo
share/locale/eu/LC_MESSAGES/mate-control-center.mo
share/locale/fa/LC_MESSAGES/mate-control-center.mo
share/locale/fi/LC_MESSAGES/mate-control-center.mo
share/locale/fr/LC_MESSAGES/mate-control-center.mo
+share/locale/fr_CA/LC_MESSAGES/mate-control-center.mo
+share/locale/frp/LC_MESSAGES/mate-control-center.mo
share/locale/ga/LC_MESSAGES/mate-control-center.mo
share/locale/gl/LC_MESSAGES/mate-control-center.mo
share/locale/gu/LC_MESSAGES/mate-control-center.mo
@@ -460,15 +460,18 @@ share/locale/he/LC_MESSAGES/mate-control-center.mo
share/locale/hi/LC_MESSAGES/mate-control-center.mo
share/locale/hr/LC_MESSAGES/mate-control-center.mo
share/locale/hu/LC_MESSAGES/mate-control-center.mo
+share/locale/hy/LC_MESSAGES/mate-control-center.mo
share/locale/id/LC_MESSAGES/mate-control-center.mo
share/locale/is/LC_MESSAGES/mate-control-center.mo
share/locale/it/LC_MESSAGES/mate-control-center.mo
share/locale/ja/LC_MESSAGES/mate-control-center.mo
+share/locale/jv/LC_MESSAGES/mate-control-center.mo
share/locale/ka/LC_MESSAGES/mate-control-center.mo
share/locale/kk/LC_MESSAGES/mate-control-center.mo
share/locale/kn/LC_MESSAGES/mate-control-center.mo
share/locale/ko/LC_MESSAGES/mate-control-center.mo
share/locale/ku/LC_MESSAGES/mate-control-center.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-control-center.mo
share/locale/ky/LC_MESSAGES/mate-control-center.mo
share/locale/lt/LC_MESSAGES/mate-control-center.mo
share/locale/lv/LC_MESSAGES/mate-control-center.mo
@@ -489,6 +492,7 @@ share/locale/oc/LC_MESSAGES/mate-control-center.mo
share/locale/or/LC_MESSAGES/mate-control-center.mo
share/locale/pa/LC_MESSAGES/mate-control-center.mo
share/locale/pl/LC_MESSAGES/mate-control-center.mo
+share/locale/pms/LC_MESSAGES/mate-control-center.mo
share/locale/pt/LC_MESSAGES/mate-control-center.mo
share/locale/pt_BR/LC_MESSAGES/mate-control-center.mo
share/locale/ro/LC_MESSAGES/mate-control-center.mo
@@ -509,7 +513,6 @@ share/locale/ug/LC_MESSAGES/mate-control-center.mo
share/locale/uk/LC_MESSAGES/mate-control-center.mo
share/locale/ur/LC_MESSAGES/mate-control-center.mo
share/locale/uz/LC_MESSAGES/mate-control-center.mo
-share/locale/uz@cyrillic/LC_MESSAGES/mate-control-center.mo
share/locale/vi/LC_MESSAGES/mate-control-center.mo
share/locale/wa/LC_MESSAGES/mate-control-center.mo
share/locale/xh/LC_MESSAGES/mate-control-center.mo
@@ -580,10 +583,5 @@ share/locale/zu/LC_MESSAGES/mate-control-center.mo
%%DATADIR%%/ui/mate-keyboard-properties-options-dialog.ui
%%DATADIR%%/ui/mate-mouse-properties.ui
%%DATADIR%%/ui/mate-network-properties.ui
-share/mate/cursor-fonts/cursor-large-white.pcf
-share/mate/cursor-fonts/cursor-large.pcf
-share/mate/cursor-fonts/cursor-white.pcf
-share/mime/application/x-mate-theme-package.xml
-share/mime/packages/mate-theme-package.xml
share/polkit-1/actions/org.mate.randr.policy
share/thumbnailers/mate-font-viewer.thumbnailer
diff --git a/sysutils/mate-polkit/Makefile b/sysutils/mate-polkit/Makefile
index 1c8893a1e596..f9c725dd8780 100644
--- a/sysutils/mate-polkit/Makefile
+++ b/sysutils/mate-polkit/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-polkit
-PORTVERSION= 1.12.0
+PORTVERSION= 1.18.1
CATEGORIES= sysutils mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,22 +10,18 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= MATE frontend to the PolicKit framework
-BUILD_DEPENDS= itstool:textproc/itstool
+LICENSE= LGPL20
+LICENSE_FILE= ${WRKSRC}/COPYING
+
LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit \
libaccountsservice.so:sysutils/accountsservice
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME= gtk20 intlhack introspection:build
+USES= gettext gmake libtool localbase pathfix pkgconfig tar:xz
+USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection:build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-gtk-doc \
- --with-gtk=2.0 \
- --enable-accountsservice \
- --localstatedir=/var
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
.include <bsd.port.mk>
diff --git a/sysutils/mate-polkit/distinfo b/sysutils/mate-polkit/distinfo
index bf4650ef552e..3adf15a8b6a6 100644
--- a/sysutils/mate-polkit/distinfo
+++ b/sysutils/mate-polkit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-polkit-1.12.0.tar.xz) = c38f0a0c3d4e10fc95d27fa4e8d47eb6948e8c9279a82f316f563666571bf8b9
-SIZE (mate/mate-polkit-1.12.0.tar.xz) = 324708
+TIMESTAMP = 1494456783
+SHA256 (mate/mate-polkit-1.18.1.tar.xz) = ec011e845184bb766684811b6befaef3797f12895cf21807d71f3de92d146e97
+SIZE (mate/mate-polkit-1.18.1.tar.xz) = 346904
diff --git a/sysutils/mate-polkit/pkg-plist b/sysutils/mate-polkit/pkg-plist
index fb79665b9b18..537de5056a9b 100644
--- a/sysutils/mate-polkit/pkg-plist
+++ b/sysutils/mate-polkit/pkg-plist
@@ -13,32 +13,41 @@ share/gir-1.0/PolkitGtkMate-1.0.gir
share/locale/am/LC_MESSAGES/mate-polkit.mo
share/locale/ar/LC_MESSAGES/mate-polkit.mo
share/locale/be/LC_MESSAGES/mate-polkit.mo
+share/locale/bg/LC_MESSAGES/mate-polkit.mo
share/locale/bn_IN/LC_MESSAGES/mate-polkit.mo
+share/locale/bs/LC_MESSAGES/mate-polkit.mo
share/locale/ca/LC_MESSAGES/mate-polkit.mo
+share/locale/ca@valencia/LC_MESSAGES/mate-polkit.mo
share/locale/cmn/LC_MESSAGES/mate-polkit.mo
share/locale/cs/LC_MESSAGES/mate-polkit.mo
+share/locale/cy/LC_MESSAGES/mate-polkit.mo
share/locale/da/LC_MESSAGES/mate-polkit.mo
share/locale/de/LC_MESSAGES/mate-polkit.mo
share/locale/el/LC_MESSAGES/mate-polkit.mo
share/locale/en_AU/LC_MESSAGES/mate-polkit.mo
share/locale/en_GB/LC_MESSAGES/mate-polkit.mo
share/locale/es/LC_MESSAGES/mate-polkit.mo
+share/locale/es_CO/LC_MESSAGES/mate-polkit.mo
share/locale/et/LC_MESSAGES/mate-polkit.mo
share/locale/eu/LC_MESSAGES/mate-polkit.mo
share/locale/fi/LC_MESSAGES/mate-polkit.mo
share/locale/fr/LC_MESSAGES/mate-polkit.mo
+share/locale/fr_CA/LC_MESSAGES/mate-polkit.mo
share/locale/gl/LC_MESSAGES/mate-polkit.mo
share/locale/gu/LC_MESSAGES/mate-polkit.mo
share/locale/he/LC_MESSAGES/mate-polkit.mo
share/locale/hi/LC_MESSAGES/mate-polkit.mo
share/locale/hr/LC_MESSAGES/mate-polkit.mo
share/locale/hu/LC_MESSAGES/mate-polkit.mo
+share/locale/hy/LC_MESSAGES/mate-polkit.mo
share/locale/id/LC_MESSAGES/mate-polkit.mo
+share/locale/is/LC_MESSAGES/mate-polkit.mo
share/locale/it/LC_MESSAGES/mate-polkit.mo
share/locale/ja/LC_MESSAGES/mate-polkit.mo
share/locale/kk/LC_MESSAGES/mate-polkit.mo
share/locale/kn/LC_MESSAGES/mate-polkit.mo
share/locale/ko/LC_MESSAGES/mate-polkit.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-polkit.mo
share/locale/ky/LC_MESSAGES/mate-polkit.mo
share/locale/lt/LC_MESSAGES/mate-polkit.mo
share/locale/lv/LC_MESSAGES/mate-polkit.mo
@@ -46,7 +55,9 @@ share/locale/ml/LC_MESSAGES/mate-polkit.mo
share/locale/mr/LC_MESSAGES/mate-polkit.mo
share/locale/ms/LC_MESSAGES/mate-polkit.mo
share/locale/nb/LC_MESSAGES/mate-polkit.mo
+share/locale/ne/LC_MESSAGES/mate-polkit.mo
share/locale/nl/LC_MESSAGES/mate-polkit.mo
+share/locale/oc/LC_MESSAGES/mate-polkit.mo
share/locale/or/LC_MESSAGES/mate-polkit.mo
share/locale/pa/LC_MESSAGES/mate-polkit.mo
share/locale/pl/LC_MESSAGES/mate-polkit.mo
@@ -54,6 +65,7 @@ share/locale/pt/LC_MESSAGES/mate-polkit.mo
share/locale/pt_BR/LC_MESSAGES/mate-polkit.mo
share/locale/ro/LC_MESSAGES/mate-polkit.mo
share/locale/ru/LC_MESSAGES/mate-polkit.mo
+share/locale/si/LC_MESSAGES/mate-polkit.mo
share/locale/sk/LC_MESSAGES/mate-polkit.mo
share/locale/sl/LC_MESSAGES/mate-polkit.mo
share/locale/sq/LC_MESSAGES/mate-polkit.mo
@@ -65,6 +77,7 @@ share/locale/th/LC_MESSAGES/mate-polkit.mo
share/locale/tr/LC_MESSAGES/mate-polkit.mo
share/locale/uk/LC_MESSAGES/mate-polkit.mo
share/locale/ur/LC_MESSAGES/mate-polkit.mo
+share/locale/uz/LC_MESSAGES/mate-polkit.mo
share/locale/zh_CN/LC_MESSAGES/mate-polkit.mo
share/locale/zh_HK/LC_MESSAGES/mate-polkit.mo
share/locale/zh_TW/LC_MESSAGES/mate-polkit.mo
diff --git a/sysutils/mate-power-manager/Makefile b/sysutils/mate-power-manager/Makefile
index 57b73990b82e..f05d0b515eb8 100644
--- a/sysutils/mate-power-manager/Makefile
+++ b/sysutils/mate-power-manager/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-power-manager
-PORTVERSION= 1.12.1
+PORTVERSION= 1.18.0
CATEGORIES= sysutils mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -13,30 +13,32 @@ COMMENT= Power management system for the MATE Desktop
BUILD_DEPENDS= itstool:textproc/itstool \
gnome-keyring>=3.0.0:security/gnome-keyring
LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \
+ libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
- libunique-1.0.so:x11-toolkits/unique \
libupower-glib.so:sysutils/upower \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
libnotify.so:devel/libnotify \
+ libunique-3.0.so:x11-toolkits/libunique3 \
libgnome-keyring.so:security/libgnome-keyring
RUN_DEPENDS= pkexec:sysutils/polkit \
gnome-keyring>=3.0.0:security/gnome-keyring
PORTSCOUT= limitw:1,even
-USES= execinfo gettext gmake libtool pathfix pkgconfig tar:xz
+USES= execinfo gettext gmake libtool localbase \
+ pathfix pkgconfig tar:xz
USE_MATE= panel
USE_XORG= x11 xext xproto xrandr xrender
-USE_GNOME= cairo glib20 gtk20 intlhack
+USE_GNOME= cairo glib20 gtk30 intlhack
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CONFIGURE_ENV= LIBS="-lexecinfo"
CONFIGURE_ARGS= --with-doc-dir=${PREFIX}/share/doc \
--disable-docbook-docs \
- --with-gtk=2.0 \
+ --with-gtk=3.0 \
--with-keyring
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.mate.power-manager.gschema.xml
diff --git a/sysutils/mate-power-manager/distinfo b/sysutils/mate-power-manager/distinfo
index 2a437a505698..ddfddbc1a3a5 100644
--- a/sysutils/mate-power-manager/distinfo
+++ b/sysutils/mate-power-manager/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-power-manager-1.12.1.tar.xz) = c43aa2ae75335a758d71cdab4b939141c352a7fb179c3e41a064ce9c007b587f
-SIZE (mate/mate-power-manager-1.12.1.tar.xz) = 3197824
+TIMESTAMP = 1491688605
+SHA256 (mate/mate-power-manager-1.18.0.tar.xz) = dd0c5fc82d0ea81246890a95d57de92c60c3d735ad06f5946c79eebe7c52b3be
+SIZE (mate/mate-power-manager-1.18.0.tar.xz) = 3180036
diff --git a/sysutils/mate-power-manager/files/patch-src_gpm-control.c b/sysutils/mate-power-manager/files/patch-src_gpm-control.c
deleted file mode 100644
index 93111de0b6ed..000000000000
--- a/sysutils/mate-power-manager/files/patch-src_gpm-control.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/gpm-control.c.orig 2014-04-20 19:32:33.624174324 +0000
-+++ src/gpm-control.c 2014-04-20 19:33:52.860168682 +0000
-@@ -290,7 +290,11 @@
- g_object_unref(proxy);
- }
- else {
-+#ifdef HAVE_OLD_UPOWER
- ret = up_client_suspend_sync (control->priv->client, NULL, error);
-+#else
-+ ret = FALSE;
-+#endif
- }
-
- egg_debug ("emitting resume");
-@@ -400,7 +404,11 @@
- }
- }
- else {
-+#ifdef HAVE_OLD_UPOWER
- ret = up_client_hibernate_sync (control->priv->client, NULL, error);
-+#else
-+ ret = FALSE;
-+#endif
- }
-
- egg_debug ("emitting resume");
diff --git a/sysutils/mate-power-manager/files/patch-src_gpm-engine.c b/sysutils/mate-power-manager/files/patch-src_gpm-engine.c
deleted file mode 100644
index b90ba56a974b..000000000000
--- a/sysutils/mate-power-manager/files/patch-src_gpm-engine.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/gpm-engine.c.orig 2014-04-20 19:34:27.136166463 +0000
-+++ src/gpm-engine.c 2014-04-20 19:35:40.970161631 +0000
-@@ -812,7 +812,11 @@
- g_return_val_if_fail (GPM_IS_ENGINE (engine), FALSE);
-
- /* get devices from UPower */
-+#ifdef HAVE_OLD_UPOWER
- ret = up_client_enumerate_devices_sync (engine->priv->client, NULL, &error);
-+#else
-+ ret = FALSE;
-+#endif
- if (!ret) {
- egg_error ("failed to get device list: %s", error->message);
- g_error_free (error);
diff --git a/sysutils/mate-power-manager/files/patch-src_gpm-statistics.c b/sysutils/mate-power-manager/files/patch-src_gpm-statistics.c
deleted file mode 100644
index faa3bc25149f..000000000000
--- a/sysutils/mate-power-manager/files/patch-src_gpm-statistics.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/gpm-statistics.c.orig 2014-04-20 19:31:29.658178466 +0000
-+++ src/gpm-statistics.c 2014-04-20 19:32:20.889177637 +0000
-@@ -1796,7 +1796,11 @@
- g_signal_connect (wakeups, "data-changed", G_CALLBACK (gpm_stats_data_changed_cb), NULL);
-
- /* coldplug */
-+#ifdef HAVE_OLD_UPOWER
- ret = up_client_enumerate_devices_sync (client, NULL, NULL);
-+#else
-+ ret = FALSE;
-+#endif
- if (!ret)
- goto out;
- devices = up_client_get_devices (client);
diff --git a/sysutils/mate-power-manager/pkg-plist b/sysutils/mate-power-manager/pkg-plist
index 7986025f1763..711af1bc03de 100644
--- a/sysutils/mate-power-manager/pkg-plist
+++ b/sysutils/mate-power-manager/pkg-plist
@@ -4,8 +4,11 @@ bin/mate-power-statistics
etc/xdg/autostart/mate-power-manager.desktop
libexec/mate-brightness-applet
libexec/mate-inhibit-applet
+man/man1/mate-power-backlight-helper.1.gz
+man/man1/mate-power-manager.1.gz
+man/man1/mate-power-preferences.1.gz
+man/man1/mate-power-statistics.1.gz
sbin/mate-power-backlight-helper
-share/MateConf/gsettings/mate-power-manager.convert
share/applications/mate-power-preferences.desktop
share/applications/mate-power-statistics.desktop
share/dbus-1/services/org.mate.PowerManager.service
@@ -280,10 +283,10 @@ share/locale/ar/LC_MESSAGES/mate-power-manager.mo
share/locale/as/LC_MESSAGES/mate-power-manager.mo
share/locale/ast/LC_MESSAGES/mate-power-manager.mo
share/locale/be/LC_MESSAGES/mate-power-manager.mo
-share/locale/be@latin/LC_MESSAGES/mate-power-manager.mo
share/locale/bg/LC_MESSAGES/mate-power-manager.mo
share/locale/bn/LC_MESSAGES/mate-power-manager.mo
share/locale/bn_IN/LC_MESSAGES/mate-power-manager.mo
+share/locale/br/LC_MESSAGES/mate-power-manager.mo
share/locale/ca/LC_MESSAGES/mate-power-manager.mo
share/locale/ca@valencia/LC_MESSAGES/mate-power-manager.mo
share/locale/cmn/LC_MESSAGES/mate-power-manager.mo
@@ -293,12 +296,12 @@ share/locale/da/LC_MESSAGES/mate-power-manager.mo
share/locale/de/LC_MESSAGES/mate-power-manager.mo
share/locale/dz/LC_MESSAGES/mate-power-manager.mo
share/locale/el/LC_MESSAGES/mate-power-manager.mo
-share/locale/en@shaw/LC_MESSAGES/mate-power-manager.mo
share/locale/en_AU/LC_MESSAGES/mate-power-manager.mo
share/locale/en_CA/LC_MESSAGES/mate-power-manager.mo
share/locale/en_GB/LC_MESSAGES/mate-power-manager.mo
-share/locale/en_US/LC_MESSAGES/mate-power-manager.mo
share/locale/es/LC_MESSAGES/mate-power-manager.mo
+share/locale/es_CO/LC_MESSAGES/mate-power-manager.mo
+share/locale/es_MX/LC_MESSAGES/mate-power-manager.mo
share/locale/et/LC_MESSAGES/mate-power-manager.mo
share/locale/eu/LC_MESSAGES/mate-power-manager.mo
share/locale/fa/LC_MESSAGES/mate-power-manager.mo
@@ -311,6 +314,7 @@ share/locale/he/LC_MESSAGES/mate-power-manager.mo
share/locale/hi/LC_MESSAGES/mate-power-manager.mo
share/locale/hr/LC_MESSAGES/mate-power-manager.mo
share/locale/hu/LC_MESSAGES/mate-power-manager.mo
+share/locale/hy/LC_MESSAGES/mate-power-manager.mo
share/locale/id/LC_MESSAGES/mate-power-manager.mo
share/locale/is/LC_MESSAGES/mate-power-manager.mo
share/locale/it/LC_MESSAGES/mate-power-manager.mo
@@ -320,6 +324,7 @@ share/locale/kk/LC_MESSAGES/mate-power-manager.mo
share/locale/kn/LC_MESSAGES/mate-power-manager.mo
share/locale/ko/LC_MESSAGES/mate-power-manager.mo
share/locale/ku/LC_MESSAGES/mate-power-manager.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-power-manager.mo
share/locale/ky/LC_MESSAGES/mate-power-manager.mo
share/locale/lt/LC_MESSAGES/mate-power-manager.mo
share/locale/lv/LC_MESSAGES/mate-power-manager.mo
@@ -336,6 +341,7 @@ share/locale/oc/LC_MESSAGES/mate-power-manager.mo
share/locale/or/LC_MESSAGES/mate-power-manager.mo
share/locale/pa/LC_MESSAGES/mate-power-manager.mo
share/locale/pl/LC_MESSAGES/mate-power-manager.mo
+share/locale/pms/LC_MESSAGES/mate-power-manager.mo
share/locale/pt/LC_MESSAGES/mate-power-manager.mo
share/locale/pt_BR/LC_MESSAGES/mate-power-manager.mo
share/locale/ro/LC_MESSAGES/mate-power-manager.mo
@@ -353,6 +359,7 @@ share/locale/th/LC_MESSAGES/mate-power-manager.mo
share/locale/tr/LC_MESSAGES/mate-power-manager.mo
share/locale/uk/LC_MESSAGES/mate-power-manager.mo
share/locale/ur/LC_MESSAGES/mate-power-manager.mo
+share/locale/uz/LC_MESSAGES/mate-power-manager.mo
share/locale/vi/LC_MESSAGES/mate-power-manager.mo
share/locale/zh_CN/LC_MESSAGES/mate-power-manager.mo
share/locale/zh_HK/LC_MESSAGES/mate-power-manager.mo
diff --git a/sysutils/mate-settings-daemon/Makefile b/sysutils/mate-settings-daemon/Makefile
index d25574230bbd..dbdbef74f7e2 100644
--- a/sysutils/mate-settings-daemon/Makefile
+++ b/sysutils/mate-settings-daemon/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mate-settings-daemon
-PORTVERSION= 1.12.1
-PORTREVISION= 1
+PORTVERSION= 1.18.0
CATEGORIES= sysutils mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -15,26 +14,29 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
libxklavier.so:x11/libxklavier \
libnss3.so:security/nss \
+ libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig \
libpolkit-gobject-1.so:sysutils/polkit \
+ libstartup-notification-1.so:x11/startup-notification \
+ libcanberra-gtk.so:audio/libcanberra \
+ libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+ libnspr4.so:devel/nspr \
libnotify.so:devel/libnotify
RUN_DEPENDS= xrdb:x11/xrdb
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
-USE_MATE= desktop libmatekbd
-USE_XORG= xxf86misc
-USE_GNOME= dconf gtk20 intlhack
+USES= gettext gmake libtool localbase pathfix \
+ pkgconfig tar:xz
+USE_MATE= desktop libmatekbd mixer
+USE_XORG= ice sm x11 xext xi xxf86misc
+USE_GNOME= cairo dconf gtk30 intlhack
USE_LDCONFIG= yes
-USE_GSTREAMER= good
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-dbus-services=${PREFIX}/share/dbus-1/services \
- --with-gtk=2.0 \
+ --with-gtk=3.0 \
--disable-static
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml \
diff --git a/sysutils/mate-settings-daemon/distinfo b/sysutils/mate-settings-daemon/distinfo
index cf3a70dee076..6c0cf7ea72ef 100644
--- a/sysutils/mate-settings-daemon/distinfo
+++ b/sysutils/mate-settings-daemon/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-settings-daemon-1.12.1.tar.xz) = a0d9ea55ba5828500e873eff6c771dae645fa3218c1ba9d701c408f0eb71e988
-SIZE (mate/mate-settings-daemon-1.12.1.tar.xz) = 781388
+TIMESTAMP = 1491671899
+SHA256 (mate/mate-settings-daemon-1.18.0.tar.xz) = a377abc570eb553018c02665779a2799374efce0c9a756aba5d4266fb939aebe
+SIZE (mate/mate-settings-daemon-1.18.0.tar.xz) = 779856
diff --git a/sysutils/mate-settings-daemon/pkg-plist b/sysutils/mate-settings-daemon/pkg-plist
index e505a4d76b1b..600245bb4fea 100644
--- a/sysutils/mate-settings-daemon/pkg-plist
+++ b/sysutils/mate-settings-daemon/pkg-plist
@@ -47,7 +47,6 @@ libexec/msd-locate-pointer
man/man1/mate-settings-daemon.1.gz
man/man1/msd-datetime-mechanism.1.gz
man/man1/msd-locate-pointer.1.gz
-share/MateConf/gsettings/mate-settings-daemon.convert
share/dbus-1/services/org.mate.SettingsDaemon.service
share/dbus-1/system-services/org.mate.SettingsDaemon.DateTimeMechanism.service
share/icons/hicolor/16x16/apps/msd-xrandr.png
@@ -72,7 +71,6 @@ share/locale/as/LC_MESSAGES/mate-settings-daemon.mo
share/locale/ast/LC_MESSAGES/mate-settings-daemon.mo
share/locale/az/LC_MESSAGES/mate-settings-daemon.mo
share/locale/be/LC_MESSAGES/mate-settings-daemon.mo
-share/locale/be@latin/LC_MESSAGES/mate-settings-daemon.mo
share/locale/bg/LC_MESSAGES/mate-settings-daemon.mo
share/locale/bn/LC_MESSAGES/mate-settings-daemon.mo
share/locale/bn_IN/LC_MESSAGES/mate-settings-daemon.mo
@@ -88,17 +86,17 @@ share/locale/da/LC_MESSAGES/mate-settings-daemon.mo
share/locale/de/LC_MESSAGES/mate-settings-daemon.mo
share/locale/dz/LC_MESSAGES/mate-settings-daemon.mo
share/locale/el/LC_MESSAGES/mate-settings-daemon.mo
-share/locale/en@shaw/LC_MESSAGES/mate-settings-daemon.mo
share/locale/en_AU/LC_MESSAGES/mate-settings-daemon.mo
share/locale/en_CA/LC_MESSAGES/mate-settings-daemon.mo
share/locale/en_GB/LC_MESSAGES/mate-settings-daemon.mo
-share/locale/en_US/LC_MESSAGES/mate-settings-daemon.mo
share/locale/es/LC_MESSAGES/mate-settings-daemon.mo
+share/locale/es_CO/LC_MESSAGES/mate-settings-daemon.mo
share/locale/et/LC_MESSAGES/mate-settings-daemon.mo
share/locale/eu/LC_MESSAGES/mate-settings-daemon.mo
share/locale/fa/LC_MESSAGES/mate-settings-daemon.mo
share/locale/fi/LC_MESSAGES/mate-settings-daemon.mo
share/locale/fr/LC_MESSAGES/mate-settings-daemon.mo
+share/locale/frp/LC_MESSAGES/mate-settings-daemon.mo
share/locale/ga/LC_MESSAGES/mate-settings-daemon.mo
share/locale/gl/LC_MESSAGES/mate-settings-daemon.mo
share/locale/gu/LC_MESSAGES/mate-settings-daemon.mo
@@ -106,6 +104,7 @@ share/locale/he/LC_MESSAGES/mate-settings-daemon.mo
share/locale/hi/LC_MESSAGES/mate-settings-daemon.mo
share/locale/hr/LC_MESSAGES/mate-settings-daemon.mo
share/locale/hu/LC_MESSAGES/mate-settings-daemon.mo
+share/locale/hy/LC_MESSAGES/mate-settings-daemon.mo
share/locale/id/LC_MESSAGES/mate-settings-daemon.mo
share/locale/is/LC_MESSAGES/mate-settings-daemon.mo
share/locale/it/LC_MESSAGES/mate-settings-daemon.mo
@@ -115,6 +114,7 @@ share/locale/kk/LC_MESSAGES/mate-settings-daemon.mo
share/locale/kn/LC_MESSAGES/mate-settings-daemon.mo
share/locale/ko/LC_MESSAGES/mate-settings-daemon.mo
share/locale/ku/LC_MESSAGES/mate-settings-daemon.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-settings-daemon.mo
share/locale/ky/LC_MESSAGES/mate-settings-daemon.mo
share/locale/lt/LC_MESSAGES/mate-settings-daemon.mo
share/locale/lv/LC_MESSAGES/mate-settings-daemon.mo
@@ -135,6 +135,7 @@ share/locale/oc/LC_MESSAGES/mate-settings-daemon.mo
share/locale/or/LC_MESSAGES/mate-settings-daemon.mo
share/locale/pa/LC_MESSAGES/mate-settings-daemon.mo
share/locale/pl/LC_MESSAGES/mate-settings-daemon.mo
+share/locale/pms/LC_MESSAGES/mate-settings-daemon.mo
share/locale/pt/LC_MESSAGES/mate-settings-daemon.mo
share/locale/pt_BR/LC_MESSAGES/mate-settings-daemon.mo
share/locale/ro/LC_MESSAGES/mate-settings-daemon.mo
@@ -153,6 +154,7 @@ share/locale/th/LC_MESSAGES/mate-settings-daemon.mo
share/locale/tr/LC_MESSAGES/mate-settings-daemon.mo
share/locale/uk/LC_MESSAGES/mate-settings-daemon.mo
share/locale/ur/LC_MESSAGES/mate-settings-daemon.mo
+share/locale/uz/LC_MESSAGES/mate-settings-daemon.mo
share/locale/vi/LC_MESSAGES/mate-settings-daemon.mo
share/locale/wa/LC_MESSAGES/mate-settings-daemon.mo
share/locale/xh/LC_MESSAGES/mate-settings-daemon.mo
diff --git a/sysutils/mate-system-monitor/Makefile b/sysutils/mate-system-monitor/Makefile
index f5650a0fe943..a1f5b688d8f9 100644
--- a/sysutils/mate-system-monitor/Makefile
+++ b/sysutils/mate-system-monitor/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mate-system-monitor
-PORTVERSION= 1.12.1
-PORTREVISION= 1
+PORTVERSION= 1.18.0
CATEGORIES= sysutils mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -17,15 +16,13 @@ LIB_DEPENDS= libgtop-2.0.so:devel/libgtop \
PORTSCOUT= limitw:1,even
-USES= alias compiler:c++11-lang gettext gmake pathfix \
- pkgconfig tar:xz
+USES= alias compiler:c++11-lib gettext gmake localbase \
+ pathfix pkgconfig tar:xz
USE_MATE= icontheme
-USE_GNOME= gtk20 gtkmm24 intlhack librsvg2 libwnck libxml2
-CONFIGURE_ARGS= --with-gtk=2.0
+USE_GNOME= gtkmm30 intlhack librsvg2 libwnck3 libxml2
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-systemd
CONFIGURE_ENV= LIBS="-lutil" DATADIRNAME="share"
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.mate.system-monitor.enums.xml \
org.mate.system-monitor.gschema.xml
diff --git a/sysutils/mate-system-monitor/distinfo b/sysutils/mate-system-monitor/distinfo
index 6b462172d5eb..7d012d618e85 100644
--- a/sysutils/mate-system-monitor/distinfo
+++ b/sysutils/mate-system-monitor/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-system-monitor-1.12.1.tar.xz) = 7668ecba70b7f56f3bcfb143cb6b93a15daf8636fcf678491112afea1a49dea9
-SIZE (mate/mate-system-monitor-1.12.1.tar.xz) = 2113756
+TIMESTAMP = 1491689060
+SHA256 (mate/mate-system-monitor-1.18.0.tar.xz) = 887c0d91fa866af75cc066591fcd521107976f123784b1b887535a4709cd9bf1
+SIZE (mate/mate-system-monitor-1.18.0.tar.xz) = 2133484
diff --git a/sysutils/mate-system-monitor/files/patch-src_lsof.cpp b/sysutils/mate-system-monitor/files/patch-src_lsof.cpp
deleted file mode 100644
index 9c32166eb360..000000000000
--- a/sysutils/mate-system-monitor/files/patch-src_lsof.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lsof.cpp.orig 2015-09-25 13:36:19.000000000 +0200
-+++ src/lsof.cpp 2016-01-09 12:32:53.892273000 +0100
-@@ -140,8 +140,9 @@
-
- void update_count(unsigned count)
- {
-- string s = static_cast<std::ostringstream&>(std::ostringstream() << count).str();
-- gtk_label_set_text(this->count, s.c_str());
-+ std::ostringstream ss;
-+ ss << count;;
-+ gtk_label_set_text(this->count, ss.str().c_str());
- }
-
-
diff --git a/sysutils/mate-system-monitor/files/patch-src_procproperties.cpp b/sysutils/mate-system-monitor/files/patch-src_procproperties.cpp
deleted file mode 100644
index 7daeab5c60d6..000000000000
--- a/sysutils/mate-system-monitor/files/patch-src_procproperties.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/procproperties.cpp.orig 2015-07-02 23:46:27.000000000 +0200
-+++ src/procproperties.cpp 2015-07-14 10:18:48.273918000 +0200
-@@ -26,7 +26,7 @@
- #include <glibtop/procstate.h>
- #if defined (__linux__)
- #include <asm/param.h>
--#elif defined (__NetBSD__) || defined (__OpenBSD__)
-+#elif defined (__NetBSD__) || defined (__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #include <sys/param.h>
- #include <sys/sysctl.h>
- #endif
-@@ -114,7 +114,7 @@
-
- get_process_memory_info(info);
-
--#if defined (__NetBSD__) || defined (__OpenBSD__)
-+#if defined (__NetBSD__) || defined (__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- struct clockinfo cinf;
- size_t size = sizeof (cinf);
- int HZ;
diff --git a/sysutils/mate-system-monitor/pkg-plist b/sysutils/mate-system-monitor/pkg-plist
index 3aa31cd9e7d4..f9ec93af42c8 100644
--- a/sysutils/mate-system-monitor/pkg-plist
+++ b/sysutils/mate-system-monitor/pkg-plist
@@ -1,6 +1,7 @@
bin/mate-system-monitor
+libexec/mate-system-monitor/msm-kill
+libexec/mate-system-monitor/msm-renice
man/man1/mate-system-monitor.1.gz
-share/MateConf/gsettings/mate-system-monitor.convert
share/appdata/mate-system-monitor.appdata.xml
share/applications/mate-system-monitor.desktop
share/help/C/mate-system-monitor/figures/addColumn.png
@@ -219,10 +220,10 @@ share/locale/as/LC_MESSAGES/mate-system-monitor.mo
share/locale/ast/LC_MESSAGES/mate-system-monitor.mo
share/locale/az/LC_MESSAGES/mate-system-monitor.mo
share/locale/be/LC_MESSAGES/mate-system-monitor.mo
-share/locale/be@latin/LC_MESSAGES/mate-system-monitor.mo
share/locale/bg/LC_MESSAGES/mate-system-monitor.mo
share/locale/bn/LC_MESSAGES/mate-system-monitor.mo
share/locale/bn_IN/LC_MESSAGES/mate-system-monitor.mo
+share/locale/br/LC_MESSAGES/mate-system-monitor.mo
share/locale/bs/LC_MESSAGES/mate-system-monitor.mo
share/locale/ca/LC_MESSAGES/mate-system-monitor.mo
share/locale/ca@valencia/LC_MESSAGES/mate-system-monitor.mo
@@ -233,18 +234,20 @@ share/locale/da/LC_MESSAGES/mate-system-monitor.mo
share/locale/de/LC_MESSAGES/mate-system-monitor.mo
share/locale/dz/LC_MESSAGES/mate-system-monitor.mo
share/locale/el/LC_MESSAGES/mate-system-monitor.mo
-share/locale/en@shaw/LC_MESSAGES/mate-system-monitor.mo
share/locale/en_AU/LC_MESSAGES/mate-system-monitor.mo
share/locale/en_CA/LC_MESSAGES/mate-system-monitor.mo
share/locale/en_GB/LC_MESSAGES/mate-system-monitor.mo
share/locale/eo/LC_MESSAGES/mate-system-monitor.mo
share/locale/es/LC_MESSAGES/mate-system-monitor.mo
+share/locale/es_CO/LC_MESSAGES/mate-system-monitor.mo
share/locale/es_MX/LC_MESSAGES/mate-system-monitor.mo
share/locale/et/LC_MESSAGES/mate-system-monitor.mo
share/locale/eu/LC_MESSAGES/mate-system-monitor.mo
share/locale/fa/LC_MESSAGES/mate-system-monitor.mo
share/locale/fi/LC_MESSAGES/mate-system-monitor.mo
share/locale/fr/LC_MESSAGES/mate-system-monitor.mo
+share/locale/fr_CA/LC_MESSAGES/mate-system-monitor.mo
+share/locale/frp/LC_MESSAGES/mate-system-monitor.mo
share/locale/ga/LC_MESSAGES/mate-system-monitor.mo
share/locale/gl/LC_MESSAGES/mate-system-monitor.mo
share/locale/gu/LC_MESSAGES/mate-system-monitor.mo
@@ -252,14 +255,18 @@ share/locale/he/LC_MESSAGES/mate-system-monitor.mo
share/locale/hi/LC_MESSAGES/mate-system-monitor.mo
share/locale/hr/LC_MESSAGES/mate-system-monitor.mo
share/locale/hu/LC_MESSAGES/mate-system-monitor.mo
+share/locale/hy/LC_MESSAGES/mate-system-monitor.mo
share/locale/id/LC_MESSAGES/mate-system-monitor.mo
+share/locale/is/LC_MESSAGES/mate-system-monitor.mo
share/locale/it/LC_MESSAGES/mate-system-monitor.mo
share/locale/ja/LC_MESSAGES/mate-system-monitor.mo
+share/locale/jv/LC_MESSAGES/mate-system-monitor.mo
share/locale/ka/LC_MESSAGES/mate-system-monitor.mo
share/locale/kk/LC_MESSAGES/mate-system-monitor.mo
share/locale/kn/LC_MESSAGES/mate-system-monitor.mo
share/locale/ko/LC_MESSAGES/mate-system-monitor.mo
share/locale/ku/LC_MESSAGES/mate-system-monitor.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-system-monitor.mo
share/locale/ky/LC_MESSAGES/mate-system-monitor.mo
share/locale/li/LC_MESSAGES/mate-system-monitor.mo
share/locale/lt/LC_MESSAGES/mate-system-monitor.mo
@@ -281,6 +288,7 @@ share/locale/oc/LC_MESSAGES/mate-system-monitor.mo
share/locale/or/LC_MESSAGES/mate-system-monitor.mo
share/locale/pa/LC_MESSAGES/mate-system-monitor.mo
share/locale/pl/LC_MESSAGES/mate-system-monitor.mo
+share/locale/pms/LC_MESSAGES/mate-system-monitor.mo
share/locale/ps/LC_MESSAGES/mate-system-monitor.mo
share/locale/pt/LC_MESSAGES/mate-system-monitor.mo
share/locale/pt_BR/LC_MESSAGES/mate-system-monitor.mo
@@ -301,6 +309,7 @@ share/locale/tr/LC_MESSAGES/mate-system-monitor.mo
share/locale/ug/LC_MESSAGES/mate-system-monitor.mo
share/locale/uk/LC_MESSAGES/mate-system-monitor.mo
share/locale/ur/LC_MESSAGES/mate-system-monitor.mo
+share/locale/uz/LC_MESSAGES/mate-system-monitor.mo
share/locale/vi/LC_MESSAGES/mate-system-monitor.mo
share/locale/zh_CN/LC_MESSAGES/mate-system-monitor.mo
share/locale/zh_HK/LC_MESSAGES/mate-system-monitor.mo
@@ -308,3 +317,4 @@ share/locale/zh_TW/LC_MESSAGES/mate-system-monitor.mo
share/pixmaps/mate-system-monitor/download.svg
share/pixmaps/mate-system-monitor/side.png
share/pixmaps/mate-system-monitor/upload.svg
+share/polkit-1/actions/org.mate.mate-system-monitor.policy
diff --git a/x11-fm/caja/Makefile b/x11-fm/caja/Makefile
index e044cb5505a8..d73db6ef9670 100644
--- a/x11-fm/caja/Makefile
+++ b/x11-fm/caja/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= caja
-PORTVERSION= 1.12.4
+PORTVERSION= 1.18.3
CATEGORIES= x11-fm mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,29 +10,27 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT?= File manager for the MATE desktop
-BUILD_DEPENDS= gtkdoc-check:textproc/gtk-doc
+LICENSE= GPLv2 LGPL20
+LICENSE_COMB= multi
+LICENSE_GPLv2_FILE= ${WRKSRC}/COPYING
+LICENSE_LGPL20_FILE= ${WRKSRC}/COPYING.LIB
+
LIB_DEPENDS= libexif.so:graphics/libexif \
- libunique-1.0.so:x11-toolkits/unique \
- libexempi.so:textproc/exempi
-RUN_DEPENDS= ${LOCALBASE}/libexec/gvfsd:devel/gvfs
+ libexempi.so:textproc/exempi \
+ libstartup-notification-1.so:x11/startup-notification \
+ libnotify.so:devel/libnotify
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \
- shared-mime-info tar:xz
+USES= desktop-file-utils gettext gmake libtool localbase \
+ pathfix pkgconfig shared-mime-info tar:xz
USE_MATE= desktop icontheme:run
-USE_XORG= ice x11 xrender
-USE_GNOME= glib20 gtk20 intltool introspection:build \
- libxml2 pango
+USE_XORG= ice sm x11
+USE_GNOME= cairo gtk30 gnomeprefix intltool introspection:build libxml2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-packagekit \
- --with-gtk=2.0 \
- --disable-gtk-doc \
- --with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS= --disable-packagekit
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.caja.gschema.xml \
@@ -40,6 +38,5 @@ GLIB_SCHEMAS= org.mate.caja.gschema.xml \
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/caja/extensions-2.0
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcaja-extension.so.1.4.0
.include <bsd.port.mk>
diff --git a/x11-fm/caja/distinfo b/x11-fm/caja/distinfo
index 8950eaee3b62..1f8cbe89ace5 100644
--- a/x11-fm/caja/distinfo
+++ b/x11-fm/caja/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/caja-1.12.4.tar.xz) = 0987c4b0ee72660a313b24b2b41bb5cf7b57e35d236ec0217268b3b03287799a
-SIZE (mate/caja-1.12.4.tar.xz) = 3646176
+TIMESTAMP = 1497519794
+SHA256 (mate/caja-1.18.3.tar.xz) = b562c544f907944b2e1ce426b5e1d1d02886ecfff8d44f0a3ae2a2793ac39256
+SIZE (mate/caja-1.18.3.tar.xz) = 3526224
diff --git a/x11-fm/caja/pkg-plist b/x11-fm/caja/pkg-plist
index cc28901a0a91..41ba7a0a0357 100644
--- a/x11-fm/caja/pkg-plist
+++ b/x11-fm/caja/pkg-plist
@@ -18,12 +18,10 @@ lib/libcaja-extension.so
lib/libcaja-extension.so.1
lib/libcaja-extension.so.1.4.0
libdata/pkgconfig/libcaja-extension.pc
-libexec/caja-convert-metadata
man/man1/caja-autorun-software.1.gz
man/man1/caja-connect-server.1.gz
man/man1/caja-file-management-properties.1.gz
man/man1/caja.1.gz
-share/MateConf/gsettings/caja.convert
share/appdata/caja.appdata.xml
share/applications/caja-autorun-software.desktop
share/applications/caja-browser.desktop
@@ -34,8 +32,11 @@ share/applications/caja-home.desktop
share/applications/caja.desktop
share/applications/mate-network-scheme.desktop
%%DATADIR%%/browser.xml
+%%DATADIR%%/caja-desktop-3.14.css
+%%DATADIR%%/caja-desktop.css
%%DATADIR%%/caja-extras.placeholder
%%DATADIR%%/caja-suggested.placeholder
+%%DATADIR%%/caja.css
%%DATADIR%%/patterns/blue_gray_rough.png
%%DATADIR%%/patterns/blue_ridge.png
%%DATADIR%%/patterns/blue_type.png
@@ -77,23 +78,23 @@ share/applications/mate-network-scheme.desktop
%%DATADIR%%/ui/caja-shell-ui.xml
%%DATADIR%%/ui/caja-spatial-window-ui.xml
share/dbus-1/services/org.mate.freedesktop.FileManager1.service
+share/doc/libcaja-extension/CajaColumn.html
+share/doc/libcaja-extension/CajaColumnProvider.html
+share/doc/libcaja-extension/CajaFileInfo.html
+share/doc/libcaja-extension/CajaInfoProvider.html
+share/doc/libcaja-extension/CajaLocationWidgetProvider.html
+share/doc/libcaja-extension/CajaMenu.html
+share/doc/libcaja-extension/CajaMenuItem.html
+share/doc/libcaja-extension/CajaMenuProvider.html
+share/doc/libcaja-extension/CajaPropertyPage.html
+share/doc/libcaja-extension/CajaPropertyPageProvider.html
share/doc/libcaja-extension/ch01.html
share/doc/libcaja-extension/home.png
share/doc/libcaja-extension/index.html
-share/doc/libcaja-extension/index.sgml
share/doc/libcaja-extension/ix01.html
share/doc/libcaja-extension/left-insensitive.png
share/doc/libcaja-extension/left.png
-share/doc/libcaja-extension/libcaja-extension-caja-column-provider.html
-share/doc/libcaja-extension/libcaja-extension-caja-column.html
-share/doc/libcaja-extension/libcaja-extension-caja-extension-types.html
-share/doc/libcaja-extension/libcaja-extension-caja-file-info.html
-share/doc/libcaja-extension/libcaja-extension-caja-info-provider.html
-share/doc/libcaja-extension/libcaja-extension-caja-location-widget-provider.html
-share/doc/libcaja-extension/libcaja-extension-caja-menu-provider.html
-share/doc/libcaja-extension/libcaja-extension-caja-menu.html
-share/doc/libcaja-extension/libcaja-extension-caja-property-page-provider.html
-share/doc/libcaja-extension/libcaja-extension-caja-property-page.html
+share/doc/libcaja-extension/libcaja-extension-CajaModule.html
share/doc/libcaja-extension/libcaja-extension.devhelp2
share/doc/libcaja-extension/pt01.html
share/doc/libcaja-extension/right-insensitive.png
@@ -117,7 +118,6 @@ share/locale/as/LC_MESSAGES/caja.mo
share/locale/ast/LC_MESSAGES/caja.mo
share/locale/az/LC_MESSAGES/caja.mo
share/locale/be/LC_MESSAGES/caja.mo
-share/locale/be@latin/LC_MESSAGES/caja.mo
share/locale/bg/LC_MESSAGES/caja.mo
share/locale/bn/LC_MESSAGES/caja.mo
share/locale/bn_IN/LC_MESSAGES/caja.mo
@@ -133,24 +133,25 @@ share/locale/da/LC_MESSAGES/caja.mo
share/locale/de/LC_MESSAGES/caja.mo
share/locale/dz/LC_MESSAGES/caja.mo
share/locale/el/LC_MESSAGES/caja.mo
-share/locale/en@shaw/LC_MESSAGES/caja.mo
share/locale/en_AU/LC_MESSAGES/caja.mo
share/locale/en_CA/LC_MESSAGES/caja.mo
share/locale/en_GB/LC_MESSAGES/caja.mo
-share/locale/en_US/LC_MESSAGES/caja.mo
share/locale/eo/LC_MESSAGES/caja.mo
share/locale/es/LC_MESSAGES/caja.mo
+share/locale/es_AR/LC_MESSAGES/caja.mo
+share/locale/es_CO/LC_MESSAGES/caja.mo
+share/locale/es_MX/LC_MESSAGES/caja.mo
share/locale/et/LC_MESSAGES/caja.mo
share/locale/eu/LC_MESSAGES/caja.mo
share/locale/fa/LC_MESSAGES/caja.mo
share/locale/fi/LC_MESSAGES/caja.mo
share/locale/fr/LC_MESSAGES/caja.mo
+share/locale/frp/LC_MESSAGES/caja.mo
share/locale/fur/LC_MESSAGES/caja.mo
share/locale/fy/LC_MESSAGES/caja.mo
share/locale/ga/LC_MESSAGES/caja.mo
share/locale/gl/LC_MESSAGES/caja.mo
share/locale/gu/LC_MESSAGES/caja.mo
-share/locale/gv/LC_MESSAGES/caja.mo
share/locale/ha/LC_MESSAGES/caja.mo
share/locale/he/LC_MESSAGES/caja.mo
share/locale/hi/LC_MESSAGES/caja.mo
@@ -160,16 +161,15 @@ share/locale/hy/LC_MESSAGES/caja.mo
share/locale/ia/LC_MESSAGES/caja.mo
share/locale/id/LC_MESSAGES/caja.mo
share/locale/ig/LC_MESSAGES/caja.mo
-share/locale/io/LC_MESSAGES/caja.mo
share/locale/is/LC_MESSAGES/caja.mo
share/locale/it/LC_MESSAGES/caja.mo
share/locale/ja/LC_MESSAGES/caja.mo
share/locale/ka/LC_MESSAGES/caja.mo
share/locale/kk/LC_MESSAGES/caja.mo
-share/locale/km/LC_MESSAGES/caja.mo
share/locale/kn/LC_MESSAGES/caja.mo
share/locale/ko/LC_MESSAGES/caja.mo
share/locale/ku/LC_MESSAGES/caja.mo
+share/locale/ku_IQ/LC_MESSAGES/caja.mo
share/locale/ky/LC_MESSAGES/caja.mo
share/locale/li/LC_MESSAGES/caja.mo
share/locale/lt/LC_MESSAGES/caja.mo
@@ -192,18 +192,19 @@ share/locale/oc/LC_MESSAGES/caja.mo
share/locale/or/LC_MESSAGES/caja.mo
share/locale/pa/LC_MESSAGES/caja.mo
share/locale/pl/LC_MESSAGES/caja.mo
+share/locale/pms/LC_MESSAGES/caja.mo
share/locale/ps/LC_MESSAGES/caja.mo
share/locale/pt/LC_MESSAGES/caja.mo
share/locale/pt_BR/LC_MESSAGES/caja.mo
share/locale/ro/LC_MESSAGES/caja.mo
share/locale/ru/LC_MESSAGES/caja.mo
share/locale/rw/LC_MESSAGES/caja.mo
+share/locale/sc/LC_MESSAGES/caja.mo
share/locale/si/LC_MESSAGES/caja.mo
share/locale/sk/LC_MESSAGES/caja.mo
share/locale/sl/LC_MESSAGES/caja.mo
share/locale/sq/LC_MESSAGES/caja.mo
share/locale/sr/LC_MESSAGES/caja.mo
-share/locale/sr@ije/LC_MESSAGES/caja.mo
share/locale/sr@latin/LC_MESSAGES/caja.mo
share/locale/sv/LC_MESSAGES/caja.mo
share/locale/ta/LC_MESSAGES/caja.mo
@@ -215,7 +216,6 @@ share/locale/ug/LC_MESSAGES/caja.mo
share/locale/uk/LC_MESSAGES/caja.mo
share/locale/ur/LC_MESSAGES/caja.mo
share/locale/uz/LC_MESSAGES/caja.mo
-share/locale/uz@cyrillic/LC_MESSAGES/caja.mo
share/locale/vi/LC_MESSAGES/caja.mo
share/locale/wa/LC_MESSAGES/caja.mo
share/locale/xh/LC_MESSAGES/caja.mo
diff --git a/x11-themes/mate-backgrounds/Makefile b/x11-themes/mate-backgrounds/Makefile
index 5ea35c07c0e8..9b2cd25d88e9 100644
--- a/x11-themes/mate-backgrounds/Makefile
+++ b/x11-themes/mate-backgrounds/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-backgrounds
-PORTVERSION= 1.12.0
+PORTVERSION= 1.18.0
CATEGORIES= x11-themes graphics mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -15,7 +15,5 @@ PORTSCOUT= limitw:1,even
USES= gettext gmake pathfix tar:xz
USE_GNOME= glib20 intlhack
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/x11-themes/mate-backgrounds/distinfo b/x11-themes/mate-backgrounds/distinfo
index 07a55bfdeb56..fe1e3e807d21 100644
--- a/x11-themes/mate-backgrounds/distinfo
+++ b/x11-themes/mate-backgrounds/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-backgrounds-1.12.0.tar.xz) = 841f098c94967fce74d6dd57cd0291e7aaee65effbd94d767a16b2f25feb6c2d
-SIZE (mate/mate-backgrounds-1.12.0.tar.xz) = 20885844
+TIMESTAMP = 1491700555
+SHA256 (mate/mate-backgrounds-1.18.0.tar.xz) = f103d38898cc088608c813d732e4681fd6a8b9cf2a9564b9d057461da59e081b
+SIZE (mate/mate-backgrounds-1.18.0.tar.xz) = 20890260
diff --git a/x11-themes/mate-backgrounds/pkg-plist b/x11-themes/mate-backgrounds/pkg-plist
index a241d07be8b9..5a2a87908b03 100644
--- a/x11-themes/mate-backgrounds/pkg-plist
+++ b/x11-themes/mate-backgrounds/pkg-plist
@@ -36,6 +36,7 @@ share/locale/be@latin/LC_MESSAGES/mate-backgrounds.mo
share/locale/bg/LC_MESSAGES/mate-backgrounds.mo
share/locale/bn/LC_MESSAGES/mate-backgrounds.mo
share/locale/bn_IN/LC_MESSAGES/mate-backgrounds.mo
+share/locale/bs/LC_MESSAGES/mate-backgrounds.mo
share/locale/ca/LC_MESSAGES/mate-backgrounds.mo
share/locale/ca@valencia/LC_MESSAGES/mate-backgrounds.mo
share/locale/cmn/LC_MESSAGES/mate-backgrounds.mo
@@ -51,12 +52,15 @@ share/locale/en_CA/LC_MESSAGES/mate-backgrounds.mo
share/locale/en_GB/LC_MESSAGES/mate-backgrounds.mo
share/locale/eo/LC_MESSAGES/mate-backgrounds.mo
share/locale/es/LC_MESSAGES/mate-backgrounds.mo
+share/locale/es_CO/LC_MESSAGES/mate-backgrounds.mo
share/locale/es_MX/LC_MESSAGES/mate-backgrounds.mo
share/locale/et/LC_MESSAGES/mate-backgrounds.mo
share/locale/eu/LC_MESSAGES/mate-backgrounds.mo
share/locale/fa/LC_MESSAGES/mate-backgrounds.mo
share/locale/fi/LC_MESSAGES/mate-backgrounds.mo
share/locale/fr/LC_MESSAGES/mate-backgrounds.mo
+share/locale/fr_CA/LC_MESSAGES/mate-backgrounds.mo
+share/locale/frp/LC_MESSAGES/mate-backgrounds.mo
share/locale/fur/LC_MESSAGES/mate-backgrounds.mo
share/locale/fy/LC_MESSAGES/mate-backgrounds.mo
share/locale/ga/LC_MESSAGES/mate-backgrounds.mo
@@ -68,6 +72,7 @@ share/locale/hr/LC_MESSAGES/mate-backgrounds.mo
share/locale/hu/LC_MESSAGES/mate-backgrounds.mo
share/locale/hy/LC_MESSAGES/mate-backgrounds.mo
share/locale/id/LC_MESSAGES/mate-backgrounds.mo
+share/locale/is/LC_MESSAGES/mate-backgrounds.mo
share/locale/it/LC_MESSAGES/mate-backgrounds.mo
share/locale/ja/LC_MESSAGES/mate-backgrounds.mo
share/locale/ka/LC_MESSAGES/mate-backgrounds.mo
@@ -75,6 +80,7 @@ share/locale/kk/LC_MESSAGES/mate-backgrounds.mo
share/locale/kn/LC_MESSAGES/mate-backgrounds.mo
share/locale/ko/LC_MESSAGES/mate-backgrounds.mo
share/locale/ku/LC_MESSAGES/mate-backgrounds.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-backgrounds.mo
share/locale/ky/LC_MESSAGES/mate-backgrounds.mo
share/locale/lt/LC_MESSAGES/mate-backgrounds.mo
share/locale/lv/LC_MESSAGES/mate-backgrounds.mo
diff --git a/x11-themes/mate-icon-theme-faenza/Makefile b/x11-themes/mate-icon-theme-faenza/Makefile
index 5cef4bcc08de..8ff702d99207 100644
--- a/x11-themes/mate-icon-theme-faenza/Makefile
+++ b/x11-themes/mate-icon-theme-faenza/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-icon-theme-faenza
-PORTVERSION= 1.12.0
+PORTVERSION= 1.18.1
CATEGORIES= x11-themes mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,6 +10,9 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= Collection of Faenza and Faience icons for the MATE desktop
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
PORTSCOUT= limitw:1,even
USES= tar:xz
diff --git a/x11-themes/mate-icon-theme-faenza/distinfo b/x11-themes/mate-icon-theme-faenza/distinfo
index 36e1fb57edd5..bd119010e631 100644
--- a/x11-themes/mate-icon-theme-faenza/distinfo
+++ b/x11-themes/mate-icon-theme-faenza/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-icon-theme-faenza-1.12.0.tar.xz) = c8f6eaac54fdd6d3a81e5cbf18e2bb342c51fd07e0d3deaafc7ca2180bf0b97c
-SIZE (mate/mate-icon-theme-faenza-1.12.0.tar.xz) = 19058516
+TIMESTAMP = 1497526123
+SHA256 (mate/mate-icon-theme-faenza-1.18.1.tar.xz) = 8920a19b5c1755bf3b489b3bf45b90d88e273825ff455a3ba83dfb42d3e3836d
+SIZE (mate/mate-icon-theme-faenza-1.18.1.tar.xz) = 19330596
diff --git a/x11-themes/mate-icon-theme-faenza/pkg-plist b/x11-themes/mate-icon-theme-faenza/pkg-plist
index c2d8409046a6..c1296cbef9d6 100644
--- a/x11-themes/mate-icon-theme-faenza/pkg-plist
+++ b/x11-themes/mate-icon-theme-faenza/pkg-plist
@@ -3971,6 +3971,7 @@ share/icons/matefaenza/apps/16/softwarecenter.png
share/icons/matefaenza/apps/16/sound-juicer.png
share/icons/matefaenza/apps/16/soundconverter.png
share/icons/matefaenza/apps/16/speedcrunch.png
+share/icons/matefaenza/apps/16/spotify-client.png
share/icons/matefaenza/apps/16/spotify-linux-48x48.png
share/icons/matefaenza/apps/16/spotify-linux-512x512.png
share/icons/matefaenza/apps/16/spotify.png
@@ -4839,6 +4840,7 @@ share/icons/matefaenza/apps/22/softwarecenter.png
share/icons/matefaenza/apps/22/sound-juicer.png
share/icons/matefaenza/apps/22/soundconverter.png
share/icons/matefaenza/apps/22/speedcrunch.png
+share/icons/matefaenza/apps/22/spotify-client.png
share/icons/matefaenza/apps/22/spotify-linux-48x48.png
share/icons/matefaenza/apps/22/spotify-linux-512x512.png
share/icons/matefaenza/apps/22/spotify.png
@@ -5707,6 +5709,7 @@ share/icons/matefaenza/apps/24/softwarecenter.png
share/icons/matefaenza/apps/24/sound-juicer.png
share/icons/matefaenza/apps/24/soundconverter.png
share/icons/matefaenza/apps/24/speedcrunch.png
+share/icons/matefaenza/apps/24/spotify-client.png
share/icons/matefaenza/apps/24/spotify-linux-48x48.png
share/icons/matefaenza/apps/24/spotify-linux-512x512.png
share/icons/matefaenza/apps/24/spotify.png
@@ -6574,6 +6577,7 @@ share/icons/matefaenza/apps/32/softwarecenter.png
share/icons/matefaenza/apps/32/sound-juicer.png
share/icons/matefaenza/apps/32/soundconverter.png
share/icons/matefaenza/apps/32/speedcrunch.png
+share/icons/matefaenza/apps/32/spotify-client.png
share/icons/matefaenza/apps/32/spotify-linux-48x48.png
share/icons/matefaenza/apps/32/spotify-linux-512x512.png
share/icons/matefaenza/apps/32/spotify.png
@@ -7447,6 +7451,7 @@ share/icons/matefaenza/apps/48/softwarecenter.png
share/icons/matefaenza/apps/48/sound-juicer.png
share/icons/matefaenza/apps/48/soundconverter.png
share/icons/matefaenza/apps/48/speedcrunch.png
+share/icons/matefaenza/apps/48/spotify-client.png
share/icons/matefaenza/apps/48/spotify-linux-48x48.png
share/icons/matefaenza/apps/48/spotify-linux-512x512.png
share/icons/matefaenza/apps/48/spotify.png
@@ -8256,6 +8261,7 @@ share/icons/matefaenza/apps/64/softwarecenter.png
share/icons/matefaenza/apps/64/sound-juicer.png
share/icons/matefaenza/apps/64/soundconverter.png
share/icons/matefaenza/apps/64/speedcrunch.png
+share/icons/matefaenza/apps/64/spotify-client.png
share/icons/matefaenza/apps/64/spotify-linux-48x48.png
share/icons/matefaenza/apps/64/spotify-linux-512x512.png
share/icons/matefaenza/apps/64/spotify.png
@@ -9006,6 +9012,7 @@ share/icons/matefaenza/apps/96/softwarecenter.png
share/icons/matefaenza/apps/96/sound-juicer.png
share/icons/matefaenza/apps/96/soundconverter.png
share/icons/matefaenza/apps/96/speedcrunch.png
+share/icons/matefaenza/apps/96/spotify-client.png
share/icons/matefaenza/apps/96/spotify-linux-48x48.png
share/icons/matefaenza/apps/96/spotify-linux-512x512.png
share/icons/matefaenza/apps/96/spotify.png
@@ -9833,6 +9840,7 @@ share/icons/matefaenza/apps/scalable/softwarecenter.svg
share/icons/matefaenza/apps/scalable/sound-juicer.svg
share/icons/matefaenza/apps/scalable/soundconverter.svg
share/icons/matefaenza/apps/scalable/speedcrunch.svg
+share/icons/matefaenza/apps/scalable/spotify-client.svg
share/icons/matefaenza/apps/scalable/spotify-linux-48x48.svg
share/icons/matefaenza/apps/scalable/spotify-linux-512x512.svg
share/icons/matefaenza/apps/scalable/spotify.svg
diff --git a/x11-themes/mate-icon-theme/Makefile b/x11-themes/mate-icon-theme/Makefile
index 7d06059a3f4f..329e3dffab8e 100644
--- a/x11-themes/mate-icon-theme/Makefile
+++ b/x11-themes/mate-icon-theme/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-icon-theme
-PORTVERSION= 1.12.0
+PORTVERSION= 1.18.2
CATEGORIES= x11-themes mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,18 +10,20 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= Collection of icons for the MATE desktop
+LICENSE= LGPL3 CC-BY-SA-3.0
+LICENSE_COMB= dual
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
icon-naming-utils>=0.8.7:x11-themes/icon-naming-utils
RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
PORTSCOUT= limitw:1,even
-USES= gettext gmake pathfix pkgconfig tar:xz
-USE_GNOME= intlhack
+USES= gettext-tools gmake pkgconfig tar:xz
+USE_GNOME= intltool
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
pre-install:
@${REINPLACE_CMD} -e 's|install: install-data|install:|g' \
diff --git a/x11-themes/mate-icon-theme/distinfo b/x11-themes/mate-icon-theme/distinfo
index 9ff43d43d714..8d08d69b1bd9 100644
--- a/x11-themes/mate-icon-theme/distinfo
+++ b/x11-themes/mate-icon-theme/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-icon-theme-1.12.0.tar.xz) = 77e253e8c332d7283384aca82c607513201477376bb15621a27df09ce8ce2135
-SIZE (mate/mate-icon-theme-1.12.0.tar.xz) = 19330108
+TIMESTAMP = 1497527567
+SHA256 (mate/mate-icon-theme-1.18.2.tar.xz) = 9091373f9672634b5bc09344d4819df717e48ac55b6a057f21faa83f47a4236a
+SIZE (mate/mate-icon-theme-1.18.2.tar.xz) = 20071792
diff --git a/x11-themes/mate-icon-theme/pkg-plist b/x11-themes/mate-icon-theme/pkg-plist
index ae38632b0d62..61292a8384c0 100644
--- a/x11-themes/mate-icon-theme/pkg-plist
+++ b/x11-themes/mate-icon-theme/pkg-plist
@@ -435,6 +435,7 @@ share/icons/mate/16x16/apps/redhat-filemanager.png
share/icons/mate/16x16/apps/screensaver.png
share/icons/mate/16x16/apps/style.png
share/icons/mate/16x16/apps/susehelpcenter.png
+share/icons/mate/16x16/apps/system-config-keyboard.png
share/icons/mate/16x16/apps/system-config-users.png
share/icons/mate/16x16/apps/system-file-manager.png
share/icons/mate/16x16/apps/system-software-install.png
@@ -1581,6 +1582,7 @@ share/icons/mate/22x22/apps/redhat-filemanager.png
share/icons/mate/22x22/apps/screensaver.png
share/icons/mate/22x22/apps/style.png
share/icons/mate/22x22/apps/susehelpcenter.png
+share/icons/mate/22x22/apps/system-config-keyboard.png
share/icons/mate/22x22/apps/system-config-users.png
share/icons/mate/22x22/apps/system-file-manager.png
share/icons/mate/22x22/apps/system-software-install.png
@@ -2721,6 +2723,7 @@ share/icons/mate/24x24/apps/redhat-filemanager.png
share/icons/mate/24x24/apps/screensaver.png
share/icons/mate/24x24/apps/style.png
share/icons/mate/24x24/apps/susehelpcenter.png
+share/icons/mate/24x24/apps/system-config-keyboard.png
share/icons/mate/24x24/apps/system-config-users.png
share/icons/mate/24x24/apps/system-file-manager.png
share/icons/mate/24x24/apps/system-software-install.png
@@ -4558,6 +4561,7 @@ share/icons/mate/32x32/apps/redhat-filemanager.png
share/icons/mate/32x32/apps/screensaver.png
share/icons/mate/32x32/apps/style.png
share/icons/mate/32x32/apps/susehelpcenter.png
+share/icons/mate/32x32/apps/system-config-keyboard.png
share/icons/mate/32x32/apps/system-config-users.png
share/icons/mate/32x32/apps/system-file-manager.png
share/icons/mate/32x32/apps/system-software-install.png
@@ -5695,6 +5699,7 @@ share/icons/mate/48x48/apps/redhat-filemanager.png
share/icons/mate/48x48/apps/screensaver.png
share/icons/mate/48x48/apps/style.png
share/icons/mate/48x48/apps/susehelpcenter.png
+share/icons/mate/48x48/apps/system-config-keyboard.png
share/icons/mate/48x48/apps/system-config-users.png
share/icons/mate/48x48/apps/system-file-manager.png
share/icons/mate/48x48/apps/system-software-install.png
@@ -6573,6 +6578,266 @@ share/icons/mate/scalable/actions/zoom-fit-best-symbolic.svg
share/icons/mate/scalable/actions/zoom-in-symbolic.svg
share/icons/mate/scalable/actions/zoom-original-symbolic.svg
share/icons/mate/scalable/actions/zoom-out-symbolic.svg
+share/icons/mate/scalable/animations/_basque.svg
+share/icons/mate/scalable/animations/_catalonia.svg
+share/icons/mate/scalable/animations/_earth_pernefeldt.svg
+share/icons/mate/scalable/animations/_galicia.svg
+share/icons/mate/scalable/animations/_generic.svg
+share/icons/mate/scalable/animations/_olympic.svg
+share/icons/mate/scalable/animations/_scotland.svg
+share/icons/mate/scalable/animations/_united_nations.svg
+share/icons/mate/scalable/animations/_wales.svg
+share/icons/mate/scalable/animations/ad.svg
+share/icons/mate/scalable/animations/ae.svg
+share/icons/mate/scalable/animations/af.svg
+share/icons/mate/scalable/animations/ag.svg
+share/icons/mate/scalable/animations/ai.svg
+share/icons/mate/scalable/animations/al.svg
+share/icons/mate/scalable/animations/am.svg
+share/icons/mate/scalable/animations/ao.svg
+share/icons/mate/scalable/animations/aq.svg
+share/icons/mate/scalable/animations/ar.svg
+share/icons/mate/scalable/animations/as.svg
+share/icons/mate/scalable/animations/at.svg
+share/icons/mate/scalable/animations/au.svg
+share/icons/mate/scalable/animations/aw.svg
+share/icons/mate/scalable/animations/ax.svg
+share/icons/mate/scalable/animations/az.svg
+share/icons/mate/scalable/animations/ba.svg
+share/icons/mate/scalable/animations/bb.svg
+share/icons/mate/scalable/animations/bd.svg
+share/icons/mate/scalable/animations/be.svg
+share/icons/mate/scalable/animations/bf.svg
+share/icons/mate/scalable/animations/bg.svg
+share/icons/mate/scalable/animations/bh.svg
+share/icons/mate/scalable/animations/bi.svg
+share/icons/mate/scalable/animations/bj.svg
+share/icons/mate/scalable/animations/bl.svg
+share/icons/mate/scalable/animations/bm.svg
+share/icons/mate/scalable/animations/bn.svg
+share/icons/mate/scalable/animations/bo.svg
+share/icons/mate/scalable/animations/bq.svg
+share/icons/mate/scalable/animations/br.svg
+share/icons/mate/scalable/animations/brl.svg
+share/icons/mate/scalable/animations/bs.svg
+share/icons/mate/scalable/animations/bt.svg
+share/icons/mate/scalable/animations/bv.svg
+share/icons/mate/scalable/animations/bw.svg
+share/icons/mate/scalable/animations/by.svg
+share/icons/mate/scalable/animations/bz.svg
+share/icons/mate/scalable/animations/ca.svg
+share/icons/mate/scalable/animations/cc.svg
+share/icons/mate/scalable/animations/cd.svg
+share/icons/mate/scalable/animations/cf.svg
+share/icons/mate/scalable/animations/cg.svg
+share/icons/mate/scalable/animations/ch.svg
+share/icons/mate/scalable/animations/ci.svg
+share/icons/mate/scalable/animations/ck.svg
+share/icons/mate/scalable/animations/cl.svg
+share/icons/mate/scalable/animations/cm.svg
+share/icons/mate/scalable/animations/cn.svg
+share/icons/mate/scalable/animations/co.svg
+share/icons/mate/scalable/animations/cr.svg
+share/icons/mate/scalable/animations/cu.svg
+share/icons/mate/scalable/animations/cv.svg
+share/icons/mate/scalable/animations/cw.svg
+share/icons/mate/scalable/animations/cx.svg
+share/icons/mate/scalable/animations/cy.svg
+share/icons/mate/scalable/animations/cz.svg
+share/icons/mate/scalable/animations/de.svg
+share/icons/mate/scalable/animations/dj.svg
+share/icons/mate/scalable/animations/dk.svg
+share/icons/mate/scalable/animations/dm.svg
+share/icons/mate/scalable/animations/do.svg
+share/icons/mate/scalable/animations/dz.svg
+share/icons/mate/scalable/animations/ec.svg
+share/icons/mate/scalable/animations/ee.svg
+share/icons/mate/scalable/animations/eg.svg
+share/icons/mate/scalable/animations/eh.svg
+share/icons/mate/scalable/animations/eo.svg
+share/icons/mate/scalable/animations/er.svg
+share/icons/mate/scalable/animations/es.svg
+share/icons/mate/scalable/animations/et.svg
+share/icons/mate/scalable/animations/fi.svg
+share/icons/mate/scalable/animations/fj.svg
+share/icons/mate/scalable/animations/fk.svg
+share/icons/mate/scalable/animations/fm.svg
+share/icons/mate/scalable/animations/fo.svg
+share/icons/mate/scalable/animations/fr.svg
+share/icons/mate/scalable/animations/ga.svg
+share/icons/mate/scalable/animations/gb.svg
+share/icons/mate/scalable/animations/gd.svg
+share/icons/mate/scalable/animations/ge.svg
+share/icons/mate/scalable/animations/gf.svg
+share/icons/mate/scalable/animations/gg.svg
+share/icons/mate/scalable/animations/gh.svg
+share/icons/mate/scalable/animations/gi.svg
+share/icons/mate/scalable/animations/gl.svg
+share/icons/mate/scalable/animations/gm.svg
+share/icons/mate/scalable/animations/gn.svg
+share/icons/mate/scalable/animations/gp.svg
+share/icons/mate/scalable/animations/gq.svg
+share/icons/mate/scalable/animations/gr.svg
+share/icons/mate/scalable/animations/gs.svg
+share/icons/mate/scalable/animations/gt.svg
+share/icons/mate/scalable/animations/gu.svg
+share/icons/mate/scalable/animations/gw.svg
+share/icons/mate/scalable/animations/gy.svg
+share/icons/mate/scalable/animations/hk.svg
+share/icons/mate/scalable/animations/hm.svg
+share/icons/mate/scalable/animations/hn.svg
+share/icons/mate/scalable/animations/hr.svg
+share/icons/mate/scalable/animations/ht.svg
+share/icons/mate/scalable/animations/hu.svg
+share/icons/mate/scalable/animations/id.svg
+share/icons/mate/scalable/animations/ie.svg
+share/icons/mate/scalable/animations/il.svg
+share/icons/mate/scalable/animations/im.svg
+share/icons/mate/scalable/animations/in.svg
+share/icons/mate/scalable/animations/io.svg
+share/icons/mate/scalable/animations/iq.svg
+share/icons/mate/scalable/animations/ir.svg
+share/icons/mate/scalable/animations/is.svg
+share/icons/mate/scalable/animations/it.svg
+share/icons/mate/scalable/animations/je.svg
+share/icons/mate/scalable/animations/jm.svg
+share/icons/mate/scalable/animations/jo.svg
+share/icons/mate/scalable/animations/jp.svg
+share/icons/mate/scalable/animations/ke.svg
+share/icons/mate/scalable/animations/kg.svg
+share/icons/mate/scalable/animations/kh.svg
+share/icons/mate/scalable/animations/ki.svg
+share/icons/mate/scalable/animations/km.svg
+share/icons/mate/scalable/animations/kn.svg
+share/icons/mate/scalable/animations/kp.svg
+share/icons/mate/scalable/animations/kr.svg
+share/icons/mate/scalable/animations/kw.svg
+share/icons/mate/scalable/animations/ky.svg
+share/icons/mate/scalable/animations/kz.svg
+share/icons/mate/scalable/animations/la.svg
+share/icons/mate/scalable/animations/lb.svg
+share/icons/mate/scalable/animations/lc.svg
+share/icons/mate/scalable/animations/li.svg
+share/icons/mate/scalable/animations/lk.svg
+share/icons/mate/scalable/animations/lr.svg
+share/icons/mate/scalable/animations/ls.svg
+share/icons/mate/scalable/animations/lt.svg
+share/icons/mate/scalable/animations/lu.svg
+share/icons/mate/scalable/animations/lv.svg
+share/icons/mate/scalable/animations/ly.svg
+share/icons/mate/scalable/animations/ma.svg
+share/icons/mate/scalable/animations/mc.svg
+share/icons/mate/scalable/animations/md.svg
+share/icons/mate/scalable/animations/me.svg
+share/icons/mate/scalable/animations/mf.svg
+share/icons/mate/scalable/animations/mg.svg
+share/icons/mate/scalable/animations/mh.svg
+share/icons/mate/scalable/animations/mk.svg
+share/icons/mate/scalable/animations/ml.svg
+share/icons/mate/scalable/animations/mm.svg
+share/icons/mate/scalable/animations/mn.svg
+share/icons/mate/scalable/animations/mo.svg
+share/icons/mate/scalable/animations/mp.svg
+share/icons/mate/scalable/animations/mq.svg
+share/icons/mate/scalable/animations/mr.svg
+share/icons/mate/scalable/animations/ms.svg
+share/icons/mate/scalable/animations/mt.svg
+share/icons/mate/scalable/animations/mu.svg
+share/icons/mate/scalable/animations/mv.svg
+share/icons/mate/scalable/animations/mw.svg
+share/icons/mate/scalable/animations/mx.svg
+share/icons/mate/scalable/animations/my.svg
+share/icons/mate/scalable/animations/mz.svg
+share/icons/mate/scalable/animations/na.svg
+share/icons/mate/scalable/animations/nc.svg
+share/icons/mate/scalable/animations/ne.svg
+share/icons/mate/scalable/animations/nf.svg
+share/icons/mate/scalable/animations/ng.svg
+share/icons/mate/scalable/animations/ni.svg
+share/icons/mate/scalable/animations/nl.svg
+share/icons/mate/scalable/animations/no.svg
+share/icons/mate/scalable/animations/np.svg
+share/icons/mate/scalable/animations/nr.svg
+share/icons/mate/scalable/animations/nu.svg
+share/icons/mate/scalable/animations/nz.svg
+share/icons/mate/scalable/animations/om.svg
+share/icons/mate/scalable/animations/pa.svg
+share/icons/mate/scalable/animations/pe.svg
+share/icons/mate/scalable/animations/pf.svg
+share/icons/mate/scalable/animations/pg.svg
+share/icons/mate/scalable/animations/ph.svg
+share/icons/mate/scalable/animations/pk.svg
+share/icons/mate/scalable/animations/pl.svg
+share/icons/mate/scalable/animations/pm.svg
+share/icons/mate/scalable/animations/pn.svg
+share/icons/mate/scalable/animations/pr.svg
+share/icons/mate/scalable/animations/ps.svg
+share/icons/mate/scalable/animations/pt.svg
+share/icons/mate/scalable/animations/pw.svg
+share/icons/mate/scalable/animations/py.svg
+share/icons/mate/scalable/animations/qa.svg
+share/icons/mate/scalable/animations/re.svg
+share/icons/mate/scalable/animations/ro.svg
+share/icons/mate/scalable/animations/rs.svg
+share/icons/mate/scalable/animations/ru.svg
+share/icons/mate/scalable/animations/rw.svg
+share/icons/mate/scalable/animations/sa.svg
+share/icons/mate/scalable/animations/sb.svg
+share/icons/mate/scalable/animations/sc.svg
+share/icons/mate/scalable/animations/sd.svg
+share/icons/mate/scalable/animations/se.svg
+share/icons/mate/scalable/animations/sg.svg
+share/icons/mate/scalable/animations/sh.svg
+share/icons/mate/scalable/animations/si.svg
+share/icons/mate/scalable/animations/sj.svg
+share/icons/mate/scalable/animations/sk.svg
+share/icons/mate/scalable/animations/sl.svg
+share/icons/mate/scalable/animations/sm.svg
+share/icons/mate/scalable/animations/sn.svg
+share/icons/mate/scalable/animations/so.svg
+share/icons/mate/scalable/animations/sr.svg
+share/icons/mate/scalable/animations/ss.svg
+share/icons/mate/scalable/animations/st.svg
+share/icons/mate/scalable/animations/sv.svg
+share/icons/mate/scalable/animations/sx.svg
+share/icons/mate/scalable/animations/sy.svg
+share/icons/mate/scalable/animations/sz.svg
+share/icons/mate/scalable/animations/tc.svg
+share/icons/mate/scalable/animations/td.svg
+share/icons/mate/scalable/animations/tf.svg
+share/icons/mate/scalable/animations/tg.svg
+share/icons/mate/scalable/animations/th.svg
+share/icons/mate/scalable/animations/tj.svg
+share/icons/mate/scalable/animations/tk.svg
+share/icons/mate/scalable/animations/tl.svg
+share/icons/mate/scalable/animations/tm.svg
+share/icons/mate/scalable/animations/tn.svg
+share/icons/mate/scalable/animations/to.svg
+share/icons/mate/scalable/animations/tr.svg
+share/icons/mate/scalable/animations/tt.svg
+share/icons/mate/scalable/animations/tv.svg
+share/icons/mate/scalable/animations/tw.svg
+share/icons/mate/scalable/animations/tz.svg
+share/icons/mate/scalable/animations/ua.svg
+share/icons/mate/scalable/animations/ug.svg
+share/icons/mate/scalable/animations/um.svg
+share/icons/mate/scalable/animations/us.svg
+share/icons/mate/scalable/animations/uy.svg
+share/icons/mate/scalable/animations/uz.svg
+share/icons/mate/scalable/animations/va.svg
+share/icons/mate/scalable/animations/vc.svg
+share/icons/mate/scalable/animations/ve.svg
+share/icons/mate/scalable/animations/vg.svg
+share/icons/mate/scalable/animations/vi.svg
+share/icons/mate/scalable/animations/vn.svg
+share/icons/mate/scalable/animations/vu.svg
+share/icons/mate/scalable/animations/wf.svg
+share/icons/mate/scalable/animations/ws.svg
+share/icons/mate/scalable/animations/ye.svg
+share/icons/mate/scalable/animations/yt.svg
+share/icons/mate/scalable/animations/za.svg
+share/icons/mate/scalable/animations/zm.svg
+share/icons/mate/scalable/animations/zw.svg
share/icons/mate/scalable/apps/accessories-calculator-symbolic.svg
share/icons/mate/scalable/apps/accessories-character-map-symbolic.svg
share/icons/mate/scalable/apps/accessories-dictionary-symbolic.svg
@@ -6584,6 +6849,7 @@ share/icons/mate/scalable/apps/goa-panel-symbolic.svg
share/icons/mate/scalable/apps/help-browser-symbolic.svg
share/icons/mate/scalable/apps/help-contents-symbolic.svg
share/icons/mate/scalable/apps/help-faq-symbolic.svg
+share/icons/mate/scalable/apps/mate.svg
share/icons/mate/scalable/apps/multimedia-volume-control-symbolic.svg
share/icons/mate/scalable/apps/preferences-color-symbolic.svg
share/icons/mate/scalable/apps/preferences-desktop-accessibility-symbolic.svg
diff --git a/x11-themes/mate-themes/Makefile b/x11-themes/mate-themes/Makefile
index dedd9586c44e..4fb8d959932d 100644
--- a/x11-themes/mate-themes/Makefile
+++ b/x11-themes/mate-themes/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-themes
-PORTVERSION= 3.22.10
+PORTVERSION= 3.22.12
CATEGORIES= x11-themes mate
MASTER_SITES= MATE/themes/${PORTVERSION:R}/
DIST_SUBDIR= mate
@@ -11,21 +11,17 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Collection of themes and icons for MATE
LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= gtk-engines2>=2.15.0:x11-themes/gtk-engines2 \
- icon-naming-utils>=0.8.7:x11-themes/icon-naming-utils
RUN_DEPENDS= gtk-engines2>=2.15.0:x11-themes/gtk-engines2 \
gtk-murrine-engine>=0.98:x11-themes/gtk-murrine-engine
PORTSCOUT= limit:^${PORTVERSION:R:S|.|\.|}\.*$$
-USES= gettext gmake pathfix pkgconfig tar:xz
-USE_MATE= marco
-USE_GNOME= gdkpixbuf2 gtk20 intlhack
+USES= gettext gmake localbase pathfix pkgconfig tar:xz
+USE_GNOME= gtk20 intltool
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
LOCALES= as ast bn_IN ca@valencia cmn crh dz es_CO fur \
hy kk ky mai mg mr nds oc si sr@latin te ug xh zh_HK
diff --git a/x11-themes/mate-themes/distinfo b/x11-themes/mate-themes/distinfo
index a1794ae55a2f..afe57a4d51d8 100644
--- a/x11-themes/mate-themes/distinfo
+++ b/x11-themes/mate-themes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491986138
-SHA256 (mate/mate-themes-3.22.10.tar.xz) = 8bc9ffe898d2e28eec7a92f1c36f9f6c479ffb171342cd36e91713d59d64d10d
-SIZE (mate/mate-themes-3.22.10.tar.xz) = 4265684
+TIMESTAMP = 1497516893
+SHA256 (mate/mate-themes-3.22.12.tar.xz) = 04603907c8481bffe438a5f15a1cec93ee50c83d10ef9acd97368e607fd4f15a
+SIZE (mate/mate-themes-3.22.12.tar.xz) = 4268168
diff --git a/x11-themes/mate-themes/pkg-plist b/x11-themes/mate-themes/pkg-plist
index eaaa3508bc12..65ec455d6cca 100644
--- a/x11-themes/mate-themes/pkg-plist
+++ b/x11-themes/mate-themes/pkg-plist
@@ -3301,6 +3301,7 @@ share/icons/mate/cursors/bottom_side
share/icons/mate/cursors/bottom_tee
share/icons/mate/cursors/c7088f0f3e6c8088236ef8e1e3e70000
share/icons/mate/cursors/circle
+share/icons/mate/cursors/color-picker
share/icons/mate/cursors/copy
share/icons/mate/cursors/cross
share/icons/mate/cursors/cross_reverse
diff --git a/x11-wm/marco/Makefile b/x11-wm/marco/Makefile
index 6ab8987fe231..bd9a7fdf8963 100644
--- a/x11-wm/marco/Makefile
+++ b/x11-wm/marco/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= marco
-PORTVERSION= 1.12.1
+PORTVERSION= 1.18.1
CATEGORIES= x11-wm mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,23 +10,25 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= Window manager for the adult in you
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= itstool:textproc/itstool \
zenity>=3.0.0:x11/zenity
LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
- libcanberra-gtk.so:audio/libcanberra \
+ libcanberra.so:audio/libcanberra \
+ libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libgtop-2.0.so:devel/libgtop
RUN_DEPENDS= zenity>=3.0.0:x11/zenity
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
-USE_XORG= x11 xcomposite xcursor xdamage xrandr
-USE_GNOME= gdkpixbuf2 glib20 gtk20 intlhack pango
+USES= gettext gmake libtool localbase pathfix pkgconfig tar:xz
+USE_XORG= ice sm x11 xcomposite xcursor xdamage xext xfixes \
+ xinerama xrandr xrender
+USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gtk=2.0
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.marco.gschema.xml
diff --git a/x11-wm/marco/distinfo b/x11-wm/marco/distinfo
index f342235cd798..9029b6391484 100644
--- a/x11-wm/marco/distinfo
+++ b/x11-wm/marco/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/marco-1.12.1.tar.xz) = 7f799115952a209e5063e5bd88d61d0baf430e630ca7783626af4dce46add084
-SIZE (mate/marco-1.12.1.tar.xz) = 1163996
+TIMESTAMP = 1497520209
+SHA256 (mate/marco-1.18.1.tar.xz) = 65a276104745817208582e5da1894eeb86391ea2e288775aa1d098e679ba8b53
+SIZE (mate/marco-1.18.1.tar.xz) = 1251108
diff --git a/x11-wm/marco/pkg-plist b/x11-wm/marco/pkg-plist
index 9c7d42100b30..cc273f6e5539 100644
--- a/x11-wm/marco/pkg-plist
+++ b/x11-wm/marco/pkg-plist
@@ -11,14 +11,13 @@ include/marco-1/marco-private/theme.h
include/marco-1/marco-private/util.h
lib/libmarco-private.a
lib/libmarco-private.so
-lib/libmarco-private.so.0
-lib/libmarco-private.so.0.0.0
+lib/libmarco-private.so.1
+lib/libmarco-private.so.1.0.0
libdata/pkgconfig/libmarco-private.pc
man/man1/marco-message.1.gz
man/man1/marco-theme-viewer.1.gz
man/man1/marco-window-demo.1.gz
man/man1/marco.1.gz
-share/MateConf/gsettings/marco.convert
share/applications/marco.desktop
share/help/C/creating-marco-themes/index.docbook
share/locale/am/LC_MESSAGES/marco.mo
@@ -27,7 +26,6 @@ share/locale/as/LC_MESSAGES/marco.mo
share/locale/ast/LC_MESSAGES/marco.mo
share/locale/az/LC_MESSAGES/marco.mo
share/locale/be/LC_MESSAGES/marco.mo
-share/locale/be@latin/LC_MESSAGES/marco.mo
share/locale/bg/LC_MESSAGES/marco.mo
share/locale/bn/LC_MESSAGES/marco.mo
share/locale/bn_IN/LC_MESSAGES/marco.mo
@@ -43,12 +41,13 @@ share/locale/da/LC_MESSAGES/marco.mo
share/locale/de/LC_MESSAGES/marco.mo
share/locale/dz/LC_MESSAGES/marco.mo
share/locale/el/LC_MESSAGES/marco.mo
-share/locale/en@shaw/LC_MESSAGES/marco.mo
share/locale/en_AU/LC_MESSAGES/marco.mo
share/locale/en_CA/LC_MESSAGES/marco.mo
share/locale/en_GB/LC_MESSAGES/marco.mo
share/locale/eo/LC_MESSAGES/marco.mo
share/locale/es/LC_MESSAGES/marco.mo
+share/locale/es_CO/LC_MESSAGES/marco.mo
+share/locale/es_MX/LC_MESSAGES/marco.mo
share/locale/et/LC_MESSAGES/marco.mo
share/locale/eu/LC_MESSAGES/marco.mo
share/locale/fa/LC_MESSAGES/marco.mo
@@ -68,11 +67,13 @@ share/locale/ig/LC_MESSAGES/marco.mo
share/locale/is/LC_MESSAGES/marco.mo
share/locale/it/LC_MESSAGES/marco.mo
share/locale/ja/LC_MESSAGES/marco.mo
+share/locale/jv/LC_MESSAGES/marco.mo
share/locale/ka/LC_MESSAGES/marco.mo
share/locale/kk/LC_MESSAGES/marco.mo
share/locale/kn/LC_MESSAGES/marco.mo
share/locale/ko/LC_MESSAGES/marco.mo
share/locale/ku/LC_MESSAGES/marco.mo
+share/locale/ku_IQ/LC_MESSAGES/marco.mo
share/locale/ky/LC_MESSAGES/marco.mo
share/locale/la/LC_MESSAGES/marco.mo
share/locale/lt/LC_MESSAGES/marco.mo
@@ -111,6 +112,7 @@ share/locale/th/LC_MESSAGES/marco.mo
share/locale/tk/LC_MESSAGES/marco.mo
share/locale/tr/LC_MESSAGES/marco.mo
share/locale/uk/LC_MESSAGES/marco.mo
+share/locale/uz/LC_MESSAGES/marco.mo
share/locale/vi/LC_MESSAGES/marco.mo
share/locale/wa/LC_MESSAGES/marco.mo
share/locale/xh/LC_MESSAGES/marco.mo
diff --git a/x11/libmatekbd/Makefile b/x11/libmatekbd/Makefile
index 1c06944f01d8..22f33c7b4e9d 100644
--- a/x11/libmatekbd/Makefile
+++ b/x11/libmatekbd/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libmatekbd
-PORTVERSION= 1.12.1
+PORTVERSION= 1.18.2
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,23 +10,22 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= MATE keyboard shared library
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
+
LIB_DEPENDS= libxklavier.so:x11/libxklavier
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME= gtk20 intlhack introspection:build
+USES= gettext gmake libtool localbase pathfix \
+ pkgconfig tar:xz
+USE_GNOME= cairo gtk30 intltool introspection:build
+USE_XORG= x11
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gtk=2.0
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.peripherals-keyboard-xkb.gschema.xml
-post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmatekbd*so*
-
.include <bsd.port.mk>
diff --git a/x11/libmatekbd/distinfo b/x11/libmatekbd/distinfo
index 83eb561d2317..1209793e50ae 100644
--- a/x11/libmatekbd/distinfo
+++ b/x11/libmatekbd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/libmatekbd-1.12.1.tar.xz) = 58a0494fb23fd0ab47836aa35b3e5068e1d5ec63df0185a08ef8c2767bb64ea2
-SIZE (mate/libmatekbd-1.12.1.tar.xz) = 349492
+TIMESTAMP = 1497538064
+SHA256 (mate/libmatekbd-1.18.2.tar.xz) = 03df100cf931a1f6880a32b0b3eb90e82e81f6d17085bb44a2a7ca8551a00b0c
+SIZE (mate/libmatekbd-1.18.2.tar.xz) = 369448
diff --git a/x11/libmatekbd/pkg-plist b/x11/libmatekbd/pkg-plist
index fbbaaa126892..bd8c0c91ea89 100644
--- a/x11/libmatekbd/pkg-plist
+++ b/x11/libmatekbd/pkg-plist
@@ -16,82 +16,158 @@ lib/libmatekbdui.so.4
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/af/LC_MESSAGES/libmatekbd.mo
share/locale/am/LC_MESSAGES/libmatekbd.mo
+share/locale/an/LC_MESSAGES/libmatekbd.mo
share/locale/ar/LC_MESSAGES/libmatekbd.mo
share/locale/as/LC_MESSAGES/libmatekbd.mo
share/locale/ast/LC_MESSAGES/libmatekbd.mo
+share/locale/az/LC_MESSAGES/libmatekbd.mo
share/locale/be/LC_MESSAGES/libmatekbd.mo
-share/locale/be@latin/LC_MESSAGES/libmatekbd.mo
share/locale/bg/LC_MESSAGES/libmatekbd.mo
share/locale/bn/LC_MESSAGES/libmatekbd.mo
share/locale/bn_IN/LC_MESSAGES/libmatekbd.mo
+share/locale/br/LC_MESSAGES/libmatekbd.mo
+share/locale/bs/LC_MESSAGES/libmatekbd.mo
share/locale/ca/LC_MESSAGES/libmatekbd.mo
share/locale/ca@valencia/LC_MESSAGES/libmatekbd.mo
share/locale/cmn/LC_MESSAGES/libmatekbd.mo
+share/locale/crh/LC_MESSAGES/libmatekbd.mo
share/locale/cs/LC_MESSAGES/libmatekbd.mo
+share/locale/csb/LC_MESSAGES/libmatekbd.mo
+share/locale/cv/LC_MESSAGES/libmatekbd.mo
+share/locale/cy/LC_MESSAGES/libmatekbd.mo
share/locale/da/LC_MESSAGES/libmatekbd.mo
share/locale/de/LC_MESSAGES/libmatekbd.mo
+share/locale/de_CH/LC_MESSAGES/libmatekbd.mo
share/locale/dz/LC_MESSAGES/libmatekbd.mo
share/locale/el/LC_MESSAGES/libmatekbd.mo
-share/locale/en@shaw/LC_MESSAGES/libmatekbd.mo
share/locale/en_AU/LC_MESSAGES/libmatekbd.mo
+share/locale/en_CA/LC_MESSAGES/libmatekbd.mo
share/locale/en_GB/LC_MESSAGES/libmatekbd.mo
-share/locale/en_US/LC_MESSAGES/libmatekbd.mo
share/locale/eo/LC_MESSAGES/libmatekbd.mo
share/locale/es/LC_MESSAGES/libmatekbd.mo
+share/locale/es_419/LC_MESSAGES/libmatekbd.mo
+share/locale/es_AR/LC_MESSAGES/libmatekbd.mo
+share/locale/es_CL/LC_MESSAGES/libmatekbd.mo
+share/locale/es_CO/LC_MESSAGES/libmatekbd.mo
+share/locale/es_CR/LC_MESSAGES/libmatekbd.mo
+share/locale/es_DO/LC_MESSAGES/libmatekbd.mo
+share/locale/es_EC/LC_MESSAGES/libmatekbd.mo
+share/locale/es_ES/LC_MESSAGES/libmatekbd.mo
+share/locale/es_MX/LC_MESSAGES/libmatekbd.mo
+share/locale/es_NI/LC_MESSAGES/libmatekbd.mo
+share/locale/es_PA/LC_MESSAGES/libmatekbd.mo
+share/locale/es_PE/LC_MESSAGES/libmatekbd.mo
+share/locale/es_PR/LC_MESSAGES/libmatekbd.mo
+share/locale/es_SV/LC_MESSAGES/libmatekbd.mo
+share/locale/es_US/LC_MESSAGES/libmatekbd.mo
+share/locale/es_UY/LC_MESSAGES/libmatekbd.mo
+share/locale/es_VE/LC_MESSAGES/libmatekbd.mo
share/locale/et/LC_MESSAGES/libmatekbd.mo
share/locale/eu/LC_MESSAGES/libmatekbd.mo
+share/locale/fa/LC_MESSAGES/libmatekbd.mo
share/locale/fi/LC_MESSAGES/libmatekbd.mo
+share/locale/fil/LC_MESSAGES/libmatekbd.mo
+share/locale/fo/LC_MESSAGES/libmatekbd.mo
share/locale/fr/LC_MESSAGES/libmatekbd.mo
+share/locale/fr_CA/LC_MESSAGES/libmatekbd.mo
+share/locale/frp/LC_MESSAGES/libmatekbd.mo
+share/locale/fur/LC_MESSAGES/libmatekbd.mo
+share/locale/fy/LC_MESSAGES/libmatekbd.mo
share/locale/ga/LC_MESSAGES/libmatekbd.mo
+share/locale/gd/LC_MESSAGES/libmatekbd.mo
share/locale/gl/LC_MESSAGES/libmatekbd.mo
share/locale/gu/LC_MESSAGES/libmatekbd.mo
+share/locale/ha/LC_MESSAGES/libmatekbd.mo
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/ia/LC_MESSAGES/libmatekbd.mo
share/locale/id/LC_MESSAGES/libmatekbd.mo
+share/locale/ig/LC_MESSAGES/libmatekbd.mo
+share/locale/is/LC_MESSAGES/libmatekbd.mo
share/locale/it/LC_MESSAGES/libmatekbd.mo
share/locale/ja/LC_MESSAGES/libmatekbd.mo
+share/locale/jv/LC_MESSAGES/libmatekbd.mo
share/locale/ka/LC_MESSAGES/libmatekbd.mo
+share/locale/kk/LC_MESSAGES/libmatekbd.mo
+share/locale/km/LC_MESSAGES/libmatekbd.mo
share/locale/kn/LC_MESSAGES/libmatekbd.mo
share/locale/ko/LC_MESSAGES/libmatekbd.mo
+share/locale/ks/LC_MESSAGES/libmatekbd.mo
+share/locale/ku/LC_MESSAGES/libmatekbd.mo
+share/locale/ku_IQ/LC_MESSAGES/libmatekbd.mo
share/locale/ky/LC_MESSAGES/libmatekbd.mo
+share/locale/la/LC_MESSAGES/libmatekbd.mo
+share/locale/lb/LC_MESSAGES/libmatekbd.mo
+share/locale/li/LC_MESSAGES/libmatekbd.mo
+share/locale/lo/LC_MESSAGES/libmatekbd.mo
share/locale/lt/LC_MESSAGES/libmatekbd.mo
share/locale/lv/LC_MESSAGES/libmatekbd.mo
share/locale/mai/LC_MESSAGES/libmatekbd.mo
+share/locale/mg/LC_MESSAGES/libmatekbd.mo
+share/locale/mi/LC_MESSAGES/libmatekbd.mo
share/locale/mk/LC_MESSAGES/libmatekbd.mo
share/locale/ml/LC_MESSAGES/libmatekbd.mo
+share/locale/mn/LC_MESSAGES/libmatekbd.mo
share/locale/mr/LC_MESSAGES/libmatekbd.mo
share/locale/ms/LC_MESSAGES/libmatekbd.mo
+share/locale/my/LC_MESSAGES/libmatekbd.mo
+share/locale/nah/LC_MESSAGES/libmatekbd.mo
share/locale/nb/LC_MESSAGES/libmatekbd.mo
+share/locale/nds/LC_MESSAGES/libmatekbd.mo
+share/locale/ne/LC_MESSAGES/libmatekbd.mo
share/locale/nl/LC_MESSAGES/libmatekbd.mo
share/locale/nn/LC_MESSAGES/libmatekbd.mo
+share/locale/nqo/LC_MESSAGES/libmatekbd.mo
+share/locale/nso/LC_MESSAGES/libmatekbd.mo
share/locale/oc/LC_MESSAGES/libmatekbd.mo
+share/locale/om/LC_MESSAGES/libmatekbd.mo
share/locale/or/LC_MESSAGES/libmatekbd.mo
share/locale/pa/LC_MESSAGES/libmatekbd.mo
share/locale/pl/LC_MESSAGES/libmatekbd.mo
+share/locale/ps/LC_MESSAGES/libmatekbd.mo
share/locale/pt/LC_MESSAGES/libmatekbd.mo
share/locale/pt_BR/LC_MESSAGES/libmatekbd.mo
share/locale/ro/LC_MESSAGES/libmatekbd.mo
share/locale/ru/LC_MESSAGES/libmatekbd.mo
+share/locale/rw/LC_MESSAGES/libmatekbd.mo
+share/locale/sc/LC_MESSAGES/libmatekbd.mo
+share/locale/sco/LC_MESSAGES/libmatekbd.mo
share/locale/si/LC_MESSAGES/libmatekbd.mo
share/locale/sk/LC_MESSAGES/libmatekbd.mo
share/locale/sl/LC_MESSAGES/libmatekbd.mo
+share/locale/so/LC_MESSAGES/libmatekbd.mo
share/locale/sq/LC_MESSAGES/libmatekbd.mo
share/locale/sr/LC_MESSAGES/libmatekbd.mo
share/locale/sr@latin/LC_MESSAGES/libmatekbd.mo
share/locale/sv/LC_MESSAGES/libmatekbd.mo
+share/locale/sw/LC_MESSAGES/libmatekbd.mo
share/locale/ta/LC_MESSAGES/libmatekbd.mo
share/locale/te/LC_MESSAGES/libmatekbd.mo
+share/locale/tg/LC_MESSAGES/libmatekbd.mo
share/locale/th/LC_MESSAGES/libmatekbd.mo
+share/locale/tk/LC_MESSAGES/libmatekbd.mo
+share/locale/tl/LC_MESSAGES/libmatekbd.mo
share/locale/tr/LC_MESSAGES/libmatekbd.mo
+share/locale/ts/LC_MESSAGES/libmatekbd.mo
+share/locale/tt/LC_MESSAGES/libmatekbd.mo
+share/locale/ug/LC_MESSAGES/libmatekbd.mo
share/locale/uk/LC_MESSAGES/libmatekbd.mo
+share/locale/ur/LC_MESSAGES/libmatekbd.mo
+share/locale/ur_PK/LC_MESSAGES/libmatekbd.mo
+share/locale/uz/LC_MESSAGES/libmatekbd.mo
share/locale/vi/LC_MESSAGES/libmatekbd.mo
+share/locale/wa/LC_MESSAGES/libmatekbd.mo
+share/locale/xh/LC_MESSAGES/libmatekbd.mo
+share/locale/yi/LC_MESSAGES/libmatekbd.mo
+share/locale/yo/LC_MESSAGES/libmatekbd.mo
share/locale/zh_CN/LC_MESSAGES/libmatekbd.mo
share/locale/zh_HK/LC_MESSAGES/libmatekbd.mo
share/locale/zh_TW/LC_MESSAGES/libmatekbd.mo
+share/locale/zu/LC_MESSAGES/libmatekbd.mo
diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile
index d11d7195acf0..498182ea1a15 100644
--- a/x11/mate-applets/Makefile
+++ b/x11/mate-applets/Makefile
@@ -1,9 +1,7 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
PORTNAME= mate-applets
-PORTVERSION= 1.12.1
-PORTREVISION= 2
+PORTVERSION= 1.18.1
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -11,58 +9,61 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= Applets components for the MATE Desktop Environment
+LICENSE= GPLv2 GFDL
+LICENSE_COMB= multi
+LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
+LICENSE_FILE_GFDL= ${WRKSRC}/COPYING-DOCS
+
BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libgtop-2.0.so:devel/libgtop \
- libxklavier.so:x11/libxklavier \
libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
- libpolkit-gobject-1.so:sysutils/polkit \
- libhal.so:sysutils/hal \
libupower-glib.so:sysutils/upower \
+ libgucharmap_2_90.so:deskutils/gucharmap \
libnotify.so:devel/libnotify
PORTSCOUT= limitw:1,even
-USES= autoreconf:build gettext gmake libtool pathfix pkgconfig \
- python shebangfix tar:xz
-USE_MATE= desktop icontheme libmateweather panel polkit settingsdaemon
-USE_XORG= x11
-USE_GNOME= gdkpixbuf2 gtksourceview2 introspection:build \
- libxml2 libxslt pygobject pygobject3 libwnck intlhack
+#USES= autoreconf:build gettext gmake libtool localbase pathfix \
+# pkgconfig python shebangfix tar:xz
+USES= gettext gmake libtool localbase pkgconfig python:2.7 shebangfix tar:xz
+#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
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --with-gtk=2.0
CONFIGURE_ENV= OS_SYS="/usr/include"
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -lpthread -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.panel.applet.charpick.gschema.xml \
org.mate.panel.applet.command.gschema.xml \
org.mate.panel.applet.geyes.gschema.xml \
org.mate.panel.applet.multiload.gschema.xml \
+ org.mate.panel.applet.netspeed.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
-FIX_APPLETS= accessx-status battstat \
- invest-applet/data stickynotes trashapplet
-
.include <bsd.port.pre.mk>
-#.if ${ARCH} != "i386" && ${ARCH} != "amd64"
+.if ${ARCH} != "i386" && ${ARCH} != "amd64"
CONFIGURE_ARGS+=--disable-battstat
CFLAGS+= -fPIC
PLIST_SUB+= BATTERY="@comment "
-#.else
+.else
#CONFIGURE_ARGS+=--enable-battstat
-#GLIB_SCHEMAS+= org.mate.panel.applet.battstat.gschema.xml
-#PLIST_SUB+= BATTERY=""
-#.endif
+GLIB_SCHEMAS+= org.mate.panel.applet.battstat.gschema.xml
+PLIST_SUB+= BATTERY=""
+.endif
+# requires linux libcpufreq library
#.if ${ARCH} != "i386" && ${ARCH} != "amd64"
CONFIGURE_ARGS+=--disable-cpufreq
PLIST_SUB+= CPUFREQ="@comment "
@@ -72,16 +73,4 @@ PLIST_SUB+= CPUFREQ="@comment "
#GLIB_SCHEMAS+= org.mate.panel.applet.cpufreq.gschema.xml
#.endif
-post-patch:
- ${MV} ${WRKSRC}/invest-applet/invest/invest-applet.py \
- ${WRKSRC}/invest-applet/invest/mate-invest-applet.py
-.for dir in ${FIX_APPLETS}
- @${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 5167dfc1d2c1..5dbb8bf92ee1 100644
--- a/x11/mate-applets/distinfo
+++ b/x11/mate-applets/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-applets-1.12.1.tar.xz) = 0a3bc19e59c69eccdcc2342f29b7837563e51fbefdb232ca1884ca23d8f69c99
-SIZE (mate/mate-applets-1.12.1.tar.xz) = 6816716
+TIMESTAMP = 1491691806
+SHA256 (mate/mate-applets-1.18.1.tar.xz) = 05bae1324de35659b37307bb345bb9da16b19391c83388ef697df51a22caf4da
+SIZE (mate/mate-applets-1.18.1.tar.xz) = 7158716
diff --git a/x11/mate-applets/files/accessx-status_Makefile.am b/x11/mate-applets/files/accessx-status_Makefile.am
deleted file mode 100644
index b0119487cbfa..000000000000
--- a/x11/mate-applets/files/accessx-status_Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
---- accessx-status/Makefile.am.orig 2014-12-05 11:01:40.849389089 +0100
-+++ accessx-status/Makefile.am 2014-12-05 11:03:05.635384917 +0100
-@@ -6,13 +6,13 @@
- -DACCESSX_PIXMAPS_DIR=\""$(datadir)/pixmaps/mate-accessx-status-applet"\" \
- -DACCESSX_MENU_UI_DIR=\""$(uidir)"\"
-
--libexec_PROGRAMS = accessx-status-applet
-+libexec_PROGRAMS = mate-accessx-status-applet
-
--accessx_status_applet_SOURCES = \
-+mate_accessx_status_applet_SOURCES = \
- applet.c \
- applet.h
-
--accessx_status_applet_LDADD = \
-+mate_accessx_status_applet_LDADD = \
- $(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
- $(X_LIBS)
diff --git a/x11/mate-applets/files/battstat_Makefile.am b/x11/mate-applets/files/battstat_Makefile.am
deleted file mode 100644
index 2a007c192a0b..000000000000
--- a/x11/mate-applets/files/battstat_Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
---- battstat/Makefile.am.orig 2014-12-05 12:27:04.701035642 +0100
-+++ battstat/Makefile.am 2014-12-05 12:28:02.762606006 +0100
-@@ -35,10 +35,10 @@
- -DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\"
-
-
--libexec_PROGRAMS = battstat-applet
-+libexec_PROGRAMS = mate-battstat-applet
-
-
--battstat_applet_SOURCES = \
-+mate_battstat_applet_SOURCES = \
- battstat.h \
- pixmaps.h \
- properties.c \
-@@ -54,7 +54,7 @@
- battstat-upower.h
-
-
--battstat_applet_LDADD = \
-+mate_battstat_applet_LDADD = \
- $(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
- $(LIBNOTIFY_LIBS) \
diff --git a/x11/mate-applets/files/command_Makefile.am b/x11/mate-applets/files/command_Makefile.am
deleted file mode 100644
index 6b67c3a90189..000000000000
--- a/x11/mate-applets/files/command_Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
---- command/Makefile.am.orig 2014-12-05 12:30:39.726021147 +0100
-+++ command/Makefile.am 2014-12-05 12:30:57.153403339 +0100
-@@ -7,10 +7,10 @@
-
- APPLET_LOCATION = $(libexecdir)/command-applet
-
--libexec_PROGRAMS = command-applet
--command_applet_SOURCES = command.c
--command_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS)
--command_applet_CFLAGS = $(WARN_CFLAGS)
-+libexec_PROGRAMS = mate-command-applet
-+mate_command_applet_SOURCES = command.c
-+mate_command_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS)
-+mate_command_applet_CFLAGS = $(WARN_CFLAGS)
-
- appletsdir = $(datadir)/mate-panel/applets
- applets_in_files = org.mate.applets.CommandApplet.mate-panel-applet.in
diff --git a/x11/mate-applets/files/patch-accessx-status_Makefile.in b/x11/mate-applets/files/patch-accessx-status_Makefile.in
deleted file mode 100644
index c337d980ac00..000000000000
--- a/x11/mate-applets/files/patch-accessx-status_Makefile.in
+++ /dev/null
@@ -1,64 +0,0 @@
---- accessx-status/Makefile.in.orig 2015-01-22 17:21:18.066885138 +0100
-+++ accessx-status/Makefile.in 2015-01-22 17:21:33.201884384 +0100
-@@ -78,7 +78,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--libexec_PROGRAMS = accessx-status-applet$(EXEEXT)
-+libexec_PROGRAMS = mate-accessx-status-applet$(EXEEXT)
- subdir = accessx-status
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp AUTHORS COPYING
-@@ -98,10 +98,11 @@
- am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(appletdir)" \
- "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(uidir)"
- PROGRAMS = $(libexec_PROGRAMS)
--am_accessx_status_applet_OBJECTS = applet.$(OBJEXT)
--accessx_status_applet_OBJECTS = $(am_accessx_status_applet_OBJECTS)
-+am_mate_accessx_status_applet_OBJECTS = applet.$(OBJEXT)
-+mate_accessx_status_applet_OBJECTS = \
-+ $(am_mate_accessx_status_applet_OBJECTS)
- am__DEPENDENCIES_1 =
--accessx_status_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+mate_accessx_status_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_@AM_V@)
-@@ -142,8 +143,8 @@
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo " CCLD " $@;
- am__v_CCLD_1 =
--SOURCES = $(accessx_status_applet_SOURCES)
--DIST_SOURCES = $(accessx_status_applet_SOURCES)
-+SOURCES = $(mate_accessx_status_applet_SOURCES)
-+DIST_SOURCES = $(mate_accessx_status_applet_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- ctags-recursive dvi-recursive html-recursive info-recursive \
- install-data-recursive install-dvi-recursive \
-@@ -470,11 +471,11 @@
- -DACCESSX_PIXMAPS_DIR=\""$(datadir)/pixmaps/mate-accessx-status-applet"\" \
- -DACCESSX_MENU_UI_DIR=\""$(uidir)"\"
-
--accessx_status_applet_SOURCES = \
-+mate_accessx_status_applet_SOURCES = \
- applet.c \
- applet.h
-
--accessx_status_applet_LDADD = \
-+mate_accessx_status_applet_LDADD = \
- $(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
- $(GIO_LIBS) \
-@@ -578,9 +579,9 @@
- echo " rm -f" $$list; \
- rm -f $$list
-
--accessx-status-applet$(EXEEXT): $(accessx_status_applet_OBJECTS) $(accessx_status_applet_DEPENDENCIES) $(EXTRA_accessx_status_applet_DEPENDENCIES)
-- @rm -f accessx-status-applet$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(accessx_status_applet_OBJECTS) $(accessx_status_applet_LDADD) $(LIBS)
-+mate-accessx-status-applet$(EXEEXT): $(mate_accessx_status_applet_OBJECTS) $(mate_accessx_status_applet_DEPENDENCIES) $(EXTRA_mate_accessx_status_applet_DEPENDENCIES)
-+ @rm -f mate-accessx-status-applet$(EXEEXT)
-+ $(AM_V_CCLD)$(LINK) $(mate_accessx_status_applet_OBJECTS) $(mate_accessx_status_applet_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff --git a/x11/mate-applets/files/patch-battstat_Makefile.in b/x11/mate-applets/files/patch-battstat_Makefile.in
deleted file mode 100644
index be870252e6c9..000000000000
--- a/x11/mate-applets/files/patch-battstat_Makefile.in
+++ /dev/null
@@ -1,113 +0,0 @@
---- battstat/Makefile.in.orig 2015-01-22 17:23:12.427878023 +0100
-+++ battstat/Makefile.in 2015-01-22 17:24:25.590872727 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.14.1 from Makefile.am.
-+# Makefile.in generated by automake 1.14 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -78,7 +78,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--libexec_PROGRAMS = battstat-applet$(EXEEXT)
-+libexec_PROGRAMS = mate-battstat-applet$(EXEEXT)
- subdir = battstat
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
-@@ -99,15 +99,15 @@
- "$(DESTDIR)$(builderdir)" "$(DESTDIR)$(servicedir)" \
- "$(DESTDIR)$(uidir)"
- PROGRAMS = $(libexec_PROGRAMS)
--am_battstat_applet_OBJECTS = properties.$(OBJEXT) \
-+am_mate_battstat_applet_OBJECTS = properties.$(OBJEXT) \
- battstat_applet.$(OBJEXT) power-management.$(OBJEXT) \
- acpi-linux.$(OBJEXT) acpi-freebsd.$(OBJEXT) \
- battstat-upower.$(OBJEXT)
--battstat_applet_OBJECTS = $(am_battstat_applet_OBJECTS)
-+mate_battstat_applet_OBJECTS = $(am_mate_battstat_applet_OBJECTS)
- am__DEPENDENCIES_1 =
- @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@am__DEPENDENCIES_2 = \
- @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@ apmlib/libapm.a
--battstat_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+mate_battstat_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_@AM_V@)
-@@ -148,8 +148,8 @@
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo " CCLD " $@;
- am__v_CCLD_1 =
--SOURCES = $(battstat_applet_SOURCES)
--DIST_SOURCES = $(battstat_applet_SOURCES)
-+SOURCES = $(mate_battstat_applet_SOURCES)
-+DIST_SOURCES = $(mate_battstat_applet_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- ctags-recursive dvi-recursive html-recursive info-recursive \
- install-data-recursive install-dvi-recursive \
-@@ -303,7 +303,6 @@
- GUCHARMAP_LIBS = @GUCHARMAP_LIBS@
- HAVE_LIBAPM = @HAVE_LIBAPM@
- HAVE_XKB = @HAVE_XKB@
--HELP_DIR = @HELP_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -319,7 +318,6 @@
- INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
- INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
- INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
--ITSTOOL = @ITSTOOL@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@
-@@ -398,18 +396,14 @@
- UPOWER_LIBS = @UPOWER_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- XMKMF = @XMKMF@
- XML2_CFLAGS = @XML2_CFLAGS@
- XML2_LIBS = @XML2_LIBS@
--XMLLINT = @XMLLINT@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--YELP_LC_DIST = @YELP_LC_DIST@
--YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
-@@ -495,7 +489,7 @@
- -DG_LOG_DOMAIN=\"battstat_applet\" \
- -DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\"
-
--battstat_applet_SOURCES = \
-+mate_battstat_applet_SOURCES = \
- battstat.h \
- pixmaps.h \
- properties.c \
-@@ -508,7 +502,7 @@
- battstat-upower.c \
- battstat-upower.h
-
--battstat_applet_LDADD = \
-+mate_battstat_applet_LDADD = \
- $(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
- $(LIBNOTIFY_LIBS) \
-@@ -617,9 +611,9 @@
- echo " rm -f" $$list; \
- rm -f $$list
-
--battstat-applet$(EXEEXT): $(battstat_applet_OBJECTS) $(battstat_applet_DEPENDENCIES) $(EXTRA_battstat_applet_DEPENDENCIES)
-- @rm -f battstat-applet$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(battstat_applet_OBJECTS) $(battstat_applet_LDADD) $(LIBS)
-+mate-battstat-applet$(EXEEXT): $(mate_battstat_applet_OBJECTS) $(mate_battstat_applet_DEPENDENCIES) $(EXTRA_mate_battstat_applet_DEPENDENCIES)
-+ @rm -f mate-battstat-applet$(EXEEXT)
-+ $(AM_V_CCLD)$(LINK) $(mate_battstat_applet_OBJECTS) $(mate_battstat_applet_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff --git a/x11/mate-applets/files/patch-command_Makefile.in b/x11/mate-applets/files/patch-command_Makefile.in
deleted file mode 100644
index d3b2f156f439..000000000000
--- a/x11/mate-applets/files/patch-command_Makefile.in
+++ /dev/null
@@ -1,114 +0,0 @@
---- command/Makefile.in.orig 2014-12-05 12:31:21.926018134 +0100
-+++ command/Makefile.in 2014-12-05 12:31:38.632017015 +0100
-@@ -78,7 +78,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--libexec_PROGRAMS = command-applet$(EXEEXT)
-+libexec_PROGRAMS = mate-command-applet$(EXEEXT)
- subdir = command
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
-@@ -98,19 +98,20 @@
- am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(appletsdir)" \
- "$(DESTDIR)$(servicedir)"
- PROGRAMS = $(libexec_PROGRAMS)
--am_command_applet_OBJECTS = command_applet-command.$(OBJEXT)
--command_applet_OBJECTS = $(am_command_applet_OBJECTS)
-+am_mate_command_applet_OBJECTS = \
-+ mate_command_applet-command.$(OBJEXT)
-+mate_command_applet_OBJECTS = $(am_mate_command_applet_OBJECTS)
- am__DEPENDENCIES_1 =
--command_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+mate_command_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 =
--command_applet_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-+mate_command_applet_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-- $(command_applet_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
-- $@
-+ $(mate_command_applet_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+ $(LDFLAGS) -o $@
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -145,8 +146,8 @@
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo " CCLD " $@;
- am__v_CCLD_1 =
--SOURCES = $(command_applet_SOURCES)
--DIST_SOURCES = $(command_applet_SOURCES)
-+SOURCES = $(mate_command_applet_SOURCES)
-+DIST_SOURCES = $(mate_command_applet_SOURCES)
- am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
-@@ -444,9 +445,9 @@
- $(DISABLE_DEPRECATED_CFLAGS)
-
- APPLET_LOCATION = $(libexecdir)/command-applet
--command_applet_SOURCES = command.c
--command_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS)
--command_applet_CFLAGS = $(WARN_CFLAGS)
-+mate_command_applet_SOURCES = command.c
-+mate_command_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS)
-+mate_command_applet_CFLAGS = $(WARN_CFLAGS)
- appletsdir = $(datadir)/mate-panel/applets
- applets_in_files = org.mate.applets.CommandApplet.mate-panel-applet.in
- applets_DATA = $(applets_in_files:.mate-panel-applet.in=.mate-panel-applet)
-@@ -544,9 +545,9 @@
- echo " rm -f" $$list; \
- rm -f $$list
-
--command-applet$(EXEEXT): $(command_applet_OBJECTS) $(command_applet_DEPENDENCIES) $(EXTRA_command_applet_DEPENDENCIES)
-- @rm -f command-applet$(EXEEXT)
-- $(AM_V_CCLD)$(command_applet_LINK) $(command_applet_OBJECTS) $(command_applet_LDADD) $(LIBS)
-+mate-command-applet$(EXEEXT): $(mate_command_applet_OBJECTS) $(mate_command_applet_DEPENDENCIES) $(EXTRA_mate_command_applet_DEPENDENCIES)
-+ @rm -f mate-command-applet$(EXEEXT)
-+ $(AM_V_CCLD)$(mate_command_applet_LINK) $(mate_command_applet_OBJECTS) $(mate_command_applet_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-@@ -554,7 +555,7 @@
- distclean-compile:
- -rm -f *.tab.c
-
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command_applet-command.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mate_command_applet-command.Po@am__quote@
-
- .c.o:
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -577,19 +578,19 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
--command_applet-command.o: command.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(command_applet_CFLAGS) $(CFLAGS) -MT command_applet-command.o -MD -MP -MF $(DEPDIR)/command_applet-command.Tpo -c -o command_applet-command.o `test -f 'command.c' || echo '$(srcdir)/'`command.c
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/command_applet-command.Tpo $(DEPDIR)/command_applet-command.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command.c' object='command_applet-command.o' libtool=no @AMDEPBACKSLASH@
-+mate_command_applet-command.o: command.c
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mate_command_applet_CFLAGS) $(CFLAGS) -MT mate_command_applet-command.o -MD -MP -MF $(DEPDIR)/mate_command_applet-command.Tpo -c -o mate_command_applet-command.o `test -f 'command.c' || echo '$(srcdir)/'`command.c
-+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mate_command_applet-command.Tpo $(DEPDIR)/mate_command_applet-command.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command.c' object='mate_command_applet-command.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(command_applet_CFLAGS) $(CFLAGS) -c -o command_applet-command.o `test -f 'command.c' || echo '$(srcdir)/'`command.c
-+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mate_command_applet_CFLAGS) $(CFLAGS) -c -o mate_command_applet-command.o `test -f 'command.c' || echo '$(srcdir)/'`command.c
-
--command_applet-command.obj: command.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(command_applet_CFLAGS) $(CFLAGS) -MT command_applet-command.obj -MD -MP -MF $(DEPDIR)/command_applet-command.Tpo -c -o command_applet-command.obj `if test -f 'command.c'; then $(CYGPATH_W) 'command.c'; else $(CYGPATH_W) '$(srcdir)/command.c'; fi`
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/command_applet-command.Tpo $(DEPDIR)/command_applet-command.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command.c' object='command_applet-command.obj' libtool=no @AMDEPBACKSLASH@
-+mate_command_applet-command.obj: command.c
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mate_command_applet_CFLAGS) $(CFLAGS) -MT mate_command_applet-command.obj -MD -MP -MF $(DEPDIR)/mate_command_applet-command.Tpo -c -o mate_command_applet-command.obj `if test -f 'command.c'; then $(CYGPATH_W) 'command.c'; else $(CYGPATH_W) '$(srcdir)/command.c'; fi`
-+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mate_command_applet-command.Tpo $(DEPDIR)/mate_command_applet-command.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command.c' object='mate_command_applet-command.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(command_applet_CFLAGS) $(CFLAGS) -c -o command_applet-command.obj `if test -f 'command.c'; then $(CYGPATH_W) 'command.c'; else $(CYGPATH_W) '$(srcdir)/command.c'; fi`
-+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mate_command_applet_CFLAGS) $(CFLAGS) -c -o mate_command_applet-command.obj `if test -f 'command.c'; then $(CYGPATH_W) 'command.c'; else $(CYGPATH_W) '$(srcdir)/command.c'; fi`
-
- mostlyclean-libtool:
- -rm -f *.lo
diff --git a/x11/mate-applets/files/patch-configure b/x11/mate-applets/files/patch-configure
index d3c37d2071bd..576990454577 100644
--- a/x11/mate-applets/files/patch-configure
+++ b/x11/mate-applets/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2016-01-24 14:18:29.899712000 +0100
-+++ configure 2016-01-24 14:18:52.644710000 +0100
-@@ -15944,7 +15944,7 @@
+--- configure.orig 2016-02-01 10:05:32.777229000 +0100
++++ configure 2016-02-01 10:05:56.624276000 +0100
+@@ -16587,7 +16587,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -9,7 +9,7 @@
ac_define_dir=`eval echo $ac_define_dir`
MATELOCALEDIR="$ac_define_dir"
-@@ -17078,7 +17078,7 @@
+@@ -17434,7 +17434,7 @@
;;
# list of supported OS cores that do not use libapm
@@ -18,7 +18,7 @@
if test -n "${OS_SYS}"; then
ACPIINC="-I${OS_SYS}"
else
-@@ -17327,6 +17327,9 @@
+@@ -17683,6 +17683,9 @@
*linux*)
build_cpufreq_applet=yes
;;
@@ -28,7 +28,7 @@
*)
{ $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 @@
+@@ -17949,7 +17952,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -37,7 +37,7 @@
ac_define_dir=`eval echo $ac_define_dir`
MATE_ICONDIR="$ac_define_dir"
-@@ -17570,7 +17573,7 @@
+@@ -17962,7 +17965,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -46,7 +46,7 @@
ac_define_dir=`eval echo $ac_define_dir`
MATE_PIXMAPSDIR="$ac_define_dir"
-@@ -17583,7 +17586,7 @@
+@@ -17975,7 +17978,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -55,7 +55,7 @@
ac_define_dir=`eval echo $ac_define_dir`
PKGDATADIR="$ac_define_dir"
-@@ -17596,7 +17599,7 @@
+@@ -17988,7 +17991,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -64,7 +64,7 @@
ac_define_dir=`eval echo $ac_define_dir`
GTK_BUILDERDIR="$ac_define_dir"
-@@ -17609,7 +17612,7 @@
+@@ -18001,7 +18004,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -73,7 +73,16 @@
ac_define_dir=`eval echo $ac_define_dir`
DATADIR="$ac_define_dir"
-@@ -17622,7 +17625,7 @@
+@@ -18014,7 +18017,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`
+ PKG_DATA_DIR="$ac_define_dir"
+
+@@ -18027,7 +18030,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -82,7 +91,7 @@
ac_define_dir=`eval echo $ac_define_dir`
SYSCONFDIR="$ac_define_dir"
-@@ -17635,7 +17638,7 @@
+@@ -18040,7 +18043,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -91,7 +100,7 @@
ac_define_dir=`eval echo $ac_define_dir`
LIBDIR="$ac_define_dir"
-@@ -17648,7 +17651,7 @@
+@@ -18053,7 +18056,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -100,3 +109,12 @@
ac_define_dir=`eval echo $ac_define_dir`
PREFIX="$ac_define_dir"
+@@ -18066,7 +18069,7 @@
+
+
+ EXP_VAR=DATADIR
+- FROM_VAR="${datadir}"
++ FROM_VAR=$datadir
+
+ prefix_save=$prefix
+ exec_prefix_save=$exec_prefix
diff --git a/x11/mate-applets/files/patch-configure.ac b/x11/mate-applets/files/patch-configure.ac
index 34407387928a..0923fcd11d0b 100644
--- a/x11/mate-applets/files/patch-configure.ac
+++ b/x11/mate-applets/files/patch-configure.ac
@@ -1,5 +1,5 @@
---- configure.ac.orig 2015-11-29 20:13:23.000000000 +0100
-+++ configure.ac 2016-01-08 23:56:37.487626000 +0100
+--- configure.ac.orig 2016-01-05 02:12:51.000000000 +0100
++++ configure.ac 2016-02-01 10:03:19.854824000 +0100
@@ -269,7 +269,7 @@
GETTEXT_PACKAGE=mate-applets
AC_SUBST(GETTEXT_PACKAGE)
@@ -28,7 +28,7 @@
*)
AC_MSG_WARN([${host} is not supported by cpufreq applet, not building])
build_cpufreq_applet=no
-@@ -526,14 +529,14 @@
+@@ -546,17 +549,17 @@
builderdir="${pkgdatadir}/builder"
AC_SUBST(builderdir)
@@ -37,6 +37,7 @@
-AC_DEFINE_DIR(PKGDATADIR, "${pkgdatadir}", [Mate Applets Directory])
-AC_DEFINE_DIR(GTK_BUILDERDIR, "${builderdir}", [GtkBuilder Resources Directory])
-AC_DEFINE_DIR(DATADIR, "${datadir}", [datadir])
+-AC_DEFINE_DIR(PKG_DATA_DIR, "${pkgdatadir}", [pkgdatadir])
-AC_DEFINE_DIR(SYSCONFDIR, "${sysconfdir}", [sysconfdir])
-AC_DEFINE_DIR(LIBDIR, "${libdir}", [libdir])
-AC_DEFINE_DIR(PREFIX, "$prefix", [install prefix])
@@ -45,9 +46,13 @@
+AC_DEFINE_DIR(PKGDATADIR, [pkgdatadir], [Mate Applets Directory])
+AC_DEFINE_DIR(GTK_BUILDERDIR, [builderdir], [GtkBuilder Resources Directory])
+AC_DEFINE_DIR(DATADIR, [datadir], [datadir])
++AC_DEFINE_DIR(PKG_DATA_DIR, [pkgdatadir], [pkgdatadir])
+AC_DEFINE_DIR(SYSCONFDIR, [sysconfdir], [sysconfdir])
+AC_DEFINE_DIR(LIBDIR, [libdir], [libdir])
+AC_DEFINE_DIR(PREFIX, [prefix], [install prefix])
- AS_AC_EXPAND(DATADIR, "${datadir}")
+-AS_AC_EXPAND(DATADIR, "${datadir}")
++AS_AC_EXPAND(DATADIR, $datadir)
AS_AC_EXPAND(PYTHONDIR, $pythondir)
+ AS_AC_EXPAND(BUILDERDIR, $builderdir)
+
diff --git a/x11/mate-applets/files/patch-cpufreq-freebsd b/x11/mate-applets/files/patch-cpufreq-freebsd
index 9a5dd5d7d4e2..d10859f40719 100644
--- a/x11/mate-applets/files/patch-cpufreq-freebsd
+++ b/x11/mate-applets/files/patch-cpufreq-freebsd
@@ -45,21 +45,21 @@
governor = g_strdup (_("Frequency Scaling Unsupported"));
cur_freq = cpu * 1000;
---- cpufreq/src/cpufreq-applet.c.orig Thu Jun 15 01:01:53 2006
-+++ cpufreq/src/cpufreq-applet.c Sat Jun 17 13:42:50 2006
+--- cpufreq/src/cpufreq-applet.c.orig 2016-04-01 10:54:10.000000000 +0200
++++ cpufreq/src/cpufreq-applet.c 2016-04-19 13:56:00.550008000 +0200
@@ -17,6 +17,7 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * Authors : Carlos García Campos <carlosgc@gnome.org>
+ * Authors : Carlos García Campos <carlosgc@gnome.org>
+ * Joe Marcus Clarke <marcus@FreeBSD.org>
*/
#ifdef HAVE_CONFIG_H
-@@ -519,6 +524,7 @@ cpufreq_applet_about_cb (BonoboUICompone
+@@ -678,6 +679,7 @@
{
static const gchar *const authors[] = {
"Carlos Garcia Campos <carlosgc@gnome.org>",
-+ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)",
++ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)",
NULL
};
static const gchar *const documenters[] = {
diff --git a/x11/mate-applets/files/patch-invest-applet_invest_Makefile.in b/x11/mate-applets/files/patch-invest-applet_invest_Makefile.in
deleted file mode 100644
index 44306d54c7d9..000000000000
--- a/x11/mate-applets/files/patch-invest-applet_invest_Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- invest-applet/invest/Makefile.in.orig 2014-04-12 15:44:54.000000000 +0200
-+++ invest-applet/invest/Makefile.in 2014-04-12 15:45:15.000000000 +0200
-@@ -391,7 +391,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- bin_SCRIPTS = mate-invest-chart
--libexec_SCRIPTS = invest-applet
-+libexec_SCRIPTS = mate-invest-applet
- investdir = $(pythondir)/mate_invest
- invest_PYTHON = \
- __init__.py \
-@@ -409,7 +409,7 @@
- defs.py
-
- BUILT_SOURCES = \
-- invest-applet
-+ mate-invest-applet
-
- CLEANFILES = \
- $(BUILT_SOURCES)
-@@ -795,7 +795,7 @@
- uninstall-am uninstall-binSCRIPTS uninstall-investPYTHON \
- uninstall-libexecSCRIPTS uninstall-nodist_investPYTHON
-
--invest-applet: invest-applet.py
-+mate-invest-applet: mate-invest-applet.py
- sed -e "s|\@PYTHONDIR\@|$(pythondir)/|" $< > $@
-
- #TESTS = test.py
diff --git a/x11/mate-applets/files/patch-stickynotes_Makefile.in b/x11/mate-applets/files/patch-stickynotes_Makefile.in
deleted file mode 100644
index 991c3a669738..000000000000
--- a/x11/mate-applets/files/patch-stickynotes_Makefile.in
+++ /dev/null
@@ -1,121 +0,0 @@
---- stickynotes/Makefile.in.orig 2015-01-22 17:42:18.261799026 +0100
-+++ stickynotes/Makefile.in 2015-01-22 17:42:56.807795784 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.14.1 from Makefile.am.
-+# Makefile.in generated by automake 1.14 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -78,8 +78,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--@BUILD_STICKYNOTES_APPLET_TRUE@libexec_PROGRAMS = \
--@BUILD_STICKYNOTES_APPLET_TRUE@ stickynotes_applet$(EXEEXT)
-+@BUILD_STICKYNOTES_APPLET_TRUE@libexec_PROGRAMS = mate-stickynotes-applet$(EXEEXT)
- subdir = stickynotes
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp README TODO
-@@ -100,20 +99,21 @@
- "$(DESTDIR)$(builderdir)" "$(DESTDIR)$(convertdir)" \
- "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(uidir)"
- PROGRAMS = $(libexec_PROGRAMS)
--am__stickynotes_applet_SOURCES_DIST = util.h util.c stickynotes.h \
-+am__mate_stickynotes_applet_SOURCES_DIST = util.h util.c stickynotes.h \
- stickynotes_callbacks.h stickynotes_applet.h \
- stickynotes_applet_callbacks.h stickynotes.c \
- stickynotes_callbacks.c stickynotes_applet.c \
- stickynotes_applet_callbacks.c
--@BUILD_STICKYNOTES_APPLET_TRUE@am_stickynotes_applet_OBJECTS = \
-+@BUILD_STICKYNOTES_APPLET_TRUE@am_mate_stickynotes_applet_OBJECTS = \
- @BUILD_STICKYNOTES_APPLET_TRUE@ util.$(OBJEXT) \
- @BUILD_STICKYNOTES_APPLET_TRUE@ stickynotes.$(OBJEXT) \
- @BUILD_STICKYNOTES_APPLET_TRUE@ stickynotes_callbacks.$(OBJEXT) \
- @BUILD_STICKYNOTES_APPLET_TRUE@ stickynotes_applet.$(OBJEXT) \
- @BUILD_STICKYNOTES_APPLET_TRUE@ stickynotes_applet_callbacks.$(OBJEXT)
--stickynotes_applet_OBJECTS = $(am_stickynotes_applet_OBJECTS)
-+mate_stickynotes_applet_OBJECTS = \
-+ $(am_mate_stickynotes_applet_OBJECTS)
- am__DEPENDENCIES_1 =
--@BUILD_STICKYNOTES_APPLET_TRUE@stickynotes_applet_DEPENDENCIES = \
-+@BUILD_STICKYNOTES_APPLET_TRUE@mate_stickynotes_applet_DEPENDENCIES = \
- @BUILD_STICKYNOTES_APPLET_TRUE@ $(am__DEPENDENCIES_1) \
- @BUILD_STICKYNOTES_APPLET_TRUE@ $(am__DEPENDENCIES_1) \
- @BUILD_STICKYNOTES_APPLET_TRUE@ $(am__DEPENDENCIES_1) \
-@@ -157,8 +157,8 @@
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo " CCLD " $@;
- am__v_CCLD_1 =
--SOURCES = $(stickynotes_applet_SOURCES)
--DIST_SOURCES = $(am__stickynotes_applet_SOURCES_DIST)
-+SOURCES = $(mate_stickynotes_applet_SOURCES)
-+DIST_SOURCES = $(am__mate_stickynotes_applet_SOURCES_DIST)
- RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- ctags-recursive dvi-recursive html-recursive info-recursive \
- install-data-recursive install-dvi-recursive \
-@@ -314,7 +314,6 @@
- GUCHARMAP_LIBS = @GUCHARMAP_LIBS@
- HAVE_LIBAPM = @HAVE_LIBAPM@
- HAVE_XKB = @HAVE_XKB@
--HELP_DIR = @HELP_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -330,7 +329,6 @@
- INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
- INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
- INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
--ITSTOOL = @ITSTOOL@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@
-@@ -409,18 +407,14 @@
- UPOWER_LIBS = @UPOWER_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- XMKMF = @XMKMF@
- XML2_CFLAGS = @XML2_CFLAGS@
- XML2_LIBS = @XML2_LIBS@
--XMLLINT = @XMLLINT@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--YELP_LC_DIST = @YELP_LC_DIST@
--YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
-@@ -501,7 +495,7 @@
- @BUILD_STICKYNOTES_APPLET_TRUE@ -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\"\
- @BUILD_STICKYNOTES_APPLET_TRUE@ -DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/mate-stickynotes/\"
-
--@BUILD_STICKYNOTES_APPLET_TRUE@stickynotes_applet_SOURCES = \
-+@BUILD_STICKYNOTES_APPLET_TRUE@mate_stickynotes_applet_SOURCES = \
- @BUILD_STICKYNOTES_APPLET_TRUE@ util.h \
- @BUILD_STICKYNOTES_APPLET_TRUE@ util.c \
- @BUILD_STICKYNOTES_APPLET_TRUE@ stickynotes.h \
-@@ -513,7 +507,7 @@
- @BUILD_STICKYNOTES_APPLET_TRUE@ stickynotes_applet.c \
- @BUILD_STICKYNOTES_APPLET_TRUE@ stickynotes_applet_callbacks.c
-
--@BUILD_STICKYNOTES_APPLET_TRUE@stickynotes_applet_LDADD = \
-+@BUILD_STICKYNOTES_APPLET_TRUE@mate_stickynotes_applet_LDADD = \
- @BUILD_STICKYNOTES_APPLET_TRUE@ $(STICKYNOTES_LIBS) \
- @BUILD_STICKYNOTES_APPLET_TRUE@ $(MATE_APPLETS4_LIBS) \
- @BUILD_STICKYNOTES_APPLET_TRUE@ $(MATEDESKTOP_LIBS) \
-@@ -624,9 +618,9 @@
- echo " rm -f" $$list; \
- rm -f $$list
-
--stickynotes_applet$(EXEEXT): $(stickynotes_applet_OBJECTS) $(stickynotes_applet_DEPENDENCIES) $(EXTRA_stickynotes_applet_DEPENDENCIES)
-- @rm -f stickynotes_applet$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(stickynotes_applet_OBJECTS) $(stickynotes_applet_LDADD) $(LIBS)
-+mate-stickynotes-applet$(EXEEXT): $(mate_stickynotes_applet_OBJECTS) $(mate_stickynotes_applet_DEPENDENCIES) $(EXTRA_mate_stickynotes_applet_DEPENDENCIES)
-+ @rm -f mate-stickynotes-applet$(EXEEXT)
-+ $(AM_V_CCLD)$(LINK) $(mate_stickynotes_applet_OBJECTS) $(mate_stickynotes_applet_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff --git a/x11/mate-applets/files/patch-timerapplet_Makefile.in b/x11/mate-applets/files/patch-timerapplet_Makefile.in
deleted file mode 100644
index 27f87afe7eda..000000000000
--- a/x11/mate-applets/files/patch-timerapplet_Makefile.in
+++ /dev/null
@@ -1,114 +0,0 @@
---- timerapplet/Makefile.in.orig 2014-12-05 12:42:20.777973220 +0100
-+++ timerapplet/Makefile.in 2014-12-05 12:42:53.159970630 +0100
-@@ -78,7 +78,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--libexec_PROGRAMS = timer-applet$(EXEEXT)
-+libexec_PROGRAMS = mate-timer-applet$(EXEEXT)
- subdir = timerapplet
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
-@@ -98,18 +98,20 @@
- am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(appletsdir)" \
- "$(DESTDIR)$(servicedir)"
- PROGRAMS = $(libexec_PROGRAMS)
--am_timer_applet_OBJECTS = timer_applet-timerapplet.$(OBJEXT)
--timer_applet_OBJECTS = $(am_timer_applet_OBJECTS)
-+am_mate_timer_applet_OBJECTS = \
-+ mate_timer_applet-timerapplet.$(OBJEXT)
-+mate_timer_applet_OBJECTS = $(am_mate_timer_applet_OBJECTS)
- am__DEPENDENCIES_1 =
--timer_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+mate_timer_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 =
--timer_applet_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(timer_applet_CFLAGS) \
-- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+mate_timer_applet_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-+ $(mate_timer_applet_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-+ -o $@
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -144,8 +146,8 @@
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo " CCLD " $@;
- am__v_CCLD_1 =
--SOURCES = $(timer_applet_SOURCES)
--DIST_SOURCES = $(timer_applet_SOURCES)
-+SOURCES = $(mate_timer_applet_SOURCES)
-+DIST_SOURCES = $(mate_timer_applet_SOURCES)
- am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
-@@ -444,9 +446,9 @@
- $(DISABLE_DEPRECATED_CFLAGS)
-
- APPLET_LOCATION = $(libexecdir)/timer-applet
--timer_applet_SOURCES = timerapplet.c
--timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS) $(LIBNOTIFY_LIBS)
--timer_applet_CFLAGS = $(WARN_CFLAGS)
-+mate_timer_applet_SOURCES = timerapplet.c
-+mate_timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS) $(LIBNOTIFY_LIBS)
-+mate_timer_applet_CFLAGS = $(WARN_CFLAGS)
- appletsdir = $(datadir)/mate-panel/applets
- applets_in_files = org.mate.applets.TimerApplet.mate-panel-applet.in
- applets_DATA = $(applets_in_files:.mate-panel-applet.in=.mate-panel-applet)
-@@ -544,9 +546,9 @@
- echo " rm -f" $$list; \
- rm -f $$list
-
--timer-applet$(EXEEXT): $(timer_applet_OBJECTS) $(timer_applet_DEPENDENCIES) $(EXTRA_timer_applet_DEPENDENCIES)
-- @rm -f timer-applet$(EXEEXT)
-- $(AM_V_CCLD)$(timer_applet_LINK) $(timer_applet_OBJECTS) $(timer_applet_LDADD) $(LIBS)
-+mate-timer-applet$(EXEEXT): $(mate_timer_applet_OBJECTS) $(mate_timer_applet_DEPENDENCIES) $(EXTRA_mate_timer_applet_DEPENDENCIES)
-+ @rm -f mate-timer-applet$(EXEEXT)
-+ $(AM_V_CCLD)$(mate_timer_applet_LINK) $(mate_timer_applet_OBJECTS) $(mate_timer_applet_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-@@ -554,7 +556,7 @@
- distclean-compile:
- -rm -f *.tab.c
-
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer_applet-timerapplet.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mate_timer_applet-timerapplet.Po@am__quote@
-
- .c.o:
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -577,19 +579,19 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
--timer_applet-timerapplet.o: timerapplet.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(timer_applet_CFLAGS) $(CFLAGS) -MT timer_applet-timerapplet.o -MD -MP -MF $(DEPDIR)/timer_applet-timerapplet.Tpo -c -o timer_applet-timerapplet.o `test -f 'timerapplet.c' || echo '$(srcdir)/'`timerapplet.c
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/timer_applet-timerapplet.Tpo $(DEPDIR)/timer_applet-timerapplet.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='timerapplet.c' object='timer_applet-timerapplet.o' libtool=no @AMDEPBACKSLASH@
-+mate_timer_applet-timerapplet.o: timerapplet.c
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mate_timer_applet_CFLAGS) $(CFLAGS) -MT mate_timer_applet-timerapplet.o -MD -MP -MF $(DEPDIR)/mate_timer_applet-timerapplet.Tpo -c -o mate_timer_applet-timerapplet.o `test -f 'timerapplet.c' || echo '$(srcdir)/'`timerapplet.c
-+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mate_timer_applet-timerapplet.Tpo $(DEPDIR)/mate_timer_applet-timerapplet.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='timerapplet.c' object='mate_timer_applet-timerapplet.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(timer_applet_CFLAGS) $(CFLAGS) -c -o timer_applet-timerapplet.o `test -f 'timerapplet.c' || echo '$(srcdir)/'`timerapplet.c
-+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mate_timer_applet_CFLAGS) $(CFLAGS) -c -o mate_timer_applet-timerapplet.o `test -f 'timerapplet.c' || echo '$(srcdir)/'`timerapplet.c
-
--timer_applet-timerapplet.obj: timerapplet.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(timer_applet_CFLAGS) $(CFLAGS) -MT timer_applet-timerapplet.obj -MD -MP -MF $(DEPDIR)/timer_applet-timerapplet.Tpo -c -o timer_applet-timerapplet.obj `if test -f 'timerapplet.c'; then $(CYGPATH_W) 'timerapplet.c'; else $(CYGPATH_W) '$(srcdir)/timerapplet.c'; fi`
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/timer_applet-timerapplet.Tpo $(DEPDIR)/timer_applet-timerapplet.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='timerapplet.c' object='timer_applet-timerapplet.obj' libtool=no @AMDEPBACKSLASH@
-+mate_timer_applet-timerapplet.obj: timerapplet.c
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mate_timer_applet_CFLAGS) $(CFLAGS) -MT mate_timer_applet-timerapplet.obj -MD -MP -MF $(DEPDIR)/mate_timer_applet-timerapplet.Tpo -c -o mate_timer_applet-timerapplet.obj `if test -f 'timerapplet.c'; then $(CYGPATH_W) 'timerapplet.c'; else $(CYGPATH_W) '$(srcdir)/timerapplet.c'; fi`
-+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mate_timer_applet-timerapplet.Tpo $(DEPDIR)/mate_timer_applet-timerapplet.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='timerapplet.c' object='mate_timer_applet-timerapplet.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(timer_applet_CFLAGS) $(CFLAGS) -c -o timer_applet-timerapplet.obj `if test -f 'timerapplet.c'; then $(CYGPATH_W) 'timerapplet.c'; else $(CYGPATH_W) '$(srcdir)/timerapplet.c'; fi`
-+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mate_timer_applet_CFLAGS) $(CFLAGS) -c -o mate_timer_applet-timerapplet.obj `if test -f 'timerapplet.c'; then $(CYGPATH_W) 'timerapplet.c'; else $(CYGPATH_W) '$(srcdir)/timerapplet.c'; fi`
-
- mostlyclean-libtool:
- -rm -f *.lo
diff --git a/x11/mate-applets/files/patch-trashapplet_src_Makefile.in b/x11/mate-applets/files/patch-trashapplet_src_Makefile.in
deleted file mode 100644
index 95618f79c635..000000000000
--- a/x11/mate-applets/files/patch-trashapplet_src_Makefile.in
+++ /dev/null
@@ -1,111 +0,0 @@
---- trashapplet/src/Makefile.in.orig 2015-01-22 17:36:57.524822808 +0100
-+++ trashapplet/src/Makefile.in 2015-01-22 17:37:30.146818374 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.14.1 from Makefile.am.
-+# Makefile.in generated by automake 1.14 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -77,7 +77,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--libexec_PROGRAMS = trashapplet$(EXEEXT)
-+libexec_PROGRAMS = mate-trashapplet$(EXEEXT)
- subdir = trashapplet/src
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
-@@ -96,12 +96,12 @@
- CONFIG_CLEAN_VPATH_FILES =
- am__installdirs = "$(DESTDIR)$(libexecdir)"
- PROGRAMS = $(libexec_PROGRAMS)
--am_trashapplet_OBJECTS = trashapplet.$(OBJEXT) trash-empty.$(OBJEXT) \
-- xstuff.$(OBJEXT)
--trashapplet_OBJECTS = $(am_trashapplet_OBJECTS)
-+am_mate_trashapplet_OBJECTS = trashapplet.$(OBJEXT) \
-+ trash-empty.$(OBJEXT) xstuff.$(OBJEXT)
-+mate_trashapplet_OBJECTS = $(am_mate_trashapplet_OBJECTS)
- am__DEPENDENCIES_1 =
--trashapplet_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
-+mate_trashapplet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -140,8 +140,8 @@
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo " CCLD " $@;
- am__v_CCLD_1 =
--SOURCES = $(trashapplet_SOURCES)
--DIST_SOURCES = $(trashapplet_SOURCES)
-+SOURCES = $(mate_trashapplet_SOURCES)
-+DIST_SOURCES = $(mate_trashapplet_SOURCES)
- am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
-@@ -226,7 +226,6 @@
- GUCHARMAP_LIBS = @GUCHARMAP_LIBS@
- HAVE_LIBAPM = @HAVE_LIBAPM@
- HAVE_XKB = @HAVE_XKB@
--HELP_DIR = @HELP_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -242,7 +241,6 @@
- INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
- INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
- INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
--ITSTOOL = @ITSTOOL@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@
-@@ -321,18 +319,14 @@
- UPOWER_LIBS = @UPOWER_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- XMKMF = @XMKMF@
- XML2_CFLAGS = @XML2_CFLAGS@
- XML2_LIBS = @XML2_LIBS@
--XMLLINT = @XMLLINT@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--YELP_LC_DIST = @YELP_LC_DIST@
--YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
-@@ -402,14 +396,14 @@
- $(GIO_CFLAGS) \
- -DTRASH_MENU_UI_DIR=\""$(datadir)/mate/ui"\"
-
--trashapplet_SOURCES = \
-+mate_trashapplet_SOURCES = \
- trashapplet.c \
- trash-empty.h \
- trash-empty.c \
- xstuff.c \
- xstuff.h
-
--trashapplet_LDADD = \
-+mate_trashapplet_LDADD = \
- $(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
- $(GIO_LIBS) \
-@@ -499,9 +493,9 @@
- echo " rm -f" $$list; \
- rm -f $$list
-
--trashapplet$(EXEEXT): $(trashapplet_OBJECTS) $(trashapplet_DEPENDENCIES) $(EXTRA_trashapplet_DEPENDENCIES)
-- @rm -f trashapplet$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(trashapplet_OBJECTS) $(trashapplet_LDADD) $(LIBS)
-+mate-trashapplet$(EXEEXT): $(mate_trashapplet_OBJECTS) $(mate_trashapplet_DEPENDENCIES) $(EXTRA_mate_trashapplet_DEPENDENCIES)
-+ @rm -f mate-trashapplet$(EXEEXT)
-+ $(AM_V_CCLD)$(LINK) $(mate_trashapplet_OBJECTS) $(mate_trashapplet_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff --git a/x11/mate-applets/files/stickynotes_Makefile.am b/x11/mate-applets/files/stickynotes_Makefile.am
deleted file mode 100644
index d86393547178..000000000000
--- a/x11/mate-applets/files/stickynotes_Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
---- stickynotes/Makefile.am.orig 2014-12-05 12:40:40.520108172 +0100
-+++ stickynotes/Makefile.am 2014-12-05 12:41:13.202979210 +0100
-@@ -20,9 +20,9 @@
- -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\"\
- -DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/mate-stickynotes/\"
-
--libexec_PROGRAMS = stickynotes_applet
-+libexec_PROGRAMS = mate-stickynotes-applet
-
--stickynotes_applet_SOURCES = \
-+mate_stickynotes_applet_SOURCES = \
- util.h \
- util.c \
- stickynotes.h \
-@@ -34,7 +34,7 @@
- stickynotes_applet.c \
- stickynotes_applet_callbacks.c
-
--stickynotes_applet_LDADD = \
-+mate_stickynotes_applet_LDADD = \
- $(STICKYNOTES_LIBS) \
- $(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
diff --git a/x11/mate-applets/files/timerapplet_Makefile.am b/x11/mate-applets/files/timerapplet_Makefile.am
deleted file mode 100644
index a246bd826282..000000000000
--- a/x11/mate-applets/files/timerapplet_Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
---- timerapplet/Makefile.am.orig 2014-12-05 12:42:16.277972721 +0100
-+++ timerapplet/Makefile.am 2014-12-05 12:42:39.149096790 +0100
-@@ -8,10 +8,10 @@
-
- APPLET_LOCATION = $(libexecdir)/timer-applet
-
--libexec_PROGRAMS = timer-applet
--timer_applet_SOURCES = timerapplet.c
--timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS) $(LIBNOTIFY_LIBS)
--timer_applet_CFLAGS = $(WARN_CFLAGS)
-+libexec_PROGRAMS = mate-timer-applet
-+mate_timer_applet_SOURCES = timerapplet.c
-+mate_timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS) $(LIBNOTIFY_LIBS)
-+mate_timer_applet_CFLAGS = $(WARN_CFLAGS)
-
- appletsdir = $(datadir)/mate-panel/applets
- applets_in_files = org.mate.applets.TimerApplet.mate-panel-applet.in
diff --git a/x11/mate-applets/files/trashapplet_src_Makefile.am b/x11/mate-applets/files/trashapplet_src_Makefile.am
deleted file mode 100644
index 7b139ddd448d..000000000000
--- a/x11/mate-applets/files/trashapplet_src_Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
---- trashapplet/src/Makefile.am.orig 2014-12-05 12:54:23.744922552 +0100
-+++ trashapplet/src/Makefile.am 2014-12-05 12:54:39.836133588 +0100
-@@ -4,16 +4,16 @@
- $(GIO_CFLAGS) \
- -DTRASH_MENU_UI_DIR=\""$(datadir)/mate/ui"\"
-
--libexec_PROGRAMS = trashapplet
-+libexec_PROGRAMS = mate-trashapplet
-
--trashapplet_SOURCES = \
-+mate_trashapplet_SOURCES = \
- trashapplet.c \
- trash-empty.h \
- trash-empty.c \
- xstuff.c \
- xstuff.h
-
--trashapplet_LDADD = \
-+mate_trashapplet_LDADD = \
- $(MATE_APPLETS4_LIBS) \
- $(MATEDESKTOP_LIBS) \
- $(GIO_LIBS) \
diff --git a/x11/mate-applets/pkg-plist b/x11/mate-applets/pkg-plist
index 33068e19e195..8145921a3b12 100644
--- a/x11/mate-applets/pkg-plist
+++ b/x11/mate-applets/pkg-plist
@@ -1,53 +1,51 @@
-%%CPUFREQ%%bin/mate-cpufreq-selector
bin/mate-invest-chart
-%%CPUFREQ%%etc/dbus-1/system.d/org.mate.CPUFreqSelector.conf
-%%BATTERY%%etc/sound/events/mate-battstat_applet.soundlist
+etc/sound/events/mate-battstat_applet.soundlist
%%PYTHON_SITELIBDIR%%/mate_invest/__init__.py
%%PYTHON_SITELIBDIR%%/mate_invest/__init__.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/__init__.pyo
+%%PYTHON_SITELIBDIR%%/mate_invest/__init__.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/mate_invest/about.py
%%PYTHON_SITELIBDIR%%/mate_invest/about.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/about.pyo
+%%PYTHON_SITELIBDIR%%/mate_invest/about.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/mate_invest/applet.py
%%PYTHON_SITELIBDIR%%/mate_invest/applet.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/applet.pyo
+%%PYTHON_SITELIBDIR%%/mate_invest/applet.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/mate_invest/chart.py
%%PYTHON_SITELIBDIR%%/mate_invest/chart.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/chart.pyo
+%%PYTHON_SITELIBDIR%%/mate_invest/chart.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/mate_invest/currencies.py
%%PYTHON_SITELIBDIR%%/mate_invest/currencies.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/currencies.pyo
+%%PYTHON_SITELIBDIR%%/mate_invest/currencies.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/mate_invest/defs.py
%%PYTHON_SITELIBDIR%%/mate_invest/defs.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/defs.pyo
+%%PYTHON_SITELIBDIR%%/mate_invest/defs.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/mate_invest/help.py
%%PYTHON_SITELIBDIR%%/mate_invest/help.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/help.pyo
+%%PYTHON_SITELIBDIR%%/mate_invest/help.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/mate_invest/networkmanager.py
%%PYTHON_SITELIBDIR%%/mate_invest/networkmanager.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/networkmanager.pyo
+%%PYTHON_SITELIBDIR%%/mate_invest/networkmanager.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/mate_invest/preferences.py
%%PYTHON_SITELIBDIR%%/mate_invest/preferences.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/preferences.pyo
+%%PYTHON_SITELIBDIR%%/mate_invest/preferences.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/mate_invest/quotes.py
%%PYTHON_SITELIBDIR%%/mate_invest/quotes.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/quotes.pyo
+%%PYTHON_SITELIBDIR%%/mate_invest/quotes.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/mate_invest/widgets.py
%%PYTHON_SITELIBDIR%%/mate_invest/widgets.pyc
-%%PYTHON_SITELIBDIR%%/mate_invest/widgets.pyo
-libexec/mate-accessx-status-applet
-%%BATTERY%%libexec/mate-battstat-applet-2
+%%PYTHON_SITELIBDIR%%/mate_invest/widgets.%%PYTHON_PYOEXTENSION%%
+libexec/accessx-status-applet
+libexec/battstat-applet
+libexec/command-applet
+libexec/invest-applet
libexec/mate-charpick-applet
-libexec/mate-command-applet
libexec/mate-drivemount-applet
libexec/mate-geyes-applet
-libexec/mate-invest-applet
-%%CPUFREQ%%libexec/mate-cpufreq-applet
libexec/mate-multiload-applet
-libexec/mate-stickynotes-applet
-libexec/mate-timer-applet
-libexec/mate-trashapplet
+libexec/mate-netspeed-applet
libexec/mateweather-applet
+libexec/stickynotes-applet
+libexec/timer-applet
+libexec/trashapplet
man/man1/mate-charpick-applet.1.gz
man/man1/mate-cpufreq-selector.1.gz
man/man1/mate-drivemount-applet.1.gz
@@ -55,10 +53,8 @@ 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/MateConf/gsettings/stickynotes-applet.convert
share/dbus-1/services/org.mate.panel.applet.AccessxStatusAppletFactory.service
-%%BATTERY%%share/dbus-1/services/org.mate.panel.applet.BattstatAppletFactory.service
-%%CPUFREQ%%share/dbus-1/services/org.mate.panel.applet.CPUFreqAppletFactory.service
+share/dbus-1/services/org.mate.panel.applet.BattstatAppletFactory.service
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
@@ -66,10 +62,10 @@ 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
share/dbus-1/services/org.mate.panel.applet.StickyNotesAppletFactory.service
share/dbus-1/services/org.mate.panel.applet.TimerAppletFactory.service
share/dbus-1/services/org.mate.panel.applet.TrashAppletFactory.service
-%%CPUFREQ%%share/dbus-1/system-services/org.mate.CPUFreqSelector.service
share/help/C/mate-accessx-status/figures/accessx-status-applet.png
share/help/C/mate-accessx-status/figures/accessx-status-disabled.png
share/help/C/mate-accessx-status/figures/accessx_bounce-keys.png
@@ -83,6 +79,13 @@ share/help/C/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/C/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/C/mate-accessx-status/index.docbook
share/help/C/mate-accessx-status/legal.xml
+share/help/C/mate-battstat/figures/battstat-applet-expanded.png
+share/help/C/mate-battstat/figures/battstat-applet.png
+share/help/C/mate-battstat/figures/battstat-credits-hal.png
+share/help/C/mate-battstat/figures/battstat-preferences.png
+share/help/C/mate-battstat/figures/context-menu.png
+share/help/C/mate-battstat/index.docbook
+share/help/C/mate-battstat/legal.xml
share/help/C/mate-char-palette/figures/charpalette_applet.png
share/help/C/mate-char-palette/figures/charpalette_chargroup.png
share/help/C/mate-char-palette/figures/charpick-preferences.png
@@ -107,6 +110,17 @@ share/help/C/mate-multiload/figures/system-monitor-applet_window.png
share/help/C/mate-multiload/figures/system_monitor.png
share/help/C/mate-multiload/index.docbook
share/help/C/mate-multiload/legal.xml
+share/help/C/mate-netspeed-applet/figures/details.png
+share/help/C/mate-netspeed-applet/figures/eth_sum_48.png
+share/help/C/mate-netspeed-applet/figures/ethernet.png
+share/help/C/mate-netspeed-applet/figures/loopback.png
+share/help/C/mate-netspeed-applet/figures/netspeed_applet.png
+share/help/C/mate-netspeed-applet/figures/plip.png
+share/help/C/mate-netspeed-applet/figures/ppp.png
+share/help/C/mate-netspeed-applet/figures/settings.png
+share/help/C/mate-netspeed-applet/figures/wavelan.png
+share/help/C/mate-netspeed-applet/index.docbook
+share/help/C/mate-netspeed-applet/legal.xml
share/help/C/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
share/help/C/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
share/help/C/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
@@ -165,6 +179,13 @@ share/help/bg/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/bg/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/bg/mate-accessx-status/index.docbook
share/help/bg/mate-accessx-status/legal.xml
+share/help/bg/mate-battstat/figures/battstat-applet-expanded.png
+share/help/bg/mate-battstat/figures/battstat-applet.png
+share/help/bg/mate-battstat/figures/battstat-credits-hal.png
+share/help/bg/mate-battstat/figures/battstat-preferences.png
+share/help/bg/mate-battstat/figures/context-menu.png
+share/help/bg/mate-battstat/index.docbook
+share/help/bg/mate-battstat/legal.xml
share/help/bg/mate-char-palette/figures/charpalette_applet.png
share/help/bg/mate-char-palette/figures/charpalette_chargroup.png
share/help/bg/mate-char-palette/figures/charpick-preferences.png
@@ -187,6 +208,13 @@ share/help/ca/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/ca/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/ca/mate-accessx-status/index.docbook
share/help/ca/mate-accessx-status/legal.xml
+share/help/ca/mate-battstat/figures/battstat-applet-expanded.png
+share/help/ca/mate-battstat/figures/battstat-applet.png
+share/help/ca/mate-battstat/figures/battstat-credits-hal.png
+share/help/ca/mate-battstat/figures/battstat-preferences.png
+share/help/ca/mate-battstat/figures/context-menu.png
+share/help/ca/mate-battstat/index.docbook
+share/help/ca/mate-battstat/legal.xml
share/help/ca/mate-char-palette/figures/charpalette_applet.png
share/help/ca/mate-char-palette/figures/charpalette_chargroup.png
share/help/ca/mate-char-palette/figures/charpick-preferences.png
@@ -250,6 +278,13 @@ share/help/cs/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/cs/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/cs/mate-accessx-status/index.docbook
share/help/cs/mate-accessx-status/legal.xml
+share/help/cs/mate-battstat/figures/battstat-applet-expanded.png
+share/help/cs/mate-battstat/figures/battstat-applet.png
+share/help/cs/mate-battstat/figures/battstat-credits-hal.png
+share/help/cs/mate-battstat/figures/battstat-preferences.png
+share/help/cs/mate-battstat/figures/context-menu.png
+share/help/cs/mate-battstat/index.docbook
+share/help/cs/mate-battstat/legal.xml
share/help/cs/mate-char-palette/figures/charpalette_applet.png
share/help/cs/mate-char-palette/figures/charpalette_chargroup.png
share/help/cs/mate-char-palette/figures/charpick-preferences.png
@@ -297,6 +332,13 @@ share/help/cs/mateweather/figures/stock_weather-storm.png
share/help/cs/mateweather/figures/stock_weather-sunny.png
share/help/cs/mateweather/index.docbook
share/help/cs/mateweather/legal.xml
+share/help/da/mate-battstat/figures/battstat-applet-expanded.png
+share/help/da/mate-battstat/figures/battstat-applet.png
+share/help/da/mate-battstat/figures/battstat-credits-hal.png
+share/help/da/mate-battstat/figures/battstat-preferences.png
+share/help/da/mate-battstat/figures/context-menu.png
+share/help/da/mate-battstat/index.docbook
+share/help/da/mate-battstat/legal.xml
share/help/da/mate-drivemount/figures/drivemount-applet_eject.png
share/help/da/mate-drivemount/figures/drivemount-applet_example.png
share/help/da/mate-drivemount/figures/drivemount-applet_mount.png
@@ -323,6 +365,13 @@ share/help/de/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/de/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/de/mate-accessx-status/index.docbook
share/help/de/mate-accessx-status/legal.xml
+share/help/de/mate-battstat/figures/battstat-applet-expanded.png
+share/help/de/mate-battstat/figures/battstat-applet.png
+share/help/de/mate-battstat/figures/battstat-credits-hal.png
+share/help/de/mate-battstat/figures/battstat-preferences.png
+share/help/de/mate-battstat/figures/context-menu.png
+share/help/de/mate-battstat/index.docbook
+share/help/de/mate-battstat/legal.xml
share/help/de/mate-char-palette/figures/charpalette_applet.png
share/help/de/mate-char-palette/figures/charpalette_chargroup.png
share/help/de/mate-char-palette/figures/charpick-preferences.png
@@ -347,6 +396,17 @@ share/help/de/mate-multiload/figures/system-monitor-applet_window.png
share/help/de/mate-multiload/figures/system_monitor.png
share/help/de/mate-multiload/index.docbook
share/help/de/mate-multiload/legal.xml
+share/help/de/mate-netspeed-applet/figures/details.png
+share/help/de/mate-netspeed-applet/figures/eth_sum_48.png
+share/help/de/mate-netspeed-applet/figures/ethernet.png
+share/help/de/mate-netspeed-applet/figures/loopback.png
+share/help/de/mate-netspeed-applet/figures/netspeed_applet.png
+share/help/de/mate-netspeed-applet/figures/plip.png
+share/help/de/mate-netspeed-applet/figures/ppp.png
+share/help/de/mate-netspeed-applet/figures/settings.png
+share/help/de/mate-netspeed-applet/figures/wavelan.png
+share/help/de/mate-netspeed-applet/index.docbook
+share/help/de/mate-netspeed-applet/legal.xml
share/help/de/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
share/help/de/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
share/help/de/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
@@ -386,6 +446,13 @@ share/help/el/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/el/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/el/mate-accessx-status/index.docbook
share/help/el/mate-accessx-status/legal.xml
+share/help/el/mate-battstat/figures/battstat-applet-expanded.png
+share/help/el/mate-battstat/figures/battstat-applet.png
+share/help/el/mate-battstat/figures/battstat-credits-hal.png
+share/help/el/mate-battstat/figures/battstat-preferences.png
+share/help/el/mate-battstat/figures/context-menu.png
+share/help/el/mate-battstat/index.docbook
+share/help/el/mate-battstat/legal.xml
share/help/el/mate-char-palette/figures/charpalette_applet.png
share/help/el/mate-char-palette/figures/charpalette_chargroup.png
share/help/el/mate-char-palette/figures/charpick-preferences.png
@@ -410,6 +477,17 @@ share/help/el/mate-multiload/figures/system-monitor-applet_window.png
share/help/el/mate-multiload/figures/system_monitor.png
share/help/el/mate-multiload/index.docbook
share/help/el/mate-multiload/legal.xml
+share/help/el/mate-netspeed-applet/figures/details.png
+share/help/el/mate-netspeed-applet/figures/eth_sum_48.png
+share/help/el/mate-netspeed-applet/figures/ethernet.png
+share/help/el/mate-netspeed-applet/figures/loopback.png
+share/help/el/mate-netspeed-applet/figures/netspeed_applet.png
+share/help/el/mate-netspeed-applet/figures/plip.png
+share/help/el/mate-netspeed-applet/figures/ppp.png
+share/help/el/mate-netspeed-applet/figures/settings.png
+share/help/el/mate-netspeed-applet/figures/wavelan.png
+share/help/el/mate-netspeed-applet/index.docbook
+share/help/el/mate-netspeed-applet/legal.xml
share/help/el/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
share/help/el/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
share/help/el/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
@@ -449,6 +527,13 @@ share/help/en_GB/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/en_GB/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/en_GB/mate-accessx-status/index.docbook
share/help/en_GB/mate-accessx-status/legal.xml
+share/help/en_GB/mate-battstat/figures/battstat-applet-expanded.png
+share/help/en_GB/mate-battstat/figures/battstat-applet.png
+share/help/en_GB/mate-battstat/figures/battstat-credits-hal.png
+share/help/en_GB/mate-battstat/figures/battstat-preferences.png
+share/help/en_GB/mate-battstat/figures/context-menu.png
+share/help/en_GB/mate-battstat/index.docbook
+share/help/en_GB/mate-battstat/legal.xml
share/help/en_GB/mate-char-palette/figures/charpalette_applet.png
share/help/en_GB/mate-char-palette/figures/charpalette_chargroup.png
share/help/en_GB/mate-char-palette/figures/charpick-preferences.png
@@ -512,6 +597,13 @@ share/help/es/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/es/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/es/mate-accessx-status/index.docbook
share/help/es/mate-accessx-status/legal.xml
+share/help/es/mate-battstat/figures/battstat-applet-expanded.png
+share/help/es/mate-battstat/figures/battstat-applet.png
+share/help/es/mate-battstat/figures/battstat-credits-hal.png
+share/help/es/mate-battstat/figures/battstat-preferences.png
+share/help/es/mate-battstat/figures/context-menu.png
+share/help/es/mate-battstat/index.docbook
+share/help/es/mate-battstat/legal.xml
share/help/es/mate-char-palette/figures/charpalette_applet.png
share/help/es/mate-char-palette/figures/charpalette_chargroup.png
share/help/es/mate-char-palette/figures/charpick-preferences.png
@@ -575,6 +667,13 @@ share/help/eu/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/eu/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/eu/mate-accessx-status/index.docbook
share/help/eu/mate-accessx-status/legal.xml
+share/help/eu/mate-battstat/figures/battstat-applet-expanded.png
+share/help/eu/mate-battstat/figures/battstat-applet.png
+share/help/eu/mate-battstat/figures/battstat-credits-hal.png
+share/help/eu/mate-battstat/figures/battstat-preferences.png
+share/help/eu/mate-battstat/figures/context-menu.png
+share/help/eu/mate-battstat/index.docbook
+share/help/eu/mate-battstat/legal.xml
share/help/eu/mate-char-palette/figures/charpalette_applet.png
share/help/eu/mate-char-palette/figures/charpalette_chargroup.png
share/help/eu/mate-char-palette/figures/charpick-preferences.png
@@ -635,6 +734,13 @@ share/help/fi/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/fi/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/fi/mate-accessx-status/index.docbook
share/help/fi/mate-accessx-status/legal.xml
+share/help/fi/mate-battstat/figures/battstat-applet-expanded.png
+share/help/fi/mate-battstat/figures/battstat-applet.png
+share/help/fi/mate-battstat/figures/battstat-credits-hal.png
+share/help/fi/mate-battstat/figures/battstat-preferences.png
+share/help/fi/mate-battstat/figures/context-menu.png
+share/help/fi/mate-battstat/index.docbook
+share/help/fi/mate-battstat/legal.xml
share/help/fi/mate-char-palette/figures/charpalette_applet.png
share/help/fi/mate-char-palette/figures/charpalette_chargroup.png
share/help/fi/mate-char-palette/figures/charpick-preferences.png
@@ -698,6 +804,13 @@ share/help/fr/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/fr/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/fr/mate-accessx-status/index.docbook
share/help/fr/mate-accessx-status/legal.xml
+share/help/fr/mate-battstat/figures/battstat-applet-expanded.png
+share/help/fr/mate-battstat/figures/battstat-applet.png
+share/help/fr/mate-battstat/figures/battstat-credits-hal.png
+share/help/fr/mate-battstat/figures/battstat-preferences.png
+share/help/fr/mate-battstat/figures/context-menu.png
+share/help/fr/mate-battstat/index.docbook
+share/help/fr/mate-battstat/legal.xml
share/help/fr/mate-char-palette/figures/charpalette_applet.png
share/help/fr/mate-char-palette/figures/charpalette_chargroup.png
share/help/fr/mate-char-palette/figures/charpick-preferences.png
@@ -719,6 +832,17 @@ share/help/fr/mate-multiload/figures/system-monitor-applet_window.png
share/help/fr/mate-multiload/figures/system_monitor.png
share/help/fr/mate-multiload/index.docbook
share/help/fr/mate-multiload/legal.xml
+share/help/fr/mate-netspeed-applet/figures/details.png
+share/help/fr/mate-netspeed-applet/figures/eth_sum_48.png
+share/help/fr/mate-netspeed-applet/figures/ethernet.png
+share/help/fr/mate-netspeed-applet/figures/loopback.png
+share/help/fr/mate-netspeed-applet/figures/netspeed_applet.png
+share/help/fr/mate-netspeed-applet/figures/plip.png
+share/help/fr/mate-netspeed-applet/figures/ppp.png
+share/help/fr/mate-netspeed-applet/figures/settings.png
+share/help/fr/mate-netspeed-applet/figures/wavelan.png
+share/help/fr/mate-netspeed-applet/index.docbook
+share/help/fr/mate-netspeed-applet/legal.xml
share/help/fr/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
share/help/fr/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
share/help/fr/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
@@ -806,6 +930,13 @@ share/help/ko/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/ko/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/ko/mate-accessx-status/index.docbook
share/help/ko/mate-accessx-status/legal.xml
+share/help/ko/mate-battstat/figures/battstat-applet-expanded.png
+share/help/ko/mate-battstat/figures/battstat-applet.png
+share/help/ko/mate-battstat/figures/battstat-credits-hal.png
+share/help/ko/mate-battstat/figures/battstat-preferences.png
+share/help/ko/mate-battstat/figures/context-menu.png
+share/help/ko/mate-battstat/index.docbook
+share/help/ko/mate-battstat/legal.xml
share/help/ko/mate-char-palette/figures/charpalette_applet.png
share/help/ko/mate-char-palette/figures/charpalette_chargroup.png
share/help/ko/mate-char-palette/figures/charpick-preferences.png
@@ -901,6 +1032,13 @@ share/help/oc/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/oc/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/oc/mate-accessx-status/index.docbook
share/help/oc/mate-accessx-status/legal.xml
+share/help/oc/mate-battstat/figures/battstat-applet-expanded.png
+share/help/oc/mate-battstat/figures/battstat-applet.png
+share/help/oc/mate-battstat/figures/battstat-credits-hal.png
+share/help/oc/mate-battstat/figures/battstat-preferences.png
+share/help/oc/mate-battstat/figures/context-menu.png
+share/help/oc/mate-battstat/index.docbook
+share/help/oc/mate-battstat/legal.xml
share/help/oc/mate-char-palette/figures/charpalette_applet.png
share/help/oc/mate-char-palette/figures/charpalette_chargroup.png
share/help/oc/mate-char-palette/figures/charpick-preferences.png
@@ -948,6 +1086,13 @@ share/help/oc/mateweather/figures/stock_weather-storm.png
share/help/oc/mateweather/figures/stock_weather-sunny.png
share/help/oc/mateweather/index.docbook
share/help/oc/mateweather/legal.xml
+share/help/pa/mate-battstat/figures/battstat-applet-expanded.png
+share/help/pa/mate-battstat/figures/battstat-applet.png
+share/help/pa/mate-battstat/figures/battstat-credits-hal.png
+share/help/pa/mate-battstat/figures/battstat-preferences.png
+share/help/pa/mate-battstat/figures/context-menu.png
+share/help/pa/mate-battstat/index.docbook
+share/help/pa/mate-battstat/legal.xml
share/help/pa/mate-drivemount/figures/drivemount-applet_eject.png
share/help/pa/mate-drivemount/figures/drivemount-applet_example.png
share/help/pa/mate-drivemount/figures/drivemount-applet_mount.png
@@ -986,6 +1131,13 @@ share/help/pa/mateweather/figures/stock_weather-storm.png
share/help/pa/mateweather/figures/stock_weather-sunny.png
share/help/pa/mateweather/index.docbook
share/help/pa/mateweather/legal.xml
+share/help/pt_BR/mate-battstat/figures/battstat-applet-expanded.png
+share/help/pt_BR/mate-battstat/figures/battstat-applet.png
+share/help/pt_BR/mate-battstat/figures/battstat-credits-hal.png
+share/help/pt_BR/mate-battstat/figures/battstat-preferences.png
+share/help/pt_BR/mate-battstat/figures/context-menu.png
+share/help/pt_BR/mate-battstat/index.docbook
+share/help/pt_BR/mate-battstat/legal.xml
share/help/pt_BR/mate-char-palette/figures/charpalette_applet.png
share/help/pt_BR/mate-char-palette/figures/charpalette_chargroup.png
share/help/pt_BR/mate-char-palette/figures/charpick-preferences.png
@@ -997,6 +1149,17 @@ share/help/pt_BR/mate-multiload/figures/system-monitor-applet_window.png
share/help/pt_BR/mate-multiload/figures/system_monitor.png
share/help/pt_BR/mate-multiload/index.docbook
share/help/pt_BR/mate-multiload/legal.xml
+share/help/pt_BR/mate-netspeed-applet/figures/details.png
+share/help/pt_BR/mate-netspeed-applet/figures/eth_sum_48.png
+share/help/pt_BR/mate-netspeed-applet/figures/ethernet.png
+share/help/pt_BR/mate-netspeed-applet/figures/loopback.png
+share/help/pt_BR/mate-netspeed-applet/figures/netspeed_applet.png
+share/help/pt_BR/mate-netspeed-applet/figures/plip.png
+share/help/pt_BR/mate-netspeed-applet/figures/ppp.png
+share/help/pt_BR/mate-netspeed-applet/figures/settings.png
+share/help/pt_BR/mate-netspeed-applet/figures/wavelan.png
+share/help/pt_BR/mate-netspeed-applet/index.docbook
+share/help/pt_BR/mate-netspeed-applet/legal.xml
share/help/pt_BR/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
share/help/pt_BR/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
share/help/pt_BR/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
@@ -1086,6 +1249,13 @@ share/help/sv/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/sv/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/sv/mate-accessx-status/index.docbook
share/help/sv/mate-accessx-status/legal.xml
+share/help/sv/mate-battstat/figures/battstat-applet-expanded.png
+share/help/sv/mate-battstat/figures/battstat-applet.png
+share/help/sv/mate-battstat/figures/battstat-credits-hal.png
+share/help/sv/mate-battstat/figures/battstat-preferences.png
+share/help/sv/mate-battstat/figures/context-menu.png
+share/help/sv/mate-battstat/index.docbook
+share/help/sv/mate-battstat/legal.xml
share/help/sv/mate-char-palette/figures/charpalette_applet.png
share/help/sv/mate-char-palette/figures/charpalette_chargroup.png
share/help/sv/mate-char-palette/figures/charpick-preferences.png
@@ -1110,6 +1280,17 @@ share/help/sv/mate-multiload/figures/system-monitor-applet_window.png
share/help/sv/mate-multiload/figures/system_monitor.png
share/help/sv/mate-multiload/index.docbook
share/help/sv/mate-multiload/legal.xml
+share/help/sv/mate-netspeed-applet/figures/details.png
+share/help/sv/mate-netspeed-applet/figures/eth_sum_48.png
+share/help/sv/mate-netspeed-applet/figures/ethernet.png
+share/help/sv/mate-netspeed-applet/figures/loopback.png
+share/help/sv/mate-netspeed-applet/figures/netspeed_applet.png
+share/help/sv/mate-netspeed-applet/figures/plip.png
+share/help/sv/mate-netspeed-applet/figures/ppp.png
+share/help/sv/mate-netspeed-applet/figures/settings.png
+share/help/sv/mate-netspeed-applet/figures/wavelan.png
+share/help/sv/mate-netspeed-applet/index.docbook
+share/help/sv/mate-netspeed-applet/legal.xml
share/help/sv/mate-stickynotes-applet/figures/stickynote-right-menu-lock.png
share/help/sv/mate-stickynotes-applet/figures/stickynote-right-menu-new.png
share/help/sv/mate-stickynotes-applet/figures/stickynotes-note-prefs.png
@@ -1149,6 +1330,13 @@ share/help/uk/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/uk/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/uk/mate-accessx-status/index.docbook
share/help/uk/mate-accessx-status/legal.xml
+share/help/uk/mate-battstat/figures/battstat-applet-expanded.png
+share/help/uk/mate-battstat/figures/battstat-applet.png
+share/help/uk/mate-battstat/figures/battstat-credits-hal.png
+share/help/uk/mate-battstat/figures/battstat-preferences.png
+share/help/uk/mate-battstat/figures/context-menu.png
+share/help/uk/mate-battstat/index.docbook
+share/help/uk/mate-battstat/legal.xml
share/help/uk/mate-char-palette/figures/charpalette_applet.png
share/help/uk/mate-char-palette/figures/charpalette_chargroup.png
share/help/uk/mate-char-palette/figures/charpick-preferences.png
@@ -1209,6 +1397,13 @@ share/help/zh_CN/mate-accessx-status/figures/accessx_sticky-shift-key.png
share/help/zh_CN/mate-accessx-status/figures/accessx_sticky-windows-key.png
share/help/zh_CN/mate-accessx-status/index.docbook
share/help/zh_CN/mate-accessx-status/legal.xml
+share/help/zh_CN/mate-battstat/figures/battstat-applet-expanded.png
+share/help/zh_CN/mate-battstat/figures/battstat-applet.png
+share/help/zh_CN/mate-battstat/figures/battstat-credits-hal.png
+share/help/zh_CN/mate-battstat/figures/battstat-preferences.png
+share/help/zh_CN/mate-battstat/figures/context-menu.png
+share/help/zh_CN/mate-battstat/index.docbook
+share/help/zh_CN/mate-battstat/legal.xml
share/help/zh_CN/mate-char-palette/figures/charpalette_applet.png
share/help/zh_CN/mate-char-palette/figures/charpalette_chargroup.png
share/help/zh_CN/mate-char-palette/figures/charpick-preferences.png
@@ -1285,25 +1480,33 @@ share/help/zh_TW/mate-stickynotes-applet/legal.xml
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
-%%CPUFREQ%%share/icons/hicolor/16x16/apps/mate-cpu-frequency-applet.png
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
-%%CPUFREQ%%share/icons/hicolor/22x22/apps/mate-cpu-frequency-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
-%%CPUFREQ%%share/icons/hicolor/24x24/apps/mate-cpu-frequency-applet.png
share/icons/hicolor/24x24/apps/mate-eyes-applet.png
+share/icons/hicolor/24x24/apps/mate-netspeed-applet.png
share/icons/hicolor/24x24/apps/mate-sticky-notes-applet.png
-%%CPUFREQ%%share/icons/hicolor/32x32/apps/mate-cpu-frequency-applet.png
+share/icons/hicolor/24x24/status/mate-netspeed-wireless-100.png
+share/icons/hicolor/24x24/status/mate-netspeed-wireless-25.png
+share/icons/hicolor/24x24/status/mate-netspeed-wireless-50.png
+share/icons/hicolor/24x24/status/mate-netspeed-wireless-75.png
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
-%%CPUFREQ%%share/icons/hicolor/scalable/apps/mate-cpu-frequency-applet.svg
+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
share/locale/am/LC_MESSAGES/mate-applets.mo
@@ -1312,7 +1515,6 @@ share/locale/as/LC_MESSAGES/mate-applets.mo
share/locale/ast/LC_MESSAGES/mate-applets.mo
share/locale/az/LC_MESSAGES/mate-applets.mo
share/locale/be/LC_MESSAGES/mate-applets.mo
-share/locale/be@latin/LC_MESSAGES/mate-applets.mo
share/locale/bg/LC_MESSAGES/mate-applets.mo
share/locale/bn/LC_MESSAGES/mate-applets.mo
share/locale/bn_IN/LC_MESSAGES/mate-applets.mo
@@ -1328,7 +1530,6 @@ share/locale/da/LC_MESSAGES/mate-applets.mo
share/locale/de/LC_MESSAGES/mate-applets.mo
share/locale/dz/LC_MESSAGES/mate-applets.mo
share/locale/el/LC_MESSAGES/mate-applets.mo
-share/locale/en@shaw/LC_MESSAGES/mate-applets.mo
share/locale/en_AU/LC_MESSAGES/mate-applets.mo
share/locale/en_CA/LC_MESSAGES/mate-applets.mo
share/locale/en_GB/LC_MESSAGES/mate-applets.mo
@@ -1341,8 +1542,6 @@ share/locale/es_CR/LC_MESSAGES/mate-applets.mo
share/locale/es_DO/LC_MESSAGES/mate-applets.mo
share/locale/es_EC/LC_MESSAGES/mate-applets.mo
share/locale/es_ES/LC_MESSAGES/mate-applets.mo
-share/locale/es_GT/LC_MESSAGES/mate-applets.mo
-share/locale/es_HN/LC_MESSAGES/mate-applets.mo
share/locale/es_MX/LC_MESSAGES/mate-applets.mo
share/locale/es_NI/LC_MESSAGES/mate-applets.mo
share/locale/es_PA/LC_MESSAGES/mate-applets.mo
@@ -1356,6 +1555,8 @@ share/locale/eu/LC_MESSAGES/mate-applets.mo
share/locale/fa/LC_MESSAGES/mate-applets.mo
share/locale/fi/LC_MESSAGES/mate-applets.mo
share/locale/fr/LC_MESSAGES/mate-applets.mo
+share/locale/fr_CA/LC_MESSAGES/mate-applets.mo
+share/locale/frp/LC_MESSAGES/mate-applets.mo
share/locale/ga/LC_MESSAGES/mate-applets.mo
share/locale/gl/LC_MESSAGES/mate-applets.mo
share/locale/gu/LC_MESSAGES/mate-applets.mo
@@ -1368,11 +1569,13 @@ share/locale/id/LC_MESSAGES/mate-applets.mo
share/locale/is/LC_MESSAGES/mate-applets.mo
share/locale/it/LC_MESSAGES/mate-applets.mo
share/locale/ja/LC_MESSAGES/mate-applets.mo
+share/locale/jv/LC_MESSAGES/mate-applets.mo
share/locale/ka/LC_MESSAGES/mate-applets.mo
share/locale/kk/LC_MESSAGES/mate-applets.mo
share/locale/kn/LC_MESSAGES/mate-applets.mo
share/locale/ko/LC_MESSAGES/mate-applets.mo
share/locale/ku/LC_MESSAGES/mate-applets.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-applets.mo
share/locale/ky/LC_MESSAGES/mate-applets.mo
share/locale/lt/LC_MESSAGES/mate-applets.mo
share/locale/lv/LC_MESSAGES/mate-applets.mo
@@ -1411,25 +1614,15 @@ share/locale/tr/LC_MESSAGES/mate-applets.mo
share/locale/ug/LC_MESSAGES/mate-applets.mo
share/locale/uk/LC_MESSAGES/mate-applets.mo
share/locale/ur/LC_MESSAGES/mate-applets.mo
+share/locale/uz/LC_MESSAGES/mate-applets.mo
share/locale/vi/LC_MESSAGES/mate-applets.mo
share/locale/wa/LC_MESSAGES/mate-applets.mo
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
-share/mate/ui/accessx-status-applet-menu.xml
-%%BATTERY%%share/mate/ui/battstat-applet-menu.xml
-share/mate/ui/charpick-applet-menu.xml
-%%CPUFREQ%%share/mate/ui/cpufreq-applet-menu.xml
-share/mate/ui/drivemount-applet-menu.xml
-share/mate/ui/geyes-applet-menu.xml
-share/mate/ui/mateweather-applet-menu.xml
-share/mate/ui/multiload-applet-menu.xml
-share/mate/ui/stickynotes-applet-menu.xml
-share/mate/ui/trashapplet-menu.xml
%%DATADIR%%/Invest_Applet.xml
-%%BATTERY%%%%DATADIR%%/builder/battstat_applet.ui
-%%CPUFREQ%%%%DATADIR%%/builder/cpufreq-preferences.ui
+%%DATADIR%%/builder/battstat_applet.ui
%%DATADIR%%/builder/financialchart.ui
%%DATADIR%%/builder/prefs-dialog.ui
%%DATADIR%%/builder/stickynotes.ui
@@ -1452,6 +1645,11 @@ share/mate/ui/trashapplet-menu.xml
%%DATADIR%%/geyes/Tango/config
%%DATADIR%%/geyes/Tango/tango-eye.png
%%DATADIR%%/geyes/Tango/tango-pupil.png
+%%DATADIR%%/icons/hicolor/48x48/apps/stickynotes-stock-close.png
+%%DATADIR%%/icons/hicolor/48x48/apps/stickynotes-stock-locked.png
+%%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
@@ -1460,8 +1658,7 @@ share/mate/ui/trashapplet-menu.xml
%%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
-%%CPUFREQ%%share/mate-panel/applets/org.mate.applets.CPUFreqApplet.mate-panel-applet
+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
@@ -1469,9 +1666,20 @@ 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
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/mate/ui/accessx-status-applet-menu.xml
+share/mate/ui/battstat-applet-menu.xml
+share/mate/ui/charpick-applet-menu.xml
+share/mate/ui/drivemount-applet-menu.xml
+share/mate/ui/geyes-applet-menu.xml
+share/mate/ui/mateweather-applet-menu.xml
+share/mate/ui/multiload-applet-menu.xml
+share/mate/ui/netspeed-menu.xml
+share/mate/ui/stickynotes-applet-menu.xml
+share/mate/ui/trashapplet-menu.xml
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
@@ -1508,14 +1716,3 @@ 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
-%%CPUFREQ%%share/pixmaps/mate-cpufreq-applet/cpufreq-75.png
-%%CPUFREQ%%share/pixmaps/mate-cpufreq-applet/cpufreq-na.png
-share/pixmaps/mate-stickynotes/close.png
-share/pixmaps/mate-stickynotes/locked.png
-share/pixmaps/mate-stickynotes/resize_se.png
-share/pixmaps/mate-stickynotes/resize_sw.png
-share/pixmaps/mate-stickynotes/unlocked.png
-%%CPUFREQ%%share/polkit-1/actions/org.mate.cpufreqselector.policy
diff --git a/x11/mate-base/Makefile b/x11/mate-base/Makefile
index 9b6dff6f957c..eaeaf7068a38 100644
--- a/x11/mate-base/Makefile
+++ b/x11/mate-base/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-base
-PORTVERSION= 1.12.0
+PORTVERSION= 1.18.0
CATEGORIES= x11 mate
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/mate-desktop/Makefile b/x11/mate-desktop/Makefile
index 6b94a4251f70..a1a6787b7de9 100644
--- a/x11/mate-desktop/Makefile
+++ b/x11/mate-desktop/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-desktop
-PORTVERSION= 1.12.1
+PORTVERSION= 1.18.0
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,24 +10,23 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= Additional UI API for MATE
-BUILD_DEPENDS= itstool:textproc/itstool
+LICENSE= GPLv2 GFDL LGPL21
+LICENSE_COMB= multi
+LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
+LICENSE_FILE_GFDL= ${WRKSRC}/COPYING-DOCS
+LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB
+
LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification
PORTSCOUT= limitw:1,even
-USES= bison gettext gmake libtool pathfix pkgconfig \
- python shebangfix tar:xz
+USES= gettext gmake libtool localbase pathfix \
+ pkgconfig python shebangfix tar:xz
USE_XORG= x11 xrandr
-USE_GNOME= dconf gdkpixbuf2 gtk20 intlhack introspection:build
-SHEBANG_FILES= tools/mpaste
+USE_GNOME= cairo dconf gdkpixbuf2 gnomeprefix gtk30 \
+ intltool introspection:build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gtk=2.0 \
- --disable-gtk-doc \
- --disable-user-guide \
- --with-html-dir=${PREFIX}/share/doc
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.accessibility-keyboard.gschema.xml \
@@ -49,10 +48,4 @@ GLIB_SCHEMAS= org.mate.accessibility-keyboard.gschema.xml \
org.mate.typing-break.gschema.xml \
org.mate.debug.gschema.xml
-OPTIONS_SUB= yes
-OPTIONS_DEFINE= PASTE
-OPTIONS_DEFAULT= PASTE
-PASTE_CONFIGURE_ENABLE= mpaste
-PASTE_DESC= Build the mate paste tool
-
.include <bsd.port.mk>
diff --git a/x11/mate-desktop/distinfo b/x11/mate-desktop/distinfo
index 8ac041f95fdc..c0b156451d2d 100644
--- a/x11/mate-desktop/distinfo
+++ b/x11/mate-desktop/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-desktop-1.12.1.tar.xz) = d9b96ac455340916a11b221d45a940c347e4428e5096035496d9f703eacf5a03
-SIZE (mate/mate-desktop-1.12.1.tar.xz) = 773332
+TIMESTAMP = 1491603387
+SHA256 (mate/mate-desktop-1.18.0.tar.xz) = 6f2dd9fc60bacd0ff27b8328c7addceb9e73a75c7dce7db4132659d588173b8a
+SIZE (mate/mate-desktop-1.18.0.tar.xz) = 827332
diff --git a/x11/mate-desktop/pkg-plist b/x11/mate-desktop/pkg-plist
index 5c907bbcdeae..70f9c29fc93c 100644
--- a/x11/mate-desktop/pkg-plist
+++ b/x11/mate-desktop/pkg-plist
@@ -1,6 +1,5 @@
bin/mate-about
bin/mate-color-select
-%%PASTE%%bin/mpaste
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
@@ -24,8 +23,6 @@ lib/libmate-desktop-2.so.17.1.4
libdata/pkgconfig/mate-desktop-2.0.pc
man/man1/mate-about.1.gz
man/man1/mate-color-select.1.gz
-man/man1/mpaste.1.gz
-share/MateConf/gsettings/mate-desktop.convert
share/applications/mate-about.desktop
share/applications/mate-color-select.desktop
%%PORTDOCS%%%%DOCSDIR%%/MateBG.html
@@ -35,7 +32,6 @@ share/applications/mate-color-select.desktop
%%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
@@ -63,6 +59,7 @@ 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/icons/hicolor/scalable/apps/mate.svg
share/libmate-desktop/pnp.ids
share/locale/af/LC_MESSAGES/mate-desktop.mo
share/locale/am/LC_MESSAGES/mate-desktop.mo
@@ -72,7 +69,6 @@ share/locale/as/LC_MESSAGES/mate-desktop.mo
share/locale/ast/LC_MESSAGES/mate-desktop.mo
share/locale/az/LC_MESSAGES/mate-desktop.mo
share/locale/be/LC_MESSAGES/mate-desktop.mo
-share/locale/be@latin/LC_MESSAGES/mate-desktop.mo
share/locale/bg/LC_MESSAGES/mate-desktop.mo
share/locale/bn/LC_MESSAGES/mate-desktop.mo
share/locale/bn_IN/LC_MESSAGES/mate-desktop.mo
@@ -83,52 +79,31 @@ share/locale/ca@valencia/LC_MESSAGES/mate-desktop.mo
share/locale/cmn/LC_MESSAGES/mate-desktop.mo
share/locale/crh/LC_MESSAGES/mate-desktop.mo
share/locale/cs/LC_MESSAGES/mate-desktop.mo
-share/locale/csb/LC_MESSAGES/mate-desktop.mo
-share/locale/cv/LC_MESSAGES/mate-desktop.mo
share/locale/cy/LC_MESSAGES/mate-desktop.mo
share/locale/da/LC_MESSAGES/mate-desktop.mo
share/locale/de/LC_MESSAGES/mate-desktop.mo
+share/locale/de_CH/LC_MESSAGES/mate-desktop.mo
share/locale/dz/LC_MESSAGES/mate-desktop.mo
share/locale/el/LC_MESSAGES/mate-desktop.mo
-share/locale/en@shaw/LC_MESSAGES/mate-desktop.mo
share/locale/en_AU/LC_MESSAGES/mate-desktop.mo
share/locale/en_CA/LC_MESSAGES/mate-desktop.mo
share/locale/en_GB/LC_MESSAGES/mate-desktop.mo
-share/locale/en_US/LC_MESSAGES/mate-desktop.mo
share/locale/eo/LC_MESSAGES/mate-desktop.mo
share/locale/es/LC_MESSAGES/mate-desktop.mo
share/locale/es_AR/LC_MESSAGES/mate-desktop.mo
share/locale/es_CL/LC_MESSAGES/mate-desktop.mo
share/locale/es_CO/LC_MESSAGES/mate-desktop.mo
-share/locale/es_CR/LC_MESSAGES/mate-desktop.mo
-share/locale/es_DO/LC_MESSAGES/mate-desktop.mo
-share/locale/es_EC/LC_MESSAGES/mate-desktop.mo
-share/locale/es_ES/LC_MESSAGES/mate-desktop.mo
share/locale/es_MX/LC_MESSAGES/mate-desktop.mo
-share/locale/es_NI/LC_MESSAGES/mate-desktop.mo
-share/locale/es_PA/LC_MESSAGES/mate-desktop.mo
-share/locale/es_PE/LC_MESSAGES/mate-desktop.mo
-share/locale/es_PR/LC_MESSAGES/mate-desktop.mo
-share/locale/es_SV/LC_MESSAGES/mate-desktop.mo
-share/locale/es_US/LC_MESSAGES/mate-desktop.mo
-share/locale/es_UY/LC_MESSAGES/mate-desktop.mo
-share/locale/es_VE/LC_MESSAGES/mate-desktop.mo
share/locale/et/LC_MESSAGES/mate-desktop.mo
share/locale/eu/LC_MESSAGES/mate-desktop.mo
share/locale/fa/LC_MESSAGES/mate-desktop.mo
share/locale/fi/LC_MESSAGES/mate-desktop.mo
-share/locale/fil/LC_MESSAGES/mate-desktop.mo
-share/locale/fo/LC_MESSAGES/mate-desktop.mo
share/locale/fr/LC_MESSAGES/mate-desktop.mo
-share/locale/fr_CA/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/gd/LC_MESSAGES/mate-desktop.mo
share/locale/gl/LC_MESSAGES/mate-desktop.mo
share/locale/gu/LC_MESSAGES/mate-desktop.mo
-share/locale/ha/LC_MESSAGES/mate-desktop.mo
share/locale/he/LC_MESSAGES/mate-desktop.mo
share/locale/hi/LC_MESSAGES/mate-desktop.mo
share/locale/hr/LC_MESSAGES/mate-desktop.mo
@@ -143,15 +118,11 @@ share/locale/ja/LC_MESSAGES/mate-desktop.mo
share/locale/jv/LC_MESSAGES/mate-desktop.mo
share/locale/ka/LC_MESSAGES/mate-desktop.mo
share/locale/kk/LC_MESSAGES/mate-desktop.mo
-share/locale/km/LC_MESSAGES/mate-desktop.mo
share/locale/kn/LC_MESSAGES/mate-desktop.mo
share/locale/ko/LC_MESSAGES/mate-desktop.mo
-share/locale/ks/LC_MESSAGES/mate-desktop.mo
share/locale/ku/LC_MESSAGES/mate-desktop.mo
share/locale/ku_IQ/LC_MESSAGES/mate-desktop.mo
share/locale/ky/LC_MESSAGES/mate-desktop.mo
-share/locale/la/LC_MESSAGES/mate-desktop.mo
-share/locale/lb/LC_MESSAGES/mate-desktop.mo
share/locale/li/LC_MESSAGES/mate-desktop.mo
share/locale/lo/LC_MESSAGES/mate-desktop.mo
share/locale/lt/LC_MESSAGES/mate-desktop.mo
@@ -164,17 +135,13 @@ share/locale/ml/LC_MESSAGES/mate-desktop.mo
share/locale/mn/LC_MESSAGES/mate-desktop.mo
share/locale/mr/LC_MESSAGES/mate-desktop.mo
share/locale/ms/LC_MESSAGES/mate-desktop.mo
-share/locale/my/LC_MESSAGES/mate-desktop.mo
-share/locale/nah/LC_MESSAGES/mate-desktop.mo
share/locale/nb/LC_MESSAGES/mate-desktop.mo
share/locale/nds/LC_MESSAGES/mate-desktop.mo
share/locale/ne/LC_MESSAGES/mate-desktop.mo
share/locale/nl/LC_MESSAGES/mate-desktop.mo
share/locale/nn/LC_MESSAGES/mate-desktop.mo
-share/locale/nqo/LC_MESSAGES/mate-desktop.mo
share/locale/nso/LC_MESSAGES/mate-desktop.mo
share/locale/oc/LC_MESSAGES/mate-desktop.mo
-share/locale/om/LC_MESSAGES/mate-desktop.mo
share/locale/or/LC_MESSAGES/mate-desktop.mo
share/locale/pa/LC_MESSAGES/mate-desktop.mo
share/locale/pl/LC_MESSAGES/mate-desktop.mo
@@ -183,36 +150,26 @@ share/locale/pt/LC_MESSAGES/mate-desktop.mo
share/locale/pt_BR/LC_MESSAGES/mate-desktop.mo
share/locale/ro/LC_MESSAGES/mate-desktop.mo
share/locale/ru/LC_MESSAGES/mate-desktop.mo
-share/locale/rw/LC_MESSAGES/mate-desktop.mo
share/locale/sc/LC_MESSAGES/mate-desktop.mo
share/locale/si/LC_MESSAGES/mate-desktop.mo
share/locale/sk/LC_MESSAGES/mate-desktop.mo
share/locale/sl/LC_MESSAGES/mate-desktop.mo
-share/locale/so/LC_MESSAGES/mate-desktop.mo
share/locale/sq/LC_MESSAGES/mate-desktop.mo
share/locale/sr/LC_MESSAGES/mate-desktop.mo
share/locale/sr@latin/LC_MESSAGES/mate-desktop.mo
share/locale/sv/LC_MESSAGES/mate-desktop.mo
-share/locale/sw/LC_MESSAGES/mate-desktop.mo
share/locale/ta/LC_MESSAGES/mate-desktop.mo
share/locale/te/LC_MESSAGES/mate-desktop.mo
-share/locale/tg/LC_MESSAGES/mate-desktop.mo
share/locale/th/LC_MESSAGES/mate-desktop.mo
share/locale/tk/LC_MESSAGES/mate-desktop.mo
-share/locale/tl/LC_MESSAGES/mate-desktop.mo
share/locale/tr/LC_MESSAGES/mate-desktop.mo
-share/locale/ts/LC_MESSAGES/mate-desktop.mo
-share/locale/tt/LC_MESSAGES/mate-desktop.mo
share/locale/ug/LC_MESSAGES/mate-desktop.mo
share/locale/uk/LC_MESSAGES/mate-desktop.mo
share/locale/ur/LC_MESSAGES/mate-desktop.mo
-share/locale/ur_PK/LC_MESSAGES/mate-desktop.mo
share/locale/uz/LC_MESSAGES/mate-desktop.mo
-share/locale/uz@cyrillic/LC_MESSAGES/mate-desktop.mo
share/locale/vi/LC_MESSAGES/mate-desktop.mo
share/locale/wa/LC_MESSAGES/mate-desktop.mo
share/locale/xh/LC_MESSAGES/mate-desktop.mo
-share/locale/yi/LC_MESSAGES/mate-desktop.mo
share/locale/yo/LC_MESSAGES/mate-desktop.mo
share/locale/zh_CN/LC_MESSAGES/mate-desktop.mo
share/locale/zh_HK/LC_MESSAGES/mate-desktop.mo
diff --git a/x11/mate-menus/Makefile b/x11/mate-menus/Makefile
index 7cf23f3e332e..e8fd62f2ff7f 100644
--- a/x11/mate-menus/Makefile
+++ b/x11/mate-menus/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-menus
-PORTVERSION= 1.12.0
+PORTVERSION= 1.18.0
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,15 +10,18 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= Implementation of the FreeDesktop Desktop Menu Spec
+LICENSE= GPLv2 LGPL20
+LICENSE_COMB= dual
+LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
+LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB
+
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool pathfix pkgconfig \
- python tar:xz
-USE_GNOME= glib20 intlhack introspection:build
+USES= gettext gmake libtool localbase pathfix pkgconfig \
+ python:2.7 tar:xz
+USE_GNOME= glib20 intltool introspection:buid
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
post-patch:
diff --git a/x11/mate-menus/distinfo b/x11/mate-menus/distinfo
index 232fb2c7a06f..e07c889d829d 100644
--- a/x11/mate-menus/distinfo
+++ b/x11/mate-menus/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-menus-1.12.0.tar.xz) = b0b735be91cca632d7c63f254a9442201608b24f1d5588a1ff05b50da41b95c4
-SIZE (mate/mate-menus-1.12.0.tar.xz) = 342488
+TIMESTAMP = 1491694633
+SHA256 (mate/mate-menus-1.18.0.tar.xz) = f07cdb952934b732678ed37a9cd740c8860e9e2d0ddb4d73a8d06cdccfc87e16
+SIZE (mate/mate-menus-1.18.0.tar.xz) = 358032
diff --git a/x11/mate-menus/pkg-plist b/x11/mate-menus/pkg-plist
index bcd55cd77c18..3ca0e810d73f 100644
--- a/x11/mate-menus/pkg-plist
+++ b/x11/mate-menus/pkg-plist
@@ -1,4 +1,5 @@
etc/xdg/menus/mate-applications.menu
+etc/xdg/menus/mate-preferences-categories.menu
etc/xdg/menus/mate-settings.menu
include/mate-menus/matemenu-tree.h
lib/girepository-1.0/MateMenu-2.0.typelib
@@ -17,11 +18,11 @@ share/locale/ar/LC_MESSAGES/mate-menus.mo
share/locale/as/LC_MESSAGES/mate-menus.mo
share/locale/ast/LC_MESSAGES/mate-menus.mo
share/locale/be/LC_MESSAGES/mate-menus.mo
-share/locale/be@latin/LC_MESSAGES/mate-menus.mo
share/locale/bg/LC_MESSAGES/mate-menus.mo
share/locale/bn/LC_MESSAGES/mate-menus.mo
share/locale/bn_IN/LC_MESSAGES/mate-menus.mo
share/locale/br/LC_MESSAGES/mate-menus.mo
+share/locale/bs/LC_MESSAGES/mate-menus.mo
share/locale/ca/LC_MESSAGES/mate-menus.mo
share/locale/ca@valencia/LC_MESSAGES/mate-menus.mo
share/locale/cmn/LC_MESSAGES/mate-menus.mo
@@ -30,28 +31,28 @@ share/locale/cs/LC_MESSAGES/mate-menus.mo
share/locale/cy/LC_MESSAGES/mate-menus.mo
share/locale/da/LC_MESSAGES/mate-menus.mo
share/locale/de/LC_MESSAGES/mate-menus.mo
-share/locale/dv/LC_MESSAGES/mate-menus.mo
share/locale/dz/LC_MESSAGES/mate-menus.mo
share/locale/el/LC_MESSAGES/mate-menus.mo
-share/locale/en@shaw/LC_MESSAGES/mate-menus.mo
share/locale/en_AU/LC_MESSAGES/mate-menus.mo
share/locale/en_CA/LC_MESSAGES/mate-menus.mo
share/locale/en_GB/LC_MESSAGES/mate-menus.mo
share/locale/eo/LC_MESSAGES/mate-menus.mo
share/locale/es/LC_MESSAGES/mate-menus.mo
+share/locale/es_CL/LC_MESSAGES/mate-menus.mo
+share/locale/es_CO/LC_MESSAGES/mate-menus.mo
share/locale/es_MX/LC_MESSAGES/mate-menus.mo
share/locale/et/LC_MESSAGES/mate-menus.mo
share/locale/eu/LC_MESSAGES/mate-menus.mo
share/locale/fa/LC_MESSAGES/mate-menus.mo
share/locale/fi/LC_MESSAGES/mate-menus.mo
share/locale/fr/LC_MESSAGES/mate-menus.mo
+share/locale/fr_CA/LC_MESSAGES/mate-menus.mo
+share/locale/frp/LC_MESSAGES/mate-menus.mo
share/locale/fur/LC_MESSAGES/mate-menus.mo
share/locale/fy/LC_MESSAGES/mate-menus.mo
share/locale/ga/LC_MESSAGES/mate-menus.mo
share/locale/gl/LC_MESSAGES/mate-menus.mo
-share/locale/gn/LC_MESSAGES/mate-menus.mo
share/locale/gu/LC_MESSAGES/mate-menus.mo
-share/locale/gv/LC_MESSAGES/mate-menus.mo
share/locale/ha/LC_MESSAGES/mate-menus.mo
share/locale/he/LC_MESSAGES/mate-menus.mo
share/locale/hi/LC_MESSAGES/mate-menus.mo
@@ -60,10 +61,10 @@ share/locale/hu/LC_MESSAGES/mate-menus.mo
share/locale/hy/LC_MESSAGES/mate-menus.mo
share/locale/id/LC_MESSAGES/mate-menus.mo
share/locale/ig/LC_MESSAGES/mate-menus.mo
-share/locale/io/LC_MESSAGES/mate-menus.mo
share/locale/is/LC_MESSAGES/mate-menus.mo
share/locale/it/LC_MESSAGES/mate-menus.mo
share/locale/ja/LC_MESSAGES/mate-menus.mo
+share/locale/jv/LC_MESSAGES/mate-menus.mo
share/locale/ka/LC_MESSAGES/mate-menus.mo
share/locale/kk/LC_MESSAGES/mate-menus.mo
share/locale/kn/LC_MESSAGES/mate-menus.mo
@@ -95,6 +96,7 @@ share/locale/pt_BR/LC_MESSAGES/mate-menus.mo
share/locale/ro/LC_MESSAGES/mate-menus.mo
share/locale/ru/LC_MESSAGES/mate-menus.mo
share/locale/rw/LC_MESSAGES/mate-menus.mo
+share/locale/sc/LC_MESSAGES/mate-menus.mo
share/locale/si/LC_MESSAGES/mate-menus.mo
share/locale/sk/LC_MESSAGES/mate-menus.mo
share/locale/sl/LC_MESSAGES/mate-menus.mo
@@ -110,7 +112,6 @@ share/locale/ug/LC_MESSAGES/mate-menus.mo
share/locale/uk/LC_MESSAGES/mate-menus.mo
share/locale/ur/LC_MESSAGES/mate-menus.mo
share/locale/uz/LC_MESSAGES/mate-menus.mo
-share/locale/uz@cyrillic/LC_MESSAGES/mate-menus.mo
share/locale/vi/LC_MESSAGES/mate-menus.mo
share/locale/xh/LC_MESSAGES/mate-menus.mo
share/locale/yo/LC_MESSAGES/mate-menus.mo
diff --git a/x11/mate-panel/Makefile b/x11/mate-panel/Makefile
index 31066535ece1..46c28a312815 100644
--- a/x11/mate-panel/Makefile
+++ b/x11/mate-panel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-panel
-PORTVERSION= 1.12.2
+PORTVERSION= 1.18.3
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,27 +10,28 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= Panel component for the MATE Desktop
+LICENSE= GPLv2 GFDL LGPL21
+LICENSE_COMB= multi
+LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
+LICENSE_FILE_GFDL= ${WRKSRC}/COPYING-DOCS
+LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB
+
BUILD_DEPENDS= itstool:textproc/itstool
-LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
- libcanberra-gtk.so:audio/libcanberra
+LIB_DEPENDS= libdbus-1.so:devel/dbus \
+ libdbus-glib-1.so:devel/dbus-glib \
+ libstartup-notification-1.so:x11/startup-notification
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool pathfix pkgconfig python tar:xz
-USE_MATE= desktop libmateweather menus
+USES= gettext gmake libtool localbase pathfix pkgconfig \
+ tar:xz
+USE_MATE= desktop libmateweather menus
USE_XORG= ice sm x11 xau xrandr
-USE_GNOME= cairo dconf gdkpixbuf2 glib20 gtk20 \
- intlhack introspection:build librsvg2 pango libwnck
+USE_GNOME= cairo dconf gnomeprefix gtk30 intltool \
+ introspection:build librsvg2 libwnck3
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-network-manager \
- --disable-gtk-doc \
- --with-gtk=2.0 \
- --with-html-dir=${PREFIX}/share/doc \
- --libexecdir=${PREFIX}/lib/mate-panel
INSTALLS_ICONS= yes
-LDFLAGS+= -L${LOCALBASE}/lib
-CPPFLAGS+= -I${LOCALBASE}/include
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.panel.applet.clock.gschema.xml \
@@ -43,7 +44,4 @@ GLIB_SCHEMAS= org.mate.panel.applet.clock.gschema.xml \
org.mate.panel.object.gschema.xml \
org.mate.panel.toplevel.gschema.xml
-post-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/mate-panel/modules
-
.include <bsd.port.mk>
diff --git a/x11/mate-panel/distinfo b/x11/mate-panel/distinfo
index a0f1885bab5b..c5733de564f7 100644
--- a/x11/mate-panel/distinfo
+++ b/x11/mate-panel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-panel-1.12.2.tar.xz) = b757bb5ea3da1b36fcf599d4f123534e936f0e46859b3307816085f486667fa1
-SIZE (mate/mate-panel-1.12.2.tar.xz) = 1930792
+TIMESTAMP = 1497518551
+SHA256 (mate/mate-panel-1.18.3.tar.xz) = 4d04ad53ed7826c39cd10628b9dfda60b0e4e06edf38ff3c9a4329f7c0f2e987
+SIZE (mate/mate-panel-1.18.3.tar.xz) = 1976968
diff --git a/x11/mate-panel/pkg-plist b/x11/mate-panel/pkg-plist
index 3aaed4e11b64..86cf85f71971 100644
--- a/x11/mate-panel/pkg-plist
+++ b/x11/mate-panel/pkg-plist
@@ -9,41 +9,40 @@ lib/libmate-panel-applet-4.a
lib/libmate-panel-applet-4.so
lib/libmate-panel-applet-4.so.1
lib/libmate-panel-applet-4.so.1.0.1
-lib/mate-panel/clock-applet
-lib/mate-panel/fish-applet
-lib/mate-panel/notification-area-applet
-lib/mate-panel/wnck-applet
libdata/pkgconfig/libmatepanelapplet-4.0.pc
+libexec/clock-applet
+libexec/fish-applet
+libexec/notification-area-applet
+libexec/wnck-applet
man/man1/mate-desktop-item-edit.1.gz
man/man1/mate-panel-test-applets.1.gz
man/man1/mate-panel.1.gz
-share/MateConf/gsettings/mate-panel.convert
share/applications/mate-panel.desktop
share/dbus-1/services/org.mate.panel.applet.ClockAppletFactory.service
share/dbus-1/services/org.mate.panel.applet.FishAppletFactory.service
share/dbus-1/services/org.mate.panel.applet.NotificationAreaAppletFactory.service
share/dbus-1/services/org.mate.panel.applet.WnckletFactory.service
-share/doc/mate-panel-applet/applet-popups.html
-share/doc/mate-panel-applet/applet-porting.html
-share/doc/mate-panel-applet/applet-writing.html
-share/doc/mate-panel-applet/home.png
-share/doc/mate-panel-applet/index.html
-share/doc/mate-panel-applet/index.sgml
-share/doc/mate-panel-applet/left-insensitive.png
-share/doc/mate-panel-applet/left.png
-share/doc/mate-panel-applet/mate-panel-applet-Panel-Applet-MateConf-Utilities.html
-share/doc/mate-panel-applet/mate-panel-applet-mate-panel-applet.html
-share/doc/mate-panel-applet/mate-panel-applet.devhelp2
-share/doc/mate-panel-applet/mate-panel-applet.html
-share/doc/mate-panel-applet/multi-applets.html
-share/doc/mate-panel-applet/panel-signals.html
-share/doc/mate-panel-applet/right-insensitive.png
-share/doc/mate-panel-applet/right.png
-share/doc/mate-panel-applet/server-files.html
-share/doc/mate-panel-applet/session-saving.html
-share/doc/mate-panel-applet/style.css
-share/doc/mate-panel-applet/up-insensitive.png
-share/doc/mate-panel-applet/up.png
+%%PORTDOCS%%%%DOCSDIR%%-applet/applet-popups.html
+%%PORTDOCS%%%%DOCSDIR%%-applet/applet-porting.html
+%%PORTDOCS%%%%DOCSDIR%%-applet/applet-writing.html
+%%PORTDOCS%%%%DOCSDIR%%-applet/home.png
+%%PORTDOCS%%%%DOCSDIR%%-applet/index.html
+%%PORTDOCS%%%%DOCSDIR%%-applet/index.sgml
+%%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
+%%PORTDOCS%%%%DOCSDIR%%-applet/multi-applets.html
+%%PORTDOCS%%%%DOCSDIR%%-applet/panel-signals.html
+%%PORTDOCS%%%%DOCSDIR%%-applet/right-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%-applet/right.png
+%%PORTDOCS%%%%DOCSDIR%%-applet/server-files.html
+%%PORTDOCS%%%%DOCSDIR%%-applet/session-saving.html
+%%PORTDOCS%%%%DOCSDIR%%-applet/style.css
+%%PORTDOCS%%%%DOCSDIR%%-applet/up-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%-applet/up.png
share/gir-1.0/MatePanelApplet-4.0.gir
share/help/C/mate-clock/figures/clock_applet.png
share/help/C/mate-clock/index.docbook
@@ -249,7 +248,6 @@ share/locale/as/LC_MESSAGES/mate-panel.mo
share/locale/ast/LC_MESSAGES/mate-panel.mo
share/locale/az/LC_MESSAGES/mate-panel.mo
share/locale/be/LC_MESSAGES/mate-panel.mo
-share/locale/be@latin/LC_MESSAGES/mate-panel.mo
share/locale/bg/LC_MESSAGES/mate-panel.mo
share/locale/bn/LC_MESSAGES/mate-panel.mo
share/locale/bn_IN/LC_MESSAGES/mate-panel.mo
@@ -265,23 +263,26 @@ share/locale/da/LC_MESSAGES/mate-panel.mo
share/locale/de/LC_MESSAGES/mate-panel.mo
share/locale/dz/LC_MESSAGES/mate-panel.mo
share/locale/el/LC_MESSAGES/mate-panel.mo
-share/locale/en@shaw/LC_MESSAGES/mate-panel.mo
share/locale/en_AU/LC_MESSAGES/mate-panel.mo
share/locale/en_CA/LC_MESSAGES/mate-panel.mo
share/locale/en_GB/LC_MESSAGES/mate-panel.mo
share/locale/eo/LC_MESSAGES/mate-panel.mo
share/locale/es/LC_MESSAGES/mate-panel.mo
+share/locale/es_CO/LC_MESSAGES/mate-panel.mo
+share/locale/es_MX/LC_MESSAGES/mate-panel.mo
+share/locale/es_PR/LC_MESSAGES/mate-panel.mo
share/locale/et/LC_MESSAGES/mate-panel.mo
share/locale/eu/LC_MESSAGES/mate-panel.mo
share/locale/fa/LC_MESSAGES/mate-panel.mo
share/locale/fi/LC_MESSAGES/mate-panel.mo
share/locale/fr/LC_MESSAGES/mate-panel.mo
+share/locale/fr_CA/LC_MESSAGES/mate-panel.mo
+share/locale/frp/LC_MESSAGES/mate-panel.mo
share/locale/fur/LC_MESSAGES/mate-panel.mo
share/locale/fy/LC_MESSAGES/mate-panel.mo
share/locale/ga/LC_MESSAGES/mate-panel.mo
share/locale/gl/LC_MESSAGES/mate-panel.mo
share/locale/gu/LC_MESSAGES/mate-panel.mo
-share/locale/gv/LC_MESSAGES/mate-panel.mo
share/locale/ha/LC_MESSAGES/mate-panel.mo
share/locale/he/LC_MESSAGES/mate-panel.mo
share/locale/hi/LC_MESSAGES/mate-panel.mo
@@ -293,13 +294,14 @@ share/locale/ig/LC_MESSAGES/mate-panel.mo
share/locale/is/LC_MESSAGES/mate-panel.mo
share/locale/it/LC_MESSAGES/mate-panel.mo
share/locale/ja/LC_MESSAGES/mate-panel.mo
+share/locale/jv/LC_MESSAGES/mate-panel.mo
share/locale/ka/LC_MESSAGES/mate-panel.mo
share/locale/kk/LC_MESSAGES/mate-panel.mo
share/locale/kn/LC_MESSAGES/mate-panel.mo
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
@@ -321,6 +323,7 @@ share/locale/oc/LC_MESSAGES/mate-panel.mo
share/locale/or/LC_MESSAGES/mate-panel.mo
share/locale/pa/LC_MESSAGES/mate-panel.mo
share/locale/pl/LC_MESSAGES/mate-panel.mo
+share/locale/pms/LC_MESSAGES/mate-panel.mo
share/locale/ps/LC_MESSAGES/mate-panel.mo
share/locale/pt/LC_MESSAGES/mate-panel.mo
share/locale/pt_BR/LC_MESSAGES/mate-panel.mo
@@ -332,7 +335,6 @@ share/locale/sk/LC_MESSAGES/mate-panel.mo
share/locale/sl/LC_MESSAGES/mate-panel.mo
share/locale/sq/LC_MESSAGES/mate-panel.mo
share/locale/sr/LC_MESSAGES/mate-panel.mo
-share/locale/sr@ije/LC_MESSAGES/mate-panel.mo
share/locale/sr@latin/LC_MESSAGES/mate-panel.mo
share/locale/sv/LC_MESSAGES/mate-panel.mo
share/locale/ta/LC_MESSAGES/mate-panel.mo
@@ -343,7 +345,6 @@ share/locale/ug/LC_MESSAGES/mate-panel.mo
share/locale/uk/LC_MESSAGES/mate-panel.mo
share/locale/ur/LC_MESSAGES/mate-panel.mo
share/locale/uz/LC_MESSAGES/mate-panel.mo
-share/locale/uz@cyrillic/LC_MESSAGES/mate-panel.mo
share/locale/vi/LC_MESSAGES/mate-panel.mo
share/locale/wa/LC_MESSAGES/mate-panel.mo
share/locale/xh/LC_MESSAGES/mate-panel.mo
@@ -353,47 +354,43 @@ share/locale/zh_CN/LC_MESSAGES/mate-panel.mo
share/locale/zh_HK/LC_MESSAGES/mate-panel.mo
share/locale/zh_TW/LC_MESSAGES/mate-panel.mo
share/locale/zu/LC_MESSAGES/mate-panel.mo
-share/mate-panel/applets/org.mate.panel.ClockApplet.mate-panel-applet
-share/mate-panel/applets/org.mate.panel.FishApplet.mate-panel-applet
-share/mate-panel/applets/org.mate.panel.NotificationAreaApplet.mate-panel-applet
-share/mate-panel/applets/org.mate.panel.Wncklet.mate-panel-applet
-share/mate-panel/layouts/default.layout
-share/mate-panel/layouts/fedora.layout
-share/mate-panel/layouts/linuxmint.layout
-share/mate-panel/layouts/mageia.layout
-share/mate-panel/layouts/opensuse.layout
-share/mate-panel/layouts/ubuntu.layout
-share/mate-panel/pixmaps/clock-calendar-icon.png
-share/mate-panel/pixmaps/clock-face-large.svg
-share/mate-panel/pixmaps/clock-face-small-day.svg
-share/mate-panel/pixmaps/clock-face-small-evening.svg
-share/mate-panel/pixmaps/clock-face-small-morning.svg
-share/mate-panel/pixmaps/clock-face-small-night.svg
-share/mate-panel/pixmaps/clock-face-small.svg
-share/mate-panel/pixmaps/clock-map-location-current.png
-share/mate-panel/pixmaps/clock-map-location-hilight.png
-share/mate-panel/pixmaps/clock-map-location-marker.png
-share/mate-panel/pixmaps/clock-map.png
-share/mate-panel/pixmaps/fishanim.png
-share/mate-panel/pixmaps/footguy.png
-share/mate-panel/pixmaps/mate-gegl2-2.png
-share/mate-panel/pixmaps/mate-gegl2.png
-share/mate-panel/pixmaps/monkey.png
-share/mate-panel/pixmaps/oldwanda.png
-share/mate-panel/pixmaps/wanda.png
-share/mate-panel/ui/clock-menu.xml
-share/mate-panel/ui/clock.ui
-share/mate-panel/ui/fish-menu.xml
-share/mate-panel/ui/fish.ui
-share/mate-panel/ui/notification-area-menu.xml
-share/mate-panel/ui/panel-properties-dialog.ui
-share/mate-panel/ui/panel-run-dialog.ui
-share/mate-panel/ui/panel-test-applets.ui
-share/mate-panel/ui/showdesktop-menu.xml
-share/mate-panel/ui/window-list-menu.xml
-share/mate-panel/ui/window-list.ui
-share/mate-panel/ui/window-menu-menu.xml
-share/mate-panel/ui/workspace-switcher-menu.xml
-share/mate-panel/ui/workspace-switcher.ui
-@dir lib/mate-panel/modules
-@postexec %D/bin/gio-querymodules %D/lib/mate-panel/modules
+%%DATADIR%%/applets/org.mate.panel.ClockApplet.mate-panel-applet
+%%DATADIR%%/applets/org.mate.panel.FishApplet.mate-panel-applet
+%%DATADIR%%/applets/org.mate.panel.NotificationAreaApplet.mate-panel-applet
+%%DATADIR%%/applets/org.mate.panel.Wncklet.mate-panel-applet
+%%DATADIR%%/layouts/default.layout
+%%DATADIR%%/layouts/fedora.layout
+%%DATADIR%%/layouts/linuxmint.layout
+%%DATADIR%%/layouts/mageia.layout
+%%DATADIR%%/layouts/opensuse.layout
+%%DATADIR%%/layouts/ubuntu.layout
+%%DATADIR%%/pixmaps/clock-calendar-icon.png
+%%DATADIR%%/pixmaps/clock-face-large.svg
+%%DATADIR%%/pixmaps/clock-face-small-day.svg
+%%DATADIR%%/pixmaps/clock-face-small-evening.svg
+%%DATADIR%%/pixmaps/clock-face-small-morning.svg
+%%DATADIR%%/pixmaps/clock-face-small-night.svg
+%%DATADIR%%/pixmaps/clock-face-small.svg
+%%DATADIR%%/pixmaps/clock-map-location-current.png
+%%DATADIR%%/pixmaps/clock-map-location-hilight.png
+%%DATADIR%%/pixmaps/clock-map-location-marker.png
+%%DATADIR%%/pixmaps/clock-map.png
+%%DATADIR%%/pixmaps/fishanim.png
+%%DATADIR%%/pixmaps/footguy.png
+%%DATADIR%%/pixmaps/monkey.png
+%%DATADIR%%/pixmaps/oldwanda.png
+%%DATADIR%%/pixmaps/wanda.png
+%%DATADIR%%/ui/clock-menu.xml
+%%DATADIR%%/ui/clock.ui
+%%DATADIR%%/ui/fish-menu.xml
+%%DATADIR%%/ui/fish.ui
+%%DATADIR%%/ui/notification-area-menu.xml
+%%DATADIR%%/ui/panel-properties-dialog.ui
+%%DATADIR%%/ui/panel-run-dialog.ui
+%%DATADIR%%/ui/panel-test-applets.ui
+%%DATADIR%%/ui/showdesktop-menu.xml
+%%DATADIR%%/ui/window-list-menu.xml
+%%DATADIR%%/ui/window-list.ui
+%%DATADIR%%/ui/window-menu-menu.xml
+%%DATADIR%%/ui/workspace-switcher-menu.xml
+%%DATADIR%%/ui/workspace-switcher.ui
diff --git a/x11/mate-screensaver/Makefile b/x11/mate-screensaver/Makefile
index c42c98202388..e8fb6c6d1f82 100644
--- a/x11/mate-screensaver/Makefile
+++ b/x11/mate-screensaver/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mate-screensaver
-PORTVERSION= 1.12.0
-PORTREVISION= 2
+PORTVERSION= 1.18.1
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -11,25 +10,28 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= MATE screen saver and locker
+LICENSE= GPLv2 LGPL20
+LICENSE_COMB= dual
+LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
+LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB
+
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
- libnotify.so:devel/libnotify
+ libnotify.so:devel/libnotify \
+ libstartup-notification-1.so:x11/startup-notification
PORTSCOUT= limitw:1,even
-USES= gettext gmake pathfix pkgconfig tar:xz
+USES= gettext gmake localbase pathfix pkgconfig tar:xz
USE_GL= gl
USE_MATE= desktop libmatekbd menus session:run
-USE_XORG= ice sm x11 xext xtst xxf86misc xxf86vm xscrnsaver
-USE_GNOME= glib20 gtk20 intlhack
+USE_XORG= ice sm x11 xext xscrnsaver xxf86misc xxf86vm
+USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xscreensaverdir=${XSCREENSAVER_DIR} \
--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks \
- --with-gtk=2.0 \
--with-console-kit=yes \
--with-systemd=no
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.mate.screensaver.gschema.xml
@@ -49,9 +51,9 @@ XSCREENSAVER_RUN_DEPENDS= xscreensaver-gnome-hacks>=0:x11/xscreensaver-gnome-hac
OPTIONS_SUB= yes
PAM_RUN_DEPENDS= pam_helper:security/pam_helper
-PAM_CONFIGURE_ON=--enable-authentication-scheme=helper \
- --with-passwd-helper=${LOCALBASE}/bin/pam_helper
-PAM_CONFIGURE_OFF=--disable-pam
+PAM_CONFIGURE_ON= --enable-authentication-scheme=helper \
+ --with-passwd-helper=${LOCALBASE}/bin/pam_helper
+PAM_CONFIGURE_OFF= --disable-pam
.include <bsd.port.options.mk>
diff --git a/x11/mate-screensaver/distinfo b/x11/mate-screensaver/distinfo
index 2718106c65b0..e9808e2f9f7f 100644
--- a/x11/mate-screensaver/distinfo
+++ b/x11/mate-screensaver/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-screensaver-1.12.0.tar.xz) = 198cb5159bd6321c90e0069115909be52eb4382de25cb9c4ba33fa29e3fdc693
-SIZE (mate/mate-screensaver-1.12.0.tar.xz) = 4868924
+TIMESTAMP = 1497537052
+SHA256 (mate/mate-screensaver-1.18.1.tar.xz) = 32bd34ac058e4a9206da5eeea07902f8f9321e76961f766aded605a71c08d135
+SIZE (mate/mate-screensaver-1.18.1.tar.xz) = 4923504
diff --git a/x11/mate-screensaver/pkg-plist b/x11/mate-screensaver/pkg-plist
index d71b279617ef..aee7941bdbb9 100644
--- a/x11/mate-screensaver/pkg-plist
+++ b/x11/mate-screensaver/pkg-plist
@@ -1,11 +1,11 @@
bin/mate-screensaver
bin/mate-screensaver-command
bin/mate-screensaver-preferences
-%%PAM%%etc/pam.d/mate-screensaver
+etc/pam.d/mate-screensaver
etc/xdg/autostart/mate-screensaver.desktop
etc/xdg/menus/mate-screensavers.menu
libdata/pkgconfig/mate-screensaver.pc
-@(,,6555) libexec/mate-screensaver-dialog
+libexec/mate-screensaver-dialog
libexec/mate-screensaver-gl-helper
libexec/mate-screensaver/floaters
libexec/mate-screensaver/popsquares
@@ -13,7 +13,6 @@ libexec/mate-screensaver/slideshow
man/man1/mate-screensaver-command.1.gz
man/man1/mate-screensaver-preferences.1.gz
man/man1/mate-screensaver.1.gz
-share/MateConf/gsettings/org.mate.screensaver.gschema.migrate
share/applications/mate-screensaver-preferences.desktop
share/applications/screensavers/cosmos-slideshow.desktop
share/applications/screensavers/footlogo-floaters.desktop
@@ -37,32 +36,34 @@ share/locale/ar/LC_MESSAGES/mate-screensaver.mo
share/locale/as/LC_MESSAGES/mate-screensaver.mo
share/locale/ast/LC_MESSAGES/mate-screensaver.mo
share/locale/be/LC_MESSAGES/mate-screensaver.mo
-share/locale/be@latin/LC_MESSAGES/mate-screensaver.mo
share/locale/bg/LC_MESSAGES/mate-screensaver.mo
share/locale/bn/LC_MESSAGES/mate-screensaver.mo
share/locale/bn_IN/LC_MESSAGES/mate-screensaver.mo
share/locale/br/LC_MESSAGES/mate-screensaver.mo
+share/locale/bs/LC_MESSAGES/mate-screensaver.mo
share/locale/ca/LC_MESSAGES/mate-screensaver.mo
share/locale/ca@valencia/LC_MESSAGES/mate-screensaver.mo
-share/locale/crh/LC_MESSAGES/mate-screensaver.mo
share/locale/cmn/LC_MESSAGES/mate-screensaver.mo
+share/locale/crh/LC_MESSAGES/mate-screensaver.mo
share/locale/cs/LC_MESSAGES/mate-screensaver.mo
share/locale/cy/LC_MESSAGES/mate-screensaver.mo
share/locale/da/LC_MESSAGES/mate-screensaver.mo
share/locale/de/LC_MESSAGES/mate-screensaver.mo
share/locale/dz/LC_MESSAGES/mate-screensaver.mo
share/locale/el/LC_MESSAGES/mate-screensaver.mo
-share/locale/en@shaw/LC_MESSAGES/mate-screensaver.mo
share/locale/en_AU/LC_MESSAGES/mate-screensaver.mo
share/locale/en_CA/LC_MESSAGES/mate-screensaver.mo
share/locale/en_GB/LC_MESSAGES/mate-screensaver.mo
share/locale/es/LC_MESSAGES/mate-screensaver.mo
share/locale/es_AR/LC_MESSAGES/mate-screensaver.mo
+share/locale/es_CO/LC_MESSAGES/mate-screensaver.mo
share/locale/et/LC_MESSAGES/mate-screensaver.mo
share/locale/eu/LC_MESSAGES/mate-screensaver.mo
share/locale/fa/LC_MESSAGES/mate-screensaver.mo
share/locale/fi/LC_MESSAGES/mate-screensaver.mo
share/locale/fr/LC_MESSAGES/mate-screensaver.mo
+share/locale/fr_CA/LC_MESSAGES/mate-screensaver.mo
+share/locale/frp/LC_MESSAGES/mate-screensaver.mo
share/locale/ga/LC_MESSAGES/mate-screensaver.mo
share/locale/gl/LC_MESSAGES/mate-screensaver.mo
share/locale/gu/LC_MESSAGES/mate-screensaver.mo
@@ -70,6 +71,7 @@ share/locale/he/LC_MESSAGES/mate-screensaver.mo
share/locale/hi/LC_MESSAGES/mate-screensaver.mo
share/locale/hr/LC_MESSAGES/mate-screensaver.mo
share/locale/hu/LC_MESSAGES/mate-screensaver.mo
+share/locale/hy/LC_MESSAGES/mate-screensaver.mo
share/locale/id/LC_MESSAGES/mate-screensaver.mo
share/locale/is/LC_MESSAGES/mate-screensaver.mo
share/locale/it/LC_MESSAGES/mate-screensaver.mo
@@ -79,6 +81,7 @@ share/locale/kk/LC_MESSAGES/mate-screensaver.mo
share/locale/kn/LC_MESSAGES/mate-screensaver.mo
share/locale/ko/LC_MESSAGES/mate-screensaver.mo
share/locale/ku/LC_MESSAGES/mate-screensaver.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-screensaver.mo
share/locale/ky/LC_MESSAGES/mate-screensaver.mo
share/locale/lt/LC_MESSAGES/mate-screensaver.mo
share/locale/lv/LC_MESSAGES/mate-screensaver.mo
@@ -116,6 +119,7 @@ share/locale/th/LC_MESSAGES/mate-screensaver.mo
share/locale/tr/LC_MESSAGES/mate-screensaver.mo
share/locale/uk/LC_MESSAGES/mate-screensaver.mo
share/locale/ur/LC_MESSAGES/mate-screensaver.mo
+share/locale/uz/LC_MESSAGES/mate-screensaver.mo
share/locale/vi/LC_MESSAGES/mate-screensaver.mo
share/locale/zh_CN/LC_MESSAGES/mate-screensaver.mo
share/locale/zh_HK/LC_MESSAGES/mate-screensaver.mo
diff --git a/x11/mate-session-manager/Makefile b/x11/mate-session-manager/Makefile
index 321a10612cb5..b48bbe9009b1 100644
--- a/x11/mate-session-manager/Makefile
+++ b/x11/mate-session-manager/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-session-manager
-PORTVERSION= 1.12.1
+PORTVERSION= 1.18.0
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -11,24 +11,23 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Session component for the MATE desktop
LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
+ libdbus-1.so:devel/dbus \
libupower-glib.so:sysutils/upower
RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:sysutils/consolekit \
${LOCALBASE}/bin/xdpyinfo:x11/xdpyinfo
PORTSCOUT= limitw:1,even
-USES= execinfo gettext gmake libtool pathfix pkgconfig tar:xz
+USES= execinfo gettext gmake localbase libtool pathfix \
+ pkgconfig tar:xz
USE_MATE= desktop
-USE_XORG= ice sm xau xext xrandr xrender xtrans xtst
-USE_GNOME= gtk20 intlhack librsvg2 libxslt pango
+USE_XORG= ice sm x11 xau xext xrandr xrender xtrans xtst
+USE_GNOME= cairo gtk30 intlhack librsvg2 libxslt pango
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-docbook-docs \
- --with-gtk=2.0 \
--enable-upower \
--with-systemd=no
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.mate.session.gschema.xml
diff --git a/x11/mate-session-manager/distinfo b/x11/mate-session-manager/distinfo
index ab6e4b6110df..ff8fae7c8a7a 100644
--- a/x11/mate-session-manager/distinfo
+++ b/x11/mate-session-manager/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-session-manager-1.12.1.tar.xz) = 2bad592d7dc0e6807f347bba1580c7c9f5d880aeedee2293d4c8947ab439e7e2
-SIZE (mate/mate-session-manager-1.12.1.tar.xz) = 538524
+TIMESTAMP = 1491695526
+SHA256 (mate/mate-session-manager-1.18.0.tar.xz) = 1c50f7866d8c75c1a918754960c6629798d6cb0f8d06aa3e48516ea672c7d419
+SIZE (mate/mate-session-manager-1.18.0.tar.xz) = 578256
diff --git a/x11/mate-session-manager/files/patch-configure b/x11/mate-session-manager/files/patch-configure
deleted file mode 100644
index 03ccb0ce7efe..000000000000
--- a/x11/mate-session-manager/files/patch-configure
+++ /dev/null
@@ -1,92 +0,0 @@
---- configure.orig 2014-04-20 19:14:11.248250628 +0000
-+++ configure 2014-04-20 19:14:11.260251121 +0000
-@@ -13329,7 +13329,89 @@
- esac
-
-
-+# We can only support old upower
-
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UPOWER" >&5
-+$as_echo_n "checking for UPOWER... " >&6; }
-+
-+if test -n "$UPOWER_CFLAGS"; then
-+ pkg_cv_UPOWER_CFLAGS="$UPOWER_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib < 0.99.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "upower-glib < 0.99.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_UPOWER_CFLAGS=`$PKG_CONFIG --cflags "upower-glib < 0.99.0" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$UPOWER_LIBS"; then
-+ pkg_cv_UPOWER_LIBS="$UPOWER_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib < 0.99.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "upower-glib < 0.99.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_UPOWER_LIBS=`$PKG_CONFIG --libs "upower-glib < 0.99.0" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test $pkg_failed = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ UPOWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "upower-glib < 0.99.0" 2>&1`
-+ else
-+ UPOWER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "upower-glib < 0.99.0" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$UPOWER_PKG_ERRORS" >&5
-+
-+ have_old_upower=no
-+elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ have_old_upower=no
-+else
-+ UPOWER_CFLAGS=$pkg_cv_UPOWER_CFLAGS
-+ UPOWER_LIBS=$pkg_cv_UPOWER_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ have_old_upower=yes
-+fi
-+if test x$have_old_upower = xyes; then :
-+
-+
-+$as_echo "#define HAVE_OLD_UPOWER 1" >>confdefs.h
-+
-+
-+fi
-+ if test x$have_old_upower = xyes; then
-+ HAVE_OLD_UPOWER_TRUE=
-+ HAVE_OLD_UPOWER_FALSE='#'
-+else
-+ HAVE_OLD_UPOWER_TRUE='#'
-+ HAVE_OLD_UPOWER_FALSE=
-+fi
-
-
-
diff --git a/x11/mate-session-manager/files/patch-mate-session_gsm-autostart-app.c b/x11/mate-session-manager/files/patch-mate-session_gsm-autostart-app.c
deleted file mode 100644
index f7e5285d5206..000000000000
--- a/x11/mate-session-manager/files/patch-mate-session_gsm-autostart-app.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- mate-session/gsm-autostart-app.c.orig 2008-08-20 14:18:52.000000000 -0400
-+++ mate-session/gsm-autostart-app.c 2008-08-20 14:19:02.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <string.h>
- #include <sys/wait.h>
- #include <errno.h>
-+#include <signal.h>
-
- #include <glib.h>
- #include <gio/gio.h>
diff --git a/x11/mate-session-manager/files/patch-mate-session_gsm-logout-dialog.c b/x11/mate-session-manager/files/patch-mate-session_gsm-logout-dialog.c
deleted file mode 100644
index 83910fc665d4..000000000000
--- a/x11/mate-session-manager/files/patch-mate-session_gsm-logout-dialog.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- mate-session/gsm-logout-dialog.c.orig 2014-03-05 20:39:13.000000000 +0000
-+++ mate-session/gsm-logout-dialog.c 2014-04-20 18:19:12.537577789 +0000
-@@ -214,8 +214,10 @@
- #if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
- else
- #endif
--#ifdef HAVE_UPOWER
-+#ifdef HAVE_OLD_UPOWER
- ret = up_client_get_can_suspend (logout_dialog->priv->up_client);
-+#else
-+ ret = FALSE;
- #endif
- return ret;
- }
-@@ -232,8 +234,10 @@
- #if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
- else
- #endif
--#ifdef HAVE_UPOWER
-+#ifdef HAVE_OLD_UPOWER
- ret = up_client_get_can_hibernate (logout_dialog->priv->up_client);
-+#else
-+ ret = FALSE;
- #endif
- return ret;
- }
diff --git a/x11/mate-session-manager/files/patch-mate-session_gsm-manager.c b/x11/mate-session-manager/files/patch-mate-session_gsm-manager.c
deleted file mode 100644
index 63d84cc82236..000000000000
--- a/x11/mate-session-manager/files/patch-mate-session_gsm-manager.c
+++ /dev/null
@@ -1,64 +0,0 @@
---- mate-session/gsm-manager.c.orig 2014-03-05 20:39:13.000000000 +0000
-+++ mate-session/gsm-manager.c 2014-04-20 18:31:08.980429286 +0000
-@@ -1166,22 +1166,28 @@
- #if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
- else {
- #endif
--#ifdef HAVE_UPOWER
-+#ifdef HAVE_OLD_UPOWER
- can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
-+#else
-+ can_hibernate = FALSE;
-+#endif
- if (can_hibernate) {
-
- /* lock the screen before we suspend */
- manager_perhaps_lock (manager);
-
- error = NULL;
-+#ifdef HAVE_OLD_UPOWER
- ret = up_client_hibernate_sync (manager->priv->up_client, NULL, &error);
-+#else
-+ ret = FALSE;
-+#endif
- if (!ret) {
- g_warning ("Unexpected hibernate failure: %s",
- error->message);
- g_error_free (error);
- }
- }
--#endif
- #if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
- }
- #endif
-@@ -1211,22 +1217,28 @@
- #if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
- else {
- #endif
--#ifdef HAVE_UPOWER
-+#ifdef HAVE_OLD_UPOWER
- can_suspend = up_client_get_can_suspend (manager->priv->up_client);
-+#else
-+ can_suspend = FALSE;
-+#endif
- if (can_suspend) {
-
- /* lock the screen before we suspend */
- manager_perhaps_lock (manager);
-
- error = NULL;
-+#ifdef HAVE_OLD_UPOWER
- ret = up_client_suspend_sync (manager->priv->up_client, NULL, &error);
-+#else
-+ ret = FALSE;
-+#endif
- if (!ret) {
- g_warning ("Unexpected suspend failure: %s",
- error->message);
- g_error_free (error);
- }
- }
--#endif
- #if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
- }
- #endif
diff --git a/x11/mate-session-manager/pkg-plist b/x11/mate-session-manager/pkg-plist
index 591d7bec49b2..c853c8a69f08 100644
--- a/x11/mate-session-manager/pkg-plist
+++ b/x11/mate-session-manager/pkg-plist
@@ -8,7 +8,6 @@ man/man1/mate-session-properties.1.gz
man/man1/mate-session-save.1.gz
man/man1/mate-session.1.gz
man/man1/mate-wm.1.gz
-share/MateConf/gsettings/mate-session.convert
share/applications/mate-session-properties.desktop
share/icons/hicolor/16x16/apps/mate-session-properties.png
share/icons/hicolor/22x22/apps/mate-session-properties.png
@@ -23,7 +22,6 @@ share/locale/as/LC_MESSAGES/mate-session-manager.mo
share/locale/ast/LC_MESSAGES/mate-session-manager.mo
share/locale/az/LC_MESSAGES/mate-session-manager.mo
share/locale/be/LC_MESSAGES/mate-session-manager.mo
-share/locale/be@latin/LC_MESSAGES/mate-session-manager.mo
share/locale/bg/LC_MESSAGES/mate-session-manager.mo
share/locale/bn/LC_MESSAGES/mate-session-manager.mo
share/locale/bn_IN/LC_MESSAGES/mate-session-manager.mo
@@ -39,19 +37,21 @@ share/locale/da/LC_MESSAGES/mate-session-manager.mo
share/locale/de/LC_MESSAGES/mate-session-manager.mo
share/locale/dz/LC_MESSAGES/mate-session-manager.mo
share/locale/el/LC_MESSAGES/mate-session-manager.mo
-share/locale/en@shaw/LC_MESSAGES/mate-session-manager.mo
share/locale/en_AU/LC_MESSAGES/mate-session-manager.mo
share/locale/en_CA/LC_MESSAGES/mate-session-manager.mo
share/locale/en_GB/LC_MESSAGES/mate-session-manager.mo
-share/locale/en_US/LC_MESSAGES/mate-session-manager.mo
-share/locale/es_MX/LC_MESSAGES/mate-session-manager.mo
share/locale/eo/LC_MESSAGES/mate-session-manager.mo
share/locale/es/LC_MESSAGES/mate-session-manager.mo
+share/locale/es_AR/LC_MESSAGES/mate-session-manager.mo
+share/locale/es_CO/LC_MESSAGES/mate-session-manager.mo
+share/locale/es_MX/LC_MESSAGES/mate-session-manager.mo
share/locale/et/LC_MESSAGES/mate-session-manager.mo
share/locale/eu/LC_MESSAGES/mate-session-manager.mo
share/locale/fa/LC_MESSAGES/mate-session-manager.mo
share/locale/fi/LC_MESSAGES/mate-session-manager.mo
share/locale/fr/LC_MESSAGES/mate-session-manager.mo
+share/locale/fr_CA/LC_MESSAGES/mate-session-manager.mo
+share/locale/frp/LC_MESSAGES/mate-session-manager.mo
share/locale/fur/LC_MESSAGES/mate-session-manager.mo
share/locale/fy/LC_MESSAGES/mate-session-manager.mo
share/locale/ga/LC_MESSAGES/mate-session-manager.mo
@@ -68,17 +68,18 @@ share/locale/ig/LC_MESSAGES/mate-session-manager.mo
share/locale/is/LC_MESSAGES/mate-session-manager.mo
share/locale/it/LC_MESSAGES/mate-session-manager.mo
share/locale/ja/LC_MESSAGES/mate-session-manager.mo
+share/locale/jv/LC_MESSAGES/mate-session-manager.mo
share/locale/ka/LC_MESSAGES/mate-session-manager.mo
share/locale/kk/LC_MESSAGES/mate-session-manager.mo
share/locale/kn/LC_MESSAGES/mate-session-manager.mo
share/locale/ko/LC_MESSAGES/mate-session-manager.mo
share/locale/ku/LC_MESSAGES/mate-session-manager.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-session-manager.mo
share/locale/ky/LC_MESSAGES/mate-session-manager.mo
share/locale/lt/LC_MESSAGES/mate-session-manager.mo
share/locale/lv/LC_MESSAGES/mate-session-manager.mo
share/locale/mai/LC_MESSAGES/mate-session-manager.mo
share/locale/mg/LC_MESSAGES/mate-session-manager.mo
-share/locale/mi/LC_MESSAGES/mate-session-manager.mo
share/locale/mk/LC_MESSAGES/mate-session-manager.mo
share/locale/ml/LC_MESSAGES/mate-session-manager.mo
share/locale/mn/LC_MESSAGES/mate-session-manager.mo
@@ -94,6 +95,7 @@ share/locale/oc/LC_MESSAGES/mate-session-manager.mo
share/locale/or/LC_MESSAGES/mate-session-manager.mo
share/locale/pa/LC_MESSAGES/mate-session-manager.mo
share/locale/pl/LC_MESSAGES/mate-session-manager.mo
+share/locale/pms/LC_MESSAGES/mate-session-manager.mo
share/locale/ps/LC_MESSAGES/mate-session-manager.mo
share/locale/pt/LC_MESSAGES/mate-session-manager.mo
share/locale/pt_BR/LC_MESSAGES/mate-session-manager.mo
@@ -116,7 +118,6 @@ share/locale/ug/LC_MESSAGES/mate-session-manager.mo
share/locale/uk/LC_MESSAGES/mate-session-manager.mo
share/locale/ur/LC_MESSAGES/mate-session-manager.mo
share/locale/uz/LC_MESSAGES/mate-session-manager.mo
-share/locale/uz@cyrillic/LC_MESSAGES/mate-session-manager.mo
share/locale/vi/LC_MESSAGES/mate-session-manager.mo
share/locale/wa/LC_MESSAGES/mate-session-manager.mo
share/locale/xh/LC_MESSAGES/mate-session-manager.mo
@@ -125,6 +126,6 @@ share/locale/zh_CN/LC_MESSAGES/mate-session-manager.mo
share/locale/zh_HK/LC_MESSAGES/mate-session-manager.mo
share/locale/zh_TW/LC_MESSAGES/mate-session-manager.mo
share/locale/zu/LC_MESSAGES/mate-session-manager.mo
-share/mate-session-manager/gsm-inhibit-dialog.ui
-share/mate-session-manager/session-properties.ui
+%%DATADIR%%/gsm-inhibit-dialog.ui
+%%DATADIR%%/session-properties.ui
share/xsessions/mate.desktop
diff --git a/x11/mate-terminal/Makefile b/x11/mate-terminal/Makefile
index 9a1a481815dc..21aa5bea0c05 100644
--- a/x11/mate-terminal/Makefile
+++ b/x11/mate-terminal/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate-terminal
-PORTVERSION= 1.12.1
+PORTVERSION= 1.18.1
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -10,19 +10,21 @@ DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
COMMENT= Terminal component for the MATE Desktop
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= itstool:textproc/itstool
+LIB_DEPENDS= libgnutls.so:security/gnutls \
+ libpcre2-8.so:devel/pcre2
PORTSCOUT= limitw:1,even
-USES= gettext gmake pathfix pkgconfig shebangfix tar:xz
-USE_MATE= desktop
-USE_XORG= sm x11
-USE_GNOME= dconf gtk20 intlhack vte
+USES= gettext gmake localbase pathfix perl5 pkgconfig \
+ shebangfix tar:xz
+USE_XORG= ice sm x11
+USE_GNOME= cairo dconf gdkpixbuf2 gtk30 intltool vte3
SHEBANG_FILES= mate-terminal.wrapper
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gtk=2.0
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.mate.terminal.gschema.xml
diff --git a/x11/mate-terminal/distinfo b/x11/mate-terminal/distinfo
index 019df12525ab..0a50f7210e2e 100644
--- a/x11/mate-terminal/distinfo
+++ b/x11/mate-terminal/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-terminal-1.12.1.tar.xz) = d4e16a7b2742e0a904e304b2251fb8e5028833a6813e75bd8214ee542cd86c0e
-SIZE (mate/mate-terminal-1.12.1.tar.xz) = 1143628
+TIMESTAMP = 1494459097
+SHA256 (mate/mate-terminal-1.18.1.tar.xz) = 4135b2212a2ed5d6c20b645e17a76d814aa8212f68f83c0a67a9899680a930fe
+SIZE (mate/mate-terminal-1.18.1.tar.xz) = 1299492
diff --git a/x11/mate-terminal/pkg-plist b/x11/mate-terminal/pkg-plist
index 780c1ac6cc47..5c533bfc8412 100644
--- a/x11/mate-terminal/pkg-plist
+++ b/x11/mate-terminal/pkg-plist
@@ -77,7 +77,6 @@ share/locale/as/LC_MESSAGES/mate-terminal.mo
share/locale/ast/LC_MESSAGES/mate-terminal.mo
share/locale/az/LC_MESSAGES/mate-terminal.mo
share/locale/be/LC_MESSAGES/mate-terminal.mo
-share/locale/be@latin/LC_MESSAGES/mate-terminal.mo
share/locale/bg/LC_MESSAGES/mate-terminal.mo
share/locale/bn/LC_MESSAGES/mate-terminal.mo
share/locale/bn_IN/LC_MESSAGES/mate-terminal.mo
@@ -92,18 +91,19 @@ share/locale/da/LC_MESSAGES/mate-terminal.mo
share/locale/de/LC_MESSAGES/mate-terminal.mo
share/locale/dz/LC_MESSAGES/mate-terminal.mo
share/locale/el/LC_MESSAGES/mate-terminal.mo
-share/locale/en@shaw/LC_MESSAGES/mate-terminal.mo
share/locale/en_AU/LC_MESSAGES/mate-terminal.mo
share/locale/en_CA/LC_MESSAGES/mate-terminal.mo
share/locale/en_GB/LC_MESSAGES/mate-terminal.mo
-share/locale/en_US/LC_MESSAGES/mate-terminal.mo
share/locale/eo/LC_MESSAGES/mate-terminal.mo
share/locale/es/LC_MESSAGES/mate-terminal.mo
+share/locale/es_CO/LC_MESSAGES/mate-terminal.mo
+share/locale/es_MX/LC_MESSAGES/mate-terminal.mo
share/locale/et/LC_MESSAGES/mate-terminal.mo
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/frp/LC_MESSAGES/mate-terminal.mo
share/locale/fur/LC_MESSAGES/mate-terminal.mo
share/locale/ga/LC_MESSAGES/mate-terminal.mo
share/locale/gl/LC_MESSAGES/mate-terminal.mo
@@ -114,14 +114,18 @@ share/locale/hr/LC_MESSAGES/mate-terminal.mo
share/locale/hu/LC_MESSAGES/mate-terminal.mo
share/locale/hy/LC_MESSAGES/mate-terminal.mo
share/locale/id/LC_MESSAGES/mate-terminal.mo
+share/locale/is/LC_MESSAGES/mate-terminal.mo
share/locale/it/LC_MESSAGES/mate-terminal.mo
share/locale/ja/LC_MESSAGES/mate-terminal.mo
+share/locale/jv/LC_MESSAGES/mate-terminal.mo
share/locale/ka/LC_MESSAGES/mate-terminal.mo
share/locale/kk/LC_MESSAGES/mate-terminal.mo
share/locale/kn/LC_MESSAGES/mate-terminal.mo
share/locale/ko/LC_MESSAGES/mate-terminal.mo
share/locale/ku/LC_MESSAGES/mate-terminal.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-terminal.mo
share/locale/ky/LC_MESSAGES/mate-terminal.mo
+share/locale/la/LC_MESSAGES/mate-terminal.mo
share/locale/lt/LC_MESSAGES/mate-terminal.mo
share/locale/lv/LC_MESSAGES/mate-terminal.mo
share/locale/mai/LC_MESSAGES/mate-terminal.mo
@@ -140,6 +144,7 @@ share/locale/oc/LC_MESSAGES/mate-terminal.mo
share/locale/or/LC_MESSAGES/mate-terminal.mo
share/locale/pa/LC_MESSAGES/mate-terminal.mo
share/locale/pl/LC_MESSAGES/mate-terminal.mo
+share/locale/pms/LC_MESSAGES/mate-terminal.mo
share/locale/ps/LC_MESSAGES/mate-terminal.mo
share/locale/pt/LC_MESSAGES/mate-terminal.mo
share/locale/pt_BR/LC_MESSAGES/mate-terminal.mo
@@ -160,6 +165,7 @@ share/locale/tr/LC_MESSAGES/mate-terminal.mo
share/locale/ug/LC_MESSAGES/mate-terminal.mo
share/locale/uk/LC_MESSAGES/mate-terminal.mo
share/locale/ur/LC_MESSAGES/mate-terminal.mo
+share/locale/uz/LC_MESSAGES/mate-terminal.mo
share/locale/vi/LC_MESSAGES/mate-terminal.mo
share/locale/wa/LC_MESSAGES/mate-terminal.mo
share/locale/xh/LC_MESSAGES/mate-terminal.mo
diff --git a/x11/mate/Makefile b/x11/mate/Makefile
index 8921e0e9f61f..449d8932ca0e 100644
--- a/x11/mate/Makefile
+++ b/x11/mate/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mate
-PORTVERSION= 1.12.0
+PORTVERSION= 1.18.0
CATEGORIES= x11 mate
MAINTAINER= gnome@FreeBSD.org
@@ -15,7 +15,7 @@ RUN_DEPENDS= mate-base>=1.8.0:x11/mate-base \
mate-icon-theme-faenza>=1.8.0:x11-themes/mate-icon-theme-faenza \
mate-terminal:x11/mate-terminal \
mate-screensaver:x11/mate-screensaver \
- galculator:math/galculator \
+ mate-calc:math/mate-calc \
mate-screenshot:deskutils/mate-utils \
mate-system-monitor:sysutils/mate-system-monitor \
eom:graphics/eom \