pkg/50624: patch to update games/vms-empire to 1.13

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/50624: patch to update games/vms-empire to 1.13
From: ben.gergely%NetBSD.org@localhost;,r&#337%NetBSD.org@localhost;,tükörfúrógép.com%NetBSD.org@localhost
Date: Tue, 5 Jan 2016 16:00:00 +0000 (UTC)
>Number:         50624
>Category:       pkg
>Synopsis:       patch to update games/vms-empire to 1.13
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Jan 05 16:00:00 +0000 2016
>Originator:     Ben Gergely
>Release:        current
>Organization:
>Environment:
>Description:
patch to update games/vms-empire to 1.13 as per the update request from doc/TODO
>How-To-Repeat:

>Fix:
changelog:

1.13: 2014-12-14:
        Comment on entry to and exit from edit mode.
        Cleaned up packaging and install/uninstall productions.

1.12: 2014-05-20:
        Incorporated Dennis Pinckard's fix for a Mac OS/X port bug.
        Added desktop file.

1.11: 2013-12-31T17:28:06
        Clean up code to modern C, apply cppcheck.
        Fix code typo reported as Debian bug #593434

1.10: 2013-08-22T23:46:03
        Fix core dump when a satellite bounced off the world edge.
        Full ANSIfication of function prototypes (which fixed the
        sat bug - the code appears to have been tickling some obscure
        bug in the compilation of function calls with K&R-style prototypes).

1.9: 2012-02-16T02:49:47
        Drop RPM packaging. Documentation cleanups.

1.8: 2010-10-21T12:47:33Z
        Joe Wells's patch to enable different-sized worlds.  Minor fixes to
        map functions by Andrew Morrow. More on the history of the game.
        Enable arrow keys in edit mode.
        License changed from Chuck Simmons's cosmetically tweaked clone
        of the GPL to GPL proper, so the classifier systems that forge
        and archive sites use will be less confused.


patch to update to 1.13:

Index: DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/games/vms-empire/DESCR,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 DESCR
--- DESCR	2 Jun 2003 14:09:48 -0000	1.1.1.1
+++ DESCR	16 Dec 2015 14:16:45 -0000
@@ -1,5 +1,5 @@
 VMS-Empire is a simulation of a full-scale war between two emperors, the
 computer and you.  Naturally, there is only room for one, so the object of
 the game is to destroy the other.  The computer plays by the same rules that
-you do.  This game is the ancestor of all the multiplayer Empire simulations
-out there.
+you do. This game was ancestral to all later expand/explore/exploit/exterminate
+games, including Civilization and Master of Orion.
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/vms-empire/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	18 Aug 2015 07:31:09 -0000	1.15
+++ Makefile	16 Dec 2015 14:16:45 -0000
@@ -1,20 +1,20 @@
 # $NetBSD: Makefile,v 1.15 2015/08/18 07:31:09 wiz Exp $
 #
 
-DISTNAME=	vms-empire-1.7
-PKGREVISION=	2
+DISTNAME=	vms-empire-1.13
 CATEGORIES=	games
 MASTER_SITES=	http://www.catb.org/~esr/vms-empire/
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.catb.org/~esr/vms-empire/
 COMMENT=	Solitaire Empire (sometimes called "VMS Empire")
+LICENSE=	gnu-gpl-v2
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vms-empire ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/vms-empire.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/vms-empire.6
+	${INSTALL_MAN} ${WRKSRC}/empire.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/vms-empire.6
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/games/vms-empire/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	3 Nov 2015 20:57:06 -0000	1.7
+++ distinfo	16 Dec 2015 14:16:45 -0000
@@ -1,8 +1,11 @@
 $NetBSD: distinfo,v 1.7 2015/11/03 20:57:06 agc Exp $
 
