- Fix build on FreeBSD 10.0

Notes: all x11@ ports fixed for FreeBSD 10

65 files changed, 65 insertions, 6 deletions

diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index ccb0bbfb4f0c..cca829a2ed4f 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Framework for defining and tracking users
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
     		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
 
+WITH_FBSD10_FIX=yes
 WRKSRC=		${WRKDIR}/ConsoleKit-${PORTVERSION}
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index 3408391bfee3..11672fb71b38 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	eggdbus-1.0:${PORTSDIR}/devel/eggdbus \
 		expat.6:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
 
+WITH_FBSD10_FIX=	yes
 USE_GNOME=	gnomehack glib20 intlhack
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index 6282853bd8e8..1347cdbde2eb 100644
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org acecad input driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 MAN4=		acecad.4x
 
diff --git a/x11-drivers/xf86-input-egalax/Makefile b/x11-drivers/xf86-input-egalax/Makefile
index b58b18315b81..87b857ce8347 100644
--- a/x11-drivers/xf86-input-egalax/Makefile
+++ b/x11-drivers/xf86-input-egalax/Makefile
@@ -15,6 +15,7 @@ COMMENT=	eGalax touch screen input driver for X.Org
 
 LICENSE=	BSD
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 MAN4=		egalax.4x
 
diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile
index 48901c312f8c..d31f64feac68 100644
--- a/x11-drivers/xf86-input-elographics/Makefile
+++ b/x11-drivers/xf86-input-elographics/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org elographics input driver
 
+WITH_FBSD10_FIX=	yes
 XORG_CAT=	driver
 MAN4=		elographics.4x
 
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
index 5a13b5284dc8..703267742e1d 100644
--- a/x11-drivers/xf86-input-hyperpen/Makefile
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org hyperpen input driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index 1017689b2550..d1712a63b2ff 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org joystick input driver
 
 XORG_CAT=	driver
-
+WITH_FBSD10_FIX=yes
 MAN4=		joystick.4x
 
 post-patch:
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 3a5205df7340..51a6e4bf9979 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org keyboard input driver
 
+WITH_FBSD10_FIX=	yes
 XORG_CAT=	driver
 USE_XORG=	kbproto
 MAN4=		kbd.4x
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index 319e96c8dd86..90e1a4699544 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org mouse input driver
 
+WITH_FBSD10_FIX=	yes
 XORG_CAT=	driver
 MAN4=		mousedrv.4x
 
diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile
index de568328ec74..8ef80feddba9 100644
--- a/x11-drivers/xf86-input-mutouch/Makefile
+++ b/x11-drivers/xf86-input-mutouch/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org mutouch input driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 MAN4=		mutouch.4x
 
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
index d67d1c7a7215..1ce3edf18375 100644
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org penmount input driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 MAN4=		penmount.4x
 
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index b251bd51b857..d5ef9422d0ba 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -15,6 +15,7 @@ COMMENT=	X.Org synaptics input driver
 
 CONFLICTS=	synaptics-[0-9]*
 
+WITH_FBSD10_FIX=yes
 USE_GNOME=	gnomehack
 USE_XORG=	x11
 XORG_CAT=	driver
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index 78cc5c02c74e..55b4e2308463 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org vmmouse input driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
 USE_GMAKE=	yes
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
index 530f563a8515..8bb0cf91dd64 100644
--- a/x11-drivers/xf86-input-void/Makefile
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org void input driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 MAN4=		void.4x
 
diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
index 5eaddccbec44..26e51a7705ba 100644
--- a/x11-drivers/xf86-video-apm/Makefile
+++ b/x11-drivers/xf86-video-apm/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org apm display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto
 MAN4=		apm.4x
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index b3e381ae2169..930a3042e9f2 100644
--- a/x11-drivers/xf86-video-ark/Makefile
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org ark display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	xextproto
 
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 02986dec8fb0..03b0f2bfea58 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org ati display driver
 
 USE_GL=		gl
