5 files changed, 37 insertions, 50 deletions

diff --git a/games/xroads/Makefile b/games/xroads/Makefile
index b9942023ea46..b0ce63745be9 100644
--- a/games/xroads/Makefile
+++ b/games/xroads/Makefile
@@ -7,24 +7,23 @@
 
 PORTNAME=	xroads
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	games
-MASTER_SITES=	http://www.autobahn.mb.ca/~foxtrot/ \
-		http://supernova.dyn.ml.org/
+MASTER_SITES=	http://linux.tucows.com/files/x11/entertain/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_X_PREFIX=	yes
-FETCH_BEFORE_ARGS=	-t -b
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xroads ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/games/xroads
+	@${MKDIR} ${PREFIX}/share/xroads
 .for file in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18
-	${INSTALL_DATA} ${WRKSRC}/map${file}.xrm ${PREFIX}/share/games/xroads
+	${INSTALL_DATA} ${WRKSRC}/map${file}.xrm ${PREFIX}/share/xroads
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/xroads
+	@${MKDIR} ${PREFIX}/share/doc/xroads
 .for file in BUGS CHANGELOG README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xroads
 .endfor
diff --git a/games/xroads/files/patch-aa b/games/xroads/files/patch-aa
index 97426d9b5558..7f0e9be73571 100644
--- a/games/xroads/files/patch-aa
+++ b/games/xroads/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile	Fri Jul 16 21:37:03 1999
-+++ Makefile.new	Sat May 20 00:44:02 2000
+--- Makefile.orig	Sat Jul 17 10:37:03 1999
++++ Makefile	Fri Mar 30 21:19:14 2001
 @@ -5,8 +5,10 @@
  # the executable
  ###########################################################################
@@ -8,8 +8,8 @@
 -BINPATH = /usr/X11R6/bin/
 +PREFIX		?= /usr/X11R6
 +X11BASE		?= /usr/X11R6
-+DATAPATH	= ${PREFIX}/share/games/xroads/
-+BINPATH		= ${PREFIX}/bin/
++DATAPATH	= ${PREFIX}/share/xroads
++BINPATH		= ${PREFIX}/bin
  # I imagine you would use this BINPATH for Solaris:
  #BINPATH = /usr/openwin/bin/
  
@@ -18,7 +18,7 @@
  
  #CFLAGS = -fomit-frame-pointer -O2 -Wall -DXRMPATH=\"$(DATAPATH)\"
 -CFLAGS = -O6 -mpentium -g -Wall -DXRMPATH=\"$(DATAPATH)\"
-+CFLAGS += -Wall -DXRMPATH=\"$(DATAPATH)\" -I${X11BASE}/include
++CFLAGS += -DXRMPATH=\"$(DATAPATH)\" -I${X11BASE}/include
  
  ###########################################################################
  # Links necessary for X11                                                 
diff --git a/games/xroads/files/patch-ab b/games/xroads/files/patch-ab
index d5f8821ae20a..e1d3efc93f4f 100644
--- a/games/xroads/files/patch-ab
+++ b/games/xroads/files/patch-ab
@@ -1,5 +1,5 @@
---- config.h	Fri Jul 16 21:37:03 1999
-+++ config.h.new	Sat May 20 00:45:15 2000
+--- config.h.orig	Sat Jul 17 10:37:03 1999
++++ config.h	Fri Mar 30 21:11:09 2001
 @@ -30,7 +30,7 @@
  /* Comment this out to disable the joystick code. This code currently only
     works on Linux, and only uses one joystick */
@@ -9,12 +9,3 @@
  
  /* Don't enable the joystick by default. Otherwise, it defaults to
     controlling player 1. Uncomment this if your joystick doesn't work
-@@ -69,7 +69,7 @@
-    sure it's actually set to something) */
- 
- #ifndef XRMPATH
--#define XRMPATH "./"
-+#define XRMPATH DATADIR "./"
- #endif
- 
- /* Comment this out to use the P key to pause the game. If you used this
diff --git a/games/xroads/pkg-descr b/games/xroads/pkg-descr
index 03d57e1fe411..1805c77709cb 100644
--- a/games/xroads/pkg-descr
+++ b/games/xroads/pkg-descr
@@ -1,7 +1,5 @@
-XRoads is a game for the X Windows system that attempts to be like the
+XRoads is a game for the X Window System that attempts to be like the
 game Crossroads (and it's sequel, Pandemonium) for the Commodore 64.
 Basically, it is a 2-dimensional, overhead view maze game in which you
 fight against a gang of monsters. There are (or at least, there will be)
 tons of different twists in the game which make it fun.
-
-WWW: http://www.autobahn.mb.ca/~foxtrot/xroads.html
diff --git a/games/xroads/pkg-plist b/games/xroads/pkg-plist
index 2d522f77bdf4..5747db510b92 100644
--- a/games/xroads/pkg-plist
+++ b/games/xroads/pkg-plist
@@ -1,26 +1,25 @@
 bin/xroads
-share/doc/xroads/BUGS
-share/doc/xroads/CHANGELOG
-share/doc/xroads/README
-share/games/xroads/map00.xrm
-share/games/xroads/map01.xrm
-share/games/xroads/map02.xrm
-share/games/xroads/map03.xrm
-share/games/xroads/map04.xrm
-share/games/xroads/map05.xrm
-share/games/xroads/map06.xrm
-share/games/xroads/map07.xrm
-share/games/xroads/map08.xrm
-share/games/xroads/map09.xrm
-share/games/xroads/map10.xrm
-share/games/xroads/map11.xrm
-share/games/xroads/map12.xrm
-share/games/xroads/map13.xrm
-share/games/xroads/map14.xrm
-share/games/xroads/map15.xrm
-share/games/xroads/map16.xrm
-share/games/xroads/map17.xrm
-share/games/xroads/map18.xrm
-@dirrm share/doc/xroads
-@dirrm share/games/xroads
-@dirrm share/games
+%%PORTDOCS%%share/doc/xroads/BUGS
+%%PORTDOCS%%share/doc/xroads/CHANGELOG
+%%PORTDOCS%%share/doc/xroads/README
+share/xroads/map00.xrm
+share/xroads/map01.xrm
+share/xroads/map02.xrm
+share/xroads/map03.xrm
+share/xroads/map04.xrm
+share/xroads/map05.xrm
+share/xroads/map06.xrm
+share/xroads/map07.xrm
+share/xroads/map08.xrm
+share/xroads/map09.xrm
+share/xroads/map10.xrm
+share/xroads/map11.xrm
+share/xroads/map12.xrm
+share/xroads/map13.xrm
+share/xroads/map14.xrm
+share/xroads/map15.xrm
+share/xroads/map16.xrm
+share/xroads/map17.xrm
+share/xroads/map18.xrm
+@dirrm share/xroads
+%%PORTDOCS%%@dirrm share/doc/xroads