diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile
index e689db93312a..4ff00bd98df4 100644
--- a/astro/google-earth/Makefile
+++ b/astro/google-earth/Makefile
@@ -40,15 +40,11 @@ FETCH_BEFORE_ARGS=	-o ${TARGET_DISTFILE}
 
 UNMAKESELF=	${LOCALBASE}/bin/unmakeself
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 do-fetch:
 	@if [ ! -f ${DISTDIR}/${TARGET_DISTFILE} ]; then \
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index 73a2a3842f63..b3225d27c1ee 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -34,7 +34,7 @@ PKGNAMESUFFIX=	-nox11
 CONFIGURE_ARGS+=	--without-x
 .else
 USE_XPM=	yes
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3 || defined(WITHOUT_XFT)
+.if defined(WITHOUT_XFT)
 CONFIGURE_ARGS+=	--without-xft
 .else
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 45d1c24831c8..909e681c9d14 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -16,6 +16,7 @@ PKGNAMESUFFIX?=	${GNOME_SUFFIX}${PKGNAMESUFFIX2}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Emulator for Commodore C64, C128, VIC20, PET, and CBM-II
 
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
 LIB_DEPENDS=	png:${PORTSDIR}/graphics/png
 .if !defined(VICE_WITH_GNOME)
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
@@ -89,10 +90,6 @@ CFLAGS+=		-DHAVE_LIBESD=1 -DHAVE_SDL_SDL_AUDIO_H=1
 CONFIGURE_ARGS+=	--without-esd
 .endif
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
-BUILD_DEPENDS+=	bdftopcf:${X_CLIENTS_PORT}
-.endif
-
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
 # ../src/resid/libresid.a(wave.o)(.rodata+0x0): relocation truncated to fit: GPREL32 *UND*
 BROKEN=		"GPREL relocation truncated"
diff --git a/emulators/vmware-guestd4/Makefile b/emulators/vmware-guestd4/Makefile
index f3795778c479..4b09ed1105b3 100644
--- a/emulators/vmware-guestd4/Makefile
+++ b/emulators/vmware-guestd4/Makefile
@@ -52,17 +52,7 @@ MOUNT_PT?=	/mnt
 MOUNT=		/sbin/mount
 UMOUNT=		/sbin/umount
 
-.if defined(VMWARE_X_PORTS)
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-PLIST_SUB+=	INSTALLXSERVER3:=""
-PLIST_SUB+=	INSTALLXSERVER4:="@comment "
-.else
-PLIST_SUB+=	INSTALLXSERVER3:="@comment "
-PLIST_SUB+=	INSTALLXSERVER4:=""
-.endif
-
-.else
+.if !defined(VMWARE_X_PORTS)
 
 .if !defined(WITHOUT_VMWARE_VMMEMCTL)
 .if exists(/usr/src/sys/Makefile)
@@ -125,18 +115,9 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox ${X11BASE}/bin
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/configurator/XFree86-3/XF86_VMware_4.5 ${X11BASE}/bin/XF86_VMware
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-3/XF86Config ${X11BASE}/etc/XF86Config_VMware
-	@${ECHO} ""
-	@${ECHO} "You have installed XFree86 3.x X Server for VMware."
-	@${ECHO} "${X11BASE}/etc/XF86Config_VMware is a sample XF86Config file."
-	@${ECHO} "Copy this file to /etc/XF86Config before starting X."
-.else
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware
-.endif
 	-${LOCALBASE}/sbin/vmware-guestd --cmd toolinstall.end
 
 .else
diff --git a/emulators/vmware-guestd4/pkg-descr.tools b/emulators/vmware-guestd4/pkg-descr.tools
index 68165f70e46f..ff7b3d266147 100644
--- a/emulators/vmware-guestd4/pkg-descr.tools
+++ b/emulators/vmware-guestd4/pkg-descr.tools
@@ -7,9 +7,7 @@ configulation files, and special XFree86 3.x server for Guest OS.
 However, we cannot install dual-boot configuration since it requires
 to modify /etc files.
 
-This ports will install vmware-toolbox to your computer, and
-XFree86 X server if you set XFREE86_VERSION to 3 in /etc/make.conf, 
-If you already use XFree86 4.1.0 or later, you may use 'vmware'
+This ports will install vmware-toolbox to your computer.  You may use 'vmware'
 driver for X server.  Vmware-guestd is installed as a separate port,
 ports/emulators/vmware-guestd4, but this port install guestd automatically.
 
diff --git a/emulators/vmware-guestd4/pkg-plist.tools b/emulators/vmware-guestd4/pkg-plist.tools
index acc0046b6340..b06f3832af6d 100644
--- a/emulators/vmware-guestd4/pkg-plist.tools
+++ b/emulators/vmware-guestd4/pkg-plist.tools
@@ -1,6 +1,4 @@
 bin/vmware-toolbox
