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

8 files changed, 111 insertions, 111 deletions

diff --git a/graphics/atril-lite/Makefile b/graphics/atril-lite/Makefile
index cd4d4d976f2d..f4282aa44892 100644
--- a/graphics/atril-lite/Makefile
+++ b/graphics/atril-lite/Makefile
@@ -1,12 +1,12 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	0
 PKGNAMESUFFIX=	-lite
 
 COMMENT=	MATE multi-format document viewer
 
-OPTIONS_EXCLUDE=	CAJA
+OPTIONS_EXCLUDE=	CAJA DBUS
 
 MASTERDIR=      ${.CURDIR}/../../graphics/atril
 SLAVEPORT=      lite
diff --git a/graphics/atril-lite/pkg-plist b/graphics/atril-lite/pkg-plist
index 116bfc96438a..aa7235a5b730 100644
--- a/graphics/atril-lite/pkg-plist
+++ b/graphics/atril-lite/pkg-plist
@@ -65,15 +65,13 @@ lib/atril/3/backends/tiffdocument.atril-backend
 %%XPS%%lib/atril/3/backends/xpsdocument.atril-backend
 lib/libatrildocument.so
 lib/libatrildocument.so.3
-lib/libatrildocument.so.%%GTK3_VERSION%%
+lib/libatrildocument.so.3.0.0
 lib/libatrilview.so
 lib/libatrilview.so.3
-lib/libatrilview.so.%%GTK3_VERSION%%
+lib/libatrilview.so.3.0.0
 libdata/pkgconfig/atril-document-1.5.0.pc
 libdata/pkgconfig/atril-view-1.5.0.pc
-libexec/atril-convert-metadata
 man/man1/atril.1.gz
-share/MateConf/gsettings/atril.convert
 share/appdata/atril.appdata.xml
 share/applications/atril.desktop
 %%DATADIR%%/atril-toolbar.xml
@@ -150,7 +148,6 @@ share/gtk-doc/html/atril/atril-frontend.html
 share/gtk-doc/html/atril/atril.devhelp2
 share/gtk-doc/html/atril/home.png
 share/gtk-doc/html/atril/index.html
-share/gtk-doc/html/atril/index.sgml
 share/gtk-doc/html/atril/left-insensitive.png
 share/gtk-doc/html/atril/left.png
 share/gtk-doc/html/atril/licence.html
@@ -184,13 +181,13 @@ share/gtk-doc/html/libatrildocument-1.5.0/EvLayer.html
 share/gtk-doc/html/libatrildocument-1.5.0/EvPage.html
 share/gtk-doc/html/libatrildocument-1.5.0/EvRenderContext.html
 share/gtk-doc/html/libatrildocument-1.5.0/EvSelection.html
+share/gtk-doc/html/libatrildocument-1.5.0/annotation-glossary.html
 share/gtk-doc/html/libatrildocument-1.5.0/api-index-full.html
 share/gtk-doc/html/libatrildocument-1.5.0/document-data.html
 share/gtk-doc/html/libatrildocument-1.5.0/document-helpers.html
 share/gtk-doc/html/libatrildocument-1.5.0/document-interfaces.html
 share/gtk-doc/html/libatrildocument-1.5.0/home.png
 share/gtk-doc/html/libatrildocument-1.5.0/index.html
-share/gtk-doc/html/libatrildocument-1.5.0/index.sgml
 share/gtk-doc/html/libatrildocument-1.5.0/left-insensitive.png
 share/gtk-doc/html/libatrildocument-1.5.0/left.png
 share/gtk-doc/html/libatrildocument-1.5.0/libatrildocument-1.5.0.devhelp2
@@ -213,10 +210,10 @@ share/gtk-doc/html/libatrildocument-1.5.0/style.css
 share/gtk-doc/html/libatrildocument-1.5.0/up-insensitive.png
 share/gtk-doc/html/libatrildocument-1.5.0/up.png
 share/gtk-doc/html/libatrilview-1.5.0/EvJob.html
+share/gtk-doc/html/libatrilview-1.5.0/annotation-glossary.html
 share/gtk-doc/html/libatrilview-1.5.0/api-index-full.html
 share/gtk-doc/html/libatrilview-1.5.0/home.png
 share/gtk-doc/html/libatrilview-1.5.0/index.html
-share/gtk-doc/html/libatrilview-1.5.0/index.sgml
 share/gtk-doc/html/libatrilview-1.5.0/left-insensitive.png
 share/gtk-doc/html/libatrilview-1.5.0/left.png
 share/gtk-doc/html/libatrilview-1.5.0/libatrilview-1.5.0.devhelp2
