author: Martin Wilke <miwi@FreeBSD.org> 2012-04-21 17:03:32 +0000
committer: Martin Wilke <miwi@FreeBSD.org> 2012-04-21 17:03:32 +0000
commit: 29e347e19709b94e2a25b8f749afaa22b4613213 (patch)
tree: 7fb1ab5c9603709eeba2da5c25166d99dc1147d6 /x11-servers
parent: 551496002207129285b709a89863af8a414819a9 (diff)
download: ports-29e347e19709b94e2a25b8f749afaa22b4613213.tar.gz
ports-29e347e19709b94e2a25b8f749afaa22b4613213.zip
20 files changed, 226 insertions, 283 deletions
diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile
index 1acc4d722b5e..d14a67957d61 100644
--- a/x11-servers/xephyr/Makefile
+++ b/x11-servers/xephyr/Makefile
@@ -6,17 +6,12 @@
 #
 
 PORTNAME=	xephyr
-PORTVERSION=	1.7.7
-CATEGORIES=	x11-servers
+PORTREVISION=	0
 
-MAINTAINER=	x11@FreeBSD.org
 COMMENT=	A kdrive based X server from X.Org
 
-XORG_CAT=	xserver
-
-LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-
-USE_GL=		gl
+MASTERDIR=	${.CURDIR}/../xorg-server
+DESCR=		${.CURDIR}/pkg-descr
 USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		dri2proto damageproto xcmiscproto xtrans inputproto \
 		xf86bigfontproto scrnsaverproto bigreqsproto \
@@ -25,32 +20,15 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		xineramaproto xinerama evieproto xkbfile xfont \
 		xau xdmcp xext fontenc xv pixman
 
-USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--enable-kdrive --enable-xephyr	--disable-dmx --disable-xvfb \
+		--without-xmlto --disable-docs --disable-devel-docs \
 		--disable-xorg --disable-xnest \
 		--localstatedir=/var --without-dtrace
 
+SLAVE_PORT=	yes
 PLIST_FILES=	bin/Xephyr
 
-OPTIONS=	HAL	"Compile with HAL config support" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_OPENSSL_BASE)
-# The reason why I use this is cause openssl from base doesn't install a .pc file
-# and configure will fail trying to find it. Setting both of those variables to
-# a *non-empty* value by-passes the pkg-config check.
-CONFIGURE_ENV=	SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
-.endif
-
-.if !defined(WITHOUT_HAL)
-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
-CONFIGURE_ARGS+=	--enable-config-hal=yes
-.else
-CONFIGURE_ARGS+=	--enable-config-hal=no
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${PREFIX}/bin/
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-servers/xephyr/distinfo b/x11-servers/xephyr/distinfo
index 86aaea93dc0b..bc91bed4cb04 100644
--- a/x11-servers/xephyr/distinfo
+++ b/x11-servers/xephyr/distinfo
@@ -1,2 +1,2 @@
-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.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
+SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index 344cdffd2c9e..aa3ebc94315f 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=	xorg-dmx
-PORTVERSION=	1.7.7
-PORTEPOCH=	1
-CATEGORIES=	x11-servers
+PORTREVISION=	0
 
-MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Distributed Multihead X from X.Org
 
-XORG_CAT=	xserver
-
-LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-
-USE_GL=		gl
+MASTERDIR=	${.CURDIR}/../xorg-server
+DESCR=		${.CURDIR}/pkg-descr
 USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		dri2proto damageproto xcmiscproto xextproto xf86miscproto \
 		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
@@ -27,31 +21,15 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
 		xau dmx xtst xres pixman xtrans
 
-USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--disable-xvfb --disable-xorg --disable-xnest \
+		--without-xmlto	--disable-docs --disable-devel-docs \
 		--enable-dmx --localstatedir=/var --without-dtrace
 
 MAN1=		Xdmx.1 dmxtodmx.1 vdltodmx.1 xdmxconfig.1
 
+SLAVE_PORT=	yes
+
 do-install:
 	cd ${WRKSRC}/hw/dmx; ${MAKE} install
 