-%%INSTALLXSERVER3:%%bin/XF86_VMware
-%%INSTALLXSERVER3:%%etc/XF86Config_VMware
-%%INSTALLXSERVER4:%%etc/XF86Config-4_VMware
-%%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware
-%%INSTALLXSERVER4:%%lib/modules/input/vmmouse_drv.o_VMware
+etc/XF86Config-4_VMware
+lib/modules/drivers/vmware_drv.o_VMware
+lib/modules/input/vmmouse_drv.o_VMware
diff --git a/emulators/vmware-guestd5/Makefile b/emulators/vmware-guestd5/Makefile
index c0362691e13e..bdabbe499ee9 100644
--- a/emulators/vmware-guestd5/Makefile
+++ b/emulators/vmware-guestd5/Makefile
@@ -69,22 +69,10 @@ BITS?=		64
 
 .if defined(VMWARE_X_PORTS)
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-.if ${BITS} == 32
-PLIST_SUB+=	INSTALLXSERVER3:=""
-.else
-PLIST_SUB+=	INSTALLXSERVER3:="@comment "
-.endif
-PLIST_SUB+=	INSTALLXSERVER4:="@comment "
-PLIST_SUB+=	INSTALLXVMMOUSE:="@comment "
-.elif ${X_WINDOW_SYSTEM:L} == xfree86-4
-PLIST_SUB+=	INSTALLXSERVER3:="@comment "
+.if ${X_WINDOW_SYSTEM:L} == xfree86-4
 PLIST_SUB+=	INSTALLXSERVER4:=""
-PLIST_SUB+=	INSTALLXVMMOUSE:=""
 .else
-PLIST_SUB+=	INSTALLXSERVER3:="@comment "
 PLIST_SUB+=	INSTALLXSERVER4:="@comment "
-PLIST_SUB+=	INSTALLXVMMOUSE:=""
 .endif
 
 .else
@@ -174,24 +162,10 @@ do-install:
 .if defined(WITH_VMWARE_GTK)
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${X11BASE}/bin
 .endif
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 	if [ ! -d ${X11BASE}/lib/modules/input ] ; then \
 		${MKDIR} ${X11BASE}/lib/modules/input ; \
 	fi
-.endif
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-.if ${BITS} == 32
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/configurator/XFree86-3/XF86_VMware_4.5 ${X11BASE}/bin/XF86_VMware
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-3/XF86Config ${X11BASE}/etc/XF86Config_VMware
-	@${ECHO} ""
-	@${ECHO} "You have installed XFree86 3.x X Server for VMware."
-	@${ECHO} "${X11BASE}/etc/XF86Config_VMware is a sample XF86Config file."
-	@${ECHO} "Copy this file to /etc/XF86Config before starting X."
-.else
-	@${ECHO} "There is no XFree86 3.x X server for your system."
-	@${ECHO} "Consider upgrading your X to XFree86 4.x or switch to X.Org."
-.endif
-.elif ${X_WINDOW_SYSTEM:L} == xfree86-4
+.if ${X_WINDOW_SYSTEM:L} == xfree86-4
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware
 	if [ ! -d ${X11BASE}/lib/modules/drivers ] ; then \
 		${MKDIR} ${X11BASE}/lib/modules/drivers ; \
diff --git a/emulators/vmware-guestd5/pkg-descr.tools b/emulators/vmware-guestd5/pkg-descr.tools
index 2027da8571ce..cccff5433821 100644
--- a/emulators/vmware-guestd5/pkg-descr.tools
+++ b/emulators/vmware-guestd5/pkg-descr.tools
@@ -2,14 +2,11 @@ VMware tools support FreeBSD _guest_ OS running on VMware Workstation.
 Beware, this port is _not_ for FreeBSD _host_ OS.
 
 VMware tools for FreeBSD consist of vmware-toolbox which supports
-seamless operation between the Host and the Guest OS, dual-boot
-configulation files, and special XFree86 3.x server for Guest OS.
-However, we cannot install dual-boot configuration since it requires
-to modify /etc files.
+seamless operation between the Host and the Guest OS and dual-boot
+configulation files.  However, we cannot install dual-boot configuration
+since it requires to modify /etc files.
 
-This ports will install vmware-toolbox to your computer, and
-XFree86 X server if you set XFREE86_VERSION to 3 in /etc/make.conf, 
-If you already use XFree86 4.1.0 or later, you may use 'vmware'
+This ports will install vmware-toolbox to your computer.  You may use 'vmware'
 driver for X server.  Vmware-guestd is installed as a separate port,
 ports/emulators/vmware-guestd4, but this port install guestd automatically.
 
diff --git a/emulators/vmware-guestd5/pkg-plist.tools b/emulators/vmware-guestd5/pkg-plist.tools
index 01dff9975c77..c9e1f6501362 100644
--- a/emulators/vmware-guestd5/pkg-plist.tools
+++ b/emulators/vmware-guestd5/pkg-plist.tools
@@ -1,10 +1,8 @@
 bin/vmware-toolbox
 bin/vmware-toolbox-tcl
 %%INSTALLXGTKTOOL:%%bin/vmware-toolbox-gtk
