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

7 files changed, 19 insertions, 210 deletions

diff --git a/x11/mate-session-manager/Makefile b/x11/mate-session-manager/Makefile
index 321a10612cb5..b48bbe9009b1 100644
--- a/x11/mate-session-manager/Makefile
+++ b/x11/mate-session-manager/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-session-manager
-PORTVERSION=	1.12.1
+PORTVERSION=	1.18.0
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -11,24 +11,23 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Session component for the MATE desktop
 
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libdbus-1.so:devel/dbus \
 		libupower-glib.so:sysutils/upower
 RUN_DEPENDS=	${LOCALBASE}/sbin/console-kit-daemon:sysutils/consolekit \
 		${LOCALBASE}/bin/xdpyinfo:x11/xdpyinfo
 
 PORTSCOUT=	limitw:1,even
 
-USES=		execinfo gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		execinfo gettext gmake localbase libtool pathfix \
+		pkgconfig tar:xz
 USE_MATE=	desktop
-USE_XORG=	ice sm xau xext xrandr xrender xtrans xtst
-USE_GNOME=	gtk20 intlhack librsvg2 libxslt pango
+USE_XORG=	ice sm x11 xau xext xrandr xrender xtrans xtst
+USE_GNOME=	cairo gtk30 intlhack librsvg2 libxslt pango
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docbook-docs \
-		--with-gtk=2.0 \
 		--enable-upower \
 		--with-systemd=no
 INSTALLS_ICONS=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.mate.session.gschema.xml
 
