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, 20 insertions, 15 deletions

diff --git a/x11-wm/marco/Makefile b/x11-wm/marco/Makefile
index 6ab8987fe231..bd9a7fdf8963 100644
--- a/x11-wm/marco/Makefile
+++ b/x11-wm/marco/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	marco
-PORTVERSION=	1.12.1
+PORTVERSION=	1.18.1
 CATEGORIES=	x11-wm mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -10,23 +10,25 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Window manager for the adult in you
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	itstool:textproc/itstool \
 		zenity>=3.0.0:x11/zenity
 LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
-		libcanberra-gtk.so:audio/libcanberra \
+		libcanberra.so:audio/libcanberra \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libgtop-2.0.so:devel/libgtop
 RUN_DEPENDS=	zenity>=3.0.0:x11/zenity
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
-USE_XORG=	x11 xcomposite xcursor xdamage xrandr
-USE_GNOME=	gdkpixbuf2 glib20 gtk20 intlhack pango
+USES=		gettext gmake libtool localbase pathfix pkgconfig tar:xz
+USE_XORG=	ice sm x11 xcomposite xcursor xdamage xext xfixes \
+		xinerama xrandr xrender
+USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gtk=2.0
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.mate.marco.gschema.xml
diff --git a/x11-wm/marco/distinfo b/x11-wm/marco/distinfo
index f342235cd798..9029b6391484 100644
--- a/x11-wm/marco/distinfo
+++ b/x11-wm/marco/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/marco-1.12.1.tar.xz) = 7f799115952a209e5063e5bd88d61d0baf430e630ca7783626af4dce46add084
-SIZE (mate/marco-1.12.1.tar.xz) = 1163996
+TIMESTAMP = 1497520209
+SHA256 (mate/marco-1.18.1.tar.xz) = 65a276104745817208582e5da1894eeb86391ea2e288775aa1d098e679ba8b53
+SIZE (mate/marco-1.18.1.tar.xz) = 1251108
diff --git a/x11-wm/marco/pkg-plist b/x11-wm/marco/pkg-plist
index 9c7d42100b30..cc273f6e5539 100644
--- a/x11-wm/marco/pkg-plist
+++ b/x11-wm/marco/pkg-plist
@@ -11,14 +11,13 @@ include/marco-1/marco-private/theme.h
 include/marco-1/marco-private/util.h
 lib/libmarco-private.a
 lib/libmarco-private.so
-lib/libmarco-private.so.0
-lib/libmarco-private.so.0.0.0
+lib/libmarco-private.so.1
+lib/libmarco-private.so.1.0.0
 libdata/pkgconfig/libmarco-private.pc
 man/man1/marco-message.1.gz
 man/man1/marco-theme-viewer.1.gz
 man/man1/marco-window-demo.1.gz
 man/man1/marco.1.gz
-share/MateConf/gsettings/marco.convert
 share/applications/marco.desktop
 share/help/C/creating-marco-themes/index.docbook
 share/locale/am/LC_MESSAGES/marco.mo
@@ -27,7 +26,6 @@ share/locale/as/LC_MESSAGES/marco.mo
 share/locale/ast/LC_MESSAGES/marco.mo
 share/locale/az/LC_MESSAGES/marco.mo
 share/locale/be/LC_MESSAGES/marco.mo
-share/locale/be@latin/LC_MESSAGES/marco.mo
 share/locale/bg/LC_MESSAGES/marco.mo
 share/locale/bn/LC_MESSAGES/marco.mo
 share/locale/bn_IN/LC_MESSAGES/marco.mo
@@ -43,12 +41,13 @@ share/locale/da/LC_MESSAGES/marco.mo
 share/locale/de/LC_MESSAGES/marco.mo
 share/locale/dz/LC_MESSAGES/marco.mo
 share/locale/el/LC_MESSAGES/marco.mo
-share/locale/en@shaw/LC_MESSAGES/marco.mo
 share/locale/en_AU/LC_MESSAGES/marco.mo
 share/locale/en_CA/LC_MESSAGES/marco.mo
 share/locale/en_GB/LC_MESSAGES/marco.mo
 share/locale/eo/LC_MESSAGES/marco.mo
 share/locale/es/LC_MESSAGES/marco.mo
+share/locale/es_CO/LC_MESSAGES/marco.mo
+share/locale/es_MX/LC_MESSAGES/marco.mo
 share/locale/et/LC_MESSAGES/marco.mo
 share/locale/eu/LC_MESSAGES/marco.mo
 share/locale/fa/LC_MESSAGES/marco.mo
@@ -68,11 +67,13 @@ share/locale/ig/LC_MESSAGES/marco.mo
 share/locale/is/LC_MESSAGES/marco.mo
 share/locale/it/LC_MESSAGES/marco.mo
 share/locale/ja/LC_MESSAGES/marco.mo
+share/locale/jv/LC_MESSAGES/marco.mo
 share/locale/ka/LC_MESSAGES/marco.mo
 share/locale/kk/LC_MESSAGES/marco.mo
 share/locale/kn/LC_MESSAGES/marco.mo
 share/locale/ko/LC_MESSAGES/marco.mo
 share/locale/ku/LC_MESSAGES/marco.mo
+share/locale/ku_IQ/LC_MESSAGES/marco.mo
 share/locale/ky/LC_MESSAGES/marco.mo
 share/locale/la/LC_MESSAGES/marco.mo
 share/locale/lt/LC_MESSAGES/marco.mo
@@ -111,6 +112,7 @@ share/locale/th/LC_MESSAGES/marco.mo
 share/locale/tk/LC_MESSAGES/marco.mo
 share/locale/tr/LC_MESSAGES/marco.mo
 share/locale/uk/LC_MESSAGES/marco.mo
+share/locale/uz/LC_MESSAGES/marco.mo
 share/locale/vi/LC_MESSAGES/marco.mo
 share/locale/wa/LC_MESSAGES/marco.mo
 share/locale/xh/LC_MESSAGES/marco.mo