-
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 MAN4=		ati.4x radeon.4x
diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile
index 78c6c7c63a77..9b98b309a276 100644
--- a/x11-drivers/xf86-video-ati613/Makefile
+++ b/x11-drivers/xf86-video-ati613/Makefile
@@ -15,6 +15,7 @@ COMMENT=	X.Org ati display driver
 
 USE_GL=		gl
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 MAN4=		ati.4x radeon.4x
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index 2de3dc72e873..76b36bf4f361 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org chips display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto
 MAN4=		chips.4x
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index 1def9f85551a..44b852abf26b 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org cirrus display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto
 MAN4=		cirrus.4x
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index 9b0f1474aed2..e93df287a18c 100644
--- a/x11-drivers/xf86-video-dummy/Makefile
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org dummy display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xf86dgaproto
 
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index 5573b32c332f..370a31c5251e 100644
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org fbdev display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto
 MAN4=		fbdev.4x
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index fe6678ebc269..be07e736dcd1 100644
--- a/x11-drivers/xf86-video-glint/Makefile
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -14,6 +14,7 @@ COMMENT=	X.Org glint display driver
 
 USE_GL=		gl
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	xf86driproto videoproto xextproto xf86dgaproto glproto
 MAN4=		glint.4x
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index 3c61786b42b2..8b1809938654 100644
--- a/x11-drivers/xf86-video-i128/Makefile
+++ b/x11-drivers/xf86-video-i128/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org i128 display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto
 MAN4=		i128.4x
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index 7320b92768e3..950aeded59d3 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org i740 display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto
 MAN4=		i740.4x
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index fbabd24c2808..184772fe6215 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -15,6 +15,7 @@ COMMENT=	Driver for Intel integrated graphics chipsets
 
 CONFLICTS=	xf86-video-i810-[0-9]*
 
+WITH_FBSD10_FIX=yes
 ONLY_FOR_ARCHS=	amd64 i386
 USE_GL=		gl
 
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
index d4ba10d89143..044c401e5755 100644
--- a/x11-drivers/xf86-video-mach64/Makefile
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org mach64 display driver
 
 USE_GL=		gl
-
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
 
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index 8ffe2ccff5f6..e11f3cdca43e 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -15,6 +15,7 @@ COMMENT=	X.Org mga display driver
 
 USE_GL=		gl
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	xf86driproto videoproto xextproto glproto
 MAN4=		mga.4x
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
index 17a2a42b3b79..329069269f65 100644
--- a/x11-drivers/xf86-video-neomagic/Makefile
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org neomagic display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto xf86dgaproto
 MAN4=		neomagic.4x
diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile
index 7d8e3627dfd5..8420c8fa306a 100644
--- a/x11-drivers/xf86-video-newport/Makefile
+++ b/x11-drivers/xf86-video-newport/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org newport display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto
 MAN4=		newport.4x
diff --git a/x11-drivers/xf86-video-nouveau/Makefile b/x11-drivers/xf86-video-nouveau/Makefile
index 0b4dac78c3d6..1c360dc2cbb1 100644
--- a/x11-drivers/xf86-video-nouveau/Makefile
+++ b/x11-drivers/xf86-video-nouveau/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	ftp://ftp.lissyara.su/users/Guest/distfiles/
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Free nouveau display driver for nvidia-based cards
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto xf86driproto glproto
 MAN4=		nouveau.4x
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
index 7a3dd9c60c3d..2941190ed5e7 100644
--- a/x11-drivers/xf86-video-nv/Makefile
+++ b/x11-drivers/xf86-video-nv/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org nv display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto
 MAN4=		nv.4x
diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile
index b3e4d076eeb5..9a7898c31a2e 100644
--- a/x11-drivers/xf86-video-openchrome/Makefile
+++ b/x11-drivers/xf86-video-openchrome/Makefile
@@ -16,6 +16,7 @@ COMMENT=	X.Org openChrome display driver
 
 USE_GL=		gl
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xf86driproto xextproto xvmc glproto
 MAN4=		openchrome.4x
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
index e94bed1a4be2..a39ccf61f636 100644
--- a/x11-drivers/xf86-video-r128/Makefile
+++ b/x11-drivers/xf86-video-r128/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org r128 display driver
 
 USE_GL=		gl
-
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
 MAN4=		r128.4x
diff --git a/x11-drivers/xf86-video-radeonhd-devel/Makefile b/x11-drivers/xf86-video-radeonhd-devel/Makefile
index 296a5dfa3a15..4d4b4b9d5e35 100644
--- a/x11-drivers/xf86-video-radeonhd-devel/Makefile
+++ b/x11-drivers/xf86-video-radeonhd-devel/Makefile
@@ -23,6 +23,7 @@ LIB_DEPENDS=	pciaccess.0:${PORTSDIR}/devel/libpciaccess
 XORG_CAT=	driver
 USE_XORG=	damageproto glproto videoproto xextproto xf86driproto
 USE_AUTOTOOLS=	automake:env aclocal:env autoconf libtool
+WITH_FBSD10_FIX=yes
 
 CONFLICTS=	xf86-video-radeonhd-[0-9]*
 