diff --git a/x11/mate-session-manager/distinfo b/x11/mate-session-manager/distinfo
index ab6e4b6110df..ff8fae7c8a7a 100644
--- a/x11/mate-session-manager/distinfo
+++ b/x11/mate-session-manager/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-session-manager-1.12.1.tar.xz) = 2bad592d7dc0e6807f347bba1580c7c9f5d880aeedee2293d4c8947ab439e7e2
-SIZE (mate/mate-session-manager-1.12.1.tar.xz) = 538524
+TIMESTAMP = 1491695526
+SHA256 (mate/mate-session-manager-1.18.0.tar.xz) = 1c50f7866d8c75c1a918754960c6629798d6cb0f8d06aa3e48516ea672c7d419
+SIZE (mate/mate-session-manager-1.18.0.tar.xz) = 578256
diff --git a/x11/mate-session-manager/files/patch-configure b/x11/mate-session-manager/files/patch-configure
deleted file mode 100644
index 03ccb0ce7efe..000000000000
--- a/x11/mate-session-manager/files/patch-configure
+++ /dev/null
@@ -1,92 +0,0 @@
---- configure.orig	2014-04-20 19:14:11.248250628 +0000
-+++ configure	2014-04-20 19:14:11.260251121 +0000
-@@ -13329,7 +13329,89 @@
- esac
- 
- 
-+# We can only support old upower
- 
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UPOWER" >&5
-+$as_echo_n "checking for UPOWER... " >&6; }
-+
-+if test -n "$UPOWER_CFLAGS"; then
-+    pkg_cv_UPOWER_CFLAGS="$UPOWER_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib < 0.99.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "upower-glib < 0.99.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_UPOWER_CFLAGS=`$PKG_CONFIG --cflags "upower-glib < 0.99.0" 2>/dev/null`
-+                      test "x$?" != "x0" && pkg_failed=yes
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$UPOWER_LIBS"; then
-+    pkg_cv_UPOWER_LIBS="$UPOWER_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib < 0.99.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "upower-glib < 0.99.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_UPOWER_LIBS=`$PKG_CONFIG --libs "upower-glib < 0.99.0" 2>/dev/null`
-+                      test "x$?" != "x0" && pkg_failed=yes
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test $pkg_failed = yes; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+                UPOWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "upower-glib < 0.99.0" 2>&1`
-+        else
-+                UPOWER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "upower-glib < 0.99.0" 2>&1`
-+        fi
-+        # Put the nasty error message in config.log where it belongs
-+        echo "$UPOWER_PKG_ERRORS" >&5
-+
-+        have_old_upower=no
-+elif test $pkg_failed = untried; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+        have_old_upower=no
-+else
-+        UPOWER_CFLAGS=$pkg_cv_UPOWER_CFLAGS
-+        UPOWER_LIBS=$pkg_cv_UPOWER_LIBS
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+        have_old_upower=yes
-+fi
-+if test x$have_old_upower = xyes; then :
-+
-+
-+$as_echo "#define HAVE_OLD_UPOWER 1" >>confdefs.h
-+
-+
-+fi
-+ if test x$have_old_upower = xyes; then
-+  HAVE_OLD_UPOWER_TRUE=
-+  HAVE_OLD_UPOWER_FALSE='#'
-+else
-+  HAVE_OLD_UPOWER_TRUE='#'
-+  HAVE_OLD_UPOWER_FALSE=
-+fi
- 
- 
- 
diff --git a/x11/mate-session-manager/files/patch-mate-session_gsm-autostart-app.c b/x11/mate-session-manager/files/patch-mate-session_gsm-autostart-app.c
deleted file mode 100644
index f7e5285d5206..000000000000
--- a/x11/mate-session-manager/files/patch-mate-session_gsm-autostart-app.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- mate-session/gsm-autostart-app.c.orig	2008-08-20 14:18:52.000000000 -0400
-+++ mate-session/gsm-autostart-app.c	2008-08-20 14:19:02.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <string.h>
- #include <sys/wait.h>
- #include <errno.h>
-+#include <signal.h>
- 
- #include <glib.h>
- #include <gio/gio.h>
diff --git a/x11/mate-session-manager/files/patch-mate-session_gsm-logout-dialog.c b/x11/mate-session-manager/files/patch-mate-session_gsm-logout-dialog.c
deleted file mode 100644
index 83910fc665d4..000000000000
--- a/x11/mate-session-manager/files/patch-mate-session_gsm-logout-dialog.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- mate-session/gsm-logout-dialog.c.orig	2014-03-05 20:39:13.000000000 +0000
-+++ mate-session/gsm-logout-dialog.c	2014-04-20 18:19:12.537577789 +0000
-@@ -214,8 +214,10 @@
- #if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-         else
- #endif
--#ifdef HAVE_UPOWER
-+#ifdef HAVE_OLD_UPOWER
-         ret = up_client_get_can_suspend (logout_dialog->priv->up_client);
-+#else
-+        ret = FALSE;
- #endif
-         return ret;
- }
-@@ -232,8 +234,10 @@
- #if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-         else
- #endif
--#ifdef HAVE_UPOWER
-+#ifdef HAVE_OLD_UPOWER
-         ret = up_client_get_can_hibernate (logout_dialog->priv->up_client);
-+#else
-+        ret = FALSE;
- #endif
-         return ret;
- }
diff --git a/x11/mate-session-manager/files/patch-mate-session_gsm-manager.c b/x11/mate-session-manager/files/patch-mate-session_gsm-manager.c
deleted file mode 100644
index 63d84cc82236..000000000000
--- a/x11/mate-session-manager/files/patch-mate-session_gsm-manager.c
+++ /dev/null
@@ -1,64 +0,0 @@
---- mate-session/gsm-manager.c.orig	2014-03-05 20:39:13.000000000 +0000
-+++ mate-session/gsm-manager.c	2014-04-20 18:31:08.980429286 +0000
-@@ -1166,22 +1166,28 @@
- #if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-         else {
- #endif
--#ifdef HAVE_UPOWER
-+#ifdef HAVE_OLD_UPOWER
-         can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
-+#else
-+        can_hibernate = FALSE;
-+#endif
-         if (can_hibernate) {
- 
-                 /* lock the screen before we suspend */
-                 manager_perhaps_lock (manager);
- 
-                 error = NULL;
-+#ifdef HAVE_OLD_UPOWER
-                 ret = up_client_hibernate_sync (manager->priv->up_client, NULL, &error);
-+#else
-+                ret = FALSE;
-+#endif
-                 if (!ret) {
-                         g_warning ("Unexpected hibernate failure: %s",
-                                    error->message);
-                         g_error_free (error);
-                 }
-         }
--#endif
- #if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-         }
- #endif
-@@ -1211,22 +1217,28 @@
- #if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-         else {
- #endif
--#ifdef HAVE_UPOWER
-+#ifdef HAVE_OLD_UPOWER
-         can_suspend = up_client_get_can_suspend (manager->priv->up_client);
-+#else
-+        can_suspend = FALSE;
-+#endif
-         if (can_suspend) {
- 
-                 /* lock the screen before we suspend */
-                 manager_perhaps_lock (manager);
- 
-                 error = NULL;
-+#ifdef HAVE_OLD_UPOWER
-                 ret = up_client_suspend_sync (manager->priv->up_client, NULL, &error);
-+#else
-+                ret = FALSE;
-+#endif
-                 if (!ret) {
-                         g_warning ("Unexpected suspend failure: %s",
-                                    error->message);
-                         g_error_free (error);
-                 }
-         }
--#endif
- #if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-         }
- #endif
diff --git a/x11/mate-session-manager/pkg-plist b/x11/mate-session-manager/pkg-plist
index 591d7bec49b2..c853c8a69f08 100644
--- a/x11/mate-session-manager/pkg-plist
+++ b/x11/mate-session-manager/pkg-plist
@@ -8,7 +8,6 @@ man/man1/mate-session-properties.1.gz
 man/man1/mate-session-save.1.gz
 man/man1/mate-session.1.gz
 man/man1/mate-wm.1.gz
