3 files changed, 38 insertions, 40 deletions

diff --git a/x11-fm/caja/Makefile b/x11-fm/caja/Makefile
index e044cb5505a8..d73db6ef9670 100644
--- a/x11-fm/caja/Makefile
+++ b/x11-fm/caja/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	caja
-PORTVERSION=	1.12.4
+PORTVERSION=	1.18.3
 CATEGORIES=	x11-fm mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -10,29 +10,27 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	File manager for the MATE desktop
 
-BUILD_DEPENDS=	gtkdoc-check:textproc/gtk-doc
+LICENSE=	GPLv2 LGPL20
+LICENSE_COMB=	multi
+LICENSE_GPLv2_FILE=	${WRKSRC}/COPYING
+LICENSE_LGPL20_FILE=	${WRKSRC}/COPYING.LIB
+
 LIB_DEPENDS=	libexif.so:graphics/libexif \
-		libunique-1.0.so:x11-toolkits/unique \
-		libexempi.so:textproc/exempi
-RUN_DEPENDS=	${LOCALBASE}/libexec/gvfsd:devel/gvfs
+		libexempi.so:textproc/exempi \
+		libstartup-notification-1.so:x11/startup-notification \
+		libnotify.so:devel/libnotify
 
 PORTSCOUT=	limitw:1,even
 
-USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
-		shared-mime-info tar:xz
+USES=		desktop-file-utils gettext gmake libtool localbase \
+		pathfix pkgconfig shared-mime-info tar:xz
 USE_MATE=	desktop icontheme:run
-USE_XORG=	ice x11 xrender
-USE_GNOME=	glib20 gtk20 intltool introspection:build \
-		libxml2 pango
+USE_XORG=	ice sm x11
+USE_GNOME=	cairo gtk30 gnomeprefix intltool introspection:build libxml2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-packagekit \
-		--with-gtk=2.0 \
-		--disable-gtk-doc \
-		--with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS=	--disable-packagekit
 INSTALLS_ICONS=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.mate.caja.gschema.xml \
@@ -40,6 +38,5 @@ GLIB_SCHEMAS=	org.mate.caja.gschema.xml \
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/caja/extensions-2.0
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcaja-extension.so.1.4.0
 
 .include <bsd.port.mk>
diff --git a/x11-fm/caja/distinfo b/x11-fm/caja/distinfo
index 8950eaee3b62..1f8cbe89ace5 100644
--- a/x11-fm/caja/distinfo
+++ b/x11-fm/caja/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/caja-1.12.4.tar.xz) = 0987c4b0ee72660a313b24b2b41bb5cf7b57e35d236ec0217268b3b03287799a
-SIZE (mate/caja-1.12.4.tar.xz) = 3646176
+TIMESTAMP = 1497519794
+SHA256 (mate/caja-1.18.3.tar.xz) = b562c544f907944b2e1ce426b5e1d1d02886ecfff8d44f0a3ae2a2793ac39256
+SIZE (mate/caja-1.18.3.tar.xz) = 3526224
diff --git a/x11-fm/caja/pkg-plist b/x11-fm/caja/pkg-plist
index cc28901a0a91..41ba7a0a0357 100644
--- a/x11-fm/caja/pkg-plist
+++ b/x11-fm/caja/pkg-plist
@@ -18,12 +18,10 @@ lib/libcaja-extension.so
 lib/libcaja-extension.so.1
 lib/libcaja-extension.so.1.4.0
 libdata/pkgconfig/libcaja-extension.pc
-libexec/caja-convert-metadata
 man/man1/caja-autorun-software.1.gz
 man/man1/caja-connect-server.1.gz
 man/man1/caja-file-management-properties.1.gz
 man/man1/caja.1.gz
-share/MateConf/gsettings/caja.convert
 share/appdata/caja.appdata.xml
 share/applications/caja-autorun-software.desktop
 share/applications/caja-browser.desktop
@@ -34,8 +32,11 @@ share/applications/caja-home.desktop
 share/applications/caja.desktop
 share/applications/mate-network-scheme.desktop
 %%DATADIR%%/browser.xml