@@ -318,11 +315,11 @@ share/locale/ar/LC_MESSAGES/atril.mo
 share/locale/as/LC_MESSAGES/atril.mo
 share/locale/ast/LC_MESSAGES/atril.mo
 share/locale/be/LC_MESSAGES/atril.mo
-share/locale/be@latin/LC_MESSAGES/atril.mo
 share/locale/bg/LC_MESSAGES/atril.mo
 share/locale/bn/LC_MESSAGES/atril.mo
 share/locale/bn_IN/LC_MESSAGES/atril.mo
 share/locale/br/LC_MESSAGES/atril.mo
+share/locale/bs/LC_MESSAGES/atril.mo
 share/locale/ca/LC_MESSAGES/atril.mo
 share/locale/ca@valencia/LC_MESSAGES/atril.mo
 share/locale/cmn/LC_MESSAGES/atril.mo
@@ -332,17 +329,22 @@ share/locale/da/LC_MESSAGES/atril.mo
 share/locale/de/LC_MESSAGES/atril.mo
 share/locale/dz/LC_MESSAGES/atril.mo
 share/locale/el/LC_MESSAGES/atril.mo
-share/locale/en@shaw/LC_MESSAGES/atril.mo
 share/locale/en_AU/LC_MESSAGES/atril.mo
 share/locale/en_CA/LC_MESSAGES/atril.mo
 share/locale/en_GB/LC_MESSAGES/atril.mo
 share/locale/eo/LC_MESSAGES/atril.mo
 share/locale/es/LC_MESSAGES/atril.mo
+share/locale/es_CL/LC_MESSAGES/atril.mo
+share/locale/es_CO/LC_MESSAGES/atril.mo
+share/locale/es_MX/LC_MESSAGES/atril.mo
+share/locale/es_VE/LC_MESSAGES/atril.mo
 share/locale/et/LC_MESSAGES/atril.mo
 share/locale/eu/LC_MESSAGES/atril.mo
 share/locale/fa/LC_MESSAGES/atril.mo
 share/locale/fi/LC_MESSAGES/atril.mo
 share/locale/fr/LC_MESSAGES/atril.mo
+share/locale/fr_CA/LC_MESSAGES/atril.mo
+share/locale/frp/LC_MESSAGES/atril.mo
 share/locale/ga/LC_MESSAGES/atril.mo
 share/locale/gl/LC_MESSAGES/atril.mo
 share/locale/gu/LC_MESSAGES/atril.mo
@@ -351,15 +353,19 @@ share/locale/hi/LC_MESSAGES/atril.mo
 share/locale/hr/LC_MESSAGES/atril.mo
 share/locale/hu/LC_MESSAGES/atril.mo
 share/locale/hy/LC_MESSAGES/atril.mo
+share/locale/ia/LC_MESSAGES/atril.mo
 share/locale/id/LC_MESSAGES/atril.mo
+share/locale/is/LC_MESSAGES/atril.mo
 share/locale/it/LC_MESSAGES/atril.mo
 share/locale/ja/LC_MESSAGES/atril.mo
+share/locale/jv/LC_MESSAGES/atril.mo
 share/locale/ka/LC_MESSAGES/atril.mo
 share/locale/kk/LC_MESSAGES/atril.mo
 share/locale/kn/LC_MESSAGES/atril.mo
 share/locale/ko/LC_MESSAGES/atril.mo
 share/locale/ks/LC_MESSAGES/atril.mo
 share/locale/ku/LC_MESSAGES/atril.mo
+share/locale/ku_IQ/LC_MESSAGES/atril.mo
 share/locale/ky/LC_MESSAGES/atril.mo
 share/locale/lt/LC_MESSAGES/atril.mo
 share/locale/lv/LC_MESSAGES/atril.mo
@@ -379,6 +385,7 @@ share/locale/oc/LC_MESSAGES/atril.mo
 share/locale/or/LC_MESSAGES/atril.mo
 share/locale/pa/LC_MESSAGES/atril.mo
 share/locale/pl/LC_MESSAGES/atril.mo
+share/locale/pms/LC_MESSAGES/atril.mo
 share/locale/ps/LC_MESSAGES/atril.mo
 share/locale/pt/LC_MESSAGES/atril.mo
 share/locale/pt_BR/LC_MESSAGES/atril.mo
@@ -398,6 +405,7 @@ share/locale/te/LC_MESSAGES/atril.mo
 share/locale/th/LC_MESSAGES/atril.mo
 share/locale/tr/LC_MESSAGES/atril.mo
 share/locale/uk/LC_MESSAGES/atril.mo
+share/locale/uz/LC_MESSAGES/atril.mo
 share/locale/vi/LC_MESSAGES/atril.mo
 share/locale/wa/LC_MESSAGES/atril.mo
 share/locale/zh_CN/LC_MESSAGES/atril.mo
diff --git a/graphics/atril/Makefile b/graphics/atril/Makefile
index 804cc9b6b8b7..24c746b2080a 100644
--- a/graphics/atril/Makefile
+++ b/graphics/atril/Makefile
@@ -1,9 +1,11 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
+#
+# Please update update atril-lite also
 
 PORTNAME=	atril
-PORTVERSION=	1.12.2
-PORTREVISION?=	2
+PORTVERSION=	1.18.0
+PORTREVISION?=	0
 CATEGORIES=	graphics print mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -14,20 +16,24 @@ COMMENT?=	MATE multi-format document viewer
 BUILD_DEPENDS=	itstool:textproc/itstool
 
 LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib \
+		libsoup-2.4.so:devel/libsoup \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libtiff.so:graphics/tiff \
 		libspectre.so:print/libspectre
 
 PORTSCOUT=	limitw:1,even
 SLAVEPORT?=	no
 
-USES=		desktop-file-utils gettext gmake libtool pathfix \
+USES=		desktop-file-utils gettext gmake libarchive libtool pathfix \
 		pkgconfig tar:xz
 USE_MATE=	icontheme
-USE_XORG=	sm
-USE_GNOME=	cairo gtk20 intlhack libxml2
+USE_XORG=	ice sm x11
+USE_GNOME=	cairo gtk30 intlhack libxml2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gtk=2.0 \
-		--disable-static
+CONFIGURE_ARGS=	--disable-static \
+		--with-gtk=3.0
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -43,55 +49,44 @@ USE_MATE+=	desktop
 
 GLIB_SCHEMAS=	org.mate.Atril.gschema.xml
 
-OPTIONS_DEFINE=	CAJA COMICS DJVU DVI EPUB KEYRING T1LIB XPS
-OPTIONS_DEFAULT=CAJA COMICS DJVU EPUB KEYRING XPS
-DVI_DESC=	DVI viewer support
-T1LIB_DESC=	T1LIB for TYPE1 fonts to DVI (Enables DVI)
-CAJA_DESC=	Caja plugin
-KEYRING_DESC=	Keyring support
-COMICS_DESC=	Comic book archives support
-DJVU_DESC=	DJVU support
-XPS_DESC=	XPS support
-EPUB_DESC=	Epub support
+OPTIONS_DEFINE=	CAJA COMICS DBUS DJVU DVI EPUB KEYRING T1LIB XPS
+OPTIONS_DEFAULT=CAJA COMICS DBUS DJVU EPUB KEYRING XPS
 
 OPTIONS_SUB=	yes
 
+CAJA_DESC=		Caja plugin
 CAJA_CONFIGURE_ENABLE=	caja
 CAJA_USE=		MATE=caja
+
+DJVU_DESC=		DJVU support
 DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
 DJVU_CONFIGURE_ENABLE=	djvu
+
+COMICS_DESC=			Comic book archives support
 COMICS_CONFIGURE_ENABLE=	comics
+
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
+DBUS_CONFIGURE_ENABLE=	dbus
+
+KEYRING_DESC=		Keyring support
 KEYRING_CONFIGURE_WITH=	keyring
 KEYRING_LIB_DEPENDS=	libsecret-1.so:security/libsecret
+
+XPS_DESC=		XPS support
 XPS_CONFIGURE_ENABLE=	xps
 XPS_LIB_DEPENDS=	libgxps.so:graphics/libgxps
-EPUB_CONFIGURE_ENABLE=	epub
-EPUB_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
-.include <bsd.port.options.mk>
-
-.if ${SLAVEPORT} == lite
-CONFIGURE_ARGS+=--disable-dbus
-.else
-CONFIGURE_ARGS+=--enable-dbus
-LIB_DEPENDS+=	libdbus-glib-1.so:devel/dbus-glib
-.endif
+EPUB_DESC=		Epub support
+EPUB_CONFIGURE_ENABLE=	epub
+EPUB_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
-.if ${PORT_OPTIONS:MDVI} || ${PORT_OPTIONS:MT1LIB}
-USE_TEX=	base
-CONFIGURE_ARGS+=--enable-dvi
-PLIST_SUB+=	DVI=""
+DVI_DESC=		DVI viewer support
+DVI_USE=		tex=base
+DVI_CONFIGURE_ENABLE=	dvi
 
