- Unmark broken on -CURRENT, it's building fine again [1]

- Hand over to new maintainer [1]
- Fix WWW
- Unbreak on non-i386 architectures by removing i386 specific optimization
- Deprecated USE_MESA removed
- Some pkg-plist love

PR:		ports/59344 [1]
Submitted by:	Erik Greenwald <erik@smluc.org>
Approved by:	marcus (backup mentor)

4 files changed, 49 insertions, 57 deletions

diff --git a/games/tank/Makefile b/games/tank/Makefile
index c03e211553c1..ca01deb1f67e 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -11,26 +11,20 @@ CATEGORIES=	games
 MASTER_SITES=	http://step.polymtl.ca/~coyote/tank/
 DISTFILES=	${DISTNAME}-src.tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	erik@smluc.org
 COMMENT=	A 3-D network tank game that uses OpenGL/Mesa
 
 BUILD_DEPENDS=	${X11BASE}/lib/libaux.a:${PORTSDIR}/graphics/libaux
 
-USE_MESA=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
 ALL_TARGET=	linux-mesa-elf
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 500000
-BROKEN=		"does not build on FreeBSD ${OSVERSION}"
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tank ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/tank
-	${INSTALL_DATA} ${WRKSRC}/*.tga ${PREFIX}/share/tank
-	${INSTALL_DATA} ${WRKSRC}/*.au ${PREFIX}/share/tank
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.tga ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.au ${DATADIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/tank/files/patch-Makefile.Linux.Mesa b/games/tank/files/patch-Makefile.Linux.Mesa
index 3a6d991868b2..44c9dd40cfe1 100644
--- a/games/tank/files/patch-Makefile.Linux.Mesa
+++ b/games/tank/files/patch-Makefile.Linux.Mesa
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- Makefile.Linux.Mesa.orig	Sun Feb  2 19:59:42 1997
-+++ Makefile.Linux.Mesa	Wed Mar 14 13:02:41 2001
+--- Makefile.Linux.Mesa.orig	Sun Feb  2 18:59:42 1997
++++ Makefile.Linux.Mesa	Sun Nov 16 19:16:50 2003
 @@ -3,23 +3,23 @@
  
  .SUFFIXES: .cc .o
@@ -16,8 +13,9 @@ $FreeBSD$
 +INCLUDE = -I$(X11BASE)/include -I$(X11BASE)/include/GL
  
 -CFLAGS = $(INCLUDE) $(ARCH) -O2 -m486 -Wall -pipe \
+-	-pedantic -funroll-loops -mieee-fp
 +CFLAGS += $(INCLUDE) $(ARCH) -DSOUND -Wall -pipe ${PTHREAD_CFLAGS} \
- 	-pedantic -funroll-loops -mieee-fp
++	-pedantic -funroll-loops
  
 -LDFLAGS = -L/usr/X11R6/lib -L$(MESA)/lib
 +LDFLAGS = -L$(X11BASE)/lib
diff --git a/games/tank/pkg-descr b/games/tank/pkg-descr
index 67b4e57359a1..36b691ad99cc 100644
--- a/games/tank/pkg-descr
+++ b/games/tank/pkg-descr
@@ -9,4 +9,4 @@ up display, etc.) make game play varied and more interesting.
 This program was written as a final project for a computer graphics
 course, and was originally developed under Linux.
 
-WWW: http://step.polymtl.ca/~coyote/graphics-tank/
+WWW: http://step.polymtl.ca/~coyote/graphics_tank.html
diff --git a/games/tank/pkg-plist b/games/tank/pkg-plist
index eca0e17b6986..146ee8cff65e 100644
--- a/games/tank/pkg-plist
+++ b/games/tank/pkg-plist
@@ -1,38 +1,38 @@
 bin/tank
-share/tank/eatthis.au
-share/tank/expl01.tga
-share/tank/expl02.tga
-share/tank/expl03.tga
-share/tank/expl04.tga
-share/tank/expl05.tga
-share/tank/expl06.tga
-share/tank/expl07.tga
-share/tank/expl08.tga
-share/tank/expl09.tga
-share/tank/expl10.tga
-share/tank/expl11.tga
-share/tank/expl12.tga
-share/tank/expl13.tga
-share/tank/expl14.tga
-share/tank/expl15.tga
-share/tank/expl16.tga
-share/tank/expl17.tga
-share/tank/expl18.tga
-share/tank/expl19.tga
-share/tank/expl20.tga
-share/tank/explos.au
-share/tank/miss01.tga
-share/tank/miss02.tga
-share/tank/miss03.tga
-share/tank/miss04.tga
-share/tank/miss05.tga
-share/tank/miss06.tga
-share/tank/miss07.tga
-share/tank/miss08.tga
-share/tank/miss09.tga
-share/tank/miss10.tga
-share/tank/miss11.tga
-share/tank/miss12.tga
-share/tank/miss13.tga
-share/tank/miss14.tga
-@dirrm share/tank
+%%DATADIR%%/eatthis.au
+%%DATADIR%%/expl01.tga
+%%DATADIR%%/expl02.tga
+%%DATADIR%%/expl03.tga
+%%DATADIR%%/expl04.tga
+%%DATADIR%%/expl05.tga
+%%DATADIR%%/expl06.tga
+%%DATADIR%%/expl07.tga
+%%DATADIR%%/expl08.tga
+%%DATADIR%%/expl09.tga
+%%DATADIR%%/expl10.tga
+%%DATADIR%%/expl11.tga
+%%DATADIR%%/expl12.tga
+%%DATADIR%%/expl13.tga
+%%DATADIR%%/expl14.tga
+%%DATADIR%%/expl15.tga
+%%DATADIR%%/expl16.tga
+%%DATADIR%%/expl17.tga
+%%DATADIR%%/expl18.tga
+%%DATADIR%%/expl19.tga
+%%DATADIR%%/expl20.tga
+%%DATADIR%%/explos.au
+%%DATADIR%%/miss01.tga
+%%DATADIR%%/miss02.tga
+%%DATADIR%%/miss03.tga
+%%DATADIR%%/miss04.tga
+%%DATADIR%%/miss05.tga
+%%DATADIR%%/miss06.tga
+%%DATADIR%%/miss07.tga
+%%DATADIR%%/miss08.tga
+%%DATADIR%%/miss09.tga
+%%DATADIR%%/miss10.tga
+%%DATADIR%%/miss11.tga
+%%DATADIR%%/miss12.tga
+%%DATADIR%%/miss13.tga
+%%DATADIR%%/miss14.tga
+@dirrm %%DATADIR%%