-%%INSTALLXSERVER3:%%bin/XF86_VMware
-%%INSTALLXSERVER3:%%etc/XF86Config_VMware
 %%INSTALLXSERVER4:%%etc/XF86Config-4_VMware
 %%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware
-%%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware
+lib/modules/input/vmmouse_drv.o_VMware
 %%INSTALLXSERVER4:%%@dirrmtry lib/modules/drivers
-%%INSTALLXVMMOUSE:%%@dirrmtry lib/modules/input
+dirrmtry lib/modules/input
diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile
index c0362691e13e..bdabbe499ee9 100644
--- a/emulators/vmware-guestd6/Makefile
+++ b/emulators/vmware-guestd6/Makefile
@@ -69,22 +69,10 @@ BITS?=		64
 
 .if defined(VMWARE_X_PORTS)
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-.if ${BITS} == 32
-PLIST_SUB+=	INSTALLXSERVER3:=""
-.else
-PLIST_SUB+=	INSTALLXSERVER3:="@comment "
-.endif
-PLIST_SUB+=	INSTALLXSERVER4:="@comment "
-PLIST_SUB+=	INSTALLXVMMOUSE:="@comment "
-.elif ${X_WINDOW_SYSTEM:L} == xfree86-4
-PLIST_SUB+=	INSTALLXSERVER3:="@comment "
+.if ${X_WINDOW_SYSTEM:L} == xfree86-4
 PLIST_SUB+=	INSTALLXSERVER4:=""
-PLIST_SUB+=	INSTALLXVMMOUSE:=""
 .else
-PLIST_SUB+=	INSTALLXSERVER3:="@comment "
 PLIST_SUB+=	INSTALLXSERVER4:="@comment "
-PLIST_SUB+=	INSTALLXVMMOUSE:=""
 .endif
 
 .else
@@ -174,24 +162,10 @@ do-install:
 .if defined(WITH_VMWARE_GTK)
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${X11BASE}/bin
 .endif
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 	if [ ! -d ${X11BASE}/lib/modules/input ] ; then \
 		${MKDIR} ${X11BASE}/lib/modules/input ; \
 	fi
-.endif
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-.if ${BITS} == 32
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/configurator/XFree86-3/XF86_VMware_4.5 ${X11BASE}/bin/XF86_VMware
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-3/XF86Config ${X11BASE}/etc/XF86Config_VMware
-	@${ECHO} ""
-	@${ECHO} "You have installed XFree86 3.x X Server for VMware."
-	@${ECHO} "${X11BASE}/etc/XF86Config_VMware is a sample XF86Config file."
-	@${ECHO} "Copy this file to /etc/XF86Config before starting X."
-.else
-	@${ECHO} "There is no XFree86 3.x X server for your system."
-	@${ECHO} "Consider upgrading your X to XFree86 4.x or switch to X.Org."
-.endif
-.elif ${X_WINDOW_SYSTEM:L} == xfree86-4
+.if ${X_WINDOW_SYSTEM:L} == xfree86-4
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware
 	if [ ! -d ${X11BASE}/lib/modules/drivers ] ; then \
 		${MKDIR} ${X11BASE}/lib/modules/drivers ; \
diff --git a/emulators/vmware-guestd6/pkg-descr.tools b/emulators/vmware-guestd6/pkg-descr.tools
index 2027da8571ce..cccff5433821 100644
--- a/emulators/vmware-guestd6/pkg-descr.tools
+++ b/emulators/vmware-guestd6/pkg-descr.tools
@@ -2,14 +2,11 @@ VMware tools support FreeBSD _guest_ OS running on VMware Workstation.
 Beware, this port is _not_ for FreeBSD _host_ OS.
 
 VMware tools for FreeBSD consist of vmware-toolbox which supports
-seamless operation between the Host and the Guest OS, dual-boot
-configulation files, and special XFree86 3.x server for Guest OS.
-However, we cannot install dual-boot configuration since it requires
-to modify /etc files.
+seamless operation between the Host and the Guest OS and dual-boot
+configulation files.  However, we cannot install dual-boot configuration
+since it requires to modify /etc files.
 
-This ports will install vmware-toolbox to your computer, and
-XFree86 X server if you set XFREE86_VERSION to 3 in /etc/make.conf, 
-If you already use XFree86 4.1.0 or later, you may use 'vmware'
+This ports will install vmware-toolbox to your computer.  You may use 'vmware'
 driver for X server.  Vmware-guestd is installed as a separate port,
 ports/emulators/vmware-guestd4, but this port install guestd automatically.
 
