Don't drop -fno-strict-aliasing on NetBSD/!i386. Fixes PR 34099.

Bump revision of xorg-imake and xorg-libs.

6 files changed, 46 insertions, 10 deletions

diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile
index 52edb46a820..9ea25277d1e 100644
--- a/x11/xorg-imake/Makefile
+++ b/x11/xorg-imake/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2006/07/17 17:06:59 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/07/31 16:39:42 joerg Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-imake-${XORG_VER}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
 DISTFILES=	X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src3.tar.gz
diff --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo
index 03b2faa83de..3a300338e59 100644
--- a/x11/xorg-imake/distinfo
+++ b/x11/xorg-imake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2006/06/12 00:36:25 joerg Exp $
+$NetBSD: distinfo,v 1.21 2006/07/31 16:39:42 joerg Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -8,7 +8,7 @@ RMD160 (X11R6.9.0-src3.tar.gz) = 1a2d1855f7b204012627a6c6bf0eaf5245fff414
 Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes
 SHA1 (patch-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322
 SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
-SHA1 (patch-ac) = edd7ae5601783d65bec21b5aaed3fd879bc0ed99
+SHA1 (patch-ac) = 9df1808bf84dbb78130287d69d619ca4359d3f47
 SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
 SHA1 (patch-ae) = 33233761a745b4c62cf64855a5d9c196cd679cf2
 SHA1 (patch-ag) = 79d826e9d8d4a05f250378814d47f0383ab2eafe
diff --git a/x11/xorg-imake/patches/patch-ac b/x11/xorg-imake/patches/patch-ac
index c445113ae29..ddc3ac22ad4 100644
--- a/x11/xorg-imake/patches/patch-ac
+++ b/x11/xorg-imake/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2006/04/28 21:52:19 joerg Exp $
+$NetBSD: patch-ac,v 1.8 2006/07/31 16:39:42 joerg Exp $
 
 --- config/cf/NetBSD.cf.in.orig	2005-11-30 06:20:06.000000000 +0100
 +++ config/cf/NetBSD.cf.in
@@ -38,6 +38,15 @@ $NetBSD: patch-ac,v 1.7 2006/04/28 21:52:19 joerg Exp $
  #  ifndef DoLoadableServer
  #  define DoLoadableServer	YES
  #  endif
+@@ -231,7 +231,7 @@ XCOMM operating system:  OSName (OSMajor
+ #  define ServerExtraSysLibs	-li386
+ # endif
+ #else
+-# define OptimizedCDebugFlags 	-O2
++# define OptimizedCDebugFlags 	-O2 GccAliasingArgs
+ # if defined(SparcArchitecture)
+ #  define ServerOSDefines 	-DDDXOSINIT
+ # elif defined(AlphaArchitecture)
 @@ -284,6 +284,8 @@ XCOMM operating system:  OSName (OSMajor
  #  ifndef XFree86ConsoleDefines
  #    define XFree86ConsoleDefines	-DWSCONS_SUPPORT
@@ -67,3 +76,12 @@ $NetBSD: patch-ac,v 1.7 2006/04/28 21:52:19 joerg Exp $
  # include <xorg.cf>
  #endif
  
+@@ -651,7 +664,7 @@ sed 's/\.[0-9]*$$//'`
+  */
+ #ifdef PpcArchitecture
+ 
+-# define OptimizedCDebugFlags 	-O2
++# define OptimizedCDebugFlags 	-O2 GccAliasingArgs
+ # define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
+ 
+ # ifndef DoLoadableServer
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index b55b09a3ced..c9de0144af2 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2006/07/26 16:02:21 minskim Exp $
+# $NetBSD: Makefile,v 1.40 2006/07/31 16:39:41 joerg Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-libs-${XORG_VER}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG}
 DISTFILES=		X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 8115d5f3cbc..f3a34ac382a 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2006/07/24 22:00:47 minskim Exp $
+$NetBSD: distinfo,v 1.50 2006/07/31 16:39:41 joerg Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -11,7 +11,7 @@ RMD160 (X11R6.9.0-src3.tar.gz) = 1a2d1855f7b204012627a6c6bf0eaf5245fff414
 Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes
 SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1
 SHA1 (patch-ab) = 45f06a7d1ac2316621c5707bb202b7f6042699be
-SHA1 (patch-ac) = 841979893b72455ce59b951ac137ca0c236a39f3
+SHA1 (patch-ac) = 4b64af7f360836589943ec229247357033e883fa
 SHA1 (patch-ad) = 8b803d38021a0762e503c445a302f133e5c1f3b1
 SHA1 (patch-ae) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d
 SHA1 (patch-af) = 62127e39c829cba6b01bd9f3aaaea682eec52c9e
diff --git a/x11/xorg-libs/patches/patch-ac b/x11/xorg-libs/patches/patch-ac
index 9a1c93aec0c..7f56a33b0a3 100644
--- a/x11/xorg-libs/patches/patch-ac
+++ b/x11/xorg-libs/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.9 2006/04/28 21:52:19 joerg Exp $
+$NetBSD: patch-ac,v 1.10 2006/07/31 16:39:41 joerg Exp $
 
 --- config/cf/NetBSD.cf.in.orig	2006-04-28 23:09:24.000000000 +0200
 +++ config/cf/NetBSD.cf.in
@@ -38,6 +38,15 @@ $NetBSD: patch-ac,v 1.9 2006/04/28 21:52:19 joerg Exp $
  #  ifndef DoLoadableServer
  #  define DoLoadableServer	YES
  #  endif
+@@ -231,7 +231,7 @@ XCOMM operating system:  OSName (OSMajor
+ #  define ServerExtraSysLibs	-li386
+ # endif
+ #else
+-# define OptimizedCDebugFlags 	-O2
++# define OptimizedCDebugFlags 	-O2 GccAliasingArgs
+ # if defined(SparcArchitecture)
+ #  define ServerOSDefines 	-DDDXOSINIT
+ # elif defined(AlphaArchitecture)
 @@ -240,17 +240,24 @@ XCOMM operating system:  OSName (OSMajor
  #   define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
  # elif defined(PpcArchitecture)
@@ -104,3 +113,12 @@ $NetBSD: patch-ac,v 1.9 2006/04/28 21:52:19 joerg Exp $
  # include <xorg.cf>
  #endif
  
+@@ -651,7 +664,7 @@ sed 's/\.[0-9]*$$//'`
+  */
+ #ifdef PpcArchitecture
+ 
+-# define OptimizedCDebugFlags 	-O2
++# define OptimizedCDebugFlags 	-O2 GccAliasingArgs
+ # define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
+ 
+ # ifndef DoLoadableServer