Update caja to 1.18.3.

4 files changed, 31 insertions, 39 deletions

diff --git a/sysutils/caja/Makefile b/sysutils/caja/Makefile
index e05b3c2a540..d0be9606668 100644
--- a/sysutils/caja/Makefile
+++ b/sysutils/caja/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2017/02/12 06:24:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2017/06/23 17:06:33 youri Exp $
 
-PKGREVISION= 3
 .include "../../meta-pkgs/mate/Makefile.common"
 
-DISTNAME=	caja-1.14.1
+DISTNAME=	caja-${VERSION:R}.3
 CATEGORIES=	sysutils
+MASTER_SITES+=	http://pub.mate-desktop.org/releases/${VERSION:R}/
 
 COMMENT=	File manager for the MATE desktop
 
@@ -18,18 +18,11 @@ PKGCONFIG_OVERRIDE+=	libcaja-extension/libcaja-extension.pc.in
 
 .include "../../x11/mate-desktop/buildlink3.mk"
 .include "../../devel/exempi/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pangox-compat/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libunique/buildlink3.mk"
-.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/caja/PLIST b/sysutils/caja/PLIST
index c709a5c4c34..23dfc6d978c 100644
--- a/sysutils/caja/PLIST
+++ b/sysutils/caja/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/06/13 22:31:25 youri Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/06/23 17:06:33 youri Exp $
 bin/caja
 bin/caja-autorun-software
 bin/caja-connect-server
@@ -16,7 +16,6 @@ include/caja/libcaja-extension/caja-property-page-provider.h
 include/caja/libcaja-extension/caja-property-page.h
 lib/libcaja-extension.la
 lib/pkgconfig/libcaja-extension.pc
-libexec/caja-convert-metadata
 man/man1/caja-autorun-software.1
 man/man1/caja-connect-server.1
 man/man1/caja-file-management-properties.1
@@ -31,6 +30,8 @@ share/applications/caja-home.desktop
 share/applications/caja.desktop
 share/applications/mate-network-scheme.desktop
 share/caja/browser.xml
+share/caja/caja-desktop-3.14.css
+share/caja/caja-desktop.css
 share/caja/caja-extras.placeholder
 share/caja/caja-suggested.placeholder
 share/caja/caja.css
@@ -77,26 +78,29 @@ share/caja/ui/caja-spatial-window-ui.xml
 share/dbus-1/services/org.mate.freedesktop.FileManager1.service
 share/glib-2.0/schemas/org.mate.caja.gschema.xml
 share/glib-2.0/schemas/org.mate.media-handling.gschema.xml
+share/gtk-doc/html/libcaja-extension/CajaColumn.html
+share/gtk-doc/html/libcaja-extension/CajaColumnProvider.html
+share/gtk-doc/html/libcaja-extension/CajaFileInfo.html
+share/gtk-doc/html/libcaja-extension/CajaInfoProvider.html
+share/gtk-doc/html/libcaja-extension/CajaLocationWidgetProvider.html
+share/gtk-doc/html/libcaja-extension/CajaMenu.html
+share/gtk-doc/html/libcaja-extension/CajaMenuItem.html
+share/gtk-doc/html/libcaja-extension/CajaMenuProvider.html
+share/gtk-doc/html/libcaja-extension/CajaPropertyPage.html
+share/gtk-doc/html/libcaja-extension/CajaPropertyPageProvider.html
 share/gtk-doc/html/libcaja-extension/ch01.html
 share/gtk-doc/html/libcaja-extension/home.png
 share/gtk-doc/html/libcaja-extension/index.html
-share/gtk-doc/html/libcaja-extension/index.sgml
 share/gtk-doc/html/libcaja-extension/ix01.html
+share/gtk-doc/html/libcaja-extension/left-insensitive.png
 share/gtk-doc/html/libcaja-extension/left.png
