- Update to 1.0.0-BETA2

- Sync options with upstream TrueOS ports repo

5 files changed, 73 insertions, 65 deletions

diff --git a/x11/lumina/Makefile b/x11/lumina/Makefile
index f7ff76eed40d..2a05c1b095cd 100644
--- a/x11/lumina/Makefile
+++ b/x11/lumina/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	lumina
-PORTVERSION=	0.9.0
+PORTVERSION=	1.0.0
 DISTVERSIONPREFIX=	v
-DISTVERSIONSUFFIX=	-Release-p1
-PORTREVISION=	3
+DISTVERSIONSUFFIX=	-Beta2
+PORTREVISION=1
 PORTEPOCH=	1
 CATEGORIES=	x11
 
@@ -14,22 +14,20 @@ COMMENT=	Lumina Desktop Environment
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	xorg>=0:x11/xorg \
-		fluxbox>=0:x11-wm/fluxbox \
-		fluxbox-tenr-styles-pack>=0:x11-themes/fluxbox-tenr-styles-pack \
+RUN_DEPENDS=	fluxbox>=0:x11-wm/fluxbox \
 		kde4-icons-oxygen>=0:x11-themes/kde4-icons-oxygen \
 		xscreensaver:x11/xscreensaver \
-		xscreensaver-demo:x11/xscreensaver \
 		xbrightness:x11/xbrightness \
-		xcompmgr:x11-wm/xcompmgr \
+		compton:x11-wm/compton \
+		xrandr:x11/xrandr \
 		numlockx:x11/numlockx
 
-CONFLICTS=      lumina-devel-0*
+CONFLICTS=	lumina-devel-0*
 
-OPTIONS_DEFINE=	MULTIMEDIA PCBSD
+OPTIONS_DEFINE=	MULTIMEDIA TRUEOS
 OPTIONS_DEFAULT=	MULTIMEDIA
 MULTIMEDIA_DESC=	Install multimedia support backend (gstreamer)
-PCBSD_DESC=	Use the PC-BSD system interface settings.
+TRUEOS_DESC=	Use the TrueOS system interface settings.
 
 .include <bsd.port.options.mk>
 
@@ -39,20 +37,18 @@ RUN_DEPENDS+=	gstreamer1-plugins-core>=0:multimedia/gstreamer1-plugins-core
 
 MAKE_JOBS_UNSAFE=yes
 
-USE_XORG=	x11 xdamage
-USE_XCB=		x11extras wm
+USE_XORG=	x11 xdamage xcb
+USE_XCB=	x11extras wm ewmh util-wm
 USE_LDCONFIG=	yes
-USE_QT5=	core gui network svg linguist multimedia imageformats \
-		buildtools x11extras concurrent
+USE_QT5=	core gui widgets network svg multimedia imageformats \
+		buildtools_build x11extras concurrent
 USES=		desktop-file-utils qmake
 USE_GITHUB=	yes
-GH_ACCOUNT=	pcbsd
+GH_ACCOUNT=	trueos
 
 #Setup the qmake configuration options
-.if ${PORT_OPTIONS:MPCBSD}
-QMAKE_ARGS=	CONFIG+="configure NO_I18N PCBSD"
-.else
-QMAKE_ARGS=	CONFIG+="configure NO_I18N"
+.if ${PORT_OPTIONS:MTRUEOS}
+QMAKE_ARGS=	DEFAULT_SETTINGS=TrueOS
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/lumina/distinfo b/x11/lumina/distinfo
index 95569df7a898..0742d7d0ef79 100644
--- a/x11/lumina/distinfo
+++ b/x11/lumina/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pcbsd-lumina-v0.9.0-Release-p1_GH0.tar.gz) = 60447b24449079b5e5bdadee380f930535455dc4b05deec0322f4f1ac10d76e0
-SIZE (pcbsd-lumina-v0.9.0-Release-p1_GH0.tar.gz) = 53810841
+TIMESTAMP = 1467986165
+SHA256 (trueos-lumina-v1.0.0-Beta2_GH0.tar.gz) = f505b7ae796138f6558f49f5e180b5bb8561162060f5a2df150d7c8ee90e148c
+SIZE (trueos-lumina-v1.0.0-Beta2_GH0.tar.gz) = 54670960
diff --git a/x11/lumina/pkg-descr b/x11/lumina/pkg-descr
index 4618997811e9..ce2d052a0e9a 100644
--- a/x11/lumina/pkg-descr
+++ b/x11/lumina/pkg-descr
@@ -1,4 +1,9 @@
-Lumina-DE is a lightweight, BSD licensed desktop environment,
-designed specifically for use on FreeBSD
+The Lumina Desktop Environment is a lightweight system interface that is 
+designed for use on any Unix-like operating system. It takes a 
+plugin-based approach, allowing the entire interface to be assembled or
+arranged by each individual user as desired, with a system-wide default 
+layout which can be customized by the system administrator. This allows 
+every system (or user session) to be designed to maximize the individual 
+user's productivity.
 
 WWW: http://lumina-desktop.org
diff --git a/x11/lumina/pkg-message b/x11/lumina/pkg-message
index 1d15dc6b74dd..c3742ad9e57c 100644
--- a/x11/lumina/pkg-message
+++ b/x11/lumina/pkg-message
@@ -1,8 +1,7 @@
 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 start-lumina-desktop" 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/start-lumina-desktop -- :0"
