CVS commit: pkgsrc/games/finalbattle

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun Dec 11 01:10:26 UTC 2016

Modified Files:
        pkgsrc/games/finalbattle: Makefile PLIST distinfo
Added Files:
        pkgsrc/games/finalbattle/patches: patch-makefile
Removed Files:
        pkgsrc/games/finalbattle/patches: patch-aa patch-ab

Log Message:
Make this work. Add a distfile jumbo patch doing the following:
   - use standard headers
   - don't use perror, don't use sprintf
   - fix time handling issues
   - compile in paths so the data can be installed (from patch-ab)
   - fix name conflict with libc
   - avoid undefined behavior
   - avoid implicit int for clang
   - declare own functions, sprinkle const and static, and fix
     signedness to get a clean build (except for one remaining issue
     where it's not clear what to do)
   - remove unused elements detected by gcc
   - fix some problems detected by gcc
   - fix a startup crash
   - modernize the makefile

Also, don't install the raw image bitmap data and the scripts to digest
it; install only the digested form, as that's all that's used at runtime.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/games/finalbattle/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/finalbattle/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/finalbattle/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/games/finalbattle/patches/patch-aa
cvs rdiff -u -r1.2 -r0 pkgsrc/games/finalbattle/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/games/finalbattle/patches/patch-makefile

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

Modified files:

Index: pkgsrc/games/finalbattle/Makefile
diff -u pkgsrc/games/finalbattle/Makefile:1.16 pkgsrc/games/finalbattle/Makefile:1.17
--- pkgsrc/games/finalbattle/Makefile:1.16      Sat Jul  4 16:18:34 2015
+++ pkgsrc/games/finalbattle/Makefile   Sun Dec 11 01:10:26 2016
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:34 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2016/12/11 01:10:26 dholland Exp $
 #
 
 DISTNAME=      finalbattle.0.0
 PKGNAME=       finalbattle-0.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    games x11
 MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=games/} \
                ftp://ftp.billsgames.com/unix/x/finalbattle/
 
+PATCH_SITES=   http://www.NetBSD.org/~dholland/patchkits/finalbattle/
+PATCHFILES=    finalbattle-jumbo-patch-20161210.gz
+PATCH_DIST_STRIP= -p1
+
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://web.archive.org/web/2/http://www.newbreedsoftware.com/finalbattle/
 COMMENT=       Multiplayer space battle simulation for X

Index: pkgsrc/games/finalbattle/PLIST
diff -u pkgsrc/games/finalbattle/PLIST:1.2 pkgsrc/games/finalbattle/PLIST:1.3
--- pkgsrc/games/finalbattle/PLIST:1.2  Sun Jun 14 17:56:44 2009
+++ pkgsrc/games/finalbattle/PLIST      Sun Dec 11 01:10:26 2016
@@ -1,37 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/12/11 01:10:26 dholland Exp $
 bin/final
-share/finalbattle/sprites/asteroids/ast00.pbm
-share/finalbattle/sprites/asteroids/ast01.pbm
-share/finalbattle/sprites/asteroids/ast02.pbm
-share/finalbattle/sprites/asteroids/ast03.pbm
-share/finalbattle/sprites/asteroids/ast04.pbm
-share/finalbattle/sprites/asteroids/ast05.pbm
-share/finalbattle/sprites/asteroids/ast06.pbm
-share/finalbattle/sprites/asteroids/ast07.pbm
-share/finalbattle/sprites/asteroids/ast08.pbm
-share/finalbattle/sprites/asteroids/ast09.pbm
-share/finalbattle/sprites/asteroids/ast10.pbm
-share/finalbattle/sprites/asteroids/ast11.pbm
-share/finalbattle/sprites/asteroids/ast12.pbm
-share/finalbattle/sprites/asteroids/ast13.pbm
-share/finalbattle/sprites/asteroids/ast14.pbm
-share/finalbattle/sprites/asteroids/ast15.pbm
-share/finalbattle/sprites/asteroids/mael00.pbm
-share/finalbattle/sprites/asteroids/mael01.pbm
-share/finalbattle/sprites/asteroids/mael02.pbm
-share/finalbattle/sprites/asteroids/mael03.pbm
-share/finalbattle/sprites/asteroids/mael04.pbm
-share/finalbattle/sprites/asteroids/mael05.pbm
-share/finalbattle/sprites/asteroids/mael06.pbm
-share/finalbattle/sprites/asteroids/mael07.pbm
-share/finalbattle/sprites/asteroids/mael08.pbm
-share/finalbattle/sprites/asteroids/mael09.pbm
-share/finalbattle/sprites/asteroids/mael10.pbm
-share/finalbattle/sprites/asteroids/mael11.pbm
-share/finalbattle/sprites/asteroids/mael12.pbm
-share/finalbattle/sprites/asteroids/mael13.pbm
-share/finalbattle/sprites/asteroids/mael14.pbm
-share/finalbattle/sprites/asteroids/mael15.pbm
+share/finalbattle/README.txt
+share/finalbattle/final.news
 share/finalbattle/sprites/obj/a.obj
 share/finalbattle/sprites/obj/asteroids.obj
 share/finalbattle/sprites/obj/b.obj
