- Switch to USES= metaport

- Re-organize options helper

1 files changed, 23 insertions, 62 deletions

diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 6297cdf3875a..2574403fa00e 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -5,79 +5,40 @@ PORTNAME=	xfce
 PORTVERSION=	4.12
 PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-EXTRACT_ONLY=	# empty
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	The "meta-port" for the Xfce Desktop Environment
 
-OPTIONS_DEFINE=	APPFINDER ICONS MIXER MOUSEPAD NOTIFY ORAGE PRINT SLIM SQUEEZE TERMINAL XPM
-OPTIONS_DEFAULT=	APPFINDER ICONS MOUSEPAD NOTIFY ORAGE TERMINAL
-ORAGE_DESC=	Calendar
-MOUSEPAD_DESC=	Text editor
-TERMINAL_DESC=	Terminal emulator
-APPFINDER_DESC=	Launcher and finder
-SQUEEZE_DESC=	Archive manager
-XPM_DESC=	Power manager
-SLIM_DESC=	SLiM, login manager
-
 RUN_DEPENDS=	xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \
 		xfce4-session:${PORTSDIR}/x11-wm/xfce4-session \
 		xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
 		xfdesktop:${PORTSDIR}/x11-wm/xfce4-desktop \
-		${LOCALBASE}/lib/gtk-2.0/2.10.0/engines/libxfce.so:${PORTSDIR}/x11-themes/gtk-xfce-engine \
-		xfsettingsd:${PORTSDIR}/sysutils/xfce4-settings
+		xfsettingsd:${PORTSDIR}/sysutils/xfce4-settings \
+		gtk-xfce-engine>0:${PORTSDIR}/x11-themes/gtk-xfce-engine
 
-NO_BUILD=	yes
+USES=	metaport
 LATEST_LINK=	xfce4
 
-NO_MTREE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MICONS}
-RUN_DEPENDS+=	adwaita-icon-theme>=3.14.0:${PORTSDIR}/x11-themes/adwaita-icon-theme
-.endif
-
-.if ${PORT_OPTIONS:MORAGE}
-RUN_DEPENDS+=	orage:${PORTSDIR}/deskutils/orage
-.endif
-
-.if ${PORT_OPTIONS:MMOUSEPAD}
-RUN_DEPENDS+=	mousepad:${PORTSDIR}/editors/mousepad
-.endif
-
-.if ${PORT_OPTIONS:MTERMINAL}
-RUN_DEPENDS+=	xfce4-terminal:${PORTSDIR}/x11/xfce4-terminal
-.endif
-
-.if ${PORT_OPTIONS:MAPPFINDER}
-RUN_DEPENDS+=	xfce4-appfinder:${PORTSDIR}/misc/xfce4-appfinder
-.endif
-
-.if ${PORT_OPTIONS:MMIXER}
-RUN_DEPENDS+=	xfce4-mixer:${PORTSDIR}/audio/xfce4-mixer
-.endif
-
-.if ${PORT_OPTIONS:MPRINT}
-RUN_DEPENDS+=	xfprint4:${PORTSDIR}/print/xfce4-print
-.endif
-
-.if ${PORT_OPTIONS:MSQUEEZE}
-RUN_DEPENDS+=   squeeze:${PORTSDIR}/archivers/squeeze
-.endif
-
-.if ${PORT_OPTIONS:MNOTIFY}
-RUN_DEPENDS+=	xfce4-notifyd-config:${PORTSDIR}/deskutils/xfce4-notifyd
-.endif
-
-.if ${PORT_OPTIONS:MXPM}
-RUN_DEPENDS+=	xfce4-power-manager:${PORTSDIR}/sysutils/xfce4-power-manager
-.endif
-
-.if ${PORT_OPTIONS:MSLIM}
-RUN_DEPENDS+=	slim:${PORTSDIR}/x11/slim
-.endif
+OPTIONS_DEFINE=	APPFINDER ICONS MIXER MOUSEPAD NOTIFY ORAGE PRINT SLIM SQUEEZE TERMINAL XPM
+OPTIONS_DEFAULT=	APPFINDER ICONS MOUSEPAD NOTIFY ORAGE TERMINAL
+APPFINDER_RUN_DEPENDS=	xfce4-appfinder:${PORTSDIR}/misc/xfce4-appfinder
+APPFINDER_DESC=	Launcher and finder
+ICONS_RUN_DEPENDS=	adwaita-icon-theme>0:${PORTSDIR}/x11-themes/adwaita-icon-theme
+MIXER_RUN_DEPENDS=	xfce4-mixer:${PORTSDIR}/audio/xfce4-mixer
+MOUSEPAD_RUN_DEPENDS=	mousepad:${PORTSDIR}/editors/mousepad
+MOUSEPAD_DESC=	Text editor
+NOTIFY_RUN_DEPENDS=	xfce4-notifyd-config:${PORTSDIR}/deskutils/xfce4-notifyd
+ORAGE_RUN_DEPENDS=	orage:${PORTSDIR}/deskutils/orage
+ORAGE_DESC=	Calendar
+PRINT_RUN_DEPENDS=	xfprint4:${PORTSDIR}/print/xfce4-print
+SLIM_RUN_DEPENDS=	slim:${PORTSDIR}/x11/slim
+SLIM_DESC=	SLiM, login manager
+SQUEEZE_RUN_DEPENDS=	squeeze:${PORTSDIR}/archivers/squeeze
+SQUEEZE_DESC=	Archive manager
+TERMINAL_RUN_DEPENDS=	xfce4-terminal:${PORTSDIR}/x11/xfce4-terminal
+TERMINAL_DESC=	Terminal emulator
+XPM_RUN_DEPENDS=	xfce4-power-manager:${PORTSDIR}/sysutils/xfce4-power-manager
+XPM_DESC=	Power manager
 
 do-install:	# empty