Date: Fri, 6 Feb 1998 09:44:28 -0500 (EST) From: mph@pobox.com To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/5665: Port update: games/freeciv to 1.46 Message-ID: <199802061444.JAA06485@mph124.rh.psu.edu>
next in thread | raw e-mail | index | archive | help
>Number: 5665 >Category: ports >Synopsis: Port update: games/freeciv to 1.46 >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: Fri Feb 6 06:50:00 PST 1998 >Last-Modified: >Originator: Matthew Hunt >Organization: >Release: FreeBSD 2.2.5-STABLE i386 >Environment: >Description: The attached patch updates games/freeciv to FreeCiv 1.46. I sent the patch to the maintainer, ada@bsd.org, for review on 31 Jan, but I have received no response, so she may be unavailable. >How-To-Repeat: >Fix: diff -urN /usr/ports/games/freeciv/Makefile freeciv/Makefile --- /usr/ports/games/freeciv/Makefile Fri Oct 10 02:05:51 1997 +++ freeciv/Makefile Sat Jan 31 16:52:00 1998 @@ -1,15 +1,15 @@ # New ports collection makefile for: freeciv -# Version required: 1.0k +# Version required: 1.46 # Date created: Jun 20 1997 # Whom: ada@bsd.org # # $Id: Makefile,v 1.3 1997/10/09 11:35:53 tg Exp $ # -DISTNAME= freeciv-1.0k +DISTNAME= freeciv146 +PKGNAME= freeciv-1.46 CATEGORIES= games -MASTER_SITES= ftp://ftp.daimi.aau.dk/pub/stud/pjunold/ -EXTRACT_SUFX= .tar.Z +MASTER_SITES= ftp://ftp.daimi.aau.dk/pub/stud/pjunold/freeciv/ MAINTAINER= ada@bsd.org diff -urN /usr/ports/games/freeciv/files/md5 freeciv/files/md5 --- /usr/ports/games/freeciv/files/md5 Fri Oct 10 02:05:51 1997 +++ freeciv/files/md5 Sat Jan 31 16:28:00 1998 @@ -1 +1 @@ -MD5 (freeciv-1.0k.tar.Z) = 317845454015fd3c0c4e6fdf6a6c57c6 +MD5 (freeciv146.tar.gz) = c072c22a71b79457ed5ad423548e10df diff -urN /usr/ports/games/freeciv/patches/patch-aa freeciv/patches/patch-aa --- /usr/ports/games/freeciv/patches/patch-aa Wed Jul 9 05:39:07 1997 +++ freeciv/patches/patch-aa Sat Jan 31 16:34:37 1998 @@ -1,7 +1,7 @@ -*** Imakefile.orig Tue May 20 05:15:33 1997 ---- Imakefile Wed Jul 9 17:58:33 1997 +*** Imakefile.orig Sun Jan 18 13:11:24 1998 +--- Imakefile Sat Jan 31 16:28:17 1998 *************** -*** 57,64 **** +*** 61,68 **** CLI_LIBS = $(XPM_LIB_DIR) -lXpm XawClientLibs $(SOCKLIB) SER_LIBS = $(SOCKLIB) @@ -10,7 +10,7 @@ ComplexProgramTarget_1(civclient, $(CLI_LIBS), $(SYSLIBS)) ComplexProgramTarget_2(civserver, $(SER_LIBS), $(SYSLIBS)) ---- 57,67 ---- +--- 61,71 ---- CLI_LIBS = $(XPM_LIB_DIR) -lXpm XawClientLibs $(SOCKLIB) SER_LIBS = $(SOCKLIB) diff -urN /usr/ports/games/freeciv/patches/patch-ab freeciv/patches/patch-ab --- /usr/ports/games/freeciv/patches/patch-ab Wed Jul 9 05:39:08 1997 +++ freeciv/patches/patch-ab Sat Jan 31 16:34:05 1998 @@ -1,37 +1,40 @@ -*** client/graphics.c.orig Mon Feb 17 07:46:33 1997 ---- client/graphics.c Wed Jul 9 17:38:38 1997 +*** client/graphics.c.orig Sun Jan 18 13:11:26 1998 +--- client/graphics.c Sat Jan 31 16:32:58 1998 *************** -*** 15,21 **** +*** 15,27 **** #include <string.h> #include <ctype.h> #include <X11/Intrinsic.h> ! #include <xpm.h> - #include "log.h" - #include "graphics.h" ---- 15,21 ---- + #include <shared.h> + #include <log.h> + #include <graphics.h> + #include <colors.h> + + extern int display_depth; + extern Widget map_canvas; + extern Display *display; +--- 15,31 ---- #include <string.h> #include <ctype.h> #include <X11/Intrinsic.h> ! #include <X11/xpm.h> - #include "log.h" - #include "graphics.h" -*************** -*** 34,39 **** ---- 34,43 ---- - struct Sprite *intro_gfx_sprite; - struct Sprite *radar_gfx_sprite; + #include <shared.h> + #include <log.h> + #include <graphics.h> + #include <colors.h> + #ifndef FREECIV_DATADIR + #define FREECIV_DATADIR "data" + #endif + - /* current always 30x30, but with scaling.... */ - int tile_sprite_width, tile_sprite_height; - + extern int display_depth; + extern Widget map_canvas; + extern Display *display; *************** -*** 59,65 **** +*** 61,67 **** if(datadir[i] == '/') datadir[i] = '\0'; } else { @@ -39,7 +42,7 @@ }; }; sprintf(realfile,"%s/%s",datadir,filename); ---- 63,69 ---- +--- 65,71 ---- if(datadir[i] == '/') datadir[i] = '\0'; } else { diff -urN /usr/ports/games/freeciv/pkg/PLIST freeciv/pkg/PLIST --- /usr/ports/games/freeciv/pkg/PLIST Wed Jul 9 05:39:09 1997 +++ freeciv/pkg/PLIST Sat Jan 31 16:40:06 1998 @@ -4,4 +4,5 @@ share/freeciv/intro.xpm share/freeciv/radar.xpm share/freeciv/tiles.xpm +share/freeciv/units.xpm @dirrm share/freeciv >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199802061444.JAA06485>