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, 91 insertions, 15 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