From owner-freebsd-ports Mon Aug 3 22:30:11 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id WAA03172 for freebsd-ports-outgoing; Mon, 3 Aug 1998 22:30:11 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id WAA03087 for ; Mon, 3 Aug 1998 22:30:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id WAA22902; Mon, 3 Aug 1998 22:30:02 -0700 (PDT) Received: from rich.chel.su (mobil.surnet.ru [195.54.2.7]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id WAA02913 for ; Mon, 3 Aug 1998 22:27:24 -0700 (PDT) (envelope-from andy@icc.surw.chel.su) Received: from icc.surw.chel.su (surw.chel.su [195.54.2.162]) by rich.chel.su (8.7.2/Murphy) with ESMTP id LAA15921 for ; Tue, 4 Aug 1998 11:28:28 +0600 (UDT) Received: (from andy@localhost) by icc.surw.chel.su (8.8.5/8.8.4) id JAA17964; Tue, 4 Aug 1998 09:31:55 +0400 (MSD) Message-Id: <199808040531.JAA17964@icc.surw.chel.su> Date: Tue, 4 Aug 1998 09:31:55 +0400 (MSD) From: Andrey Zakhvatov Reply-To: andy@icc.surw.chel.su To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/7487: Update port: games/xroads Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 7487 >Category: ports >Synopsis: Update port: games/xroads >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Aug 3 22:30:00 PDT 1998 >Last-Modified: >Originator: Andrey Zakhvatov >Organization: South Ural Railway ICC >Release: FreeBSD 2.2.2-RELEASE i386 >Environment: >Description: This is a patch to update games/xroads port. diff -Nru xroads/Makefile xroads-0.3/Makefile --- xroads/Makefile Sun Jul 5 22:35:08 1998 +++ xroads-0.3/Makefile Tue Aug 4 12:38:44 1998 @@ -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 $ # -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/ \ @@ -20,7 +20,7 @@ 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 -Nru xroads/files/md5 xroads-0.3/files/md5 --- xroads/files/md5 Thu Jul 2 06:42:46 1998 +++ xroads-0.3/files/md5 Tue Aug 4 12:36:43 1998 @@ -1 +1 @@ -MD5 (xroads-v0.1.5.tar.gz) = afa98f48300d3a01da4e25e98ba32ebf +MD5 (xroads-v0.3.tar.gz) = 7f2bd992a705fe9ac4620f935ed141fd diff -Nru xroads/patches/patch-aa xroads-0.3/patches/patch-aa --- xroads/patches/patch-aa Thu Jul 2 06:42:46 1998 +++ xroads-0.3/patches/patch-aa Tue Aug 4 12:56:15 1998 @@ -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 -Nru xroads/patches/patch-ab xroads-0.3/patches/patch-ab --- xroads/patches/patch-ab Thu Jan 1 00:00:00 1970 +++ xroads-0.3/patches/patch-ab Tue Aug 4 12:49:59 1998 @@ -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 -Nru xroads/pkg/PLIST xroads-0.3/pkg/PLIST --- xroads/pkg/PLIST Thu Jul 2 06:42:47 1998 +++ xroads-0.3/pkg/PLIST Tue Aug 4 12:39:06 1998 @@ -6,5 +6,10 @@ 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 >How-To-Repeat: >Fix: Please, check and apply this patch. >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message