Update to 2.02r2, fixing the build on -current.

6 files changed, 10 insertions, 42 deletions

diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index afa2143f5c62..e41c8458a91f 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	xevil
-PORTVERSION=	2.02
+PORTVERSION=	2.02.r2
 CATEGORIES=	games
 MASTER_SITES=	http://www.xevil.com/download/stable/
-DISTNAME=	xevilsrc${PORTVERSION}
+DISTNAME=	xevilsrc${PORTVERSION:S/.r/r/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A fast-action, networked, anti-social, kill-everything game
@@ -21,10 +21,6 @@ ALL_TARGET=	freebsd
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 # I'm not sure if this should be here
 .if (${MACHINE} == "alpha")
 CFLAGS+="-DXEVIL_KEYSET=UIalpha"
diff --git a/games/xevil/distinfo b/games/xevil/distinfo
index 987cf5b5c627..2057fd58f008 100644
--- a/games/xevil/distinfo
+++ b/games/xevil/distinfo
@@ -1 +1 @@
-MD5 (xevilsrc2.02.zip) = e1890f77144367e2e8bbf3609458b784
+MD5 (xevilsrc2.02r2.zip) = 09a9ef720b7204b0be68c4f462def370
diff --git a/games/xevil/files/patch-aa b/games/xevil/files/patch-aa
index ea4cd3e46cbc..32472679189a 100644
--- a/games/xevil/files/patch-aa
+++ b/games/xevil/files/patch-aa
@@ -1,6 +1,6 @@
---- config.mk.orig	Wed Jan 19 14:19:04 2000
-+++ config.mk	Thu Dec 21 19:40:33 2000
-@@ -34,12 +34,12 @@
+--- config.mk.orig	Sun Mar 23 00:08:58 2003
++++ config.mk	Sun May 18 12:02:44 2003
+@@ -34,7 +34,7 @@
  # 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.
@@ -9,12 +9,6 @@
  
  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.
diff --git a/games/xevil/files/patch-ab b/games/xevil/files/patch-ab
deleted file mode 100644
index 4afdb165a17d..000000000000
--- a/games/xevil/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index d15d837ad957..000000000000
--- a/games/xevil/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
index 3782a2529f40..d9b25e4b7972 100644
--- a/games/xevil/files/patch-ad
+++ b/games/xevil/files/patch-ad
@@ -1,5 +1,5 @@
---- Makefile~	Wed Jan 19 13:08:50 2000
-+++ Makefile	Thu Dec 21 19:43:26 2000
+--- Makefile.orig	Sun Mar 23 00:09:08 2003
++++ Makefile	Sun May 18 12:05:08 2003
 @@ -63,11 +63,6 @@
  
  # Could also include serverping in the distribution
@@ -8,7 +8,7 @@
 -	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)
+-	(cd $(OBJ_DIR); $(COMPRESS) -f xevil$(VERSION).$(PCKG_NAME).tar)
  
  ## Make a distribution file.
- dist:
+ #dist: