Commit correct port to x11-wm-xfce4

Sorry for the mess!

1 files changed, 33 insertions, 130 deletions

diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 863f1671bfb2..89ad1211a656 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -1,137 +1,40 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
+# Created by: James Earl <jdearl@telus.net>
 # $FreeBSD$
 
-PORTNAME=	xfce4-goodies
+PORTNAME=	xfce
 PORTVERSION=	4.16
-CATEGORIES=	x11
+CATEGORIES=	x11-wm xfce
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Meta-port for software and artwork from the Xfce4 Goodies Project
-
-USES=		metaport
-
-OPTIONS_DEFAULT=        ARCHIVE BATTERY CALCULATOR CLIPMAN CPUGRAPH DASHBOARD \
-			DATETIME DICTIONARY DISKPERF FSGUARD GENMON GIGOLO \
-			MAILWATCH MEDIATAGS MENULIBRE MOUNT NETLOAD PAROLE \
-			POWERMANAGER RISTRETTO SCREENSAVER SCREENSHOOTER SMARTBOOKMARK \
-			SYSTEMLOAD TASKMANAGER TERMINAL THEMES TIMEOUT TIMER VCS VERVE \
-			WAVELAN WEATHER WHISKERMENU XFBURN XKB
-# Removed from defaults due to ports being broken.
-# NOTES BSDCPUFREQ
-
-OPTIONS_EXCLUDE_powerpc=	BATTERY
-OPTIONS_EXCLUDE_powerpc64=	BATTERY
-OPTIONS_EXCLUDE_powerpc64le=	BATTERY
-OPTIONS_EXCLUDE_powerpcspe=	BATTERY
-
-OPTIONS_GROUP=	APPLICATIONS PANELPLUGINS THUNARPLUGINS UNOFFICIAL
-
-OPTIONS_GROUP_APPLICATIONS=	DASHBOARD DICTIONARY GIGOLO MIDORI PAROLE \
-				POWERMANAGER RISTRETTO SCREENSHOOTER \
-				TASKMANAGER TERMINAL VOLUMEDPULSE XFBURN \
-				XFMPC SCREENSAVER
-DASHBOARD_DESC=			GNOME shell like dashboard for the Xfce desktop
-DICTIONARY_DESC=		Xfce4 plugin to query different dictionaries
-GIGOLO_DESC=			Frontend to easily manage filesystem connections
-MIDORI_DESC=			Lightweight web browser using WebKit engine
-PAROLE_DESC=			Lightweight media player based on GStreamer
-POWERMANAGER_DESC=		Power manager for the Xfce Desktop
-RISTRETTO_DESC=			Image viewer with Xfce integration
-SCREENSAVER_DESC=		Screen Saver for the Xfce Desktop
-SCREENSHOOTER_DESC=		Application and panel plugin to take screenshots
-TASKMANAGER_DESC=		Task manager for the Xfce desktop
-TERMINAL_DESC=			Terminal emulator for the X windowing system
-VOLUMEDPULSE_DESC=		Volume management daemon for Xfce using PulseAudio
-XFBURN_DESC=			CD/DVD burning tool for Xfce
-XFMPC_DESC=			Graphical MPD client focusing on low footprint
-
-DASHBOARD_RUN_DEPENDS=		xfce4-dashboard>=0:x11/xfce4-dashboard
-DICTIONARY_RUN_DEPENDS=		xfce4-dict-plugin>=0:textproc/xfce4-dict-plugin
-GIGOLO_RUN_DEPENDS=		gigolo>=0:sysutils/gigolo
-MIDORI_RUN_DEPENDS=		midori>=0:www/midori
-PAROLE_RUN_DEPENDS=		parole>=0:multimedia/xfce4-parole
-POWERMANAGER_RUN_DEPENDS=	xfce4-power-manager>=0:sysutils/xfce4-power-manager
-RISTRETTO_RUN_DEPENDS=		ristretto>=0:graphics/ristretto
-SCREENSAVER_RUN_DEPENDS=	xfce4-screensaver>=0:x11/xfce4-screensaver
-SCREENSHOOTER_RUN_DEPENDS=	xfce4-screenshooter-plugin>=0:x11/xfce4-screenshooter-plugin
-TASKMANAGER_RUN_DEPENDS=	xfce4-taskmanager>=0:x11/xfce4-taskmanager
-TERMINAL_RUN_DEPENDS=		xfce4-terminal>=0:x11/xfce4-terminal
-VOLUMEDPULSE_RUN_DEPENDS=	xfce4-volumed-pulse>=0:deskutils/xfce4-volumed-pulse
-XFBURN_RUN_DEPENDS=		xfburn>=0:sysutils/xfburn
-XFMPC_RUN_DEPENDS=		xfmpc>=0:audio/xfmpc
-
-OPTIONS_GROUP_PANELPLUGINS=	BATTERY CALCULATOR CLIPMAN CPUGRAPH DATETIME \
-				DISKPERF FSGUARD GENERICSLIDER GENMON \
-				MAILWATCH MOUNT MPC NETLOAD NOTES PULSEAUDIO \
-				SMARTBOOKMARK SYSTEMLOAD TIMER \
-				TIMEOUT VERVE WAVELAN WEATHER WHISKERMENU \
-				XKB
-BATTERY_DESC=			Battery monitor panel plugin for Xfce4
-CALCULATOR_DESC=		Simple calculator for the Xfce panel
-CLIPMAN_DESC=			Clipboard manager for the Xfce panel
-CPUGRAPH_DESC=			Graphical representation of the CPU load
-DATETIME_DESC=			Datetime panel plugin for the Xfce desktop
-DISKPERF_DESC=			Graphical representation of the disk IO
-FSGUARD_DESC=			Displays free space of mountpoint
-GENERICSLIDER_DESC=		Slider to adjust / monitor any numeric variable
-GENMON_DESC=			Generic Monitor Xfce4 panel plugin
-MAILWATCH_DESC=			Mail notification applet for the Xfce panel
-MOUNT_DESC=			Mount and umount utility for the Xfce4 panel
-MPC_DESC=			Musicpd client plugin for the Xfce panel
-NETLOAD_DESC=			Network Load plugin for Xfce4
-NOTES_DESC=			Notes plugin for the Xfce panel
-PULSEAUDIO_DESC=		Panel plugin for controlling PulseAudio mixer
-SMARTBOOKMARK_DESC=		Query search engines from the Xfce panel
-SYSTEMLOAD_DESC=		System Load plugin for Xfce4 panel
-TIMEOUT_DESC=			Prompts the user to take a break every X minutes
-TIMER_DESC=			Set alarm at specific time or after time period
-VERVE_DESC=			Command line plugin for the Xfce Desktop
-WAVELAN_DESC=			Displays information about a WaveLAN device
-WEATHER_DESC=			Weather plugin for the Xfce panel
-WHISKERMENU_DESC=		Alternate menu for the Xfce Desktop
-XKB_DESC=			Keyboard layout switching plugin for Xfce panel
-
-BATTERY_RUN_DEPENDS=		xfce4-battery-plugin>=0:sysutils/xfce4-battery-plugin
-CALCULATOR_RUN_DEPENDS=		xfce4-calculator-plugin>=0:math/xfce4-calculator-plugin
-CLIPMAN_RUN_DEPENDS=		xfce4-clipman-plugin>=0:x11/xfce4-clipman-plugin
-CPUGRAPH_RUN_DEPENDS=		xfce4-cpugraph-plugin>=0:sysutils/xfce4-cpugraph-plugin
-DATETIME_RUN_DEPENDS=		xfce4-datetime-plugin>=0:x11-clocks/xfce4-datetime-plugin
-DISKPERF_RUN_DEPENDS=		xfce4-diskperf-plugin>=0:sysutils/xfce4-diskperf-plugin
-FSGUARD_RUN_DEPENDS=		xfce4-fsguard-plugin>=0:sysutils/xfce4-fsguard-plugin
-GENERICSLIDER_RUN_DEPENDS=	xfce4-generic-slider>=0:deskutils/xfce4-generic-slider
-GENMON_RUN_DEPENDS=		xfce4-genmon-plugin>=0:sysutils/xfce4-genmon-plugin
-MAILWATCH_RUN_DEPENDS=		xfce4-mailwatch-plugin>=0:mail/xfce4-mailwatch-plugin
-MOUNT_RUN_DEPENDS=		xfce4-mount-plugin>=0:sysutils/xfce4-mount-plugin
-MPC_RUN_DEPENDS=		xfce4-mpc-plugin>=0:audio/xfce4-mpc-plugin
-NETLOAD_RUN_DEPENDS=		xfce4-netload-plugin>=0:sysutils/xfce4-netload-plugin
-NOTES_RUN_DEPENDS=		xfce4-notes-plugin>=0:deskutils/xfce4-notes-plugin
-PULSEAUDIO_RUN_DEPENDS=		xfce4-pulseaudio-plugin>=0:audio/xfce4-pulseaudio-plugin
-SMARTBOOKMARK_RUN_DEPENDS=	xfce4-smartbookmark-plugin>=0:www/xfce4-smartbookmark-plugin
-SYSTEMLOAD_RUN_DEPENDS=		xfce4-systemload-plugin>=0:sysutils/xfce4-systemload-plugin
-TIMEOUT_RUN_DEPENDS=		xfce4-time-out-plugin>=0:x11-clocks/xfce4-time-out-plugin
-TIMER_RUN_DEPENDS=		xfce4-timer-plugin>=0:x11-clocks/xfce4-timer-plugin
-VERVE_RUN_DEPENDS=		xfce4-verve-plugin>=0:x11/xfce4-verve-plugin
-WAVELAN_RUN_DEPENDS=		xfce4-wavelan-plugin>=0:sysutils/xfce4-wavelan-plugin
-WEATHER_RUN_DEPENDS=		xfce4-weather-plugin>=0:misc/xfce4-weather-plugin
-WHISKERMENU_RUN_DEPENDS=	xfce4-whiskermenu-plugin>=0:x11/xfce4-whiskermenu-plugin
-XKB_RUN_DEPENDS=		xfce4-xkb-plugin>=0:deskutils/xfce4-xkb-plugin
-
-OPTIONS_GROUP_THUNARPLUGINS=	ARCHIVE MEDIATAGS VCS
-ARCHIVE_DESC=			Create/extract archives from file context menus
-MEDIATAGS_DESC=			View/edit id3/ogg tags in file properties dialog
-VCS_DESC=			SVN+GIT Version Control System integration
-
-ARCHIVE_RUN_DEPENDS=		thunar-archive-plugin>=0:archivers/thunar-archive-plugin
-MEDIATAGS_RUN_DEPENDS=		thunar-media-tags-plugin>=0:audio/thunar-media-tags-plugin
-VCS_RUN_DEPENDS=		thunar-vcs-plugin>=0:devel/thunar-vcs-plugin
-
-OPTIONS_GROUP_UNOFFICIAL=	BSDCPUFREQ MENULIBRE THEMES
-BSDCPUFREQ_DESC=		Display the CPU clock frequency in Xfce panel
-MENULIBRE_DESC=			Advanced compliant menu editor
-THEMES_DESC=			Additional themes for xfwm4
-
-BSDCPUFREQ_RUN_DEPENDS=		xfce4-bsdcpufreq-plugin>=0:sysutils/xfce4-bsdcpufreq-plugin
-MENULIBRE_RUN_DEPENDS=		py${PYTHON3_DEFAULT:S/.//}-menulibre>=0:x11/menulibre
-THEMES_RUN_DEPENDS=		xfce4-wm-themes>=0:misc/xfce4-wm-themes
+COMMENT=	Meta-port for the Xfce Desktop Environment
+
+RUN_DEPENDS=	xfwm4:x11-wm/xfce4-wm \
+		xfce4-session:x11-wm/xfce4-session \
+		xfce4-panel:x11-wm/xfce4-panel \
+		xfdesktop:x11-wm/xfce4-desktop \
+		xfsettingsd:sysutils/xfce4-settings
+
+USES=	metaport
+
+OPTIONS_DEFINE=		APPFINDER GREYBIRD ICONS LIGHTDM MOUSEPAD NOTIFY \
+			TERMINAL XPM
+OPTIONS_DEFAULT=	APPFINDER GREYBIRD ICONS MOUSEPAD NOTIFY TERMINAL \
+			XPM
+APPFINDER_RUN_DEPENDS=	xfce4-appfinder:misc/xfce4-appfinder
+APPFINDER_DESC=		Launcher and finder
+GREYBIRD_DESC=		Install Greybird theme
+GREYBIRD_RUN_DEPENDS=	greybird-theme>0:x11-themes/greybird-theme
+ICONS_RUN_DEPENDS=	adwaita-icon-theme>0:x11-themes/adwaita-icon-theme
+LIGHTDM_RUN_DEPENDS=	lightdm-gtk-greeter:x11/lightdm-gtk-greeter
+LIGHTDM_DESC=		LightDM display manger
+MOUSEPAD_RUN_DEPENDS=	mousepad:editors/mousepad
+MOUSEPAD_DESC=		Text editor
+NOTIFY_RUN_DEPENDS=	xfce4-notifyd-config:deskutils/xfce4-notifyd
+TERMINAL_RUN_DEPENDS=	xfce4-terminal:x11/xfce4-terminal
+TERMINAL_DESC=		Terminal emulator
+XPM_RUN_DEPENDS=	xfce4-power-manager:sysutils/xfce4-power-manager
+XPM_DESC=		Power manager
+
+do-install:	# empty
 
 .include <bsd.port.mk>