- update to xevil-2.02r2

- fix HOMEPAGE and MASTER_SITES

games/xevil/Makefile

@@ -1,39 +1,44 @@
-# $OpenBSD: Makefile,v 1.21 2007/09/15 18:01:03 simon Exp $
+# $OpenBSD: Makefile,v 1.22 2007/12/07 15:54:56 ajacoutot Exp $
 #
 
 COMMENT=	side-view, fast-action, kill everything type of game
 
-DISTNAME=	xevil1.5
-PKGNAME=	xevil-1.5
+V=		2.02r2
+DISTNAME=	xevilsrc${V}
+PKGNAME=	xevil-${V}
+
 CATEGORIES=	games
 
-MASTER_SITES=	${MASTER_SITE_XCONTRIB:=games/xevil1.5/}
-EXTRACT_SUFX=	.tar.Z
+HOMEPAGE=	http://www.xevil.com/
+MASTER_SITES=	{HOMEPAGE}download/stable/
+EXTRACT_SUFX=	.zip
 
-# License: GPL
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 c m stdc++
+
+WANTLIB=	X11 Xpm c m stdc++
 
 USE_X11=	Yes
+USE_GMAKE=	Yes
 
 WRKDIST=	${WRKDIR}
+MAKE_FILE=	makefile
 
-ALL_TARGET=	freebsd
-MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
+ALL_TARGET=	openbsd
+MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" HOSTTYPE=openbsd
 
 NO_REGRESS=	Yes
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKBUILD}/xevil $(PREFIX)/bin
-	${INSTALL_MAN} ${WRKSRC}/xevil.6 $(PREFIX)/man/man6
-	cd ${WRKSRC} && ${INSTALL_DATA} \
-		${WRKSRC}/app-defaults/XEvil.iris \
-		${WRKSRC}/app-defaults/XEvil.mac \
-		${WRKSRC}/app-defaults/XEvil.sun3 \
-		${WRKSRC}/app-defaults/XEvil.sun4_sparc \
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xevil/html
+	${INSTALL_PROGRAM} ${WRKBUILD}/x11/OPENBSD/xevil \
+		${PREFIX}/bin/xevil
+	${INSTALL_DATA} ${WRKSRC}/x11/app-defaults/XEvil.* \
 		$(PREFIX)/lib/X11/app-defaults/
