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

4 files changed, 84 insertions, 70 deletions

diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index d9c2253f363e..73b0ecbd9302 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-print
 PORTVERSION=	4.6.1
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	print xfce
 MASTER_SITES=	XFCE/src/archive/xfprint/${PORTVERSION:R}
 DISTNAME=	xfprint-${PORTVERSION}
@@ -16,26 +16,40 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	a2ps:print/a2ps
 RUN_DEPENDS=	a2ps:print/a2ps
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libdbus-1.so:devel/dbus
+
+USES=		gettext-tools gmake gnome libtool pathfix pkgconfig \
+		tar:bzip2 xfce
+USE_GNOME=	cairo glib20 gtk20 intlhack intltool
+USE_LDCONFIG=	yes
+USE_XFCE=	libgui xfconf
+USE_XORG=	x11
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USES=		gettext gmake libtool pathfix pkgconfig xfce tar:bzip2
-USE_GNOME=	glib20 gtk20 intltool intlhack
-USE_LDCONFIG=	yes
-USE_XFCE=	libgui xfconf
+INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	LETTER
-OPTIONS_DEFAULT=	LPR
-OPTIONS_SINGLE=	PRINTMETHOD
+OPTIONS_DEFINE=		LETTER NLS
+OPTIONS_SINGLE=		PRINTMETHOD
 OPTIONS_SINGLE_PRINTMETHOD=	LPR CUPS
+OPTIONS_DEFAULT=	LPR
+OPTIONS_SUB=		yes
+
 LETTER_DESC=	Use letter paper format instead of A4
 LPR_DESC=	LPR printing system support
-CUPS_LIB_DEPENDS=	libcups.so:print/cups
+
 CUPS_CONFIGURE_ENABLE=	cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
+
+LETTER_CONFIGURE_ENABLE=letter
 LPR_CONFIGURE_ENABLE=	bsdlpr
 LPR_CONFIGURE_WITH=	printcap=/etc/printcap
-LETTER_CONFIGURE_ENABLE=	letter
-OPTIONS_SUB=	yes
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
 
 post-patch:
 	@${REINPLACE_CMD} '/_LDADD =/s/=/= -lX11/' \
diff --git a/print/xfce4-print/files/patch-printing-systems__cups__cups.c b/print/xfce4-print/files/patch-printing-systems_cups_cups.c
index c598add37ed5..d20d929ff1d2 100644
--- a/print/xfce4-print/files/patch-printing-systems__cups__cups.c
+++ b/print/xfce4-print/files/patch-printing-systems_cups_cups.c
@@ -1,5 +1,5 @@
---- ./printing-systems/cups/cups.c.orig	2009-02-24 21:34:16.000000000 +0000
-+++ ./printing-systems/cups/cups.c	2014-06-03 18:56:42.000000000 +0000
+--- printing-systems/cups/cups.c.orig	2009-02-24 21:34:16 UTC
++++ printing-systems/cups/cups.c
 @@ -23,7 +23,9 @@
  
  #include <gmodule.h>
@@ -10,7 +10,7 @@
  #include <cups/ppd.h>
  #include <cups/cups.h>
  #include <cups/language.h>
-@@ -133,8 +135,8 @@
+@@ -133,8 +135,8 @@ cups_request_new (int operation_id)
  
    language = cupsLangDefault ();
    request = ippNew ();
@@ -21,7 +21,7 @@
  
    ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8");
  
-@@ -242,7 +244,7 @@
+@@ -242,7 +244,7 @@ get_printers ()
  
        if (!request)
          continue;
diff --git a/print/xfce4-print/pkg-descr b/print/xfce4-print/pkg-descr
index 00c7a1d53b15..3480755e4f7a 100644
--- a/print/xfce4-print/pkg-descr
+++ b/print/xfce4-print/pkg-descr
@@ -1,4 +1,4 @@
 Xfprint contains a print dialog and a printer manager for the Xfce Desktop
 Environment. It supports CUPS, BSD-LPR and file as printing destination.
 
