ports/89603: [patch] games/quake3 bugfix

Sat Nov 26 21:00:25 UTC 2005

>Number:         89603
>Category:       ports
>Synopsis:       [patch] games/quake3 bugfix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 26 21:00:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Linas Valiukas
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD shirshegsm.lan13.satnet.lt 6.0-STABLE FreeBSD 6.0-STABLE #1: Fri Nov 4 18:46:07 EET 2005 root at shirshegsm.lan13.satnet.lt:/usr/obj/usr/src/sys/CHEESE i386


	
>Description:
* removed -march and -mcpu flags (so it _may_ compile on other platforms)
* patches now work (thanks to ports/89600)
>How-To-Repeat:
	
>Fix:

--- quake3_rev3.diff begins here ---
diff -ruN quake3/Makefile quake3.new/Makefile
--- quake3/Makefile	Wed Nov 23 14:00:47 2005
+++ quake3.new/Makefile	Sat Nov 26 22:38:52 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	quake3
 PORTVERSION=	1.32b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/source/ \
 		http://www.proarena.com/p/ftpx/x8524/quake_3_arena/ \
diff -ruN quake3/files/patch-code-Construct quake3.new/files/patch-code-Construct
--- quake3/files/patch-code-Construct	Wed Nov 23 14:00:47 2005
+++ quake3.new/files/patch-code-Construct	Sat Nov 26 22:38:52 2005
@@ -1,5 +1,5 @@
---- /work/a/ports/games/quake3/work/quake3-1.32b/code/Construct.orig	Mon Aug 15 20:56:27 2005
-+++ /work/a/ports/games/quake3/work/quake3-1.32b/code/Construct	Wed Nov 23 10:37:04 2005
+--- code/Construct.orig	Sat Nov 26 22:27:56 2005
++++ code/Construct	Sat Nov 26 22:29:33 2005
 @@ -19,8 +19,8 @@
  use Cons_gcc;
  
@@ -49,7 +49,7 @@
  else
  {
 -  $BASE_CFLAGS = $COMMON_CFLAGS . '-DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce ';
-+  $BASE_CFLAGS = $COMMON_CFLAGS . '-DNDEBUG -O6 -march=pentiumpro -march=pentium -fomit-frame-pointer -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce ';
++  $BASE_CFLAGS = $COMMON_CFLAGS . '-DNDEBUG -O6 -fomit-frame-pointer -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce ';
  	$BSPC_BASE_CFLAGS = $BASE_CFLAGS . '-DLINUX -DBSPC -Dstricmp=strcasecmp ';
  }
  
diff -ruN quake3/files/patch-code-unix-Makefile quake3.new/files/patch-code-unix-Makefile
--- quake3/files/patch-code-unix-Makefile	Tue Nov 22 07:20:37 2005
+++ quake3.new/files/patch-code-unix-Makefile	Sat Nov 26 22:38:51 2005
@@ -1,5 +1,5 @@
---- code/unix/Makefile.orig	Sun May  5 07:21:10 2002
-+++ code/unix/Makefile	Sun Nov 20 18:48:48 2005
+--- code/unix/Makefile.orig	Sat Nov 26 22:27:53 2005
++++ code/unix/Makefile	Sat Nov 26 22:30:31 2005
 @@ -136,7 +136,7 @@
      ifeq ($(ARCH),ppc)
        NEWPGCC=/loki/global/ppc/bin/gcc
@@ -14,7 +14,7 @@
  # NOTE: the -fomit-frame-pointer option leads to an unstable binary on my test box if it was built on the main box
  #   but building on the Mdk 7.2 baseline seems to work
 -      RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce
-+      RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -march=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
++      RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
  # TTimo: use this for building on P3 gcc 2.95.3 libc2.2 for all targets (experimental! -fomit-fram-pointer removed)
 -#      RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce
 +#      RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -march=pentiumpro -march=pentium -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
@@ -35,7 +35,7 @@
  NEWPGCC=/home/raistllin/src/gcc/build/install/bin/gcc
  CC=$(shell if [ -f $(NEWPGCC) ]; then echo $(NEWPGCC); else echo pgcc; fi )
 -RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing - fstrength-reduce
-+RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -march=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing - fstrength-reduce
++RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing - fstrength-reduce
  endif
  
  LIBEXT=a
diff -ruN quake3/files/patch-code-unix-cons quake3.new/files/patch-code-unix-cons
--- quake3/files/patch-code-unix-cons	Wed Nov 23 14:00:47 2005
+++ quake3.new/files/patch-code-unix-cons	Sat Nov 26 22:38:51 2005
@@ -1,5 +1,5 @@
---- /work/a/ports/games/quake3/work/quake3-1.32b/code/unix/cons.orig	Fri Jun 14 13:01:32 2002
-+++ /work/a/ports/games/quake3/work/quake3-1.32b/code/unix/cons	Wed Nov 23 10:32:49 2005
+--- code/unix/cons.orig	Fri Jun 14 13:01:32 2002
++++ code/unix/cons	Wed Nov 23 10:32:49 2005
 @@ -271,11 +271,11 @@
       # Defaults for a typical (?) UNIX platform.
       # Your mileage may vary.
--- quake3_rev3.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:

