7 files changed, 91 insertions, 62 deletions

diff --git a/games/xrisk/Makefile b/games/xrisk/Makefile
index 8b46d6a70d45..5d3c3419947a 100644
--- a/games/xrisk/Makefile
+++ b/games/xrisk/Makefile
@@ -1,23 +1,20 @@
 # New ports collection makefile for:    xrisk
-# Date created:         4 Jan 1995
-# Whom:                 swallace
+# Date created:		4 Jan 1995
+# Whom:			swallace
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xrisk
-PORTVERSION=	2.13
+PORTVERSION=	2.15
 CATEGORIES=	games
-MASTER_SITES=	http://people.freebsd.org/~steve/distfiles/ \
-		ftp://geocub.greco-prog.fr/pub/Games/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://ftp.pvv.unit.no/pvv/games/
 
 MAINTAINER=	swallace@FreeBSD.org
 
+USE_IMAKE=	yes
 MAN6=		xrisk.6
-MANCOMPRESSED=	yes
 
-USE_X_PREFIX=	yes
 RESTRICTED=	"Possible trademark infringement"
 
 .include <bsd.port.mk>
diff --git a/games/xrisk/distinfo b/games/xrisk/distinfo
index cc1c5717aa43..52e151d443ff 100644
--- a/games/xrisk/distinfo
+++ b/games/xrisk/distinfo
@@ -1 +1 @@
-MD5 (xrisk-2.13.tar.Z) = 3b0e5bf9c22f633d7afdda54a2160aa8
+MD5 (xrisk-2.15.tar.gz) = 469209c189135a0fb7805ef70b05bc41
diff --git a/games/xrisk/files/patch-aa b/games/xrisk/files/patch-aa
new file mode 100644
index 000000000000..c64fdf70ee09
--- /dev/null
+++ b/games/xrisk/files/patch-aa
@@ -0,0 +1,11 @@
+--- xrisk.def.orig	Wed Oct 27 19:14:11 1993
++++ xrisk.def	Fri Feb 11 15:46:40 2000
+@@ -3,6 +3,8 @@
+ /* EXTRA_DEFINES = -D_NO_PROTO */
+ RISKBINDIR    = $(BINDIR)
+ RISKLIBDIR    = $(LIBDIR)/xrisk
++MANDIR        = $(MANPATH)/man6
++MANSUFFIX     = 6
+ 
+ /*
+   If you prefere mappings other than english check out if it exists (or write
diff --git a/games/xrisk/files/patch-ab b/games/xrisk/files/patch-ab
new file mode 100644
index 000000000000..90039a846601
--- /dev/null
+++ b/games/xrisk/files/patch-ab
@@ -0,0 +1,8 @@
+--- doc/Imakefile.orig	Sun Jul 18 00:18:14 1993
++++ doc/Imakefile	Tue Feb  1 22:39:11 2000
+@@ -1,5 +1,3 @@
+ #include "../xrisk.def"
+ 
+-all:
+-
+ InstallManPage(xrisk,$(MANDIR))
diff --git a/games/xrisk/files/patch-ac b/games/xrisk/files/patch-ac
new file mode 100644
index 000000000000..1547b5c71d13
--- /dev/null
+++ b/games/xrisk/files/patch-ac
@@ -0,0 +1,11 @@
+--- lib/Imakefile.orig	Sun Jul 18 00:26:04 1993
++++ lib/Imakefile	Tue Feb  1 22:42:35 2000
+@@ -3,8 +3,6 @@
+ MAPFILES   = english.mapping french.mapping german.mapping norwegian.mapping
+ XRASFILES  = *.xras
+ 
+-all:
+-
+ InstallMultiple($(DATAFILE),$(DATADIR))
+ InstallMultiple($(MAPFILES),$(MAPDIR))
+ InstallMultiple($(XRASFILES),$(XRASDIR))
diff --git a/games/xrisk/pkg-descr b/games/xrisk/pkg-descr
index 2e3d98835283..1c6bf4109029 100644
--- a/games/xrisk/pkg-descr
+++ b/games/xrisk/pkg-descr
@@ -1,3 +1,5 @@
 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.to/projects.html
diff --git a/games/xrisk/pkg-plist b/games/xrisk/pkg-plist
index 0cc0412c3798..d98f8f52d87e 100644
--- a/games/xrisk/pkg-plist
+++ b/games/xrisk/pkg-plist
@@ -1,54 +1,54 @@
 bin/xrisk
-lib/xrisk/#100_Afghanistan.xras
-lib/xrisk/#101_Alaska.xras
-lib/xrisk/#102_Alberta.xras
-lib/xrisk/#103_Argentina.xras
-lib/xrisk/#104_Brazil.xras
-lib/xrisk/#105_Egypt.xras
-lib/xrisk/#106_Greenland.xras
-lib/xrisk/#107_India.xras
-lib/xrisk/#108_Indonesia.xras
-lib/xrisk/#109_Irkutsk.xras
-lib/xrisk/#110_Iceland.xras
-lib/xrisk/#111_Japan.xras
-lib/xrisk/#112_Kamchatka.xras
-lib/xrisk/#113_China.xras
-lib/xrisk/#114_Congo.xras
-lib/xrisk/#115_Madagascar.xras
-lib/xrisk/#116_Central-America.xras
-lib/xrisk/#117_Middle-East.xras
-lib/xrisk/#118_Mongolia.xras
-lib/xrisk/#119_Northwest-Africa.xras
-lib/xrisk/#120_Central-Europe.xras
-lib/xrisk/#121_Northwest-Territories.xras
-lib/xrisk/#122_New-Guinea.xras
-lib/xrisk/#123_East-Africa.xras
-lib/xrisk/#124_East-America.xras
-lib/xrisk/#125_East-Australia.xras
-lib/xrisk/#126_Ontario.xras
-lib/xrisk/#127_Peru.xras
-lib/xrisk/#128_Quebec.xras
-lib/xrisk/#129_Siam.xras
-lib/xrisk/#130_Siberia.xras
-lib/xrisk/#131_Scandinavia.xras
-lib/xrisk/#132_United-Kingdom.xras
-lib/xrisk/#133_South-Africa.xras
-lib/xrisk/#134_Southern-Europe.xras
-lib/xrisk/#135_Ukraine.xras
-lib/xrisk/#136_Ural.xras
-lib/xrisk/#137_Venezuela.xras
-lib/xrisk/#138_West-America.xras
-lib/xrisk/#139_West-Australia.xras
-lib/xrisk/#140_Western-Europe.xras
-lib/xrisk/#141_Yakutsk.xras
-lib/xrisk/#156_world.xras
-lib/xrisk/#161_artillery.xras
-lib/xrisk/#162_infantry.xras
-lib/xrisk/#163_cavalry.xras
-lib/xrisk/#164_joker.xras
-lib/xrisk/english.mapping
-lib/xrisk/french.mapping
-lib/xrisk/german.mapping
-lib/xrisk/norwegian.mapping
-lib/xrisk/risk.data
-@dirrm lib/xrisk
+lib/X11/xrisk/#100_Afghanistan.xras
+lib/X11/xrisk/#101_Alaska.xras
+lib/X11/xrisk/#102_Alberta.xras
+lib/X11/xrisk/#103_Argentina.xras
+lib/X11/xrisk/#104_Brazil.xras
+lib/X11/xrisk/#105_Egypt.xras
+lib/X11/xrisk/#106_Greenland.xras
+lib/X11/xrisk/#107_India.xras
+lib/X11/xrisk/#108_Indonesia.xras
+lib/X11/xrisk/#109_Irkutsk.xras
+lib/X11/xrisk/#110_Iceland.xras
+lib/X11/xrisk/#111_Japan.xras
+lib/X11/xrisk/#112_Kamchatka.xras
+lib/X11/xrisk/#113_China.xras
+lib/X11/xrisk/#114_Congo.xras
+lib/X11/xrisk/#115_Madagascar.xras
+lib/X11/xrisk/#116_Central-America.xras
+lib/X11/xrisk/#117_Middle-East.xras
+lib/X11/xrisk/#118_Mongolia.xras
+lib/X11/xrisk/#119_Northwest-Africa.xras
+lib/X11/xrisk/#120_Central-Europe.xras
+lib/X11/xrisk/#121_Northwest-Territories.xras
+lib/X11/xrisk/#122_New-Guinea.xras
+lib/X11/xrisk/#123_East-Africa.xras
+lib/X11/xrisk/#124_East-America.xras
+lib/X11/xrisk/#125_East-Australia.xras
+lib/X11/xrisk/#126_Ontario.xras
+lib/X11/xrisk/#127_Peru.xras
+lib/X11/xrisk/#128_Quebec.xras
+lib/X11/xrisk/#129_Siam.xras
+lib/X11/xrisk/#130_Siberia.xras
+lib/X11/xrisk/#131_Scandinavia.xras
+lib/X11/xrisk/#132_United-Kingdom.xras
+lib/X11/xrisk/#133_South-Africa.xras
+lib/X11/xrisk/#134_Southern-Europe.xras
+lib/X11/xrisk/#135_Ukraine.xras
+lib/X11/xrisk/#136_Ural.xras
+lib/X11/xrisk/#137_Venezuela.xras
+lib/X11/xrisk/#138_West-America.xras
+lib/X11/xrisk/#139_West-Australia.xras
+lib/X11/xrisk/#140_Western-Europe.xras
+lib/X11/xrisk/#141_Yakutsk.xras
+lib/X11/xrisk/#156_world.xras
+lib/X11/xrisk/#161_artillery.xras
+lib/X11/xrisk/#162_infantry.xras
+lib/X11/xrisk/#163_cavalry.xras
+lib/X11/xrisk/#164_joker.xras
+lib/X11/xrisk/english.mapping
+lib/X11/xrisk/french.mapping
+lib/X11/xrisk/german.mapping
+lib/X11/xrisk/norwegian.mapping
+lib/X11/xrisk/risk.data
+@dirrm lib/X11/xrisk