diff --git a/emulators/vmware-guestd6/pkg-plist.tools b/emulators/vmware-guestd6/pkg-plist.tools
index 01dff9975c77..c9e1f6501362 100644
--- a/emulators/vmware-guestd6/pkg-plist.tools
+++ b/emulators/vmware-guestd6/pkg-plist.tools
@@ -1,10 +1,8 @@
 bin/vmware-toolbox
 bin/vmware-toolbox-tcl
 %%INSTALLXGTKTOOL:%%bin/vmware-toolbox-gtk
-%%INSTALLXSERVER3:%%bin/XF86_VMware
-%%INSTALLXSERVER3:%%etc/XF86Config_VMware
 %%INSTALLXSERVER4:%%etc/XF86Config-4_VMware
 %%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware
-%%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware
+lib/modules/input/vmmouse_drv.o_VMware
 %%INSTALLXSERVER4:%%@dirrmtry lib/modules/drivers
-%%INSTALLXVMMOUSE:%%@dirrmtry lib/modules/input
+dirrmtry lib/modules/input
diff --git a/emulators/vmware-tools3/Makefile b/emulators/vmware-tools3/Makefile
index 7710dd232680..1b81f5ced6f6 100644
--- a/emulators/vmware-tools3/Makefile
+++ b/emulators/vmware-tools3/Makefile
@@ -46,12 +46,6 @@ MOUNT_PT?=	/mnt
 MOUNT=		/sbin/mount
 UMOUNT=		/sbin/umount
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-PLIST_SUB+=	INSTALLXSERVER:=""
-.else
-PLIST_SUB+=	INSTALLXSERVER:="@comment "
-.endif
-
 do-fetch:
 	@${DO_NADA}
 fetch-list:
@@ -86,14 +80,6 @@ post-extract:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vmware-toolbox ${PREFIX}/bin
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-	${INSTALL_PROGRAM} ${WRKSRC}/XF86_VMware ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/XF86Config.dist ${PREFIX}/etc/XF86Config_VMware
-	@${ECHO} ""
-	@${ECHO} "You have installed XFree86 3.x X Server for VMware."
-	@${ECHO} "${PREFIX}/etc/XF86Config_VMware is a sample XF86Config file."
-	@${ECHO} "Copy this file to /etc/XF86Config before starting X."
-.endif
 	-${LOCALBASE}/sbin/vmware-guestd --cmd toolinstall.end
 
 .include <bsd.port.post.mk>
diff --git a/emulators/vmware-tools3/pkg-descr b/emulators/vmware-tools3/pkg-descr
index 07e884cac2bd..1b1b6c212f25 100644
--- a/emulators/vmware-tools3/pkg-descr
+++ b/emulators/vmware-tools3/pkg-descr
@@ -7,9 +7,7 @@ configulation files, and special XFree86 3.x server for Guest OS.
 However, we cannot install dual-boot configuration since it requires
 to modify /etc files.
 
-This ports will install vmware-toolbox to your computer, and
-XFree86 X server if you set XFREE86_VERSION to 3 in /etc/make.conf, 
-If you already use XFree86 4.1.0 or later, you may use 'vmware'
+This ports will install vmware-toolbox to your computer.  You may use 'vmware'
 driver for X server.  Vmware-guestd is installed as a separate port,
 ports/emulators/vmware-guestd3, but this port install guestd automatically.
 
diff --git a/emulators/vmware-tools3/pkg-plist b/emulators/vmware-tools3/pkg-plist
index 51edd7fd6855..a3ee170075eb 100644
--- a/emulators/vmware-tools3/pkg-plist
+++ b/emulators/vmware-tools3/pkg-plist
@@ -1,3 +1 @@
 bin/vmware-toolbox
