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, 27 insertions, 27 deletions

diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index 0102808be868..47d8e9fdaac3 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libxfce4menu
 PORTVERSION=	4.12.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/src/xfce/libxfce4ui/${PORTVERSION:R}
 DISTNAME=	libxfce4ui-${PORTVERSION}
@@ -14,29 +14,40 @@ COMMENT=	Widgets library for the Xfce desktop environment
 
 LICENSE=	GPLv2
 
-PORTSCOUT=	limit:^4\.12\.
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libdbus-1.so:devel/dbus
 
-USES=		gmake libtool pathfix pkgconfig gettext-tools \
-		xfce tar:bzip2
-GNU_CONFIGURE=	yes
-USE_GNOME=	glib20 gtk20 intltool intlhack
+USES=		gettext-tools gmake gnome libtool pathfix pkgconfig \
+		tar:bzip2 xfce
+USE_GNOME=	cairo glib20 gtk20 intlhack intltool
 USE_LDCONFIG=	yes
 USE_XFCE=	xfconf
-INSTALLS_ICONS=	yes
+USE_XORG=	ice sm x11
 
+GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--with-vendor-info=${OPSYS} --without-html-dir
+INSTALL_TARGET=	install-strip
+
+PORTSCOUT=	limit:^4\.12\.
 
 OPTIONS_DEFINE=		GLADE GTK3 NLS STARTUP
 OPTIONS_DEFAULT=	GTK3 STARTUP
-STARTUP_DESC=		Startup notification
-STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
-STARTUP_CONFIGURE_ENABLE=	startup-notification
-NLS_USES=		gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
-GLADE_LIB_DEPENDS=	libgladeui-1.so:devel/glade3
+OPTIONS_SUB=		yes
+
 GLADE_CONFIGURE_ENABLE=	gladeui
-GTK3_USE=		gnome=gtk30
+GLADE_LIB_DEPENDS=	libgladeui-1.so:devel/glade3
+
 GTK3_CONFIGURE_ENABLE=	gtk3
-OPTIONS_SUB=		yes
+GTK3_USE=		gnome=gtk30
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
+
+STARTUP_CONFIGURE_ENABLE=	startup-notification
+STARTUP_DESC=		Startup notification
+STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 
 .include <bsd.port.mk>
diff --git a/x11/libxfce4menu/files/patch-configure b/x11/libxfce4menu/files/patch-configure
deleted file mode 100644
index cf0deee23b75..000000000000
--- a/x11/libxfce4menu/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2015-03-15 18:14:47 UTC
-+++ configure
-@@ -14128,7 +14128,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
- 
-     fi
-   fi
--     USE_NLS=yes
-+#     USE_NLS=yes
- 
- 
-     gt_cv_have_gettext=no
diff --git a/x11/libxfce4menu/pkg-descr b/x11/libxfce4menu/pkg-descr
index 35ac0f7cc331..afe817530c63 100644
--- a/x11/libxfce4menu/pkg-descr
+++ b/x11/libxfce4menu/pkg-descr
@@ -1,4 +1,4 @@
 libxfce4ui is used to share commonly used Xfce widgets amoung the Xfce
 applications.
 
-WWW: http://www.xfce.org/
+WWW: https://www.xfce.org/