CVS commit: pkgsrc/games/mirrormagic

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

Module Name:    pkgsrc
Committed By:   dholland
Date:           Mon Aug 16 01:29:37 UTC 2021

Modified Files:
        pkgsrc/games/mirrormagic: distinfo
        pkgsrc/games/mirrormagic/patches: patch-src_Makefile

Log Message:
games/mirrormagic: fix makefile to be parallel, failed in the procyon builds


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/mirrormagic/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/mirrormagic/patches/patch-src_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/mirrormagic/distinfo
diff -u pkgsrc/games/mirrormagic/distinfo:1.10 pkgsrc/games/mirrormagic/distinfo:1.11
--- pkgsrc/games/mirrormagic/distinfo:1.10      Fri Jul 13 17:28:46 2018
+++ pkgsrc/games/mirrormagic/distinfo   Mon Aug 16 01:29:37 2021
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2018/07/13 17:28:46 adam Exp $
+$NetBSD: distinfo,v 1.11 2021/08/16 01:29:37 dholland Exp $
 
 SHA1 (mirrormagic-3.0.0.tar.gz) = 44f401ae883edb7cdc981cdde8807f18ec342bdc
 RMD160 (mirrormagic-3.0.0.tar.gz) = 69db03f025d57bb921d4b0143db06f37bb6371d7
 SHA512 (mirrormagic-3.0.0.tar.gz) = 4cec053bc78a10090a5f9cf678429fd3c927637c3299652de9914b4d8a19518c2e5e10d72bba56aff6a545bbf30e95874576be5b08978060cd59cdba1903de2a
 Size (mirrormagic-3.0.0.tar.gz) = 4052452 bytes
-SHA1 (patch-src_Makefile) = 702af16aeb41f10d3ea995ad8c5c2a43f3ce9a0e
+SHA1 (patch-src_Makefile) = 765b7a450384e420ca0e8726bef8e276183111d4
 SHA1 (patch-src_libgame_joystick.c) = 152bfcca101d5b66838d68532fbd76599297a6ef
 SHA1 (patch-src_libgame_joystick.h) = a6bae0443a6285b9e4179119f1101ba7bf8d6727
 SHA1 (patch-src_libgame_system.c) = 5e45cba46865f43c7f7d9de3a1f5b44aebb185d0

Index: pkgsrc/games/mirrormagic/patches/patch-src_Makefile
diff -u pkgsrc/games/mirrormagic/patches/patch-src_Makefile:1.1 pkgsrc/games/mirrormagic/patches/patch-src_Makefile:1.2
--- pkgsrc/games/mirrormagic/patches/patch-src_Makefile:1.1     Sun May  5 07:59:38 2019
+++ pkgsrc/games/mirrormagic/patches/patch-src_Makefile Mon Aug 16 01:29:37 2021
@@ -1,10 +1,12 @@
-$NetBSD: patch-src_Makefile,v 1.1 2019/05/05 07:59:38 adam Exp $
+$NetBSD: patch-src_Makefile,v 1.2 2021/08/16 01:29:37 dholland Exp $
 
 Append to CFLAGS and LDFLAGS.
 
---- src/Makefile.orig  2017-03-15 20:15:06.000000000 +0000
+Fix the makefile to not choke on parallel builds.
+
+--- src/Makefile.orig  2018-04-10 19:44:08.000000000 +0000
 +++ src/Makefile
-@@ -117,8 +117,10 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAG
+@@ -119,8 +119,10 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAG
  OPTIONS = -O3 -Wall
  endif
  
@@ -17,3 +19,19 @@ Append to CFLAGS and LDFLAGS.
  
  
  SRCS =        main.c          \
+@@ -218,7 +220,14 @@ GRAPHICS_DIR = ../graphics
+ # build targets
+ # -----------------------------------------------------------------------------
+ 
+-all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir game_mm_dir $(PROGNAME) graphics_dir
++# since gmake has no .WAIT the only option is to serialize fully
++#all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir game_mm_dir $(PROGNAME) graphics_dir
++all:
++      $(MAKE) $(AUTOCONF)
++      $(MAKE) libgame_dir
++      $(MAKE) game_em_dir game_sp_dir game_mm_dir
++      $(MAKE) $(PROGNAME)
++      $(MAKE)  graphics_dir
+ 
+ $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
+       $(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)