-%%INSTALLXSERVER:%%bin/XF86_VMware
-%%INSTALLXSERVER:%%etc/XF86Config_VMware
diff --git a/games/atitd/Makefile b/games/atitd/Makefile
index 570eae34cc7e..10ca373f3322 100644
--- a/games/atitd/Makefile
+++ b/games/atitd/Makefile
@@ -21,15 +21,11 @@ RUN_DEPENDS=	${X11BASE}/bin/xhost:${X_CLIENTS_PORT}
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .ifdef(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so:${PORTSDIR}/graphics/linux_glx
-.endif
 
 PLIST_FILES=	bin/atitd
 USE_LINUX=	yes
diff --git a/games/linux-doom3-demo/Makefile b/games/linux-doom3-demo/Makefile
index 9995c4be7162..1ae94ee7b3c7 100644
--- a/games/linux-doom3-demo/Makefile
+++ b/games/linux-doom3-demo/Makefile
@@ -35,15 +35,11 @@ SUB_LIST=	DOOMDIR="${DOOMDIR}"
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile
index a04c7314233f..327b5e9c77d7 100644
--- a/games/linux-doom3/Makefile
+++ b/games/linux-doom3/Makefile
@@ -32,15 +32,11 @@ SUB_FILES=	doom3 doom3-ded pkg-message
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 .if defined(WITH_NO_CDKEY)
 PORTVERSION=	1.1.1286
diff --git a/games/linux-quake3-demo/Makefile b/games/linux-quake3-demo/Makefile
index a1054ded0a2d..f99d34f908f3 100644
--- a/games/linux-quake3-demo/Makefile
+++ b/games/linux-quake3-demo/Makefile
@@ -49,17 +49,12 @@ do-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
-.   ifdef(WITH_NVIDIA_GL)
+.ifdef(WITH_NVIDIA_GL)
 GL_LIB=		${LINUXBASE}/usr/lib/libGL.so.1
 GL_PORT=	x11/nvidia-driver
-.   else
+.else
 GL_LIB=		${LINUXBASE}/usr/X11R6/lib/libGL.so.1
 GL_PORT=	graphics/linux_dri
-.   endif
-.else
-GL_LIB=		${LINUXBASE}/lib/libGL.so
-GL_PORT=	graphics/linux_glx
 .endif
 
 RUN_DEPENDS+=	${GL_LIB}:${PORTSDIR}/${GL_PORT}
diff --git a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile
index bb194f5cd62d..cbe1b464e358 100644
--- a/games/linux-ut2003-demo/Makefile
+++ b/games/linux-ut2003-demo/Makefile
@@ -42,15 +42,11 @@ LIBDIRS=	Animations Benchmark ForceFeedback KarmaData Maps Music \
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/games/linux-ut2004-demo/Makefile b/games/linux-ut2004-demo/Makefile
index c835d2572716..92450a292870 100644
--- a/games/linux-ut2004-demo/Makefile
+++ b/games/linux-ut2004-demo/Makefile
@@ -44,15 +44,11 @@ LIBDIRS=	Animations Benchmark ForceFeedback KarmaData Maps Music \
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/games/linux-virtual-jay-peak/Makefile b/games/linux-virtual-jay-peak/Makefile
index 3f53e94f1bc2..3a00767e8aa4 100644
--- a/games/linux-virtual-jay-peak/Makefile
+++ b/games/linux-virtual-jay-peak/Makefile
@@ -44,14 +44,10 @@ do-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/games/linux-x-plane-net-installer/Makefile b/games/linux-x-plane-net-installer/Makefile
index af5a1f9b82b8..94f466f76f89 100644
--- a/games/linux-x-plane-net-installer/Makefile
+++ b/games/linux-x-plane-net-installer/Makefile
@@ -30,15 +30,11 @@ PLIST_FILES=	bin/X-Plane-Net-Install
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/games/linux-x-plane/Makefile b/games/linux-x-plane/Makefile
index bc4594d8a895..c56492f4db52 100644
--- a/games/linux-x-plane/Makefile
+++ b/games/linux-x-plane/Makefile
@@ -76,15 +76,11 @@ DESKTOP_ENTRIES="X-Plane Airfoil Maker" \
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 do-fetch:
 	@if ! [ -e ${DISTDIR}/${DISTFILES} ]; then \
diff --git a/graphics/libvisual-plugins/Makefile b/graphics/libvisual-plugins/Makefile
index a392207699c4..59a11d8b4ff4 100644
--- a/graphics/libvisual-plugins/Makefile
+++ b/graphics/libvisual-plugins/Makefile
@@ -32,8 +32,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 BUILD_DEPENDS=	mkdirhier:${PORTSDIR}/devel/imake-4
 .elif ${X_WINDOW_SYSTEM} == "xorg"
 BUILD_DEPENDS=	mkdirhier:${PORTSDIR}/devel/imake-6
-.elif ${X_WINDOW_SYSTEM} == "xfree86-3"
-BUILD_DEPENDS=	mkdirhier:${PORTSDIR}/x11/XFree86
 .endif
 
 .if defined(WITH_MPLAYER)
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index fe8acad91efc..1f05a06e4bf5 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -37,10 +37,6 @@ PORTDOCS=      AUTHORS COPYING COPYRIGHT ChangeLog NEWS README \
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-IGNORE=		"Requires Xv Extension"
-.endif
-
 .if ${HAVE_GNOME:Mgtk12}!=""
 USE_GNOME+=	gtk12
 MAN1+=		playdv.1
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 98cfce72a083..5996119ade0d 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -58,12 +58,6 @@ MAN5=	xine.5
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
-PLIST_SUB+=	WITH_LIBXV=""
-.else
-PLIST_SUB+=	WITH_LIBXV="@comment "
-.endif
-
 .if !defined(WITHOUT_ARTS) && (exists(${LOCALBASE}/bin/artsc-config) || defined(WITH_ARTS))
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
 PLIST_SUB+=	WITH_ARTS=""
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 79f93a670fc3..77822685907d 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -142,7 +142,7 @@ lib/xine/plugins/1.1.3/xineplug_vo_out_opengl.so
 lib/xine/plugins/1.1.3/xineplug_vo_out_sdl.so
 %%WITH_VIDIX%%lib/xine/plugins/1.1.3/xineplug_vo_out_vidix.so
 lib/xine/plugins/1.1.3/xineplug_vo_out_xshm.so
-%%WITH_LIBXV%%lib/xine/plugins/1.1.3/xineplug_vo_out_xv.so
+lib/xine/plugins/1.1.3/xineplug_vo_out_xv.so
 %%WITH_XVMC%%lib/xine/plugins/1.1.3/xineplug_vo_out_xvmc.so
 libdata/pkgconfig/libxine.pc
 share/aclocal/xine.m4
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 850995eaa447..9a3ff46b0b65 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--disable-arts
 PLIST_SUB+=	LIBARTS="@comment "
 .endif
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3 && !defined(WITHOUT_XFT)
+.if !defined(WITHOUT_XFT)
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--enable-xft
 CPPFLAGS+=	`freetype-config --cflags`
diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile
index ebae796a0646..cf6758b27ebd 100644
--- a/x11-fonts/bitstream-vera/Makefile
+++ b/x11-fonts/bitstream-vera/Makefile
@@ -25,6 +25,8 @@ USE_BZIP2=	yes
 PREFIX?=	${X11BASE}
 NO_BUILD=	yes
 
+MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
+
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 
 MSG_FILE=	${PKGDIR}/pkg-message
@@ -39,12 +41,6 @@ FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTNAME}
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
-.else
-MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
-.endif
-
 .SILENT:
 
 post-patch:
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index c7e8c0c8af22..a265a51ef1f1 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -42,6 +42,8 @@ MAKE_ENV=	LC_ALL=C
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${PKGINSTALL}
 
+MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
+
 MAN1=		fc-match.1
 MAN5=		fonts-conf.5
 PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
@@ -56,12 +58,6 @@ PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
 #PATCH_DIST_STRIP+=	-p1
 .endif
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
-.else
-MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 789e0b336862..b849cc84c847 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -35,10 +35,4 @@ MAN3=		Xft.3
 #PATCHFILES+=    cjk-patch-libXft-20050716.diff.gz
 #.endif
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-IGNORE=	xft requires Render extension headers/library to build
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile
index d6cada700d5e..7f5d5554c94f 100644
--- a/x11-fonts/webfonts/Makefile
+++ b/x11-fonts/webfonts/Makefile
@@ -32,6 +32,8 @@ MAINTAINER=	kkonstan@duth.gr
 COMMENT=	TrueType core fonts for the Web
 
 EXTRACT_DEPENDS=cabextract:${PORTSDIR}/archivers/cabextract
+BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 USE_X_PREFIX=	yes
 
@@ -60,17 +62,6 @@ FONTS_FILE=	${WRKDIR}/fonts.dir
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-RUN_DEPENDS=	xfstt:${PORTSDIR}/x11-servers/Xfstt
-PLIST_SUB+=	FCACHE="@comment " \
-		OLDXF86=""
-.else
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-PLIST_SUB+=	FCACHE="" \
-		OLDXF86="@comment "
-.endif
-
 .SILENT:
 
 #
@@ -113,18 +104,13 @@ do-install:
 	${INSTALL_DATA} ${FONTS_FILE} ${FONTSDIR}
 	${INSTALL_DATA} ${FONTS_FILE} ${FONTSDIR}/fonts.scale
 	${INSTALL_DATA} ${WRKSRC}/licen.txt ${DOCSDIR}/LICENSE
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-	${LN} -fs ${FONTSDIR} ${TTFONTSDIR}/${FONTNAME}
-.endif
 
 #
 # Post-install
 #
 post-install:
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 	${ECHO_MSG} "===> Running fc-cache"
 	-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
-.endif
 	${ECHO_MSG}
 	${CAT} ${PKGMESSAGE}
 	${ECHO_MSG}
diff --git a/x11-fonts/webfonts/pkg-plist b/x11-fonts/webfonts/pkg-plist
index 1f703b8c0698..8db024244000 100644
--- a/x11-fonts/webfonts/pkg-plist
+++ b/x11-fonts/webfonts/pkg-plist
@@ -11,7 +11,7 @@
 %%FONTSDIR%%/courbd.ttf
 %%FONTSDIR%%/courbi.ttf
 %%FONTSDIR%%/couri.ttf
-%%FCACHE%%@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
+@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 %%FONTSDIR%%/fonts.dir
 %%FONTSDIR%%/fonts.scale
 %%FONTSDIR%%/georgia.ttf
@@ -37,6 +37,4 @@
 %%DOCSDIR%%/LICENSE
 @dirrm %%DOCSDIR%%
 @dirrm %%FONTSDIR%%
