pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/games mirrormagic: updated to 3.0.0



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5eb59564e40e
branches:  trunk
changeset: 310367:5eb59564e40e
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Jul 13 17:28:46 2018 +0000

description:
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.

diffstat:

 games/Makefile                                           |   3 +-
 games/mirrormagic-sdl/DESCR                              |  10 --
 games/mirrormagic-sdl/Makefile                           |  55 ----------------
 games/mirrormagic-sdl/PLIST                              |   7 --
 games/mirrormagic-sdl/distinfo                           |  13 ---
 games/mirrormagic-sdl/patches/patch-aa                   |  38 -----------
 games/mirrormagic-sdl/patches/patch-ab                   |  22 ------
 games/mirrormagic-sdl/patches/patch-ac                   |  12 ---
 games/mirrormagic-sdl/patches/patch-ad                   |  15 ----
 games/mirrormagic-sdl/patches/patch-src_libgame_misc.h   |  15 ----
 games/mirrormagic-sdl/patches/patch-src_libgame_sdl.h    |  36 ----------
 games/mirrormagic-sdl/patches/patch-src_libgame_system.h |  20 -----
 games/mirrormagic/Makefile                               |  55 ++-------------
 games/mirrormagic/PLIST                                  |   7 +-
 games/mirrormagic/distinfo                               |  20 ++---
 games/mirrormagic/patches/patch-aa                       |  31 ---------
 games/mirrormagic/patches/patch-ab                       |  22 ------
 games/mirrormagic/patches/patch-ad                       |  15 ----
 games/mirrormagic/patches/patch-src_libgame_misc.h       |  15 ----
 games/mirrormagic/patches/patch-src_libgame_system.h     |  20 -----
 games/mirrormagic/patches/patch-src_libgame_x11.h        |  15 ----
 21 files changed, 19 insertions(+), 427 deletions(-)

diffs (truncated from 550 to 300 lines):

diff -r 096ab1a1e9c4 -r 5eb59564e40e games/Makefile
--- a/games/Makefile    Fri Jul 13 17:27:32 2018 +0000
+++ b/games/Makefile    Fri Jul 13 17:28:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.415 2018/02/28 22:21:17 wiz Exp $
+# $NetBSD: Makefile,v 1.416 2018/07/13 17:28:46 adam Exp $
 #
 
 COMMENT=       Games
@@ -238,7 +238,6 @@
 SUBDIR+=       marathon-trilogy
 SUBDIR+=       minami
 SUBDIR+=       mirrormagic
-SUBDIR+=       mirrormagic-sdl
 SUBDIR+=       monsterz
 SUBDIR+=       moon-buggy
 SUBDIR+=       moria
