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, 16 insertions, 65 deletions

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