Merge xevil from pkgsrc-wip, update to 2.02.

Lots of changes.

6 files changed, 52 insertions, 122 deletions

diff --git a/games/xevil/patches/patch-aa b/games/xevil/patches/patch-aa
index 0d77bc94903..41f10afb347 100644
--- a/games/xevil/patches/patch-aa
+++ b/games/xevil/patches/patch-aa
@@ -1,57 +1,29 @@
-$NetBSD: patch-aa,v 1.3 1998/08/27 14:06:10 garbled Exp $
+$NetBSD: patch-aa,v 1.4 2005/01/25 16:02:26 xtraeme Exp $
 
---- Makefile.orig	Tue Oct  1 19:50:59 1996
-+++ Makefile	Fri Jul 31 09:49:41 1998
-@@ -8,8 +8,8 @@
- #### Defines that are applicable to makes on all architectures
- SHELL		=	/bin/sh
- TARGETS		=	xevil #xshow
--DEBUG_OPT	=	-g#  #-DPRINT_ERRORS  
--LINK_OPT	=	#-O
-+DEBUG_OPT	=	-O#  #-DPRINT_ERRORS  
-+LINK_OPT	=	-Wl,-R$(X11BASE)/lib #-O
+--- config.mk.orig	2003-03-23 00:08:58.000000000 +0000
++++ config.mk	2003-08-16 11:05:41.000000000 +0000
+@@ -36,7 +36,7 @@
+ # internally, so you do so at your own risk.
+ DEBUG_OPT   =   -O #-DNDEBUG
  
- #SRC_DIR and WORK_DIR are only used for `make workdir`
- SRC_DIR		= 	/mit/hardts/src/X/xevil1.4.9
-@@ -22,7 +22,7 @@
- OBJS		=	physical.o actual.o game.o main.o intel.o locator.o world.o \
- 			ui.o coord.o area.o utils.o 
- ARCHITECTURES	=	athena-sun4 athena-sun5 alpha decmips ds decstation \
--			freebsd hp700 iris4d \
-+			freebsd hp700 iris4d netbsd \
- 			jsc-sun4 i386-linux rsaix sun4 sun5 vision-sun4 
- STRIP		=	strip
+-LINK_OPT    =	
++LINK_OPT    =	$(COMPILER_RPATH_FLAG)$(X11BASE)/lib
  
-@@ -33,6 +33,8 @@
+ # The string that will be used for making the packaged .tar.Z file.
+ VERSION     =   2.02r2
+@@ -160,11 +160,11 @@
  
- #### Attempt to guesss the host architecture using the HOSTYPE and hostype
- # variables.  Then call self with the architecture name.
-+all: default
-+
- default:
- 	@if [ $${HOSTTYPE-bob} != bob ] ; then \
- 		archit=$$HOSTTYPE ; \
-@@ -50,7 +52,9 @@
- 		echo "{$(ARCHITECTURES)}" ; \
- 	fi ;
+ # The -DMSEC_PER_CLOCK=8 is kind of a hack, take it out if the game speed of 
+ # XEvil is all screwed up.
+-freebsd:
++pkgsrc:
+ 	@$(MAKE) CC="c++" \
+-CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC -DMSEC_PER_CLOCK=8 -DUNAME_USR_BIN" \
+-INCL_DIRS="-I/usr/X11R6/include" LIBS_DIRS="-L/usr/X11R6/lib" \
+-OBJ_DIR=$(DEPTH)/x11/FREEBSD PCKG_NAME="freebsd" \
++CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC -DUSE_UINT_NET_LENGTH ${CFLAGS}" \
++INCL_DIRS="-I$(X11BASE)/include" LIBS_DIRS="-L$(X11BASE)/lib" \
++OBJ_DIR=$(DEPTH)/x11/PKGSRC PCKG_NAME="pkgsrc" \
+ LIBS="-lXpm -lX11 -lm" $(TARGETS)
  
--
-+install: xevil
-+	${INSTALL_PROGRAM} xevil ${PREFIX}/bin
-+	${INSTALL_MAN} xevil.6 ${PREFIX}/man/man6
  
- #### Specific architectures.  
- ## Feel free to modify one of these to accomodate your machine's configuration.
-@@ -100,7 +104,11 @@
- INCL_DIRS=-I/usr/X11R6/include LIBS_DIRS=-L/usr/X11R6/lib \
- LIBS="-lX11 -lm" $(TARGETS)
- 
--
-+netbsd:
-+	@$(MAKE) CC="c++" \
-+CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC -DMSEC_PER_CLOCK=8" \
-+INCL_DIRS=-I$(X11BASE)/include LIBS_DIRS=-L$(X11BASE)/lib \
-+LIBS="-lX11 -lm" $(TARGETS)
- 
- hp700:
- 	@$(MAKE) CC="g++" LIBS="-lX11 -lm" INCL_DIRS="" CFLAGS="-DUSE_RANDOM -DRANDOM_NEEDS_PROTOTYPES -DMATH_H_IS_CC -DPROTECTED_IS_PUBLIC" \
diff --git a/games/xevil/patches/patch-ab b/games/xevil/patches/patch-ab
index acda07c8de7..b06632152c6 100644
--- a/games/xevil/patches/patch-ab
+++ b/games/xevil/patches/patch-ab
@@ -1,31 +1,17 @@
-$NetBSD: patch-ab,v 1.3 2004/03/26 01:34:08 kristerw Exp $
+$NetBSD: patch-ab,v 1.4 2005/01/25 16:02:26 xtraeme Exp $
 