@@ -58,179 +28,3 @@ share/finalbattle/sprites/obj/weapon_e.o
 share/finalbattle/sprites/obj/weapon_f.obj
 share/finalbattle/sprites/obj/weapon_g.obj
 share/finalbattle/sprites/obj/weapon_h.obj
-share/finalbattle/sprites/ships/a01m.pbm
-share/finalbattle/sprites/ships/a01p.pbm
-share/finalbattle/sprites/ships/a02m.pbm
-share/finalbattle/sprites/ships/a02p.pbm
-share/finalbattle/sprites/ships/a03m.pbm
-share/finalbattle/sprites/ships/a03p.pbm
-share/finalbattle/sprites/ships/a04m.pbm
-share/finalbattle/sprites/ships/a04p.pbm
-share/finalbattle/sprites/ships/a05m.pbm
-share/finalbattle/sprites/ships/a05p.pbm
-share/finalbattle/sprites/ships/a06m.pbm
-share/finalbattle/sprites/ships/a06p.pbm
-share/finalbattle/sprites/ships/a07m.pbm
-share/finalbattle/sprites/ships/a07p.pbm
-share/finalbattle/sprites/ships/a08m.pbm
-share/finalbattle/sprites/ships/a08p.pbm
-share/finalbattle/sprites/ships/a10m.pbm
-share/finalbattle/sprites/ships/a10p.pbm
-share/finalbattle/sprites/ships/a11m.pbm
-share/finalbattle/sprites/ships/a11p.pbm
-share/finalbattle/sprites/ships/a12m.pbm
-share/finalbattle/sprites/ships/a12p.pbm
-share/finalbattle/sprites/ships/a13m.pbm
-share/finalbattle/sprites/ships/a13p.pbm
-share/finalbattle/sprites/ships/a14m.pbm
-share/finalbattle/sprites/ships/a14p.pbm
-share/finalbattle/sprites/ships/a16m.pbm
-share/finalbattle/sprites/ships/a16p.pbm
-share/finalbattle/sprites/ships/a17m.pbm
-share/finalbattle/sprites/ships/a17p.pbm
-share/finalbattle/sprites/ships/a18m.pbm
-share/finalbattle/sprites/ships/a18p.pbm
-share/finalbattle/sprites/ships/alien.pbm
-share/finalbattle/sprites/ships/behem.pbm
-share/finalbattle/sprites/ships/claw.pbm
-share/finalbattle/sprites/ships/claw00.pbm
-share/finalbattle/sprites/ships/claw01.pbm
-share/finalbattle/sprites/ships/claw02.pbm
-share/finalbattle/sprites/ships/claw03.pbm
-share/finalbattle/sprites/ships/claw04.pbm
-share/finalbattle/sprites/ships/claw05.pbm
-share/finalbattle/sprites/ships/claw06.pbm
-share/finalbattle/sprites/ships/claw07.pbm
-share/finalbattle/sprites/ships/claw08.pbm
-share/finalbattle/sprites/ships/claw09.pbm
-share/finalbattle/sprites/ships/claw10.pbm
-share/finalbattle/sprites/ships/claw11.pbm
-share/finalbattle/sprites/ships/claw12.pbm
-share/finalbattle/sprites/ships/claw13.pbm
-share/finalbattle/sprites/ships/claw14.pbm
-share/finalbattle/sprites/ships/claw15.pbm
-share/finalbattle/sprites/ships/drone.pbm
-share/finalbattle/sprites/ships/dronem.pbm
-share/finalbattle/sprites/ships/fighter.pbm
-share/finalbattle/sprites/ships/kling.pbm
-share/finalbattle/sprites/ships/mil.pbm
-share/finalbattle/sprites/ships/rocket.pbm
-share/finalbattle/sprites/ships/skinny.pbm
-share/finalbattle/sprites/ships/tri00.pbm
-share/finalbattle/sprites/ships/tri01.pbm
-share/finalbattle/sprites/ships/tri02.pbm
-share/finalbattle/sprites/ships/tri03.pbm
-share/finalbattle/sprites/ships/tri04.pbm
-share/finalbattle/sprites/ships/tri05.pbm
-share/finalbattle/sprites/ships/tri06.pbm
-share/finalbattle/sprites/ships/tri07.pbm
-share/finalbattle/sprites/ships/tri08.pbm
-share/finalbattle/sprites/ships/tri09.pbm
-share/finalbattle/sprites/ships/tri10.pbm
-share/finalbattle/sprites/ships/tri11.pbm
-share/finalbattle/sprites/ships/tri12.pbm
-share/finalbattle/sprites/ships/tri13.pbm
-share/finalbattle/sprites/ships/tri14.pbm
-share/finalbattle/sprites/ships/tri15.pbm
-share/finalbattle/sprites/ships/viper0.pbm
-share/finalbattle/sprites/ships/viper1.pbm
-share/finalbattle/sprites/ships/viper2.pbm
-share/finalbattle/sprites/ships/viper3.pbm
-share/finalbattle/sprites/ships/viper4.pbm
-share/finalbattle/sprites/ships/viper5.pbm
-share/finalbattle/sprites/ships/viper6.pbm
-share/finalbattle/sprites/ships/viper7.pbm
-share/finalbattle/sprites/ships/viper8.pbm
-share/finalbattle/sprites/ships/viper9.pbm
-share/finalbattle/sprites/ships/vipera.pbm
-share/finalbattle/sprites/ships/viperb.pbm
-share/finalbattle/sprites/ships/viperc.pbm
-share/finalbattle/sprites/ships/viperd.pbm
-share/finalbattle/sprites/ships/vipere.pbm
-share/finalbattle/sprites/ships/viperf.pbm
-share/finalbattle/sprites/ships/wwing00.pbm
-share/finalbattle/sprites/ships/wwing01.pbm
-share/finalbattle/sprites/ships/wwing02.pbm
-share/finalbattle/sprites/ships/wwing03.pbm
-share/finalbattle/sprites/ships/wwing04.pbm
-share/finalbattle/sprites/ships/wwing05.pbm
-share/finalbattle/sprites/ships/wwing06.pbm
-share/finalbattle/sprites/ships/wwing07.pbm
-share/finalbattle/sprites/ships/wwing08.pbm
-share/finalbattle/sprites/ships/wwing09.pbm
-share/finalbattle/sprites/ships/wwing10.pbm
-share/finalbattle/sprites/ships/wwing11.pbm
-share/finalbattle/sprites/ships/wwing12.pbm
-share/finalbattle/sprites/ships/wwing13.pbm
-share/finalbattle/sprites/ships/wwing14.pbm
-share/finalbattle/sprites/ships/wwing15.pbm
-share/finalbattle/sprites/upgrade/negate~
-share/finalbattle/sprites/upgrade/upgrade_a0.pbm
-share/finalbattle/sprites/upgrade/upgrade_a1.pbm
-share/finalbattle/sprites/upgrade/upgrade_a2.pbm
-share/finalbattle/sprites/upgrade/upgrade_a3.pbm
-share/finalbattle/sprites/upgrade/upgrade_a4.pbm
-share/finalbattle/sprites/upgrade/upgrade_b0.pbm
-share/finalbattle/sprites/upgrade/upgrade_b1.pbm
-share/finalbattle/sprites/upgrade/upgrade_c0.pbm
-share/finalbattle/sprites/upgrade/upgrade_c1.pbm
-share/finalbattle/sprites/upgrade/upgrade_c2.pbm
-share/finalbattle/sprites/upgrade/upgrade_c3.pbm
-share/finalbattle/sprites/upgrade/upgrade_c4.pbm
-share/finalbattle/sprites/upgrade/upgrade_c5.pbm
-share/finalbattle/sprites/upgrade/upgrade_c6.pbm
-share/finalbattle/sprites/upgrade/upgrade_c7.pbm
-share/finalbattle/sprites/upgrade/upgrade_d0.pbm
-share/finalbattle/sprites/upgrade/upgrade_d1.pbm
-share/finalbattle/sprites/upgrade/upgrade_d2.pbm
-share/finalbattle/sprites/upgrade/upgrade_d3.pbm
-share/finalbattle/sprites/upgrade/upgrade_d4.pbm
-share/finalbattle/sprites/upgrade/upgrade_d5.pbm
-share/finalbattle/sprites/upgrade/upgrade_d6.pbm
-share/finalbattle/sprites/upgrade/upgrade_d7.pbm
-share/finalbattle/sprites/upgrade/upgrade_e0.pbm
-share/finalbattle/sprites/upgrade/upgrade_e1.pbm
-share/finalbattle/sprites/upgrade/upgrade_e2.pbm
-share/finalbattle/sprites/upgrade/upgrade_e3.pbm
-share/finalbattle/sprites/upgrade/upgrade_e4.pbm
-share/finalbattle/sprites/upgrade/upgrade_e5.pbm
-share/finalbattle/sprites/upgrade/upgrade_e6.pbm
-share/finalbattle/sprites/upgrade/upgrade_e7.pbm
-share/finalbattle/sprites/upgrade/upgrade_f0.pbm
-share/finalbattle/sprites/upgrade/upgrade_f1.pbm
-share/finalbattle/sprites/upgrade/upgrade_f2.pbm
-share/finalbattle/sprites/upgrade/upgrade_f3.pbm
-share/finalbattle/sprites/upgrade/upgrade_g0.pbm
-share/finalbattle/sprites/upgrade/upgrade_h0.pbm
-share/finalbattle/sprites/upgrade/upgrade_i0.pbm
-share/finalbattle/sprites/upgrade/upgrade_i1.pbm
-share/finalbattle/sprites/upgrade/upgrade_i2.pbm
-share/finalbattle/sprites/upgrade/upgrade_i3.pbm
-share/finalbattle/sprites/upgrade/upgrade_j0.pbm
-share/finalbattle/sprites/upgrade/upgrade_j1.pbm
-share/finalbattle/sprites/upgrade/upgrade_j2.pbm
-share/finalbattle/sprites/upgrade/upgrade_j3.pbm
-share/finalbattle/sprites/upgrade/upgrade_j4.pbm
-share/finalbattle/sprites/upgrade/upgrade_j5.pbm
-share/finalbattle/sprites/upgrade/upgrade_j6.pbm
-share/finalbattle/sprites/upgrade/upgrade_j7.pbm
-share/finalbattle/sprites/upgrade/upgrade_x0.pbm
-share/finalbattle/sprites/weapon/special_a.pbm
-share/finalbattle/sprites/weapon/special_mask.pbm
-share/finalbattle/sprites/weapon/weapon_a.pbm
-share/finalbattle/sprites/weapon/weapon_b.pbm
-share/finalbattle/sprites/weapon/weapon_c.pbm
-share/finalbattle/sprites/weapon/weapon_d.pbm
-share/finalbattle/sprites/weapon/weapon_e.pbm
-share/finalbattle/sprites/weapon/weapon_f.pbm
-share/finalbattle/sprites/weapon/weapon_g.pbm
-share/finalbattle/sprites/weapon/weapon_h.pbm
-share/finalbattle/sprites/weapon/weapon_mask.pbm
-share/finalbattle/sprites/makeasteroids-asterax
-share/finalbattle/sprites/makeasteroids-maelstrom
-share/finalbattle/sprites/makeships
-share/finalbattle/sprites/makeupgrades
-share/finalbattle/sprites/makeweapons
-share/finalbattle/sprites/title.xbm
-share/finalbattle/final.news
-share/finalbattle/README.txt