-. if ${PORT_OPTIONS:MT1LIB}
-LIB_DEPENDS+=	libt1.so:devel/t1lib
-CONFIGURE_ARGS+=--enable-t1lib
-.else
-CONFIGURE_ARGS+=--disable-t1lib
-. endif
-
-.else
-CONFIGURE_ARGS+=--disable-dvi
-PLIST_SUB+=	DVI="@comment "
-.endif
+T1LIB_DESC=		T1LIB for TYPE1 fonts to DVI (Enables DVI)
+T1LIB_LIB_DEPENDS=	libt1.so:devel/t1lib
+T1LIB_CONFIGURE_ENABLE=	t1lib
+T1LIB_IMPLIES=		DVI
 
 .include <bsd.port.mk>
diff --git a/graphics/atril/distinfo b/graphics/atril/distinfo
index f2b5de71b0e4..7da88437f355 100644
--- a/graphics/atril/distinfo
+++ b/graphics/atril/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/atril-1.12.2.tar.xz) = 47cd22969d4ff6ef860a310a57f77f1fcc0c5674113a72ee507d2b1b5c780226
-SIZE (mate/atril-1.12.2.tar.xz) = 1663920
+TIMESTAMP = 1491698614
+SHA256 (mate/atril-1.18.0.tar.xz) = c2284f17f7b683efa22615f00cf2768ea07667981d8304566e49c3d863de80fd
+SIZE (mate/atril-1.18.0.tar.xz) = 1688144
diff --git a/graphics/atril/pkg-plist b/graphics/atril/pkg-plist
index fea297d9c338..de6e442af684 100644
--- a/graphics/atril/pkg-plist
+++ b/graphics/atril/pkg-plist
@@ -74,12 +74,10 @@ lib/libatrilview.so.3
 lib/libatrilview.so.%%GTK3_VERSION%%
 libdata/pkgconfig/atril-document-1.5.0.pc
 libdata/pkgconfig/atril-view-1.5.0.pc
-libexec/atril-convert-metadata
 libexec/atrild
 man/man1/atril-previewer.1.gz
 man/man1/atril-thumbnailer.1.gz
 man/man1/atril.1.gz
-share/MateConf/gsettings/atril.convert
 share/appdata/atril.appdata.xml
 share/applications/atril.desktop
 %%DATADIR%%/atril-previewer-ui.xml
@@ -159,7 +157,6 @@ share/gtk-doc/html/atril/atril-frontend.html
 share/gtk-doc/html/atril/atril.devhelp2
 share/gtk-doc/html/atril/home.png
 share/gtk-doc/html/atril/index.html
-share/gtk-doc/html/atril/index.sgml
 share/gtk-doc/html/atril/left-insensitive.png
 share/gtk-doc/html/atril/left.png
 share/gtk-doc/html/atril/licence.html
@@ -193,13 +190,13 @@ share/gtk-doc/html/libatrildocument-1.5.0/EvLayer.html
 share/gtk-doc/html/libatrildocument-1.5.0/EvPage.html
 share/gtk-doc/html/libatrildocument-1.5.0/EvRenderContext.html
 share/gtk-doc/html/libatrildocument-1.5.0/EvSelection.html
+share/gtk-doc/html/libatrildocument-1.5.0/annotation-glossary.html
 share/gtk-doc/html/libatrildocument-1.5.0/api-index-full.html
 share/gtk-doc/html/libatrildocument-1.5.0/document-data.html
 share/gtk-doc/html/libatrildocument-1.5.0/document-helpers.html
 share/gtk-doc/html/libatrildocument-1.5.0/document-interfaces.html
 share/gtk-doc/html/libatrildocument-1.5.0/home.png
 share/gtk-doc/html/libatrildocument-1.5.0/index.html
-share/gtk-doc/html/libatrildocument-1.5.0/index.sgml
 share/gtk-doc/html/libatrildocument-1.5.0/left-insensitive.png
 share/gtk-doc/html/libatrildocument-1.5.0/left.png
 share/gtk-doc/html/libatrildocument-1.5.0/libatrildocument-1.5.0.devhelp2
@@ -222,10 +219,10 @@ share/gtk-doc/html/libatrildocument-1.5.0/style.css
 share/gtk-doc/html/libatrildocument-1.5.0/up-insensitive.png
 share/gtk-doc/html/libatrildocument-1.5.0/up.png
 share/gtk-doc/html/libatrilview-1.5.0/EvJob.html
+share/gtk-doc/html/libatrilview-1.5.0/annotation-glossary.html
 share/gtk-doc/html/libatrilview-1.5.0/api-index-full.html
 share/gtk-doc/html/libatrilview-1.5.0/home.png
 share/gtk-doc/html/libatrilview-1.5.0/index.html
-share/gtk-doc/html/libatrilview-1.5.0/index.sgml
 share/gtk-doc/html/libatrilview-1.5.0/left-insensitive.png
 share/gtk-doc/html/libatrilview-1.5.0/left.png
 share/gtk-doc/html/libatrilview-1.5.0/libatrilview-1.5.0.devhelp2
@@ -327,11 +324,11 @@ share/locale/ar/LC_MESSAGES/atril.mo
 share/locale/as/LC_MESSAGES/atril.mo
 share/locale/ast/LC_MESSAGES/atril.mo
 share/locale/be/LC_MESSAGES/atril.mo
-share/locale/be@latin/LC_MESSAGES/atril.mo
 share/locale/bg/LC_MESSAGES/atril.mo
 share/locale/bn/LC_MESSAGES/atril.mo
 share/locale/bn_IN/LC_MESSAGES/atril.mo
 share/locale/br/LC_MESSAGES/atril.mo
+share/locale/bs/LC_MESSAGES/atril.mo
 share/locale/ca/LC_MESSAGES/atril.mo
 share/locale/ca@valencia/LC_MESSAGES/atril.mo
 share/locale/cmn/LC_MESSAGES/atril.mo
@@ -341,17 +338,22 @@ share/locale/da/LC_MESSAGES/atril.mo
 share/locale/de/LC_MESSAGES/atril.mo
 share/locale/dz/LC_MESSAGES/atril.mo
 share/locale/el/LC_MESSAGES/atril.mo
-share/locale/en@shaw/LC_MESSAGES/atril.mo
 share/locale/en_AU/LC_MESSAGES/atril.mo
 share/locale/en_CA/LC_MESSAGES/atril.mo
 share/locale/en_GB/LC_MESSAGES/atril.mo
 share/locale/eo/LC_MESSAGES/atril.mo
 share/locale/es/LC_MESSAGES/atril.mo
+share/locale/es_CL/LC_MESSAGES/atril.mo
+share/locale/es_CO/LC_MESSAGES/atril.mo
+share/locale/es_MX/LC_MESSAGES/atril.mo
+share/locale/es_VE/LC_MESSAGES/atril.mo
 share/locale/et/LC_MESSAGES/atril.mo
 share/locale/eu/LC_MESSAGES/atril.mo
 share/locale/fa/LC_MESSAGES/atril.mo
 share/locale/fi/LC_MESSAGES/atril.mo
 share/locale/fr/LC_MESSAGES/atril.mo
+share/locale/fr_CA/LC_MESSAGES/atril.mo
+share/locale/frp/LC_MESSAGES/atril.mo
 share/locale/ga/LC_MESSAGES/atril.mo
 share/locale/gl/LC_MESSAGES/atril.mo
 share/locale/gu/LC_MESSAGES/atril.mo
@@ -360,15 +362,19 @@ share/locale/hi/LC_MESSAGES/atril.mo
 share/locale/hr/LC_MESSAGES/atril.mo
 share/locale/hu/LC_MESSAGES/atril.mo
 share/locale/hy/LC_MESSAGES/atril.mo
+share/locale/ia/LC_MESSAGES/atril.mo
 share/locale/id/LC_MESSAGES/atril.mo
+share/locale/is/LC_MESSAGES/atril.mo
 share/locale/it/LC_MESSAGES/atril.mo
 share/locale/ja/LC_MESSAGES/atril.mo
+share/locale/jv/LC_MESSAGES/atril.mo
 share/locale/ka/LC_MESSAGES/atril.mo
 share/locale/kk/LC_MESSAGES/atril.mo
 share/locale/kn/LC_MESSAGES/atril.mo
 share/locale/ko/LC_MESSAGES/atril.mo
 share/locale/ks/LC_MESSAGES/atril.mo
 share/locale/ku/LC_MESSAGES/atril.mo
+share/locale/ku_IQ/LC_MESSAGES/atril.mo
 share/locale/ky/LC_MESSAGES/atril.mo
 share/locale/lt/LC_MESSAGES/atril.mo
 share/locale/lv/LC_MESSAGES/atril.mo
@@ -388,6 +394,7 @@ share/locale/oc/LC_MESSAGES/atril.mo
 share/locale/or/LC_MESSAGES/atril.mo
 share/locale/pa/LC_MESSAGES/atril.mo
 share/locale/pl/LC_MESSAGES/atril.mo
