From nobody@FreeBSD.org  Fri Oct 18 00:14:37 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 2DB48F6E
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 18 Oct 2013 00:14:37 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 1A5712CF3
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 18 Oct 2013 00:14:37 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r9I0Eask018281
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 18 Oct 2013 00:14:36 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r9I0EalH018182;
	Fri, 18 Oct 2013 00:14:36 GMT
	(envelope-from nobody)
Message-Id: <201310180014.r9I0EalH018182@oldred.freebsd.org>
Date: Fri, 18 Oct 2013 00:14:36 GMT
From: Linas Valiukas <shirshegsm@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch][maintainer update] games/quake3: fix compiler errors with Clang, new mirrors
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         183074
>Category:       ports
>Synopsis:       [patch][maintainer update] games/quake3: fix compiler errors with Clang, new mirrors
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    danilo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 18 00:20:00 UTC 2013
>Closed-Date:    Sun Oct 20 04:52:48 UTC 2013
>Last-Modified:  Sun Oct 20 05:00:00 UTC 2013
>Originator:     Linas Valiukas
>Release:        10.0-ALPHA5
>Organization:
>Environment:
FreeBSD freebsd 10.0-ALPHA5 FreeBSD 10.0-ALPHA5 #0 r256092: Mon Oct  7 00:40:42 UTC 2013     root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
games/quake3 didn't manage to build on 10.0-ALPHA5 (clang version 3.3 (tags/RELEASE_33/final 183502) 20130610) because:

  error: invalid value '6' in '-O6'
  gmake[2]: *** [release/client/cl_cgame.o] Error 1

and:

  build/release-freebsd-i386/ded/vm_x86.o: In function `AsmCall':
  code/qcommon/vm_x86.c:(.text+0x18): undefined reference to `callMask'

The patch fixes that.

Also, more live mirrors added and dead ones removed.
>How-To-Repeat:
1) $ cd games/quake3
2) $ make
3) fail :(
>Fix:
1) apply patch
2) $ cd games/quake3
3) $ make
4) yay!

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 330700)
+++ Makefile	(working copy)
@@ -1,22 +1,20 @@
 # Created by: pypt
-# $FreeBSD$
+# $FreeBSD: games/quake3/Makefile 327730 2013-09-20 17:36:33Z bapt $
 
 PORTNAME=	quake3
 PORTVERSION=	1.32c
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
-MASTER_SITES=	http://www.proarena.com/p/ftpx/x8524/quake_3_arena/ \
-		http://www.planetgargoyle.com/ \
-		http://www.teamdarkside.net/ \
-		http://0day.icculus.org/mirrors/quake3/ \
-		http://www.olpainless.net/files/ \
+MASTER_SITES=	ftp://mancubus.net/pub/idgames/idstuff/source/ \
+		http://ftp.mancubus.net/pub/idgames/idstuff/source/ \
+		http://www.gamers.org/pub/idgames/idstuff/source/ \
 		${MASTER_SITE_IDSOFTWARE:S|$|source/|}
 DISTNAME=	${PORTNAME}-${REALVERSION}-source
 
 MAINTAINER=	shirshegsm@gmail.com
 COMMENT=	Quake III Arena -- first person shooter (native build)
 
-USES=		gmake
+USES=		${GMAKE}
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	does not run properly; try games/ioquake3
 USE_ZIP=	yes
