Update new xorg server to 1.14.4.

This will break some drivers, fixes for affected drivers are forthcomming.


git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1214 058c260c-8361-11dd-a0ac-aa2bafec7d09

9 files changed, 397 insertions, 178 deletions

diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
new file mode 100644
index 0000000..464ee27
--- /dev/null
+++ b/Mk/bsd.xorg.mk
@@ -0,0 +1,357 @@
+#-*- tab-width: 4; -*-
+# ex:ts=4
+#
+# bsd.xorg.mk - Support for X.Org ports and dependencies
+#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
+#
+# !!! Here be dragons !!! (yeah, here as well...)
+#
+# $FreeBSD$
+#
+
+.if !defined(_POSTMKINCLUDED) && !defined(Xorg_Pre_Include)
+
+Xorg_Include_MAINTAINER=	x11@FreeBSD.org
+Xorg_Pre_Include=		bsd.xorg.mk
+
+# Some notes:
+#
+# app - Installs applications, no shared libraries.
+# data - Installs only data.
+# doc - no particular notes
+# driver - input depends on inputproto/randrproto at least
+#          video depends on randrproto/renderproto at least
+# font - don't install .pc file
+# lib - various dependencies, install .pc file, needs pathfix
+# proto - install .pc file, needs pathfix, most only needed at build time.
+# xserver - there's only one atm, I guess everything can fit into the port itself
+
+.if defined(XORG_CAT)
+# Default variables, common to all new modular xorg ports.
+.if !defined(USE_TGZ)
+USE_BZIP2=    	yes
+.endif
+GNU_CONFIGURE= 	yes
+DIST_SUBDIR=	xorg/${XORG_CAT}
+
+MASTER_SITES?=	${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR?=	individual/${XORG_CAT}
+
+# All xorg ports needs pkgconfig to build, but some ports look for pkgconfig and
+# then continues the build.
+USES+=		pkgconfig
+
+# All xorg ports needs xorg-macros.
+. if ${PORTNAME} != xorg-macros
+USE_XORG+=      xorg-macros
+. endif
+
+. if ${XORG_CAT} == "app"
+# Nothing at the moment
+. endif
+
+. if ${XORG_CAT} == "data"
+# Nothing at the moment.
+. endif
+
+. if ${XORG_CAT} == "driver"
+USE_XORG+=	xorg-server xproto randrproto xi renderproto xextproto \
+			inputproto kbproto fontsproto videoproto dri2proto xf86driproto \
+			glproto xineramaproto resourceproto scrnsaverproto
+# work around a llvm bug on i386, llvm bug #15806 
+# reproduced with clang 3.2 (current release) and 3.1
+.  if ${ARCH} == i386
+CFLAGS+=	-fno-optimize-sibling-calls
+.  endif
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
+. endif
+
+. if ${XORG_CAT} == "font"
+FONTDIR?=	${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
+CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/lib/X11/fonts
+CONFIGURE_ENV+=	FONTROOTDIR=${PREFIX}/lib/X11/fonts
+NEED_MKFONTFOO=	yes
+
+.  if ${PORTNAME:M*type1*}x != x
+INSTALLS_TTF?=	yes
+.  elif ${PORTNAME:M*ttf*}x != x
+INSTALLS_TTF?=	yes
+.  elif ${PORTNAME:M*encodings*}x != x
+# This is terrific, we want mkfontscale at build time, but don't use it like for the other ports.
+NEED_MKFONTFOO=	no
+BUILD_DEPENDS+=	${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+INSTALLS_TTF?=	no
+.  else
+INSTALLS_TTF?=	no
+.  endif
+
+.  if ${PORTNAME:M*font-util*}x != x
+USES+=	pathfix
+NEED_MKFONTFOO=	no
+.  elif ${INSTALLS_TTF} == "yes"
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
+.  else
+BUILD_DEPENDS+=	${LOCALBASE}/bin/bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+.  endif
+
+.  if ${NEED_MKFONTFOO} == "yes"
+BUILD_DEPENDS+=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+				${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+RUN_DEPENDS+=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+				${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+.  endif
+
+post-install:
+.  if ${INSTALLS_TTF} == "yes"
+.   for _fontdir in ${FONTDIR}
+	@${ECHO_CMD} "@exec fc-cache -s %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec fc-cache -s %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+.   endfor
+.  endif
+.  for _fontdir in ${FONTDIR}
+.   if ${NEED_MKFONTFOO} == "yes"
+	@${ECHO_CMD} "@exec mkfontscale %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec mkfontscale %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec if [ -e %D/lib/X11/fonts/${_fontdir}/fonts.scale -a \"\`stat -f '%%z' %D/lib/X11/fonts/${_fontdir}/fonts.scale 2>/dev/null\`\" = '2' ]; then rm %D/lib/X11/fonts/${_fontdir}/fonts.scale; fi" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec mkfontdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec mkfontdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec if [ -e %D/lib/X11/fonts/${_fontdir}/fonts.dir -a \"\`stat -f '%%z' %D/lib/X11/fonts/${_fontdir}/fonts.dir 2>/dev/null\`\" = '2' ]; then rm %D/lib/X11/fonts/${_fontdir}/fonts.dir; fi" >> ${TMPPLIST}
+.   endif
+	@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+.  endfor
+. endif
+
+. if ${XORG_CAT} == "lib"
+USES+=	pathfix
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS+=--enable-malloc0returnsnull
+. endif
+
+. if ${XORG_CAT} == "proto"
+USES+=	pathfix
+. endif
+
+. if ${XORG_CAT} == "xserver"
+DISTFILES?=	xorg-server-${PORTVERSION}.tar.bz2
+WRKSRC=		${WRKDIR}/xorg-server-${PORTVERSION}
+USES+=	pathfix
+CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb
+
+LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
+USE_XORG+=	pciaccess xextproto videoproto fontsproto dri2proto
+. endif
+
+.endif
+
+.endif
+
+.if exists(${LOCALBASE}/bin/X)
+XSERVER_VER!=	${LOCALBASE}/bin/X -version 2>&1 | sed -n 's;^X\.Org X Server \([^ ]*\).*;\1;p'
+.endif
+
+.if defined(_POSTMKINCLUDED) && !defined(Xorg_Post_Include)
+
+Xorg_Post_Include=		bsd.xorg.mk
+
+# Register all xorg .pc files here.
+# foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS.
+
+XORG_MODULES=	bigreqsproto \
+				compositeproto \
+				damageproto \
+				dmx \
+				dmxproto \
+				dri2proto \
+				evieproto \
+				fixesproto \
+				fontcacheproto \
+				fontenc \
+				fontsproto \
+				fontutil \
+				glproto \
+				ice \
+				inputproto \
+				kbproto \
+				libfs \
+				oldx \
+				pciaccess \
+				pixman \
+				printproto \
+				randrproto \
+				recordproto \
+				renderproto \
+				resourceproto \
+				scrnsaverproto \
+				sm \
+				trapproto \
+				videoproto \
+				x11 \
+				xau \
+				xaw \
+				xaw6 \
+				xaw7 \
+				xbitmaps \
+				xcb \
+				xcmiscproto \
+				xcomposite \
+				xcursor \
+				xdamage \
+				xdmcp \
+				xevie \
+				xext \
+				xextproto \
+				xf86bigfontproto \
+				xf86dgaproto \
+				xf86driproto \
+				xf86miscproto \
+				xf86rushproto \
+				xf86vidmodeproto \
+				xfixes \
+				xfont \
+				xfontcache \
+				xft \
+				xi \
+				xinerama \
+				xineramaproto \
+				xkbfile \
+				xkbui \
+				xmu \
+				xmuu \
+				xorg-macros \
+				xorg-server \
+				xp \
+				xpm \
+				xprintapputil \
+				xprintutil \
+				xproto \
+				xproxymngproto \
+				xrandr \
+				xrender \
+				xres \
+				xscrnsaver \
+				xt \
+				xtrans \
+				xtrap \
+				xtst \
+				xv \
+				xvmc \
+				xxf86dga \
+				xxf86misc \
+				xxf86vm
+
+bigreqsproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/bigreqsproto.pc:${PORTSDIR}/x11/bigreqsproto
+compositeproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compositeproto.pc:${PORTSDIR}/x11/compositeproto
+damageproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/damageproto.pc:${PORTSDIR}/x11/damageproto
+dmx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx
+dmxproto_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto
+dri2proto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dri2proto.pc:${PORTSDIR}/x11/dri2proto
+evieproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext
+fixesproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto
+fontcacheproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto
+fontenc_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc
+fontsproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontsproto.pc:${PORTSDIR}/x11-fonts/fontsproto
+fontutil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util
+glproto_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/glproto.pc:${PORTSDIR}/x11/glproto
+ice_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE
+inputproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/inputproto.pc:${PORTSDIR}/x11/inputproto
+kbproto_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/kbproto.pc:${PORTSDIR}/x11/kbproto
+libfs_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS
+oldx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX
+pciaccess_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pciaccess.pc:${PORTSDIR}/devel/libpciaccess
+pixman_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman
+printproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto
+randrproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto
+recordproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/recordproto.pc:${PORTSDIR}/x11/recordproto
+renderproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/renderproto.pc:${PORTSDIR}/x11/renderproto
+resourceproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/resourceproto.pc:${PORTSDIR}/x11/resourceproto
+scrnsaverproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/scrnsaverproto.pc:${PORTSDIR}/x11/scrnsaverproto
+sm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM
+trapproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/trapproto.pc:${PORTSDIR}/x11/trapproto
+videoproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/videoproto.pc:${PORTSDIR}/x11/videoproto
+x11_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11
+xau_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
+xaw_LIB_PC_DEPENDS=		${xaw7_LIB_PC_DEPENDS}
+xaw6_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xaw6.pc:${PORTSDIR}/x11-toolkits/libXaw
+xaw7_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw
+xbitmaps_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps
+xcb_LIB_PC_DEPENDS=			${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
+xcmiscproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcmiscproto.pc:${PORTSDIR}/x11/xcmiscproto
+xcomposite_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite
+xcursor_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor
+xdamage_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage
+xdmcp_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp
+xevie_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie
+xext_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext
+xextproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xextproto.pc:${PORTSDIR}/x11/xextproto
+xf86bigfontproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86bigfontproto.pc:${PORTSDIR}/x11-fonts/xf86bigfontproto
+xf86dgaproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86dgaproto.pc:${PORTSDIR}/x11/xf86dgaproto
+xf86driproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86driproto.pc:${PORTSDIR}/x11/xf86driproto
+xf86miscproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86miscproto.pc:${PORTSDIR}/x11/xf86miscproto
+xf86rushproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86rushproto.pc:${PORTSDIR}/x11/xf86rushproto
+xf86vidmodeproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86vidmodeproto.pc:${PORTSDIR}/x11/xf86vidmodeproto
+xfixes_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes
+xfont_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont
+xfontcache_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache
+xft_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft
+xi_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi
+xinerama_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama
+xineramaproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xineramaproto.pc:${PORTSDIR}/x11/xineramaproto
+xkbfile_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile
+xkbui_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui
+xmu_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu
+xmuu_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xmuu.pc:${PORTSDIR}/x11-toolkits/libXmu
+xorg-macros_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+xorg-server_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-server.pc:${PORTSDIR}/x11-servers/xorg-server
+xp_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp
+xpm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm
+xprintapputil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil
+xprintutil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil
+xproto_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
+xproxymngproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xproxymngproto.pc:${PORTSDIR}/x11/xproxymanagementprotocol
+xrandr_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr
+xrender_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender
+xres_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres
+xscrnsaver_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver
+xt_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt
+xtrans_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans
+xtrap_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap
+xtst_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst
+xv_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv
+xvmc_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC
+xxf86dga_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga
+xxf86misc_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc
+xxf86vm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm
+
+.for _module in ${USE_XORG:M*\:both:C/\:.*//g}
+. if ${XORG_MODULES:M${_module}} == ""
+IGNORE=				requires unknown xorg module (${_module})
+. endif
+RUN_DEPENDS+=			${${_module}_BUILD_DEPENDS}
+.endfor
+
+.for _module in ${USE_XORG:C/\:.*//g}
+. if ${XORG_MODULES:M${_module}} == ""
+IGNORE=				requires unknown xorg module (${_module})
+. endif
+LIB_PC_DEPENDS+=		${${_module}_LIB_PC_DEPENDS}
+BUILD_DEPENDS+=			${${_module}_BUILD_DEPENDS}
+.endfor
+
+RUN_DEPENDS+=			${LIB_PC_DEPENDS}
+BUILD_DEPENDS+=			${LIB_PC_DEPENDS}
+
+.if !target(check-latest)
+check-latest:
+	@AVAIL_VER=`fetch -qo - http://xorg.freedesktop.org/releases/individual/${XORG_CAT}/ | sed -ne 's/.*${PORTNAME}-\(.*\).tar.bz2\".*/\1/p'` && \
+		${ECHO_CMD} "Available versions for ${PORTNAME} are: $${AVAIL_VER}." && \
+		for ver in $${AVAIL_VER}; do \
+			if [ `pkg_version -t $$ver ${PORTVERSION}` = ">" ]; then \
+				${ECHO_CMD} "${PORTNAME} $$ver is newer than current version."; \
+			fi; \
+		done
+.endif
+
+.endif
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 9605431..698ef95 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -1,5 +1,5 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11-servers/xorg-server/Makefile 328762 2013-09-29 23:46:47Z zeising $
+# $FreeBSD: head/x11-servers/xorg-server/Makefile 321157 2013-06-17 21:51:48Z jkim $
 
 PORTNAME?=	xorg-server
 PORTVERSION=	${XORG_VERSION}
@@ -34,12 +34,10 @@ OPTIONS_EXCLUDE_sparc64=	HAL
 .include <bsd.port.options.mk>
 
 .if defined(WITH_NEW_XORG)
-XORG_VERSION=	1.12.4
-XORG_REVISION=	4
+XORG_VERSION=	1.14.4
+XORG_REVISION=	0
 PLIST_SUB+=	OLD="@comment " NEW=""
-EXTRA_PATCHES+=	${FILESDIR}/extra-clang \
-		${FILESDIR}/extra-configure \
-		${FILESDIR}/extra-new-dix_dixfonts.c
+EXTRA_PATCHES+=	${FILESDIR}/extra-hw_xfree86_loader_loadmod.c
 .else
 XORG_VERSION=	1.7.7
 XORG_REVISION=	11
@@ -50,7 +48,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-Xext-xace.c \
 		${FILESDIR}/extra-os-utils.c \
 		${FILESDIR}/extra-dix_events.c \
 		${FILESDIR}/extra-Xserver-hw-xfree86-common-xf86Config.c \
-		${FILESDIR}/extra-old-dix_dixfonts.c
+		${FILESDIR}/extra-dix_dixfonts.c
 .endif
 
 USE_BZIP2=	yes
@@ -107,8 +105,7 @@ CONFIGURE_ARGS+=	--enable-aiglx=no
 .endif
 
 .if ${PORT_OPTIONS:MSUID}
-CONFIGURE_ARGS+=--enable-install-setuid=no
-#CONFIGURE_ARGS+=--enable-install-setuid=yes
+CONFIGURE_ARGS+=--enable-install-setuid=yes
 PLIST_SUB+=	SUID=""
 .else
 CONFIGURE_ARGS+=--enable-install-setuid=no
@@ -197,7 +194,9 @@ post-install:
 	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
 		${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/*.so
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}//lib/xorg/modules/extensions/*.so
+.if !defined(WITH_NEW_XORG)
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/*.so
+.endif
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/multimedia/*.so
 
 .if defined(WITH_NEW_XORG)
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 7f1ac51..2854591 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,4 +1,4 @@
 SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
 SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
-SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
-SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761
+SHA256 (xorg/xserver/xorg-server-1.14.4.tar.bz2) = 608ccfaafb845f6e559884a30f946d365209172416710d687b190e9e1ff65dc3
+SIZE (xorg/xserver/xorg-server-1.14.4.tar.bz2) = 5507288
diff --git a/x11-servers/xorg-server/files/extra-clang b/x11-servers/xorg-server/files/extra-clang
deleted file mode 100644
index 7f22a52..0000000
--- a/x11-servers/xorg-server/files/extra-clang
+++ /dev/null
@@ -1,98 +0,0 @@
---- dix/events.c.orig	2012-07-09 02:32:59.000000000 +0200
-+++ dix/events.c	2012-07-22 14:34:46.000000000 +0200
-@@ -5189,7 +5189,8 @@
- InitEvents(void)
- {
-     int i;
--    QdEventPtr qe, tmp;
-+    QdEventPtr qe = NULL;
-+    QdEventPtr tmp;
- 
-     inputInfo.numDevices = 0;
-     inputInfo.devices = (DeviceIntPtr) NULL;
---- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0200
-+++ hw/xfree86/common/xf86Xinput.c	2012-07-22 14:34:46.000000000 +0200
-@@ -524,7 +524,7 @@
- MatchAttrToken(const char *attr, struct xorg_list *patterns,
-                int (*compare) (const char *attr, const char *pattern))
- {
--    const xf86MatchGroup *group;
-+    const xf86MatchGroup *group = NULL;
- 
-     /* If there are no patterns, accept the match */
-     if (xorg_list_is_empty(patterns))
---- hw/xfree86/dri2/dri2.c.orig	2012-07-09 02:32:59.000000000 +0200
-+++ hw/xfree86/dri2/dri2.c	2012-07-22 14:38:42.000000000 +0200
-@@ -239,7 +239,7 @@
- static DRI2DrawableRefPtr
- DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
- {
--    DRI2DrawableRefPtr ref;
-+    DRI2DrawableRefPtr ref = NULL;
- 
-     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
-         if (ref->id == id)
-@@ -306,7 +306,8 @@
- {
-     DRI2DrawablePtr pPriv = p;
-     DRI2ScreenPtr ds = pPriv->dri2_screen;
--    DRI2DrawableRefPtr ref, next;
-+    DRI2DrawableRefPtr ref = NULL;
-+    DRI2DrawableRefPtr next;
-     WindowPtr pWin;
-     PixmapPtr pPixmap;
-     DrawablePtr pDraw;
-@@ -587,7 +588,7 @@
- DRI2InvalidateDrawable(DrawablePtr pDraw)
- {
-     DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
--    DRI2DrawableRefPtr ref;
-+    DRI2DrawableRefPtr ref = NULL;
- 
-     if (!pPriv || !pPriv->needInvalidate)
-         return;
---- test/list.c.orig	2012-06-26 06:12:51.000000000 +0200
-+++ test/list.c	2012-07-22 14:34:46.000000000 +0200
-@@ -187,7 +187,7 @@
- {
-     struct parent parent = { 0 };
-     struct child child[3];
--    struct child *c;
-+    struct child *c = NULL;
-     int i = 0;
- 
-     xorg_list_init(&parent.children);
---- xfixes/cursor.c.orig	2012-07-06 07:17:19.000000000 +0200
-+++ xfixes/cursor.c	2012-07-22 14:34:46.000000000 +0200
-@@ -1143,7 +1143,7 @@
- barrier_find_nearest(CursorScreenPtr cs, int dir,
-                      int x1, int y1, int x2, int y2)
- {
--    struct PointerBarrierClient *c;
-+    struct PointerBarrierClient *c = NULL;
-     struct PointerBarrier *nearest = NULL;
-     double min_distance = INT_MAX;      /* can't get higher than that in X anyway */
- 
---- hw/xfree86/parser/InputClass.c.orig	2013-07-04 11:45:42.139818164 +0200
-+++ hw/xfree86/parser/InputClass.c	2013-07-04 11:46:29.034806839 +0200
-@@ -362,7 +362,8 @@
-     XF86ConfInputClassPtr prev;
- 
-     while (ptr) {
--        xf86MatchGroup *group, *next;
-+        xf86MatchGroup *group = NULL;
-+        xf86MatchGroup *next;
-         char **list;
- 
-         TestFree(ptr->identifier);
---- hw/xfree86/loader/loadmod.c.orig	2013-07-04 11:48:11.160800614 +0200
-+++ hw/xfree86/loader/loadmod.c	2013-07-04 11:48:32.000800157 +0200
-@@ -472,7 +472,7 @@
-     char **elem;
-     const char **subdirs;
-     const char **s;
--    PatternPtr patterns;
-+    PatternPtr patterns = NULL;
-     PatternPtr p;
-     DIR *d;
-     struct dirent *dp;
diff --git a/x11-servers/xorg-server/files/extra-configure b/x11-servers/xorg-server/files/extra-configure
deleted file mode 100644
index cede35b..0000000
--- a/x11-servers/xorg-server/files/extra-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2013-09-07 22:11:27.210621324 +0200
-+++ configure	2013-09-07 22:11:52.912624338 +0200
-@@ -22839,7 +22839,7 @@
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
--  ac_cv_tls=$kw
-+  ac_cv_tls=$kw; break ;
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-         done
diff --git a/x11-servers/xorg-server/files/extra-old-dix_dixfonts.c b/x11-servers/xorg-server/files/extra-dix_dixfonts.c
index 163a4ef..163a4ef 100644
--- a/x11-servers/xorg-server/files/extra-old-dix_dixfonts.c
+++ b/x11-servers/xorg-server/files/extra-dix_dixfonts.c
diff --git a/x11-servers/xorg-server/files/extra-hw_xfree86_loader_loadmod.c b/x11-servers/xorg-server/files/extra-hw_xfree86_loader_loadmod.c
new file mode 100644
index 0000000..1d769f2
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-hw_xfree86_loader_loadmod.c
@@ -0,0 +1,11 @@
+--- hw/xfree86/loader/loadmod.c.orig	2013-06-21 15:54:25.000000000 +0200
++++ hw/xfree86/loader/loadmod.c	2013-06-21 15:55:09.000000000 +0200
+@@ -490,7 +490,7 @@
+     char **elem;
+     const char **subdirs;
+     const char **s;
+-    PatternPtr patterns;
++    PatternPtr patterns = NULL;
+     PatternPtr p;
+     DIR *d;
+     struct dirent *dp;
diff --git a/x11-servers/xorg-server/files/extra-new-dix_dixfonts.c b/x11-servers/xorg-server/files/extra-new-dix_dixfonts.c
deleted file mode 100644
index d1f5674..0000000
--- a/x11-servers/xorg-server/files/extra-new-dix_dixfonts.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- dix/dixfonts.c.orig	2012-05-17 19:09:01.000000000 +0200
-+++ dix/dixfonts.c	2013-10-09 10:49:38.158284440 +0200
-@@ -1414,6 +1414,7 @@
-             GC *pGC;
-             unsigned char *data;
-             ITclosurePtr new_closure;
-+            ITclosurePtr old_closure;
- 
-             /* We're putting the client to sleep.  We need to
-                save some state.  Similar problem to that handled
-@@ -1425,12 +1426,14 @@
-                 err = BadAlloc;
-                 goto bail;
-             }
-+            old_closure = c;
-             *new_closure = *c;
-             c = new_closure;
- 
-             data = malloc(c->nChars * itemSize);
-             if (!data) {
-                 free(c);
-+                c = old_closure;
-                 err = BadAlloc;
-                 goto bail;
-             }
-@@ -1441,6 +1444,7 @@
-             if (!pGC) {
-                 free(c->data);
-                 free(c);
-+                c = old_closure;
-                 err = BadAlloc;
-                 goto bail;
-             }
-@@ -1453,6 +1457,7 @@
-                 FreeScratchGC(pGC);
-                 free(c->data);
-                 free(c);
-+                c = old_closure;
-                 err = BadAlloc;
-                 goto bail;
-             }
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index 0cb6565..704d374 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -61,6 +61,7 @@ include/xorg/geext.h
 include/xorg/geint.h
 include/xorg/globals.h
 include/xorg/glyphstr.h
+%%NEW%%include/xorg/glx_extinit.h
 include/xorg/hotplug.h
 include/xorg/i2c_def.h
 include/xorg/input.h
@@ -68,7 +69,7 @@ include/xorg/inputstr.h
 %%NEW%%include/xorg/list.h
 include/xorg/mi.h
 %%OLD%%include/xorg/mibank.h
-include/xorg/mibstore.h
+%%OLD%%include/xorg/mibstore.h
 include/xorg/micmap.h
 include/xorg/micoord.h
 include/xorg/mifillarc.h
@@ -133,9 +134,9 @@ include/xorg/vidmodeproc.h
 include/xorg/wfbrename.h
 include/xorg/window.h
 include/xorg/windowstr.h
-include/xorg/xaa.h
+%%OLD%%include/xorg/xaa.h
 %%OLD%%include/xorg/xaaWrapper.h
-include/xorg/xaalocal.h
+%%OLD%%include/xorg/xaalocal.h
 include/xorg/xaarop.h
 include/xorg/xace.h
 include/xorg/xacestr.h
@@ -165,6 +166,7 @@ include/xorg/xf86cmap.h
 include/xorg/xf86fbman.h
 include/xorg/xf86i2c.h
 include/xorg/xf86int10.h
+%%NEW%%include/xorg/xf86platformBus.h
 include/xorg/xf86sbusBus.h
 include/xorg/xf86str.h
 include/xorg/xf86xv.h
@@ -181,16 +183,16 @@ include/xorg/xorgVersion.h
 include/xorg/xserver-properties.h
 include/xorg/xvdix.h
 include/xorg/xvmcext.h
-lib/xorg/modules/extensions/libdbe.la
-lib/xorg/modules/extensions/libdbe.so
-lib/xorg/modules/extensions/libdri.la
-lib/xorg/modules/extensions/libdri.so
-lib/xorg/modules/extensions/libdri2.la
-lib/xorg/modules/extensions/libdri2.so
-lib/xorg/modules/extensions/libextmod.la
-lib/xorg/modules/extensions/libextmod.so
-lib/xorg/modules/extensions/librecord.la
-lib/xorg/modules/extensions/librecord.so
+%%OLD%%lib/xorg/modules/extensions/libdbe.la
+%%OLD%%lib/xorg/modules/extensions/libdbe.so
+%%OLD%%lib/xorg/modules/extensions/libdri.la
+%%OLD%%lib/xorg/modules/extensions/libdri.so
+%%OLD%%lib/xorg/modules/extensions/libdri2.la
+%%OLD%%lib/xorg/modules/extensions/libdri2.so
+%%OLD%%lib/xorg/modules/extensions/libextmod.la
+%%OLD%%lib/xorg/modules/extensions/libextmod.so
+%%OLD%%lib/xorg/modules/extensions/librecord.la
+%%OLD%%lib/xorg/modules/extensions/librecord.so
 lib/xorg/modules/extensions/.xorg/libglx.so
 lib/xorg/modules/libexa.la
 lib/xorg/modules/libexa.so
@@ -210,8 +212,8 @@ lib/xorg/modules/libvgahw.la
 lib/xorg/modules/libvgahw.so
 lib/xorg/modules/libwfb.la
 lib/xorg/modules/libwfb.so
-lib/xorg/modules/libxaa.la
-lib/xorg/modules/libxaa.so
+%%OLD%%lib/xorg/modules/libxaa.la
+%%OLD%%lib/xorg/modules/libxaa.so
 %%OLD%%lib/xorg/modules/libxf8_16bpp.la
 %%OLD%%lib/xorg/modules/libxf8_16bpp.so
 %%OLD%%lib/xorg/modules/linux/libfbdevhw.la
@@ -251,4 +253,4 @@ share/aclocal/xorg-server.m4
 @dirrm lib/xorg/modules
 @dirrm lib/xorg
 %%NEW%%@dirrmtry share/X11/xorg.conf.d
-@dirrmtry share/X11
+%%NEW%%@dirrmtry share/X11