summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2001-08-15 07:09:40 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2001-08-15 07:09:40 +0000
commitab678682d54a10c9359c4b8c424c93bd443c3621 (patch)
tree9e3d455a3326045209e91d230434c44d2f666704 /games
parentupgrade to 0.96 (diff)
Unbrore with threaded Mesa.
PR: 29594 Submitted by: Patrick Li <pat@databits.net>
Notes
Notes: svn path=/head/; revision=46268
Diffstat (limited to 'games')
-rw-r--r--games/bzflag/Makefile3
-rw-r--r--games/bzflag/files/patch-Make-common33
2 files changed, 32 insertions, 4 deletions
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index 1bbfa3bddc39..0155c908b3dd 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -21,7 +21,8 @@ USE_XLIB= yes
USE_MESA= yes
MAKE_ENV= PORTCFLAGS="${CFLAGS}" PORTCXXFLAGS="${CXXFLAGS}" \
- PORTPREFIX="${PREFIX}"
+ PORTPREFIX="${PREFIX}" PTHREAD_LIBS="${PTHREAD_LIBS}" \
+ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
MAN6= bzflag.6 bzfrelay.6 bzfls.6 bzfs.6
diff --git a/games/bzflag/files/patch-Make-common b/games/bzflag/files/patch-Make-common
index dcc937caa9e0..91eb9560ea63 100644
--- a/games/bzflag/files/patch-Make-common
+++ b/games/bzflag/files/patch-Make-common
@@ -1,6 +1,33 @@
---- Make-common.orig Sat Mar 24 02:21:48 2001
-+++ Make-common Sat Mar 24 02:13:00 2001
-@@ -169,13 +169,13 @@
+--- Make-common.orig Wed Feb 14 03:34:09 2001
++++ Make-common Fri Aug 10 01:04:44 2001
+@@ -33,7 +33,7 @@
+ #
+ # C options
+ #
+-CFLAGS = $(LCFLAGS) $(PCFLAGS) $(GCFLAGS) $(COPTIMIZER) $(MKDEPOPT) $(CWOFF)
++CFLAGS = $(LCFLAGS) $(PCFLAGS) $(GCFLAGS) $(COPTIMIZER) $(MKDEPOPT) $(CWOFF) ${PTHREAD_CFLAGS}
+ LCFLAGS = $(LCDEFS) $(LCINCS) $(LCOPTS)
+ PCFLAGS = $(PCDEFS) $(PCINCS) $(PCOPTS)
+ GCFLAGS = $(GCDEFS) $(GCINCS) $(GCOPTS)
+@@ -51,7 +51,7 @@
+ #
+ # C++ options
+ #
+-CXXFLAGS = $(LCXXFLAGS) $(PCXXFLAGS) $(GCXXFLAGS) $(CXXOPTIMIZER) $(MKDEPOPT) $(CXXWOFF)
++CXXFLAGS = $(LCXXFLAGS) $(PCXXFLAGS) $(GCXXFLAGS) $(CXXOPTIMIZER) $(MKDEPOPT) $(CXXWOFF) ${PTHREAD_CFLAGS}
+ LCXXFLAGS = $(LCXXDEFS) $(LCXXINCS) $(LCXXOPTS)
+ PCXXFLAGS = $(PCXXDEFS) $(PCXXINCS) $(PCXXOPTS)
+ GCXXFLAGS = $(GCXXDEFS) $(GCXXINCS) $(GCXXOPTS)
+@@ -69,7 +69,7 @@
+ #
+ # ld options
+ #
+-LDFLAGS = $(LDOPTS) $(LDLIBS)
++LDFLAGS = $(LDOPTS) $(LDLIBS) ${PTHREAD_LIBS}
+ LDOPTS = $(LLDOPTS) $(PLDOPTS) $(GLDOPTS)
+ LDLIBS = $(LLDLIBS) $(PLDLIBS) $(GLDLIBS)
+
+@@ -167,13 +167,13 @@
#
# default to optimized build
#