Index: files/patch-code-Construct
===================================================================
--- files/patch-code-Construct	(revision 0)
+++ files/patch-code-Construct	(working copy)
@@ -0,0 +1,11 @@
+--- code/Construct.orig	2013-10-18 02:05:36.000000000 +0300
++++ code/Construct	2013-10-18 02:05:53.000000000 +0300
+@@ -237,7 +237,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 -O2 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce ';
+ 	$BSPC_BASE_CFLAGS = $BASE_CFLAGS . '-DLINUX -DBSPC -Dstricmp=strcasecmp ';
+ }
+ 
Index: files/patch-code-botlib-linux-i386.mak
===================================================================
--- files/patch-code-botlib-linux-i386.mak	(revision 0)
+++ files/patch-code-botlib-linux-i386.mak	(working copy)
@@ -0,0 +1,11 @@
+--- code/botlib/linux-i386.mak.orig	2013-10-18 02:02:20.000000000 +0300
++++ code/botlib/linux-i386.mak	2013-10-18 02:02:35.000000000 +0300
+@@ -8,7 +8,7 @@
+ BASE_CFLAGS=-Dstricmp=strcasecmp
+ 
+ #use these cflags to optimize it
+-CFLAGS=$(BASE_CFLAGS) -m486 -O6 -ffast-math -funroll-loops \
++CFLAGS=$(BASE_CFLAGS) -m486 -O2 -ffast-math -funroll-loops \
+ 	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
+ 	-malign-jumps=2 -malign-functions=2
+ #use these when debugging 
Index: files/patch-code-bspc-Makefile
===================================================================
--- files/patch-code-bspc-Makefile	(revision 0)
+++ files/patch-code-bspc-Makefile	(working copy)
@@ -0,0 +1,11 @@
+--- code/bspc/Makefile.orig	2013-10-18 02:04:52.000000000 +0300
++++ code/bspc/Makefile	2013-10-18 02:05:03.000000000 +0300
+@@ -12,7 +12,7 @@
+ BASE_CFLAGS=-Dstricmp=strcasecmp
+ 
+ #use these cflags to optimize it
+-CFLAGS=$(BASE_CFLAGS) -m486 -O6 -ffast-math -funroll-loops \
++CFLAGS=$(BASE_CFLAGS) -m486 -O2 -ffast-math -funroll-loops \
+ 	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
+ 	-malign-jumps=2 -malign-functions=2 -DLINUX -DBSPC
+ #use these when debugging 
Index: files/patch-code-bspc-linux-i386.mak
===================================================================
--- files/patch-code-bspc-linux-i386.mak	(revision 0)
+++ files/patch-code-bspc-linux-i386.mak	(working copy)
@@ -0,0 +1,11 @@
+--- code/bspc/linux-i386.mak.orig	2013-10-18 02:04:04.000000000 +0300
++++ code/bspc/linux-i386.mak	2013-10-18 02:04:18.000000000 +0300
+@@ -8,7 +8,7 @@
+ BASE_CFLAGS=-Dstricmp=strcasecmp
+ 
+ #use these cflags to optimize it
+-CFLAGS=$(BASE_CFLAGS) -m486 -O6 -ffast-math -funroll-loops \
++CFLAGS=$(BASE_CFLAGS) -m486 -O2 -ffast-math -funroll-loops \
+ 	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
+ 	-malign-jumps=2 -malign-functions=2 -DLINUX -DBSPC
+ #use these when debugging 
Index: files/patch-code-qcommon-vm_x86.c
===================================================================
--- files/patch-code-qcommon-vm_x86.c	(revision 0)
+++ files/patch-code-qcommon-vm_x86.c	(working copy)
@@ -0,0 +1,11 @@
+--- code/qcommon/vm_x86.c.orig	2013-10-18 02:26:13.000000000 +0300
++++ code/qcommon/vm_x86.c	2013-10-18 02:26:30.000000000 +0300
+@@ -84,7 +84,7 @@
+ #endif // !_WIN32
+ 
+ 
+-static	int		callMask = 0; // bk001213 - init
++static	int __attribute__((used))		callMask = 0; // bk001213 - init
+ 
+ static	int	instruction, pass;
+ static	int	lastConst = 0;
Index: files/patch-code-unix-Makefile
===================================================================
--- files/patch-code-unix-Makefile	(revision 330700)
+++ files/patch-code-unix-Makefile	(working copy)
@@ -1,5 +1,5 @@
---- code/unix/Makefile.orig	Sun Jun  4 18:13:21 2006
-+++ code/unix/Makefile	Sun Jun  4 18:14:42 2006
+--- code/unix/Makefile.orig	2013-10-18 02:01:30.000000000 +0300
++++ code/unix/Makefile	2013-10-18 02:07:18.000000000 +0300
 @@ -34,7 +34,7 @@
  
  # Build name
@@ -29,12 +29,18 @@
  # bk010215 - TODO - add all defaults / kill Ryan
  
  
