Clenup xfce ports:

- Add missing dependencies
- Remove unneeded patches
- Regenerate and rename legacy patches
- Add NLS option to ports providing such a knob, and missing the
  option
- Add INSTALL_TARGET=install-strip where missing
- Sort things
- Remove unneeded +=
- Cosmetic changes to OPTION related variables to improve readability
- Update WWW
- Silence portlint warnings about variables order
- Bump PORTREVISION where changing dependencies and/or adding
  install-strip

3 files changed, 19 insertions, 26 deletions

diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index b06abac96ece..ae8a8ebc0a20 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-session
 PORTVERSION=	4.12.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
@@ -17,28 +17,32 @@ 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
+		libpolkit-gobject-1.so:sysutils/polkit \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 
-GNU_CONFIGURE=	yes
-INSTALLS_ICONS=	yes
-USE_GNOME=	gtk20 glib20 intltool intlhack libwnck
-USES=		pathfix pkgconfig gmake libtool gettext-tools xfce tar:bzip2
+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
-USE_XORG=	x11 sm ice
+USE_XORG=	ice sm x11
 
-CONFIGURE_ARGS+=--enable-legacy-sm \
+GNU_CONFIGURE=	yes
+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
 
-OPTIONS_DEFINE=	NLS
-NLS_USES=	gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
 
-PLIST_SUB=	VERSION="4.6"
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git a/x11-wm/xfce4-session/files/patch-configure b/x11-wm/xfce4-session/files/patch-configure
deleted file mode 100644
index aa31d0998179..000000000000
--- a/x11-wm/xfce4-session/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig	2012-04-28 20:43:34.000000000 +0000
-+++ ./configure	2013-04-24 23:04:07.000000000 +0000
-@@ -14200,7 +14200,7 @@
- 
-     fi
-   fi
--     USE_NLS=yes
-+#     USE_NLS=yes
- 
- 
-     gt_cv_have_gettext=no
diff --git a/x11-wm/xfce4-session/pkg-descr b/x11-wm/xfce4-session/pkg-descr
index e38b77ededea..1c90b569402c 100644
--- a/x11-wm/xfce4-session/pkg-descr
+++ b/x11-wm/xfce4-session/pkg-descr
@@ -2,4 +2,4 @@ The Xfce session manager controls the loading of applications when
 Xfce is started. It also handles logging out, shutting down, and
 rebooting.
 
-WWW: http://www.xfce.org/
+WWW: https://www.xfce.org/