author: Koop Mast <kwm@FreeBSD.org> 2017-07-04 11:44:30 +0000
committer: Koop Mast <kwm@FreeBSD.org> 2017-07-04 11:44:30 +0000
commit: 0a7668c1332918aa06ca27664ae8c447a553c5fd (patch)
tree: 37169f4d6a1ec15a3f96493c65cb713e58dc7aee /x11
parent: 1702ea4d9050cc64965b5766671c067e06c781e2 (diff)
download: ports-0a7668c1332918aa06ca27664ae8c447a553c5fd.tar.gz
ports-0a7668c1332918aa06ca27664ae8c447a553c5fd.zip
46 files changed, 619 insertions, 1344 deletions
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 \
author	Koop Mast <kwm@FreeBSD.org>	2017-07-04 11:44:30 +0000
committer	Koop Mast <kwm@FreeBSD.org>	2017-07-04 11:44:30 +0000
commit	0a7668c1332918aa06ca27664ae8c447a553c5fd (patch)
tree	37169f4d6a1ec15a3f96493c65cb713e58dc7aee /x11
parent	1702ea4d9050cc64965b5766671c067e06c781e2 (diff)
download	ports-0a7668c1332918aa06ca27664ae8c447a553c5fd.tar.gz ports-0a7668c1332918aa06ca27664ae8c447a553c5fd.zip