-@@ -136,7 +136,7 @@
+@@ -131,12 +131,12 @@
+ #  DEBUG_CFLAGS=$(BASE_CFLAGS) -g  -Wall -O
+   ifeq ($(ARCH),axp)
+     CC=pgcc
+-    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
++    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
+   else
      ifeq ($(ARCH),ppc)
        NEWPGCC=/loki/global/ppc/bin/gcc
        CC=$(NEWPGCC)
 -      RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -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 -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 -O2 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
      else
        #NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc # bk001205
        #NEWPGCC=/loki/global/x86/bin/gcc
@@ -43,10 +49,10 @@
  # 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 -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 -O2 -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 -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
++#      RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
      endif
    endif
  
@@ -89,9 +95,9 @@
 -GL_CFLAGS = -I$(MESADIR)/include -I/usr/X11R6/include
 +ifdef OPTIMIZED_CFLAGS
 +  ifeq ($(ARCH),i386)
-+RELEASE_CFLAGS+=-O6 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
++RELEASE_CFLAGS+=-O2 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
 +  else
-+RELEASE_CFLAGS+=-O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
++RELEASE_CFLAGS+=-O2 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
 +  endif
 +endif
  
@@ -230,10 +236,7 @@
  		$(B)/client/linux_glimp.o \
  		$(B)/client/linux_snd.o \
 +		$(B)/client/linux_signals.o \
- 		$(B)/client/snd_mixa.o \
--		$(B)/client/matha.o   \
--		$(B)/client/ftol.o \
--		$(B)/client/snapvector.o
++		$(B)/client/snd_mixa.o \
 +		$(B)/client/matha.o
 +
 +	Q3POBJ_SMP=\
@@ -242,7 +245,10 @@
 +		$(B)/client/linux_glimp_smp.o \
 +		$(B)/client/linux_snd.o \
 +		$(B)/client/linux_signals.o \