+1) Run "start-lumina-desktop" directly from the command line after logging in.
+2) Put the line "exec start-lumina-desktop" at the end of your user's "~/.xinitrc" file before running startx with any special X11 flags
 
 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 0ef04668a905..b260ae6aaf26 100644
--- a/x11/lumina/pkg-plist
+++ b/x11/lumina/pkg-plist
@@ -1,57 +1,64 @@
-bin/Lumina-DE
+bin/start-lumina-desktop
+bin/lumina-desktop
+bin/lumina-open
 bin/lumina-config
-bin/lumina-fileinfo
 bin/lumina-fm
-bin/lumina-info
-bin/lumina-open
 bin/lumina-screenshot
 bin/lumina-search
-bin/lumina-textedit
+bin/lumina-info
 bin/lumina-xconfig
-bin/start-lumina-desktop
-%%ETCDIR%%Desktop.conf.dist
-include/LuminaOS.h
-include/LuminaSingleApplication.h
-include/LuminaThemes.h
+bin/lumina-fileinfo
+bin/lumina-textedit
+bin/lte
+etc/luminaDesktop.conf.dist
+lib/libLuminaUtils.so
+lib/libLuminaUtils.so.1
+lib/libLuminaUtils.so.1.0
+lib/libLuminaUtils.so.1.0.0
+include/LuminaXDG.h
 include/LuminaUtils.h
 include/LuminaX11.h
-include/LuminaXDG.h
-%%QT_LIBDIR%%/%%QT_LIBDIR%%LuminaUtils.so
-%%QT_LIBDIR%%/%%QT_LIBDIR%%LuminaUtils.so.1
-%%QT_LIBDIR%%/%%QT_LIBDIR%%LuminaUtils.so.1.0
-%%QT_LIBDIR%%/%%QT_LIBDIR%%LuminaUtils.so.1.0.0
-share/Lumina-DE/Login.ogg
-share/Lumina-DE/Logout.ogg
-share/Lumina-DE/colors/Black.qss.colors
-share/Lumina-DE/colors/Blue-Light.qss.colors
-share/Lumina-DE/colors/Grey-Dark.qss.colors
-share/Lumina-DE/colors/Lumina-Glass.qss.colors
-share/Lumina-DE/colors/Lumina-Gold.qss.colors
-share/Lumina-DE/colors/Lumina-Green.qss.colors
-share/Lumina-DE/colors/Lumina-Purple.qss.colors
-share/Lumina-DE/colors/Lumina-Red.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/desktop-background.jpg
-share/Lumina-DE/fluxbox-init-rc
-share/Lumina-DE/fluxbox-keys
-share/Lumina-DE/luminaDesktop.conf
-share/Lumina-DE/themes/Lumina-default.qss.template
-share/Lumina-DE/themes/None.qss.template
+include/LuminaThemes.h
+include/LuminaOS.h
+include/LuminaSingleApplication.h
+share/applications/lumina-config.desktop
+share/applications/lumina-fileinfo.desktop
 share/applications/lumina-fm.desktop
 share/applications/lumina-info.desktop
 share/applications/lumina-screenshot.desktop
 share/applications/lumina-search.desktop
 share/applications/lumina-support.desktop
 share/applications/lumina-textedit.desktop
+share/applications/lumina-xconfig.desktop
 share/pixmaps/Lumina-DE.png
-share/wallpapers/Lumina-DE/Lumina_Wispy_blue-grey-zoom.jpg
-share/wallpapers/Lumina-DE/Lumina_Wispy_blue-grey.jpg
+share/pixmaps/Insight-FileManager.png
+share/xsessions/Lumina-DE.desktop
+share/lumina-desktop/desktop-background.jpg
+share/lumina-desktop/luminaDesktop.conf
+share/lumina-desktop/fluxbox-init-rc
+share/lumina-desktop/fluxbox-keys
+share/lumina-desktop/Login.ogg
+share/lumina-desktop/Logout.ogg
+share/lumina-desktop/colors/Black.qss.colors
+share/lumina-desktop/colors/Blue-Light.qss.colors
+share/lumina-desktop/colors/Grey-Dark.qss.colors
+share/lumina-desktop/colors/Lumina-Red.qss.colors
+share/lumina-desktop/colors/Lumina-Green.qss.colors
+share/lumina-desktop/colors/Lumina-Purple.qss.colors
+share/lumina-desktop/colors/Lumina-Gold.qss.colors
+share/lumina-desktop/colors/Lumina-Glass.qss.colors
+share/lumina-desktop/colors/PCBSD10-Default.qss.colors
+share/lumina-desktop/colors/Solarized-Dark.qss.colors
+share/lumina-desktop/colors/Solarized-Light.qss.colors
+share/lumina-desktop/themes/Glass.qss.template
+share/lumina-desktop/themes/Lumina-default.qss.template
+share/lumina-desktop/themes/None.qss.template
+share/lumina-desktop/menu-scripts/ls.json.sh
 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_blue-grey-zoom.jpg
+share/wallpapers/Lumina-DE/Lumina_Wispy_blue-grey.jpg
 share/wallpapers/Lumina-DE/Lumina_Wispy_grey-blue-zoom.jpg
 share/wallpapers/Lumina-DE/Lumina_Wispy_grey-blue.jpg
-share/wallpapers/Lumina-DE/Lumina_Wispy_purple.jpg
 share/wallpapers/Lumina-DE/Lumina_Wispy_red.jpg
-share/xsessions/Lumina-DE.desktop