- Update to Lumina 0.8.7

5 files changed, 33 insertions, 16 deletions

diff --git a/x11/lumina/Makefile b/x11/lumina/Makefile
index e721e03fee1f..0a1a61af41d4 100644
--- a/x11/lumina/Makefile
+++ b/x11/lumina/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lumina
-PORTVERSION=	0.8.6
+PORTVERSION=	0.8.7
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-Release
 PORTEPOCH=	1
@@ -22,29 +22,35 @@ RUN_DEPENDS=	xorg>=0:${PORTSDIR}/x11/xorg \
 		xbrightness:${PORTSDIR}/x11/xbrightness \
 		numlockx:${PORTSDIR}/x11/numlockx
 
-OPTIONS_DEFINE=	MULTIMEDIA
+CONFLICTS=      lumina-devel-0*
+
+OPTIONS_DEFINE=	MULTIMEDIA PCBSD
 OPTIONS_DEFAULT=	MULTIMEDIA
 MULTIMEDIA_DESC=	Install multimedia support backend (gstreamer)
+PCBSD_DESC=	Use the PC-BSD system interface settings.
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMULTIMEDIA}
-RUN_DEPENDS+=	gstreamer-plugins-core>=0:${PORTSDIR}/multimedia/gstreamer-plugins-core \
-		gstreamer-plugins-ogg>=0:${PORTSDIR}/audio/gstreamer-plugins-ogg \
-		gstreamer-plugins-vorbis>=0:${PORTSDIR}/audio/gstreamer-plugins-vorbis
+RUN_DEPENDS+=	gstreamer-plugins-core>=0:${PORTSDIR}/multimedia/gstreamer-plugins-core
 .endif
 
 MAKE_JOBS_UNSAFE=yes
 
-USE_XORG=	x11 xcomposite xdamage xrender
+USE_XORG=	x11 xdamage
 USE_XCB=		x11extras wm
 USE_LDCONFIG=	yes
 USE_QT5=	core gui network quick svg linguist multimedia imageformats \
-		buildtools x11extras
-USES=		qmake
+		buildtools x11extras concurrent
+USES=		desktop-file-utils qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	pcbsd
 
+#Setup the qmake configuration options
+.if {PORT_OPTIONS:MPCBSD}
+QMAKE_ARGS=	CONFIG+="configure NO_I18N PCBSD"
+.else
 QMAKE_ARGS=	CONFIG+="configure NO_I18N"
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11/lumina/distinfo b/x11/lumina/distinfo
index 6415a54ab8aa..fdaf3cbeac7f 100644
--- a/x11/lumina/distinfo
+++ b/x11/lumina/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pcbsd-lumina-v0.8.6-Release_GH0.tar.gz) = bb4d3c848193034f17ed7aa91f69308ba237da101336ecb5d1eeb95c7a62ece2
-SIZE (pcbsd-lumina-v0.8.6-Release_GH0.tar.gz) = 23300406
+SHA256 (pcbsd-lumina-v0.8.7-Release_GH0.tar.gz) = 2374636d238f24d552186a7d3e00d5c2c7f87e2169d8462015100a2271dd1b51
+SIZE (pcbsd-lumina-v0.8.7-Release_GH0.tar.gz) = 35755064
diff --git a/x11/lumina/pkg-descr b/x11/lumina/pkg-descr
index 18269daeb980..4618997811e9 100644
--- a/x11/lumina/pkg-descr
+++ b/x11/lumina/pkg-descr
@@ -1,4 +1,4 @@
 Lumina-DE is a lightweight, BSD licensed desktop environment,
 designed specifically for use on FreeBSD
 
-WWW: https://www.lumina-desktop.org
+WWW: http://lumina-desktop.org
diff --git a/x11/lumina/pkg-message b/x11/lumina/pkg-message
new file mode 100644
index 000000000000..e3f28d0e97d3
--- /dev/null
+++ b/x11/lumina/pkg-message
@@ -0,0 +1,8 @@
+The Lumina Desktop Environment has been installed!
+
+An entry for for launching Lumina from a graphical login manager has already been added to the system, but if you with to start Lumina manually, you will need to do one of the following:
+1) Put the line "exec Lumina-DE" at the end of your user's "~/.xinitrc" file before running startx
+2) Wrap the Lumina binary call with an X initialization call: 
+Example: "xinit ${PREFIX}/bin/Lumina-DE -- :0"
+
+Also note that the system-wide default settings for Lumina are contained in ${PREFIX}/etc/luminaDesktop.conf[.dist]. While it is possible to customize the desktop to the user's liking after logging in, you may want to adjust the default settings as necessary if there are multiple user accounts on this system.
diff --git a/x11/lumina/pkg-plist b/x11/lumina/pkg-plist
index 6716bc8da669..39042be132a2 100644
--- a/x11/lumina/pkg-plist
+++ b/x11/lumina/pkg-plist
@@ -26,22 +26,25 @@ share/pixmaps/Lumina-DE.png
 share/pixmaps/Insight-FileManager.png
 share/xsessions/Lumina-DE.desktop
 share/Lumina-DE/desktop-background.jpg
-share/Lumina-DE/defaultapps.conf
 share/Lumina-DE/luminaDesktop.conf
 share/Lumina-DE/fluxbox-init-rc
 share/Lumina-DE/fluxbox-keys
 share/Lumina-DE/Login.ogg
 share/Lumina-DE/Logout.ogg
+share/Lumina-DE/colors/Blue-Light.qss.colors
+share/Lumina-DE/colors/Grey-Dark.qss.colors
 share/Lumina-DE/colors/Lumina-Red.qss.colors
 share/Lumina-DE/colors/Lumina-Green.qss.colors
 share/Lumina-DE/colors/Lumina-Purple.qss.colors
 share/Lumina-DE/colors/Lumina-Gold.qss.colors
 share/Lumina-DE/colors/Lumina-Glass.qss.colors
 share/Lumina-DE/colors/PCBSD10-Default.qss.colors
+share/Lumina-DE/colors/Solarized-Dark.qss.colors
+share/Lumina-DE/colors/Solarized-Light.qss.colors
 share/Lumina-DE/themes/Lumina-default.qss.template
 share/Lumina-DE/themes/None.qss.template
 share/Lumina-DE/quickplugins/quick-sample.qml
-share/wallpapers/Lumina-DE/Lumina_Wispy_gold_1920x1080.jpg
-share/wallpapers/Lumina-DE/Lumina_Wispy_green_1920x1080.jpg
-share/wallpapers/Lumina-DE/Lumina_Wispy_purple_1920x1080.jpg
-share/wallpapers/Lumina-DE/Lumina_Wispy_red_1920x1080.jpg
+share/wallpapers/Lumina-DE/Lumina_Wispy_gold.jpg
+share/wallpapers/Lumina-DE/Lumina_Wispy_green.jpg
+share/wallpapers/Lumina-DE/Lumina_Wispy_purple.jpg
+share/wallpapers/Lumina-DE/Lumina_Wispy_red.jpg