-SHA1 (vms-empire-1.7.tar.gz) = 3a9d697f333269ed486f93e77c54f3e688c96edc
-RMD160 (vms-empire-1.7.tar.gz) = 931d4377c315643b1edde2d5f6a058cffaaf3da1
-SHA512 (vms-empire-1.7.tar.gz) = 429a8c34c24eaf2d1d26fc1fbe6cf610b1f1fa05ca723e29d4d84713b5a55156f6285d193ca2d4500d6696f652914954c1cf09a795466f6f25f3bfb8600b6261
-Size (vms-empire-1.7.tar.gz) = 84726 bytes
-SHA1 (patch-aa) = eda2153945c51e89d1ff5e177b130535f528dd4e
-SHA1 (patch-ab) = 2cf492e58273942670e5f1b7d526895b40898a61
+SHA1 (vms-empire-1.13.tar.gz) = b947b1b2ef4a6dac23d888b79985a8d398fac189
+RMD160 (vms-empire-1.13.tar.gz) = a49d3c9bd2e8635f13b85e2a1f2c46e39658a83c
+SHA512 (vms-empire-1.13.tar.gz) = 5e0a53b73a79a0cfea2eec592e09746782d2f5696287c3faad80c3a73c26aee6a1cd1f3a01ff937e2729d6a7c9cc5ccf7c81689ff3f814fcfeb4097536ab75f7
+Size (vms-empire-1.13.tar.gz) = 109310 bytes
+SHA1 (patch-aa) = 4f7e42833f720f322807ccb2e407a44d7f827254
+SHA1 (patch-edit.c) = 48e46e5000a5c29fff927bbbd986d9f7bc7d065b
+SHA1 (patch-empire.h) = fd89019d0e08f81013a803cfe67f0805ea02db44
+SHA1 (patch-term.c) = 15a7b393f750e4ee19b45b6f32e47c237de3ffa8
+SHA1 (patch-usermove.c) = cfd46bc3843019395e2fba47d9276716a579e73c
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/games/vms-empire/patches/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- patches/patch-aa	17 Oct 2013 16:28:02 -0000	1.4
+++ patches/patch-aa	16 Dec 2015 14:16:45 -0000
@@ -1,11 +1,11 @@
 $NetBSD: patch-aa,v 1.4 2013/10/17 16:28:02 roy Exp $
 
---- Makefile.orig	2004-09-27 15:32:07.000000000 +0000
+--- Makefile.orig	2014-12-14 22:05:55.000000000 +0000
 +++ Makefile
-@@ -18,17 +18,17 @@ SYS = LINUX
- # Use -g to compile the program for debugging.
+@@ -8,18 +8,18 @@ VERS=1.13
  
- #DEBUG = -g -DDEBUG -Wall
+ # Use -g to compile the program for debugging.
+ #DEBUG = -g -DDEBUG
 -DEBUG = -O2
 +#DEBUG = -O2
  
@@ -18,17 +18,18 @@
  
  # You shouldn't have to modify anything below this line.
  
--CFLAGS = $(DEBUG) $(PROFILE) -D$(SYS)
-+CFLAGS += $(DEBUG) $(PROFILE) -D$(SYS)
+ # There's a dynamic format in the object-display routines; suppress the warning
+-CFLAGS = $(DEBUG) $(PROFILE) -Wall -Wno-format-security
++CFLAGS += $(DEBUG) $(PROFILE) -Wall -Wno-format-security
  
  FILES = \
  	attack.c \
-@@ -67,7 +67,7 @@ OFILES = \
+@@ -58,7 +58,7 @@ OFILES = \
  all: vms-empire
  
  vms-empire: $(OFILES)
 -	$(CC) $(PROFILE) -o vms-empire $(OFILES) $(LIBS)
 +	$(CC) $(PROFILE) -o vms-empire $(OFILES) $(LIBS) $(LDFLAGS)
  
