Merge branch 'master' of github.com:trueos/lumina

14 files changed, 31 insertions, 28 deletions

diff --git a/port-files/FreeBSD/deskutils/lumina-archiver/Makefile b/port-files/FreeBSD/deskutils/lumina-archiver/Makefile
index c3236a33..d6efa3a7 100644
--- a/port-files/FreeBSD/deskutils/lumina-archiver/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-archiver/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Archive manager from the Lumina Desktop
 
 LICENSE=	BSD3CLAUSE
 
-CONFLICTS=	lumina-1.2.1
+CONFLICTS_INSTALL=	lumina-1.2.*
 
 OPTIONS_DEFINE=	I18N
 OPTIONS_DEFAULT=	I18N
@@ -23,7 +23,7 @@ MAKE_JOBS_UNSAFE=yes
 
 USE_QT5=	core gui widgets network svg \
 		buildtools_build x11extras concurrent multimedia
-USES=		desktop-file-utils qmake
+USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-calculator/Makefile b/port-files/FreeBSD/deskutils/lumina-calculator/Makefile
index a1f2654c..3e85119f 100644
--- a/port-files/FreeBSD/deskutils/lumina-calculator/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-calculator/Makefile
@@ -11,7 +11,12 @@ COMMENT=	Scientific calculator from the Lumina Desktop
 
 LICENSE=	BSD3CLAUSE
 
-CONFLICTS=	lumina-1.2.1
+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.*
 
 OPTIONS_DEFINE=	I18N
 OPTIONS_DEFAULT=	I18N
@@ -21,9 +26,11 @@ I18N_DESC= Install localization files
 
 MAKE_JOBS_UNSAFE=yes
 
+USE_GL=		gl
+USE_XORG=	x11 xdamage xcb
 USE_QT5=	core gui widgets network svg \
 		buildtools_build x11extras concurrent multimedia
-USES=		desktop-file-utils qmake
+USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-fileinfo/Makefile b/port-files/FreeBSD/deskutils/lumina-fileinfo/Makefile
index e94153c2..1bf569ba 100644
--- a/port-files/FreeBSD/deskutils/lumina-fileinfo/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-fileinfo/Makefile
@@ -11,7 +11,7 @@ COMMENT=	File properties utility from the Lumina Desktop
 
 LICENSE=	BSD3CLAUSE
 
-CONFLICTS=	lumina-1.2.1
+CONFLICTS_INSTALL=	lumina-1.2.*
 
 OPTIONS_DEFINE=	I18N
 OPTIONS_DEFAULT=	I18N
@@ -23,7 +23,7 @@ MAKE_JOBS_UNSAFE=yes
 
 USE_QT5=	core gui widgets network svg \
 		buildtools_build x11extras concurrent multimedia
-USES=		desktop-file-utils qmake
+USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-fm/Makefile b/port-files/FreeBSD/deskutils/lumina-fm/Makefile
index c31edfef..bb2ab4a7 100644
--- a/port-files/FreeBSD/deskutils/lumina-fm/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-fm/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Insight file manager from the Lumina Desktop
 
 LICENSE=	BSD3CLAUSE
 
-CONFLICTS=	lumina-1.2.1
+CONFLICTS_INSTALL=	lumina-1.2.*
 
 OPTIONS_DEFINE=	I18N
 OPTIONS_DEFAULT=	I18N
@@ -23,7 +23,7 @@ MAKE_JOBS_UNSAFE=yes
 
 USE_QT5=	core gui widgets network svg imageformats \
 		buildtools_build x11extras multimedia concurrent
-USES=		desktop-file-utils qmake
+USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-mediaplayer/Makefile b/port-files/FreeBSD/deskutils/lumina-mediaplayer/Makefile
index 0f9affd1..2a319ee5 100644
--- a/port-files/FreeBSD/deskutils/lumina-mediaplayer/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-mediaplayer/Makefile
@@ -11,8 +11,6 @@ COMMENT=	Streaming media player from the Lumina Desktop
 
 LICENSE=	BSD3CLAUSE
 
-CONFLICTS=	lumina-1.2.1
-
 OPTIONS_DEFINE=	I18N
 OPTIONS_DEFAULT=	I18N
 I18N_DESC= Install localization files
@@ -23,7 +21,7 @@ MAKE_JOBS_UNSAFE=yes
 
 USE_QT5=	core gui widgets network svg \
 		buildtools_build x11extras multimedia concurrent
-USES=		desktop-file-utils qmake
+USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-notify/Makefile b/port-files/FreeBSD/deskutils/lumina-notify/Makefile
index b0012c94..c0e8243c 100644
--- a/port-files/FreeBSD/deskutils/lumina-notify/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-notify/Makefile
@@ -11,8 +11,6 @@ COMMENT=	Alarm/notification utility from the Lumina Desktop
 
 LICENSE=	BSD3CLAUSE
 
-CONFLICTS=	lumina-1.2.1
-
 OPTIONS_DEFINE=	I18N
 OPTIONS_DEFAULT=	I18N
 I18N_DESC= Install localization files
@@ -23,7 +21,7 @@ MAKE_JOBS_UNSAFE=yes
 
 USE_QT5=	core gui widgets network svg \
 		buildtools_build x11extras concurrent multimedia
-USES=		desktop-file-utils qmake
+USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-screenshot/Makefile b/port-files/FreeBSD/deskutils/lumina-screenshot/Makefile
index ef49b0b8..b66f0cad 100644
--- a/port-files/FreeBSD/deskutils/lumina-screenshot/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-screenshot/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Screenshot utility from the Lumina Desktop
 
 LICENSE=	BSD3CLAUSE
 
-CONFLICTS=	lumina-1.2.1
+CONFLICTS_INSTALL=	lumina-1.2.*
 
 OPTIONS_DEFINE=	I18N
 OPTIONS_DEFAULT=	I18N
@@ -23,7 +23,7 @@ MAKE_JOBS_UNSAFE=yes
 
 USE_QT5=	core gui widgets network svg \
 		buildtools_build x11extras concurrent multimedia
-USES=		desktop-file-utils qmake
+USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-textedit/Makefile b/port-files/FreeBSD/deskutils/lumina-textedit/Makefile
index 2d5c2152..fccf5f1b 100644
--- a/port-files/FreeBSD/deskutils/lumina-textedit/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-textedit/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Plaintext editor from the Lumina Desktop
 
 LICENSE=	BSD3CLAUSE
 
-CONFLICTS=	lumina-1.2.1
+CONFLICTS_INSTALL=	lumina-1.2.*
 
 OPTIONS_DEFINE=	I18N
 OPTIONS_DEFAULT=	I18N
@@ -23,7 +23,7 @@ MAKE_JOBS_UNSAFE=yes
 
 USE_QT5=	core gui widgets network svg \
 		buildtools_build x11extras concurrent multimedia
-USES=		desktop-file-utils qmake
+USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-textedit/pkg-plist b/port-files/FreeBSD/deskutils/lumina-textedit/pkg-plist
index bf8a3b04..d0688f6a 100644
--- a/port-files/FreeBSD/deskutils/lumina-textedit/pkg-plist
+++ b/port-files/FreeBSD/deskutils/lumina-textedit/pkg-plist
@@ -64,6 +64,7 @@ share/lumina-desktop/i18n/l-te_zh_HK.qm
 share/lumina-desktop/i18n/l-te_zh_TW.qm
 share/lumina-desktop/i18n/l-te_zu.qm
 share/lumina-desktop/syntax_rules/cpp.syntax
+share/lumina-desktop/syntax_rules/go.syntax
 share/lumina-desktop/syntax_rules/html.syntax
 share/lumina-desktop/syntax_rules/javascript.syntax
 share/lumina-desktop/syntax_rules/json.syntax
@@ -73,4 +74,5 @@ share/lumina-desktop/syntax_rules/python.syntax
 share/lumina-desktop/syntax_rules/README.md
 share/lumina-desktop/syntax_rules/rst.syntax
 share/lumina-desktop/syntax_rules/sh.syntax
+share/lumina-desktop/syntax_rules/txt.syntax
 share/lumina-desktop/syntax_rules/xml.syntax
