Update to 1.10.3.

Remove alpha support.
Regen ia64 patch.


git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-dev@269 058c260c-8361-11dd-a0ac-aa2bafec7d09

5 files changed, 21 insertions, 37 deletions

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 51538df..39b6197 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-server
-PORTVERSION=	1.9.5
+PORTVERSION=	1.10.3
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
@@ -44,7 +44,7 @@ MAN1=		Xorg.1 \
 		gtf.1
 MAN4=		exa.4 \
 		fbdevhw.4
-MAN5=		xorg.conf.5
+MAN5=		xorg.conf.5 xorg.conf.d.5
 
 NOT_FOR_ARCHS=	alpha
 
@@ -88,13 +88,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 +126,7 @@ pre-everything::
 	@${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf."
 .endif
 
+post-install:
+	@${MKDIR} ${PREFIX}/share/X11/xorg.conf.d
+
 .include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 720acd9..6f061ee 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/xserver/xorg-server-1.9.5.tar.bz2) = 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc
-SIZE (xorg/xserver/xorg-server-1.9.5.tar.bz2) = 5172054
+SHA256 (xorg/xserver/xorg-server-1.10.3.tar.bz2) = 05ec05fbc8ec336127071db38cfb61c618e43b720edbd8d51d171c0cd359e290
+SIZE (xorg/xserver/xorg-server-1.10.3.tar.bz2) = 5338354
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 b53d82e..0000000
--- 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 f749a3b..9a3f48e 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/pkg-plist b/x11-servers/xorg-server/pkg-plist
index 3bb750e..f85022e 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -6,11 +6,9 @@ include/xorg/BT.h
 include/xorg/IBM.h
 include/xorg/TI.h
 include/xorg/XIstubs.h
-include/xorg/bstore.h
-include/xorg/bstorestr.h
+include/xorg/Xprintf.h
 include/xorg/bt829.h
 include/xorg/callback.h
-include/xorg/cfb8_16.h
 include/xorg/closestr.h
 include/xorg/closure.h
 include/xorg/colormap.h
@@ -73,6 +71,8 @@ include/xorg/misc.h
 include/xorg/miscstruct.h
 include/xorg/mispans.h
 include/xorg/mistruct.h
+include/xorg/misync.h
+include/xorg/misyncstr.h
 include/xorg/miwideline.h
 include/xorg/mizerarc.h
 include/xorg/mioverlay.h
@@ -93,7 +93,6 @@ include/xorg/randrstr.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
@@ -108,6 +107,7 @@ include/xorg/shmint.h
 include/xorg/site.h
 include/xorg/swaprep.h
 include/xorg/swapreq.h
+include/xorg/syncsdk.h
 include/xorg/tda8425.h
 include/xorg/tda9850.h
 include/xorg/tda9885.h
@@ -121,7 +121,6 @@ include/xorg/wfbrename.h
 include/xorg/window.h
 include/xorg/windowstr.h
 include/xorg/xaa.h
-include/xorg/xaaWrapper.h
 include/xorg/xaalocal.h
 include/xorg/xaarop.h
 include/xorg/xace.h
@@ -199,8 +198,6 @@ 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/multimedia/bt829_drv.la
 lib/xorg/modules/multimedia/bt829_drv.so
 lib/xorg/modules/multimedia/fi1236_drv.la
@@ -218,6 +215,7 @@ lib/xorg/modules/multimedia/uda1380_drv.so
 lib/xorg/protocol.txt
 libdata/pkgconfig/xorg-server.pc
 share/aclocal/xorg-server.m4
+@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
 @dirrm share/doc/xorg-server
 @dirrm include/xorg
 @dirrm lib/xorg/modules/extensions
@@ -231,5 +229,6 @@ share/aclocal/xorg-server.m4
 @dirrmtry lib/X11/xserver
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
+@dirrmtry share/X11/xorg.conf.d
 @dirrmtry share/X11/app-defaults
 @dirrmtry share/X11