---- actual.C.orig	Tue Sep 24 00:18:08 1996
-+++ actual.C	Fri Mar 26 02:17:46 2004
-@@ -23,6 +23,7 @@
-     hardts@alum.mit.edu
-     http://graphics.lcs.mit.edu/~hardts/xevil.html
- */
-+using namespace std;
+--- cmn/utils.cpp.orig	Sun Apr 13 15:11:54 2003
++++ cmn/utils.cpp	Sun Apr 13 15:12:19 2003
+@@ -483,11 +483,7 @@
+ #endif
  
- #ifndef NO_PRAGMAS
- #pragma implementation "actual.h"
-@@ -30,7 +31,8 @@
  
+-#ifdef UNAME_USR_BIN
+-#define UNAME_PATH "/usr/bin/uname"
+-#else
+-#define UNAME_PATH "/bin/uname"
+-#endif
++#define UNAME_PATH "@UNAME@"
  
- // Include Files
--#include <strstream.h>
-+#include <strstream>
-+using std::ostrstream;
- 
- #include "utils.h"
- #include "coord.h"
-@@ -685,7 +687,7 @@
- // More general and easy to extend.
- PhysicalP Transmogifier::new_physical(const Pos &middle)
- {
--  PhysicalContext *list[A_CLASSES_NUM];
-+  const PhysicalContext *list[A_CLASSES_NUM];
-   int size;
-   LocatorP l = get_locator();
-   WorldP w = get_world();
+ #ifdef X11
+   FILE* fp = popen(UNAME_PATH " -a","r");
diff --git a/games/xevil/patches/patch-ac b/games/xevil/patches/patch-ac
index 3eec6d2db1c..59a83883c2f 100644
--- a/games/xevil/patches/patch-ac
+++ b/games/xevil/patches/patch-ac
@@ -1,44 +1,16 @@
-$NetBSD: patch-ac,v 1.3 2004/03/26 01:34:08 kristerw Exp $
+$NetBSD: patch-ac,v 1.4 2005/01/25 16:02:26 xtraeme Exp $
 
---- game.C.orig	Tue Sep 24 02:27:18 1996
-+++ game.C	Fri Mar 26 02:19:24 2004
-@@ -22,6 +22,7 @@
-     hardts@alum.mit.edu
-     http://graphics.lcs.mit.edu/~hardts/xevil.html
- */
-+using namespace std;
+--- makefile.orig	2003-03-23 00:09:08.000000000 +0000
++++ makefile	2003-08-16 11:20:02.000000000 +0000
+@@ -63,11 +63,6 @@
  
- #ifndef NO_PRAGMAS
- #pragma implementation "game.h"
-@@ -34,7 +35,7 @@
- #include <stdio.h>
- }
+ # Could also include serverping in the distribution
+ $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z::
+-	cp readme.txt $(OBJ_DIR)
+-	cp gpl.txt $(OBJ_DIR)
+-	cp -r instructions $(OBJ_DIR)
+-	(cd $(OBJ_DIR); tar cf xevil$(VERSION).$(PCKG_NAME).tar xevil readme.txt gpl.txt instructions)
+-	(cd $(OBJ_DIR); $(COMPRESS) -f xevil$(VERSION).$(PCKG_NAME).tar)
  
--#include <strstream.h>
-+#include <strstream>
- #include <iomanip.h>
- 
- #include "utils.h"
-@@ -386,11 +387,11 @@
-   
-   // Get arrays of potential weapons and potential otherItems.
-   int weaponsNum;
--  PhysicalContext *weapons[A_CLASSES_NUM];
-+  const PhysicalContext *weapons[A_CLASSES_NUM];
-   weaponsNum = locator->filter_contexts(weapons,NULL,
- 					potential_weapon_filter);
-   int oItemsNum;
--  PhysicalContext *oItems[A_CLASSES_NUM];
-+  const PhysicalContext *oItems[A_CLASSES_NUM];
-   oItemsNum = locator->filter_contexts(oItems,NULL,
- 				       potential_other_item_filter);
-   
-@@ -1381,7 +1382,7 @@
-       // Choose class randomly.
- 
-       // Get list of all classes that are potential Human classes.
--      PhysicalContext *list[A_CLASSES_NUM];
-+      const PhysicalContext *list[A_CLASSES_NUM];
-       int size = locator.filter_contexts(list,NULL,potential_human_filter);
-       assert(size);
-       theContext = list[Utils::choose(size)];
+ ## Make a distribution file.
+ #dist:
diff --git a/games/xevil/patches/patch-ad b/games/xevil/patches/patch-ad
index 985d4da950e..addc5959904 100644
--- a/games/xevil/patches/patch-ad
+++ b/games/xevil/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
+$NetBSD: patch-ad,v 1.2 2005/01/25 16:02:26 xtraeme Exp $
 
 --- cmn/area.cpp.orig	2003-11-22 10:53:19.000000000 -0800
 +++ cmn/area.cpp	2003-11-22 10:53:47.000000000 -0800
diff --git a/games/xevil/patches/patch-ae b/games/xevil/patches/patch-ae
index b5c9be7a792..b36643a42d2 100644
--- a/games/xevil/patches/patch-ae
+++ b/games/xevil/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
+$NetBSD: patch-ae,v 1.2 2005/01/25 16:02:26 xtraeme Exp $
 
 --- cmn/role.cpp.orig	2000-01-19 12:54:34.000000000 -0800
 +++ cmn/role.cpp	2003-11-22 10:55:47.000000000 -0800
diff --git a/games/xevil/patches/patch-af b/games/xevil/patches/patch-af
index 61f278ea1fa..8fee72be442 100644
--- a/games/xevil/patches/patch-af
+++ b/games/xevil/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
+$NetBSD: patch-af,v 1.2 2005/01/25 16:02:26 xtraeme Exp $
 
 --- cmn/game_style.h.orig	2003-11-22 10:56:44.000000000 -0800
 +++ cmn/game_style.h	2003-11-22 10:56:59.000000000 -0800