+%%DATADIR%%/caja-desktop-3.14.css
+%%DATADIR%%/caja-desktop.css
 %%DATADIR%%/caja-extras.placeholder
 %%DATADIR%%/caja-suggested.placeholder
+%%DATADIR%%/caja.css
 %%DATADIR%%/patterns/blue_gray_rough.png
 %%DATADIR%%/patterns/blue_ridge.png
 %%DATADIR%%/patterns/blue_type.png
@@ -77,23 +78,23 @@ share/applications/mate-network-scheme.desktop
 %%DATADIR%%/ui/caja-shell-ui.xml
 %%DATADIR%%/ui/caja-spatial-window-ui.xml
 share/dbus-1/services/org.mate.freedesktop.FileManager1.service
+share/doc/libcaja-extension/CajaColumn.html
+share/doc/libcaja-extension/CajaColumnProvider.html
+share/doc/libcaja-extension/CajaFileInfo.html
+share/doc/libcaja-extension/CajaInfoProvider.html
+share/doc/libcaja-extension/CajaLocationWidgetProvider.html
+share/doc/libcaja-extension/CajaMenu.html
+share/doc/libcaja-extension/CajaMenuItem.html
+share/doc/libcaja-extension/CajaMenuProvider.html
+share/doc/libcaja-extension/CajaPropertyPage.html
+share/doc/libcaja-extension/CajaPropertyPageProvider.html
 share/doc/libcaja-extension/ch01.html
 share/doc/libcaja-extension/home.png
 share/doc/libcaja-extension/index.html
-share/doc/libcaja-extension/index.sgml
 share/doc/libcaja-extension/ix01.html
 share/doc/libcaja-extension/left-insensitive.png
 share/doc/libcaja-extension/left.png
-share/doc/libcaja-extension/libcaja-extension-caja-column-provider.html
-share/doc/libcaja-extension/libcaja-extension-caja-column.html
-share/doc/libcaja-extension/libcaja-extension-caja-extension-types.html
-share/doc/libcaja-extension/libcaja-extension-caja-file-info.html
-share/doc/libcaja-extension/libcaja-extension-caja-info-provider.html
-share/doc/libcaja-extension/libcaja-extension-caja-location-widget-provider.html
-share/doc/libcaja-extension/libcaja-extension-caja-menu-provider.html
-share/doc/libcaja-extension/libcaja-extension-caja-menu.html
-share/doc/libcaja-extension/libcaja-extension-caja-property-page-provider.html
-share/doc/libcaja-extension/libcaja-extension-caja-property-page.html
+share/doc/libcaja-extension/libcaja-extension-CajaModule.html
 share/doc/libcaja-extension/libcaja-extension.devhelp2
 share/doc/libcaja-extension/pt01.html
 share/doc/libcaja-extension/right-insensitive.png
@@ -117,7 +118,6 @@ share/locale/as/LC_MESSAGES/caja.mo
 share/locale/ast/LC_MESSAGES/caja.mo
 share/locale/az/LC_MESSAGES/caja.mo
 share/locale/be/LC_MESSAGES/caja.mo
-share/locale/be@latin/LC_MESSAGES/caja.mo
 share/locale/bg/LC_MESSAGES/caja.mo
 share/locale/bn/LC_MESSAGES/caja.mo
 share/locale/bn_IN/LC_MESSAGES/caja.mo
@@ -133,24 +133,25 @@ share/locale/da/LC_MESSAGES/caja.mo
 share/locale/de/LC_MESSAGES/caja.mo
 share/locale/dz/LC_MESSAGES/caja.mo
 share/locale/el/LC_MESSAGES/caja.mo
-share/locale/en@shaw/LC_MESSAGES/caja.mo
 share/locale/en_AU/LC_MESSAGES/caja.mo
 share/locale/en_CA/LC_MESSAGES/caja.mo
 share/locale/en_GB/LC_MESSAGES/caja.mo
-share/locale/en_US/LC_MESSAGES/caja.mo
 share/locale/eo/LC_MESSAGES/caja.mo
 share/locale/es/LC_MESSAGES/caja.mo
