[Midnightbsd-cvs] mports [22343] trunk/games/quake3: fixup patchset

[laffer1 at midnightbsd.org]

Revision: 22343
          http://svnweb.midnightbsd.org/mports/?rev=22343
Author:   laffer1
Date:     2017-02-25 11:46:10 -0500 (Sat, 25 Feb 2017)
Log Message:
-----------
fixup patchset

Modified Paths:
--------------
    trunk/games/quake3/Makefile
    trunk/games/quake3/files/patch-code-unix-Makefile

Modified: trunk/games/quake3/Makefile
===================================================================
--- trunk/games/quake3/Makefile	2017-02-25 16:44:11 UTC (rev 22342)
+++ trunk/games/quake3/Makefile	2017-02-25 16:46:10 UTC (rev 22343)
@@ -87,8 +87,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MTHREADS}
-MAKE_ENV+=	SMP=YES \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV+=	SMP=YES
 PLIST_SUB+=	SMP=""
 Q3BIN+=		quake3-smp
 .else

Modified: trunk/games/quake3/files/patch-code-unix-Makefile
===================================================================
--- trunk/games/quake3/files/patch-code-unix-Makefile	2017-02-25 16:44:11 UTC (rev 22342)
+++ trunk/games/quake3/files/patch-code-unix-Makefile	2017-02-25 16:46:10 UTC (rev 22343)
@@ -1,16 +1,5 @@
---- code/unix/Makefile.orig	Wed Apr 30 23:44:13 2008
-+++ code/unix/Makefile	Wed Apr 30 23:50:16 2008
-@@ -17,8 +17,8 @@
- # GNU Make required
- #
- 
--PLATFORM=$(shell uname|tr A-Z a-z)
--PLATFORM_RELEASE=$(shell uname -r)
-+PLATFORM=freebsd
-+PLATFORM_RELEASE=9.1-RELEASE
- 
- ###
- ### These paths are where you probably want to change things
+--- 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
@@ -40,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-functions=2 -fno-strict-aliasing -fstrength-reduce
      else
        #NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc # bk001205
        #NEWPGCC=/loki/global/x86/bin/gcc
@@ -54,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-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-functions=2 -fno-strict-aliasing -fstrength-reduce
      endif
    endif
  
@@ -100,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-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
  
@@ -126,7 +121,7 @@
  RANLIB=ranlib
  
 -THREAD_LDFLAGS=-lpthread
-+THREAD_LDFLAGS=$(PTHREAD_LIBS)
++THREAD_LDFLAGS=-lpthread
  # don't need -ldl (FreeBSD)
 -LDFLAGS=-lm
 +LDFLAGS+=-lm