diff options
| author | Nick Sayer <nsayer@FreeBSD.org> | 2001-03-28 19:12:56 +0000 |
|---|---|---|
| committer | Nick Sayer <nsayer@FreeBSD.org> | 2001-03-28 19:12:56 +0000 |
| commit | a964287ef6978eb0acbedef6400be550b93f6259 (patch) | |
| tree | 7a1b457a296363a21b0704565ea15eb8823d21cc | |
| parent | Respect CFLAGS, CXXFLAGS and PREFIX (diff) | |
Revert last change. I now understand where the PORT prefixed variables
come from. Pass the pointy hat. But I cleaned out RELENG_3 support in
the patch before, so finish the job in Makefile.
Notes
Notes:
svn path=/head/; revision=40501
| -rw-r--r-- | games/bzflag/Makefile | 2 | ||||
| -rw-r--r-- | games/bzflag/files/config-sys | 8 | ||||
| -rw-r--r-- | games/bzflag/files/patch-Make-common | 24 |
3 files changed, 8 insertions, 26 deletions
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile index 2eee7de2eebe..23e19e74b92c 100644 --- a/games/bzflag/Makefile +++ b/games/bzflag/Makefile @@ -21,7 +21,7 @@ USE_XLIB= yes USE_MESA= yes MAKE_ENV= PORTCFLAGS="${CFLAGS}" PORTCXXFLAGS="${CXXFLAGS}" \ - PORTPREFIX="${PREFIX}" OSVERSION="${OSVERSION}" + PORTPREFIX="${PREFIX}" MAN6= bzflag.6 bzfrelay.6 bzfls.6 bzfs.6 diff --git a/games/bzflag/files/config-sys b/games/bzflag/files/config-sys index 79c37be6b38d..acfee53f5402 100644 --- a/games/bzflag/files/config-sys +++ b/games/bzflag/files/config-sys @@ -10,7 +10,7 @@ # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# configuration for generic FreeBSD +# configuration for generic linux # CONFIG = linux @@ -23,7 +23,7 @@ XF86VIDMODE_LIB = -lXxf86vm # # install locations # -INSTALL_DATA_DIR = ${PREFIX}/share/bzflag/data +INSTALL_DATA_DIR = ${PORTPREFIX}/share/bzflag/data # # tools @@ -52,8 +52,8 @@ PCXXDEFS = $(XF86VIDMODE_DEF) # PCOPTS = -Wall -W -ansi $(ACOPTS) PCXXOPTS = -Wall -W -fno-exceptions -fno-rtti $(ACXXOPTS) -COPT = -DNDEBUG -CXXOPT = -DNDEBUG -ffast-math -fomit-frame-pointer \ +COPT = -DNDEBUG ${PORTCFLAGS} +CXXOPT = -DNDEBUG ${PORTCXXFLAGS} -ffast-math -fomit-frame-pointer \ -fnonnull-objects -fexpensive-optimizations CDEBUG = -DDEBUG -g CXXDEBUG = -DDEBUG -g diff --git a/games/bzflag/files/patch-Make-common b/games/bzflag/files/patch-Make-common index 1d6346bc6c66..dcc937caa9e0 100644 --- a/games/bzflag/files/patch-Make-common +++ b/games/bzflag/files/patch-Make-common @@ -1,24 +1,6 @@ ---- Make-common.orig Tue Feb 13 00:50:39 2001 -+++ Make-common Wed Mar 28 10:50:04 2001 -@@ -33,7 +33,7 @@ - # - # C options - # --CFLAGS = $(LCFLAGS) $(PCFLAGS) $(GCFLAGS) $(COPTIMIZER) $(MKDEPOPT) $(CWOFF) -+CFLAGS += $(LCFLAGS) $(PCFLAGS) $(GCFLAGS) $(COPTIMIZER) $(MKDEPOPT) $(CWOFF) - 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) - LCXXFLAGS = $(LCXXDEFS) $(LCXXINCS) $(LCXXOPTS) - PCXXFLAGS = $(PCXXDEFS) $(PCXXINCS) $(PCXXOPTS) - GCXXFLAGS = $(GCXXDEFS) $(GCXXINCS) $(GCXXOPTS) -@@ -167,13 +167,13 @@ +--- Make-common.orig Sat Mar 24 02:21:48 2001 ++++ Make-common Sat Mar 24 02:13:00 2001 +@@ -169,13 +169,13 @@ # # default to optimized build # |