3 files changed, 46 insertions, 12 deletions

diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 9132ec8ab517..92651e97af68 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xfce
-PORTVERSION=	4.2.3.2
-PORTREVISION=	4
+PORTVERSION=	4.3.99.2
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -21,15 +21,14 @@ RUN_DEPENDS=	${LOCALBASE}/lib/xfce4/mcs-plugins/ui_plugin.so:${PORTSDIR}/sysutil
 		xfce4-appfinder:${PORTSDIR}/misc/xfce4-appfinder \
 		xfce4-session:${PORTSDIR}/x11-wm/xfce4-session \
 		xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
-		${LOCALBASE}/lib/xfce4/panel-plugins/libtriggerlauncher.so:${PORTSDIR}/x11/xfce4-trigger-launcher \
 		xfdesktop:${PORTSDIR}/x11-wm/xfce4-desktop \
 		startxfce4:${PORTSDIR}/sysutils/xfce4-utils \
-		xffm:${PORTSDIR}/x11-fm/xfce4-fm \
 		xfprint4:${PORTSDIR}/print/xfce4-print \
-		xfce4-iconbox:${PORTSDIR}/misc/xfce4-iconbox \
-		${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libxfce.so:${PORTSDIR}/x11-themes/gtk-xfce-engine
+		${LOCALBASE}/lib/gtk-2.0/2.10.0/engines/libxfce.so:${PORTSDIR}/x11-themes/gtk-xfce-engine \
+		thunar:${PORTSDIR}/x11-fm/thunar \
+		orage:${PORTSDIR}/deskutils/orage \
+		mousepad:${PORTSDIR}/editors/mousepad
 
-USE_GNOME=	gtk20
 NO_BUILD=	yes
 LATEST_LINK=	xfce4
 
@@ -48,13 +47,12 @@ PLIST_SUB+=	GDM="@comment "
 
 .if !defined(WITHOUT_EXTRAS)
 .if !defined(WITHOUT_THEMES)
-RUN_DEPENDS+=	${LOCALBASE}/share/xfce4/mime/Rodent.mime.xml:${PORTSDIR}/x11-themes/xfce4-icon-theme
+RUN_DEPENDS+=	${LOCALBASE}/share/xfce4/mime/Rodent.mime.xml:${PORTSDIR}/x11-themes/xfce4-icon-theme \
+		${LOCALBASE}/share/themes/Xfce/xfwm4/themerc:${PORTSDIR}/misc/xfce4-wm-themes
 .endif
 
 .if !defined(WITHOUT_PLUGINS)
-RUN_DEPENDS+=	${LOCALBASE}/lib/xfce4/panel-plugins/libmixer.so:${PORTSDIR}/audio/xfce4-mixer \
-		${LOCALBASE}/lib/xfce4/panel-plugins/libsystray.so:${PORTSDIR}/x11-wm/xfce4-systray \
-		xfce4-tips:${PORTSDIR}/games/xfce4-toys
+RUN_DEPENDS+=	${LOCALBASE}/lib/xfce4/modules/libxfce4mixer.so:${PORTSDIR}/audio/xfce4-mixer
 .endif
 .endif
 
diff --git a/x11-wm/xfce4/bsd.xfce.mk b/x11-wm/xfce4/bsd.xfce.mk
new file mode 100644
index 000000000000..29528d4e6b90
--- /dev/null
+++ b/x11-wm/xfce4/bsd.xfce.mk
@@ -0,0 +1,36 @@
+MASTER_SITES_XFCE=		http://mocha.xfce.org/archive/%SUBDIR%/src/ \
+				http://www.us.xfce.org/archive/%SUBDIR%/src/ \
+				http://www.de.xfce.org/archive/%SUBDIR%/src/ \
+				http://www.ca-us.xfce.org/archive/%SUBDIR%/src/ \
+				http://www.p0llux.be/xfce/%SUBDIR%/src/
+
+MASTER_SITE_SUBDIR=		xfce-4.4.0
+
+configenv_CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+
+libexo_LIB_DEPENDS=		exo-0.3:${PORTSDIR}/x11/libexo
+
+libgui_LIB_DEPENDS=		xfcegui4.6:${PORTSDIR}/x11-toolkits/libxfce4gui
+
+libutil_LIB_DEPENDS=		xfce4util.4:${PORTSDIR}/x11/libxfce4util
+
+libmcs_LIB_DEPENDS=		xfce4mcs-manager.3:${PORTSDIR}/x11/libxfce4mcs
+
+mcsmanager_BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
+mcsmanager_RUN_DEPENDS=		xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
+
+panel_BUILD_DEPENDS=		xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+panel_RUN_DEPENDS=		xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+
+thunar_BUILD_DEPENDS=		thunar:${PORTSDIR}/x11-fm/thunar
+thunar_RUN_DEPENDS=		thunar:${PORTSDIR}/x11-fm/thunar
+
+wm_BUILD_DEPENDS=		xfwm4:${PORTSDIR}/x11-wm/xfce4-wm
+wm_RUN_DEPENDS=			xfwm4:${PORTSDIR}/x11-wm/xfce4-wm
+
+.for component in ${USE_XFCE}
+BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
+LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
+RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
+CONFIGURE_ENV+=	${${component}_CONFIGURE_ENV}
+.endfor
diff --git a/x11-wm/xfce4/pkg-descr b/x11-wm/xfce4/pkg-descr
index e0d82837f724..484eeab7f17f 100644
--- a/x11-wm/xfce4/pkg-descr
+++ b/x11-wm/xfce4/pkg-descr
@@ -3,4 +3,4 @@ XFce 4 Desktop Environment
 This package does not contain anything by itself - it is a "meta-port" that
 depends on other XFce 4 packages.
 
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/