-OPTIONS=	HAL     "Compile with HAL config support" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_OPENSSL_BASE)
-# The reason why I use this is cause openssl from base doesn't install a .pc file
-# and configure will fail trying to find it. Setting both of those variables to
-# a *non-empty* value by-passes the pkg-config check.
-CONFIGURE_ENV=	SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
-.endif
-
-.if !defined(WITHOUT_HAL)
-LIB_DEPENDS+=		hal.1:${PORTSDIR}/sysutils/hal
-CONFIGURE_ARGS+=	--enable-config-hal=yes
-.else
-CONFIGURE_ARGS+=	--enable-config-hal=no
-.endif
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo
index 86aaea93dc0b..bc91bed4cb04 100644
--- a/x11-servers/xorg-dmx/distinfo
+++ b/x11-servers/xorg-dmx/distinfo
@@ -1,2 +1,2 @@
-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.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
+SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174
diff --git a/x11-servers/xorg-dmx/pkg-plist b/x11-servers/xorg-dmx/pkg-plist
index 93ae1cd4ba07..657dfd5608de 100644
--- a/x11-servers/xorg-dmx/pkg-plist
+++ b/x11-servers/xorg-dmx/pkg-plist
@@ -1,6 +1,8 @@
 bin/Xdmx
+%%OLD%%bin/xdmx
 bin/dmxaddinput
 bin/dmxaddscreen
+%%NEW%%bin/dmxinfo
 bin/dmxreconfig
 bin/dmxresize
 bin/dmxrminput
@@ -8,5 +10,6 @@ bin/dmxrmscreen
 bin/dmxtodmx
 bin/dmxwininfo
 bin/vdltodmx
-bin/xdmx
 bin/xdmxconfig
+%%NEW%%@dirrmtry share/X11/xorg.conf.d
+%%NEW%%@dirrmtry share/X11
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index 2ecfa9441535..ef991df92b30 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=	xorg-nestserver
-PORTVERSION=	1.7.7
-PORTEPOCH=	1
-CATEGORIES=	x11-servers
+PORTREVISION=	1
 
-MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Nesting X server from X.Org
 
-XORG_CAT=	xserver
-
-LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-
-USE_GL=		gl
+MASTERDIR=	${.CURDIR}/../xorg-server
+DESCR=		${.CURDIR}/pkg-descr
 USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		damageproto xcmiscproto xextproto xf86miscproto inputproto \
 		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
@@ -26,24 +20,20 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
 		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
 
-USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg \
+		--without-xmlto --disable-docs --disable-devel-docs \
 		--localstatedir=/var --without-dtrace
 
+SLAVE_PORT=	yes
 PLIST_FILES=	bin/Xnest
 MAN1=		Xnest.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${PREFIX}/bin/
+.if defined(WITH_NEW_XORG)
+	${INSTALL_MAN} ${WRKSRC}/hw/xnest/man/Xnest.1 ${PREFIX}/man/man1/
+.else
 	${INSTALL_MAN} ${WRKSRC}/hw/xnest/Xnest.1 ${PREFIX}/man/man1/
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_OPENSSL_BASE)
-# The reason why I use this is cause openssl from base doesn't install a .pc file
-# and configure will fail trying to find it. Setting both of those variables to
-# a *non-empty* value by-passes the pkg-config check.
-CONFIGURE_ENV=	SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
 .endif
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo
index 86aaea93dc0b..bc91bed4cb04 100644
--- a/x11-servers/xorg-nestserver/distinfo
+++ b/x11-servers/xorg-nestserver/distinfo
@@ -1,2 +1,2 @@
-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.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
+SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 02fe10c85733..cb5663c7d092 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -5,25 +5,41 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xorg-server
-PORTVERSION=	1.7.7
-PORTREVISION=	3
-PORTEPOCH=	1
+PORTNAME?=	xorg-server
+PORTVERSION=	${XORG_VERSION}
+PORTREVISION?=	${XORG_REVISION}
+PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
 DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org X server and related programs