+share/locale/pms/LC_MESSAGES/atril.mo
 share/locale/ps/LC_MESSAGES/atril.mo
 share/locale/pt/LC_MESSAGES/atril.mo
 share/locale/pt_BR/LC_MESSAGES/atril.mo
@@ -407,6 +414,7 @@ share/locale/te/LC_MESSAGES/atril.mo
 share/locale/th/LC_MESSAGES/atril.mo
 share/locale/tr/LC_MESSAGES/atril.mo
 share/locale/uk/LC_MESSAGES/atril.mo
+share/locale/uz/LC_MESSAGES/atril.mo
 share/locale/vi/LC_MESSAGES/atril.mo
 share/locale/wa/LC_MESSAGES/atril.mo
 share/locale/zh_CN/LC_MESSAGES/atril.mo
diff --git a/graphics/eom/Makefile b/graphics/eom/Makefile
index 6ef4f0725d5f..0880a0ec0700 100644
--- a/graphics/eom/Makefile
+++ b/graphics/eom/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	eom
-PORTVERSION=	1.12.2
+PORTVERSION=	1.18.2
 CATEGORIES=	graphics mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -10,25 +10,26 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Eye of MATE image viewer
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
+		libdbus-1.so:devel/dbus \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libpeas-gtk-1.0.so:devel/libpeas
 
 PORTSCOUT=	limitw:1,even
 
-USES=		desktop-file-utils gettext gmake jpeg libtool pathfix pkgconfig \
-		tar:xz
+USES=		desktop-file-utils gettext gmake jpeg libtool localbase \
+		pathfix pkgconfig tar:xz
 USE_MATE=	desktop icontheme
 USE_XORG=	x11
-USE_GNOME=	gdkpixbuf2 glib20 gtk20 intltool librsvg2 libxml2
+USE_GNOME=	cairo gnomeprefix gtk30 intltool introspection \
+		librsvg2 libxml2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--disable-gtk-doc \
-		--with-html-dir=${PREFIX}/share/doc \
-		--disable-introspection \
-		--with-gtk=2.0 \
-		--disable-python \
-		--without-cms
+CONFIGURE_ARGS=	--without-cms
 INSTALLS_ICONS=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.mate.eom.gschema.xml \
@@ -36,33 +37,18 @@ GLIB_SCHEMAS=	org.mate.eom.gschema.xml \
 
 OPTIONS_DEFINE=	EXIF EXEMPI
 OPTIONS_DEFAULT=EXIF EXEMPI
-EXIF_DESC=	Digital camera file meta-data support
-EXEMPI_DESC=	XMP support
-
-.include <bsd.port.options.mk>
 
-_WITH_EXIF=	no
-_WITH_EXEMPI=	no
+EXEMPI_DESC=		XMP support
+EXEMPI_CONFIGURE_WITH=	xmp
+EXEMPI_LIB_DEPENDS=	libexempi.so:textproc/exempi
 
-.if ${PORT_OPTIONS:MEXIF}
-CONFIGURE_ARGS+=--with-libexif
-LIB_DEPENDS+=	libexif.so:graphics/libexif
-PLIST_SUB+=	EXIF=""
-_WITH_EXIF=	yes
-.else
-CONFIGURE_ARGS+=--without-libexif
-PLIST_SUB+=	EXIF="@comment "
-.endif
+EXIF_DESC=		Digital camera file meta-data support
+EXIF_CONFIGURE_WITH=	libexif
+EXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 
-.if ${PORT_OPTIONS:MEXEMPI}
-CONFIGURE_ARGS+=--with-xmp
-LIB_DEPENDS+=	libexempi.so:textproc/exempi
-_WITH_EXEMPI=	yes
-.else
-CONFIGURE_ARGS+=--without-xmp
-.endif
+.include <bsd.port.options.mk>
 
-.if ${_WITH_EXIF}=="yes" || ${_WITH_EXEMPI}=="yes"
+.if ${PORT_OPTIONS:MEXIF} || ${PORT_OPTIONS:MEXEMPI}
 PLIST_SUB+=	EXIFEXEMPI=""
 .else
 PLIST_SUB+=	EXIFEXEMPI="@comment "
