4 files changed, 63 insertions, 20 deletions

diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index 0be50f9f96d7..b62cc51b55e4 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-settings
-PORTVERSION=	4.12.4
-PORTREVISION=	3
+PORTVERSION=	4.14.1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
@@ -14,23 +13,22 @@ COMMENT=	Xfce 4 settings application
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-1.so:devel/dbus \
-		libdbus-glib-1.so:devel/dbus-glib \
+LIB_DEPENDS=	libcolord.so:graphics/colord \
 		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2 \
 		libxklavier.so:x11/libxklavier
 
-USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
-USE_GNOME=	cairo glib20 gtk20 intlhack intltool
-USE_XFCE=	garcon libexo
+USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+		xfce xorg
+USE_GNOME=	cairo glib20 gtk30 intltool
+USE_XFCE=	garcon libexo xfconf
 USE_XORG=	xorgproto x11 xcursor xi xrandr
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-debug=yes \
-		--disable-xorg-libinput
+CONFIGURE_ARGS=	--disable-xorg-libinput \
+		--enable-pluggable-dialogs
 INSTALLS_ICONS=	yes
 
-PORTSCOUT=	limit:^4\.12\.
+PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=		NOTIFY NLS UPOWER
 OPTIONS_DEFAULT=	NOTIFY
@@ -47,11 +45,14 @@ NOTIFY_LIB_DEPENDS=		libnotify.so:devel/libnotify
 UPOWER_CONFIGURE_ENABLE=	upower-glib
 UPOWER_LIB_DEPENDS=		libupower-glib.so:sysutils/upower
 
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug=yes
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|Rodent|Adwaita|g' \
 		${WRKSRC}/dialogs/appearance-settings/main.c
-	@${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="Adwaita|; \
-		s|"ThemeName" type="empty|"ThemeName" type="string" value="Xfce|' \
+	@${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="Adwaita|' \
 		${WRKSRC}/xfsettingsd/xsettings.xml
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-settings/distinfo b/sysutils/xfce4-settings/distinfo
index e327ce54351c..5ebb563dbe5e 100644
--- a/sysutils/xfce4-settings/distinfo
+++ b/sysutils/xfce4-settings/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529575306
-SHA256 (xfce4/xfce4-settings-4.12.4.tar.bz2) = e2a04cad48bf9e951409d0c841829fa3b4ce632cd799082ef82d0506618b6f9b
-SIZE (xfce4/xfce4-settings-4.12.4.tar.bz2) = 1036773
+TIMESTAMP = 1566458209
+SHA256 (xfce4/xfce4-settings-4.14.1.tar.bz2) = e873e9f6b8e801fd9304ee100c4c76ed9987446c38429d02477c086431c0bf7a
+SIZE (xfce4/xfce4-settings-4.14.1.tar.bz2) = 1187352
diff --git a/sysutils/xfce4-settings/pkg-message b/sysutils/xfce4-settings/pkg-message
new file mode 100644
index 000000000000..23391e2cb09c
--- /dev/null
+++ b/sysutils/xfce4-settings/pkg-message
@@ -0,0 +1,30 @@
+[
+{
+	type: upgrade
+	maximum_version: "4.14.0"
+	message: <<EOD
+Since XFCE 4.14 was updated to use gtk3 it is suggested to move to
+a gtk3 compliant theme.
+
+By default XFCE is installed "unthemed", but the Greybird theme is
+installed by the metaport.
+
+The icon theme installed and configured by default is Adwaita. Other
+icon themes are available in the ports tree under the x11-themes
+category.
+
+To switch to the greybird theme you can:
+
+Launch 'xfce4-appearance-settings', also available in the applications
+menu, under settings/appearence, and go to the 'Style' tab to select
+the greybird theme.
+
+Then go to 'Window Manager' or launch 'xfwm4-settings' and select the 
+greybird theme.
+
+Or launch these command in a shell:
+  xfconf-query -c xsettings -p /Net/ThemeName -t string -s "Greybird"
+  xfconf-query -c xfwm4 -p /general/theme -t string -s "Greybird"
+EOD
+}
+]
diff --git a/sysutils/xfce4-settings/pkg-plist b/sysutils/xfce4-settings/pkg-plist
index 50f6ce92b33a..b9950f876a3a 100644
--- a/sysutils/xfce4-settings/pkg-plist
+++ b/sysutils/xfce4-settings/pkg-plist
@@ -1,5 +1,6 @@
 bin/xfce4-accessibility-settings
 bin/xfce4-appearance-settings
+bin/xfce4-color-settings
 bin/xfce4-display-settings
 bin/xfce4-find-cursor
 bin/xfce4-keyboard-settings
@@ -9,21 +10,28 @@ bin/xfce4-settings-editor
 bin/xfce4-settings-manager
 bin/xfsettingsd
 etc/xdg/autostart/xfsettingsd.desktop
-etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
 etc/xdg/menus/xfce-settings-manager.menu
+etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
 lib/xfce4/settings/appearance-install-theme
 share/applications/xfce-display-settings.desktop
 share/applications/xfce-keyboard-settings.desktop
-share/applications/xfce4-mime-settings.desktop
 share/applications/xfce-mouse-settings.desktop
 share/applications/xfce-settings-manager.desktop
 share/applications/xfce-ui-settings.desktop
 share/applications/xfce4-accessibility-settings.desktop
+share/applications/xfce4-color-settings.desktop
+share/applications/xfce4-mime-settings.desktop
 share/applications/xfce4-settings-editor.desktop
 share/icons/hicolor/128x128/devices/xfce-display-extend.png
 share/icons/hicolor/128x128/devices/xfce-display-external.png
 share/icons/hicolor/128x128/devices/xfce-display-internal.png
 share/icons/hicolor/128x128/devices/xfce-display-mirror.png
+share/icons/hicolor/128x128/devices/xfce-display-profile.png
+share/icons/hicolor/24x24/apps/xfce4-color-settings.png
+share/icons/hicolor/48x48/apps/xfce4-color-settings.png
+share/icons/hicolor/64x64/apps/xfce4-color-settings.png
+share/icons/hicolor/scalable/apps/xfce4-color-settings.svg
+%%NLS%%share/locale/am/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/be/LC_MESSAGES/xfce4-settings.mo
@@ -35,6 +43,7 @@ share/icons/hicolor/128x128/devices/xfce-display-mirror.png
 %%NLS%%share/locale/de/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/el/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-settings.mo
@@ -44,7 +53,9 @@ share/icons/hicolor/128x128/devices/xfce-display-mirror.png
 %%NLS%%share/locale/he/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/is/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/it/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-settings.mo
@@ -59,13 +70,14 @@ share/icons/hicolor/128x128/devices/xfce-display-mirror.png
 %%NLS%%share/locale/oc/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-settings.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/si/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/te/LC_MESSAGES/xfce4-settings.mo
@@ -73,8 +85,8 @@ share/icons/hicolor/128x128/devices/xfce-display-mirror.png
 %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-settings.mo
-%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-settings.mo