Index: pkgsrc/games/finalbattle/distinfo
diff -u pkgsrc/games/finalbattle/distinfo:1.6 pkgsrc/games/finalbattle/distinfo:1.7
--- pkgsrc/games/finalbattle/distinfo:1.6       Tue Nov  3 20:56:49 2015
+++ pkgsrc/games/finalbattle/distinfo   Sun Dec 11 01:10:26 2016
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 20:56:49 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/12/11 01:10:26 dholland Exp $
 
+SHA1 (finalbattle-jumbo-patch-20161210.gz) = 99a4eb17d7bab08ade244300b19cc3bb3135e125
+RMD160 (finalbattle-jumbo-patch-20161210.gz) = 10f1cd934fcdeef77974c621f75ca587d647928a
+SHA512 (finalbattle-jumbo-patch-20161210.gz) = f3019220c8768b77787f1431eb262e0fcfd76b1a6ce03c689ad6ea71cf6c49543611d3327a77e4b5cb224a8cdea0036288d6d42c11c85af5bd47b3f10df9e670
+Size (finalbattle-jumbo-patch-20161210.gz) = 15780 bytes
 SHA1 (finalbattle.0.0.tar.gz) = 36942d8bb0bd79b04cff52c085a0d1406973b965
 RMD160 (finalbattle.0.0.tar.gz) = f1df6916ebdda9bebf10f005a9ccdb97c77f6e39
 SHA512 (finalbattle.0.0.tar.gz) = 55e77c97e678f0f589040c51cc57df363350cdcb0ed85f0af4364202dee5b53e9aadd8f06d540bae36bbb9406c964c0e84d65df50246d66aee93b5e475848877
 Size (finalbattle.0.0.tar.gz) = 86579 bytes
