mirrormagic: updated to 3.0.0

3.0.0:
There are not many new features and changes to the game itself, as the main goal of this release is to keep the game playable on modern systems, and there is finally also support for Mac and Android systems. This was all done by integrating the classic Mirror Magic game engine into the game Rocks’n’Diamonds as a new custom game engine, therefore using R’n’D as the new technical platform for this and any future release.

9 files changed, 18 insertions, 182 deletions

diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index f16de3eb68e..3161f1e8a98 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,55 +1,16 @@
-# $NetBSD: Makefile,v 1.31 2012/10/06 11:54:47 asau Exp $
-#
+# $NetBSD: Makefile,v 1.32 2018/07/13 17:28:46 adam Exp $
 
-DISTNAME=		mirrormagic-2.0.2
-PKGREVISION=		2
-CATEGORIES=		games x11
-MASTER_SITES=		http://www.artsoft.org/RELEASES/unix/mirrormagic/
+DISTNAME=	mirrormagic-3.0.0
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.artsoft.org/mirrormagic/
-COMMENT=		Nice little puzzle game with color graphics and sound
+COMMENT=	Nice little puzzle game with color graphics and sound
 
-CONFLICTS=		mirrormagic-sdl-[1-9]*
+CONFLICTS=	mirrormagic-sdl-[1-9]*
 
-USE_TOOLS+=		gmake pax
-PLIST_SRC=		${WRKDIR}/PLIST PLIST
+LEVEL_NAMES=	classic_deflektor classic_mindbender
 
-# if you change SCORE_PATH, don't forget to change patch-aa, too
-SCORE_PATH=		/var/games/mirrormagic
+.include "../../games/rocksndiamonds/Makefile.common"
 