-share/MateConf/gsettings/mate-session.convert
 share/applications/mate-session-properties.desktop
 share/icons/hicolor/16x16/apps/mate-session-properties.png
 share/icons/hicolor/22x22/apps/mate-session-properties.png
@@ -23,7 +22,6 @@ share/locale/as/LC_MESSAGES/mate-session-manager.mo
 share/locale/ast/LC_MESSAGES/mate-session-manager.mo
 share/locale/az/LC_MESSAGES/mate-session-manager.mo
 share/locale/be/LC_MESSAGES/mate-session-manager.mo
-share/locale/be@latin/LC_MESSAGES/mate-session-manager.mo
 share/locale/bg/LC_MESSAGES/mate-session-manager.mo
 share/locale/bn/LC_MESSAGES/mate-session-manager.mo
 share/locale/bn_IN/LC_MESSAGES/mate-session-manager.mo
@@ -39,19 +37,21 @@ share/locale/da/LC_MESSAGES/mate-session-manager.mo
 share/locale/de/LC_MESSAGES/mate-session-manager.mo
 share/locale/dz/LC_MESSAGES/mate-session-manager.mo
 share/locale/el/LC_MESSAGES/mate-session-manager.mo
-share/locale/en@shaw/LC_MESSAGES/mate-session-manager.mo
 share/locale/en_AU/LC_MESSAGES/mate-session-manager.mo
 share/locale/en_CA/LC_MESSAGES/mate-session-manager.mo
 share/locale/en_GB/LC_MESSAGES/mate-session-manager.mo
-share/locale/en_US/LC_MESSAGES/mate-session-manager.mo
-share/locale/es_MX/LC_MESSAGES/mate-session-manager.mo
 share/locale/eo/LC_MESSAGES/mate-session-manager.mo
 share/locale/es/LC_MESSAGES/mate-session-manager.mo
+share/locale/es_AR/LC_MESSAGES/mate-session-manager.mo
+share/locale/es_CO/LC_MESSAGES/mate-session-manager.mo
+share/locale/es_MX/LC_MESSAGES/mate-session-manager.mo
 share/locale/et/LC_MESSAGES/mate-session-manager.mo
 share/locale/eu/LC_MESSAGES/mate-session-manager.mo
 share/locale/fa/LC_MESSAGES/mate-session-manager.mo
 share/locale/fi/LC_MESSAGES/mate-session-manager.mo
 share/locale/fr/LC_MESSAGES/mate-session-manager.mo
