7 files changed, 5 insertions, 27 deletions

diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile
index 58cf6e09b0a8..da034bd20607 100644
--- a/x11-wm/aewm/Makefile
+++ b/x11-wm/aewm/Makefile
@@ -31,14 +31,12 @@ PKGNAMESUFFIX=	-gtk
 .else
 .endif
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_XFT)
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 MAKE_ENV+=	DEFINES="-DXFT" \
 		EXTRA_INC="`pkg-config --cflags xft`" \
 		EXTRA_LIBS="`pkg-config --libs xft`"
 .endif
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIR/s|clients||g' ${WRKSRC}/Makefile
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 676b815be470..d2bd25665599 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -58,14 +58,8 @@ PLIST_FILES=	share/locale/bg/LC_MESSAGES/e16.mo \
 CONFIGURE_ARGS+=--disable-nls
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if (${MACHINE} == "alpha") && (${X_WINDOW_SYSTEM:L} == xfree86-3)
-CONFIGURE_ARGS+=	--disable-zoom
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
 		-e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/scripts/e_gen_menu
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 676b815be470..d2bd25665599 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -58,14 +58,8 @@ PLIST_FILES=	share/locale/bg/LC_MESSAGES/e16.mo \
 CONFIGURE_ARGS+=--disable-nls
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if (${MACHINE} == "alpha") && (${X_WINDOW_SYSTEM:L} == xfree86-3)
-CONFIGURE_ARGS+=	--disable-zoom
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
 		-e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/scripts/e_gen_menu
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 1769b78d5ba2..04f30f23f3bb 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -63,14 +63,14 @@ CONFIGURE_ARGS+=	--with-icesound=esound
 CONFIGURE_ARGS+=	--with-icesound=oss
 .endif
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3 || defined(WITHOUT_XFT)
+.if defined(WITHOUT_XFT)
 CONFIGURE_ARGS+=	--enable-corefonts --disable-xfreetype
 .else
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--enable-gradients
 .endif
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3 || defined(WITHOUT_XINERAMA)
+.if defined(WITHOUT_XINERAMA)
 CONFIGURE_ARGS+=	--disable-xinerama
 .endif
 
diff --git a/x11-wm/matchbox/Makefile b/x11-wm/matchbox/Makefile
index 2d8ecff76620..f1a1e095d6cf 100644
--- a/x11-wm/matchbox/Makefile
+++ b/x11-wm/matchbox/Makefile
@@ -31,7 +31,7 @@ DOCS=		AUTHORS ChangeLog NEWS README
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3 || defined(WITHOUT_XFT)
+.if defined(WITHOUT_XFT)
 CONFIGURE_ARGS+=	--enable-standalone
 .else
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
diff --git a/x11-wm/pawm/Makefile b/x11-wm/pawm/Makefile
index 0079b3074e8c..f2679d14232d 100644
--- a/x11-wm/pawm/Makefile
+++ b/x11-wm/pawm/Makefile
@@ -31,9 +31,6 @@ CFLAGS+=	-Dintmax_t=u_int32_t -Duintmax_t=u_int32_t \
 		-DSIZE_MAX=UINT_MAX
 .endif
 
-.if ${X_WINDOW_SYSTEM} == xfree86-3
-CFLAGS+=	-DDISABLE_XFT -DDISABLE_XRANDR
-.else
 LDFLAGS+=	-lXrandr
 .if defined(WITHOUT_XFT)
 CFLAGS+=	-DDISABLE_XFT
@@ -42,7 +39,6 @@ LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CFLAGS+=	`pkg-config --cflags xft`
 LDFLAGS+=	`pkg-config --libs xft`
 .endif
-.endif
 
 .if defined(WITH_SN)
 LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index a2030700238b..d89afbdeb410 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -41,15 +41,11 @@ MAN1=		glob.1 xfbd.1 xfce.1 xfclock.1 xfglob.1 xfgnome.1 xfhelp.1 \
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_XFT)
 LIB_DEPENDS+=		Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--enable-xft
 .endif
 CONFIGURE_ARGS+=	--enable-xinerama
-.else
-CONFIGURE_ARGS+=	--disable-xinerama
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in