diff -r 096ab1a1e9c4 -r 5eb59564e40e games/mirrormagic-sdl/DESCR
--- a/games/mirrormagic-sdl/DESCR       Fri Jul 13 17:27:32 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-This is a nice little game with color graphics and sound for your
-Unix system with color X11. You need an 8-Bit color display or better.
-It is not recommended on black&white systems, and maybe not on gray
-scale systems.
-
-It was first released as "Mirror Magic" in the year 1989 on the Amiga
-(with ports on other computer systems). As the Amiga is a bit outdated
-now, I decided to port it to Unix systems.
-
-A game for Unix/X11 by Holger Schemel, (c) 1995 by Holger Schemel.
diff -r 096ab1a1e9c4 -r 5eb59564e40e games/mirrormagic-sdl/Makefile
--- a/games/mirrormagic-sdl/Makefile    Fri Jul 13 17:27:32 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.31 2015/04/25 14:23:01 tnn Exp $
-#
-
-DISTNAME=              mirrormagic-2.0.2
-PKGNAME=               ${DISTNAME:S/-/-sdl-/}
-PKGREVISION=           19
-CATEGORIES=            games x11
-MASTER_SITES=          http://www.artsoft.org/RELEASES/unix/mirrormagic/
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://www.artsoft.org/mirrormagic/
-COMMENT=               Nice little puzzle game with color graphics and sound
-
-CONFLICTS=             mirrormagic-[1-9]*
-
-USE_TOOLS+=            gmake pax
-PLIST_SRC=             ${WRKDIR}/PLIST PLIST
-
-# if you change SCORE_PATH, don't forget to change patch-aa, too
-SCORE_PATH=            /var/games/mirrormagic
-
-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}
-
-SPECIAL_PERMS=         bin/mirrormagic ${SETGID_GAMES_PERMS}
-
-INSTALLATION_DIRS=     bin
-
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/mirrormagic ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/mirrormagic
-       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
-
-.include "../../audio/SDL_mixer/buildlink3.mk"
-.include "../../graphics/SDL_image/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 096ab1a1e9c4 -r 5eb59564e40e games/mirrormagic-sdl/PLIST
--- a/games/mirrormagic-sdl/PLIST       Fri Jul 13 17:27:32 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:51 joerg 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 -r 096ab1a1e9c4 -r 5eb59564e40e games/mirrormagic-sdl/distinfo
--- a/games/mirrormagic-sdl/distinfo    Fri Jul 13 17:27:32 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 20:56:59 agc 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) = 130a36ed3aea3f445dbccc0b6b45b7aa198bca12
-SHA1 (patch-ab) = abc9e8b8ed66225b50a398e287d94dfa1b728365
-SHA1 (patch-ac) = 2dd983a8f2a82f80226b902af28f5c29011e42e3
-SHA1 (patch-ad) = ebda01ff3f6dde6f56073e6ab8848d96110e17dd
-SHA1 (patch-src_libgame_misc.h) = a226378ea6dc7f4a16f8e65ae42df4ff04ccc1fb
-SHA1 (patch-src_libgame_sdl.h) = ce296d857d83f729a06b4e98bc33de218ff637ce
-SHA1 (patch-src_libgame_system.h) = a2129a503f3ea0eb49fb0721356cb6477684c03b
diff -r 096ab1a1e9c4 -r 5eb59564e40e games/mirrormagic-sdl/patches/patch-aa
--- a/games/mirrormagic-sdl/patches/patch-aa    Fri Jul 13 17:27:32 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/12 00:18:27 wiz Exp $
-
---- Makefile.orig      Tue Mar 19 02:59:43 2002
-+++ Makefile   Thu Mar 28 11:43:12 2002
-@@ -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,13 +44,12 @@
- 
- .EXPORT_ALL_VARIABLES:
- 
--MAKE = make
- 
- SRC_DIR = src
- MAKE_CMD = $(MAKE) -C $(SRC_DIR)
- 
- all:
--      @$(MAKE_CMD) TARGET=x11
-+      @$(MAKE_CMD) TARGET=sdl
- 
- x11:
-       @$(MAKE_CMD) TARGET=x11
diff -r 096ab1a1e9c4 -r 5eb59564e40e games/mirrormagic-sdl/patches/patch-ab
--- a/games/mirrormagic-sdl/patches/patch-ab    Fri Jul 13 17:27:32 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/09/12 00:18:27 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 -r 096ab1a1e9c4 -r 5eb59564e40e games/mirrormagic-sdl/patches/patch-ac
--- a/games/mirrormagic-sdl/patches/patch-ac    Fri Jul 13 17:27:32 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/09/12 00:18:27 wiz Exp $
-
---- src/libgame/sound.h.orig   Thu Mar 28 11:44:35 2002
-+++ src/libgame/sound.h        Thu Mar 28 11:44:50 2002
-@@ -27,6 +27,7 @@
- #elif defined(PLATFORM_FREEBSD)
- #include <machine/soundcard.h>
- #elif defined(PLATFORM_NETBSD)
-+#include <sys/types.h>
- #include <sys/ioctl.h>
- #include <sys/audioio.h>
- #elif defined(PLATFORM_HPUX)
diff -r 096ab1a1e9c4 -r 5eb59564e40e games/mirrormagic-sdl/patches/patch-ad
--- a/games/mirrormagic-sdl/patches/patch-ad    Fri Jul 13 17:27:32 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 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 -r 096ab1a1e9c4 -r 5eb59564e40e games/mirrormagic-sdl/patches/patch-src_libgame_misc.h
--- a/games/mirrormagic-sdl/patches/patch-src_libgame_misc.h    Fri Jul 13 17:27:32 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 096ab1a1e9c4 -r 5eb59564e40e games/mirrormagic-sdl/patches/patch-src_libgame_sdl.h
--- a/games/mirrormagic-sdl/patches/patch-src_libgame_sdl.h     Fri Jul 13 17:27:32 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-src_libgame_sdl.h,v 1.1 2012/08/10 18:04:53 joerg Exp $
-
---- src/libgame/sdl.h.orig     2012-08-10 12:21:02.000000000 +0000
-+++ src/libgame/sdl.h
-@@ -314,20 +314,20 @@ struct XY
- 
- /* SDL function definitions */
- 
--inline void SDLInitVideoDisplay(void);
--inline void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean);
--inline boolean SDLSetVideoMode(DrawBuffer **, boolean);
--inline void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
--inline void SDLFillRectangle(Bitmap *, int, int, int, int, unsigned int);
--inline void SDLDrawSimpleLine(Bitmap *, int, int, int, int, unsigned int);
--inline void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
--inline Pixel SDLGetPixel(Bitmap *, int, int);
-+void SDLInitVideoDisplay(void);
-+void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean);
-+boolean SDLSetVideoMode(DrawBuffer **, boolean);
-+void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
-+void SDLFillRectangle(Bitmap *, int, int, int, int, unsigned int);
-+void SDLDrawSimpleLine(Bitmap *, int, int, int, int, unsigned int);
-+void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
-+Pixel SDLGetPixel(Bitmap *, int, int);
- 
- Bitmap *SDLLoadImage(char *);
- 
--inline void SDLOpenAudio(void);
--inline void SDLCloseAudio(void);
-+void SDLOpenAudio(void);
-+void SDLCloseAudio(void);
- 
--inline void SDLNextEvent(Event *);
-+void SDLNextEvent(Event *);
- 
- #endif /* SDL_H */
diff -r 096ab1a1e9c4 -r 5eb59564e40e games/mirrormagic-sdl/patches/patch-src_libgame_system.h
--- a/games/mirrormagic-sdl/patches/patch-src_libgame_system.h  Fri Jul 13 17:27:32 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 *);



Home | Main Index | Thread Index | Old Index