+	${INSTALL_DATA} ${WRKSRC}/instructions/* \
+		${PREFIX}/share/doc/xevil/html
 
 .include <bsd.port.mk>

games/xevil/distinfo

@@ -1,5 +1,5 @@
-MD5 (xevil1.5.tar.Z) = 6PTlkitx6dDv25qFH1PRHg==
-RMD160 (xevil1.5.tar.Z) = VL3ji4IMZNx91Jm2Y//CvI2DMcw=
-SHA1 (xevil1.5.tar.Z) = F9TnFBU9n4hKAJfP+q3CxYHDAkI=
-SHA256 (xevil1.5.tar.Z) = yDTD6iLyecO2GZCqONyrWL+i0C3phWlQk0ZjZv0c5wg=
-SIZE (xevil1.5.tar.Z) = 453590
+MD5 (xevilsrc2.02r2.zip) = CanvcgtyBLC+aMT0Yt7zcA==
+RMD160 (xevilsrc2.02r2.zip) = 3KgimKwt/mbk6SoCcxu2hRVjtn4=
+SHA1 (xevilsrc2.02r2.zip) = 6aJi2v/H7lwGGW3JTPNcGZvoa7w=
+SHA256 (xevilsrc2.02r2.zip) = Ract7291Mr1LcZOTLfCcG6Tq2iQzOCxJSzfUcz50MYg=
+SIZE (xevilsrc2.02r2.zip) = 1857315

games/xevil/patches/patch-Makefile

@@ -1,23 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.2 2004/01/24 23:06:35 naddy Exp $
---- Makefile.orig	1996-06-03 22:47:02.000000000 +0200
-+++ Makefile	2004-01-24 23:52:27.000000000 +0100
-@@ -8,8 +8,6 @@
- #### Defines that are applicable to makes on all architectures
- SHELL		=	/bin/sh
- TARGETS		=	xevil #xshow
--DEBUG_OPT	=	-O #-g#  #-DPRINT_ERRORS  
--LINK_OPT	=	-O
- 
- #SRC_DIR and WORK_DIR are only used for `make workdir`
- SRC_DIR		= 	/mit/hardts/src/X/xevil1.4.9
-@@ -94,8 +92,8 @@ ds:
- 
- 
- freebsd:
--	@$(MAKE) CC="c++" CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC" \
--INCL_DIRS=-I/usr/X11R6/include LIBS_DIRS=-L/usr/X11R6/lib \
-+	@$(MAKE) CC="${CXX}" CFLAGS="${CXXFLAGS} -DUSE_RANDOM -DPROTECTED_IS_PUBLIC" \
-+INCL_DIRS=-I${X11BASE}/include LIBS_DIRS=-L${X11BASE}/lib \
- LIBS="-lX11 -lm" $(TARGETS)
- 
- 

games/xevil/patches/patch-actual_C

@@ -1,14 +0,0 @@
-$OpenBSD: patch-actual_C,v 1.1 2004/01/24 23:06:35 naddy Exp $
---- actual.C.orig	1996-06-03 22:00:26.000000000 +0200
-+++ actual.C	2004-01-24 23:42:05.000000000 +0100
-@@ -30,7 +30,9 @@
- 
- 
- // Include Files
--#include <strstream.h>
-+#include <strstream>
-+
-+using namespace std;
- 
- #include "utils.h"
- #include "coord.h"

games/xevil/patches/patch-cmn_actual_cpp

@@ -0,0 +1,14 @@
+$OpenBSD: patch-cmn_actual_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/actual.cpp.orig	Wed Jan 19 12:54:36 2000
++++ cmn/actual.cpp	Fri Dec  7 14:14:44 2007
+@@ -32,7 +32,9 @@
+ 
+ // Include Files
+ #if X11
+-#include <strstream.h>
++#include <strstream>
++using namespace std;
++using namespace std;
+ #endif
+ #if WIN32
+ #include <strstrea.h>

games/xevil/patches/patch-cmn_area_cpp

@@ -0,0 +1,15 @@
+$OpenBSD: patch-cmn_area_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/area.cpp.orig	Fri Dec  7 13:57:54 2007
++++ cmn/area.cpp	Fri Dec  7 13:59:09 2007
+@@ -34,7 +34,10 @@
+ extern "C" {
+ #include <limits.h> // For INT_MAX
+ }
+-#include <iostream.h>
++#include <iostream>
++
++using namespace std;
++
+ #include "utils.h"
+ #include "coord.h"
+ #include "area.h"

games/xevil/patches/patch-cmn_game_cpp

@@ -0,0 +1,13 @@
+$OpenBSD: patch-cmn_game_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/game.cpp.orig	Sat Mar 22 22:20:00 2003
++++ cmn/game.cpp	Fri Dec  7 14:14:11 2007
+@@ -34,7 +34,8 @@ extern "C" {
+ }
+ 
+ #if X11
+-#include <strstream.h>
++#include <strstream>
++using namespace std;
+ #endif
+ #if WIN32
+ #include <strstrea.h>

games/xevil/patches/patch-cmn_game_h

@@ -0,0 +1,15 @@
+$OpenBSD: patch-cmn_game_h,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/game.h.orig	Fri Dec  7 14:02:32 2007
++++ cmn/game.h	Fri Dec  7 14:03:58 2007
+@@ -35,7 +35,10 @@
+ extern "C" {
+ #include <time.h>
+ }
+-#include <iostream.h>
++#include <iostream>
++
++using namespace std;
++
+ #include "utils.h"
+ #include "ui.h"
+ #include "world.h"

games/xevil/patches/patch-cmn_game_style_cpp

@@ -0,0 +1,18 @@
+$OpenBSD: patch-cmn_game_style_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/game_style.cpp.orig	Sat Mar 22 20:47:42 2003
++++ cmn/game_style.cpp	Fri Dec  7 14:24:57 2007
+@@ -29,12 +29,10 @@
+ 
+ // Include Files
+ #include "stdafx.h"
+-extern "C" {
+-#include <string.h>
+-}
++#include <cstring>
+ 
+ #if X11
+-#include <strstream.h>
++#include <strstream>
+ #endif
+ 
+ #if WIN32

games/xevil/patches/patch-cmn_game_style_h

@@ -0,0 +1,13 @@
+$OpenBSD: patch-cmn_game_style_h,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/game_style.h.orig	Sat Mar 22 20:22:30 2003
++++ cmn/game_style.h	Fri Dec  7 14:14:33 2007
+@@ -31,7 +31,8 @@
+ #endif 
+ 
+ #if X11
+-#include <strstream.h>
++#include <strstream>
++using namespace std;
+ #endif
+ #if WIN32
+ #include <strstrea.h>

games/xevil/patches/patch-cmn_intel_cpp

@@ -0,0 +1,18 @@
+$OpenBSD: patch-cmn_intel_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/intel.cpp.orig	Wed Mar 19 09:49:22 2003
++++ cmn/intel.cpp	Fri Dec  7 14:25:40 2007
+@@ -31,11 +31,10 @@
+ 
+ // Include Files
+ #include "stdafx.h"
+-extern "C" {
+-  #include <string.h>
+-}
++#include <cstring>
+ #if X11
+-#include <strstream.h>
++#include <strstream>
++using namespace std;
+ #endif
+ #if WIN32
+ #include <strstrea.h>

games/xevil/patches/patch-cmn_locator_h

@@ -0,0 +1,27 @@
+$OpenBSD: patch-cmn_locator_h,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/locator.h.orig	Sat Mar 22 20:35:30 2003
++++ cmn/locator.h	Fri Dec  7 14:48:13 2007
+@@ -47,8 +47,10 @@ the world. */
+ 
+ 
+ // Include Files
+-#include <iostream.h>
++#include <iostream>
+ 
++using namespace std;
++
+ #include "utils.h"
+ #include "coord.h"
+ #include "id.h"
+@@ -96,6 +98,11 @@ class SoundRequest;
+ #define OL_RECENT_SOUNDS_MAX 30
+ 
+ 
++class OLgridEntry;
++#if X11
++class OLshadowEntry;
++#endif
++
+ 
+ // An entry for one object in the list of all objects currently in the game.
+ class OLentry {

games/xevil/patches/patch-cmn_physical_cpp

@@ -0,0 +1,18 @@
+$OpenBSD: patch-cmn_physical_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/physical.cpp.orig	Fri Dec  7 14:00:16 2007
++++ cmn/physical.cpp	Fri Dec  7 14:05:56 2007
+@@ -33,10 +33,12 @@
+ // Include Files
+ #include "xdata.h"
+ #include "physical.h"
+-#include <iostream.h>
++#include <iostream>
+ 
++using namespace std;
++
+ #if X11
+-#include <strstream.h>
++#include <strstream>
+ #endif
+ #if WIN32
+ #include <strstrea.h>

games/xevil/patches/patch-cmn_physical_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-cmn_physical_h,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/physical.h.orig	Fri Dec  7 14:42:19 2007
++++ cmn/physical.h	Fri Dec  7 14:42:36 2007
+@@ -93,7 +93,7 @@
+    CLASSNAME::CLASSNAME(InStreamP in,const CLASSNAME ## Context &cx, \
+                          CLASSNAME ## Xdata &x_data, \
+                          WorldP w,LocatorP l) \
+-   : PARENT(in,cx. ## parent ## Context,x_data,w,l) 
++   : PARENT(in,cx. parent ## Context,x_data,w,l)
+ 
+ // Used by internal nodes and leaves.
+ #define DEFINE_UPDATE_FROM_STREAM(CLASSNAME,PARENT) \

games/xevil/patches/patch-cmn_role_cpp

@@ -0,0 +1,18 @@
+$OpenBSD: patch-cmn_role_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/role.cpp.orig	Fri Dec  7 14:00:38 2007
++++ cmn/role.cpp	Fri Dec  7 14:05:43 2007
+@@ -29,9 +29,12 @@
+ 
+ #include "stdafx.h"
+ 
+-#include <iostream.h>
++#include <iostream>
++
++using namespace std;
++
+ #if X11
+-#include <strstream.h>
++#include <strstream>
+ #include <time.h>
+ #endif
+ #if WIN32

games/xevil/patches/patch-cmn_streams_cpp

@@ -0,0 +1,15 @@
+$OpenBSD: patch-cmn_streams_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/streams.cpp.orig	Fri Dec  7 14:00:59 2007
++++ cmn/streams.cpp	Fri Dec  7 14:01:17 2007
+@@ -31,8 +31,10 @@
+ #include "utils.h"
+ #include "neth.h" // needed for recv, send, recvfrom, sendto
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
++using namespace std;
++
+ #include "streams.h"
+ #include "xetp.h" // yuck, need this for XETP::versionStr
+ 

games/xevil/patches/patch-cmn_utils_cpp

@@ -0,0 +1,31 @@
+$OpenBSD: patch-cmn_utils_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/utils.cpp.orig	Wed Mar 19 10:05:12 2003
++++ cmn/utils.cpp	Fri Dec  7 14:27:50 2007
+@@ -30,18 +30,21 @@
+ 
+ // Include Files
+ #include "stdafx.h"
+-#include <iostream.h>
+-#include <limits.h>
+-#include <string.h>
+-#include <ctype.h>
+-#include <fstream.h>
++#include <iostream>
++
++#include <climits>
++#include <cstring>
++#include <cctype>
++#include <fstream>
+ #if WIN32
+ #include <strstrea.h>
+ #endif
+ #if X11
+-#include <strstream.h>
++#include <strstream>
+ #endif
+ 
++using namespace std;
++
+ #ifdef WIN32
+ // For file manipulation routines.
+ #include <direct.h>

games/xevil/patches/patch-cmn_world_cpp

@@ -0,0 +1,15 @@
+$OpenBSD: patch-cmn_world_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/world.cpp.orig	Fri Dec  7 14:03:01 2007
++++ cmn/world.cpp	Fri Dec  7 14:03:16 2007
+@@ -35,8 +35,10 @@
+ #endif
+ 
+ // Include Files.
+-#include <iostream.h>
++#include <iostream>
+ 
++using namespace std;
++
+ #include "utils.h"
+ #include "coord.h"
+ #include "xdata.h"

games/xevil/patches/patch-cmn_xetp_cpp

@@ -0,0 +1,18 @@
+$OpenBSD: patch-cmn_xetp_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- cmn/xetp.cpp.orig	Fri Dec  7 14:03:22 2007
++++ cmn/xetp.cpp	Fri Dec  7 14:03:37 2007
+@@ -29,9 +29,12 @@
+ 
+ #include "stdafx.h"
+ 
+-#include <iostream.h>
++#include <iostream>
++
++using namespace std;
++
+ #if X11
+-#include <strstream.h>
++#include <strstream>
+ #endif
+ #if WIN32
+ #include <strstrea.h>

games/xevil/patches/patch-config_mk

@@ -0,0 +1,27 @@
+$OpenBSD: patch-config_mk,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- config.mk.orig	Sun Mar 23 00:08:58 2003
++++ config.mk	Fri Dec  7 14:50:49 2007
+@@ -34,7 +34,7 @@ TARGETS	    =   xevil
+ # 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   =   # -O -DNDEBUG
+ 
+ LINK_OPT    =	
+ 
+@@ -168,7 +168,14 @@ OBJ_DIR=$(DEPTH)/x11/FREEBSD PCKG_NAME="freebsd" \
+ LIBS="-lXpm -lX11 -lm" $(TARGETS)
+ 
+ 
++openbsd:
++	@$(MAKE) CC="${CXX}" \
++CFLAGS="-DUSE_RANDOM -DUSE_UINT_NET_LENGTH -DUNAME_USR_BIN ${CXXFLAGS}" \
++INCL_DIRS="-I$(X11BASE)/include" LIBS_DIRS="-L$(X11BASE)/lib" \
++OBJ_DIR=$(DEPTH)/x11/OPENBSD PCKG_NAME="openbsd" \
++LIBS="-lXpm -lX11 -lm" $(TARGETS)
+ 
++
+ hp700:
+ 	@$(MAKE) CC="g++" LIBS="-lXpm -lX11 -lm" INCL_DIRS="" CFLAGS="-DUSE_RANDOM -DRANDOM_NEEDS_PROTOTYPES -DMATH_H_IS_CC -DPROTECTED_IS_PUBLIC" \
+ $(TARGETS)

games/xevil/patches/patch-game_C

@@ -1,16 +0,0 @@
-$OpenBSD: patch-game_C,v 1.1 2004/01/24 23:06:35 naddy Exp $
---- game.C.orig	2004-01-24 23:44:18.000000000 +0100
-+++ game.C	2004-01-24 23:44:38.000000000 +0100
-@@ -34,9 +34,11 @@ extern "C" {
- #include <stdio.h>
- }
- 
--#include <strstream.h>
-+#include <strstream>
- #include <iomanip.h>
- 
-+using namespace std;
-+
- #include "utils.h"
- #include "coord.h"
- #include "world.h"

games/xevil/patches/patch-locator_h

@@ -1,12 +0,0 @@
-$OpenBSD: patch-locator_h,v 1.1 2002/09/28 22:04:09 naddy Exp $
---- locator.h.orig	Sat Sep 28 23:57:14 2002
-+++ locator.h	Sat Sep 28 23:58:25 2002
-@@ -74,7 +74,7 @@ typedef Neutral *NeutralP;
- #define OL_GRID_ROW_MAX 4
- #define OL_GRID_WIDTH (OL_GRID_COL_MAX * WSQUARE_WIDTH) // In pixels.
- #define OL_GRID_HEIGHT (OL_GRID_ROW_MAX * WSQUARE_HEIGHT) // In pixels.
--#define OL_GRID_SIZE_MAX (max(OL_GRID_WIDTH,OL_GRID_HEIGHT))
-+#define OL_GRID_SIZE_MAX (OL_GRID_WIDTH >= OL_GRID_HEIGHT ? OL_GRID_WIDTH : OL_GRID_HEIGHT)
- #define OL_GRID_HORIZ_MAX (W_COL_MAX_MAX / OL_GRID_COL_MAX + 1)// grid squares.
- #define OL_GRID_VERT_MAX (W_ROW_MAX_MAX / OL_GRID_ROW_MAX + 1) // grid squares.
- 

games/xevil/patches/patch-makefile

@@ -0,0 +1,15 @@
+$OpenBSD: patch-makefile,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- makefile.orig	Fri Dec  7 14:49:02 2007
++++ makefile	Fri Dec  7 14:49:30 2007
+@@ -63,11 +63,6 @@ $(OBJ_DIR)/xevil::
+ 
+ # 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:

games/xevil/patches/patch-physical_C

@@ -1,14 +0,0 @@
-$OpenBSD: patch-physical_C,v 1.1 2004/01/24 23:06:35 naddy Exp $
---- physical.C.orig	1996-06-03 22:05:28.000000000 +0200
-+++ physical.C	2004-01-24 23:42:13.000000000 +0100
-@@ -35,7 +35,9 @@ extern "C" {
- #include <string.h>
- }
- 
--#include <strstream.h>
-+#include <strstream>
-+
-+using namespace std;
- 
- #include "utils.h"
- #include "coord.h"

games/xevil/patches/patch-ui_C

@@ -1,14 +0,0 @@
-$OpenBSD: patch-ui_C,v 1.1 2004/01/24 23:06:35 naddy Exp $
---- ui.C.orig	1996-06-03 22:05:56.000000000 +0200
-+++ ui.C	2004-01-24 23:42:23.000000000 +0100
-@@ -42,7 +42,9 @@ extern "C"
- }
- 
- #include <iostream.h>
--#include <strstream.h>
-+#include <strstream>
-+
-+using namespace std;
- 
- #include "coord.h"
- #include "ui.h"

games/xevil/patches/patch-utils_h

@@ -1,12 +0,0 @@
-$OpenBSD: patch-utils_h,v 1.1 2001/03/17 15:14:55 wilfried Exp $
---- utils.h.orig	Mon Jun  3 22:06:44 1996
-+++ utils.h	Fri Mar 16 19:39:08 2001
-@@ -54,7 +54,7 @@ extern "C"
- 
- 
- // Defines
--#define MSEC_PER_CLOCK (1.0e3 / CLOCKS_PER_SEC) 
-+#define MSEC_PER_CLOCK 8 // (1.0e3 / CLOCKS_PER_SEC) 
- 
- #ifndef max
- #define max(a,b)               (a<b ? b : a)

games/xevil/patches/patch-x11_l_agreement_dlg_cpp

@@ -0,0 +1,15 @@
+$OpenBSD: patch-x11_l_agreement_dlg_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- x11/l_agreement_dlg.cpp.orig	Fri Dec  7 13:27:19 2007
++++ x11/l_agreement_dlg.cpp	Fri Dec  7 13:27:36 2007
+@@ -31,8 +31,10 @@ extern "C" {
+ #include <X11/Xatom.h>
+ }
+ 
+-#include <strstream.h>
++#include <strstream>
+ 
++using namespace std;
++
+ #include "xdata.h"
+ #include "panel.h"
+ #include "l_agreement.h"

games/xevil/patches/patch-x11_main_cpp

@@ -0,0 +1,15 @@
+$OpenBSD: patch-x11_main_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- x11/main.cpp.orig	Fri Dec  7 13:33:56 2007
++++ x11/main.cpp	Fri Dec  7 13:34:14 2007
+@@ -33,8 +33,10 @@ extern "C" {
+ #include <X11/Xos.h>
+ }
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
++using namespace std;
++
+ #include "utils.h"
+ #include "neth.h"
+ #include "game.h"

games/xevil/patches/patch-x11_panel_cpp

@@ -0,0 +1,17 @@
+$OpenBSD: patch-x11_panel_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- x11/panel.cpp.orig	Sat Mar 22 20:50:44 2003
++++ x11/panel.cpp	Fri Dec  7 13:34:24 2007
+@@ -31,9 +31,11 @@ extern "C" {
+ #include <X11/Xutil.h>
+ #include <X11/keysym.h>
+ }
+-#include <iostream.h>
+-#include <strstream.h>
++#include <iostream>
++#include <strstream>
+ 
++using namespace std;
++
+ #include "utils.h"
+ #include "xdata.h"
+ #include "panel.h"

games/xevil/patches/patch-x11_serverping_cpp

@@ -0,0 +1,17 @@
+$OpenBSD: patch-x11_serverping_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- x11/serverping.cpp.orig	Sat Mar 22 21:55:12 2003
++++ x11/serverping.cpp	Fri Dec  7 13:34:36 2007
+@@ -25,8 +25,11 @@
+ // code and should be reasonably easy to compile on Windows.
+ 
+ 
+-#include <iostream.h>
+-#include <strstream.h>
++#include <iostream>
++#include <strstream>
++
++using namespace std;
++
+ #include "utils.h"
+ #include "streams.h"
+ #include "xetp_basic.h"

games/xevil/patches/patch-x11_ui_cpp

@@ -0,0 +1,17 @@
+$OpenBSD: patch-x11_ui_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- x11/ui.cpp.orig	Wed Mar 19 10:05:38 2003
++++ x11/ui.cpp	Fri Dec  7 13:34:57 2007
+@@ -40,9 +40,11 @@ extern "C" {
+ #include <X11/Xatom.h>
+ }
+ 
+-#include <iostream.h>
+-#include <strstream.h>
++#include <iostream>
++#include <strstream>
+ 
++using namespace std;
++
+ #include "coord.h"
+ #include "area.h"
+ #include "xdata.h"

games/xevil/patches/patch-x11_viewport_cpp

@@ -0,0 +1,14 @@
+$OpenBSD: patch-x11_viewport_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- x11/viewport.cpp.orig	Fri Dec  7 13:25:41 2007
++++ x11/viewport.cpp	Fri Dec  7 13:26:03 2007
+@@ -44,8 +44,9 @@ extern "C" {
+ #include <X11/Xos.h>
+ #include <X11/keysym.h>
+ }
+-#include <strstream.h>
++#include <strstream>
+ 
++using namespace std;
+ 
+ #define TICK_BORDER_WIDTH 5 // border width big enough for a tick mark.
+ #define TICK_WIDTH 3

games/xevil/patches/patch-x11_xdata_cpp

@@ -0,0 +1,15 @@
+$OpenBSD: patch-x11_xdata_cpp,v 1.1 2007/12/07 15:54:56 ajacoutot Exp $
+--- x11/xdata.cpp.orig	Fri Dec  7 13:35:03 2007
++++ x11/xdata.cpp	Fri Dec  7 13:35:20 2007
+@@ -30,7 +30,10 @@
+ #include "xdata.h"
+ #include "area.h"
+ 
+-#include <iostream.h>
++#include <iostream>
++
++using namespace std;
++
+ #include <X11/Xutil.h>
+ #include <X11/xpm.h>
+ #include <X11/Xatom.h>

games/xevil/pkg/DESCR

@@ -1,26 +1,6 @@
-INTRO:
-
-Death, kill, maim.  XEvil is a side-view, fast-action, kill everything
-type of game.  Play is against other human or computer players.  XEvil
-is keyboard controlled with configurable controls.
-
-
-FEATURES:
-
-Color/Black&White/Grey Scale
-
-0, 1, or 2 player.  A single player can play against machine 
-players.  Multiple humans can play cooperatively against machine players or
-against each other.  You can watch machine players kill each other.
-
-Extreme violence.
-
-Assortment of characters, weapons, and items.  E.g. ninja, alien, 
-chainsaw, flame-thrower, Altar-Of-Sin, and soul-swapper.
-
-Keyboard controls can be configured with X resources or at runtime with the 
-graphical interface.
-
-Game speed can be adjusted.
-
-Different styles of game play: levels, kill-kill-kill, duel, training.
+XEvil is a 3rd person, side-view, fast-action,
+kill-them-before-they-kill-you game. Fight against either
+computer-controlled enemies, or another player.
+You sinned in life. And now you must pay. Satan pits the recently
+deceased against each other to fight for rank in Hell. Your skill
+determines your fate for all eternity. This contest is known as XEvil.

games/xevil/pkg/PLIST

@@ -1,7 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/09/15 00:46:11 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2007/12/07 15:54:56 ajacoutot Exp $
 bin/xevil
 lib/X11/app-defaults/XEvil.iris
 lib/X11/app-defaults/XEvil.mac
 lib/X11/app-defaults/XEvil.sun3
 lib/X11/app-defaults/XEvil.sun4_sparc
-@man man/man6/xevil.6
+share/doc/xevil/
+share/doc/xevil/html/
+share/doc/xevil/html/UNIXSetControls.gif
+share/doc/xevil/html/UNIXShowControls.gif
+share/doc/xevil/html/UNIXmenu.gif
+share/doc/xevil/html/instructions.html
+share/doc/xevil/html/keysdlg.gif
+share/doc/xevil/html/optionsdlg.gif