-WWW: http://www.xfce.org/
+WWW: https://www.xfce.org/
diff --git a/print/xfce4-print/pkg-plist b/print/xfce4-print/pkg-plist
index 481ff2403387..f1127e261634 100644
--- a/print/xfce4-print/pkg-plist
+++ b/print/xfce4-print/pkg-plist
@@ -38,60 +38,60 @@ share/gtk-doc/html/libxfprint/up.png
 share/icons/hicolor/24x24/devices/printer.png
 share/icons/hicolor/48x48/devices/printer.png
 share/icons/hicolor/scalable/devices/printer.svg
-share/locale/am/LC_MESSAGES/xfprint.mo
-share/locale/ar/LC_MESSAGES/xfprint.mo
-share/locale/az/LC_MESSAGES/xfprint.mo
-share/locale/be/LC_MESSAGES/xfprint.mo
-share/locale/bg/LC_MESSAGES/xfprint.mo
-share/locale/bn_IN/LC_MESSAGES/xfprint.mo
-share/locale/ca/LC_MESSAGES/xfprint.mo
-share/locale/cs/LC_MESSAGES/xfprint.mo
-share/locale/da/LC_MESSAGES/xfprint.mo
-share/locale/de/LC_MESSAGES/xfprint.mo
-share/locale/dz/LC_MESSAGES/xfprint.mo
-share/locale/el/LC_MESSAGES/xfprint.mo
-share/locale/eo/LC_MESSAGES/xfprint.mo
-share/locale/en_GB/LC_MESSAGES/xfprint.mo
-share/locale/es/LC_MESSAGES/xfprint.mo
-share/locale/es_MX/LC_MESSAGES/xfprint.mo
-share/locale/et/LC_MESSAGES/xfprint.mo
-share/locale/eu/LC_MESSAGES/xfprint.mo
-share/locale/fa/LC_MESSAGES/xfprint.mo
-share/locale/fi/LC_MESSAGES/xfprint.mo
-share/locale/fr/LC_MESSAGES/xfprint.mo
-share/locale/gl/LC_MESSAGES/xfprint.mo
-share/locale/gu/LC_MESSAGES/xfprint.mo
-share/locale/he/LC_MESSAGES/xfprint.mo
-share/locale/hi/LC_MESSAGES/xfprint.mo
-share/locale/hu/LC_MESSAGES/xfprint.mo
-share/locale/id/LC_MESSAGES/xfprint.mo
-share/locale/it/LC_MESSAGES/xfprint.mo
-share/locale/ja/LC_MESSAGES/xfprint.mo
-share/locale/ka/LC_MESSAGES/xfprint.mo
-share/locale/ko/LC_MESSAGES/xfprint.mo
-share/locale/lt/LC_MESSAGES/xfprint.mo
-share/locale/lv/LC_MESSAGES/xfprint.mo
-share/locale/mk/LC_MESSAGES/xfprint.mo
-share/locale/mr/LC_MESSAGES/xfprint.mo
-share/locale/ms/LC_MESSAGES/xfprint.mo
-share/locale/nl/LC_MESSAGES/xfprint.mo
-share/locale/pa/LC_MESSAGES/xfprint.mo
-share/locale/pl/LC_MESSAGES/xfprint.mo
-share/locale/pt_BR/LC_MESSAGES/xfprint.mo
-share/locale/pt/LC_MESSAGES/xfprint.mo
-share/locale/ro/LC_MESSAGES/xfprint.mo
-share/locale/ru/LC_MESSAGES/xfprint.mo
-share/locale/si/LC_MESSAGES/xfprint.mo
-share/locale/sk/LC_MESSAGES/xfprint.mo
-share/locale/sq/LC_MESSAGES/xfprint.mo
-share/locale/sv/LC_MESSAGES/xfprint.mo
-share/locale/ta/LC_MESSAGES/xfprint.mo
-share/locale/tr/LC_MESSAGES/xfprint.mo
-share/locale/uk/LC_MESSAGES/xfprint.mo
-share/locale/ur/LC_MESSAGES/xfprint.mo
-share/locale/vi/LC_MESSAGES/xfprint.mo
-share/locale/zh_CN/LC_MESSAGES/xfprint.mo
-share/locale/zh_TW/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/am/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/az/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/es_MX/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/gu/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfprint.mo
 share/xfce4/doc/C/images/xfprint_headings.png
 share/xfce4/doc/C/images/xfprint_input.png
 share/xfce4/doc/C/images/xfprint-manager.png