diff --git a/graphics/eom/distinfo b/graphics/eom/distinfo
index 17d4708daf17..c407084f3ec9 100644
--- a/graphics/eom/distinfo
+++ b/graphics/eom/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/eom-1.12.2.tar.xz) = 38ad10a6794e02e9e319a293393a36532e86572010442ba2f1d3773313c0a1da
-SIZE (mate/eom-1.12.2.tar.xz) = 2213260
+TIMESTAMP = 1494460910
+SHA256 (mate/eom-1.18.2.tar.xz) = 0755a43f48fe1a09b826cdd6ed239631f5e4f9163ccb481362534d8fcf3bda02
+SIZE (mate/eom-1.18.2.tar.xz) = 2196228
diff --git a/graphics/eom/pkg-plist b/graphics/eom/pkg-plist
index da5bd6f6f999..adcf042a5cff 100644
--- a/graphics/eom/pkg-plist
+++ b/graphics/eom/pkg-plist
@@ -13,7 +13,6 @@ include/eom-2.20/eom/eom-image.h
 include/eom-2.20/eom/eom-job-queue.h
 include/eom-2.20/eom/eom-jobs.h
 include/eom-2.20/eom/eom-list-store.h
-include/eom-2.20/eom/eom-plugin.h
 include/eom-2.20/eom/eom-properties-dialog.h
 include/eom-2.20/eom/eom-scroll-view.h
 include/eom-2.20/eom/eom-sidebar.h
@@ -23,15 +22,15 @@ include/eom-2.20/eom/eom-thumb-view.h
 include/eom-2.20/eom/eom-thumbnail.h
 include/eom-2.20/eom/eom-transform.h
 include/eom-2.20/eom/eom-window.h
-lib/eom/plugins/fullscreen.eom-plugin
+lib/eom/plugins/fullscreen.plugin
 lib/eom/plugins/libfullscreen.so
 lib/eom/plugins/libreload.so
 lib/eom/plugins/libstatusbar-date.so
-lib/eom/plugins/reload.eom-plugin
-lib/eom/plugins/statusbar-date.eom-plugin
+lib/eom/plugins/reload.plugin
+lib/eom/plugins/statusbar-date.plugin
+lib/girepository-1.0/Eom-1.0.typelib
 libdata/pkgconfig/eom.pc
 man/man1/eom.1.gz
-share/MateConf/gsettings/eom.convert
 share/appdata/eom.appdata.xml
 share/applications/eom.desktop
 %%PORTDOCS%%%%DOCSDIR%%/EomDialog.html
@@ -40,7 +39,6 @@ share/applications/eom.desktop
 %%PORTDOCS%%%%DOCSDIR%%/EomImageSaveInfo.html
 %%PORTDOCS%%%%DOCSDIR%%/EomMetadataReaderJpg.html
 %%PORTDOCS%%%%DOCSDIR%%/EomMetadataReaderPng.html
-%%PORTDOCS%%%%DOCSDIR%%/EomPluginManager.html
 %%PORTDOCS%%%%DOCSDIR%%/EomPreferencesDialog.html
 %%PORTDOCS%%%%DOCSDIR%%/EomPrintImageSetup.html
 %%PORTDOCS%%%%DOCSDIR%%/EomPrintPreview.html
@@ -68,7 +66,6 @@ share/applications/eom.desktop
 %%PORTDOCS%%%%DOCSDIR%%/eom-eom-metadata-reader.html
 %%PORTDOCS%%%%DOCSDIR%%/eom-eom-pixbuf-util.html
 %%PORTDOCS%%%%DOCSDIR%%/eom-eom-plugin-engine.html
-%%PORTDOCS%%%%DOCSDIR%%/eom-eom-plugin.html
 %%PORTDOCS%%%%DOCSDIR%%/eom-eom-print.html
 %%PORTDOCS%%%%DOCSDIR%%/eom-eom-properties-dialog.html
 %%PORTDOCS%%%%DOCSDIR%%/eom-eom-save-as-dialog-helper.html
@@ -85,7 +82,6 @@ share/applications/eom.desktop
 %%PORTDOCS%%%%DOCSDIR%%/eom.devhelp2
 %%PORTDOCS%%%%DOCSDIR%%/home.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/index.sgml
 %%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png
 %%PORTDOCS%%%%DOCSDIR%%/left.png
 %%PORTDOCS%%%%DOCSDIR%%/pt01.html
@@ -95,6 +91,7 @@ share/applications/eom.desktop
 %%PORTDOCS%%%%DOCSDIR%%/style.css
 %%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png
 %%PORTDOCS%%%%DOCSDIR%%/up.png
+%%DATADIR%%/eom-3.18.css
 %%DATADIR%%/eom-image-properties-dialog.ui
 %%DATADIR%%/eom-multiple-save-as-dialog.ui
 %%DATADIR%%/eom-preferences-dialog.ui
