o Fix the port after it has been broken for ages (since Mesa3 release);

o make it CFLAGS/X11BASE and PREFIX-clean;
o install data files into ${PREFIX}/share, not into ${PREFIX}/lib as it was
  previously.

Prompted by:	bento

4 files changed, 90 insertions, 70 deletions

diff --git a/games/tank/Makefile b/games/tank/Makefile
index dd420482d416..84ed8f426318 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -11,18 +11,18 @@ CATEGORIES=	games
 MASTER_SITES=	http://step.polymtl.ca/~coyote/tank/
 DISTFILES=	${DISTNAME}-src.tar.gz
 
-MAINTAINER=	dburr@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-BROKEN=	can\'t find glaux.h
+BUILD_DEPENDS=	${X11BASE}/lib/libaux.a:${PORTSDIR}/graphics/libaux
 
-USE_MESA=	YES
-USE_GMAKE=	YES
+USE_MESA=	yes
+USE_GMAKE=	yes
 ALL_TARGET=	linux-mesa-elf
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tank ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/lib/tank
-	${INSTALL_DATA} ${WRKSRC}/*.tga ${PREFIX}/lib/tank
-	${INSTALL_DATA} ${WRKSRC}/*.au ${PREFIX}/lib/tank
+	${MKDIR} ${PREFIX}/share/tank
+	${INSTALL_DATA} ${WRKSRC}/*.tga ${PREFIX}/share/tank
+	${INSTALL_DATA} ${WRKSRC}/*.au ${PREFIX}/share/tank
 
 .include <bsd.port.mk>
diff --git a/games/tank/files/patch-Makefile.Linux.Mesa b/games/tank/files/patch-Makefile.Linux.Mesa
new file mode 100644
index 000000000000..d35271343081
--- /dev/null
+++ b/games/tank/files/patch-Makefile.Linux.Mesa
@@ -0,0 +1,44 @@
+
+$FreeBSD$
+
+--- Makefile.Linux.Mesa.orig	Sun Feb  2 19:59:42 1997
++++ Makefile.Linux.Mesa	Wed Mar 14 13:02:41 2001
+@@ -3,23 +3,23 @@
+ 
+ .SUFFIXES: .cc .o
+ 
+-ARCH = -DLINUX -DMESA #-DSOUND
++ARCH = -DLINUX -DPREFIX=\"$(PREFIX)\" #-DUSING_MESA -DSOUND
+ 
+ MESA = Mesa
+ 
+-INCLUDE = -I/usr/include -I$(MESA)/include -I$(MESA)/include/GL
++INCLUDE = -I$(X11BASE)/include -I$(X11BASE)/include/GL
+ 
+-CFLAGS = $(INCLUDE) $(ARCH) -O2 -m486 -Wall -pipe \
++CFLAGS += $(INCLUDE) $(ARCH) -DSOUND -Wall -pipe \
+ 	-pedantic -funroll-loops -mieee-fp
+ 
+-LDFLAGS = -L/usr/X11R6/lib -L$(MESA)/lib
++LDFLAGS = -L$(X11BASE)/lib
+ 
+ TAR	= tar  
+ COMPRESS = compress -v
+ MV	= mv
+ RM	= rm -f 
+ LS	= /bin/ls
+-CC 	= gcc -Wall
++CC 	?= gcc -Wall
+ CD	= cd
+ 
+ .c.o:	
+@@ -31,8 +31,7 @@
+ linux-elf: $(Obj)
+ 	@echo "Linking $(Obj) to $(EXECNAME)..."
+ 	$(CC) -o $(EXECNAME) $(Obj) $(LDFLAGS) \
+-	-lMesaaux -lMesatk -lMesaGLU -lMesaGL \
+-	-lXext -lX11 -lm
++	-laux -lGLU -lGL -lXext -lX11 -lm
+ 	@echo "****** Done ******"
+ 
+ linux: $(Obj)
diff --git a/games/tank/files/patch-aa b/games/tank/files/patch-aa
index 823138066fc0..837375cb7799 100644
--- a/games/tank/files/patch-aa
+++ b/games/tank/files/patch-aa
@@ -24,30 +24,6 @@ diff -ruN ../../OLD/tank-0.4a/./Makefile ./Makefile
  	$(MAKE) -f Makefile.Linux clean
  
  backup:
-diff -ruN ../../OLD/tank-0.4a/./Makefile.Linux.Mesa ./Makefile.Linux.Mesa
---- ../../OLD/tank-0.4a/./Makefile.Linux.Mesa	Sun Feb  2 09:59:42 1997
-+++ ./Makefile.Linux.Mesa	Wed Mar  4 04:42:57 1998
-@@ -3,16 +3,16 @@
- 
- .SUFFIXES: .cc .o
- 
--ARCH = -DLINUX -DMESA #-DSOUND
-+ARCH = -DLINUX -DUSING_MESA #-DSOUND
- 
- MESA = Mesa
- 
--INCLUDE = -I/usr/include -I$(MESA)/include -I$(MESA)/include/GL
-+INCLUDE = -I/usr/include -I/usr/X11R6/include -I/usr/X11R6/include/GL
- 
--CFLAGS = $(INCLUDE) $(ARCH) -O2 -m486 -Wall -pipe \
-+CFLAGS = $(INCLUDE) $(ARCH) -DSOUND -O3 -m486 -Wall -pipe \
- 	-pedantic -funroll-loops -mieee-fp
- 
--LDFLAGS = -L/usr/X11R6/lib -L$(MESA)/lib
-+LDFLAGS = -L/usr/X11R6/lib
- 
- TAR	= tar  
- COMPRESS = compress -v
 diff -ruN ../../OLD/tank-0.4a/./collisions.c ./collisions.c
 --- ../../OLD/tank-0.4a/./collisions.c	Sun Feb  2 09:59:42 1997
 +++ ./collisions.c	Wed Mar  4 04:42:57 1998
@@ -80,7 +56,7 @@ diff -ruN ../../OLD/tank-0.4a/./defines.h ./defines.h
  /* ------------------------------------------------*/
  
 -#define TANK_HOME "/usr/games/tank-0.4a"
