From e81331e6cbdc66364adbd5c7473551b06eacbefd Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 11 Dec 2016 01:10:26 +0000 Subject: 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. --- games/finalbattle/Makefile | 8 +- games/finalbattle/PLIST | 212 +------------------------------ games/finalbattle/distinfo | 9 +- games/finalbattle/patches/patch-aa | 148 --------------------- games/finalbattle/patches/patch-ab | 44 ------- games/finalbattle/patches/patch-makefile | 30 +++++ 6 files changed, 45 insertions(+), 406 deletions(-) delete mode 100644 games/finalbattle/patches/patch-aa delete mode 100644 games/finalbattle/patches/patch-ab create mode 100644 games/finalbattle/patches/patch-makefile (limited to 'games') diff --git a/games/finalbattle/Makefile b/games/finalbattle/Makefile index 05a071236a3..5e5459597ca 100644 --- a/games/finalbattle/Makefile +++ b/games/finalbattle/Makefile @@ -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 HOMEPAGE= http://web.archive.org/web/2/http://www.newbreedsoftware.com/finalbattle/ COMMENT= Multiplayer space battle simulation for X diff --git a/games/finalbattle/PLIST b/games/finalbattle/PLIST index 5a2573f9483..423bf876acf 100644 --- a/games/finalbattle/PLIST +++ b/games/finalbattle/PLIST @@ -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.obj 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 diff --git a/games/finalbattle/distinfo b/games/finalbattle/distinfo index 5a3195b18ab..71d6a308a4c 100644 --- a/games/finalbattle/distinfo +++ b/games/finalbattle/distinfo @@ -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 diff --git a/games/finalbattle/patches/patch-aa b/games/finalbattle/patches/patch-aa deleted file mode 100644 index 54507e1dc45..00000000000 --- a/games/finalbattle/patches/patch-aa +++ /dev/null @@ -1,148 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2010/01/29 20:31:33 joerg Exp $ - ---- makefile.orig Thu Apr 2 21:55:07 1998 -+++ makefile Sun Jul 26 06:51:44 1998 -@@ -11,7 +11,9 @@ - --POSTPROCESS=strip - CC=gcc --#XLIB=-L/usr/openwin/lib -lX11 --XLIB=-L/usr/X11/lib -lX11 -- -+XLIB= -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lX11 -+INSTALLROOT=${DESTDIR}$(PREFIX) -+DATA=${DESTDIR}$(PREFIX)/share/finalbattle -+SPRITES=${DESTDIR}$(PREFIX)/share/finalbattle/sprites -+DEFS=-DSPRITES=\"$(SPRITES)\" -DDATA=\"$(DATA)\" -+CFLAGS+= -I$(X11BASE)/include $(DEFS) - -@@ -27,2 +29,18 @@ - -+install: final -+ install -s -m 0755 final $(INSTALLROOT)/bin -+ mkdir -p $(SPRITES)/asteroids -+ mkdir -p $(SPRITES)/obj -+ mkdir -p $(SPRITES)/ships -+ mkdir -p $(SPRITES)/upgrade -+ mkdir -p $(SPRITES)/weapon -+ install -m 0644 sprites/asteroids/* $(SPRITES)/asteroids -+ install -m 0644 sprites/obj/* $(SPRITES)/obj -+ install -m 0644 sprites/ships/* $(SPRITES)/ships -+ install -m 0644 sprites/upgrade/* $(SPRITES)/upgrade -+ install -m 0644 sprites/weapon/* $(SPRITES)/weapon -+ @rm -r sprites/*/ -+ install -m 0644 sprites/* $(SPRITES) -+ install -m 0644 final.news $(DATA) -+ install -m 0644 README.txt $(DATA) - -@@ -30,12 +48,9 @@ - --final: final.o lib/connect.o lib/gc.o lib/hints.o lib/window.o \ -- lib/text.o setup.o graphics.o radarwin.o math.o lib/rndm.o \ -- event.o movement.o actionwin.o commwin.o weapons.o misc.o \ -- weaponwin.o damagewin.o upgradewin.o lib/color.o lib/visual.o -- $(CC) final.o lib/connect.o lib/gc.o lib/hints.o lib/window.o \ -- lib/text.o setup.o graphics.o radarwin.o math.o lib/rndm.o \ -+OBJS= final.o connect.o gc.o hints.o window.o \ -+ text.o setup.o graphics.o radarwin.o math.o rndm.o \ - event.o movement.o actionwin.o commwin.o weapons.o misc.o \ -- weaponwin.o damagewin.o upgradewin.o lib/color.o lib/visual.o \ -- -o final $(XLIB) -lm -- $(POSTPROCESS) final -+ weaponwin.o damagewin.o upgradewin.o color.o visual.o -+ -+final: $(OBJS) -+ $(CC) $(OBJS) -o $@ $(XLIB) -lm - chmod 755 final -@@ -44,3 +59,2 @@ - $(CC) convert.c -o convert -- $(POSTPROCESS) convert - chmod 755 convert -@@ -55,79 +69,28 @@ - lib/color.h lib/visual.h -- $(CC) final.c -c -- - convert.o: convert.c -- gcc convert.c -c -- -- --# The main executable's library object files: -- - setup.o: setup.c setup.h const.h glovar.h types.h misc.h lib/gc.h \ - lib/connect.h lib/rndm.h lib/text.h lib/color.h lib/visual.h -- $(CC) setup.c -c -- - misc.o: misc.c misc.h const.h glovar.h -- $(CC) misc.c -c -- - graphics.o: graphics.c graphics.h const.h glovar.h types.h -- $(CC) graphics.c -c -- - radarwin.o: radarwin.c radarwin.h const.h glovar.h types.h -- $(CC) radarwin.c -c -- - weaponwin.o: weaponwin.c weaponwin.h const.h glovar.h types.h graphics.h -- $(CC) weaponwin.c -c -- - event.o: event.c event.h const.h glovar.h types.h radarwin.h \ - weaponwin.h lib/rndm.h lib/connect.h -- $(CC) event.c -c -- - math.o: math.c math.h -- $(CC) math.c -c -- - movement.o: movement.c movement.h const.h glovar.h types.h weaponwin.h \ - misc.h weapons.h event.h upgradewin.h -- $(CC) movement.c -c -- - actionwin.o: actionwin.c actionwin.h const.h glovar.h types.h -- $(CC) actionwin.c -c -- - damagewin.o: damagewin.c damagewin.h const.h glovar.h types.h graphics.h \ - lib/text.h -- $(CC) damagewin.c -c -- - upgradewin.o: upgradewin.c damagewin.h const.h glovar.h types.h graphics.h \ - lib/text.h -- $(CC) upgradewin.c -c -- - commwin.o: commwin.c commwin.h const.h glovar.h types.h lib/text.h -- $(CC) commwin.c -c -- - weapons.o: weapons.c weapons.h movement.h const.h glovar.h -- $(CC) weapons.c -c -- -- --# Other library object files: -- --lib/color.o: lib/color.c lib/color.h -- $(CC) lib/color.c -c -o lib/color.o -- --lib/visual.o: lib/visual.c lib/visual.h -- $(CC) lib/visual.c -c -o lib/visual.o -- --lib/rndm.o: lib/rndm.c lib/rndm.h -- $(CC) lib/rndm.c -c -o lib/rndm.o -- --lib/connect.o: lib/connect.c lib/connect.h -- $(CC) lib/connect.c -c -o lib/connect.o -- --lib/text.o: lib/text.c lib/text.h -- $(CC) lib/text.c -c -o lib/text.o -- --lib/gc.o: lib/gc.c lib/gc.h -- $(CC) lib/gc.c -c -o lib/gc.o -- --lib/hints.o: lib/hints.c lib/hints.h -- $(CC) lib/hints.c -c -o lib/hints.o -- --lib/window.o: lib/window.c lib/window.h -- $(CC) lib/window.c -c -o lib/window.o -+color.o: lib/color.c lib/color.h -+visual.o: lib/visual.c lib/visual.h -+rndm.o: lib/rndm.c lib/rndm.h -+connect.o: lib/connect.c lib/connect.h -+text.o: lib/text.c lib/text.h -+gc.o: lib/gc.c lib/gc.h -+hints.o: lib/hints.c lib/hints.h -+window.o: lib/window.c lib/window.h diff --git a/games/finalbattle/patches/patch-ab b/games/finalbattle/patches/patch-ab deleted file mode 100644 index a737e05a571..00000000000 --- a/games/finalbattle/patches/patch-ab +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:40 agc Exp $ - ---- setup.c.orig Thu Apr 2 21:52:57 1998 -+++ setup.c Sun Jul 26 06:47:23 1998 -@@ -198,3 +198,3 @@ - -- fi = fopen("final.news", "r"); -+ fi = fopen(DATA "/final.news", "r"); - -@@ -799,3 +799,3 @@ - -- sprintf(fname, "sprites/obj/%c.obj", i + 'a'); -+ sprintf(fname, SPRITES "/obj/%c.obj", i + 'a'); - -@@ -812,3 +812,3 @@ - { -- sprintf(fname, "sprites/obj/%c.obj", j + 'a'); -+ sprintf(fname, SPRITES "/obj/%c.obj", j + 'a'); - -@@ -937,3 +937,3 @@ - CopyFromParent, black[i], TITLE_EVENT_MASK, VISUAL); -- XReadBitmapFile(display[i], titlewin[i], "sprites/title.xbm", &titlew, -+ XReadBitmapFile(display[i], titlewin[i], SPRITES "/title.xbm", &titlew, - &titleh, &titlebitmap[i], &xhot, &yhot); -@@ -982,3 +982,3 @@ - -- fi = objopen("sprites/obj/asteroids.obj", 16); -+ fi = objopen(SPRITES "/obj/asteroids.obj", 16); - -@@ -1005,3 +1005,3 @@ - -- fi = objopen("sprites/obj/drone.obj", 1); -+ fi = objopen(SPRITES "/obj/drone.obj", 1); - -@@ -1033,3 +1033,3 @@ - { -- sprintf(str, "sprites/obj/upgrade_%c.obj", i + 'a'); -+ sprintf(str, SPRITES "/obj/upgrade_%c.obj", i + 'a'); - -@@ -1060,3 +1060,3 @@ - { -- sprintf(str, "sprites/obj/weapon_%c.obj", i + 'a'); -+ sprintf(str, SPRITES "/obj/weapon_%c.obj", i + 'a'); - diff --git a/games/finalbattle/patches/patch-makefile b/games/finalbattle/patches/patch-makefile new file mode 100644 index 00000000000..7e35f4ebf58 --- /dev/null +++ b/games/finalbattle/patches/patch-makefile @@ -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 -- cgit v1.2.3