diff --git a/x11-drivers/xf86-video-radeonhd/Makefile b/x11-drivers/xf86-video-radeonhd/Makefile
index 03f06fe99a86..fa02e1a5fa28 100644
--- a/x11-drivers/xf86-video-radeonhd/Makefile
+++ b/x11-drivers/xf86-video-radeonhd/Makefile
@@ -18,7 +18,7 @@ OPTIONS=	UTILS "Install rhd_conntest and rhd_dump utilities" off
 XORG_CAT=	driver
 USE_XORG=	damageproto glproto videoproto xextproto xf86driproto
 CONFIGURE_ARGS=	--enable-exa
-
+WITH_FBSD10_FIX=yes
 CONFLICTS=	xf86-video-radeonhd-devel-[0-9]*
 
 MAN4=	radeonhd.4x
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index 8fc96d2825b2..bca1a5acafab 100644
--- a/x11-drivers/xf86-video-rendition/Makefile
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org rendition display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	xextproto
 MAN4=		rendition.4x
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index 5397647eaeb4..d2d85d4177ee 100644
--- a/x11-drivers/xf86-video-s3/Makefile
+++ b/x11-drivers/xf86-video-s3/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org s3 display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto
 MAN4=		s3.4x
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index bd879ee46402..5e4afb39e0f6 100644
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org s3virge display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto
 MAN4=		s3virge.4x
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index 2cad8e1b3344..0e82c6b9f287 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -14,6 +14,7 @@ COMMENT=	X.Org savage display driver
 
 USE_GL=		gl
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	xf86driproto videoproto xextproto glproto
 MAN4=		savage.4x
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index cfa486f576bd..ef6b71e22045 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org siliconmotion display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto
 MAN4=		siliconmotion.4x
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index 8140572d303b..86d54d7886c5 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -17,6 +17,7 @@ CONFLICTS=	xf86-video-sis-intel-[0-9]*
 
 USE_GL=		gl
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 MAN4=		sis.4x
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
index 6cc72846aba3..ace3dd082ca3 100644
--- a/x11-drivers/xf86-video-sunffb/Makefile
+++ b/x11-drivers/xf86-video-sunffb/Makefile
@@ -15,6 +15,7 @@ COMMENT=	X.Org sunffb display driver
 
 USE_GL=		gl
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	xf86driproto xextproto glproto
 MAN4=		sunffb.4x
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index 9e80c3b636ab..98c15a9f940c 100644
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -15,6 +15,7 @@ COMMENT=	X.Org tdfx display driver
 
 USE_GL=		gl
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	xf86driproto videoproto xextproto glproto
 MAN4=		tdfx.4x
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
index 5acd2d113ab1..8d22a2646ac9 100644
--- a/x11-drivers/xf86-video-tga/Makefile
+++ b/x11-drivers/xf86-video-tga/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org tga display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto xf86dgaproto
 
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index f768d3c8b92d..fc08ce106753 100644
--- a/x11-drivers/xf86-video-trident/Makefile
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org trident display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto xf86dgaproto
 MAN4=		trident.4x
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
index 06ee4272b1ce..fa430e84d60e 100644
--- a/x11-drivers/xf86-video-tseng/Makefile
+++ b/x11-drivers/xf86-video-tseng/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org tseng display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto
 MAN4=		tseng.4x
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index a2fccafde091..f8575257c7be 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org vesa display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	xextproto
 MAN4=		vesa.4x
diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile
index c769d950997e..e7ca84ee6da3 100644
--- a/x11-drivers/xf86-video-via/Makefile
+++ b/x11-drivers/xf86-video-via/Makefile
@@ -15,6 +15,7 @@ COMMENT=	X.Org via display driver
 
 IGNORE=		requires pciVideoPtr typedef
 
+WITH_FBSD10_FIX=yes
 USE_GL=		gl
 XORG_CAT=	driver
 USE_XORG=	xvmc xf86driproto xextproto x11 glproto
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index f3376257ef01..cde97195a922 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org vmware display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	xextproto xineramaproto videoproto
 
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index 86eef10a10d1..92bb5e365ab9 100644
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org voodoo display driver
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
 USE_XORG=	xf86dgaproto xextproto
 MAN4=		voodoo.4x
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 696f58073d65..9a53b1958340 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -16,6 +16,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
+WITH_FBSD10_FIX=	yes
 XORG_CAT=	lib
 USE_XORG=	xproto:both xrender
 
diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile
index 9adc85cc767e..fb961096e111 100644
--- a/x11-servers/driglide/Makefile
+++ b/x11-servers/driglide/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	anholt/driglide/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libraries to support 3dfx Voodoo3/4/5/Banshee with the DRI
 
+WITH_FBSD10_FIX=yes
 USE_XORG=	xxf86vm xxf86dga
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
diff --git a/x11-servers/mga_hal/Makefile b/x11-servers/mga_hal/Makefile
index cf56a40d12cb..134378d10e1a 100644
--- a/x11-servers/mga_hal/Makefile
+++ b/x11-servers/mga_hal/Makefile
@@ -17,6 +17,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Module for additional features with X.Org/XFree86 Matrox driver
 
 RESTRICTED=	Matrox drivers may not be distributed.
+WITH_FBSD10_FIX=yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index b1e7a1bc7e10..8bb9d9d352f6 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -17,11 +17,11 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org X server and related programs
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-
 RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
 
 XORG_CAT=	xserver
 
+WITH_FBSD10_FIX=yes
 USE_GMAKE=	yes
 USE_GL=		gl
 USE_XORG=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 3dda64cc8efd..27f31857ab44 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-toolkits
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Athena Widgets library
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	lib
 USE_XORG=	printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
 USE_GMAKE=	yes
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 8a206ab25518..86327e486fb3 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -15,6 +15,7 @@ COMMENT=	The XScrnSaver library
 XORG_CAT=	lib
 USE_XORG=	x11 xext xextproto scrnsaverproto:both
 
+WITH_FBSD10_FIX=	yes
 MAN3=		Xss.3 \
 		XScreenSaverAllocInfo.3 \
 		XScreenSaverGetRegistered.3 \
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index effee3169f91..3623c2e28a15 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Composite extension library
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	lib
 USE_XORG=	compositeproto:both x11 xfixes xext fixesproto xproto:both
 MAN3=		Xcomposite.3 \
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 31fb2148208a..1dd8d8f0f2cb 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -14,6 +14,7 @@ COMMENT=	X client-side cursor loading library
 
 LICENSE=	MIT
 
+WITH_FBSD10_FIX=	yes
 XORG_CAT=	lib
 USE_XORG=	xrender x11 xfixes fixesproto xproto:both \
 		xextproto
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index f27b13611b89..176b90741303 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -14,5 +14,6 @@ COMMENT=	X Damage extension library
 
 XORG_CAT=	lib
 USE_XORG=	x11 damageproto:both xfixes fixesproto xextproto xproto:both
+WITH_FBSD10_FIX=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index d4ab0714e8ca..757ea708f0d2 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -15,6 +15,7 @@ COMMENT=	X Input extension library
 
 LICENSE=	MIT
 
+WITH_FBSD10_FIX=yes
 XORG_CAT=	lib
 USE_XORG=	xproto x11 xext xextproto inputproto:both
 
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 3e44c8540793..53767e7e4aba 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -14,6 +14,7 @@ COMMENT=	X Pixmap library
 
 LICENSE=	MIT
 
+WITH_FBSD10_FIX=	yes
 XORG_CAT=	lib
 USE_XORG=	xproto x11 xext xextproto xt
 
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 6d5e9610656d..88913d4a58fa 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -17,6 +17,7 @@ LICENSE=	MIT
 XORG_CAT=	lib
 USE_XORG=	x11 randrproto:both xext xextproto xrender renderproto xproto:both
 
+WITH_FBSD10_FIX=	yes
 MAN3=		Xrandr.3 \
 		XRRConfigCurrentConfiguration.3 \
 		XRRConfigCurrentRate.3 \
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
index fd15d2ab7d40..bcc70227aace 100644
--- a/x11/libXxf86misc/Makefile
+++ b/x11/libXxf86misc/Makefile
@@ -17,6 +17,7 @@ LICENSE=	MIT
 XORG_CAT=	lib
 USE_XORG=	xproto x11 xextproto xext xf86miscproto:both
 
+WITH_FBSD10_FIX=yes
 MAN3=		XF86Misc.3 \
 		XF86MiscGetKbdSettings.3 \
 		XF86MiscGetMouseSettings.3 \
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
index 5ec77e3ad23d..90a33ccbc4e1 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -15,6 +15,7 @@ COMMENT=	DMX extension library
 XORG_CAT=	lib
 USE_XORG=	x11 xext xextproto dmxproto:both
 
+WITH_FBSD10_FIX=yes
 MAN3=		DMX.3 \
 		DMXAddInput.3 \
 		DMXAddScreen.3 \