-+#define TANK_HOME "/usr/local/lib/tank"
++#define TANK_HOME (PREFIX "/share/tank")
  
  /* ------------------------------------------------*/
  /* Definitions du nombre maximum d'objets */
@@ -125,7 +101,7 @@ diff -ruN ../../OLD/tank-0.4a/./tank.c ./tank.c
          #ifdef SOUND
  
 -        if(system("cat eatthis.au >/dev/audio &") != 0) {
-+        if(system("cat /usr/local/lib/tank/eatthis.au >/dev/audio &") != 0) {
++        if(system("/bin/cat " PREFIX "/share/tank/eatthis.au >/dev/audio &") != 0) {
          
          }
          #endif
diff --git a/games/tank/pkg-plist b/games/tank/pkg-plist
index 0b4759946546..eca0e17b6986 100644
--- a/games/tank/pkg-plist
+++ b/games/tank/pkg-plist
@@ -1,38 +1,38 @@
 bin/tank
-lib/tank/eatthis.au
-lib/tank/expl01.tga
-lib/tank/expl02.tga
-lib/tank/expl03.tga
-lib/tank/expl04.tga
-lib/tank/expl05.tga
-lib/tank/expl06.tga
-lib/tank/expl07.tga
-lib/tank/expl08.tga
-lib/tank/expl09.tga
-lib/tank/expl10.tga
-lib/tank/expl11.tga
-lib/tank/expl12.tga
-lib/tank/expl13.tga
-lib/tank/expl14.tga
-lib/tank/expl15.tga
-lib/tank/expl16.tga
-lib/tank/expl17.tga
-lib/tank/expl18.tga
-lib/tank/expl19.tga
-lib/tank/expl20.tga
-lib/tank/explos.au
-lib/tank/miss01.tga
-lib/tank/miss02.tga
-lib/tank/miss03.tga
-lib/tank/miss04.tga
-lib/tank/miss05.tga
-lib/tank/miss06.tga
-lib/tank/miss07.tga
-lib/tank/miss08.tga
-lib/tank/miss09.tga
-lib/tank/miss10.tga
-lib/tank/miss11.tga
-lib/tank/miss12.tga
-lib/tank/miss13.tga
-lib/tank/miss14.tga
-@dirrm lib/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