9 files changed, 7 insertions, 22 deletions

diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 4c95e70110d2..d1ce0449aa12 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -32,7 +32,6 @@ OPTIONS=	DBUS	"Enable D-BUS support"			on \
 MAN1=		Terminal.1
 
 .include  <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
 
 .if !defined(WITHOUT_DBUS)
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 92f1934f2a8a..3bd95126d61f 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -43,7 +43,6 @@ OPTIONS=	HAL	"Enable HAL support"			on \
 MAN1=		exo-csource.1 exo-open.1
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
 
 .if defined(WITH_GTKDOC)
 BUILD_DEPENDS+=	gtkdocize:${PORTSDIR}/textproc/gtk-doc
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 5321e278c0ca..95edaac3cc9f 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -28,7 +28,6 @@ OPTIONS=	GTKDOC	"install the library documentation"	off \
 		STARTUP "Enable startup notification support"	on
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
 
 .if defined(WITH_GTKDOC)
 BUILD_DEPENDS+=	gtkdocize:${PORTSDIR}/textproc/gtk-doc
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 7aea8b5f3852..f48b6dc77e19 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -31,6 +31,4 @@ CONFIGURE_ARGS+=--disable-gtk-doc
 PLIST_SUB+=	GTK_DOC="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 2ae3d75b483b..1dda6c1e9058 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -23,6 +23,4 @@ USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
 USE_XFCE=	configenv panel libgui libutil
 USE_XLIB=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index c26485f88b8a..34151c64f472 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -24,6 +24,4 @@ USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
 USE_XFCE=	configenv panel
 USE_XLIB=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index dae235aa7184..a27a95fef767 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -22,6 +22,4 @@ USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
 USE_XFCE=	configenv panel
 USE_XLIB=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 5c09aac8cbb9..9c891ef1a23d 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-taskmanager
 PORTVERSION=	0.4.0.r2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 xfce
 MASTER_SITES=	http://xfce4-taskmanager.nebulon.de/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
@@ -30,6 +30,4 @@ USE_XLIB=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|linux|freebsd|g; s|^CFLAGS = |&-lkvm -lm |' ${WRKSRC}/src/Makefile.in
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xfce4-xfapplet-plugin/Makefile b/x11/xfce4-xfapplet-plugin/Makefile
index f449fe5d0ece..09b046ab5ffd 100644
--- a/x11/xfce4-xfapplet-plugin/Makefile
+++ b/x11/xfce4-xfapplet-plugin/Makefile
@@ -24,6 +24,4 @@ USE_GNOME=	gnometarget gtk20 intltool intlhack orbit2 pkgconfig
 USE_XFCE=	configenv libgui libutil panel
 USE_XLIB=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>