@@ -118,6 +115,7 @@ share/applications/eom.desktop
 %%DATADIR%%/icons/hicolor/scalable/actions/eom-plugin.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/slideshow-play.svg
 %%DATADIR%%/pixmaps/thumbnail-frame.png
+share/gir-1.0/Eom-1.0.gir
 share/help/C/eom/figures/eom_save_as_window.png
 share/help/C/eom/figures/eom_start_window.png
 share/help/C/eom/figures/eom_toolbar_editor_window.png
@@ -255,7 +253,6 @@ share/locale/as/LC_MESSAGES/eom.mo
 share/locale/ast/LC_MESSAGES/eom.mo
 share/locale/az/LC_MESSAGES/eom.mo
 share/locale/be/LC_MESSAGES/eom.mo
-share/locale/be@latin/LC_MESSAGES/eom.mo
 share/locale/bg/LC_MESSAGES/eom.mo
 share/locale/bn/LC_MESSAGES/eom.mo
 share/locale/bn_IN/LC_MESSAGES/eom.mo
@@ -270,18 +267,20 @@ share/locale/da/LC_MESSAGES/eom.mo
 share/locale/de/LC_MESSAGES/eom.mo
 share/locale/dz/LC_MESSAGES/eom.mo
 share/locale/el/LC_MESSAGES/eom.mo
-share/locale/en@shaw/LC_MESSAGES/eom.mo
 share/locale/en_AU/LC_MESSAGES/eom.mo
 share/locale/en_CA/LC_MESSAGES/eom.mo
 share/locale/en_GB/LC_MESSAGES/eom.mo
-share/locale/en_US/LC_MESSAGES/eom.mo
 share/locale/eo/LC_MESSAGES/eom.mo
 share/locale/es/LC_MESSAGES/eom.mo
+share/locale/es_CO/LC_MESSAGES/eom.mo
+share/locale/es_MX/LC_MESSAGES/eom.mo
 share/locale/et/LC_MESSAGES/eom.mo
 share/locale/eu/LC_MESSAGES/eom.mo
 share/locale/fa/LC_MESSAGES/eom.mo
 share/locale/fi/LC_MESSAGES/eom.mo
 share/locale/fr/LC_MESSAGES/eom.mo
+share/locale/fr_CA/LC_MESSAGES/eom.mo
+share/locale/frp/LC_MESSAGES/eom.mo
 share/locale/fur/LC_MESSAGES/eom.mo
 share/locale/ga/LC_MESSAGES/eom.mo
 share/locale/gl/LC_MESSAGES/eom.mo
@@ -295,12 +294,14 @@ share/locale/id/LC_MESSAGES/eom.mo
 share/locale/is/LC_MESSAGES/eom.mo
 share/locale/it/LC_MESSAGES/eom.mo
 share/locale/ja/LC_MESSAGES/eom.mo
+share/locale/jv/LC_MESSAGES/eom.mo
 share/locale/ka/LC_MESSAGES/eom.mo
 share/locale/kk/LC_MESSAGES/eom.mo
 share/locale/kn/LC_MESSAGES/eom.mo
 share/locale/ko/LC_MESSAGES/eom.mo
 share/locale/ks/LC_MESSAGES/eom.mo
 share/locale/ku/LC_MESSAGES/eom.mo
+share/locale/ku_IQ/LC_MESSAGES/eom.mo
 share/locale/ky/LC_MESSAGES/eom.mo
 share/locale/lt/LC_MESSAGES/eom.mo
 share/locale/lv/LC_MESSAGES/eom.mo
@@ -321,6 +322,7 @@ share/locale/oc/LC_MESSAGES/eom.mo
 share/locale/or/LC_MESSAGES/eom.mo
 share/locale/pa/LC_MESSAGES/eom.mo
 share/locale/pl/LC_MESSAGES/eom.mo
+share/locale/pms/LC_MESSAGES/eom.mo
 share/locale/ps/LC_MESSAGES/eom.mo
 share/locale/pt/LC_MESSAGES/eom.mo
 share/locale/pt_BR/LC_MESSAGES/eom.mo
@@ -342,7 +344,6 @@ share/locale/tr/LC_MESSAGES/eom.mo
 share/locale/ug/LC_MESSAGES/eom.mo
 share/locale/uk/LC_MESSAGES/eom.mo
 share/locale/uz/LC_MESSAGES/eom.mo
-share/locale/uz@cyrillic/LC_MESSAGES/eom.mo
 share/locale/vi/LC_MESSAGES/eom.mo
 share/locale/wa/LC_MESSAGES/eom.mo
 share/locale/xh/LC_MESSAGES/eom.mo