3 files changed, 22 insertions, 30 deletions

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index ca8398007d26..43fe6e303d53 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-settings-daemon
-PORTVERSION=	3.28.1
-PORTREVISION=	2
+PORTVERSION=	3.38.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 settings daemon
@@ -25,7 +24,10 @@ LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libgeoclue-2.so:net/geoclue \
 		libupower-glib.so:sysutils/upower \
 		libgeocode-glib.so:net/geocode-glib \
-		libgweather-3.so:net/libgweather
+		libgweather-3.so:net/libgweather \
+		libcups.so:print/cups \
+		libnss3.so:security/nss \
+		libnspr4.so:devel/nspr
 
 PORTSCOUT=	limitw:1,even
 
@@ -39,21 +41,13 @@ INSTALLS_ICONS=	yes
 MESON_ARGS=	-Dnssdb_dir=${LOCALBASE}/share/certs/ \
 		-Dalsa=false \
 		-Drfkill=false \
-		-Dnetwork_manager=false
+		-Dnetwork_manager=false \
+		-Dsystemd=false \
+		-Dwwan=false \
+		-Dcups=true \
+		-Dsmartcard=true
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
-OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	CUPS SMARTCARD
-OPTIONS_DEFAULT=CUPS SMARTCARD
-
-CUPS_MESON_TRUE=	cups
-CUPS_LIB_DEPENDS=	libcups.so:print/cups
-
-SMARTCARD_DESC=	Smartcard support
-SMARTCARD_MESON_TRUE=	smartcard
-SMARTCARD_LIB_DEPENDS=	libnss3.so:security/nss \
-			libnspr4.so:devel/nspr
-
 # wayland doesn't build yet, undefined symbol
 MESON_ARGS+=	-Dwayland=false -Dgudev=false
 #WAYLAND_MESON_TRUE=	wayland gudev
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 839c6110bf7c..1479b3f2cc43 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524858563
-SHA256 (gnome3/gnome-settings-daemon-3.28.1.tar.xz) = 594f78e194eb42a6f77785d1a92a4cb9cda54b8c3af6ca0c315b4570d38d2d7d
-SIZE (gnome3/gnome-settings-daemon-3.28.1.tar.xz) = 1362420
+TIMESTAMP = 1601311194
+SHA256 (gnome/gnome-settings-daemon-3.38.0.tar.xz) = b7ed5b5fab9aad192ceed6a95be2805124e3c63c46891bbae076f7ec3fd6792e
+SIZE (gnome/gnome-settings-daemon-3.38.0.tar.xz) = 1433260
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index 4a19270aeb44..b6498d295789 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -1,11 +1,10 @@
+etc/xdg/Xwayland-session.d/00-xrdb
 etc/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop
-etc/xdg/autostart/org.gnome.SettingsDaemon.Clipboard.desktop
 etc/xdg/autostart/org.gnome.SettingsDaemon.Color.desktop
 etc/xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop
 etc/xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop
 etc/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop
 etc/xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop
-etc/xdg/autostart/org.gnome.SettingsDaemon.Mouse.desktop
 etc/xdg/autostart/org.gnome.SettingsDaemon.Power.desktop
 etc/xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop
 etc/xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop
@@ -13,29 +12,27 @@ etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop
 etc/xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop
 etc/xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop
 etc/xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.UsbProtection.desktop
 etc/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.Wwan.desktop
 etc/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop
 include/gnome-settings-daemon-3.0/gnome-settings-daemon/gsd-enums.h
 lib/gnome-settings-daemon-3.0/libgsd.so
 libdata/pkgconfig/gnome-settings-daemon.pc
 libexec/gsd-a11y-settings
-libexec/gsd-clipboard
 libexec/gsd-color
 libexec/gsd-datetime
-libexec/gsd-dummy
 libexec/gsd-housekeeping
 libexec/gsd-keyboard
-libexec/gsd-locate-pointer
 libexec/gsd-media-keys
-libexec/gsd-mouse
 libexec/gsd-power
-%%CUPS%%libexec/gsd-print-notifications
-%%CUPS%%libexec/gsd-printer
+libexec/gsd-print-notifications
+libexec/gsd-printer
 libexec/gsd-screensaver-proxy
 libexec/gsd-sharing
-%%SMARTCARD%%libexec/gsd-smartcard
+libexec/gsd-smartcard
 libexec/gsd-sound
-libexec/gsd-test-input-helper
+libexec/gsd-usb-protection
 libexec/gsd-xsettings
 share/GConf/gsettings/gnome-settings-daemon.convert
 %%DATADIR%%/datetime/backward
@@ -54,6 +51,7 @@ share/locale/br/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/bs/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ca/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ca@valencia/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/ckb/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/crh/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/cs/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/cy/LC_MESSAGES/gnome-settings-daemon.mo