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, 73 insertions, 65 deletions

diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index 8fa3656d34ba..8112ed4337b4 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	orage
 PORTVERSION=	4.12.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}/
 DIST_SUBDIR=	xfce4
@@ -15,24 +15,32 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpopt.so:devel/popt \
-	libdbus-glib-1.so:devel/dbus-glib \
-	libical.so:devel/libical
+		libdbus-glib-1.so:devel/dbus-glib \
+		libdbus-1.so:devel/dbus \
+		libical.so:devel/libical \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USES=		pkgconfig libtool gettext desktop-file-utils gmake \
-	xfce tar:bzip2
-USE_GNOME=	gtk20 intltool intlhack
+USES=		desktop-file-utils gettext gmake gnome libtool pkgconfig \
+		tar:bzip2 xfce
+USE_GNOME=	cairo gtk20 intlhack intltool
 USE_XFCE=	panel
+USE_XORG=	x11
 
-OPTIONS_DEFINE=	NOTIFY
+CFLAGS+=	-I${LOCALBASE}/include/libical
+CONFIGURE_ARGS=	--enable-dbus
+
+OPTIONS_DEFINE=		NLS NOTIFY
 OPTIONS_DEFAULT=	NOTIFY
-NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
-NOTIFY_CONFIGURE_ENABLE=	libnotify
+OPTIONS_SUB=		yes
 
-CFLAGS+=	-I${LOCALBASE}/include/libical
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
 
-CONFIGURE_ARGS=	--enable-dbus
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
+NOTIFY_CONFIGURE_ENABLE=libnotify
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|(datadir)/orage/doc/C|(datadir)/doc/orage/C|' \
diff --git a/deskutils/orage/pkg-descr b/deskutils/orage/pkg-descr
index d0c4a1bda4b5..1b8ceb49b6a6 100644
--- a/deskutils/orage/pkg-descr
+++ b/deskutils/orage/pkg-descr
@@ -3,4 +3,4 @@ environment. It is highly configurable and supports alerts based on dates.
 It warns you with popup or audio alarm. As it is an application kind-of
 every day use it launches itself in the background as a daemon.
 
-WWW: http://www.xfce.org/projects/orage/
+WWW: https://git.xfce.org/apps/orage/about/
diff --git a/deskutils/orage/pkg-plist b/deskutils/orage/pkg-plist
index dcdb3755ae0f..66e692183193 100644
--- a/deskutils/orage/pkg-plist
+++ b/deskutils/orage/pkg-plist
@@ -36,59 +36,59 @@ share/icons/hicolor/48x48/apps/orage_globaltime.png
 share/icons/hicolor/48x48/apps/xfcalendar.png
 share/icons/hicolor/scalable/apps/orage_globaltime.svg
 share/icons/hicolor/scalable/apps/xfcalendar.svg
-share/locale/am/LC_MESSAGES/orage.mo
-share/locale/ar/LC_MESSAGES/orage.mo
-share/locale/ast/LC_MESSAGES/orage.mo
-share/locale/be/LC_MESSAGES/orage.mo
-share/locale/bg/LC_MESSAGES/orage.mo
-share/locale/ca/LC_MESSAGES/orage.mo
-share/locale/cs/LC_MESSAGES/orage.mo
-share/locale/de/LC_MESSAGES/orage.mo
-share/locale/el/LC_MESSAGES/orage.mo
-share/locale/en_AU/LC_MESSAGES/orage.mo
-share/locale/en_GB/LC_MESSAGES/orage.mo
-share/locale/eo/LC_MESSAGES/orage.mo
-share/locale/es/LC_MESSAGES/orage.mo
-share/locale/et/LC_MESSAGES/orage.mo
-share/locale/eu/LC_MESSAGES/orage.mo
-share/locale/fi/LC_MESSAGES/orage.mo
-share/locale/fr/LC_MESSAGES/orage.mo
-share/locale/gl/LC_MESSAGES/orage.mo
-share/locale/he/LC_MESSAGES/orage.mo
-share/locale/hr/LC_MESSAGES/orage.mo
-share/locale/hu/LC_MESSAGES/orage.mo
-share/locale/id/LC_MESSAGES/orage.mo
-share/locale/it/LC_MESSAGES/orage.mo
-share/locale/ja/LC_MESSAGES/orage.mo
-share/locale/kk/LC_MESSAGES/orage.mo
-share/locale/ko/LC_MESSAGES/orage.mo
-share/locale/lt/LC_MESSAGES/orage.mo
-share/locale/lv/LC_MESSAGES/orage.mo
-share/locale/ms/LC_MESSAGES/orage.mo
-share/locale/nb/LC_MESSAGES/orage.mo
-share/locale/nl/LC_MESSAGES/orage.mo
-share/locale/nn/LC_MESSAGES/orage.mo
-share/locale/oc/LC_MESSAGES/orage.mo
-share/locale/pa/LC_MESSAGES/orage.mo
-share/locale/pl/LC_MESSAGES/orage.mo
-share/locale/pt/LC_MESSAGES/orage.mo
-share/locale/pt_BR/LC_MESSAGES/orage.mo
-share/locale/ro/LC_MESSAGES/orage.mo
-share/locale/ru/LC_MESSAGES/orage.mo
-share/locale/si/LC_MESSAGES/orage.mo
-share/locale/sk/LC_MESSAGES/orage.mo
-share/locale/sq/LC_MESSAGES/orage.mo
-share/locale/sr/LC_MESSAGES/orage.mo
-share/locale/sv/LC_MESSAGES/orage.mo
-share/locale/th/LC_MESSAGES/orage.mo
-share/locale/tr/LC_MESSAGES/orage.mo
-share/locale/ug/LC_MESSAGES/orage.mo
-share/locale/uk/LC_MESSAGES/orage.mo
-share/locale/ur/LC_MESSAGES/orage.mo
-share/locale/ur_PK/LC_MESSAGES/orage.mo
-share/locale/vi/LC_MESSAGES/orage.mo
-share/locale/zh_CN/LC_MESSAGES/orage.mo
-share/locale/zh_TW/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/am/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/be/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/de/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/el/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/es/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/et/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/he/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/id/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/it/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/si/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/th/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/orage.mo
 %%DATADIR%%/sounds/Boiling.wav
 %%DATADIR%%/sounds/KDE_Beep_Digital_1.ogg
 %%DATADIR%%/sounds/KDE_Beep_Digital_2.ogg