7 files changed, 77 insertions, 76 deletions

diff --git a/x11-fm/Makefile b/x11-fm/Makefile
index 8cfbd4fe3b89..9a2ad4e51665 100644
--- a/x11-fm/Makefile
+++ b/x11-fm/Makefile
@@ -4,6 +4,7 @@
     COMMENT = X11 file managers
 
     SUBDIR += asfiles
+    SUBDIR += caja
     SUBDIR += catseye-fm
     SUBDIR += deforaos-browser
     SUBDIR += doublecmd
@@ -14,7 +15,6 @@
     SUBDIR += gnome-commander2
     SUBDIR += gprename
     SUBDIR += krusader2
-    SUBDIR += mate-file-manager
     SUBDIR += mtoolsfm
     SUBDIR += mucommander
     SUBDIR += nautilus
diff --git a/x11-fm/mate-file-manager/Makefile b/x11-fm/caja/Makefile
index dbff3da93367..9ef3755b8ee3 100644
--- a/x11-fm/mate-file-manager/Makefile
+++ b/x11-fm/caja/Makefile
@@ -1,9 +1,8 @@
 # Created by: ade, archie
 # $FreeBSD$
 
-PORTNAME=	mate-file-manager
-PORTVERSION=	1.6.2
-PORTREVISION=	3
+PORTNAME=	caja
+PORTVERSION=	1.8.1
 CATEGORIES=	x11-fm mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -27,19 +26,19 @@ USE_GNOME=	glib20 gnomehier gtk20 intlhack introspection:build \
 		libxml2 pango
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBPNG="-L${LOCALBASE}/lib -lpng -lz"
-CONFIGURE_ARGS=	--enable-static \
-		--disable-packagekit \
+CONFIGURE_ARGS=	--disable-packagekit \
 		--with-gtk=2.0 \
 		--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
 INSTALLS_ICONS=	yes
-INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.mate.caja.gschema.xml \
 		org.mate.media-handling.gschema.xml
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/caja/extensions-2.0
+
 .include <bsd.port.mk>
diff --git a/x11-fm/caja/distinfo b/x11-fm/caja/distinfo
new file mode 100644
index 000000000000..67849a18d6e8
--- /dev/null
+++ b/x11-fm/caja/distinfo
@@ -0,0 +1,2 @@
+SHA256 (mate/caja-1.8.1.tar.xz) = 6706fc853a6cc6a2f0a012cd08b396f2f72607bc6c50cf6dfd5b38c64d7c6818
+SIZE (mate/caja-1.8.1.tar.xz) = 3647396
diff --git a/x11-fm/mate-file-manager/files/patch-src_file-manager_fm-properties-window.c b/x11-fm/caja/files/patch-src_file-manager_fm-properties-window.c
index d709dec1e833..d709dec1e833 100644
--- a/x11-fm/mate-file-manager/files/patch-src_file-manager_fm-properties-window.c
+++ b/x11-fm/caja/files/patch-src_file-manager_fm-properties-window.c
diff --git a/x11-fm/mate-file-manager/pkg-descr b/x11-fm/caja/pkg-descr
index 69e0fa9fd465..69e0fa9fd465 100644
--- a/x11-fm/mate-file-manager/pkg-descr
+++ b/x11-fm/caja/pkg-descr
diff --git a/x11-fm/mate-file-manager/pkg-plist b/x11-fm/caja/pkg-plist
index 9e77d2680740..ca19afb67138 100644
--- a/x11-fm/mate-file-manager/pkg-plist
+++ b/x11-fm/caja/pkg-plist
@@ -14,15 +14,15 @@ include/caja/libcaja-extension/caja-menu.h
 include/caja/libcaja-extension/caja-property-page-provider.h
 include/caja/libcaja-extension/caja-property-page.h
 lib/girepository-1.0/Caja-2.0.typelib
-lib/libcaja-extension.a
 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.1.gz
+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/applications/caja-autorun-software.desktop
 share/applications/caja-browser.desktop
@@ -32,55 +32,56 @@ share/applications/caja-folder-handler.desktop
 share/applications/caja-home.desktop
 share/applications/caja.desktop
 share/applications/mate-network-scheme.desktop