+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
+
+RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config \
+		xkbcomp:${PORTSDIR}/x11/xkbcomp
 
 XORG_CAT=	xserver
 
+.if defined(WITH_NEW_XORG)
+XORG_VERSION=	1.10.6
+XORG_REVISION=	0
+PLIST_SUB+=	OLD="@comment " NEW=""
+EXTRA_PATCHES+=	${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \
+		${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h
+.else
+XORG_VERSION=	1.7.7
+XORG_REVISION=	4
+PLIST_SUB+=	OLD="" NEW="@comment "
+EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-os-utils.c
+.endif
+
 USE_GMAKE=	yes
 USE_GL=		gl
-USE_XORG=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
+USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 		xmu xt xpm xext randrproto renderproto fixesproto damageproto \
 		dri2proto xcmiscproto xextproto xproto xtrans xf86miscproto \
 		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
@@ -34,10 +50,12 @@ USE_XORG=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 MAKE_JOBS_UNSAFE=	yes
 USE_OPENSSL=	yes
 USE_PERL5_BUILD=yes
-CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xnest \
+CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \
+		--without-xmlto --disable-docs --disable-devel-docs \
 		--localstatedir=/var --without-dtrace --disable-xephyr \
 		--enable-record=yes
 
+.if !defined(SLAVE_PORT)
 MAN1=		Xorg.1 \
 		Xserver.1 \
 		cvt.1 \
@@ -46,21 +64,26 @@ MAN4=		exa.4 \
 		fbdevhw.4
 MAN5=		xorg.conf.5
 
-NOT_FOR_ARCHS=	alpha
-
-.if !defined(ARCH)
-ARCH!=	/usr/bin/uname -p
+.if (WITH_NEW_XORG)
+MAN5+=		xorg.conf.d.5
+.endif
+.else
+# for slave ports we need to overwrite PLIST, so it doesn't overwrite
+# PLIST_FILES, with the masterport plist.
+PLIST=		${.CURDIR}/pkg-plist
 .endif
 
 OPTIONS=	AIGLX	"Compile with Accelerated Indirect GLX support" on \
 		SUID	"Install the Xorg server with setuid bit set" on
+
+.include <bsd.port.pre.mk>
+
 .if ${ARCH} == sparc64
 OPTIONS+=	HAL	"Compile with HAL config support" off
 .else
 OPTIONS+=	HAL	"Compile with HAL config support" on
 .endif
 
-.include <bsd.port.pre.mk>
 
 .if defined(WITH_OPENSSL_BASE)
 # The reason why I use this is cause openssl from base doesn't install a .pc file
@@ -88,13 +111,6 @@ CONFIGURE_ARGS+=--enable-install-setuid=yes
 CONFIGURE_ARGS+=--enable-install-setuid=no
 .endif
 
-.if ${ARCH} == alpha
-PLIST_SUB+=	ALPHA_NA="@comment "
-EXTRA_PATCHES=	${.CURDIR}/files/extra-arch-alpha
-.else
-PLIST_SUB+=	ALPHA_NA=""
-.endif
-
 .if ${ARCH} == ia64
 PLIST_SUB+=     IA64_NA="@comment "
 EXTRA_PATCHES=  ${.CURDIR}/files/extra-arch-ia64
@@ -133,4 +149,13 @@ pre-everything::
 	@${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf."
 .endif
 
+.if defined(WITH_NEW_XORG)
+post-install:
+	@${MKDIR} ${PREFIX}/share/X11/xorg.conf.d
+
+PLIST_SUB+=	OLD="@comment " NEW=""
+.else
+PLIST_SUB+=	OLD="" NEW="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 86aaea93dc0b..7e27de5b2ce5 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,2 +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.10.6.tar.bz2) = c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682
+SIZE (xorg/xserver/xorg-server-1.10.6.tar.bz2) = 5406712
diff --git a/x11-servers/xorg-server/files/extra-arch-alpha b/x11-servers/xorg-server/files/extra-arch-alpha
deleted file mode 100644
index b53d82ec034f..000000000000
--- a/x11-servers/xorg-server/files/extra-arch-alpha
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2008-01-02 12:40:11.000000000 +0000
-+++ configure	2008-01-02 12:41:09.000000000 +0000
-@@ -32222,7 +32222,7 @@
- 
- if test "x$XORG" = xyes -o "x$XGL" = xyes; then
- 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
--	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
-+	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/hw/xfree86/os-support/shared -I$(top_srcdir)/os'
- 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
- 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
- 	XORG_LIBS="$COMPOSITE_LIB $MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XPSTUBS_LIB $OS_LIB"
diff --git a/x11-servers/xorg-server/files/extra-arch-ia64 b/x11-servers/xorg-server/files/extra-arch-ia64
index f749a3b9c005..9a3f48eb2f77 100644
--- a/x11-servers/xorg-server/files/extra-arch-ia64
+++ b/x11-servers/xorg-server/files/extra-arch-ia64
@@ -32,11 +32,11 @@
   if test "x$PPC_VIDEO" = xyes; then
    PPC_VIDEO_TRUE=
    PPC_VIDEO_FALSE='#'
---- hw/xfree86/common/compiler.h.dist	2009-04-14 10:14:57.000000000 -0700
-+++ hw/xfree86/common/compiler.h	2009-06-18 16:22:46.000000000 -0700
-@@ -363,12 +363,10 @@
- #    endif
- 
+--- hw/xfree86/common/compiler.h.orig	2011-06-11 18:55:47.000000000 +0200
++++ hw/xfree86/common/compiler.h	2011-07-21 20:34:44.000000000 +0200
+@@ -397,12 +397,10 @@
+ #include <machine/pio.h>
+ #endif /* __NetBSD__ */
  
 -#   elif defined(linux) && defined(__ia64__) 
 +#   elif (defined(linux) || defined(__FreeBSD__)) && defined(__ia64__) 
@@ -45,9 +45,9 @@
  
 -#    include <sys/io.h>
 -
- struct __una_u64 { uint64_t x __attribute__((packed)); };
- struct __una_u32 { uint32_t x __attribute__((packed)); };
- struct __una_u16 { uint16_t x __attribute__((packed)); };
+ #    undef outb
+ #    undef outw
+ #    undef outl
 --- hw/xfree86/os-support/bsd/Makefile.in.dist	2009-06-18 17:45:13.000000000 -0700
 +++ hw/xfree86/os-support/bsd/Makefile.in	2009-06-18 17:45:19.000000000 -0700
 @@ -63,6 +63,7 @@
diff --git a/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h b/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
new file mode 100644
index 000000000000..612a7b0dc98b
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
@@ -0,0 +1,54 @@
+--- hw/dmx/glxProxy/compsize.h.orig	2012-03-15 11:14:45.000000000 +0100
++++ hw/dmx/glxProxy/compsize.h	2012-03-15 11:14:38.000000000 +0100
+@@ -0,0 +1,51 @@
++/*
++ * Copyright 2011 Apple Inc.
++ *
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation on the rights to use, copy, modify, merge,
++ * publish, distribute, sublicense, and/or sell copies of the Software,
++ * and to permit persons to whom the Software is furnished to do so,
++ * subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the
++ * next paragraph) shall be included in all copies or substantial
++ * portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
++ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
++ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++ * SOFTWARE.
++ */
++
++#ifndef __compsize_h__
++#define __compsize_h__
++
++extern GLint __glColorTableParameterfv_size(GLenum pname);
++extern GLint __glColorTableParameteriv_size(GLenum pname);
++extern GLint __glConvolutionParameterfv_size(GLenum pname);
++extern GLint __glConvolutionParameteriv_size(GLenum pname);
++extern GLint __glFogfv_size(GLenum pname);
++extern GLint __glFogiv_size(GLenum pname);
++extern GLint __glLightModelfv_size(GLenum pname);
++extern GLint __glLightModeliv_size(GLenum pname);
++extern GLint __glLightfv_size(GLenum pname);
++extern GLint __glLightiv_size(GLenum pname);
++extern GLint __glMaterialfv_size(GLenum pname);
++extern GLint __glMaterialiv_size(GLenum pname);
++extern GLint __glTexEnvfv_size(GLenum e);
++extern GLint __glTexEnviv_size(GLenum e);
++extern GLint __glTexGendv_size(GLenum e);
++extern GLint __glTexGenfv_size(GLenum e);
++extern GLint __glTexGeniv_size(GLenum e);
++extern GLint __glTexParameterfv_size(GLenum e);
++extern GLint __glTexParameteriv_size(GLenum e);
++
++#endif /* !__compsize_h__ */
diff --git a/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h b/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
new file mode 100644
index 000000000000..b75028b6745c
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
@@ -0,0 +1,40 @@
+--- hw/dmx/glxProxy/glxcmds.h.orig	2012-03-15 11:31:45.000000000 +0100
++++ hw/dmx/glxProxy/glxcmds.h	2012-03-15 11:31:11.000000000 +0100
+@@ -0,0 +1,37 @@
++/*
++ * Copyright 2011 Apple Inc.
++ *
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation on the rights to use, copy, modify, merge,
++ * publish, distribute, sublicense, and/or sell copies of the Software,
++ * and to permit persons to whom the Software is furnished to do so,
++ * subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the
++ * next paragraph) shall be included in all copies or substantial
++ * portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
++ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
++ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++ * SOFTWARE.
++ */
++
++#ifndef __GLX_cmds_h__
++#define __GLX_cmds_h__
++
++extern int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc);
++extern int __glXCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
++extern int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc);
++extern int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc);
++extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc);
++
++#endif /* !__GLX_cmds_h__ */
diff --git a/x11-servers/xorg-server/files/extra-include_eventstr.h b/x11-servers/xorg-server/files/extra-include_eventstr.h
new file mode 100644
index 000000000000..e39aadd16be6
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-include_eventstr.h
@@ -0,0 +1,14 @@
+--- include/eventstr.h.orig	2012-02-05 19:23:06.000000000 +0100
++++ include/eventstr.h	2012-02-05 19:23:35.000000000 +0100
+@@ -91,9 +91,9 @@
+         uint32_t button;  /**< Button number */
+         uint32_t key;     /**< Key code */
+     } detail;
+-    uint16_t root_x;      /**< Pos relative to root window in integral data */
++    int16_t root_x;      /**< Pos relative to root window in integral data */
+     float root_x_frac;    /**< Pos relative to root window in frac part */
+-    uint16_t root_y;      /**< Pos relative to root window in integral part */
++    int16_t root_y;      /**< Pos relative to root window in integral part */
+     float root_y_frac;    /**< Pos relative to root window in frac part */
+     uint8_t    buttons[(MAX_BUTTONS + 7)/8]; /**< Button mask */
+     struct {
diff --git a/x11-servers/xorg-server/files/patch-os-utils.c b/x11-servers/xorg-server/files/extra-patch-os-utils.c
index 3fe8530231e9..2980ded6fd7d 100644
--- a/x11-servers/xorg-server/files/patch-os-utils.c
+++ b/x11-servers/xorg-server/files/extra-patch-os-utils.c
@@ -17,16 +17,4 @@
 +      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
        if (lfd < 0) {
          unlink(tmp);
-         FatalError("Can't read lock file %s\n", LockFile);
-@@ -436,7 +436,11 @@
- 
- #ifdef MONOTONIC_CLOCK
-     struct timespec tp;
-+#if defined(__FreeBSD__) && defined(CLOCK_MONOTONIC_FAST)
-+    if (clock_gettime(CLOCK_MONOTONIC_FAST, &tp) == 0)
-+#else
-     if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
-+#endif
-         return (tp.tv_sec * 1000) + (tp.tv_nsec / 1000000L);
- #endif
- 
+         FatalError("Can't read lock file %s\n", LockFile); 
diff --git a/x11-servers/xorg-server/files/patch-dix-events.c b/x11-servers/xorg-server/files/patch-dix-events.c
deleted file mode 100644
index cda3c50eff25..000000000000
--- a/x11-servers/xorg-server/files/patch-dix-events.c
+++ /dev/null
@@ -1,89 +0,0 @@
---- dix/events.c
-+++ dix/events.c
-@@ -3420,7 +3420,6 @@ CheckPassiveGrabsOnWindow(
-     {
- 	DeviceIntPtr	gdev;
- 	XkbSrvInfoPtr	xkbi = NULL;
--	Mask		mask = 0;
- 
- 	gdev= grab->modifierDevice;
-         if (grab->grabtype == GRABTYPE_CORE)
-@@ -3535,9 +3534,6 @@ CheckPassiveGrabsOnWindow(
-                 }
-                 xE = &core;
-                 count = 1;
--                mask = grab->eventMask;
--                if (grab->ownerEvents)
--                    mask |= pWin->eventMask;
-             } else if (match & XI2_MATCH)
-             {
-                 rc = EventToXI2((InternalEvent*)event, &xE);
-@@ -3549,34 +3545,6 @@ CheckPassiveGrabsOnWindow(
-                     continue;
-                 }
-                 count = 1;
--
--                /* FIXME: EventToXI2 returns NULL for enter events, so
--                 * dereferencing the event is bad. Internal event types are
--                 * aligned with core events, so the else clause is valid.
--                 * long-term we should use internal events for enter/focus
--                 * as well */
--                if (xE)
--                    mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
--                else if (event->type == XI_Enter || event->type == XI_FocusIn)
--                    mask = grab->xi2mask[device->id][event->type/8];
--
--                if (grab->ownerEvents && wOtherInputMasks(grab->window))
--                {
--                    InputClientsPtr icp =
--                        wOtherInputMasks(grab->window)->inputClients;
--
--                    while(icp)
--                    {
--                        if (rClient(icp) == rClient(grab))
--                        {
--                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
--                            mask |= icp->xi2mask[device->id][evtype/8];
--                            break;
--                        }
--
--                        icp = icp->next;
--                    }
--                }
-             } else
-             {
-                 rc = EventToXI((InternalEvent*)event, &xE, &count);
-@@ -3587,23 +3555,6 @@ CheckPassiveGrabsOnWindow(
-                                 "(%d, %d).\n", device->name, event->type, rc);
-                     continue;
-                 }
--                mask = grab->eventMask;
--                if (grab->ownerEvents && wOtherInputMasks(grab->window))
--                {
--                    InputClientsPtr icp =
--                        wOtherInputMasks(grab->window)->inputClients;
--
--                    while(icp)
--                    {
--                        if (rClient(icp) == rClient(grab))
--                        {
--                            mask |= icp->mask[device->id];
--                            break;
--                        }
--
--                        icp = icp->next;
--                    }
--                }
-             }
- 
- 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
-@@ -3612,7 +3563,8 @@ CheckPassiveGrabsOnWindow(
-             {
-                 FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
- 
--                TryClientEvents(rClient(grab), device, xE, count, mask,
-+                TryClientEvents(rClient(grab), device, xE, count,
-+                                       GetEventFilter(device, xE),
-                                        GetEventFilter(device, xE), grab);
-             }
- 
diff --git a/x11-servers/xorg-server/files/patch-exa__exa_accel.c b/x11-servers/xorg-server/files/patch-exa__exa_accel.c
deleted file mode 100644
index 83f04ee754f4..000000000000
--- a/x11-servers/xorg-server/files/patch-exa__exa_accel.c
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/exa/exa_accel.c b/exa/exa_accel.c
-index 6c677c7..b4c0f83 100644
---- exa/exa_accel.c
-+++ exa/exa_accel.c
-@@ -1057,6 +1057,8 @@ exaFillRegionSolid (DrawablePtr	pDrawable, RegionPtr pRegion, Pixel pixel,
- 		*(CARD16*)pExaPixmap->sys_ptr = pixel;
- 		break;
- 	    case 8:
-+	    case 4:
-+	    case 1:
- 		*(CARD8*)pExaPixmap->sys_ptr = pixel;
- 	    }
- 
-diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
-index a078cc1..855146b 100644
---- exa/exa_unaccel.c
-+++ exa/exa_unaccel.c
-@@ -748,6 +757,8 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap)
- 	    return pixel;
- 	}
-     case 8:
-+    case 4:
-+    case 1:
- 	{
- 	    CARD8 pixel;
- 
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index bfce700b066b..29e90c810158 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -6,10 +6,12 @@ include/xorg/BT.h
 include/xorg/IBM.h
 include/xorg/TI.h
 include/xorg/XIstubs.h
-include/xorg/bstore.h
-include/xorg/bstorestr.h
+%%NEW%%include/xorg/Xprintf.h
 include/xorg/bt829.h
-include/xorg/cfb8_16.h
+%%OLD%%include/xorg/bstore.h
+%%OLD%%include/xorg/bstorestr.h
+%%NEW%%include/xorg/callback.h
+%%OLD%%include/xorg/cfb8_16.h
 include/xorg/closestr.h
 include/xorg/closure.h
 include/xorg/colormap.h
@@ -56,8 +58,9 @@ include/xorg/hotplug.h
 include/xorg/i2c_def.h
 include/xorg/input.h
 include/xorg/inputstr.h
+%%NEW%%include/xorg/list.h
 include/xorg/mi.h
-include/xorg/mibank.h
+%%OLD%%include/xorg/mibank.h
 include/xorg/mibstore.h
 include/xorg/micmap.h
 include/xorg/micoord.h
@@ -72,6 +75,8 @@ include/xorg/misc.h
 include/xorg/miscstruct.h
 include/xorg/mispans.h
 include/xorg/mistruct.h
+%%NEW%%include/xorg/misync.h
+%%NEW%%include/xorg/misyncstr.h
 include/xorg/miwideline.h
 include/xorg/mizerarc.h
 include/xorg/mioverlay.h
@@ -89,10 +94,10 @@ include/xorg/property.h
 include/xorg/propertyst.h
 include/xorg/ptrveloc.h
 include/xorg/randrstr.h
+%%OLD%%include/xorg/renderedge.h
 include/xorg/region.h
 include/xorg/regionstr.h
 include/xorg/registry.h
-include/xorg/renderedge.h
 include/xorg/resource.h
 include/xorg/rgb.h
 include/xorg/rrtransform.h
@@ -107,6 +112,7 @@ include/xorg/shmint.h
 include/xorg/site.h
 include/xorg/swaprep.h
 include/xorg/swapreq.h
+%%NEW%%include/xorg/syncsdk.h
 include/xorg/tda8425.h
 include/xorg/tda9850.h
 include/xorg/tda9885.h
@@ -120,7 +126,7 @@ include/xorg/wfbrename.h
 include/xorg/window.h
 include/xorg/windowstr.h
 include/xorg/xaa.h
-include/xorg/xaaWrapper.h
+%%OLD%%include/xorg/xaaWrapper.h
 include/xorg/xaalocal.h
 include/xorg/xaarop.h
 include/xorg/xace.h
@@ -182,6 +188,8 @@ lib/xorg/modules/libexa.la
 lib/xorg/modules/libexa.so
 lib/xorg/modules/libfb.la
 lib/xorg/modules/libfb.so
+%%NEW%%lib/xorg/modules/libfbdevhw.so
+%%NEW%%lib/xorg/modules/libfbdevhw.la
 lib/xorg/modules/libint10.la
 lib/xorg/modules/libint10.so
 lib/xorg/modules/libshadow.la
@@ -196,10 +204,10 @@ lib/xorg/modules/libwfb.la
 lib/xorg/modules/libwfb.so
 lib/xorg/modules/libxaa.la
 lib/xorg/modules/libxaa.so
-lib/xorg/modules/libxf8_16bpp.la
-lib/xorg/modules/libxf8_16bpp.so
-lib/xorg/modules/linux/libfbdevhw.la
-lib/xorg/modules/linux/libfbdevhw.so
+%%OLD%%lib/xorg/modules/libxf8_16bpp.la
+%%OLD%%lib/xorg/modules/libxf8_16bpp.so
+%%OLD%%lib/xorg/modules/linux/libfbdevhw.la
+%%OLD%%lib/xorg/modules/linux/libfbdevhw.so
 lib/xorg/modules/multimedia/bt829_drv.la
 lib/xorg/modules/multimedia/bt829_drv.so
 lib/xorg/modules/multimedia/fi1236_drv.la
@@ -217,10 +225,12 @@ lib/xorg/modules/multimedia/uda1380_drv.so
 lib/xorg/protocol.txt
 libdata/pkgconfig/xorg-server.pc
 share/aclocal/xorg-server.m4
+%%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
+%%NEW%%@dirrm share/doc/xorg-server
 @dirrm include/xorg
 @dirrm lib/xorg/modules/extensions
-@dirrm lib/xorg/modules/linux
 @dirrm lib/xorg/modules/multimedia
+%%OLD%%@dirrm lib/xorg/modules/linux
 @dirrm lib/xorg/modules
 @dirrm lib/xorg
 @dirrmtry include/X11/bitmaps
@@ -230,5 +240,6 @@ share/aclocal/xorg-server.m4
 @dirrmtry lib/X11/xserver
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
+%%NEW%%@dirrmtry share/X11/xorg.conf.d
 @dirrmtry share/X11/app-defaults
 @dirrmtry share/X11
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index 4f3a47280cd3..3f4bd301e232 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=	xorg-vfbserver
-PORTVERSION=	1.7.7
-PORTEPOCH=	1
-CATEGORIES=	x11-servers
+PORTREVISION=	1
 
-MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X virtual framebuffer server from X.Org
 
-XORG_CAT=	xserver
-
-LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-
-USE_GL=		gl
+MASTERDIR=	${.CURDIR}/../xorg-server
+DESCR=		${.CURDIR}/pkg-descr
 USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		damageproto xcmiscproto xextproto xf86miscproto inputproto \
 		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
@@ -26,23 +20,15 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		xineramaproto xinerama evieproto xkbfile xfont fontenc \
 		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
 
-USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--disable-dmx --disable-xnest --disable-xorg \
+		--without-xmlto --disable-docs --disable-devel-docs \
 		--localstatedir=/var --without-dtrace
 
+SLAVE_PORT=	yes
 PLIST_FILES=	bin/Xvfb
 MAN1=		Xvfb.1
 
 do-install:
 	cd ${WRKSRC}/hw/vfb; ${MAKE} install
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_OPENSSL_BASE)
-# The reason why I use this is cause openssl from base doesn't install a .pc file
-# and configure will fail trying to find it. Setting both of those variables to
-# a *non-empty* value by-passes the pkg-config check.
-CONFIGURE_ENV=	SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
-.endif
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo
index 86aaea93dc0b..bc91bed4cb04 100644
--- a/x11-servers/xorg-vfbserver/distinfo
+++ b/x11-servers/xorg-vfbserver/distinfo
@@ -1,2 +1,2 @@
-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.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
+SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174
author	Martin Wilke <miwi@FreeBSD.org>	2012-04-21 17:03:32 +0000
committer	Martin Wilke <miwi@FreeBSD.org>	2012-04-21 17:03:32 +0000
commit	29e347e19709b94e2a25b8f749afaa22b4613213 (patch)
tree	7fb1ab5c9603709eeba2da5c25166d99dc1147d6 /x11-servers
parent	551496002207129285b709a89863af8a414819a9 (diff)
download	ports-29e347e19709b94e2a25b8f749afaa22b4613213.tar.gz ports-29e347e19709b94e2a25b8f749afaa22b4613213.zip