-%%OLDXF86%%@exec ln -fs %D/%%FONTSDIR%% %D/%%TTFONTSDIR%%/%%FONTNAME%%
-%%OLDXF86%%@unexec rm -f %D/%%TTFONTSDIR%%/%%FONTNAME%%
-%%FCACHE%%@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
+@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
diff --git a/x11-themes/cursor-bluecurve-theme/Makefile b/x11-themes/cursor-bluecurve-theme/Makefile
index 4a63b7e927e3..e97388fe42d4 100644
--- a/x11-themes/cursor-bluecurve-theme/Makefile
+++ b/x11-themes/cursor-bluecurve-theme/Makefile
@@ -44,11 +44,7 @@ do-build:
 .include "${MASTERDIR}/bsd.bluecurve.mk"
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 BUILD_DEPENDS+=	xcursorgen:${X_CLIENTS_PORT}	# needed by cursorthemegen
 RUN_DEPENDS+=	xcursorgen:${X_CLIENTS_PORT}	# for the lib/X11/icons directory
-.else
-IGNORE=		your X Window System is too old; install x11/xorg or x11/XFree86-4 and try again
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index 393ab6be0ebf..58812c3ccc5f 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -22,9 +22,6 @@ SUB_FILES=	pkg-message
 SUB_LIST=	XAWVER="${XAWVER}"
 
 .include <bsd.port.pre.mk>
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-PLIST_FILES=	lib/libXaw3d.so.6
-.endif
 
 post-extract:
 	${MKDIR} ${WRKSRC}/X11/Xaw3d
@@ -40,9 +37,6 @@ post-configure:
 post-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${DOCSDIR}
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-	${LN} -sf libXaw3d.so.${XAWVER} ${X11BASE}/lib/libXaw3d.so.6
-.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/fox12/Makefile b/x11-toolkits/fox12/Makefile
index 2ebddf495908..4e50c3369cf2 100644
--- a/x11-toolkits/fox12/Makefile
+++ b/x11-toolkits/fox12/Makefile
@@ -47,7 +47,7 @@ LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 ## Additional Options
 ##
 #
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3 || defined(WITHOUT_XFT)
+.if defined(WITHOUT_XFT)
 CONFIGURE_ARGS+=	--with-xft=no
 .else
 CONFIGURE_ARGS+=	--with-xft=yes
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index bc199551ae36..9d3cf17de9a5 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -55,7 +55,7 @@ OPTIONS=	OPTIMIZED_CXXFLAGS "Enable additional optimizations" off \
 ## Additional Options
 ##
 #
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3 || defined(WITHOUT_XFT)
+.if defined(WITHOUT_XFT)
 CONFIGURE_ARGS+=	--with-xft=no
 .else
 CONFIGURE_ARGS+=	--with-xft=yes
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index de06681ad710..5600cf8247e8 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -50,7 +50,7 @@ IGNORE=		Does not compile at 4.x
 ## Additional Options
 ##
 #
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3 || defined(WITHOUT_XFT)
+.if defined(WITHOUT_XFT)
 CONFIGURE_ARGS+=	--with-xft=no
 .else
 CONFIGURE_ARGS+=	--with-xft=yes
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
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index 68db8d99cd0a..4a605488d72e 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -45,19 +45,10 @@ pre-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} \
 		${REINPLACE_CMD} -e 's|manm|mann|g'
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-4
-INSTALLDIRS+=	DPS/clients/makepsres DPS/demos/texteroids
-MANN+=		makepsres.man
-.endif
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-PLIST_SUB+=	WITH_XORG=""
-PLIST_SUB+=	WITH_XFREE4=""
-.else
-PLIST_SUB+=	WITH_XORG="@comment "
-
 .if ${X_WINDOW_SYSTEM:L} == xorg
-INSTALLDIRS+=	DPS/lib/dpstk DPS/lib/psres DPS/clients/pswrap
+INSTALLDIRS+=	DPS/clients/makepsres DPS/clients/pswrap DPS/demos/texteroids \
+		DPS/lib/dpstk
+MANN+=		makepsres.man
 PLIST_SUB+=	WITH_XFREE4=""
 .else
 PLIST_SUB+=	WITH_XFREE4="@comment "
@@ -73,6 +64,4 @@ do-install:
 		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .endfor
 
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/x11/dgs/pkg-plist b/x11/dgs/pkg-plist
index 14ac52bdf239..d92e10bc038f 100644
--- a/x11/dgs/pkg-plist
+++ b/x11/dgs/pkg-plist
@@ -6,36 +6,6 @@ bin/dpsnx.agent
 %%WITH_XFREE4%%bin/pswrap
 %%WITH_XFREE4%%bin/texteroids
 bin/xepsf