-share/gtk-doc/html/libcaja-extension/libcaja-extension-caja-column-provider.html
-share/gtk-doc/html/libcaja-extension/libcaja-extension-caja-column.html
-share/gtk-doc/html/libcaja-extension/libcaja-extension-caja-extension-types.html
-share/gtk-doc/html/libcaja-extension/libcaja-extension-caja-file-info.html
-share/gtk-doc/html/libcaja-extension/libcaja-extension-caja-info-provider.html
-share/gtk-doc/html/libcaja-extension/libcaja-extension-caja-location-widget-provider.html
-share/gtk-doc/html/libcaja-extension/libcaja-extension-caja-menu-provider.html
-share/gtk-doc/html/libcaja-extension/libcaja-extension-caja-menu.html
-share/gtk-doc/html/libcaja-extension/libcaja-extension-caja-property-page-provider.html
-share/gtk-doc/html/libcaja-extension/libcaja-extension-caja-property-page.html
+share/gtk-doc/html/libcaja-extension/libcaja-extension-CajaModule.html
 share/gtk-doc/html/libcaja-extension/libcaja-extension.devhelp2
 share/gtk-doc/html/libcaja-extension/pt01.html
+share/gtk-doc/html/libcaja-extension/right-insensitive.png
 share/gtk-doc/html/libcaja-extension/right.png
 share/gtk-doc/html/libcaja-extension/style.css
+share/gtk-doc/html/libcaja-extension/up-insensitive.png
 share/gtk-doc/html/libcaja-extension/up.png
 share/icons/hicolor/16x16/apps/caja.png
 share/icons/hicolor/16x16/emblems/emblem-note.png
@@ -113,7 +117,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
@@ -129,11 +132,9 @@ 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
@@ -150,7 +151,6 @@ 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 +160,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 +191,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 +215,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
diff --git a/sysutils/caja/buildlink3.mk b/sysutils/caja/buildlink3.mk
index 7f3c947eac8..6bc60a18130 100644
--- a/sysutils/caja/buildlink3.mk
+++ b/sysutils/caja/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/02/12 06:24:49 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2017/06/23 17:06:33 youri Exp $
 #
 
 BUILDLINK_TREE+=	caja
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=	caja
 CAJA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.caja+=	caja>=1.8.2
-BUILDLINK_ABI_DEPENDS.caja?=	caja>=1.14.1nb3
+BUILDLINK_ABI_DEPENDS.caja+=	caja>=1.14.1nb3
 BUILDLINK_PKGSRCDIR.caja?=	../../sysutils/caja
 
 .include "../../x11/mate-desktop/buildlink3.mk"
diff --git a/sysutils/caja/distinfo b/sysutils/caja/distinfo
index 5232f75bfc0..4caf0747069 100644
--- a/sysutils/caja/distinfo
+++ b/sysutils/caja/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2016/06/13 22:31:25 youri Exp $
+$NetBSD: distinfo,v 1.3 2017/06/23 17:06:33 youri Exp $
 
-SHA1 (caja-1.14.1.tar.xz) = db84d1876031974e33db12eb0bea187639a11cc7
-RMD160 (caja-1.14.1.tar.xz) = 0ed65b52f28681e9397e7e9b6c19905f02b572e5
-SHA512 (caja-1.14.1.tar.xz) = a179785c9ec5f322388082f7959df00a7b9014fbdcc3739c9f0b08466e8d404940278c4ac0caf06114176a8f75b2e49e2d11b0db63b5f82409ba52027b60afc7
-Size (caja-1.14.1.tar.xz) = 3611160 bytes
+SHA1 (caja-1.18.3.tar.xz) = 9b591659df514712dadb1be5eab15f106b9ea75d
+RMD160 (caja-1.18.3.tar.xz) = 375e3b84d494ae1d4e6dc36871a6ac59f0bb8698
+SHA512 (caja-1.18.3.tar.xz) = 845f7532fbf701fecc5b0e29036ee4b4d6c65f520d6d7fdbddd05d7e7bcd0f7bbd52c54cb45dbb0bd7a5bbf2ece11e584e5074e4c86954b2730baa469168a566
+Size (caja-1.18.3.tar.xz) = 3526224 bytes
 SHA1 (patch-eel_eel-background.c) = 9d0ed0d9f3c9004f6d9024837538cc26cdb410da
 SHA1 (patch-libcaja-private_caja-global-preferences.c) = 122d62430cf57e274f1e561783ca0f69d0de7d56
 SHA1 (patch-libcaja-private_caja-global-preferences.h) = edac3dc74ad737ed9e5347e8eb5eb83866dcaadf