- Unbreak on -CURRENT

- Remove website that no longer mentions this
- Remove dead mastersite

Approved by:	marcus (backup mentor)

3 files changed, 67 insertions, 11 deletions

diff --git a/games/xrisk/Makefile b/games/xrisk/Makefile
index f8d974026281..f4f3656f96f1 100644
--- a/games/xrisk/Makefile
+++ b/games/xrisk/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xrisk
 PORTVERSION=	2.15
 CATEGORIES=	games
-MASTER_SITES=	http://my.pages.de/pub/comp/games/xrisk/ \
-		http://www.mikro.biologie.tu-muenchen.de/pub/rec/games/xrisk/
+MASTER_SITES=	http://my.pages.de/pub/comp/games/xrisk/
 
 MAINTAINER=	adam-ports@blacktabby.org
 COMMENT=	A game for X11, much like the popular board game
@@ -19,10 +18,4 @@ MAN6=		xrisk.6
 
 RESTRICTED=	"Possible trademark infringement"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/xrisk/files/patch-src-risklib.c b/games/xrisk/files/patch-src-risklib.c
new file mode 100644
index 000000000000..8dbdd0437f39
--- /dev/null
+++ b/games/xrisk/files/patch-src-risklib.c
@@ -0,0 +1,65 @@
+--- src/risklib.c.orig	Wed Oct 27 11:02:08 1993
++++ src/risklib.c	Sat Nov 15 15:43:46 2003
+@@ -1,18 +1,16 @@
+ #include "xrisk.h"
+ #include "xrisklibex.h"
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <ctype.h>
+ 
+ /* Function to jump to when writing error_msg etc., extits to unix */
+-void risk_exit(format,va_alist)
+-     char *format;
+-     va_dcl
++void risk_exit(char *format,...)
+ {
+   va_list  ap;
+   char    *args[5];
+   int      argno = 0;
+   
+-  va_start (ap);
++  va_start (ap, format);
+   while ((argno<5)&&((args[argno++] = va_arg(ap, char *)) != LAST_ARG));
+   va_end (ap);
+   fprintf(stderr,format,args[0],args[1],args[2],args[3],args[4]);
+@@ -126,17 +124,14 @@
+ }
+ 
+ /* Write msg with arguments to user */ 
+-void write_msg_arg(player,va_alist)
+-     playerp player;
+-     va_dcl
++void write_msg_arg(playerp player,char *file,...)
+ {
+   va_list  ap;
+-  char    *file;
+   char    *args[5];
+   char     msg[MAXLEN_MISC];
+   int      argno = 0;
+-  va_start (ap);
+-  file = mappet(va_arg(ap, char *));
++  va_start (ap, file);
++  file = mappet(file);
+   while ((argno<5)&&((args[argno++] = va_arg(ap, char *)) != LAST_ARG));
+   va_end (ap);
+   mappargs(file,args,argno);
+@@ -176,16 +171,14 @@
+ }
+ 
+ /* Write a message with arguments to all players */
+-void write_msg_all_arg(va_alist)
+-     va_dcl
++void write_msg_all_arg(char *file,...)
+ {
+   va_list  ap;
+-  char    *file;
+   char    *args[5];
+   char     msg[MAXLEN_MISC];
+   int argno = 0;
+-  va_start (ap);
+-  file = mappet(va_arg(ap, char *));
++  va_start (ap, file);
++  file = mappet(file);
+   while ((argno<5)&& ((args[argno++] = va_arg(ap, char *)) != LAST_ARG) );
+   va_end (ap);
+   mappargs(file,args,argno);
diff --git a/games/xrisk/pkg-descr b/games/xrisk/pkg-descr
index 2e7835a06d54..a0993b9c966c 100644
--- a/games/xrisk/pkg-descr
+++ b/games/xrisk/pkg-descr
@@ -2,6 +2,4 @@ Xrisk is based on the boardgame Risk.  It can run as server or client,
 and allows up to 8 players to play at once.  The object of the game
 is World Conquest.
 
-WWW: http://www.pvv.ntnu.no/projects.html
-
 -Adam <adam-ports@blacktabby.org>