 @@ -1,19 +1,16 @@
-# $NetBSD: Makefile,v 1.41 2023/05/06 19:09:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2023/10/20 09:53:38 adam Exp $
-DISTNAME=	mirrormagic-3.0.0
+DISTNAME=	mirrormagic-3.3.0-linux
 COMMENT=	Nice little puzzle game with color graphics and sound
 PKGREVISION=	8
 CONFLICTS=	mirrormagic-sdl-[1-9]*
 LEVEL_NAMES=	classic_deflektor classic_mindbender
 .include "../../games/rocksndiamonds/Makefile.common"
 # bug in src/Makefile
 MAKE_FLAGS+=	PROGBASE=${PKGBASE}
 MAKE_FLAGS+=	RO_GAME_DIR=${PREFIX}/share/${PKGBASE}
 MAKE_FLAGS+=	RW_GAME_DIR=${SCORE_PATH:Q}
 .include "../../mk/bsd.pkg.mk"

 @@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:44:15 nia Exp $
+$NetBSD: distinfo,v 1.14 2023/10/20 09:53:38 adam Exp $
-BLAKE2s (mirrormagic-3.0.0.tar.gz) = cb57cec5574466451e6b8a5f177f8259d3a5f632b8493e71e086e03c99a38eb4
+BLAKE2s (mirrormagic-3.3.0-linux.tar.gz) = eca14ba828b5e75f094e95433c5ad629fcc37c854ce3a6056318bbcda854f0a6
-SHA512 (mirrormagic-3.0.0.tar.gz) = 4cec053bc78a10090a5f9cf678429fd3c927637c3299652de9914b4d8a19518c2e5e10d72bba56aff6a545bbf30e95874576be5b08978060cd59cdba1903de2a
+SHA512 (mirrormagic-3.3.0-linux.tar.gz) = 5dca010db2f4f2d1ae1a4ab83d0d78d44e59948728f0756c7f2dede3d09ddd92e853fa848ce509a4826609e33daf32a3dde8c2b8bd67af0d91fb7a86dfdc05ff
-Size (mirrormagic-3.0.0.tar.gz) = 4052452 bytes
+Size (mirrormagic-3.3.0-linux.tar.gz) = 5686178 bytes
-SHA1 (patch-src_Makefile) = 765b7a450384e420ca0e8726bef8e276183111d4
+SHA1 (patch-src_Makefile) = 0636da56f74733cc1f7babb25851b20cc57fdaee
-SHA1 (patch-src_libgame_joystick.c) = 152bfcca101d5b66838d68532fbd76599297a6ef
+SHA1 (patch-src_libgame_joystick.c) = 2c2e93718743ed8be1fa009ae870fe9c85cb9a30
 SHA1 (patch-src_libgame_joystick.h) = a6bae0443a6285b9e4179119f1101ba7bf8d6727
-SHA1 (patch-src_libgame_system.c) = 5e45cba46865f43c7f7d9de3a1f5b44aebb185d0
+SHA1 (patch-src_libgame_system.c) = 64b7d070b00d8bd04c476b83fa9d49cb3c14bde4

 @@ -1,37 +1,35 @@
-$NetBSD: patch-src_Makefile,v 1.2 2021/08/16 01:29:37 dholland Exp $
+$NetBSD: patch-src_Makefile,v 1.3 2023/10/20 09:53:38 adam Exp $
 Append to CFLAGS and LDFLAGS.
 Fix the makefile to not choke on parallel builds.
---- src/Makefile.orig	2018-04-10 19:44:08.000000000 +0000
+--- src/Makefile.orig	2023-05-21 14:16:39.000000000 +0000
 +++ src/Makefile
-@@ -119,8 +119,10 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAG
+@@ -153,8 +153,8 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAG
- OPTIONS = -O3 -Wall
+ OPTIONS = -O2 -Wall
  endif
--CFLAGS = $(OPTIONS) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
+-CFLAGS = $(OPTIONS) $(ANALYZE) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
--LDFLAGS =           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+-LDFLAGS =           $(ANALYZE) $(SYS_LDFLAGS) $(EXTRA_LDFLAGS)
-+# pkgsrc presets those variables, so use '+=' to append to them
++CFLAGS += $(OPTIONS) $(ANALYZE) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
-+# flags for debugging or optimisation may be supplied from the pkgsrc Makefile
++LDFLAGS +=           $(ANALYZE) $(SYS_LDFLAGS) $(EXTRA_LDFLAGS)
 +CFLAGS += $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
 +LDFLAGS += $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
  SRCS =	main.c		\
-@@ -218,7 +220,14 @@ GRAPHICS_DIR = ../graphics
+@@ -262,7 +262,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)
+ $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(COMMIT_HASH_FILE) $(OBJS) $(ICON)
- 	$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
+ 	$(CC) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)

 @@ -1,22 +1,22 @@
-$NetBSD: patch-src_libgame_joystick.c,v 1.1 2019/05/05 07:59:38 adam Exp $
+$NetBSD: patch-src_libgame_joystick.c,v 1.2 2023/10/20 09:53:38 adam Exp $
 Allow joystick on NetBSD.
---- src/libgame/joystick.c.orig	2015-10-20 21:58:08.000000000 +0000
+--- src/libgame/joystick.c.orig	2023-05-21 14:16:39.000000000 +0000
 +++ src/libgame/joystick.c
 @@ -9,12 +9,13 @@
  // joystick.c
  // ============================================================================
 -#if defined(PLATFORM_FREEBSD)
 +#include "misc.h"
++
 +#if defined(PLATFORM_FREEBSD) || (defined(PLATFORM_NETBSD) && defined(HAVE_JOYSTICK))
  #include <machine/joystick.h>
  #endif
  #include "joystick.h"
 -#include "misc.h"
- /* ========================================================================= */
+ // ============================================================================

 @@ -1,18 +1,18 @@
-$NetBSD: patch-src_libgame_system.c,v 1.1 2019/05/05 07:59:38 adam Exp $
+$NetBSD: patch-src_libgame_system.c,v 1.2 2023/10/20 09:53:38 adam Exp $
 InitJoystick will be called more than once, so reset the state
 variable 'joystick' only if there's no joystick available (yet).
---- src/libgame/system.c.orig	2018-04-10 19:44:08.000000000 +0000
+--- src/libgame/system.c.orig	2023-05-21 14:16:39.000000000 +0000
 +++ src/libgame/system.c
-@@ -1744,8 +1744,10 @@ void InitJoysticks()
+@@ -1844,8 +1844,10 @@ void InitJoysticks(void)
-   /* always start with reliable default values */
+   // always start with reliable default values
    joystick.status = JOYSTICK_NOT_AVAILABLE;
 +  if (joystick.status == JOYSTICK_NOT_AVAILABLE) {
    for (i = 0; i < MAX_PLAYERS; i++)
-     joystick.nr[i] = -1;		/* no joystick configured */
+     joystick.nr[i] = -1;		// no joystick configured
 +  }
    SDLInitJoysticks();
+ }