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

5 files changed, 55 insertions, 62 deletions

diff --git a/x11-fm/thunar-vfs/Makefile b/x11-fm/thunar-vfs/Makefile
index f80a66853a4b..7fd483ba7eeb 100644
--- a/x11-fm/thunar-vfs/Makefile
+++ b/x11-fm/thunar-vfs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	thunar-vfs
 PORTVERSION=	1.2.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	x11-fm xfce
 MASTER_SITES=	XFCE/src/archive/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
@@ -16,31 +16,41 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
-		libgamin-1.so:devel/gamin
+		libfontconfig.so:x11-fonts/fontconfig \
+		libgamin-1.so:devel/gamin \
+		libdbus-1.so:devel/dbus
 
-GNU_CONFIGURE=	yes
-USE_GNOME=	glib20 gtk20 gdkpixbuf2 intltool intlhack
+USES=		desktop-file-utils gettext-tools gmake gmake jpeg libtool pathfix \
+		perl5 pkgconfig tar:bzip2 xfce
+USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20 intlhack intltool
 USE_XFCE=	libexo
-USE_XORG=	x11
-USES=		desktop-file-utils gettext-tools gmake jpeg libtool pathfix perl5 pkgconfig \
-		xfce tar:bzip2
+USE_XORG=	ice x11 sm
+USE_LDCONFIG=	yes
 
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug --without-html-dir
+INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	NLS HAL DBUS STARTUP GCONF
+OPTIONS_DEFINE=		NLS HAL DBUS STARTUP GCONF
 OPTIONS_DEFAULT=	HAL DBUS STARTUP
-STARTUP_DESC=	Startup notification
-NLS_USES=	gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
-HAL_LIB_DEPENDS=	libhal.so:sysutils/hal
-HAL_CONFIGURE_WITH=	volume-manager=hal
-HAL_CONFIGURE_OFF=	--with-volume-manager=freebsd
-DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
+OPTIONS_SUB=		yes
+
+STARTUP_DESC=		Startup notification
+
 DBUS_CONFIGURE_ENABLE=	dbus
-STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
-STARTUP_CONFIGURE_ENABLE=	startup-notification
-GCONF_USE=	gnome=gconf2
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
+
 GCONF_CONFIGURE_ENABLE=	gnome-thumbnailers
-OPTIONS_SUB=	yes
+GCONF_USE=		gnome=gconf2
+
+HAL_CONFIGURE_OFF=	--with-volume-manager=freebsd
+HAL_CONFIGURE_WITH=	volume-manager=hal
+HAL_LIB_DEPENDS=	libhal.so:sysutils/hal
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
+
+STARTUP_CONFIGURE_ENABLE=	startup-notification
+STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 
 .include <bsd.port.mk>
diff --git a/x11-fm/thunar-vfs/files/patch-configure b/x11-fm/thunar-vfs/files/patch-configure
deleted file mode 100644
index 18cdee7253c8..000000000000
--- a/x11-fm/thunar-vfs/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig	2011-01-16 16:48:44.000000000 +0000
-+++ ./configure	2013-10-23 17:09:46.000000000 +0000
-@@ -13877,7 +13877,7 @@
- 
-     fi
-   fi
--     USE_NLS=yes
-+     #USE_NLS=yes
- 
- 
-     gt_cv_have_gettext=no
diff --git a/x11-fm/thunar-vfs/pkg-descr b/x11-fm/thunar-vfs/pkg-descr
index e8f966dca8ba..94e5af0eaad6 100644
--- a/x11-fm/thunar-vfs/pkg-descr
+++ b/x11-fm/thunar-vfs/pkg-descr
@@ -1,4 +1,4 @@
 Thunar-VFS is the Virtual filesystem shipped with the thunar 1.0
 and earlier releases.
 
-WWW: http://xfce.org/
+WWW: https://xfce.org/
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 80438507f8d6..d1c2d85610e7 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -22,22 +22,27 @@ LIB_DEPENDS=	libtumbler-1.so:deskutils/xfce4-tumbler \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	pkexec:sysutils/polkit
 
-PORTSCOUT=	limit:^1\.6\.
-
-USES=		desktop-file-utils gmake pathfix perl5 libtool pkgconfig \
-		gettext-tools xfce tar:bzip2
-GNU_CONFIGURE=	yes
-INSTALLS_ICONS=	yes
-USE_GNOME=	glib20 gtk20 intltool cairo gdkpixbuf2
+USES=		desktop-file-utils gettext-tools gmake gnome libtool pathfix \
+		perl5 pkgconfig tar:bzip2 xfce
+USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20 intltool
 USE_LDCONFIG=	yes
 USE_XFCE=	libexo
 USE_XORG=	ice sm x11
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--enable-gio-unix \
+		--disable-gudev \
+		--enable-dbus
+INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	NLS NOTIFY
-OPTIONS_GROUP=	PLUGINS
+PORTSCOUT=	limit:^1\.6\.
+
+OPTIONS_DEFINE=		NLS NOTIFY
+OPTIONS_GROUP=		PLUGINS
 OPTIONS_GROUP_PLUGINS=	PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL
 OPTIONS_DEFAULT=	NOTIFY PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL
+OPTIONS_SUB=		yes
 
 # Override NOTIFY_DESC
 NOTIFY_DESC=	Display notifications
@@ -47,23 +52,23 @@ PLUG_TPA_DESC=	Trash Panel Applet plugin
 PLUG_UCA_DESC=	User Customizable Actions plugin
 PLUG_WALL_DESC=	Wallpaper plugin
 
-NLS_USES=	gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
-NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
+NLS_CONFIGURE_ENABLE=		nls
+NLS_USES=			gettext-runtime
+
 NOTIFY_CONFIGURE_ENABLE=	notifications
-PLUG_APR_LIB_DEPENDS=	libexif.so:graphics/libexif
+NOTIFY_LIB_DEPENDS=		libnotify.so:devel/libnotify
+
 PLUG_APR_CONFIGURE_ENABLE=	apr-plugin exif
-PLUG_SBR_LIB_DEPENDS=	libpcre.so:devel/pcre
+PLUG_APR_LIB_DEPENDS=		libexif.so:graphics/libexif
+
 PLUG_SBR_CONFIGURE_ENABLE=	sbr-plugin pcre
-PLUG_TPA_USE=	gnome=gvfs xfce=panel
+PLUG_SBR_LIB_DEPENDS=		libpcre.so:devel/pcre
+
 PLUG_TPA_CONFIGURE_ENABLE=	tpa-plugin
+PLUG_TPA_USE=			gnome=gvfs xfce=panel
+
 PLUG_UCA_CONFIGURE_ENABLE=	uca-plugin
 PLUG_WALL_CONFIGURE_ENABLE=	wallpaper-plugin
-OPTIONS_SUB=	yes
-
-CONFIGURE_ARGS+=--enable-gio-unix \
-		--disable-gudev \
-		--enable-dbus
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|internet-mail|emblem-mail|' \
diff --git a/x11-fm/thunar/files/patch-configure b/x11-fm/thunar/files/patch-configure
deleted file mode 100644
index e8685262457d..000000000000
--- a/x11-fm/thunar/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2017-06-30 22:28:12 UTC
-+++ configure
-@@ -14452,7 +14452,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
- 
-     fi
-   fi
--     USE_NLS=yes
-+#     USE_NLS=yes
- 
- 
-     gt_cv_have_gettext=no