x11/lumina: upgrade 1.4.1 -> 1.5.0

- Remove deskutils/lumina-notify (upstreamed)
  https://github.com/lumina-desktop/lumina/commit/89ad0095d7da09158778b5afae9beeaa0bd98d38
- Remove deskutils/lumina-xdg-entry (upstreamed)
  https://github.com/lumina-desktop/lumina/commit/0069a052e1cbef588e8f93a31314965b0c2af68a
- Fix variables order (pet portlint)
- Alphabetize USE_QT
- Update knob to use options helpers
- Remove GH_TAGNAME (except for deskutils/lumina-pdf and
  deskutils/lumina-calculator which haven't release tag)
- Change GH_ACCOUNT from "trueos" to "lumina-desktop"
- Add a new port deskutils/lumina-photo
- Change I18N option to well know NLS option

PR:		240749
Submitted by:	Loic Bartoletti <lbartoletti@tuxfamily.org>
Approved by:	JT Pennington <jt@ixsystems.com> (maintainer)
Differential Revision:	D21749

3 files changed, 82 insertions, 97 deletions

diff --git a/deskutils/lumina-calculator/Makefile b/deskutils/lumina-calculator/Makefile
index 83462422107b..e246ca2a44a3 100644
--- a/deskutils/lumina-calculator/Makefile
+++ b/deskutils/lumina-calculator/Makefile
@@ -1,48 +1,33 @@
-# Created by: Ken Moore <ken@pcbsd.org>
 # $FreeBSD$
 
 PORTNAME=	lumina-calculator
-PORTVERSION=	1.4.1
-PORTREVISION=	3
+DISTVERSION=	1.5.0
 CATEGORIES=	deskutils
 
-MAINTAINER=	jt@ixsystems.com
+MAINTAINER=	ken@project-trident.org
 COMMENT=	Scientific calculator from the Lumina Desktop
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/../../../LICENSE
 
-LIB_DEPENDS+=	libxcb-ewmh.so:x11/xcb-util-wm \
-		libxcb-icccm.so:x11/xcb-util-wm \
-		libxcb-image.so:x11/xcb-util-image \
-		libxcb-util.so:x11/xcb-util
-
-CONFLICTS_INSTALL=	lumina-1.2.*
+USES=		gl qmake qt:5 xorg
+USE_GL=		gl
+USE_XORG=	x11
+USE_QT=		buildtools_build core gui svg widgets
+USE_GITHUB=	yes
+GH_ACCOUNT=	lumina-desktop
+GH_PROJECT=	lumina-calculator
+GH_TAGNAME=	ccb792fc713aa7163fffd37fc20c83ffe9ca7523
 
-OPTIONS_DEFINE=	I18N
-OPTIONS_DEFAULT=	I18N
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
 
 I18N_DESC=	Install localization files
 
-.include <bsd.port.options.mk>
+CONFLICTS_INSTALL=	lumina-1.2.*
 
-MAKE_JOBS_UNSAFE=yes
+WRKSRC_SUBDIR=	src-qt5
 
-USES=		compiler:c++11-lang gl qmake qt:5
-USE_GL=		gl
-USE_XORG=	x11 xdamage xcb
-USE_QT=		core gui widgets network svg \
-		buildtools_build x11extras concurrent multimedia
-USE_GITHUB=	yes
-GH_ACCOUNT=	trueos
-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
+NLS_USE=	qt=linguist_build
+NLS_QMAKE_ON=	CONFIG+=WITH_I18N
 
 .include <bsd.port.mk>
diff --git a/deskutils/lumina-calculator/distinfo b/deskutils/lumina-calculator/distinfo
index 0e307ae96a79..1e41d8da035f 100644
--- a/deskutils/lumina-calculator/distinfo
+++ b/deskutils/lumina-calculator/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 = 1569007715
+SHA256 (lumina-desktop-lumina-calculator-1.5.0-ccb792fc713aa7163fffd37fc20c83ffe9ca7523_GH0.tar.gz) = 343477ec2b965bf62c0d4cd7088cdd785eac30066eb7baa2f7dbf4c407630575
+SIZE (lumina-desktop-lumina-calculator-1.5.0-ccb792fc713aa7163fffd37fc20c83ffe9ca7523_GH0.tar.gz) = 31116
diff --git a/deskutils/lumina-calculator/pkg-plist b/deskutils/lumina-calculator/pkg-plist
index b9076a63f480..1614e6a7342e 100644
--- a/deskutils/lumina-calculator/pkg-plist
+++ b/deskutils/lumina-calculator/pkg-plist
@@ -1,66 +1,66 @@
 bin/lumina-calculator
 man/man1/lumina-calculator.1.gz
 share/applications/lumina-calculator.desktop
-%%I18N%%share/lumina-desktop/i18n/l-calc_af.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_ar.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_az.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_bg.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_bn.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_bs.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_ca.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_cs.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_cy.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_da.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_de.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_el.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_en_GB.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_en_AU.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_en_ZA.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_es.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_et.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_eu.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_fa.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_fi.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_fr.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_fr_CA.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_gl.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_he.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_hi.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_hr.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_hu.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_id.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_is.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_it.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_ja.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_ka.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_ko.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_lt.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_lv.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_mk.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_mn.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_ms.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_mt.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_nb.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_nl.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_pa.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_pl.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_pt.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_pt_BR.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_ro.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_ru.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_sk.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_sl.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_sr.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_sv.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_sw.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_ta.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_tg.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_th.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_tr.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_uk.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_uz.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_vi.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_zh_CN.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_zh_HK.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_zh_TW.qm
-%%I18N%%share/lumina-desktop/i18n/l-calc_zu.qm
+%%DATADIR%%/i18n/l-calc_af.qm
+%%DATADIR%%/i18n/l-calc_ar.qm
+%%DATADIR%%/i18n/l-calc_az.qm
+%%DATADIR%%/i18n/l-calc_bg.qm
+%%DATADIR%%/i18n/l-calc_bn.qm
+%%DATADIR%%/i18n/l-calc_bs.qm
+%%DATADIR%%/i18n/l-calc_ca.qm
+%%DATADIR%%/i18n/l-calc_cs.qm
+%%DATADIR%%/i18n/l-calc_cy.qm
+%%DATADIR%%/i18n/l-calc_da.qm
+%%DATADIR%%/i18n/l-calc_de.qm
+%%DATADIR%%/i18n/l-calc_el.qm
+%%DATADIR%%/i18n/l-calc_en_AU.qm
+%%DATADIR%%/i18n/l-calc_en_GB.qm
+%%DATADIR%%/i18n/l-calc_en_ZA.qm
+%%DATADIR%%/i18n/l-calc_es.qm
+%%DATADIR%%/i18n/l-calc_et.qm
+%%DATADIR%%/i18n/l-calc_eu.qm
+%%DATADIR%%/i18n/l-calc_fa.qm
+%%DATADIR%%/i18n/l-calc_fi.qm
+%%DATADIR%%/i18n/l-calc_fr.qm
+%%DATADIR%%/i18n/l-calc_fr_CA.qm
+%%DATADIR%%/i18n/l-calc_gl.qm
+%%DATADIR%%/i18n/l-calc_he.qm
+%%DATADIR%%/i18n/l-calc_hi.qm
+%%DATADIR%%/i18n/l-calc_hr.qm
+%%DATADIR%%/i18n/l-calc_hu.qm
+%%DATADIR%%/i18n/l-calc_id.qm
+%%DATADIR%%/i18n/l-calc_is.qm
+%%DATADIR%%/i18n/l-calc_it.qm
+%%DATADIR%%/i18n/l-calc_ja.qm
+%%DATADIR%%/i18n/l-calc_ka.qm
+%%DATADIR%%/i18n/l-calc_ko.qm
+%%DATADIR%%/i18n/l-calc_lt.qm
+%%DATADIR%%/i18n/l-calc_lv.qm
+%%DATADIR%%/i18n/l-calc_mk.qm
+%%DATADIR%%/i18n/l-calc_mn.qm
+%%DATADIR%%/i18n/l-calc_ms.qm
+%%DATADIR%%/i18n/l-calc_mt.qm
+%%DATADIR%%/i18n/l-calc_nb.qm
+%%DATADIR%%/i18n/l-calc_nl.qm
+%%DATADIR%%/i18n/l-calc_pa.qm
+%%DATADIR%%/i18n/l-calc_pl.qm
+%%DATADIR%%/i18n/l-calc_pt.qm
+%%DATADIR%%/i18n/l-calc_pt_BR.qm
+%%DATADIR%%/i18n/l-calc_ro.qm
+%%DATADIR%%/i18n/l-calc_ru.qm
+%%DATADIR%%/i18n/l-calc_sk.qm
+%%DATADIR%%/i18n/l-calc_sl.qm
+%%DATADIR%%/i18n/l-calc_sr.qm
+%%DATADIR%%/i18n/l-calc_sv.qm
+%%DATADIR%%/i18n/l-calc_sw.qm
+%%DATADIR%%/i18n/l-calc_ta.qm
+%%DATADIR%%/i18n/l-calc_tg.qm
+%%DATADIR%%/i18n/l-calc_th.qm
+%%DATADIR%%/i18n/l-calc_tr.qm
+%%DATADIR%%/i18n/l-calc_uk.qm
+%%DATADIR%%/i18n/l-calc_uz.qm
+%%DATADIR%%/i18n/l-calc_vi.qm
+%%DATADIR%%/i18n/l-calc_zh_CN.qm
+%%DATADIR%%/i18n/l-calc_zh_HK.qm
+%%DATADIR%%/i18n/l-calc_zh_TW.qm
+%%DATADIR%%/i18n/l-calc_zu.qm