Welcome XFCE 4.14 to the FreeBSD ports tree

- This XFCE release uses almost exclusively gtk3, so the USES=xfce
  now defaults to gtk3
- Make x11-themes/gtk-xfce-engine an optional dependency(disabled
  by default), it only supports gtk2, so would leave miost of this
  XFCE version unthemed.
- Add Greybird as an optional and enabled dependency as a modern
  theme supporting both GTK versions and all other XFCE parts
- The xfce4-vala port is deprecated and removed. The VALA bindings
  are available in the library ports using the GIR and VAPI options
  (on by default)
- Fixed various missing library and portlint warnings (portmgr fixit
  blanket)
- Default Display Manager changed to lightdm (Thanks to woodsb02
  for help)
- Add x11/xfce4-screensaver as an optional dependency to the
  xfce4-goodies (enabled by default)
- Remove dependency on x11-fm/thunar-vfs and deprecate the port.
  It is EOL upstream and the functionality is included in thunar
  itself

Update:
- Added back sysutils/xfce4-places-plugin, updated to 1.8.1
- archivers/thunar-archive-plugin to 0.4.0
- audio/thunar-media-tags-plugin to 0.3.0
- audio/xfce4-mpc-plugin to 0.5.2
- audio/xfce4-pulseaudio-plugin to 0.4.2
- deskutils/xfce4-tumbler to 0.2.7
- devel/thunar-vcs-plugin to 0.2.0 [1]
- devel/xfce4-dev-tools to 4.14.0
- misc/xfce4-appfinder to 4.14.0
- misc/xfce4-weather-plugin to 0.10.0
- multimedia/xfce4-parole to 1.0.4
- sysutils/gigolo to 0.5.0
- sysutils/xfce4-battery-plugin to 1.1.3
- sysutils/xfce4-fsguard-plugin to 1.1.1
- sysutils/xfce4-netload-plugin to 1.3.2
- sysutils/xfce4-power-manage to 1.6.5
- sysutils/xfce4-settings 4.14.1
- sysutils/xfce4-systemload-plugin to 1.2.3
- sysutils/xfce4-wavelan-plugin to 0.6.1
- www/xfce4-smartbookmark-plugin to 0.5.1
- x11-clocks/xfce4-datetime-plugin to 0.8.0
- Added new xfce4-stopwatch-plugin, version 0.3.1
- x11-clocks/xfce4-timer-out-plugin to 1.0.3
- x11-fm/thunar to 1.8.9
- x11-wm/xfce4-desktop to 4.14.1
- x11-wm/xfce4-panel to 4.14.0
- x11-wm/xfce4-session to 4.14.0
- x11-wm/xfce4-wm to 4.14.0
- x11/libexo to 0.12.8
- x11/libxfce4menu to 4.14.1
- x11/libxfce4util to 4.14.0
- x11/xfce4-conf to 4.14.1
- x11/xfce4-dashboard to 0.7.5
- x11/xfce4-screensaver to 0.1.8
- x11/xfce4-screenshooter-plugin to 1.9.6
- x11/xfce4-verve-plugin to 2.0.0

Thanks to: Olivier Duchateau <duchateau.olivier@gmail.com>

PR:		240236
Exp-run by:	antoine
Tested by:	sbruno
Approved by:    sergey.dyatko@gmail.com (maintainer timeout via
		email), portmgr (fixit blanket, port breaks with
		new Thunar if not updated) [1]
Differential Revision:	https://reviews.freebsd.org/D21278

5 files changed, 21 insertions, 81 deletions

diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 89b3bd019343..79f4bdc355cc 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-session
-PORTVERSION=	4.12.1
-PORTREVISION=	6
+PORTVERSION=	4.14.0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
@@ -16,18 +15,13 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	iceauth:x11/iceauth
 RUN_DEPENDS=	iceauth:x11/iceauth \
 		console-kit-daemon:sysutils/consolekit2
-LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
-		libdbus-1.so:devel/dbus \
-		libupower-glib.so:sysutils/upower \
-		libpolkit-gobject-1.so:sysutils/polkit \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2
+LIB_DEPENDS=	libupower-glib.so:sysutils/upower \
+		libpolkit-gobject-1.so:sysutils/polkit
 
 USES=		gettext-tools gmake gnome libtool pathfix pkgconfig \
-		tar:bzip2 xfce
-USE_GNOME=	cairo gtk20 glib20 intlhack intltool libwnck
-USE_LDCONFIG=	yes
-USE_XFCE=	libmenu
+		tar:bzip2 xfce xorg
+USE_GNOME=	cairo gtk30 glib20 intltool libwnck3
+USE_XFCE=	libexo xfconf
 USE_XORG=	ice sm x11
 
 GNU_CONFIGURE=	yes
@@ -35,17 +29,14 @@ INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-legacy-sm \
 		--with-xsession-prefix=${PREFIX}
 SUB_FILES=	pkg-message
-PLIST_SUB=	VERSION="4.6"
 INSTALL_TARGET=	install-strip
 
+PORTSCOUT=	limitw:1,even
+
 OPTIONS_DEFINE=		NLS
 OPTIONS_SUB=		yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/scripts/xflock4
