5 files changed, 21 insertions, 30 deletions

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 91c273b73784..991654fd1df0 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xorg-server
-PORTVERSION=	1.6.5
-PORTREVISION=	1
+PORTVERSION=	1.7.5
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
@@ -24,6 +23,7 @@ CONFLICTS=	XFree86-Server-*
 
 XORG_CAT=	xserver
 
+USE_GMAKE=	yes
 USE_GL=		gl
 USE_XORG=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 		xmu xt xpm xext randrproto renderproto fixesproto damageproto \
@@ -33,6 +33,7 @@ USE_XORG=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 		videoproto compositeproto trapproto recordproto xineramaproto \
 		xinerama evieproto xfont fontenc xkbui pixman pciaccess
 
+MAKE_JOBS_UNSAFE=	yes
 USE_OPENSSL=	yes
 USE_PERL5_BUILD=yes
 CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xnest \
@@ -135,4 +136,8 @@ pre-everything::
 	@${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf."
 .endif
 
+.if ${OSVERSION} < 700000
+USE_GCC=	4.2+
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 2fd20cdab2a0..d31dc3f6420d 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.6.5.tar.bz2) = eba3748a1f49cec25e058a139bd75a53
-SHA256 (xorg/xserver/xorg-server-1.6.5.tar.bz2) = f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
-SIZE (xorg/xserver/xorg-server-1.6.5.tar.bz2) = 4678406
+MD5 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 2856130aebf56e3df7b7d9be419bfb28
+SHA256 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
+SIZE (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 4926990
diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-compiler.h b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-compiler.h
deleted file mode 100644
index 750ed01f1c59..000000000000
--- a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-compiler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- hw/xfree86/common/compiler.h.orig	2009-02-25 13:12:11.000000000 -0600
-+++ hw/xfree86/common/compiler.h	2009-03-21 02:08:22.000000000 -0500
-@@ -465,7 +465,7 @@
- extern unsigned int inw(unsigned long port);
- extern unsigned int inl(unsigned long port);
-  
--#   elif defined(linux) && defined(__amd64__)
-+#   elif defined(linux) || defined(__FreeBSD__) && defined(__amd64__)
-  
- #    include <inttypes.h>
- 
diff --git a/x11-servers/xorg-server/files/patch-render.c b/x11-servers/xorg-server/files/patch-render.c
deleted file mode 100644
index 17f8b144b1a7..000000000000
--- a/x11-servers/xorg-server/files/patch-render.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- render/render.c.orig	Mon May 29 09:43:15 2006
-+++ render/render.c	Mon May 29 09:45:02 2006
-@@ -1340,7 +1340,7 @@
- 	{
- 	    if (buffer + sizeof (GlyphSet) < end)
- 	    {
--                memcpy(&gs, buffer, sizeof(GlyphSet));
-+		gs = *(CARD32 *) buffer;
- 		glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client,
- 								 gs,
- 								 GlyphSetType,
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index a3c972d26027..bfce700b066b 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -15,6 +15,7 @@ include/xorg/closure.h
 include/xorg/colormap.h
 include/xorg/colormapst.h
 include/xorg/compiler.h
+include/xorg/compositeext.h
 include/xorg/cursor.h
 include/xorg/cursorstr.h
 include/xorg/damage.h
@@ -33,6 +34,7 @@ include/xorg/dri2.h
 include/xorg/dristruct.h
 include/xorg/edid.h
 include/xorg/exa.h
+include/xorg/events.h
 include/xorg/exevents.h
 include/xorg/extension.h
 include/xorg/extinit.h
@@ -42,6 +44,7 @@ include/xorg/fbdevhw.h
 include/xorg/fboverlay.h
 include/xorg/fbrop.h
 include/xorg/fi1236.h
+include/xorg/fbpict.h
 include/xorg/fourcc.h
 include/xorg/gc.h
 include/xorg/gcstruct.h
@@ -71,9 +74,12 @@ include/xorg/mispans.h
 include/xorg/mistruct.h
 include/xorg/miwideline.h
 include/xorg/mizerarc.h
+include/xorg/mioverlay.h
 include/xorg/msp3430.h
 include/xorg/opaque.h
 include/xorg/os.h
+include/xorg/panoramiXsrv.h
+include/xorg/panoramiX.h
 include/xorg/picture.h
 include/xorg/picturestr.h
 include/xorg/pixmap.h
@@ -109,6 +115,7 @@ include/xorg/validate.h
 include/xorg/vbe.h
 include/xorg/vbeModes.h
 include/xorg/vgaHW.h
+include/xorg/vidmodeproc.h
 include/xorg/wfbrename.h
 include/xorg/window.h
 include/xorg/windowstr.h
@@ -116,6 +123,8 @@ include/xorg/xaa.h
 include/xorg/xaaWrapper.h
 include/xorg/xaalocal.h
 include/xorg/xaarop.h
+include/xorg/xace.h
+include/xorg/xacestr.h
 include/xorg/xf86.h
 include/xorg/xf86Crtc.h
 include/xorg/xf86Cursor.h
@@ -129,15 +138,14 @@ include/xorg/xf86Pci.h
 include/xorg/xf86PciInfo.h
 include/xorg/xf86Priv.h
 include/xorg/xf86Privstr.h
-include/xorg/xf86RAC.h
 include/xorg/xf86RandR12.h
 include/xorg/xf86RamDac.h
 include/xorg/xf86Rename.h
-include/xorg/xf86Resources.h
 %%SPARC64%%include/xorg/xf86Sbus.h
 include/xorg/xf86Xinput.h
 include/xorg/xf86_OSlib.h
 include/xorg/xf86_OSproc.h
+include/xorg/xf86VGAarbiter.h
 include/xorg/xf86cmap.h
 include/xorg/xf86fbman.h
 include/xorg/xf86i2c.h
@@ -147,6 +155,7 @@ include/xorg/xf86str.h
 include/xorg/xf86xv.h
 include/xorg/xf86xvmc.h
 include/xorg/xf86xvpriv.h
+include/xorg/xfixes.h
 include/xorg/xisb.h
 include/xorg/xkbfile.h
 include/xorg/xkbrules.h
@@ -157,7 +166,6 @@ include/xorg/xorgVersion.h
 include/xorg/xserver-properties.h
 include/xorg/xvdix.h
 include/xorg/xvmcext.h
-lib/X11/Options
 lib/xorg/modules/extensions/libdbe.la
 lib/xorg/modules/extensions/libdbe.so
 lib/xorg/modules/extensions/libdri.la