+share/locale/fr_CA/LC_MESSAGES/mate-session-manager.mo
+share/locale/frp/LC_MESSAGES/mate-session-manager.mo
 share/locale/fur/LC_MESSAGES/mate-session-manager.mo
 share/locale/fy/LC_MESSAGES/mate-session-manager.mo
 share/locale/ga/LC_MESSAGES/mate-session-manager.mo
@@ -68,17 +68,18 @@ share/locale/ig/LC_MESSAGES/mate-session-manager.mo
 share/locale/is/LC_MESSAGES/mate-session-manager.mo
 share/locale/it/LC_MESSAGES/mate-session-manager.mo
 share/locale/ja/LC_MESSAGES/mate-session-manager.mo
+share/locale/jv/LC_MESSAGES/mate-session-manager.mo
 share/locale/ka/LC_MESSAGES/mate-session-manager.mo
 share/locale/kk/LC_MESSAGES/mate-session-manager.mo
 share/locale/kn/LC_MESSAGES/mate-session-manager.mo
 share/locale/ko/LC_MESSAGES/mate-session-manager.mo
 share/locale/ku/LC_MESSAGES/mate-session-manager.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-session-manager.mo
 share/locale/ky/LC_MESSAGES/mate-session-manager.mo
 share/locale/lt/LC_MESSAGES/mate-session-manager.mo
 share/locale/lv/LC_MESSAGES/mate-session-manager.mo
 share/locale/mai/LC_MESSAGES/mate-session-manager.mo
 share/locale/mg/LC_MESSAGES/mate-session-manager.mo
-share/locale/mi/LC_MESSAGES/mate-session-manager.mo
 share/locale/mk/LC_MESSAGES/mate-session-manager.mo
 share/locale/ml/LC_MESSAGES/mate-session-manager.mo
 share/locale/mn/LC_MESSAGES/mate-session-manager.mo
@@ -94,6 +95,7 @@ share/locale/oc/LC_MESSAGES/mate-session-manager.mo
 share/locale/or/LC_MESSAGES/mate-session-manager.mo
 share/locale/pa/LC_MESSAGES/mate-session-manager.mo
 share/locale/pl/LC_MESSAGES/mate-session-manager.mo
+share/locale/pms/LC_MESSAGES/mate-session-manager.mo
 share/locale/ps/LC_MESSAGES/mate-session-manager.mo
 share/locale/pt/LC_MESSAGES/mate-session-manager.mo
 share/locale/pt_BR/LC_MESSAGES/mate-session-manager.mo
@@ -116,7 +118,6 @@ share/locale/ug/LC_MESSAGES/mate-session-manager.mo
 share/locale/uk/LC_MESSAGES/mate-session-manager.mo
 share/locale/ur/LC_MESSAGES/mate-session-manager.mo
 share/locale/uz/LC_MESSAGES/mate-session-manager.mo
-share/locale/uz@cyrillic/LC_MESSAGES/mate-session-manager.mo
 share/locale/vi/LC_MESSAGES/mate-session-manager.mo
 share/locale/wa/LC_MESSAGES/mate-session-manager.mo
 share/locale/xh/LC_MESSAGES/mate-session-manager.mo
@@ -125,6 +126,6 @@ share/locale/zh_CN/LC_MESSAGES/mate-session-manager.mo
 share/locale/zh_HK/LC_MESSAGES/mate-session-manager.mo
 share/locale/zh_TW/LC_MESSAGES/mate-session-manager.mo
 share/locale/zu/LC_MESSAGES/mate-session-manager.mo
-share/mate-session-manager/gsm-inhibit-dialog.ui
-share/mate-session-manager/session-properties.ui
+%%DATADIR%%/gsm-inhibit-dialog.ui
+%%DATADIR%%/session-properties.ui
 share/xsessions/mate.desktop