3 files changed, 21 insertions, 17 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 8b3d09bacf31..a6faea65599e 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -1,30 +1,28 @@
 # Created by: ade, archie
 
 PORTNAME=	nautilus
-PORTVERSION=	3.36.3
+PORTVERSION=	40.2
 CATEGORIES=	x11-fm gnome
-MASTER_SITES=	GNOME
+MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
-# Fix against glib 2.68.3
-PATCH_SITES=	https://gitlab.gnome.org/GNOME/nautilus/-/commit/
-PATCHFILES=	9b733dd9df9d6d9805c56749d05ada15a7560ef4.diff:-p1
-
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	File manager for the GNOME desktop
 
 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 \
-		libtotem.so:multimedia/totem
+LIB_DEPENDS=	libgexiv2.so:graphics/gexiv2 \
+		libgnome-autoar-0.so:archivers/gnome-autoar \
+		libhandy-1.so:x11-toolkits/libhandy \
+		libportal.so:deskutils/libportal \
+		libtotem.so:multimedia/totem \
+		libtracker-sparql-3.0.so:sysutils/tracker3
 
 PORTSCOUT=	limitw:1,even
 
-USES=		compiler:c11 desktop-file-utils gettext gnome \
-		localbase meson pkgconfig python:3.6+,build tar:xz xorg
+USES=		compiler:c11 desktop-file-utils gettext gnome localbase meson \
+		pkgconfig python:3.6+,build tar:xz xorg
 USE_GNOME=	cairo gdkpixbuf2 gnomedesktop3
 USE_GSTREAMER1=	yes
 INSTALLS_ICONS=	yes
@@ -36,8 +34,8 @@ BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 GLIB_SCHEMAS=	org.gnome.nautilus.gschema.xml
 
-OPTIONS_DEFINE=	GVFS
-OPTIONS_DEFAULT=GVFS
+OPTIONS_DEFINE=		GVFS
+OPTIONS_DEFAULT=	GVFS
 
 GVFS_USE=	GNOME=gvfs
 
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index d2962ae475c1..c9ed2170b84d 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1627057689
-SHA256 (gnome/nautilus-3.36.3.tar.xz) = b6cafc7ab1e70a64383de391b6097fcccbf36b208f8502d8c46423224fd30ef8
-SIZE (gnome/nautilus-3.36.3.tar.xz) = 3201908
+TIMESTAMP = 1629037876
+SHA256 (gnome/nautilus-40.2.tar.xz) = b71ef2fe07e5eea89a2bb1e5bd30947bd18873bfb30f79cbf17edfbd4d20f60d
+SIZE (gnome/nautilus-40.2.tar.xz) = 3250384
 SHA256 (gnome/9b733dd9df9d6d9805c56749d05ada15a7560ef4.diff) = e4dc2c91940618ef54bd6b4971fc57b44d1ba97ddaf161ae3b27a1e77cb6f675
 SIZE (gnome/9b733dd9df9d6d9805c56749d05ada15a7560ef4.diff) = 445
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index afe7dde18118..c7473cfbe15d 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -21,9 +21,13 @@ lib/nautilus/extensions-3.0/libnautilus-image-properties.so
 lib/nautilus/extensions-3.0/libnautilus-sendto.so
 lib/nautilus/extensions-3.0/libtotem-properties-page.so
 libdata/pkgconfig/libnautilus-extension.pc
+%%DATADIR%%/ontology/nautilus.description
+%%DATADIR%%/ontology/nautilus.ontology
 share/applications/nautilus-autorun-software.desktop
 share/applications/org.gnome.Nautilus.desktop
 share/dbus-1/services/org.freedesktop.FileManager1.service
+share/dbus-1/services/org.gnome.Nautilus.Tracker3.Miner.Extract.service
+share/dbus-1/services/org.gnome.Nautilus.Tracker3.Miner.Files.service
 share/dbus-1/services/org.gnome.Nautilus.service
 share/gir-1.0/Nautilus-3.0.gir
 share/gnome-shell/search-providers/org.gnome.Nautilus.search-provider.ini
@@ -84,6 +88,7 @@ share/locale/is/LC_MESSAGES/nautilus.mo
 share/locale/it/LC_MESSAGES/nautilus.mo
 share/locale/ja/LC_MESSAGES/nautilus.mo
 share/locale/ka/LC_MESSAGES/nautilus.mo
+share/locale/kab/LC_MESSAGES/nautilus.mo
 share/locale/kk/LC_MESSAGES/nautilus.mo
 share/locale/km/LC_MESSAGES/nautilus.mo
 share/locale/kn/LC_MESSAGES/nautilus.mo
@@ -148,3 +153,4 @@ 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
+share/tracker3/domain-ontologies/org.gnome.Nautilus.domain.rule