From 448c1bfd6a5772035d8756b757c4a6fc81e835d8 Mon Sep 17 00:00:00 2001
From: Koop Mast <kwm@FreeBSD.org>
Date: Fri, 13 Dec 2013 12:21:17 +0000
Subject: [PATCH] Fix graphics/dri on ia64.

Please note that WITH_NEW_XORG isn't tested due to other issues.

Submitted by:	marcel@
---
 graphics/dri/Makefile                    |  8 ++------
 graphics/libGL/files-old/patch-configure | 15 ++++++++++++---
 graphics/libGL/files/patch-configure     |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 122155f07216..c3fac34c19e6 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -31,10 +31,6 @@ USE_GCC=yes
 . endif
 .endif
 
-.if ${ARCH} == ia64
-#BROKEN=		does not install on ia64
-.endif
-
 ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
 
 .if !defined(WITH_NEW_XORG)
@@ -45,7 +41,7 @@ ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME
 
 PLIST_SUB+=	VERSION=${MESADISTVERSION}
 
-.if ${ARCH} == amd64 || ${ARCH} == i386
+.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64
 DRI_DRIVERS=	${ALL_DRI_DRIVERS}
 .endif
 
@@ -62,7 +58,7 @@ PLIST_SUB+=	GALLIUM=""
 CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers
 PLIST_SUB+=	GALLIUM="@comment "
 . endif
-. if ${ARCH} == powerpc || ${ARCH} == ia64
+. if ${ARCH} == powerpc
 DRI_DRIVERS=	RADEON SWRAST
 . endif
 . if ${ARCH} == sparc64
diff --git a/graphics/libGL/files-old/patch-configure b/graphics/libGL/files-old/patch-configure
index b2e156de3b6b..c9faeefb3a67 100644
--- a/graphics/libGL/files-old/patch-configure
+++ b/graphics/libGL/files-old/patch-configure
@@ -1,5 +1,14 @@
---- configure.orig	2009-12-22 03:31:30.000000000 +0100
-+++ configure	2012-06-27 19:49:26.000000000 +0200
+--- configure.orig	2013-12-12 18:52:32.304356162 +0000
++++ configure	2013-12-12 19:50:44.434111814 +0000
+@@ -5393,7 +5393,7 @@
+     ;;
+ *freebsd* | dragonfly*)
+     case "$host_cpu" in
+-    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
++    i*86|x86_64|ia64|powerpc*|sparc*) default_driver="dri";;
+     esac
+     ;;
+ esac
 @@ -6946,12 +6946,35 @@
              CXXFLAGS="$CXXFLAGS -ansi -pedantic"
          fi
@@ -9,7 +18,7 @@
 -        if test "x$DRI_DIRS" = "xyes"; then
 -            DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
 +        case "$host_cpu" in
-+        x86_64)
++        x86_64|ia64)
 +            # i810 is missing because there is no x86-64 system where it
 +            # could *ever* be used.
 +            if test "x$DRI_DIRS" = "xyes"; then
diff --git a/graphics/libGL/files/patch-configure b/graphics/libGL/files/patch-configure
index 5f788478fb58..0bfe1925179a 100644
--- a/graphics/libGL/files/patch-configure
+++ b/graphics/libGL/files/patch-configure
@@ -8,7 +8,7 @@
 -            DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
 -        fi
 +        case "$host_cpu" in
-+        x86_64)
++        x86_64|ia64)
 +            # i810 is missing because there is no x86-64 system where it
 +            # could *ever* be used.
 +            if test "x$DRI_DIRS" = "xyes"; then