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, 95 deletions

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