3 files changed, 79 insertions, 88 deletions

diff --git a/deskutils/lumina-archiver/Makefile b/deskutils/lumina-archiver/Makefile
index a45714b7e685..06bbe6b765fc 100644
--- a/deskutils/lumina-archiver/Makefile
+++ b/deskutils/lumina-archiver/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	lumina-archiver
-PORTVERSION=	1.4.1
-PORTREVISION=	3
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.5.0
 CATEGORIES=	deskutils
 
 MAINTAINER=	jt@ixsystems.com
@@ -12,30 +12,21 @@ COMMENT=	Archive manager 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=		compiler:c++11-lang qmake qt:5
-USE_QT=		core gui widgets network svg \
-		buildtools_build x11extras concurrent multimedia
+USE_QT=		buildtools_build concurrent core gui \
+		multimedia network svg widgets x11extras
 USE_GITHUB=	yes
-GH_ACCOUNT=	trueos
+GH_ACCOUNT=	lumina-desktop
 GH_PROJECT=	lumina
-GH_TAGNAME=	b6536c1547571ae8dd0618bed752e2e0025bf2a7
+
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
+
+CONFLICTS_INSTALL=	lumina-1.2.*
+
 WRKSRC_SUBDIR=	src-qt5/desktop-utils/${PORTNAME}
 
-.if${PORT_OPTIONS:MI18N}
-USE_QT+=	linguist_build
-QMAKE_ARGS+=CONFIG+=WITH_I18N
-.endif
+NLS_USE=	qt=linguist_build
+NLS_QMAKE_ON=	CONFIG+=WITH_I18N
 
 .include <bsd.port.mk>
diff --git a/deskutils/lumina-archiver/distinfo b/deskutils/lumina-archiver/distinfo
index 0e307ae96a79..b6cfc35268e3 100644
--- a/deskutils/lumina-archiver/distinfo
+++ b/deskutils/lumina-archiver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513135712
-SHA256 (trueos-lumina-1.4.1-b6536c1547571ae8dd0618bed752e2e0025bf2a7_GH0.tar.gz) = e5cb00a7d075cdcd9e709ad861212b6b115a2ca94c4034313a31fe1317e83607
-SIZE (trueos-lumina-1.4.1-b6536c1547571ae8dd0618bed752e2e0025bf2a7_GH0.tar.gz) = 20562609
+TIMESTAMP = 1569130045
+SHA256 (lumina-desktop-lumina-v1.5.0_GH0.tar.gz) = 3dcf9844ba5ba912a1b4618a0f50e0170d8dc354c178b2c3b50f8a8e6b85400f
+SIZE (lumina-desktop-lumina-v1.5.0_GH0.tar.gz) = 20657364
diff --git a/deskutils/lumina-archiver/pkg-plist b/deskutils/lumina-archiver/pkg-plist
index 7b38dee86a8c..d9eb6dc70d50 100644
--- a/deskutils/lumina-archiver/pkg-plist
+++ b/deskutils/lumina-archiver/pkg-plist
@@ -1,66 +1,66 @@
 bin/lumina-archiver
 man/man1/lumina-archiver.1.gz
 share/applications/lumina-archiver.desktop
-%%I18N%%share/lumina-desktop/i18n/l-archiver_af.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_ar.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_az.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_bg.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_bn.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_bs.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_ca.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_cs.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_cy.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_da.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_de.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_el.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_en_GB.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_en_AU.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_en_ZA.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_es.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_et.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_eu.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_fa.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_fi.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_fr.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_fr_CA.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_gl.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_he.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_hi.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_hr.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_hu.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_id.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_is.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_it.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_ja.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_ka.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_ko.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_lt.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_lv.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_mk.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_mn.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_ms.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_mt.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_nb.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_nl.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_pa.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_pl.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_pt.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_pt_BR.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_ro.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_ru.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_sk.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_sl.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_sr.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_sv.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_sw.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_ta.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_tg.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_th.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_tr.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_uk.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_uz.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_vi.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_zh_CN.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_zh_HK.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_zh_TW.qm
-%%I18N%%share/lumina-desktop/i18n/l-archiver_zu.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_af.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_ar.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_az.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_bg.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_bn.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_bs.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_ca.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_cs.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_cy.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_da.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_de.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_el.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_en_GB.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_en_AU.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_en_ZA.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_es.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_et.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_eu.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_fa.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_fi.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_fr.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_fr_CA.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_gl.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_he.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_hi.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_hr.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_hu.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_id.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_is.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_it.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_ja.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_ka.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_ko.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_lt.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_lv.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_mk.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_mn.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_ms.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_mt.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_nb.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_nl.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_pa.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_pl.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_pt.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_pt_BR.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_ro.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_ru.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_sk.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_sl.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_sr.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_sv.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_sw.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_ta.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_tg.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_th.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_tr.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_uk.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_uz.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_vi.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_zh_CN.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_zh_HK.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_zh_TW.qm
+%%NLS%%share/lumina-desktop/i18n/l-archiver_zu.qm