-SETGIDGAME=		yes
-OWN_DIRS_PERMS=		${SCORE_PATH} ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
-OWN_DIRS_PERMS+=	${SCORE_PATH}/scores				\
-				${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
-OWN_DIRS_PERMS+=	${SCORE_PATH}/scores/classic_deflektor		\
-				${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
-OWN_DIRS_PERMS+=	${SCORE_PATH}/scores/classic_mindbender		\
-				${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+# bug in src/Makefile
+MAKE_FLAGS+=	PROGBASE=${PKGBASE}
 
-SPECIAL_PERMS=		bin/mirrormagic ${SETGID_GAMES_PERMS}
-
-INSTALLATION_DIRS=	bin share/mirrormagic
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mirrormagic ${DESTDIR}${PREFIX}/bin
-	cd ${WRKSRC} && pax -rw graphics levels music sounds \
-		${DESTDIR}${PREFIX}/share/mirrormagic/
-
-	${RM} -f ${WRKDIR}/PLIST
-.for levdir in Classic_Games
-	cd ${DESTDIR}${PREFIX} && \
-	${FIND} share/mirrormagic/levels/${levdir} -type f -print \
-		>>${WRKDIR}/PLIST
-.endfor
-.for directory in graphics music sounds
-	cd ${DESTDIR}${PREFIX} && \
-	${FIND} share/mirrormagic/${directory} -type f -print \
-		>>${WRKDIR}/PLIST
-.endfor
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/mirrormagic/PLIST b/games/mirrormagic/PLIST
index 3e918c01bad..48a05cdbc3e 100644
--- a/games/mirrormagic/PLIST
+++ b/games/mirrormagic/PLIST
@@ -1,7 +1,2 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:56:51 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/07/13 17:28:46 adam Exp $
 bin/mirrormagic
-@exec install -d -m 775 -o games -g games /var/games/mirrormagic
-@exec install -d -m 775 -o games -g games /var/games/mirrormagic/scores
-@exec install -d -m 775 -o games -g games /var/games/mirrormagic/scores/classic_deflektor
-@exec install -d -m 775 -o games -g games /var/games/mirrormagic/scores/classic_mindbender
-@unexec echo Delete /var/games/mirrormagic if you do not need your hiscores anymore.
diff --git a/games/mirrormagic/distinfo b/games/mirrormagic/distinfo
index 18df9510827..e833bb01f8b 100644
--- a/games/mirrormagic/distinfo
+++ b/games/mirrormagic/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 20:56:59 agc Exp $
+$NetBSD: distinfo,v 1.10 2018/07/13 17:28:46 adam Exp $
 
-SHA1 (mirrormagic-2.0.2.tar.gz) = bce7fbf163d5177f59ba4f516b06a3ebb7cc3927
-RMD160 (mirrormagic-2.0.2.tar.gz) = 57de928f2b37575886ddb5cbafcababf9de765dc
-SHA512 (mirrormagic-2.0.2.tar.gz) = cd49b1325485b68f2b59341e91f0564693dd12117aa3d6b5078c0a7f0e074114196870af11f0a154a0934cfce7106ba9685d886611f2efeff665ea030d705e03
-Size (mirrormagic-2.0.2.tar.gz) = 1168098 bytes
-SHA1 (patch-aa) = ec4613d70482da6f240fefe57f6c61f745d01125
-SHA1 (patch-ab) = abc9e8b8ed66225b50a398e287d94dfa1b728365
-SHA1 (patch-ad) = ebda01ff3f6dde6f56073e6ab8848d96110e17dd
-SHA1 (patch-src_libgame_misc.h) = a226378ea6dc7f4a16f8e65ae42df4ff04ccc1fb
-SHA1 (patch-src_libgame_system.h) = a2129a503f3ea0eb49fb0721356cb6477684c03b
-SHA1 (patch-src_libgame_x11.h) = 2ad4a60d4b7d9e83d55832f323714dce80bd9c42
+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_libgame_joystick.c) = 152bfcca101d5b66838d68532fbd76599297a6ef
+SHA1 (patch-src_libgame_joystick.h) = a6bae0443a6285b9e4179119f1101ba7bf8d6727
+SHA1 (patch-src_libgame_system.c) = 5e45cba46865f43c7f7d9de3a1f5b44aebb185d0
diff --git a/games/mirrormagic/patches/patch-aa b/games/mirrormagic/patches/patch-aa
deleted file mode 100644
index 5ce856af013..00000000000
--- a/games/mirrormagic/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2002/09/11 23:43:42 wiz Exp $
-
---- Makefile.orig	Wed May  2 23:09:06 2001
-+++ Makefile	Sun Jun 24 21:03:37 2001
-@@ -12,15 +12,17 @@
- 
- # specify path to X11 on your system
- # if undefined, use system defaults (works with Linux/gcc/libc5)
--X11_PATH = /usr/X11
-+X11_PATH = ${X11BASE}
- 
- # specify directory for read-only game data (like graphics, sounds, levels)
- # default is '.', so you can play without installing game data somewhere
- # RO_GAME_DIR = /usr/games
-+RO_GAME_DIR = ${PREFIX}/share/mirrormagic
- 
- # specify directory for writable game data (like highscore files)
- # default is '.', so you can play without installing game data somewhere
- # RW_GAME_DIR = /var/games
-+RW_GAME_DIR = /var/games/mirrormagic
- 
- # uncomment this if your system has no joystick include file
- # JOYSTICK = -DNO_JOYSTICK
-@@ -42,7 +44,6 @@
- 
- .EXPORT_ALL_VARIABLES:
- 
--MAKE = make
- 
- SRC_DIR = src
- MAKE_CMD = $(MAKE) -C $(SRC_DIR)
diff --git a/games/mirrormagic/patches/patch-ab b/games/mirrormagic/patches/patch-ab
deleted file mode 100644
index b140205d253..00000000000
--- a/games/mirrormagic/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2002/09/11 23:43:42 wiz Exp $
-
---- src/Makefile.orig	Tue Mar 19 02:58:57 2002
-+++ src/Makefile	Thu Mar 28 11:34:15 2002
-@@ -17,7 +17,7 @@
- XINC_PATH = $(X11_PATH)/include
- XLIB_PATH = $(X11_PATH)/lib
- X11_INCL = -I$(XINC_PATH)
--X11_LIBS = -L$(XLIB_PATH)
-+X11_LIBS = -L$(XLIB_PATH) -Wl,-R$(XLIB_PATH)
- endif
- 
- AR = ar
-@@ -112,7 +112,7 @@
- OPTIONS = -O3 -Wall
- endif
- 
--CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
-+CFLAGS += $(SYS_CFLAGS) $(CONFIG)
- LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
- 
- 
diff --git a/games/mirrormagic/patches/patch-ad b/games/mirrormagic/patches/patch-ad
deleted file mode 100644
index d86464bd538..00000000000
--- a/games/mirrormagic/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2007/04/03 16:57:06 dillo Exp $
-
-Fix compilation with gcc4, from Andreas Jochens via Debian.
-
---- src/main.h.orig	2003-06-07 18:04:37.000000000 +0200
-+++ src/main.h
-@@ -459,7 +459,7 @@ extern struct PlayerInfo	stored_player[]
- #endif
- extern struct HiScore		highscore[];
- extern struct TapeInfo		tape;
--extern struct JoystickInfo	joystick[];
-+/* extern struct JoystickInfo	joystick[]; */
- extern struct SetupInfo		setup;
- extern struct GameInfo		game;
- extern struct LaserInfo		laser;
diff --git a/games/mirrormagic/patches/patch-src_libgame_misc.h b/games/mirrormagic/patches/patch-src_libgame_misc.h
deleted file mode 100644
index 62591681a0b..00000000000
--- a/games/mirrormagic/patches/patch-src_libgame_misc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_libgame_misc.h,v 1.1 2012/08/10 18:04:53 joerg Exp $
-
---- src/libgame/misc.h.orig	2012-08-10 12:06:04.000000000 +0000
-+++ src/libgame/misc.h
-@@ -137,8 +137,8 @@ void dumpLevelDirInfo(struct LevelDirInf
- void sortLevelDirInfo(struct LevelDirInfo **,
- 		      int (*compare_function)(const void *, const void *));
- 
--inline void swap_numbers(int *, int *);
--inline void swap_number_pairs(int *, int *, int *, int *);
-+void swap_numbers(int *, int *);
-+void swap_number_pairs(int *, int *, int *, int *);
- 
- char *getUserDataDir(void);
- char *getSetupDir(void);
diff --git a/games/mirrormagic/patches/patch-src_libgame_system.h b/games/mirrormagic/patches/patch-src_libgame_system.h
deleted file mode 100644
index 935e2f159c6..00000000000
--- a/games/mirrormagic/patches/patch-src_libgame_system.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_libgame_system.h,v 1.1 2012/08/10 18:04:53 joerg Exp $
-
---- src/libgame/system.h.orig	2002-03-19 02:42:52.000000000 +0000
-+++ src/libgame/system.h
-@@ -278,6 +278,8 @@ void InitGfxDoor1Info(int, int, int, int
- void InitGfxDoor2Info(int, int, int, int);
- void InitGfxScrollbufferInfo(int, int);
- 
-+#define inline
-+
- inline void InitVideoDisplay(void);
- inline void CloseVideoDisplay(void);
- inline void InitVideoBuffer(DrawBuffer **,DrawWindow **, int,int,int, boolean);
-@@ -315,4 +317,6 @@ inline void NextEvent(Event *event);
- inline Key GetEventKey(KeyEvent *, boolean);
- inline boolean CheckCloseWindowEvent(ClientMessageEvent *);
- 
-+#undef inline
-+
- #endif /* SYSTEM_H */
diff --git a/games/mirrormagic/patches/patch-src_libgame_x11.h b/games/mirrormagic/patches/patch-src_libgame_x11.h
deleted file mode 100644
index fbf47e7c4e9..00000000000
--- a/games/mirrormagic/patches/patch-src_libgame_x11.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_libgame_x11.h,v 1.1 2012/08/10 18:04:53 joerg Exp $
-
---- src/libgame/x11.h.orig	2012-08-10 12:06:45.000000000 +0000
-+++ src/libgame/x11.h
-@@ -286,8 +286,8 @@ struct XY
- 
- /* X11 function definitions */
- 
--inline void X11InitVideoDisplay(void);
--inline void X11InitVideoBuffer(DrawBuffer **, DrawWindow **);
-+void X11InitVideoDisplay(void);
-+void X11InitVideoBuffer(DrawBuffer **, DrawWindow **);
- Bitmap *X11LoadImage(char *);
- 
- #endif /* X11_H */