CVS commit: pkgsrc/games/lincity

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul  2 13:46:29 UTC 2019

Modified Files:
        pkgsrc/games/lincity: Makefile distinfo
Added Files:
        pkgsrc/games/lincity/patches: patch-mouse.c

Log Message:
lincity: Fix linker errors and define LICENSE.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/games/lincity/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/lincity/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/lincity/patches/patch-mouse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/lincity/Makefile
diff -u pkgsrc/games/lincity/Makefile:1.27 pkgsrc/games/lincity/Makefile:1.28
--- pkgsrc/games/lincity/Makefile:1.27  Sat Oct  6 11:54:45 2012
+++ pkgsrc/games/lincity/Makefile       Tue Jul  2 13:46:29 2019
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.27 2012/10/06 11:54:45 asau Exp $
+# $NetBSD: Makefile,v 1.28 2019/07/02 13:46:29 nia Exp $
 
 DISTNAME=      lincity-1.12.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    games x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=lincity/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://lincity.sourceforge.net/
 COMMENT=       Free clone of SimCity for X11
+LICENSE=       gnu-gpl-v2
 
 USE_TOOLS+=            gmake msgfmt
 USE_PKGLOCALEDIR=      yes

Index: pkgsrc/games/lincity/distinfo
diff -u pkgsrc/games/lincity/distinfo:1.9 pkgsrc/games/lincity/distinfo:1.10
--- pkgsrc/games/lincity/distinfo:1.9   Tue Nov  3 20:56:58 2015
+++ pkgsrc/games/lincity/distinfo       Tue Jul  2 13:46:29 2019
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 20:56:58 agc Exp $
+$NetBSD: distinfo,v 1.10 2019/07/02 13:46:29 nia Exp $
 
 SHA1 (lincity-1.12.1.tar.gz) = 280375273f6e741d707dc8e11fdedb160d230c95
 RMD160 (lincity-1.12.1.tar.gz) = 5b0a3bfa77372577ac3d9cc42e6a806f27a52ef3
 SHA512 (lincity-1.12.1.tar.gz) = a0436297154d07c3a8b5b15cbe5390e5fd13f08efe84aae3bbb2296aa7bf69c598d461272abe746e93ce34194c1e6c35861c0164b3f946c1608970c95d4cdf05
 Size (lincity-1.12.1.tar.gz) = 795709 bytes
+SHA1 (patch-mouse.c) = ddd911d32d0536d3e58417a02172cbed547d9658
 SHA1 (patch-pixmap.c) = 6d9064ba0d427ddd78d1b304748d47b7d8a168d7
 SHA1 (patch-pixmap.h) = 44fc362939408a206dd47a514c070f235a15db02

Added files:

Index: pkgsrc/games/lincity/patches/patch-mouse.c
diff -u /dev/null pkgsrc/games/lincity/patches/patch-mouse.c:1.1
--- /dev/null   Tue Jul  2 13:46:29 2019
+++ pkgsrc/games/lincity/patches/patch-mouse.c  Tue Jul  2 13:46:29 2019
@@ -0,0 +1,40 @@
+$NetBSD: patch-mouse.c,v 1.1 2019/07/02 13:46:29 nia Exp $
+
+mouse.c:1262: undefined reference to `mt_erase'
+mouse.c:1264: undefined reference to `mt_temp'
+mouse.c:1252: undefined reference to `mt_erase'
+mouse.c:1292: undefined reference to `mt_temp'
+mouse.c:1224: undefined reference to `mt_erase'
+mouse.c:1233: undefined reference to `mt_perm'
+mouse.c:1267: undefined reference to `mt_erase'
+mouse.c:1295: undefined reference to `mt_erase'
+
+--- mouse.c.orig       2003-10-05 05:53:32.000000000 +0000
++++ mouse.c
+@@ -1056,7 +1056,7 @@ choose_residence (void)
+    and set to 1 if the existing transport if the more expensive sort
+    (e.g. GROUP_RAIL when overwriting GROUP_ROAD).
+ */
+-inline int
++static inline int
+ mt_erase(int x, int y)
+ {
+     if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
+@@ -1093,7 +1093,7 @@ mt_erase(int x, int y)
+     return 0;
+ }
+ 
+-inline int
++static inline int
+ mt_temp(int x, int y)
+ {
+     if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
+@@ -1127,7 +1127,7 @@ mt_temp(int x, int y)
+     return 0;
+ }
+ 
+-inline int
++static inline int
+ mt_perm(int x, int y)
+ {
+     /* By now, it has already been mt_erase()'d */