ports/175776: patching x11-servers/xorg-server fails

[Tsurutani Naoki]

>Number:         175776
>Category:       ports
>Synopsis:       patching x11-servers/xorg-server fails
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 02 00:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Tsurutani Naoki
>Release:        FreeBSD 8.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD h120.65.226.10.32118.vlan.kuins.net 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #25: Mon Jan 24 10:37:18 JST 2011 turutani at h120.65.226.10.32118.vlan.kuins.net:/usr/local/work/usr/obj/usr/src/sys/POLYMER i386


	
>Description:
	building x11-servers/xorg-server fails, while patching;
	applying files/extra-new-arch-i386 fails.
	this file is used only for new X server, as I guess. is it right ?
	
>How-To-Repeat:
	
>Fix:
	here is a patch to above patch file:

--- files/extra-new-arch-i386.orig	2013-02-02 09:22:22.000000000 +0900
+++ files/extra-new-arch-i386	2013-02-02 09:07:02.000000000 +0900
@@ -1,11 +1,11 @@
---- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
-+++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
-@@ -1355,7 +1355,7 @@
+--- hw/xfree86/common/compiler.h.orig	2011-06-12 01:55:47.000000000 +0900
++++ hw/xfree86/common/compiler.h	2013-02-02 09:05:11.000000000 +0900
+@@ -1371,7 +1371,7 @@
  
- #if !defined(__SUNPRO_C)
- #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
--#ifdef GCCUSESGAS
-+#if defined(GCCUSESGAS) || defined(__clang__)
+ #    if !defined(__SUNPRO_C)
+ #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
+-#     ifdef GCCUSESGAS
++#    if defined(GCCUSESGAS) || defined(__clang__)
  
  /*
   * If gcc uses gas rather than the native assembler, the syntax of these
>Release-Note:
>Audit-Trail:
>Unformatted: