- Add LICENSE_FILE

- Rename I18N option to more standard NLS
- Use options helpers
- Whitespace fixes in pkg-descr
- Fix WWW

PR:		228979
Approved by:	maintainer timeout (jt@ixsystems.com, 3 weeks)

3 files changed, 75 insertions, 81 deletions

diff --git a/deskutils/lumina-fileinfo/Makefile b/deskutils/lumina-fileinfo/Makefile
index 3b3fef629ee7..b193f74a6393 100644
--- a/deskutils/lumina-fileinfo/Makefile
+++ b/deskutils/lumina-fileinfo/Makefile
@@ -3,23 +3,17 @@
 
 PORTNAME=	lumina-fileinfo
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	deskutils
 
 MAINTAINER=	jt@ixsystems.com
 COMMENT=	File properties utility from the Lumina Desktop
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/../../../LICENSE
 
 CONFLICTS_INSTALL=	lumina-1.2.*
 
-OPTIONS_DEFINE=	I18N
-OPTIONS_DEFAULT=	I18N
-OPTIONS_SUB=	yes
-
-I18N_DESC=	Install localization files
-
-.include <bsd.port.options.mk>
-
 MAKE_JOBS_UNSAFE=yes
 
 USES=		qmake qt:5
@@ -31,9 +25,9 @@ GH_PROJECT=	lumina
 GH_TAGNAME=	b6536c1547571ae8dd0618bed752e2e0025bf2a7
 WRKSRC_SUBDIR=	src-qt5/desktop-utils/${PORTNAME}
 
-.if${PORT_OPTIONS:MI18N}
-USE_QT+=	linguist_build
-QMAKE_ARGS+=CONFIG+=WITH_I18N
-.endif
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+NLS_QMAKE_ON=	CONFIG+=WITH_I18N
+NLS_USE=	QT=linguist_build
 
 .include <bsd.port.mk>
diff --git a/deskutils/lumina-fileinfo/pkg-descr b/deskutils/lumina-fileinfo/pkg-descr
index 5355b1e20230..82df12303403 100644
--- a/deskutils/lumina-fileinfo/pkg-descr
+++ b/deskutils/lumina-fileinfo/pkg-descr
@@ -2,7 +2,7 @@ The file information utility from the Lumina Desktop.
 This can be used to view details about individual files in addition to
 permitting the user to easily modify XDG *.desktop entries.
 
-NOTE: Installing this utility will enable more options within the insight file 
+NOTE: Installing this utility will enable more options within the insight file
 manager lumina-fm, as well as the Lumina desktop itself lumina-core.
 
-WWW: http://lumina-desktop.org
+WWW: https://lumina-desktop.org/
diff --git a/deskutils/lumina-fileinfo/pkg-plist b/deskutils/lumina-fileinfo/pkg-plist
index 950d0a7d6374..6c69f1f0a931 100644
--- a/deskutils/lumina-fileinfo/pkg-plist
+++ b/deskutils/lumina-fileinfo/pkg-plist
@@ -1,70 +1,70 @@
 bin/lumina-fileinfo
 man/man1/lumina-fileinfo.1.gz
 share/applications/lumina-fileinfo.desktop
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_af.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_ar.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_az.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_bg.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_bn.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_bs.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_ca.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_cs.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_cy.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_da.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_de.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_el.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_en_GB.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_en_AU.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_en_ZA.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_es.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_et.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_eu.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_fa.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_fi.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_fr.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_fr_CA.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_fur.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_gl.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_he.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_hi.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_hr.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_hu.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_id.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_is.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_it.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_ja.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_ka.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_ko.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_lt.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_lv.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_mk.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_mn.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_ms.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_mt.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_nb.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_ne.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_nl.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_pa.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_pl.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_pt.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_pt_BR.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_ro.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_ru.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_sa.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_sk.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_sl.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_sr.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_sv.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_sw.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_ta.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_tg.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_th.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_tr.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_uk.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_ur.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_uz.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_vi.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_zh_CN.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_zh_HK.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_zh_TW.qm
-%%I18N%%share/lumina-desktop/i18n/l-fileinfo_zu.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_af.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_ar.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_az.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_bg.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_bn.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_bs.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_ca.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_cs.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_cy.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_da.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_de.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_el.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_en_GB.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_en_AU.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_en_ZA.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_es.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_et.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_eu.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_fa.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_fi.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_fr.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_fr_CA.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_fur.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_gl.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_he.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_hi.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_hr.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_hu.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_id.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_is.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_it.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_ja.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_ka.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_ko.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_lt.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_lv.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_mk.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_mn.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_ms.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_mt.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_nb.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_ne.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_nl.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_pa.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_pl.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_pt.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_pt_BR.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_ro.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_ru.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_sa.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_sk.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_sl.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_sr.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_sv.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_sw.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_ta.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_tg.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_th.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_tr.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_uk.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_ur.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_uz.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_vi.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_zh_CN.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_zh_HK.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_zh_TW.qm
+%%NLS%%share/lumina-desktop/i18n/l-fileinfo_zu.qm