Update to 0.6. Add WWW.

6 files changed, 89 insertions, 60 deletions

diff --git a/games/xroads/Makefile b/games/xroads/Makefile
index c4a68426c875..fd9bc37c2a74 100644
--- a/games/xroads/Makefile
+++ b/games/xroads/Makefile
@@ -6,28 +6,27 @@
 #
 
 PORTNAME=	xroads
-PORTVERSION=	0.3
+PORTVERSION=	0.6
 CATEGORIES=	games
-MASTER_SITES=	http://www.geocities.com/SiliconValley/Way/1795/ \
-		http://www.autobahn.mb.ca/~foxtrot/ \
+MASTER_SITES=	http://www.autobahn.mb.ca/~foxtrot/ \
 		http://supernova.dyn.ml.org/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	will@FreeBSD.org
 
 USE_X_PREFIX=	yes
-FETCH_BEFORE_ARGS=	-t
+FETCH_BEFORE_ARGS=	-t -b
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/xroads ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/xroads
-.for file in map0 map1 map2 map3 map4 map5 map6 map7 map8
-	@ ${INSTALL_DATA} ${WRKSRC}/${file}.xrm ${PREFIX}/share/xroads
+	${INSTALL_PROGRAM} ${WRKSRC}/xroads ${PREFIX}/bin
+	${MKDIR} ${PREFIX}/share/games/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
 .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
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xroads
 .endfor
 .endif
 
diff --git a/games/xroads/distinfo b/games/xroads/distinfo
index fce88265a464..421481aaeef7 100644
--- a/games/xroads/distinfo
+++ b/games/xroads/distinfo
@@ -1 +1 @@
-MD5 (xroads-v0.3.tar.gz) = 7f2bd992a705fe9ac4620f935ed141fd
+MD5 (xroads-v0.6.tar.gz) = ad4dcdc91397ca937af8222fc56d8654
diff --git a/games/xroads/files/patch-aa b/games/xroads/files/patch-aa
index 6fb4422b3bce..97426d9b5558 100644
--- a/games/xroads/files/patch-aa
+++ b/games/xroads/files/patch-aa
@@ -1,43 +1,52 @@
---- Makefile	Mon Aug  3 17:24:42 1998
-+++ /home/andy/tmp/wrk/Makefile	Tue Aug  4 12:55:37 1998
-@@ -5,7 +5,11 @@
- # optimizations. Check the manual for your compiler.
+--- Makefile	Fri Jul 16 21:37:03 1999
++++ Makefile.new	Sat May 20 00:44:02 2000
+@@ -5,8 +5,10 @@
+ # the executable
  ###########################################################################
  
--FLAGS = -O2 -g -Wall
-+CFLAGS?=	-O2 -g -Wall
-+PREFIX?=	/usr/X11R6
-+DATADIR?=	$(PREFIX)/share/xroads
-+INCLUDE?=	-I/usr/X11R6/include
-+LIBS?=		-L/usr/X11R6/lib -lX11 -lm
+-DATAPATH = /usr/games/xroads/
+-BINPATH = /usr/X11R6/bin/
++PREFIX		?= /usr/X11R6
++X11BASE		?= /usr/X11R6
++DATAPATH	= ${PREFIX}/share/games/xroads/
++BINPATH		= ${PREFIX}/bin/
+ # I imagine you would use this BINPATH for Solaris:
+ #BINPATH = /usr/openwin/bin/
  
- # These lines ain't needed... but I'm not taking 'em out yet
- #BOGOMIPS = `grep bogomips /proc/cpuinfo | awk '{ printf("%s", $$3) }'`
-@@ -36,7 +40,7 @@
+@@ -16,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
+ 
+ ###########################################################################
+ # Links necessary for X11                                                 
+@@ -33,7 +35,7 @@
+ ###########################################################################
+ 
+ ### Linux machines use this line:
+-LINK = -L/usr/X11R6/lib -I/usr/X11R6/include -lX11 -lm
++LINK = -L${X11BASE}/lib -lX11 -lm
+ 
+ ### This line should work on Sun machines:
+ #LINK = -L/usr/openwin/lib -I/usr/openwin/include -lX11 -lm
+@@ -43,8 +45,7 @@
  ###########################################################################
  
  # Your C compiler