-
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index f1a0a4e10168..b63d01ebd36e 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/xfce4-session-4.12.1.tar.bz2) = 97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd
-SIZE (xfce4/xfce4-session-4.12.1.tar.bz2) = 1289284
+TIMESTAMP = 1565566343
+SHA256 (xfce4/xfce4-session-4.14.0.tar.bz2) = 14fb6db74eb69eb400673856ba307a0e57f577cf77c3561a5910151e3d52043f
+SIZE (xfce4/xfce4-session-4.14.0.tar.bz2) = 826950
diff --git a/x11-wm/xfce4-session/files/patch-scripts_xflock4 b/x11-wm/xfce4-session/files/patch-scripts_xflock4
index 7b2ad00a3cc5..32cedb702b8a 100644
--- a/x11-wm/xfce4-session/files/patch-scripts_xflock4
+++ b/x11-wm/xfce4-session/files/patch-scripts_xflock4
@@ -1,23 +1,6 @@
---- scripts/xflock4.orig	2014-08-30 18:24:02 UTC
+--- scripts/xflock4.orig	2019-05-10 20:05:58 UTC
 +++ scripts/xflock4
-@@ -21,13 +21,14 @@
- #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
- 
--PATH=/bin:/usr/bin
-+PATH=/bin:/usr/bin:%%LOCALBASE%%/bin
- export PATH
- 
- # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
- for lock_cmd in \
-     "xscreensaver-command -lock" \
--    "gnome-screensaver-command --lock"
-+    "gnome-screensaver-command --lock" \
-+    "xfce4-screensaver-command --lock"
- do
-     $lock_cmd >/dev/null 2>&1 && exit
- done
-@@ -35,12 +36,14 @@ done
+@@ -39,12 +39,14 @@ done
  # else run another access locking utility, if installed
  for lock_cmd in \
    "xlock -mode blank" \
@@ -29,7 +12,7 @@
      if command -v -- $1 >/dev/null 2>&1; then
          $lock_cmd >/dev/null 2>&1 &
  	# turn off display backlight:
-+	sleep 1
++        sleep 1
  	xset dpms force off
          exit
      fi
diff --git a/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-global.h b/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-global.h
deleted file mode 100644
index 71ab36ef6302..000000000000
--- a/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-global.h
+++ /dev/null
@@ -1,16 +0,0 @@
-Make verbose logging conditional (Bug #11698)
-
---- xfce4-session/xfsm-global.h.orig	2014-09-28 14:51:01 UTC
-+++ xfce4-session/xfsm-global.h
-@@ -49,7 +49,10 @@ extern XfsmSplashScreen *splash_screen;
- #if defined(G_HAVE_ISO_VARARGS)
- 
- #define xfsm_verbose(...)\
--    xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
-+G_STMT_START{ \
-+  if (G_UNLIKELY (verbose)) \
-+    xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__); \
-+}G_STMT_END
- 
- #else
- 
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index 98be06bb06ce..2c60daec8fbc 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -7,38 +7,19 @@ etc/xdg/autostart/xscreensaver.desktop
 etc/xdg/xfce4/Xft.xrdb
 etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
 etc/xdg/xfce4/xinitrc
-include/xfce4/xfce4-session-%%VERSION%%/libxfsm/xfsm-splash-engine.h
-include/xfce4/xfce4-session-%%VERSION%%/libxfsm/xfsm-splash-rc.h
-lib/libxfsm-%%VERSION%%.so
-lib/libxfsm-%%VERSION%%.so.0
-lib/libxfsm-%%VERSION%%.so.0.0.0
-lib/xfce4/session/balou-export-theme
-lib/xfce4/session/balou-install-theme
-lib/xfce4/session/splash-engines/libbalou.so
-lib/xfce4/session/splash-engines/libmice.so
-lib/xfce4/session/splash-engines/libsimple.so
 lib/xfce4/session/xfsm-shutdown-helper
-libdata/pkgconfig/xfce4-session-2.0.pc
 man/man1/xfce4-session-logout.1.gz
 man/man1/xfce4-session.1.gz
 share/applications/xfce-session-settings.desktop
 share/applications/xfce4-session-logout.desktop
 share/icons/hicolor/128x128/apps/xfce4-session.png
-share/icons/hicolor/48x48/apps/system-hibernate.png
-share/icons/hicolor/48x48/apps/system-log-out.png
-share/icons/hicolor/48x48/apps/system-reboot.png
-share/icons/hicolor/48x48/apps/system-shutdown.png
-share/icons/hicolor/48x48/apps/system-suspend.png
+share/icons/hicolor/48x48/actions/xfsm-hibernate.png
+share/icons/hicolor/48x48/actions/xfsm-logout.png
+share/icons/hicolor/48x48/actions/xfsm-reboot.png
+share/icons/hicolor/48x48/actions/xfsm-shutdown.png
+share/icons/hicolor/48x48/actions/xfsm-suspend.png
 share/icons/hicolor/48x48/apps/xfce4-session.png
-share/icons/hicolor/48x48/apps/xfce4-splash.png
-share/icons/hicolor/48x48/apps/xfsm-hibernate.png
-share/icons/hicolor/48x48/apps/xfsm-logout.png
-share/icons/hicolor/48x48/apps/xfsm-reboot.png
-share/icons/hicolor/48x48/apps/xfsm-shutdown.png
-share/icons/hicolor/48x48/apps/xfsm-suspend.png
-share/icons/hicolor/scalable/apps/system-shutdown.svg
 share/icons/hicolor/scalable/apps/xfce4-session.svg
-share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
 %%NLS%%share/locale/am/LC_MESSAGES/xfce4-session.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-session.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-session.mo
@@ -62,7 +43,9 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
 %%NLS%%share/locale/he/LC_MESSAGES/xfce4-session.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-session.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-session.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-session.mo
 %%NLS%%share/locale/is/LC_MESSAGES/xfce4-session.mo
 %%NLS%%share/locale/it/LC_MESSAGES/xfce4-session.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-session.mo
@@ -99,6 +82,4 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
 %%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-session.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
 share/polkit-1/actions/org.xfce.session.policy
-share/themes/Default/balou/logo.png
-share/themes/Default/balou/themerc
 share/xsessions/xfce.desktop