ports/74681: [Maintainer Update] games/tank fix for fbsd 5/6

[Erik Greenwald]

>Number:         74681
>Category:       ports
>Synopsis:       [Maintainer Update]  games/tank  fix for fbsd 5/6
>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 Dec 04 17:10:34 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Erik Greenwald
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD fenris 4.10-STABLE FreeBSD 4.10-STABLE #1: Sat Sep 25 14:06:08 EDT 2004 root@:/usr/src/sys/compile/FENRIS i386

>Description:

Allows games/tank to compile on fbsd 5/6, tested on:
FreeBSD vidar.br0kenland.org 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Sun Nov 28 13:27:16 EST 2004     root at vidar.br0kenland.org:/usr/obj/usr/src/sys/VIDAR  i386


ARCH was carrying the fbsd port make value instead of getting set 
to the new crud, this changes the name to avoid the conflict.

>How-To-Repeat:
>Fix:

--- games_tank.patch begins here ---
Index: games/tank/Makefile
===================================================================
RCS file: /home/ncvs/ports/games/tank/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- games/tank/Makefile	29 Sep 2004 05:23:43 -0000	1.28
+++ games/tank/Makefile	4 Dec 2004 13:59:12 -0000
@@ -24,10 +24,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tank ${PREFIX}/bin
 	${MKDIR} ${DATADIR}
Index: games/tank/files/patch-Makefile.Linux.Mesa
===================================================================
RCS file: /home/ncvs/ports/games/tank/files/patch-Makefile.Linux.Mesa,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile.Linux.Mesa
--- games/tank/files/patch-Makefile.Linux.Mesa	16 Nov 2003 18:45:34 -0000	1.4
+++ games/tank/files/patch-Makefile.Linux.Mesa	4 Dec 2004 13:59:12 -0000
@@ -1,11 +1,11 @@
---- Makefile.Linux.Mesa.orig	Sun Feb  2 18:59:42 1997
-+++ Makefile.Linux.Mesa	Sun Nov 16 19:16:50 2003
+--- Makefile.Linux.Mesa.orig	Sun Feb  2 12:59:42 1997
++++ Makefile.Linux.Mesa	Sat Dec  4 08:56:39 2004
 @@ -3,23 +3,23 @@
  
  .SUFFIXES: .cc .o
  
 -ARCH = -DLINUX -DMESA #-DSOUND
-+ARCH = -DLINUX -DPREFIX=\"$(PREFIX)\" #-DUSING_MESA -DSOUND
++TARCH = -DLINUX -DPREFIX=\"$(PREFIX)\" #-DUSING_MESA -DSOUND
  
  MESA = Mesa
  
@@ -14,7 +14,7 @@
  
 -CFLAGS = $(INCLUDE) $(ARCH) -O2 -m486 -Wall -pipe \
 -	-pedantic -funroll-loops -mieee-fp
-+CFLAGS += $(INCLUDE) $(ARCH) -DSOUND -Wall -pipe ${PTHREAD_CFLAGS} \
++CFLAGS += $(INCLUDE) $(TARCH) -DSOUND -Wall -pipe ${PTHREAD_CFLAGS} \
 +	-pedantic -funroll-loops
  
 -LDFLAGS = -L/usr/X11R6/lib -L$(MESA)/lib
--- games_tank.patch ends here ---


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