+share/locale/es_AR/LC_MESSAGES/caja.mo
+share/locale/es_CO/LC_MESSAGES/caja.mo
+share/locale/es_MX/LC_MESSAGES/caja.mo
 share/locale/et/LC_MESSAGES/caja.mo
 share/locale/eu/LC_MESSAGES/caja.mo
 share/locale/fa/LC_MESSAGES/caja.mo
 share/locale/fi/LC_MESSAGES/caja.mo
 share/locale/fr/LC_MESSAGES/caja.mo
+share/locale/frp/LC_MESSAGES/caja.mo
 share/locale/fur/LC_MESSAGES/caja.mo
 share/locale/fy/LC_MESSAGES/caja.mo
 share/locale/ga/LC_MESSAGES/caja.mo
 share/locale/gl/LC_MESSAGES/caja.mo
 share/locale/gu/LC_MESSAGES/caja.mo
-share/locale/gv/LC_MESSAGES/caja.mo
 share/locale/ha/LC_MESSAGES/caja.mo
 share/locale/he/LC_MESSAGES/caja.mo
 share/locale/hi/LC_MESSAGES/caja.mo
@@ -160,16 +161,15 @@ share/locale/hy/LC_MESSAGES/caja.mo
 share/locale/ia/LC_MESSAGES/caja.mo
 share/locale/id/LC_MESSAGES/caja.mo
 share/locale/ig/LC_MESSAGES/caja.mo
-share/locale/io/LC_MESSAGES/caja.mo
 share/locale/is/LC_MESSAGES/caja.mo
 share/locale/it/LC_MESSAGES/caja.mo
 share/locale/ja/LC_MESSAGES/caja.mo
 share/locale/ka/LC_MESSAGES/caja.mo
 share/locale/kk/LC_MESSAGES/caja.mo
-share/locale/km/LC_MESSAGES/caja.mo
 share/locale/kn/LC_MESSAGES/caja.mo
 share/locale/ko/LC_MESSAGES/caja.mo
 share/locale/ku/LC_MESSAGES/caja.mo
+share/locale/ku_IQ/LC_MESSAGES/caja.mo
 share/locale/ky/LC_MESSAGES/caja.mo
 share/locale/li/LC_MESSAGES/caja.mo
 share/locale/lt/LC_MESSAGES/caja.mo
@@ -192,18 +192,19 @@ share/locale/oc/LC_MESSAGES/caja.mo
 share/locale/or/LC_MESSAGES/caja.mo
 share/locale/pa/LC_MESSAGES/caja.mo
 share/locale/pl/LC_MESSAGES/caja.mo
+share/locale/pms/LC_MESSAGES/caja.mo
 share/locale/ps/LC_MESSAGES/caja.mo
 share/locale/pt/LC_MESSAGES/caja.mo
 share/locale/pt_BR/LC_MESSAGES/caja.mo
 share/locale/ro/LC_MESSAGES/caja.mo
 share/locale/ru/LC_MESSAGES/caja.mo
 share/locale/rw/LC_MESSAGES/caja.mo
+share/locale/sc/LC_MESSAGES/caja.mo
 share/locale/si/LC_MESSAGES/caja.mo
 share/locale/sk/LC_MESSAGES/caja.mo
 share/locale/sl/LC_MESSAGES/caja.mo
 share/locale/sq/LC_MESSAGES/caja.mo
 share/locale/sr/LC_MESSAGES/caja.mo
-share/locale/sr@ije/LC_MESSAGES/caja.mo
 share/locale/sr@latin/LC_MESSAGES/caja.mo
 share/locale/sv/LC_MESSAGES/caja.mo
 share/locale/ta/LC_MESSAGES/caja.mo
@@ -215,7 +216,6 @@ share/locale/ug/LC_MESSAGES/caja.mo
 share/locale/uk/LC_MESSAGES/caja.mo
 share/locale/ur/LC_MESSAGES/caja.mo
 share/locale/uz/LC_MESSAGES/caja.mo
-share/locale/uz@cyrillic/LC_MESSAGES/caja.mo
 share/locale/vi/LC_MESSAGES/caja.mo
 share/locale/wa/LC_MESSAGES/caja.mo
 share/locale/xh/LC_MESSAGES/caja.mo