-share/caja/browser.xml
-share/caja/caja-extras.placeholder
-share/caja/caja-suggested.placeholder
-share/caja/patterns/blue_gray_rough.png
-share/caja/patterns/blue_ridge.png
-share/caja/patterns/blue_type.png
-share/caja/patterns/brushed_metal.png
-share/caja/patterns/burlap.jpg
-share/caja/patterns/camouflage.png
-share/caja/patterns/chalk.jpg
-share/caja/patterns/cork.png
-share/caja/patterns/countertop.png
-share/caja/patterns/dark-mate.jpg
-share/caja/patterns/dots.png
-share/caja/patterns/fibers.png
-share/caja/patterns/fleur_de_lis.png
-share/caja/patterns/floral.png
-share/caja/patterns/fossil.png
-share/caja/patterns/green_weave.png
-share/caja/patterns/ice.png
-share/caja/patterns/manila_paper.png
-share/caja/patterns/mate.jpg
-share/caja/patterns/moss_ridge.png
-share/caja/patterns/numbers.png
-share/caja/patterns/ocean_stripes.png
-share/caja/patterns/purple_marble.png
-share/caja/patterns/reset.png
-share/caja/patterns/ridged_paper.png
-share/caja/patterns/rough_paper.png
-share/caja/patterns/sky_ridge.png
-share/caja/patterns/snow_ridge.png
-share/caja/patterns/stucco.jpg
-share/caja/patterns/terracotta.png
-share/caja/patterns/wavy_white.png
-share/caja/ui/caja-bookmarks-window.ui
-share/caja/ui/caja-desktop-icon-view-ui.xml
-share/caja/ui/caja-directory-view-ui.xml
-share/caja/ui/caja-file-management-properties.ui
-share/caja/ui/caja-icon-view-ui.xml
-share/caja/ui/caja-list-view-ui.xml
-share/caja/ui/caja-navigation-window-ui.xml
-share/caja/ui/caja-shell-ui.xml
-share/caja/ui/caja-spatial-window-ui.xml
+%%DATADIR%%/browser.xml
+%%DATADIR%%/caja-extras.placeholder
+%%DATADIR%%/caja-suggested.placeholder
+%%DATADIR%%/patterns/blue_gray_rough.png
+%%DATADIR%%/patterns/blue_ridge.png
+%%DATADIR%%/patterns/blue_type.png
+%%DATADIR%%/patterns/brushed_metal.png
+%%DATADIR%%/patterns/burlap.jpg
+%%DATADIR%%/patterns/camouflage.png
+%%DATADIR%%/patterns/chalk.jpg
+%%DATADIR%%/patterns/cork.png
+%%DATADIR%%/patterns/countertop.png
+%%DATADIR%%/patterns/dark-mate.jpg
+%%DATADIR%%/patterns/dots.png
+%%DATADIR%%/patterns/fibers.png
+%%DATADIR%%/patterns/fleur_de_lis.png
+%%DATADIR%%/patterns/floral.png
+%%DATADIR%%/patterns/fossil.png
+%%DATADIR%%/patterns/green_weave.png
+%%DATADIR%%/patterns/ice.png
+%%DATADIR%%/patterns/manila_paper.png
+%%DATADIR%%/patterns/mate.jpg
+%%DATADIR%%/patterns/moss_ridge.png
+%%DATADIR%%/patterns/numbers.png
+%%DATADIR%%/patterns/ocean_stripes.png
+%%DATADIR%%/patterns/purple_marble.png
+%%DATADIR%%/patterns/reset.png
+%%DATADIR%%/patterns/ridged_paper.png
+%%DATADIR%%/patterns/rough_paper.png
+%%DATADIR%%/patterns/sky_ridge.png
+%%DATADIR%%/patterns/snow_ridge.png
+%%DATADIR%%/patterns/stucco.jpg
+%%DATADIR%%/patterns/terracotta.png
+%%DATADIR%%/patterns/wavy_white.png
+%%DATADIR%%/ui/caja-bookmarks-window.ui
+%%DATADIR%%/ui/caja-desktop-icon-view-ui.xml
+%%DATADIR%%/ui/caja-directory-view-ui.xml
+%%DATADIR%%/ui/caja-file-management-properties.ui
+%%DATADIR%%/ui/caja-icon-view-ui.xml
+%%DATADIR%%/ui/caja-list-view-ui.xml
+%%DATADIR%%/ui/caja-navigation-window-ui.xml
+%%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/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
@@ -94,14 +95,19 @@ 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.devhelp2
 share/doc/libcaja-extension/pt01.html
+share/doc/libcaja-extension/right-insensitive.png
 share/doc/libcaja-extension/right.png
 share/doc/libcaja-extension/style.css
+share/doc/libcaja-extension/up-insensitive.png
 share/doc/libcaja-extension/up.png
 share/gir-1.0/Caja-2.0.gir
 share/icons/hicolor/16x16/apps/caja.png
