Upgrade to version 2.02 and change maintainer.

PR:		ports/23533
Submitted by:	Göran Runfeldt <goranrunfeldt@home.se>

4 files changed, 73 insertions, 19 deletions

diff --git a/games/xevil/files/patch-aa b/games/xevil/files/patch-aa
index eef6d10..ea4cd3e 100644
--- a/games/xevil/files/patch-aa
+++ b/games/xevil/files/patch-aa
@@ -1,19 +1,37 @@
-*** utils.h~	Mon Jul 24 22:22:34 1995
---- utils.h	Thu Sep 14 04:28:35 1995
-***************
-*** 54,60 ****
-  
-  
-  // Defines
-! #define MSEC_PER_CLOCK (1.0e3 / CLOCKS_PER_SEC) 
-  
-  #ifndef max
-  #define max(a,b)               (a<b ? b : a)
---- 54,60 ----
-  
-  
-  // Defines
-! #define MSEC_PER_CLOCK 8 // (1.0e3 / CLOCKS_PER_SEC) 
-  
-  #ifndef max
-  #define max(a,b)               (a<b ? b : a)
+--- config.mk.orig	Wed Jan 19 14:19:04 2000
++++ config.mk	Thu Dec 21 19:40:33 2000
+@@ -34,12 +34,12 @@
+ # You can add -DNDEBUG to speed up a release build by removing the assert() 
+ # calls.  But, on a really obscure Linux machine, this caused Xlib to blow up 
+ # internally, so you do so at your own risk.
+-DEBUG_OPT   =   -O #-DNDEBUG
++DEBUG_OPT   =   -DNDEBUG
+ 
+ LINK_OPT    =	
+ 
+ # The string that will be used for making the packaged .tar.Z file.
+-VERSION     =   2.01
++VERSION     =   2.02
+ 
+ #SRC_DIR and WORK_DIR are only used for `make workdir`
+ SRC_DIR		= 	/mit/hardts/src/X/xevil1.4.9
+@@ -83,7 +83,9 @@
+ #### Attempt to guesss the host architecture using the HOSTYPE and hostype
+ # variables.  Then call self with the architecture name.
+ default:
+-	@if [ $${HOSTTYPE-bob} != bob ] ; then \
++	@if [ $${OPSYS-bob} != bob ]; then \
++		archit=$$OPSYS ; \
++	elif [ $${HOSTTYPE-bob} != bob ] ; then \
+ 		archit=$$HOSTTYPE ; \
+ 	elif [ $${hosttype-bob} != bob ] ; then \
+ 		archit=$$hosttype ; \
+@@ -162,7 +164,7 @@
+ # XEvil is all screwed up.
+ freebsd:
+ 	@$(MAKE) CC="c++" \
+-CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC -DMSEC_PER_CLOCK=8 -DUNAME_USR_BIN" \
++CFLAGS="-DUSE_RANDOM -DUSE_UINT_NET_LENGTH -DUNAME_USR_BIN ${CFLAGS}" \
+ INCL_DIRS="-I/usr/X11R6/include" LIBS_DIRS="-L/usr/X11R6/lib" \
+ OBJ_DIR=$(DEPTH)/x11/FREEBSD PCKG_NAME="freebsd" \
+ LIBS="-lXpm -lX11 -lm" $(TARGETS)
diff --git a/games/xevil/files/patch-ab b/games/xevil/files/patch-ab
new file mode 100644
index 0000000..4afdb16
--- /dev/null
+++ b/games/xevil/files/patch-ab
@@ -0,0 +1,11 @@
+--- x11/ui.cpp~	Wed Jan 19 12:54:14 2000
++++ x11/ui.cpp	Thu Dec 21 19:41:38 2000
+@@ -1322,7 +1322,7 @@
+       
+       // Get font.  Use user-specified font if given.
+       // regular size font.
+-      char *theFont = fontName ? fontName : DEFAULT_FONT_NAME;
++      const char *theFont = fontName ? fontName : DEFAULT_FONT_NAME;
+       xvars.font[xvars.dpyMax] = 
+         XLoadQueryFont(xvars.dpy[xvars.dpyMax],theFont);
+       if (!xvars.font[xvars.dpyMax]) {
diff --git a/games/xevil/files/patch-ac b/games/xevil/files/patch-ac
new file mode 100644
index 0000000..d15d837
--- /dev/null
+++ b/games/xevil/files/patch-ac
@@ -0,0 +1,11 @@
+--- cmn/intel.cpp~	Wed Jan 19 12:54:34 2000
++++ cmn/intel.cpp	Thu Dec 21 19:42:34 2000
+@@ -1606,7 +1606,7 @@
+ Boolean Machine::weapon_current_is_drop_liftable(PhysicalP p) {
+   // This is a HACK, we should really make Lifter override 
+   // get_weapon_current(), etc.
+-  char *dummy;
++  const char *dummy;
+   ClassId classId = p->get_weapon_string(dummy);
+   if (classId == A_DropLiftable) {
+     return True;
diff --git a/games/xevil/files/patch-ad b/games/xevil/files/patch-ad
new file mode 100644
index 0000000..3782a25
--- /dev/null
+++ b/games/xevil/files/patch-ad
@@ -0,0 +1,14 @@
+--- Makefile~	Wed Jan 19 13:08:50 2000
++++ Makefile	Thu Dec 21 19:43:26 2000
+@@ -63,11 +63,6 @@
+ 
+ # 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)
+ 
+ ## Make a distribution file.
+ dist: