Index: Mk/bsd.xorg.mk
===================================================================
--- Mk/bsd.xorg.mk
+++ Mk/bsd.xorg.mk
@@ -46,7 +46,7 @@
 
 # All xorg ports needs xorg-macros.
 . if ${PORTNAME} != xorg-macros
-USE_XORG+=      xorg-macros
+USE_XORG+=	xorg-macros
 . endif
 
 . if ${XORG_CAT} == "app"
@@ -58,11 +58,12 @@
 . endif
 
 . if ${XORG_CAT} == "driver"
-USE_XORG+=	xorg-server xproto randrproto xi renderproto xextproto \
-		inputproto kbproto fontsproto videoproto dri2proto dri3proto \
-		xf86driproto presentproto glproto xineramaproto resourceproto \
-		scrnsaverproto
+USE_XORG+=	dri2proto dri3proto fontsproto glproto inputproto kbproto \
+			presentproto randrproto renderproto resourceproto \
+			scrnsaverproto videoproto xextproto xf86driproto xi \
+			xineramaproto xorg-server xproto
 CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
+CFLAGS+=	-Werror=uninitialized
 USES+=		libtool
 INSTALL_TARGET=	install-strip
 . endif
@@ -81,8 +82,9 @@
 .  endif
 
 . if ${XORG_CAT} == "lib"
-USES+=		pathfix libtool
+USES+=			libtool pathfix
 USE_LDCONFIG=	yes
+CFLAGS+=		-Werror=uninitialized
 CONFIGURE_ARGS+=--enable-malloc0returnsnull
 . endif
 
@@ -93,10 +95,10 @@
 . if ${XORG_CAT} == "xserver"
 DISTFILES?=	xorg-server-${PORTVERSION}.tar.bz2
 WRKSRC=		${WRKDIR}/xorg-server-${PORTVERSION}
-USES+=	pathfix
+USES+=		libtool pathfix
+CFLAGS+=	-Werror=uninitialized
 CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb \
 					--with-fontrootdir=${LOCALBASE}/share/fonts
-
 LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/dri
 USE_XORG+=	fontutil:build
 . endif
@@ -112,7 +114,7 @@
 # Register all xorg .pc files here.
 # foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS.
 
-XORG_MODULES=			bigreqsproto \
+XORG_MODULES=	bigreqsproto \
 				compositeproto \
 				damageproto \
 				dmx \