-+		$(B)/client/snd_mixa.o \
+ 		$(B)/client/snd_mixa.o \
+-		$(B)/client/matha.o   \
+-		$(B)/client/ftol.o \
+-		$(B)/client/snapvector.o
 +		$(B)/client/matha.o
 +
 +    ifeq ($(ARCH),i386)


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->danilo 
Responsible-Changed-By: danilo 
Responsible-Changed-When: Fri Oct 18 19:25:49 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183074 
State-Changed-From-To: open->closed 
State-Changed-By: danilo 
State-Changed-When: Sun Oct 20 04:52:47 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183074 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183074: commit references a PR
Date: Sun, 20 Oct 2013 04:51:27 +0000 (UTC)

 Author: danilo
 Date: Sun Oct 20 04:51:17 2013
 New Revision: 330975
 URL: http://svnweb.freebsd.org/changeset/ports/330975
 
 Log:
   - Fix build on 10 [1]
   - Update MASTER_SITES [1]
   - Add stage support
   
   PR:		ports/183074
   Submitted by:	Linas Valiukas <shirshegsm@gmail.com> (maintainer) [1]
 
 Added:
   head/games/quake3/files/patch-code-Construct   (contents, props changed)
   head/games/quake3/files/patch-code-botlib-linux-i386.mak   (contents, props changed)
   head/games/quake3/files/patch-code-bspc-Makefile   (contents, props changed)
   head/games/quake3/files/patch-code-bspc-linux-i386.mak   (contents, props changed)
   head/games/quake3/files/patch-code-qcommon-vm_x86.c   (contents, props changed)
 Modified:
   head/games/quake3/Makefile
   head/games/quake3/files/patch-code-unix-Makefile
 
 Modified: head/games/quake3/Makefile
 ==============================================================================
 --- head/games/quake3/Makefile	Sun Oct 20 04:29:33 2013	(r330974)
 +++ head/games/quake3/Makefile	Sun Oct 20 04:51:17 2013	(r330975)
 @@ -3,13 +3,11 @@
  
  PORTNAME=	quake3
  PORTVERSION=	1.32c
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	games
 -MASTER_SITES=	http://www.proarena.com/p/ftpx/x8524/quake_3_arena/ \
 -		http://www.planetgargoyle.com/ \
 -		http://www.teamdarkside.net/ \
 -		http://0day.icculus.org/mirrors/quake3/ \
 -		http://www.olpainless.net/files/ \
 +MASTER_SITES=	ftp://mancubus.net/pub/idgames/idstuff/source/ \
 +		http://ftp.mancubus.net/pub/idgames/idstuff/source/ \
 +		http://www.gamers.org/pub/idgames/idstuff/source/ \
  		${MASTER_SITE_IDSOFTWARE:S|$|source/|}
  DISTNAME=	${PORTNAME}-${REALVERSION}-source
  
 @@ -42,7 +40,6 @@ LIBDIR=		${PREFIX}/lib/${PORTNAME}
  REALVERSION=	1.32b
  VM_ARCHS=	i386 powerpc
  
 -NO_STAGE=	yes
  .include <bsd.port.options.mk>
  .include <bsd.port.pre.mk>
  
 @@ -111,12 +108,12 @@ post-patch:
  
  do-install:
  .for bin in ${Q3BIN}
 -	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} ${PREFIX}/bin
 +	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} ${STAGEDIR}${PREFIX}/bin
  .endfor
  .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED)
  .for dir in baseq3 missionpack
 -	${MKDIR} ${LIBDIR}/${dir}
 -	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${LIBDIR}/${dir}
 +	${MKDIR} ${STAGEDIR}${LIBDIR}/${dir}
 +	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${STAGEDIR}${LIBDIR}/${dir}
  .endfor
  .endif
  
 
 Added: head/games/quake3/files/patch-code-Construct
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/quake3/files/patch-code-Construct	Sun Oct 20 04:51:17 2013	(r330975)
 @@ -0,0 +1,11 @@
 +--- code/Construct.orig	2013-10-18 02:05:36.000000000 +0300
 ++++ code/Construct	2013-10-18 02:05:53.000000000 +0300
 +@@ -237,7 +237,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 -O2 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce ';
 + 	$BSPC_BASE_CFLAGS = $BASE_CFLAGS . '-DLINUX -DBSPC -Dstricmp=strcasecmp ';
 + }
 + 
 
 Added: head/games/quake3/files/patch-code-botlib-linux-i386.mak
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/quake3/files/patch-code-botlib-linux-i386.mak	Sun Oct 20 04:51:17 2013	(r330975)
 @@ -0,0 +1,11 @@
 +--- code/botlib/linux-i386.mak.orig	2013-10-18 02:02:20.000000000 +0300
 ++++ code/botlib/linux-i386.mak	2013-10-18 02:02:35.000000000 +0300
 +@@ -8,7 +8,7 @@
 + BASE_CFLAGS=-Dstricmp=strcasecmp
 + 
 + #use these cflags to optimize it
 +-CFLAGS=$(BASE_CFLAGS) -m486 -O6 -ffast-math -funroll-loops \
 ++CFLAGS=$(BASE_CFLAGS) -m486 -O2 -ffast-math -funroll-loops \
 + 	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
 + 	-malign-jumps=2 -malign-functions=2
 + #use these when debugging 
 
 Added: head/games/quake3/files/patch-code-bspc-Makefile
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/quake3/files/patch-code-bspc-Makefile	Sun Oct 20 04:51:17 2013	(r330975)
 @@ -0,0 +1,11 @@
 +--- code/bspc/Makefile.orig	2013-10-18 02:04:52.000000000 +0300
 ++++ code/bspc/Makefile	2013-10-18 02:05:03.000000000 +0300
 +@@ -12,7 +12,7 @@
 + BASE_CFLAGS=-Dstricmp=strcasecmp
 + 
 + #use these cflags to optimize it
 +-CFLAGS=$(BASE_CFLAGS) -m486 -O6 -ffast-math -funroll-loops \
 ++CFLAGS=$(BASE_CFLAGS) -m486 -O2 -ffast-math -funroll-loops \
 + 	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
 + 	-malign-jumps=2 -malign-functions=2 -DLINUX -DBSPC
 + #use these when debugging 
 
 Added: head/games/quake3/files/patch-code-bspc-linux-i386.mak
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/quake3/files/patch-code-bspc-linux-i386.mak	Sun Oct 20 04:51:17 2013	(r330975)
 @@ -0,0 +1,11 @@
 +--- code/bspc/linux-i386.mak.orig	2013-10-18 02:04:04.000000000 +0300
 ++++ code/bspc/linux-i386.mak	2013-10-18 02:04:18.000000000 +0300
 +@@ -8,7 +8,7 @@
 + BASE_CFLAGS=-Dstricmp=strcasecmp
 + 
 + #use these cflags to optimize it
 +-CFLAGS=$(BASE_CFLAGS) -m486 -O6 -ffast-math -funroll-loops \
 ++CFLAGS=$(BASE_CFLAGS) -m486 -O2 -ffast-math -funroll-loops \
 + 	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
 + 	-malign-jumps=2 -malign-functions=2 -DLINUX -DBSPC
 + #use these when debugging 
 
 Added: head/games/quake3/files/patch-code-qcommon-vm_x86.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/quake3/files/patch-code-qcommon-vm_x86.c	Sun Oct 20 04:51:17 2013	(r330975)
 @@ -0,0 +1,11 @@
 +--- code/qcommon/vm_x86.c.orig	2013-10-18 02:26:13.000000000 +0300
 ++++ code/qcommon/vm_x86.c	2013-10-18 02:26:30.000000000 +0300
 +@@ -84,7 +84,7 @@
 + #endif // !_WIN32
 + 
 + 
 +-static	int		callMask = 0; // bk001213 - init
 ++static	int __attribute__((used))		callMask = 0; // bk001213 - init
 + 
 + static	int	instruction, pass;
 + static	int	lastConst = 0;
 
 Modified: head/games/quake3/files/patch-code-unix-Makefile
 ==============================================================================
 --- head/games/quake3/files/patch-code-unix-Makefile	Sun Oct 20 04:29:33 2013	(r330974)
 +++ head/games/quake3/files/patch-code-unix-Makefile	Sun Oct 20 04:51:17 2013	(r330975)
 @@ -1,5 +1,5 @@
 ---- code/unix/Makefile.orig	Sun Jun  4 18:13:21 2006
 -+++ code/unix/Makefile	Sun Jun  4 18:14:42 2006
 +--- code/unix/Makefile.orig	2013-10-18 02:01:30.000000000 +0300
 ++++ code/unix/Makefile	2013-10-18 02:07:18.000000000 +0300
  @@ -34,7 +34,7 @@
   
   # Build name
 @@ -29,12 +29,18 @@
   # bk010215 - TODO - add all defaults / kill Ryan
   
   
 -@@ -136,7 +136,7 @@
 +@@ -131,12 +131,12 @@
 + #  DEBUG_CFLAGS=$(BASE_CFLAGS) -g  -Wall -O
 +   ifeq ($(ARCH),axp)
 +     CC=pgcc
 +-    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
 ++    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
 +   else
       ifeq ($(ARCH),ppc)
         NEWPGCC=/loki/global/ppc/bin/gcc
         CC=$(NEWPGCC)
  -      RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -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 -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 -O2 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
       else
         #NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc # bk001205
         #NEWPGCC=/loki/global/x86/bin/gcc
 @@ -43,10 +49,10 @@
   # 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 -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 -O2 -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 -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
 ++#      RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
       endif
     endif
   
 @@ -89,9 +95,9 @@
  -GL_CFLAGS = -I$(MESADIR)/include -I/usr/X11R6/include
  +ifdef OPTIMIZED_CFLAGS
  +  ifeq ($(ARCH),i386)
 -+RELEASE_CFLAGS+=-O6 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
 ++RELEASE_CFLAGS+=-O2 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
  +  else
 -+RELEASE_CFLAGS+=-O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
 ++RELEASE_CFLAGS+=-O2 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
  +  endif
  +endif
   
 @@ -230,10 +236,7 @@
   		$(B)/client/linux_glimp.o \
   		$(B)/client/linux_snd.o \
  +		$(B)/client/linux_signals.o \
 - 		$(B)/client/snd_mixa.o \
 --		$(B)/client/matha.o   \
 --		$(B)/client/ftol.o \
 --		$(B)/client/snapvector.o
 ++		$(B)/client/snd_mixa.o \
  +		$(B)/client/matha.o
  +
  +	Q3POBJ_SMP=\
 @@ -242,7 +245,10 @@
  +		$(B)/client/linux_glimp_smp.o \
  +		$(B)/client/linux_snd.o \
  +		$(B)/client/linux_signals.o \
 -+		$(B)/client/snd_mixa.o \
 + 		$(B)/client/snd_mixa.o \
 +-		$(B)/client/matha.o   \
 +-		$(B)/client/ftol.o \
 +-		$(B)/client/snapvector.o
  +		$(B)/client/matha.o
  +
  +    ifeq ($(ARCH),i386)
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