+share/icons/hicolor/16x16/emblems/emblem-note.png
 share/icons/hicolor/22x22/apps/caja.png
 share/icons/hicolor/24x24/apps/caja.png
+share/icons/hicolor/24x24/emblems/emblem-note.png
 share/icons/hicolor/32x32/apps/caja.png
+share/icons/hicolor/48x48/emblems/emblem-note.png
 share/icons/hicolor/scalable/apps/caja.svg
 share/locale/af/LC_MESSAGES/caja.mo
 share/locale/am/LC_MESSAGES/caja.mo
@@ -118,6 +124,7 @@ share/locale/br/LC_MESSAGES/caja.mo
 share/locale/bs/LC_MESSAGES/caja.mo
 share/locale/ca/LC_MESSAGES/caja.mo
 share/locale/ca@valencia/LC_MESSAGES/caja.mo
+share/locale/cmn/LC_MESSAGES/caja.mo
 share/locale/crh/LC_MESSAGES/caja.mo
 share/locale/cs/LC_MESSAGES/caja.mo
 share/locale/cy/LC_MESSAGES/caja.mo
@@ -203,6 +210,7 @@ share/locale/tk/LC_MESSAGES/caja.mo
 share/locale/tr/LC_MESSAGES/caja.mo
 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
@@ -214,9 +222,6 @@ share/locale/zh_CN/LC_MESSAGES/caja.mo
 share/locale/zh_HK/LC_MESSAGES/caja.mo
 share/locale/zh_TW/LC_MESSAGES/caja.mo
 share/locale/zu/LC_MESSAGES/caja.mo
-share/mate-file-manager/icons/hicolor/16x16/emblems/emblem-note.png
-share/mate-file-manager/icons/hicolor/24x24/emblems/emblem-note.png
-share/mate-file-manager/icons/hicolor/48x48/emblems/emblem-note.png
 share/mime/application/x-mate-saved-search.xml
 share/mime/packages/caja.xml
 share/pixmaps/caja/audio.svg
@@ -227,16 +232,8 @@ share/pixmaps/caja/emblems.png
 share/pixmaps/caja/erase.png
 share/pixmaps/caja/knob.png
 share/pixmaps/caja/thumbnail_frame.png
-@dirrm share/pixmaps/caja
-@dirrmtry share/mate-file-manager/icons/hicolor/48x48/emblems
-@dirrmtry share/mate-file-manager/icons/hicolor/48x48
-@dirrmtry share/mate-file-manager/icons/hicolor/24x24/emblems
-@dirrmtry share/mate-file-manager/icons/hicolor/24x24
-@dirrmtry share/mate-file-manager/icons/hicolor/16x16/emblems
-@dirrmtry share/mate-file-manager/icons/hicolor/16x16
-@dirrmtry share/mate-file-manager/icons/hicolor
-@dirrmtry share/mate-file-manager/icons
-@dirrmtry share/mate-file-manager
+@dirrmtry share/pixmaps/caja
+@dirrmtry share/mime/application
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -249,6 +246,8 @@ share/pixmaps/caja/thumbnail_frame.png
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
 @dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
@@ -305,6 +304,8 @@ share/pixmaps/caja/thumbnail_frame.png
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/crh/LC_MESSAGES
 @dirrmtry share/locale/crh
+@dirrmtry share/locale/cmn/LC_MESSAGES
+@dirrmtry share/locale/cmn
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
@@ -315,10 +316,11 @@ share/pixmaps/caja/thumbnail_frame.png
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrm share/doc/libcaja-extension
-@dirrm share/caja/ui
-@dirrm share/caja/patterns
-@dirrm share/caja
-@dirrmtry share/mime/application
-@dirrm include/caja/libcaja-extension
-@dirrm include/caja
+@dirrmtry share/doc/libcaja-extension
+@dirrmtry %%DATADIR%%/ui
+@dirrmtry %%DATADIR%%/patterns
+@dirrmtry %%DATADIR%%
+@dirrmtry lib/caja/extensions-2.0
+@dirrmtry lib/caja
+@dirrmtry include/caja/libcaja-extension
+@dirrmtry include/caja
diff --git a/x11-fm/mate-file-manager/distinfo b/x11-fm/mate-file-manager/distinfo
deleted file mode 100644
index 2090a1a25f5f..000000000000
--- a/x11-fm/mate-file-manager/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mate/mate-file-manager-1.6.2.tar.xz) = c1df364fa72ca7e37faf2124cecd90d6d1be9532030d11d2d7bbe2aa93db74f3
-SIZE (mate/mate-file-manager-1.6.2.tar.xz) = 3522924