Move the new port files for FreeBSD over into the proper directory and adjust the new mkport script to use that dir.

8 files changed, 10 insertions, 240 deletions

diff --git a/mkport.sh b/mkport.sh
index 74244109..3c87d250 100755
--- a/mkport.sh
+++ b/mkport.sh
@@ -76,7 +76,7 @@ rm ${distdir}/${dfile}-* 2>/dev/null
 if [ -d "${portsdir}/${port}" ] ; then
   rm -rf ${portsdir}/${port} 2>/dev/null
 fi
-cp -r port-files-master ${portsdir}/${port}
+cp -r port-files/FreeBSD ${portsdir}/${port}
 
 # Set the version numbers
 sed -i '' "s|%%CHGVERSION%%|${verTag}|g" ${portsdir}/${port}/Makefile
diff --git a/port-files-master/Makefile b/port-files-master/Makefile
deleted file mode 100644
index 58adc55e..00000000
--- a/port-files-master/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# Created by: Ken Moore <ken@pcbsd.org>
-# $FreeBSD$
-
-PORTNAME=	lumina
-PORTVERSION=	%%CHGVERSION%%
-PORTEPOCH=	1
-CATEGORIES=	x11
-
-MAINTAINER=	kmoore@FreeBSD.org
-COMMENT=	Lumina Desktop Environment
-
-LICENSE=	BSD3CLAUSE
-
-RUN_DEPENDS=	fluxbox>=0:x11-wm/fluxbox \
-		kde4-icons-oxygen>=0:x11-themes/kde4-icons-oxygen \
-		xscreensaver:x11/xscreensaver \
-		xbrightness:x11/xbrightness \
-		compton:x11-wm/compton \
-		xrandr:x11/xrandr \
-		numlockx:x11/numlockx
-
-CONFLICTS=      lumina-devel-0*
-
-OPTIONS_DEFINE=	MULTIMEDIA TRUEOS
-OPTIONS_DEFAULT=	MULTIMEDIA
-MULTIMEDIA_DESC=	Install multimedia support backend (gstreamer)
-TRUEOS_DESC=	Use the TrueOS system interface settings.
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMULTIMEDIA}
-RUN_DEPENDS+=	gstreamer1-plugins-core>=0:multimedia/gstreamer1-plugins-core
-.endif
-
-MAKE_JOBS_UNSAFE=yes
-
-USE_GL=		gl
-USE_XORG=	x11 xdamage xcb
-USE_XCB=	x11extras wm ewmh util-wm
-USE_LDCONFIG=	yes
-USE_QT5=	core gui widgets network svg multimedia imageformats \
-		buildtools_build x11extras concurrent
-USES=		desktop-file-utils qmake
-USE_GITHUB=	yes
-GH_ACCOUNT=	trueos
-GH_TAGNAME=	%%GHTAG%%
-
-#Setup the qmake configuration options
-.if ${PORT_OPTIONS:MTRUEOS}
-QMAKE_ARGS=	DEFAULT_SETTINGS=TrueOS
-.endif
-
-.include <bsd.port.mk>
diff --git a/port-files-master/pkg-descr b/port-files-master/pkg-descr
deleted file mode 100644
index ce2d052a..00000000
--- a/port-files-master/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-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/port-files-master/pkg-install b/port-files-master/pkg-install
deleted file mode 100644
index c406d96e..00000000
--- a/port-files-master/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# Script to install preload.conf
-
-PREFIX=${PKG_PREFIX-/usr/local}
-
-if [ "$2" != "POST-INSTALL" ] ; then
-   exit 0
-fi
-
-# If this is during staging, we can skip for now
-echo $PREFIX | grep -q '/stage/'
-if [ $? -eq 0 ] ; then
-   exit 0
-fi
-
-# Copy over the rc.conf.trueos file
-install -m 644 ${PREFIX}/share/trueos/conf/rc.conf.trueos /etc/rc.conf.trueos
-if [ -e "/etc/default/trueos" -o -e "/etc/defaults/trueos-desktop" ] ; then
-  install -m 644 ${PREFIX}/share/trueos/conf/loader.conf.trueos /boot/loader.conf.trueos
-  install -m 644 ${PREFIX}/share/trueos/conf/brand-trueos.4th /boot/brand-trueos.4th
-else
-  install -m 644 ${PREFIX}/share/trueos/conf/loader.conf.trueos /boot/loader.conf.trueos
-  install -m 644 ${PREFIX}/share/trueos/conf/brand-trueos.4th /boot/brand-trueos.4th
-fi
-
-if [ ! -e "${PREFIX}/etc/trueos.conf" ] ; then
-  # Do the first-time setup
-  echo "Doing first-time bootstrap"
-  if [ -e "/etc/defaults/trueos-desktop" ] ; then
-    tar cvf - -C ${PREFIX}/share/trueos/desktop-defaults/ . 2>/dev/null | tar xvpf - -C / 2>/dev/null
-  else
-    tar cvf - -C ${PREFIX}/share/trueos/server-defaults/ . 2>/dev/null | tar xvpf - -C / 2>/dev/null
-  fi
-fi
-
-exit 0
diff --git a/port-files-master/pkg-message b/port-files-master/pkg-message
deleted file mode 100644
index c3742ad9..00000000
--- a/port-files-master/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-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) 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/port-files-master/pkg-plist b/port-files-master/pkg-plist
deleted file mode 100644
index b260ae6a..00000000
--- a/port-files-master/pkg-plist
+++ /dev/null
@@ -1,64 +0,0 @@
-bin/start-lumina-desktop
-bin/lumina-desktop
-bin/lumina-open
-bin/lumina-config
-bin/lumina-fm
-bin/lumina-screenshot
-bin/lumina-search
-bin/lumina-info
-bin/lumina-xconfig
-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/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/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_red.jpg
diff --git a/port-files/FreeBSD/Makefile b/port-files/FreeBSD/Makefile
index 7aea1fab..f8f238dc 100644
--- a/port-files/FreeBSD/Makefile
+++ b/port-files/FreeBSD/Makefile
@@ -2,9 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lumina
-PORTVERSION=	1.0.0
-DISTVERSIONPREFIX=	v
-DISTVERSIONSUFFIX=	-Beta1
+PORTVERSION=	%%CHGVERSION%%
 PORTEPOCH=	1
 CATEGORIES=	x11
 
@@ -36,14 +34,21 @@ RUN_DEPENDS+=	gstreamer1-plugins-core>=0:multimedia/gstreamer1-plugins-core
 
 MAKE_JOBS_UNSAFE=yes
 
+USE_GL=		gl
 USE_XORG=	x11 xdamage xcb
-USE_XCB=	x11extras wm ewmh util-wm
 USE_LDCONFIG=	yes
 USE_QT5=	core gui widgets network svg multimedia imageformats \
 		buildtools_build x11extras concurrent
 USES=		desktop-file-utils qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
+GH_TAGNAME=	%%GHTAG%%
+
+#Setup the XCB library dependencies (USE_XCB macro does not appear to exist anymore)
+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
 
 #Setup the qmake configuration options
 .if ${PORT_OPTIONS:MTRUEOS}
diff --git a/port-files/mkport-freebsd.sh b/port-files/mkport-freebsd.sh
deleted file mode 100755
index 5f6d241d..00000000
--- a/port-files/mkport-freebsd.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-# Helper script which will create the port / distfiles
-# from a checked out git repo
-
-# Set the distfile URL we will fetch from
-DURL="http://www.pcbsd.org/~kris/software/"
-
-get_last_rev_git()
-{
-   oPWD=`pwd`
-   cd "${1}"
-   rev=0
-   rev=`git log -n 1 --date=raw | grep 'Date:' | awk '{print $2}'`
-   cd $oPWD
-   if [ $rev -ne 0 ] ; then
-     echo "$rev"
-     return 0
-   fi
-   return 1
-}
-
-if [ -z "$1" ] ; then
-   echo "Usage: ./mkports-freebsd.sh <outdir>"
-   exit 1
-fi
-
-if [ ! -d "${1}" ] ; then
-   echo "Invalid directory: $1"
-   exit 1
-fi
-
-portsdir="${1}"
-distdir="${1}/distfiles"
-if [ ! -d "$portsdir" ] ; then
-  mkdir ${portsdir}
-fi
-if [ ! -d "$portsdir/sysutils" ] ; then
-  mkdir ${portsdir}/sysutils
-fi
-if [ ! -d "$distdir" ] ; then
-  mkdir ${distdir}
-fi
-
-REV=`get_last_rev_git "."`
-
-# Make the dist files
-rm ${distdir}/lumina*.tar.bz2 2>/dev/null
-echo "Creating lumina dist file for version: $REV"
-cd ../..
-tar cvjf ${distdir}/lumina-${REV}.tar.bz2 --exclude .git --exclude Artwork lumina 2>/dev/null
-cd lumina/port-files
-
-# Copy ports files
-rm -rf ${portsdir}/x11/lumina 2>/dev/null
-cp -r FreeBSD ${portsdir}/x11/lumina
-
-# Set the version numbers
-sed -i '' "s|CHGVERSION|${REV}|g" ${portsdir}/x11/lumina/Makefile
-
-# Set the mirror to use
-sed -i '' "s|http://www.pcbsd.org/~kris/software/|${DURL}|g" ${portsdir}/x11/lumina/Makefile
-
-# Create the makesums / distinfo file
-cd ${distdir}
-sha256 lumina-${REV}.tar.bz2 > ${portsdir}/x11/lumina/distinfo
-echo "SIZE (lumina-${REV}.tar.bz2) = `stat -f \"%z\" lumina-${REV}.tar.bz2`" >> ${portsdir}/x11/lumina/distinfo