Remove silly ${OSS} in compile target. Fix errno. Annoate DragonFly

need of -lcompat.

4 files changed, 51 insertions, 12 deletions

diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index 3e8fff9e880..1163cf74903 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/02/05 23:09:12 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/28 14:58:32 joerg Exp $
 
 DISTNAME=		battalion
 PKGNAME=		battalion-1.4
@@ -19,10 +19,8 @@ USE_TOOLS+=		gtar
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
 MAKE_ENV+=	LIBFLAGS=-lcompat
-.elif ${OPSYS} == "Linux"
-MAKE_ENV+=	OS="-DLINUXVERSION"
 .endif
 
 INSTALLATION_DIRS=	bin man/man6
diff --git a/games/battalion/distinfo b/games/battalion/distinfo
index fa4217ba2ed..9281a85b62f 100644
--- a/games/battalion/distinfo
+++ b/games/battalion/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 23:11:54 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/04/28 14:58:32 joerg Exp $
 
 SHA1 (battalionSource1.4.tar.Z) = 50891668a9b6745fcb4e070805c085487a5176d8
 RMD160 (battalionSource1.4.tar.Z) = 109e5e38239f2c1d05cd4ab9619634c2d44ce890
@@ -6,5 +6,6 @@ Size (battalionSource1.4.tar.Z) = 186221 bytes
 SHA1 (battalionSUN4.tar.gz) = 5cc314e192320a7505dddf730bbcccaef212ff4a
 RMD160 (battalionSUN4.tar.gz) = 73c6ad54673918b55100f671dfdba4e09d980703
 Size (battalionSUN4.tar.gz) = 1593265 bytes
-SHA1 (patch-aa) = 1e9f44cfa4af24d422a4c9283c12c03770a508e3
+SHA1 (patch-aa) = 1f32510f308e8c081d9a23f7213c564035e0c823
 SHA1 (patch-ab) = a47c5be93d82555b4fed23f5d5e71169859ebb49
+SHA1 (patch-ac) = a2b15a1bbff53cd6804b063dc776c34fcf55ecba
diff --git a/games/battalion/patches/patch-aa b/games/battalion/patches/patch-aa
index 776c9fb6a2e..15283586adc 100644
--- a/games/battalion/patches/patch-aa
+++ b/games/battalion/patches/patch-aa
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2005/02/13 21:03:41 minskim Exp $
---- Makefile.orig	Thu Jan 16 17:31:58 1997
-+++ Makefile	Wed Apr 12 21:03:39 2000
+$NetBSD: patch-aa,v 1.11 2006/04/28 14:58:32 joerg Exp $
+
+--- Makefile.orig	1997-01-16 16:31:58.000000000 +0000
++++ Makefile
 @@ -23,7 +23,7 @@
  # (the program should compile with no warning messages - if you
  #  see a warning message please let me know about it)
@@ -10,7 +11,7 @@ $NetBSD: patch-aa,v 1.10 2005/02/13 21:03:41 minskim Exp $
  
  
  # STEP 2: IF YOU WANT TO COMPILE WITH THE MESA LIBRARIES THEN
-@@ -51,7 +51,7 @@
+@@ -51,7 +51,7 @@ GLIB =  -lGL -lGLU
  #         with the other Makefile.)
  #
  # ------------------------------------------------------------
@@ -19,7 +20,7 @@ $NetBSD: patch-aa,v 1.10 2005/02/13 21:03:41 minskim Exp $
  # or
  #OS = -DSUNVERSION
  # or
-@@ -77,8 +77,8 @@
+@@ -77,8 +77,8 @@ OS = -DSGIVERSION
  # in audio.c then everything works fine.
  #
  # ------------------------------------------------------------
@@ -30,7 +31,7 @@ $NetBSD: patch-aa,v 1.10 2005/02/13 21:03:41 minskim Exp $
  
  
  # STEP 6: IF YOU ARE COMPILING FOR A SUN AND WANT (RUDIMENTARY)
-@@ -91,13 +91,15 @@
+@@ -91,13 +91,15 @@ AUDIODEF = -DSGIAUDIO
  
  # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
  # ------------------------------------------------------------
@@ -49,3 +50,12 @@ $NetBSD: patch-aa,v 1.10 2005/02/13 21:03:41 minskim Exp $
  
  # you should now be able to type 'make' and everything should be fine ...
  
+@@ -111,7 +113,7 @@ LIBS    = -L./. -L/usr/X11R6/lib -lm -lX
+ all:	$(TARGET)
+ 
+ $(OBJ): $(?:.o=.c)
+-	$(CC) $(CFLAGS) $(LIBFLAG) $(OS) $(WHICHLIB) $(AUDIODEF) -c $?
++	$(CC) $(CFLAGS) $(LIBFLAG) $(WHICHLIB) $(AUDIODEF) -c $?
+ 
+ $(TARGET): $(OBJ)
+ 	$(CC) -o $(TARGET) $(OBJ) $(LIBFLAGS) $(GLIB) $(LIBS) $(AUDIOLIB)
diff --git a/games/battalion/patches/patch-ac b/games/battalion/patches/patch-ac
new file mode 100644
index 00000000000..a7bc3d5d513
--- /dev/null
+++ b/games/battalion/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.1 2006/04/28 14:58:32 joerg Exp $
+
+--- net.c.orig	2006-04-28 14:49:37.000000000 +0000
++++ net.c
+@@ -22,6 +22,7 @@
+  * ocassionally wehn switching from demo to game mode the screen goes
+  * black and everything stops
+  */
++#include <errno.h>
+ #include "battalion.h"
+ 
+ /*****************/
+@@ -627,9 +628,6 @@ void processClient(time_t now, int mainC
+     int j;
+     int frameNum;
+ 
+-    extern int errno;
+-     
+-
+     /* send a request every once in a while until connection established */
+     /* if I haven't seen any data from the server in a while try to reconnect */
+     /* this may be a bit harsh to say connected = 0 */
+@@ -778,7 +776,6 @@ void processNetwork(time_t now, int main
+     char command[MAXLINE];
+ 
+     struct targetInfo * tempTarget;
+-    extern int errno;
+     
+     int clilen;
+     int oldClient;