-%%WITH_XORG%%include/DPS/ColorSB.h
-%%WITH_XORG%%include/DPS/ColorSBP.h
-%%WITH_XORG%%include/DPS/DPSScrollW.h
-%%WITH_XORG%%include/DPS/DPSScrollWP.h
-%%WITH_XORG%%include/DPS/FontCreatP.h
-%%WITH_XORG%%include/DPS/FontCreato.h
-%%WITH_XORG%%include/DPS/FontSB.h
-%%WITH_XORG%%include/DPS/FontSBP.h
-%%WITH_XORG%%include/DPS/FontSamplP.h
-%%WITH_XORG%%include/DPS/FontSample.h
-%%WITH_XORG%%include/DPS/PSres.h
-%%WITH_XORG%%include/DPS/XDPS.h
-%%WITH_XORG%%include/DPS/XDPSlib.h
-%%WITH_XORG%%include/DPS/XDPSproto.h
-%%WITH_XORG%%include/DPS/dpsNXargs.h
-%%WITH_XORG%%include/DPS/dpsXclient.h
-%%WITH_XORG%%include/DPS/dpsXcommon.h
-%%WITH_XORG%%include/DPS/dpsXpreview.h
-%%WITH_XORG%%include/DPS/dpsXshare.h
-%%WITH_XORG%%include/DPS/dpsXuserpath.h
-%%WITH_XORG%%include/DPS/dpsclient.h
-%%WITH_XORG%%include/DPS/dpsconfig.h
-%%WITH_XORG%%include/DPS/dpsexcept.h
-%%WITH_XORG%%include/DPS/dpsfriends.h
-%%WITH_XORG%%include/DPS/dpsops.h
-%%WITH_XORG%%include/DPS/psops.h
-%%WITH_XORG%%lib/libdps.a
-%%WITH_XORG%%lib/libdps.la
-%%WITH_XORG%%lib/libdps.so
-%%WITH_XORG%%lib/libdps.so.0
 %%WITH_XFREE4%%lib/libdpstk.a
 %%WITH_XFREE4%%lib/libdpstk.la
 %%WITH_XFREE4%%lib/libdpstk.so
@@ -114,7 +84,6 @@ share/ghostscript/5.50/gs_typ32.ps
 share/ghostscript/5.50/gs_typ42.ps
 share/ghostscript/5.50/gs_type1.ps
 share/ghostscript/5.50/gs_wan_e.ps
-%%WITH_XORG%%@dirrm include/DPS
 @dirrmtry share/ghostscript/5.50/doc
 @dirrmtry share/ghostscript/5.50/examples
 @dirrmtry share/ghostscript/5.50
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 25af64c5fb51..aedf75af2e2c 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -33,10 +33,6 @@ MAN8=		gdkxft_sysinstall.8
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-IGNORE=		"requires XFree86-4.x or later to run"
-.endif
-
 .if ${HAVE_GNOME:Mlibglade}!="" && ${HAVE_GNOME:Mlibcapplet}!=""
 USE_GNOME+=	gnomeprefix libglade libcapplet
 PKGNAMESUFFIX=	-gnome
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 2b47ae01f044..68ab4c820836 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -14,13 +14,16 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Multilingual X11 terminal emulator
 
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20 lthack
 USE_AUTOTOOLS=	libtool:15
 LIBTOOLFILES=	configure kiklib/configure mkf/configure
 USE_PERL5_BUILD=yes
 CONFIGURE_ARGS=	--with-imagelib=gdk-pixbuf --enable-utmp \
-		--with-tools="mlclient,mlconfig,mlterm-menu,mlcc,w3mmlconfig"
+		--with-tools="mlclient,mlconfig,mlterm-menu,mlcc,w3mmlconfig" \
+		--with-type-engines="xcore,xft"
 CONFIGURE_ENV=	LIBS=-L${LOCALBASE}/lib CFLAGS=-I${LOCALBASE}/include
 
 OPTIONS=	FRIBIDI	"Use Fribidi for BiDi rendering" off \
@@ -86,14 +89,6 @@ INSTALLS_SHLIB=	yes
 
 MAN1=	mlterm.1 mlclient.1
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-PKGNAMESUFFIX=	-noaa
-CONFIGURE_ARGS+=	--with-type-engines=xcore
-.else
-CONFIGURE_ARGS+=	--with-type-engines="xcore,xft"
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-.endif
-
 post-configure:
 	@${CP} ${LIBTOOL} ${WRKSRC}
 	@${REINPLACE_CMD} -e "s,@CGI_BIN@,${PREFIX}/libexec/w3mmlconfig," \
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index d9fdc4a38732..4ab2ffce6945 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -105,9 +105,7 @@ pre-extract:
 .endif
 
 post-configure:
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 	${REINPLACE_CMD} -e 's/-lXdpms//g' ${WRKSRC}/modes/Makefile
-.endif
 
 PLIST_FILES=	bin/xlock lib/X11/app-defaults/XLock
 
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index fb67e3827f70..2012ae63b5c4 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -24,10 +24,4 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		xvattr.1
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-IGNORE=		requires Xv Extension
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>