-SHA1 (patch-aa) = 30ed8792fefa22d507ef626fffcd6b6276c513ee
-SHA1 (patch-ab) = cad883f747d86f8526a9d1a9d6138a4f75e9d0ca
+SHA1 (patch-makefile) = 4d3627f0cc8ffb3121cf34a71ec5f60320f5e4a7

Added files:

Index: pkgsrc/games/finalbattle/patches/patch-makefile
diff -u /dev/null pkgsrc/games/finalbattle/patches/patch-makefile:1.1
--- /dev/null   Sun Dec 11 01:10:26 2016
+++ pkgsrc/games/finalbattle/patches/patch-makefile     Sun Dec 11 01:10:26 2016
@@ -0,0 +1,30 @@
+$NetBSD: patch-makefile,v 1.1 2016/12/11 01:10:26 dholland Exp $
+
+Configure for pkgsrc.
+
+--- makefile~  2016-12-11 00:38:57.236393895 +0000
++++ makefile
+@@ -9,8 +9,8 @@
+ 
+ # Makefile defines
+ 
+-DESTDIR=
+-PREFIX=/usr/local
++#DESTDIR=
++#PREFIX=/usr/local
+ 
+ #CC=cc
+ CC=gcc
+@@ -24,10 +24,10 @@ STRIP=strip
+ 
+ #X11BASE=/usr/openwin
+ #X11BASE=/usr/X11R6
+-X11BASE=/usr/X11
++#X11BASE=/usr/X11
+ 
+ XINCS=-I$(X11BASE)/include
+-XLIBS=-L$(X11BASE)/lib -lX11 # -R$(X11BASE)/lib
++XLIBS=-L$(X11BASE)/lib -lX11 -R$(X11BASE)/lib
+ 
+ DATADIR=$(PREFIX)/share/finalbattle
+ SPRITESDIR=$(DATADIR)/sprites