6 files changed, 23 insertions, 29 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 8461aedf9426..30798e02656c 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nautilus
-PORTVERSION=	3.16.3
+PORTVERSION=	3.18.5
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -10,17 +10,15 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	File manager for the GNOME desktop
 
-BUILD_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 		libnotify.so:${PORTSDIR}/devel/libnotify \
 		libexempi.so:${PORTSDIR}/textproc/exempi
-RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
-USES=		desktop-file-utils gettext gmake libtool pathfix \
+USES=		desktop-file-utils gettext gmake gnome libtool pathfix \
 		pkgconfig tar:xz
 USE_GNOME=	intlhack gnomedesktop3 libxml2 gvfs introspection:build
 USE_LDCONFIG=	yes
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index c1e4695063ef..6dce384cb376 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/nautilus-3.16.3.tar.xz) = 5ff2f904ac1d4e7db213782946605d5e9570c9e2c85329713c2aced24303a36e
-SIZE (gnome3/nautilus-3.16.3.tar.xz) = 3335404
+SHA256 (gnome3/nautilus-3.18.5.tar.xz) = 60a927c0522b4cced9d8f62baed2ee5e2fd4305be4523eb5bc44805971a6cc15
+SIZE (gnome3/nautilus-3.18.5.tar.xz) = 3349312
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 5e58dcbb1462..017a1efd9bd3 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -1,6 +1,5 @@
 bin/nautilus
 bin/nautilus-autorun-software
-bin/nautilus-connect-server
 etc/xdg/autostart/nautilus-autostart.desktop
 include/nautilus/libnautilus-extension/nautilus-column-provider.h
 include/nautilus/libnautilus-extension/nautilus-column.h
@@ -20,34 +19,34 @@ lib/libnautilus-extension.so.1.4.0
 lib/nautilus/extensions-3.0/libnautilus-sendto.so
 libdata/pkgconfig/libnautilus-extension.pc
 libexec/nautilus-convert-metadata
-man/man1/nautilus-connect-server.1.gz
 man/man1/nautilus.1.gz
 share/GConf/gsettings/nautilus.convert
 share/appdata/org.gnome.Nautilus.appdata.xml
 share/applications/nautilus-autorun-software.desktop
 share/applications/nautilus-classic.desktop
-share/applications/nautilus-connect-server.desktop
 share/applications/org.gnome.Nautilus.desktop
 share/dbus-1/services/org.freedesktop.FileManager1.service
 share/dbus-1/services/org.gnome.Nautilus.service
 share/gir-1.0/Nautilus-3.0.gir
 share/gnome-shell/search-providers/nautilus-search-provider.ini
+share/gtk-doc/html/libnautilus-extension/NautilusColumn.html
+share/gtk-doc/html/libnautilus-extension/NautilusColumnProvider.html
+share/gtk-doc/html/libnautilus-extension/NautilusFileInfo.html
+share/gtk-doc/html/libnautilus-extension/NautilusInfoProvider.html
+share/gtk-doc/html/libnautilus-extension/NautilusLocationWidgetProvider.html
+share/gtk-doc/html/libnautilus-extension/NautilusMenu.html
+share/gtk-doc/html/libnautilus-extension/NautilusMenuItem.html
+share/gtk-doc/html/libnautilus-extension/NautilusMenuProvider.html
+share/gtk-doc/html/libnautilus-extension/NautilusPropertyPage.html
+share/gtk-doc/html/libnautilus-extension/NautilusPropertyPageProvider.html
 share/gtk-doc/html/libnautilus-extension/ch01.html
 share/gtk-doc/html/libnautilus-extension/home.png
 share/gtk-doc/html/libnautilus-extension/index.html
+share/gtk-doc/html/libnautilus-extension/index.sgml
 share/gtk-doc/html/libnautilus-extension/ix01.html
 share/gtk-doc/html/libnautilus-extension/left-insensitive.png
 share/gtk-doc/html/libnautilus-extension/left.png
-share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-column-provider.html
-share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-column.html
-share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-extension-types.html
-share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-file-info.html
-share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-info-provider.html
-share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-location-widget-provider.html
-share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-menu-provider.html
-share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-menu.html
-share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-property-page-provider.html
-share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-property-page.html
+share/gtk-doc/html/libnautilus-extension/libnautilus-extension-NautilusModule.html
 share/gtk-doc/html/libnautilus-extension/libnautilus-extension.devhelp2
 share/gtk-doc/html/libnautilus-extension/pt01.html
 share/gtk-doc/html/libnautilus-extension/right-insensitive.png
diff --git a/x11-fm/sushi/Makefile b/x11-fm/sushi/Makefile
index d6ed753bd6b3..89fe9aee1101 100644
--- a/x11-fm/sushi/Makefile
+++ b/x11-fm/sushi/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sushi
-PORTVERSION=	3.16.0
-PORTREVISION=	1
+PORTVERSION=	3.18.0
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -22,7 +21,7 @@ RUN_DEPENDS=	nautilus:${PORTSDIR}/x11-fm/nautilus
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix gtksourceview3 intlhack introspection:build
 USE_LDCONFIG=	yes
@@ -31,6 +30,4 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-GLIB_SCHEMAS=	org.gnome.sushi.gschema.xml
-
 .include <bsd.port.mk>
diff --git a/x11-fm/sushi/distinfo b/x11-fm/sushi/distinfo
index 7a48e2368c91..1d82ffeef346 100644
--- a/x11-fm/sushi/distinfo
+++ b/x11-fm/sushi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/sushi-3.16.0.tar.xz) = 86c4e22b374514492334b5fcca6f170d328dae77cfcc0acd357c5426600b0034
-SIZE (gnome3/sushi-3.16.0.tar.xz) = 282588
+SHA256 (gnome3/sushi-3.18.0.tar.xz) = 7f4df92be950bf23aff28da49ce108766dd21a88efc14a9d0807e10225608e9c
+SIZE (gnome3/sushi-3.18.0.tar.xz) = 294676
diff --git a/x11-fm/sushi/pkg-plist b/x11-fm/sushi/pkg-plist
index 45cfb4fe244c..3127c620d6c6 100644
--- a/x11-fm/sushi/pkg-plist
+++ b/x11-fm/sushi/pkg-plist
@@ -44,6 +44,7 @@ share/locale/ml/LC_MESSAGES/sushi.mo
 share/locale/mr/LC_MESSAGES/sushi.mo
 share/locale/nb/LC_MESSAGES/sushi.mo
 share/locale/nl/LC_MESSAGES/sushi.mo
+share/locale/oc/LC_MESSAGES/sushi.mo
 share/locale/or/LC_MESSAGES/sushi.mo
 share/locale/pa/LC_MESSAGES/sushi.mo
 share/locale/pl/LC_MESSAGES/sushi.mo
@@ -87,4 +88,3 @@ share/sushi/js/viewers/gst.js
 share/sushi/js/viewers/html.js
 share/sushi/js/viewers/image.js
 share/sushi/js/viewers/text.js
-share/sushi/style/gtk-style.css