--CC = gcc
-+CC?= gcc
+-CC = egcs
+-#CC = gcc
++CC ?= gcc
  
  # Your tar
  TAR = tar
-@@ -54,12 +58,12 @@
+@@ -71,7 +72,7 @@
  
  ## "all" of course builds XRoads.
- all:
--	$(CC) $(FLAGS) -c chardata.c
--	$(CC) $(FLAGS) -c tiledata.c
--	$(CC) $(FLAGS) -c fileops.c
--	$(CC) $(FLAGS) -c ai.c
--	$(CC) $(FLAGS) -c screens.c
--	$(CC) $(FLAGS) $(LINK) -o xroads xroads.c chardata.o tiledata.o fileops.o ai.o screens.o
-+	$(CC) $(CFLAGS) $(INCLUDE) -DDATADIR=\"$(DATADIR)\" -c chardata.c
-+	$(CC) $(CFLAGS) $(INCLUDE) -DDATADIR=\"$(DATADIR)\" -c tiledata.c
-+	$(CC) $(CFLAGS) $(INCLUDE) -DDATADIR=\"$(DATADIR)\" -c fileops.c
-+	$(CC) $(CFLAGS) $(INCLUDE) -DDATADIR=\"$(DATADIR)\" -c ai.c
-+	$(CC) $(CFLAGS) $(INCLUDE) -DDATADIR=\"$(DATADIR)\" -c screens.c
-+	$(CC) $(CFLAGS) $(INCLUDE) -DDATADIR=\"$(DATADIR)\" $(LIBS) -o xroads xroads.c chardata.o tiledata.o fileops.o ai.o screens.o
- 
- ## "quick" just recompiles xroads.c and links it with the existing .o's
- ## do NOT use this unless you've been altering my code :P
+ all: $(OBJECTS)
+-	$(CC) $(FLAGS) -o xroads $(OBJECTS) $(LINK)
++	$(CC) $(CFLAGS) -o xroads $(OBJECTS) $(LINK)
+ 
+ install: all
+ 	rm -fr $(DATAPATH)
diff --git a/games/xroads/files/patch-ab b/games/xroads/files/patch-ab
index 420389b77329..d5f8821ae20a 100644
--- a/games/xroads/files/patch-ab
+++ b/games/xroads/files/patch-ab
@@ -1,11 +1,20 @@
---- config.h	Mon Aug  3 17:24:42 1998
-+++ /home/andy/tmp/wrk/config.h	Tue Aug  4 12:49:10 1998
-@@ -62,7 +62,7 @@
-    line parameters too. Make sure to put a / on the end, or it won't
-    work correctly */
+--- config.h	Fri Jul 16 21:37:03 1999
++++ config.h.new	Sat May 20 00:45:15 2000
+@@ -30,7 +30,7 @@
+ /* Comment this out to disable the joystick code. This code currently only
+    works on Linux, and only uses one joystick */
  
+-#define USEJOYSTICK
++#undef USEJOYSTICK
+ 
+ /* 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 "/"
++#define XRMPATH DATADIR "./"
+ #endif
  
  /* Comment this out to use the P key to pause the game. If you used this
-    key as one of your motion keys, then leave then uncomment it and use
diff --git a/games/xroads/pkg-descr b/games/xroads/pkg-descr
index d643293bb133..03d57e1fe411 100644
--- a/games/xroads/pkg-descr
+++ b/games/xroads/pkg-descr
@@ -3,3 +3,5 @@ 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 8190a1271997..b6c6351612bc 100644
--- a/games/xroads/pkg-plist
+++ b/games/xroads/pkg-plist
@@ -2,14 +2,24 @@ bin/xroads
 share/doc/xroads/BUGS
 share/doc/xroads/CHANGELOG
 share/doc/xroads/README
-share/xroads/map0.xrm
-share/xroads/map1.xrm
-share/xroads/map2.xrm
-share/xroads/map3.xrm
-share/xroads/map4.xrm
-share/xroads/map5.xrm
-share/xroads/map6.xrm
-share/xroads/map7.xrm
-share/xroads/map8.xrm
+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/xroads
+@dirrm share/games/xroads