Merge xevil from pkgsrc-wip, update to 2.02.

Lots of changes.

1 files changed, 23 insertions, 51 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" \