From anholt@anholt.dyndns.org  Thu Jul  4 13:47:45 2002
Return-Path: <anholt@anholt.dyndns.org>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D858937B400
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Jul 2002 13:47:45 -0700 (PDT)
Received: from anholt.dyndns.org (12-224-154-76.client.attbi.com [12.224.154.76])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C44BE43E3B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Jul 2002 13:47:44 -0700 (PDT)
	(envelope-from anholt@anholt.dyndns.org)
Received: from anholt.dyndns.org (anholt@localhost [127.0.0.1])
	by anholt.dyndns.org (8.12.5/8.12.5) with ESMTP id g64KliU8017099
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 4 Jul 2002 13:47:45 -0700 (PDT)
	(envelope-from anholt@anholt.dyndns.org)
Received: (from anholt@localhost)
	by anholt.dyndns.org (8.12.5/8.12.5/Submit) id g64Kli0S017098;
	Thu, 4 Jul 2002 13:47:44 -0700 (PDT)
Message-Id: <200207042047.g64Kli0S017098@anholt.dyndns.org>
Date: Thu, 4 Jul 2002 13:47:44 -0700 (PDT)
From: Eric Anholt <eta@lclark.edu>
Reply-To: Eric Anholt <eta@lclark.edu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Fix tuxracer on recent XFree, respect CFLAGS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         40199
>Category:       ports
>Synopsis:       Fix tuxracer on recent XFree, respect CFLAGS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 04 13:50:02 PDT 2002
>Closed-Date:    Tue Jul 09 09:27:32 PDT 2002
>Last-Modified:  Tue Jul 09 09:27:32 PDT 2002
>Originator:     Eric Anholt
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD anholt.dyndns.org 5.0-CURRENT FreeBSD 5.0-CURRENT #6: Mon Jul 1 19:12:50 PDT 2002 root@anholt.dyndns.org:/usr/src/current/sys/i386/compile/MYKERNEL i386


	
>Description:
	TuxRacer failed to compile with GL headers from recent DRI CVS.
	At the same time, remove a bunch of optimizations that were added 
	to the user's CFLAGS.
>How-To-Repeat:
	
>Fix:

	apply patch from ports/games/tuxracer/

--- tuxracerdiff begins here ---
Index: files/patch-configure.in
===================================================================
RCS file: /home/ncvs/ports/games/tuxracer/files/patch-configure.in,v
retrieving revision 1.1
diff -u -r1.1 patch-configure.in
--- files/patch-configure.in	17 Aug 2001 17:49:35 -0000	1.1
+++ files/patch-configure.in	4 Jul 2002 07:47:53 -0000
@@ -1,6 +1,25 @@
---- configure.in.orig	Mon Apr 30 16:23:53 2001
-+++ configure.in	Mon Apr 30 16:39:21 2001
-@@ -303,6 +303,10 @@
+--- configure.in.orig	Tue Jan 16 07:26:29 2001
++++ configure.in	Thu Jul  4 00:47:06 2002
+@@ -43,16 +43,10 @@
+ dnl General options
+ dnl --------------------------------------------------------------------------
+ TR_CPPFLAGS=""
+-TR_CFLAGS="-O2 -Wall -fomit-frame-pointer -ffast-math -fexpensive-optimizations"
+-TR_CXXFLAGS="-O2 -Wall -fomit-frame-pointer -ffast-math -fexpensive-optimizations"
++TR_CFLAGS=""
++TR_CXXFLAGS=""
+ TR_LIBS=""
+ 
+-case "$host" in
+-i*86-*-*) TR_CFLAGS="$TR_CFLAGS -malign-loops=2 -malign-jumps=2 -malign-functions=2";
+-          TR_CXXFLAGS="$TR_CXXFLAGS -malign-loops=2 -malign-jumps=2 -malign-functions=2";;
+-alpha*-*-linux-*) TR_CFLAGS="$TR_CFLAGS -mieee";;
+-esac
+-
+ AC_ARG_ENABLE(debug,     [  --enable-debug          Produce an executable with debugging symbols], 
+ 			 [TR_CFLAGS="-g -Wall"; TR_CXXFLAGS="-g -Wall"],
+ 			 [TR_CPPFLAGS="$TR_CPPFLAGS -DTUXRACER_NO_ASSERT=1"])
+@@ -303,6 +297,10 @@
  
  saved_LIBS="$LIBS"
  
@@ -11,7 +30,7 @@
  AC_DEFUN( CHECK_FOR_GL_LIB, [
      AC_MSG_CHECKING([for $GL_LIB_NAME library])
      LIBS="$saved_LIBS $TR_LIBS $GL_LDOPTS -l$GL_LIB_NAME"
-@@ -313,15 +317,15 @@
+@@ -313,15 +311,15 @@
  	TR_LIBS="$TR_LIBS $GL_LDOPTS -l$GL_LIB_NAME"
  
      else
@@ -30,3 +49,12 @@
  	fi
      fi
  ])
+@@ -466,7 +464,7 @@
+     if test "x$have_glx_h" = "xno" ; then
+ 	AC_MSG_ERROR([Cannot find GL/glx.h])
+     fi
+-
++    CFLAGS="$CFLAGS -DGLX_GLXEXT_LEGACY"
+     dnl Check that glXGetProcAddressARB is defined in glx.h
+     AC_MSG_CHECKING([whether glx.h defines glXGetProcAddressARB]);
+     AC_TRY_COMPILE( [#include <GL/glx.h>], [ char *foo = (char*) glXGetProcAddressARB; ],
--- tuxracerdiff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: dwcjr 
State-Changed-When: Tue Jul 9 09:27:20 PDT 2002 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=40199 
>Unformatted:
