Update the mate desktop to 1.18.

* The MATE DE is now GTK+3 based
* mate-calc has come back.
* New USE_MATE=mixer macro

* Add license
* Review dependancies
* Swich to USES=localbase
* atril/eom options reworked into option helper

Thanks to Eric Turgeon for submitting the bulk of this MATE update.

Obtained from:	gnome devel repo

3 files changed, 22 insertions, 13 deletions

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