Date: Sun, 13 Feb 2000 07:36:59 +0900 From: tkato@prontomail.ne.jp To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16676: Update port: games/xrisk to 2.15 Message-ID: <F91CEF15431E3D11787300807CFDCBC0@tkato.prontomail.ne.jp>
next in thread | raw e-mail | index | archive | help
>Number: 16676 >Category: ports >Synopsis: Update port: games/xrisk to 2.15 >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: Sat Feb 12 14:50:07 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 3.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 2.15 New file: patches/patch-aa patches/patch-ab patches/patch-ac Remove file: patches/patch-a patches/patch-b patches/patch-c patches/patch-d patches/patch-e >How-To-Repeat: >Fix: diff -urN /usr/ports/games/xrisk/Makefile games/xrisk/Makefile --- /usr/ports/games/xrisk/Makefile Wed Aug 25 19:15:50 1999 +++ games/xrisk/Makefile Fri Feb 11 15:37:20 2000 @@ -1,22 +1,20 @@ -# New ports collection makefile for: xrisk -# Version required: 2.13 -# Date created: 4 Jan 1995 -# Whom: swallace +# New ports collection makefile for: xrisk +# Version required: 2.15 +# Date created: 4 Jan 1995 +# Whom: swallace # # $FreeBSD: ports/games/xrisk/Makefile,v 1.13 1999/08/25 06:06:01 obrien Exp $ # -DISTNAME= xrisk-2.13 +DISTNAME= xrisk-2.15 CATEGORIES= games -MASTER_SITES= ftp://geocub.greco-prog.fr/pub/Games/ -EXTRACT_SUFX= .tar.Z +MASTER_SITES= ftp://ftp.pvv.unit.no/pvv/games/ MAINTAINER= swallace@FreeBSD.org -MAN6= xrisk.6 -MANCOMPRESSED= yes - -USE_X_PREFIX= yes RESTRICTED= "Possible trademark infringement" + +USE_IMAKE= yes +MAN6= xrisk.6 .include <bsd.port.mk> diff -urN /usr/ports/games/xrisk/files/md5 games/xrisk/files/md5 --- /usr/ports/games/xrisk/files/md5 Thu Mar 7 11:20:27 1996 +++ games/xrisk/files/md5 Tue Feb 1 22:30:33 2000 @@ -1 +1 @@ -MD5 (xrisk-2.13.tar.Z) = 3b0e5bf9c22f633d7afdda54a2160aa8 +MD5 (xrisk-2.15.tar.gz) = 469209c189135a0fb7805ef70b05bc41 diff -urN /usr/ports/games/xrisk/patches/patch-a games/xrisk/patches/patch-a --- /usr/ports/games/xrisk/patches/patch-a Sat May 27 17:43:16 1995 +++ games/xrisk/patches/patch-a Thu Jan 1 09:00:00 1970 @@ -1,68 +0,0 @@ -*** Makefile.orig Fri Nov 20 05:47:32 1992 ---- Makefile Sat May 27 00:36:57 1995 -*************** -*** 1,14 **** -! CC = cc - FLAGS = -O -! BINDIR = /local/games -! LIBDIR = /local/games/lib/xrisk -! XINC = -! MANFILE = /local/man/man1/xrisk.1 - DATAFILE = $(LIBDIR)/risk.data - XRASDIR = $(LIBDIR) - MAPDIR = $(LIBDIR) - LD = $(CC) -! XLIB = -lX11 - LDFLAGS = $(FLAGS) - LDLIBS = $(XLIB) - # If you prefere mappings other than english check out if it exists ( or write ---- 1,15 ---- -! PREFIX ?= /usr/local -! -! CC = gcc - FLAGS = -O -! BINDIR = ${PREFIX}/bin -! LIBDIR = ${PREFIX}/lib/xrisk -! XINC = -I${PREFIX}/include - DATAFILE = $(LIBDIR)/risk.data - XRASDIR = $(LIBDIR) - MAPDIR = $(LIBDIR) - LD = $(CC) -! XLIB = -L${PREFIX}/lib -lX11 - LDFLAGS = $(FLAGS) - LDLIBS = $(XLIB) - # If you prefere mappings other than english check out if it exists ( or write -*************** -*** 16,22 **** - LANGUAGE = english - - DEFS = CC="$(CC)" FLAGS="$(FLAGS)" BINDIR="$(BINDIR)" \ -! LIBDIR="$(LIBDIR)" XINC="$(XINC)" MANFILE="$(MANFILE)" \ - DATAFILE="$(DATAFILE)" XRASDIR="$(XRASDIR)" \ - MAPDIR="$(MAPDIR)" LD="$(LD)" XLIB="$(XLIB)" \ - LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" \ ---- 17,23 ---- - LANGUAGE = english - - DEFS = CC="$(CC)" FLAGS="$(FLAGS)" BINDIR="$(BINDIR)" \ -! LIBDIR="$(LIBDIR)" XINC="$(XINC)" PREFIX="${PREFIX}" \ - DATAFILE="$(DATAFILE)" XRASDIR="$(XRASDIR)" \ - MAPDIR="$(MAPDIR)" LD="$(LD)" XLIB="$(XLIB)" \ - LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" \ -*************** -*** 31,37 **** - - install-xrisk : xrisk - cd src ; $(MAKE) install $(DEFS) -! - install-man : - cd doc ; $(MAKE) install $(DEFS) - ---- 32,38 ---- - - install-xrisk : xrisk - cd src ; $(MAKE) install $(DEFS) -! - install-man : - cd doc ; $(MAKE) install $(DEFS) - diff -urN /usr/ports/games/xrisk/patches/patch-aa games/xrisk/patches/patch-aa --- /usr/ports/games/xrisk/patches/patch-aa Thu Jan 1 09:00:00 1970 +++ games/xrisk/patches/patch-aa Fri Feb 11 15:46:52 2000 @@ -0,0 +1,11 @@ +--- xrisk.def.orig Wed Oct 27 19:14:11 1993 ++++ xrisk.def Fri Feb 11 15:46:40 2000 +@@ -3,6 +3,8 @@ + /* EXTRA_DEFINES = -D_NO_PROTO */ + RISKBINDIR = $(BINDIR) + RISKLIBDIR = $(LIBDIR)/xrisk ++MANDIR = $(MANPATH)/man6 ++MANSUFFIX = 6 + + /* + If you prefere mappings other than english check out if it exists (or write diff -urN /usr/ports/games/xrisk/patches/patch-ab games/xrisk/patches/patch-ab --- /usr/ports/games/xrisk/patches/patch-ab Thu Jan 1 09:00:00 1970 +++ games/xrisk/patches/patch-ab Tue Feb 1 22:39:31 2000 @@ -0,0 +1,8 @@ +--- doc/Imakefile.orig Sun Jul 18 00:18:14 1993 ++++ doc/Imakefile Tue Feb 1 22:39:11 2000 +@@ -1,5 +1,3 @@ + #include "../xrisk.def" + +-all: +- + InstallManPage(xrisk,$(MANDIR)) diff -urN /usr/ports/games/xrisk/patches/patch-ac games/xrisk/patches/patch-ac --- /usr/ports/games/xrisk/patches/patch-ac Thu Jan 1 09:00:00 1970 +++ games/xrisk/patches/patch-ac Tue Feb 1 22:42:45 2000 @@ -0,0 +1,11 @@ +--- lib/Imakefile.orig Sun Jul 18 00:26:04 1993 ++++ lib/Imakefile Tue Feb 1 22:42:35 2000 +@@ -3,8 +3,6 @@ + MAPFILES = english.mapping french.mapping german.mapping norwegian.mapping + XRASFILES = *.xras + +-all: +- + InstallMultiple($(DATAFILE),$(DATADIR)) + InstallMultiple($(MAPFILES),$(MAPDIR)) + InstallMultiple($(XRASFILES),$(XRASDIR)) diff -urN /usr/ports/games/xrisk/patches/patch-b games/xrisk/patches/patch-b --- /usr/ports/games/xrisk/patches/patch-b Sun Feb 5 18:40:08 1995 +++ games/xrisk/patches/patch-b Thu Jan 1 09:00:00 1970 @@ -1,56 +0,0 @@ -*** src/errorhandlers.c.orig Sun Nov 22 08:08:06 1992 ---- src/errorhandlers.c Fri Jan 20 00:45:33 1995 -*************** -*** 17,23 **** - if ( player->state->state <= INIT_PL_STAT ) risk_exit - ("Player(%s) killed a window. Exiting to avoid trouble.\n",player->client); - fprintf(stderr,"Probably broken pipe server %s, forgets it and continues\n", -! display->display_name); - - if (player->state->state < END_GAME) - { ---- 17,23 ---- - if ( player->state->state <= INIT_PL_STAT ) risk_exit - ("Player(%s) killed a window. Exiting to avoid trouble.\n",player->client); - fprintf(stderr,"Probably broken pipe server %s, forgets it and continues\n", -! DisplayString(display)); - - if (player->state->state < END_GAME) - { -*** src/functions.c.orig Sun Nov 22 08:08:07 1992 ---- src/functions.c Fri Jan 20 00:25:44 1995 -*************** -*** 95,100 **** ---- 95,101 ---- - XSizeHints s_h; - char *win_name,*name; - char *mmap; -+ XGCValues values; - - xinfo = (xconp)malloc(sizeof(struct Xcon)); - if (!(xinfo->disp=XOpenDisplay(player->client))) -*************** -*** 111,120 **** - xinfo->attrmask = CWBackingStore|CWEventMask; - xinfo->indexs = player->indexs; - xinfo->gc = DefaultGC(xinfo->disp,xinfo->scr); -! xinfo->gc->values.subwindow_mode = IncludeInferiors; -! xinfo->gc->values.line_style = LineSolid; -! xinfo->gc->values.line_width = 1; -! xinfo->gc->values.fill_style = FillSolid; - if (!DoesBackingStore(xinfo->screen)) xinfo->attr.event_mask |= ExposureMask; - if (DisplayPlanes(xinfo->disp, xinfo->scr)<7) risk_exit - ("Could not get more than %d bitplanes on client %s, need 7\n" ---- 112,123 ---- - xinfo->attrmask = CWBackingStore|CWEventMask; - xinfo->indexs = player->indexs; - xinfo->gc = DefaultGC(xinfo->disp,xinfo->scr); -! values.subwindow_mode = IncludeInferiors; -! values.line_style = LineSolid; -! values.line_width = 1; -! values.fill_style = FillSolid; -! XChangeGC(xinfo->disp, xinfo->gc, GCSubwindowMode | GCLineStyle -! | GCLineWidth | GCFillStyle, &values); - if (!DoesBackingStore(xinfo->screen)) xinfo->attr.event_mask |= ExposureMask; - if (DisplayPlanes(xinfo->disp, xinfo->scr)<7) risk_exit - ("Could not get more than %d bitplanes on client %s, need 7\n" diff -urN /usr/ports/games/xrisk/patches/patch-c games/xrisk/patches/patch-c --- /usr/ports/games/xrisk/patches/patch-c Thu Mar 7 13:09:22 1996 +++ games/xrisk/patches/patch-c Thu Jan 1 09:00:00 1970 @@ -1,35 +0,0 @@ -*** doc/Makefile.orig Sun Feb 5 00:53:36 1995 ---- doc/Makefile Sun Feb 5 01:04:10 1995 -*************** -*** 1,9 **** -! CC = cc - FLAGS = -O -! BINDIR = /local/games -! LIBDIR = /local/games/lib/xrisk - XINC = -I. -! MANFILE = /local/man/man1/xrisk.1 - DATAFILE = $(LIBDIR)/risk.data - XRASDIR = $(LIBDIR) - MAPDIR = $(LIBDIR) ---- 1,9 ---- -! CC = gcc - FLAGS = -O -! BINDIR = ${PREFIX}/bin -! LIBDIR = ${PREFIX}/lib/xrisk - XINC = -I. -! MANFILE = ${PREFIX}/man/man6/xrisk.6.gz - DATAFILE = $(LIBDIR)/risk.data - XRASDIR = $(LIBDIR) - MAPDIR = $(LIBDIR) -*************** -*** 16,19 **** - LANGUAGE = english - - install : -! cp xrisk.1 $(MANFILE) ---- 16,20 ---- - LANGUAGE = english - - install : -! -gzip xrisk.1 -! install -c -m 444 xrisk.1.gz ${MANFILE} diff -urN /usr/ports/games/xrisk/patches/patch-d games/xrisk/patches/patch-d --- /usr/ports/games/xrisk/patches/patch-d Thu Mar 7 13:09:22 1996 +++ games/xrisk/patches/patch-d Thu Jan 1 09:00:00 1970 @@ -1,21 +0,0 @@ -*** lib/Makefile.orig Sun Feb 5 01:08:15 1995 ---- lib/Makefile Sun Feb 5 01:08:36 1995 -*************** -*** 19,26 **** - - install : - -mkdir -p $(XRASDIR) -! cp *.xras $(XRASDIR) - -mkdir -p $(LIBDIR) -! cp risk.data $(DATAFILE) - -mkdir -p $(MAPDIR) -! cp *.mapping $(MAPDIR) ---- 19,26 ---- - - install : - -mkdir -p $(XRASDIR) -! install -c -m 444 *.xras $(XRASDIR) - -mkdir -p $(LIBDIR) -! install -c -m 444 risk.data $(DATAFILE) - -mkdir -p $(MAPDIR) -! install -c -m 444 *.mapping $(MAPDIR) diff -urN /usr/ports/games/xrisk/patches/patch-e games/xrisk/patches/patch-e --- /usr/ports/games/xrisk/patches/patch-e Thu Mar 7 13:09:23 1996 +++ games/xrisk/patches/patch-e Thu Jan 1 09:00:00 1970 @@ -1,40 +0,0 @@ -*** src/Makefile.org Fri Nov 20 04:53:11 1992 ---- src/Makefile Wed Mar 6 18:47:10 1996 -*************** -*** 1,9 **** - CC = cc - FLAGS = -O -! BINDIR = /local/games -! LIBDIR = /local/games/lib/xrisk - XINC = -I. -! MANFILE = /local/man/man1/xrisk.1 - DATAFILE = $(LIBDIR)/risk.data - XRASDIR = $(LIBDIR) - MAPDIR = $(LIBDIR) ---- 1,9 ---- - CC = cc - FLAGS = -O -! BINDIR = ${PREFIX}/bin -! LIBDIR = ${PREFIX}/lib/xrisk - XINC = -I. -! MANFILE = ${PREFIX}/man/man6/xrisk.6.gz - DATAFILE = $(LIBDIR)/risk.data - XRASDIR = $(LIBDIR) - MAPDIR = $(LIBDIR) -*************** -*** 37,43 **** - install : - strip xrisk - -mkdir -p $(BINDIR) -! cp xrisk $(BINDIR) - - clean : - rm -f *.o ---- 37,43 ---- - install : - strip xrisk - -mkdir -p $(BINDIR) -! install -c -m 555 xrisk $(BINDIR) - - clean : - rm -f *.o diff -urN /usr/ports/games/xrisk/pkg/DESCR games/xrisk/pkg/DESCR --- /usr/ports/games/xrisk/pkg/DESCR Sun Feb 5 18:40:09 1995 +++ games/xrisk/pkg/DESCR Tue Feb 1 23:10:42 2000 @@ -1,3 +1,5 @@ Xrisk is based on the boardgame Risk. It can run as server or client, and allows up to 8 players to play at once. The object of the game is World Conquest. + +WWW: http://www.pvv.ntnu.to/projects.html diff -urN /usr/ports/games/xrisk/pkg/PLIST games/xrisk/pkg/PLIST --- /usr/ports/games/xrisk/pkg/PLIST Mon Sep 28 19:24:54 1998 +++ games/xrisk/pkg/PLIST Tue Feb 1 22:36:42 2000 @@ -1,54 +1,54 @@ bin/xrisk -lib/xrisk/#100_Afghanistan.xras -lib/xrisk/#101_Alaska.xras -lib/xrisk/#102_Alberta.xras -lib/xrisk/#103_Argentina.xras -lib/xrisk/#104_Brazil.xras -lib/xrisk/#105_Egypt.xras -lib/xrisk/#106_Greenland.xras -lib/xrisk/#107_India.xras -lib/xrisk/#108_Indonesia.xras -lib/xrisk/#109_Irkutsk.xras -lib/xrisk/#110_Iceland.xras -lib/xrisk/#111_Japan.xras -lib/xrisk/#112_Kamchatka.xras -lib/xrisk/#113_China.xras -lib/xrisk/#114_Congo.xras -lib/xrisk/#115_Madagascar.xras -lib/xrisk/#116_Central-America.xras -lib/xrisk/#117_Middle-East.xras -lib/xrisk/#118_Mongolia.xras -lib/xrisk/#119_Northwest-Africa.xras -lib/xrisk/#120_Central-Europe.xras -lib/xrisk/#121_Northwest-Territories.xras -lib/xrisk/#122_New-Guinea.xras -lib/xrisk/#123_East-Africa.xras -lib/xrisk/#124_East-America.xras -lib/xrisk/#125_East-Australia.xras -lib/xrisk/#126_Ontario.xras -lib/xrisk/#127_Peru.xras -lib/xrisk/#128_Quebec.xras -lib/xrisk/#129_Siam.xras -lib/xrisk/#130_Siberia.xras -lib/xrisk/#131_Scandinavia.xras -lib/xrisk/#132_United-Kingdom.xras -lib/xrisk/#133_South-Africa.xras -lib/xrisk/#134_Southern-Europe.xras -lib/xrisk/#135_Ukraine.xras -lib/xrisk/#136_Ural.xras -lib/xrisk/#137_Venezuela.xras -lib/xrisk/#138_West-America.xras -lib/xrisk/#139_West-Australia.xras -lib/xrisk/#140_Western-Europe.xras -lib/xrisk/#141_Yakutsk.xras -lib/xrisk/#156_world.xras -lib/xrisk/#161_artillery.xras -lib/xrisk/#162_infantry.xras -lib/xrisk/#163_cavalry.xras -lib/xrisk/#164_joker.xras -lib/xrisk/english.mapping -lib/xrisk/french.mapping -lib/xrisk/german.mapping -lib/xrisk/norwegian.mapping -lib/xrisk/risk.data -@dirrm lib/xrisk +lib/X11/xrisk/#100_Afghanistan.xras +lib/X11/xrisk/#101_Alaska.xras +lib/X11/xrisk/#102_Alberta.xras +lib/X11/xrisk/#103_Argentina.xras +lib/X11/xrisk/#104_Brazil.xras +lib/X11/xrisk/#105_Egypt.xras +lib/X11/xrisk/#106_Greenland.xras +lib/X11/xrisk/#107_India.xras +lib/X11/xrisk/#108_Indonesia.xras +lib/X11/xrisk/#109_Irkutsk.xras +lib/X11/xrisk/#110_Iceland.xras +lib/X11/xrisk/#111_Japan.xras +lib/X11/xrisk/#112_Kamchatka.xras +lib/X11/xrisk/#113_China.xras +lib/X11/xrisk/#114_Congo.xras +lib/X11/xrisk/#115_Madagascar.xras +lib/X11/xrisk/#116_Central-America.xras +lib/X11/xrisk/#117_Middle-East.xras +lib/X11/xrisk/#118_Mongolia.xras +lib/X11/xrisk/#119_Northwest-Africa.xras +lib/X11/xrisk/#120_Central-Europe.xras +lib/X11/xrisk/#121_Northwest-Territories.xras +lib/X11/xrisk/#122_New-Guinea.xras +lib/X11/xrisk/#123_East-Africa.xras +lib/X11/xrisk/#124_East-America.xras +lib/X11/xrisk/#125_East-Australia.xras +lib/X11/xrisk/#126_Ontario.xras +lib/X11/xrisk/#127_Peru.xras +lib/X11/xrisk/#128_Quebec.xras +lib/X11/xrisk/#129_Siam.xras +lib/X11/xrisk/#130_Siberia.xras +lib/X11/xrisk/#131_Scandinavia.xras +lib/X11/xrisk/#132_United-Kingdom.xras +lib/X11/xrisk/#133_South-Africa.xras +lib/X11/xrisk/#134_Southern-Europe.xras +lib/X11/xrisk/#135_Ukraine.xras +lib/X11/xrisk/#136_Ural.xras +lib/X11/xrisk/#137_Venezuela.xras +lib/X11/xrisk/#138_West-America.xras +lib/X11/xrisk/#139_West-Australia.xras +lib/X11/xrisk/#140_Western-Europe.xras +lib/X11/xrisk/#141_Yakutsk.xras +lib/X11/xrisk/#156_world.xras +lib/X11/xrisk/#161_artillery.xras +lib/X11/xrisk/#162_infantry.xras +lib/X11/xrisk/#163_cavalry.xras +lib/X11/xrisk/#164_joker.xras +lib/X11/xrisk/english.mapping +lib/X11/xrisk/french.mapping +lib/X11/xrisk/german.mapping +lib/X11/xrisk/norwegian.mapping +lib/X11/xrisk/risk.data +@dirrm lib/X11/xrisk Sent by Japanese ProntoMail >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?F91CEF15431E3D11787300807CFDCBC0>