diff --git a/port-files/FreeBSD/deskutils/lumina-xdg-entry/Makefile b/port-files/FreeBSD/deskutils/lumina-xdg-entry/Makefile
index b031d5a1..ac04b4c3 100644
--- a/port-files/FreeBSD/deskutils/lumina-xdg-entry/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-xdg-entry/Makefile
@@ -11,8 +11,6 @@ COMMENT=	XDG desktop entry creator from the Lumina Desktop
 
 LICENSE=	BSD3CLAUSE
 
-CONFLICTS=	lumina-1.2.1
-
 OPTIONS_DEFINE=	I18N
 OPTIONS_DEFAULT=	I18N
 I18N_DESC= Install localization files
@@ -23,7 +21,7 @@ MAKE_JOBS_UNSAFE=yes
 
 USE_QT5=	core gui widgets network svg \
 		buildtools_build x11extras concurrent multimedia
-USES=		desktop-file-utils qmake
+USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-xdg-entry/pkg-plist b/port-files/FreeBSD/deskutils/lumina-xdg-entry/pkg-plist
index f8e1f471..25552b4c 100644
--- a/port-files/FreeBSD/deskutils/lumina-xdg-entry/pkg-plist
+++ b/port-files/FreeBSD/deskutils/lumina-xdg-entry/pkg-plist
@@ -1 +1,2 @@
 bin/lumina-xdg-entry
+share/applications/lumina-xdg-entry.desktop
diff --git a/port-files/FreeBSD/x11/lumina-core/Makefile b/port-files/FreeBSD/x11/lumina-core/Makefile
index 0c178831..f1d50652 100644
--- a/port-files/FreeBSD/x11/lumina-core/Makefile
+++ b/port-files/FreeBSD/x11/lumina-core/Makefile
@@ -16,14 +16,13 @@ RUN_DEPENDS=	fluxbox>=0:x11-wm/fluxbox \
 		xbrightness>=0:x11/xbrightness \
 		compton>=0:x11-wm/compton \
 		xrandr>=0:x11/xrandr \
-		numlockx>=0:x11/numlockx \
-		xinput>=0:x11/xinput
+		numlockx>=0:x11/numlockx
 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=	lumina-1.2.1
+CONFLICTS_INSTALL=	lumina-1.2.*
 
 OPTIONS_DEFINE=	MULTIMEDIA TRUEOS I18N
 OPTIONS_DEFAULT=	MULTIMEDIA I18N
@@ -44,7 +43,7 @@ USE_XORG=	x11 xdamage xcb
 USE_LDCONFIG=	yes
 USE_QT5=	core gui widgets network svg multimedia imageformats \
 		buildtools_build x11extras concurrent
-USES=		desktop-file-utils qmake
+USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/x11/lumina-coreutils/Makefile b/port-files/FreeBSD/x11/lumina-coreutils/Makefile
index 87457ea3..3637b265 100644
--- a/port-files/FreeBSD/x11/lumina-coreutils/Makefile
+++ b/port-files/FreeBSD/x11/lumina-coreutils/Makefile
@@ -13,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	xrandr:x11/xrandr
 
-CONFLICTS=	lumina-1.2.1
+CONFLICTS_INSTALL=	lumina-1.2.*
 
 OPTIONS_DEFINE=	I18N
 OPTIONS_DEFAULT=	I18N
@@ -26,7 +26,7 @@ MAKE_JOBS_UNSAFE=yes
 USE_LDCONFIG=	yes
 USE_QT5=	core gui widgets network svg imageformats \
 		buildtools_build x11extras concurrent multimedia
-USES=		desktop-file-utils qmake
+USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/x11/lumina/Makefile b/port-files/FreeBSD/x11/lumina/Makefile
index f6f691f4..f52e40d3 100644
--- a/port-files/FreeBSD/x11/lumina/Makefile
+++ b/port-files/FreeBSD/x11/lumina/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	lumina-core>=0:x11/lumina-core \
 		lumina-textedit>=0:deskutils/lumina-textedit \
 		lumina-xdg-entry>=0:deskutils/lumina-xdg-entry
 
-CONFLICTS=	lumina-1.2.1
+CONFLICTS_INSTALL=	lumina-1.2.*
 
 USES=		metaport