- TAGS: $(HEADERS) $(FILES)
- 	etags $(HEADERS) $(FILES)
+ attack.o:: extern.h empire.h
+ compmove.o:: extern.h empire.h
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- patches/patch-ab	2 Aug 2006 16:15:49 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/08/02 16:15:49 kristerw Exp $
-
---- game.c.orig	2006-08-02 18:11:35.000000000 +0200
-+++ game.c	2006-08-02 18:12:56.000000000 +0200
-@@ -404,11 +404,10 @@
- 
- static long ncity, nland, nshore;
- 
-+static void mark_cont();
- int good_cont (mapi)
- long mapi;
- {
--	static void mark_cont();
--
- 	long val;
- 
- 	ncity = 0; /* nothing seen yet */
Index: patches/patch-edit.c
===================================================================
RCS file: patches/patch-edit.c
diff -N patches/patch-edit.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-edit.c	16 Dec 2015 14:16:45 -0000
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Sort out the warnings.
+--- edit.c.orig	2014-05-28 18:47:13.000000000 +0000
++++ edit.c
+@@ -478,9 +478,9 @@ Print out information about a piece.
+ void
+ e_info(loc_t edit_cursor)
+ {
+-    void e_city_info(loc_t), e_piece_info(loc_t edit_cursor, char ab);
++    void e_city_info(loc_t), e_piece_info(loc_t edit_cursor, uchar ab);
+ 
+-    char ab;
++    uchar ab;
+ 
+     ab = user_map[edit_cursor].contents;
+ 
+@@ -501,7 +501,7 @@ Print info about a piece.
+ */
+ 
+ void
+-e_piece_info(loc_t edit_cursor, char ab)
++e_piece_info(loc_t edit_cursor, uchar ab)
+ {
+     piece_info_t *obj;
+     int type;
Index: patches/patch-empire.h
===================================================================
RCS file: patches/patch-empire.h
diff -N patches/patch-empire.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-empire.h	16 Dec 2015 14:16:45 -0000
@@ -0,0 +1,31 @@
+$NetBSD$
+
+Sort out the warnings.
+--- empire.h.orig	2014-01-03 20:26:03.000000000 +0000
++++ empire.h
+@@ -172,7 +172,7 @@ beginning of a game.
+ #define INFINITY 10000000 /* a large number */
+ 
+ typedef struct piece_attr {
+-	char sname; /* eg 'C' */
++	uchar sname; /* eg 'C' */
+ 	char name[20]; /* eg "aircraft carrier" */
+ 	char nickname[20]; /* eg "carrier" */
+ 	char article[20]; /* eg "an aircraft carrier" */
+@@ -207,14 +207,14 @@ You can change them and the code will ad
+ #define NUM_CITY ((100 * (MAP_WIDTH + MAP_HEIGHT)) / 228)
+ 
+ typedef struct real_map { /* a cell of the actual map */
+-	char contents; /* MAP_LAND, MAP_SEA, or MAP_CITY */
++	uchar contents; /* MAP_LAND, MAP_SEA, or MAP_CITY */
+ 	bool on_board; /* TRUE iff on the board */
+ 	city_info_t *cityp; /* ptr to city at this location */
+ 	piece_info_t *objp; /* list of objects at this location */
+ } real_map_t;
+ 
+ typedef struct view_map { /* a cell of one player's world view */
+-	char contents; /* MAP_LAND, MAP_SEA, MAP_CITY, 'A', 'a', etc */
++	uchar contents; /* MAP_LAND, MAP_SEA, MAP_CITY, 'A', 'a', etc */
+ 	long seen; /* date when last updated */
+ } view_map_t;
+ 
Index: patches/patch-term.c
===================================================================
RCS file: patches/patch-term.c
diff -N patches/patch-term.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-term.c	16 Dec 2015 14:16:45 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Sort out the warnings.
+--- term.c.orig	2014-01-09 01:41:07.000000000 +0000
++++ term.c
+@@ -245,7 +245,7 @@ Get a character from the user and conver
+ char
+ get_chx(void)
+ {
+-    char c;
++    uchar c;
+ 
+     c = get_cq ();
+ 
Index: patches/patch-usermove.c
===================================================================
RCS file: patches/patch-usermove.c
diff -N patches/patch-usermove.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-usermove.c	16 Dec 2015 14:16:45 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Sort out the warnings.
+--- usermove.c.orig	2013-08-27 15:00:47.000000000 +0000
++++ usermove.c
+@@ -1037,7 +1037,7 @@ bool
+ awake(piece_info_t *obj)
+ {
+     int i;
+-    char c;
++    uchar c;
+     long t;
+ 
+     if (obj->type == ARMY && vmap_at_sea (user_map, obj->loc)) {
Prev by Date: Re: pkg/50625 (security/libressl fails to install)
Next by Date: Re: pkg/50320
Previous by Thread: Re: pkg/50625 (security/libressl fails to install)
Next by Thread: Re: pkg/50624: patch to update games/vms-empire to 1.13
Indexes:
Home | Main Index | Thread Index | Old Index