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, 64 insertions, 55 deletions

diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index 86ea80dcea32..fe0ba1ac14ce 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mousepad
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	editors xfce
 MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
@@ -13,18 +14,26 @@ COMMENT=	Simple text editor for the Xfce Desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libdbus-1.so:devel/dbus
+
+USES=		desktop-file-utils gettext-tools gmake gnome libtool perl5 \
+		pkgconfig tar:bzip2
+USE_GNOME=	cairo gdkpixbuf2 glib20 intlhack intltool
 
 GNU_CONFIGURE=	yes
-USES=		desktop-file-utils gettext gmake libtool perl5 pkgconfig tar:bzip2
-USE_GNOME=	glib20 intltool intlhack
 
-OPTIONS_DEFINE=	GTK3
+GLIB_SCHEMAS=	org.xfce.mousepad.gschema.xml
+
+OPTIONS_DEFINE=		GTK3 NLS
 OPTIONS_DEFAULT=	GTK3
+OPTIONS_SUB=		yes
+
 GTK3_CONFIGURE_ENABLE=	gtk3
-GTK3_USE=	gnome=gtk30,gtksourceview3,dconf
-GTK3_USE_OFF=	gnome=gtk20,gtksourceview2
+GTK3_USE=		gnome=gtk30,gtksourceview3,dconf
+GTK3_USE_OFF=		gnome=gtk20,gtksourceview2
 
-GLIB_SCHEMAS=	org.xfce.mousepad.gschema.xml
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
 
 .include <bsd.port.mk>
diff --git a/editors/mousepad/pkg-descr b/editors/mousepad/pkg-descr
index 8edb21825765..99db56caea06 100644
--- a/editors/mousepad/pkg-descr
+++ b/editors/mousepad/pkg-descr
@@ -1,3 +1,3 @@
 Mousepad is a simple text editor for the Xfce desktop environment.
 
-WWW: http://goodies.xfce.org/projects/applications/mousepad
+WWW: https://git.xfce.org/apps/mousepad/about/
diff --git a/editors/mousepad/pkg-plist b/editors/mousepad/pkg-plist
index 1012a7ae94c5..bc4f290e8f13 100644
--- a/editors/mousepad/pkg-plist
+++ b/editors/mousepad/pkg-plist
@@ -1,49 +1,49 @@
 bin/mousepad
 share/applications/mousepad.desktop
-share/locale/ar/LC_MESSAGES/mousepad.mo
-share/locale/ast/LC_MESSAGES/mousepad.mo
-share/locale/bg/LC_MESSAGES/mousepad.mo
-share/locale/ca/LC_MESSAGES/mousepad.mo
-share/locale/cs/LC_MESSAGES/mousepad.mo
-share/locale/da/LC_MESSAGES/mousepad.mo
-share/locale/de/LC_MESSAGES/mousepad.mo
-share/locale/el/LC_MESSAGES/mousepad.mo
-share/locale/en_AU/LC_MESSAGES/mousepad.mo
-share/locale/en_GB/LC_MESSAGES/mousepad.mo
-share/locale/es/LC_MESSAGES/mousepad.mo
-share/locale/eu/LC_MESSAGES/mousepad.mo
-share/locale/fi/LC_MESSAGES/mousepad.mo
-share/locale/fr/LC_MESSAGES/mousepad.mo
-share/locale/gl/LC_MESSAGES/mousepad.mo
-share/locale/he/LC_MESSAGES/mousepad.mo
-share/locale/hr/LC_MESSAGES/mousepad.mo
-share/locale/hu/LC_MESSAGES/mousepad.mo
-share/locale/id/LC_MESSAGES/mousepad.mo
-share/locale/is/LC_MESSAGES/mousepad.mo
-share/locale/it/LC_MESSAGES/mousepad.mo
-share/locale/ja/LC_MESSAGES/mousepad.mo
-share/locale/kk/LC_MESSAGES/mousepad.mo
-share/locale/ko/LC_MESSAGES/mousepad.mo
-share/locale/lt/LC_MESSAGES/mousepad.mo
-share/locale/ms/LC_MESSAGES/mousepad.mo
-share/locale/nb/LC_MESSAGES/mousepad.mo
-share/locale/nl/LC_MESSAGES/mousepad.mo
-share/locale/nn/LC_MESSAGES/mousepad.mo
-share/locale/oc/LC_MESSAGES/mousepad.mo
-share/locale/pl/LC_MESSAGES/mousepad.mo
-share/locale/pt/LC_MESSAGES/mousepad.mo
-share/locale/pt_BR/LC_MESSAGES/mousepad.mo
-share/locale/ro/LC_MESSAGES/mousepad.mo
-share/locale/ru/LC_MESSAGES/mousepad.mo
-share/locale/sk/LC_MESSAGES/mousepad.mo
-share/locale/sl/LC_MESSAGES/mousepad.mo
-share/locale/sq/LC_MESSAGES/mousepad.mo
-share/locale/sr/LC_MESSAGES/mousepad.mo
-share/locale/sv/LC_MESSAGES/mousepad.mo
-share/locale/te/LC_MESSAGES/mousepad.mo
-share/locale/th/LC_MESSAGES/mousepad.mo
-share/locale/tr/LC_MESSAGES/mousepad.mo
-share/locale/ug/LC_MESSAGES/mousepad.mo
-share/locale/uk/LC_MESSAGES/mousepad.mo
-share/locale/zh_CN/LC_MESSAGES/mousepad.mo
-share/locale/zh_TW/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/da/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/de/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/el/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/es/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/he/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/id/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/is/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/it/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/te/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/th/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/mousepad.mo