7 files changed, 113 insertions, 70 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index b72db2fd3a7a..cd2429eabcc0 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -2,40 +2,33 @@
 # $FreeBSD$
 
 PORTNAME=	nautilus
-PORTVERSION=	3.18.5
-PORTREVISION=	1
+PORTVERSION=	3.28.1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	File manager for the GNOME desktop
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libexif.so:graphics/libexif \
-		libnotify.so:devel/libnotify \
-		libexempi.so:textproc/exempi
-RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libgnome-autoar-0.so:archivers/gnome-autoar \
+		libgexiv2.so:graphics/gexiv2 \
+		libtracker-sparql-2.0.so:sysutils/tracker
 
 PORTSCOUT=	limitw:1,even
 
-USES=		compiler:c11 desktop-file-utils gettext gmake gnome \
-		libtool pathfix pkgconfig tar:xz
-USE_GNOME=	intlhack gnomedesktop3 libxml2 gvfs introspection:build
+USES=		compiler:c11 desktop-file-utils gettext gnome \
+		localbase meson pkgconfig python:3.4+,build tar:xz
+#USE_GNOME=	cairo gdkpixbuf2 gnomedesktop3 introspection:build
+USE_GNOME=	cairo gdkpixbuf2 gnomedesktop3
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--disable-packagekit
-INSTALL_TARGET=	install-strip
+USE_XORG=	x11
+MESON_ARGS=	-Denable-packagekit=false \
+		-Denable-selinux=false
+BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 GLIB_SCHEMAS=	org.gnome.nautilus.gschema.xml
 
-OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	TRACKER
-OPTIONS_DEFAULT=TRACKER
-TRACKER_DESC=	Tracker support
-TRACKER_LIB_DEPENDS=	libtracker-control-1.0.so:sysutils/tracker
-TRACKER_CONFIGURE_ENABLE=	tracker
-
 .include <bsd.port.mk>
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index 6dce384cb376..73e1e540f802 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/nautilus-3.18.5.tar.xz) = 60a927c0522b4cced9d8f62baed2ee5e2fd4305be4523eb5bc44805971a6cc15
-SIZE (gnome3/nautilus-3.18.5.tar.xz) = 3349312
+TIMESTAMP = 1525501674
+SHA256 (gnome/nautilus-3.28.1.tar.xz) = 9ce878fc9d9f950475c504066ce5f8e98a8cfbf15051724469e865ea85bab0a5
+SIZE (gnome/nautilus-3.28.1.tar.xz) = 3262520
diff --git a/x11-fm/nautilus/files/patch-Makefile.in b/x11-fm/nautilus/files/patch-Makefile.in
deleted file mode 100644
index a4f79ca6bb37..000000000000
--- a/x11-fm/nautilus/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	Wed Nov 24 13:14:21 2004
-+++ Makefile.in	Wed Nov 24 13:14:47 2004
-@@ -183,7 +183,6 @@
- 	libbackground		\
- 	libnautilus-private 	\
- 	src 			\
--	test 			\
- 	po 			\
- 	data 			\
- 	icons 			\
diff --git a/x11-fm/nautilus/files/patch-data_meson.build b/x11-fm/nautilus/files/patch-data_meson.build
new file mode 100644
index 000000000000..9d1a4b140874
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-data_meson.build
@@ -0,0 +1,28 @@
+From git master. Fixes the same 512x512 icon being installed as all sizes.
+--- data/meson.build.orig	2018-06-24 22:58:44 UTC
++++ data/meson.build
+@@ -8,17 +8,15 @@
+ # https://gitlab.gnome.org/GNOME/nautilus/merge_requests/144
+ ##########
+ foreach icon_size: ['16x16', '22x22', '24x24', '32x32', '48x48', '512x512']
+-  configure_file(
+-    command: [
+-      'cp', '@INPUT@', '@OUTPUT@'
+-    ],
+-    input: files(
+-      join_paths('icons', 'hicolor', icon_size, 'apps', 'org.gnome.Nautilus.png')
+-    ),
+-    install_dir: join_paths(datadir, 'icons', 'hicolor', icon_size, 'apps'),
+-    output: '@0@.png'.format(application_id)
++  icondir = join_paths('icons', 'hicolor', icon_size, 'apps')
++
++  install_data(
++    join_paths(icondir, 'org.gnome.Nautilus.png'),
++    install_dir: join_paths(datadir, icondir),
++    rename: '@0@.png'.format(application_id)
+   )
+ endforeach
++
+ 
+ configure_file(
+   command: [
diff --git a/x11-fm/nautilus/files/patch-src_meson.build b/x11-fm/nautilus/files/patch-src_meson.build
new file mode 100644
index 000000000000..df2db60ed757
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-src_meson.build
@@ -0,0 +1,50 @@
+diff --git a/src/meson.build b/src/meson.build
+index 0979128c8ed4ab828f6d546ab86c301ab0c3f98c..c6fbd8808c3ecc0a30af14d621e24f921be2eb55 100644
+--- src/meson.build
++++ src/meson.build
+@@ -1,3 +1,13 @@
++resources = gnome.compile_resources(
++  'nautilus-resources',
++  join_paths(
++    'resources', 'nautilus.gresource.xml'
++  ),
++  source_dir: 'resources',
++  c_name: 'nautilus',
++  extra_args: '--manual-register'
++)
++
+ libnautilus_sources = [
+   gnome.mkenums(
+     'nautilus-enum-types',
+@@ -10,15 +20,8 @@ libnautilus_sources = [
+       'nautilus-search-provider.h'
+     ]
+   ),
+-  gnome.compile_resources(
+-    'nautilus-resources',
+-    join_paths(
+-      'resources', 'nautilus.gresource.xml'
+-    ),
+-    source_dir: 'resources',
+-    c_name: 'nautilus',
+-    extra_args: '--manual-register'
+-  ),
++  # The header is only used by the main executable, no need to add it here.
++  resources[0],
+   gnome.gdbus_codegen(
+     'nautilus-freedesktop-generated',
+     join_paths(
+@@ -294,7 +297,12 @@ libnautilus_dep = declare_dependency(
+     nautilus_include_dirs,
+     libnautilus_include_dirs
+   ],
+-  dependencies: nautilus_deps
++  dependencies: nautilus_deps,
++  # nautilus-main.c, which is part of the main Nautilus executable, uses
++  # the header, generated by glib-compile-resources. Passing it on from here
++  # will ensure that an internal compile-time dependency is placed on this file,
++  # thus avoiding failures that are difficult to reproduce.
++  sources: resources[1]
+ )
+ 
+ nautilus = executable(
diff --git a/x11-fm/nautilus/pkg-descr b/x11-fm/nautilus/pkg-descr
index b4f3fd678e8f..c67beaae4d09 100644
--- a/x11-fm/nautilus/pkg-descr
+++ b/x11-fm/nautilus/pkg-descr
@@ -1,5 +1,5 @@
-Nautilus is a file manager tightly integrated into the GNOME destkop.
+Nautilus is a file manager tightly integrated into the GNOME desktop.
 It is also responsible for desktop and icon management, and provides
 an intuitive interface for accessing files and webpages.
 
-WWW: http://www.gnome.org/projects/nautilus/
+WWW: https://wiki.gnome.org/Apps/Nautilus
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 017a1efd9bd3..2c51e41f4496 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -1,8 +1,8 @@
 bin/nautilus
 bin/nautilus-autorun-software
-etc/xdg/autostart/nautilus-autostart.desktop
 include/nautilus/libnautilus-extension/nautilus-column-provider.h
 include/nautilus/libnautilus-extension/nautilus-column.h
+include/nautilus/libnautilus-extension/nautilus-extension-enum-types.h
 include/nautilus/libnautilus-extension/nautilus-extension-types.h
 include/nautilus/libnautilus-extension/nautilus-file-info.h
 include/nautilus/libnautilus-extension/nautilus-info-provider.h
@@ -12,48 +12,27 @@ include/nautilus/libnautilus-extension/nautilus-menu-provider.h
 include/nautilus/libnautilus-extension/nautilus-menu.h
 include/nautilus/libnautilus-extension/nautilus-property-page-provider.h
 include/nautilus/libnautilus-extension/nautilus-property-page.h
+include/nautilus/nautilus-extension.h
 lib/girepository-1.0/Nautilus-3.0.typelib
 lib/libnautilus-extension.so
 lib/libnautilus-extension.so.1
-lib/libnautilus-extension.so.1.4.0
+lib/libnautilus-extension.so.1.5.0
+lib/nautilus/extensions-3.0/libnautilus-image-properties.so
 lib/nautilus/extensions-3.0/libnautilus-sendto.so
 libdata/pkgconfig/libnautilus-extension.pc
-libexec/nautilus-convert-metadata
-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/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-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
-share/gtk-doc/html/libnautilus-extension/right.png
-share/gtk-doc/html/libnautilus-extension/style.css
-share/gtk-doc/html/libnautilus-extension/up-insensitive.png
-share/gtk-doc/html/libnautilus-extension/up.png
+share/gnome-shell/search-providers/org.gnome.Nautilus.search-provider.ini
+share/icons/hicolor/16x16/apps/org.gnome.Nautilus.png
+share/icons/hicolor/22x22/apps/org.gnome.Nautilus.png
+share/icons/hicolor/24x24/apps/org.gnome.Nautilus.png
+share/icons/hicolor/32x32/apps/org.gnome.Nautilus.png
+share/icons/hicolor/48x48/apps/org.gnome.Nautilus.png
+share/icons/hicolor/512x512/apps/org.gnome.Nautilus.png
+share/icons/hicolor/symbolic/apps/org.gnome.Nautilus-symbolic.svg
 share/locale/af/LC_MESSAGES/nautilus.mo
 share/locale/am/LC_MESSAGES/nautilus.mo
 share/locale/an/LC_MESSAGES/nautilus.mo
@@ -115,6 +94,7 @@ share/locale/ko/LC_MESSAGES/nautilus.mo
 share/locale/ku/LC_MESSAGES/nautilus.mo
 share/locale/ky/LC_MESSAGES/nautilus.mo
 share/locale/li/LC_MESSAGES/nautilus.mo
+share/locale/ln/LC_MESSAGES/nautilus.mo
 share/locale/lt/LC_MESSAGES/nautilus.mo
 share/locale/lv/LC_MESSAGES/nautilus.mo
 share/locale/mai/LC_MESSAGES/nautilus.mo
@@ -169,3 +149,4 @@ share/locale/zh_CN/LC_MESSAGES/nautilus.mo
 share/locale/zh_HK/LC_MESSAGES/nautilus.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 share/locale/zu/LC_MESSAGES/nautilus.mo
+share/metainfo/org.gnome.Nautilus.appdata.xml