5 files changed, 58 insertions, 18 deletions

diff --git a/games/xroads/Makefile b/games/xroads/Makefile
index cc916c5e06e9..bcdbad377204 100644
--- a/games/xroads/Makefile
+++ b/games/xroads/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	xroads
-# Version required:			0.1.5
+# Version required:			0.3
 # Date created:				21 June 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.2 1998/07/05 11:40:46 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/05 09:31:02 asami Exp $
 #
 
-DISTNAME=	xroads-v0.1.5
-PKGNAME=	xroads-0.1.5
+DISTNAME=	xroads-v0.3
+PKGNAME=	xroads-0.3
 CATEGORIES=	games
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Way/1795/ \
 		http://www.autobahn.mb.ca/~foxtrot/ \
@@ -16,11 +16,12 @@ MASTER_SITES=	http://www.geocities.com/SiliconValley/Way/1795/ \
 MAINTAINER=	andy@icc.surw.chel.su
 
 USE_X_PREFIX=	yes
+FETCH_BEFORE_ARGS=	-t
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/xroads ${PREFIX}/bin
 	@ ${MKDIR} ${PREFIX}/share/xroads
-.for file in map0 map1 map2 map3
+.for file in map0 map1 map2 map3 map4 map5 map6 map7 map8
 	@ ${INSTALL_DATA} ${WRKSRC}/${file}.xrm ${PREFIX}/share/xroads
 .endfor
 .if !defined(NOPORTDOCS)
diff --git a/games/xroads/distinfo b/games/xroads/distinfo
index 9ecdbdd27a73..fce88265a464 100644
--- a/games/xroads/distinfo
+++ b/games/xroads/distinfo
@@ -1 +1 @@
-MD5 (xroads-v0.1.5.tar.gz) = afa98f48300d3a01da4e25e98ba32ebf
+MD5 (xroads-v0.3.tar.gz) = 7f2bd992a705fe9ac4620f935ed141fd
diff --git a/games/xroads/files/patch-aa b/games/xroads/files/patch-aa
index 1b96a9c2391a..6fb4422b3bce 100644
--- a/games/xroads/files/patch-aa
+++ b/games/xroads/files/patch-aa
@@ -1,20 +1,43 @@
---- Makefile	Mon Jun 29 22:40:15 1998
-+++ /home/andy/tmp/wrk/Makefile	Tue Jun 30 15:15:12 1998
-@@ -31,7 +31,7 @@
- # window and monochrome graphics.
+--- 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.
  ###########################################################################
  
--FLAGS = -O3 -DXPLOSIONS -DGAMEDELAY=10000
-+FLAGS= ${CFLAGS} -DXPLOSIONS -DGAMEDELAY=10000 -I${X11BASE}/include
+-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
  
  # These lines ain't needed... but I'm not taking 'em out yet
  #BOGOMIPS = `grep bogomips /proc/cpuinfo | awk '{ printf("%s", $$3) }'`
-@@ -48,7 +48,7 @@
- # Make sure there is a / at the end of the path
+@@ -36,7 +40,7 @@
  ###########################################################################
  
--XRMPATH = ./
-+XRMPATH = ${X11BASE}/share/xroads/
+ # Your C compiler
+-CC = gcc
++CC?= gcc
  
- ###########################################################################
- # Links necessary for X11                                                 
+ # Your tar
+ TAR = tar
+@@ -54,12 +58,12 @@
+ 
+ ## "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
diff --git a/games/xroads/files/patch-ab b/games/xroads/files/patch-ab
new file mode 100644
index 000000000000..420389b77329
--- /dev/null
+++ b/games/xroads/files/patch-ab
@@ -0,0 +1,11 @@
+--- 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 */
+ 
+-#define XRMPATH "./"
++#define XRMPATH DATADIR "/"
+ 
+ /* 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-plist b/games/xroads/pkg-plist
index ceba62f5bd2c..8190a1271997 100644
--- a/games/xroads/pkg-plist
+++ b/games/xroads/pkg-plist
@@ -6,5 +6,10 @@ 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
 @dirrm share/doc/xroads
 @dirrm share/xroads