git: a16bf0346a92 - main - games/mirrormagic: update 3.0.0 → 3.1.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dmitry Marakasov <amdmi3_at_FreeBSD.org>
Date: Tue, 27 Dec 2022 17:44:47 UTC
The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a16bf0346a92a99d061d2d325e15dd54fcb2b493

commit a16bf0346a92a99d061d2d325e15dd54fcb2b493
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-12-27 16:38:23 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-12-27 17:38:15 +0000

    games/mirrormagic: update 3.0.0 → 3.1.0
---
 games/mirrormagic/Makefile                         | 20 +++++------
 games/mirrormagic/distinfo                         |  6 ++--
 games/mirrormagic/files/patch-src_Makefile         | 41 +++++++++-------------
 games/mirrormagic/files/patch-src_libgame_system.c | 13 -------
 games/mirrormagic/files/patch-src_main.c           | 20 -----------
 games/mirrormagic/pkg-plist                        |  2 --
 6 files changed, 29 insertions(+), 73 deletions(-)

diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index 39547c0b20c2..ddb57d1af46f 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,7 +1,8 @@
 PORTNAME=	mirrormagic
-PORTVERSION=	3.0.0
+DISTVERSION=	3.1.0
 CATEGORIES=	games
-MASTER_SITES=	https://www.artsoft.org/RELEASES/unix/mirrormagic/
+MASTER_SITES=	https://www.artsoft.org/RELEASES/linux/mirrormagic/
+DISTNAME=	${PORTNAME}-${DISTVERSION}-linux
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Arcade style game with stereo sound for X Window System
@@ -15,15 +16,17 @@ USE_SDL=	sdl2 mixer2 image2 net2
 USE_PERL5=	build
 BUILD_WRKSRC=	${WRKSRC}/src
 MAKE_ARGS=	TARGET=sdl2 \
-		RO_GAME_DIR="${DATADIR}" \
-		RW_GAME_DIR="/var/games/${PORTNAME}"
+		BASE_PATH="${DATADIR}"
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
+
+PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 PORTDOCS=	*
 
 DESKTOP_ENTRIES="Mirror Magic" \
 		"" \
-		"" \
+		"${DATADIR}/graphics/gfx_mirrormagic/icons/icon.png" \
 		"${PORTNAME}" \
 		"Game;LogicGame;" \
 		""
@@ -34,11 +37,8 @@ post-extract:
 	@${RM} -r ${WRKSRC}/lib ${WRKSRC}/mirrormagic # linux binaries
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds \
-		${STAGEDIR}${PREFIX}/bin/mirrormagic
-	cd ${WRKSRC} && ${COPYTREE_SHARE} "conf docs graphics levels music sounds" \
-		${STAGEDIR}${DATADIR}
-	@${MKDIR} ${STAGEDIR}/var/games/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${STAGEDIR}${PREFIX}/bin/mirrormagic
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "conf docs graphics levels music sounds" ${STAGEDIR}${DATADIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/games/mirrormagic/distinfo b/games/mirrormagic/distinfo
index 3e7b0c29c038..a59445964884 100644
--- a/games/mirrormagic/distinfo
+++ b/games/mirrormagic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1647375691
-SHA256 (mirrormagic-3.0.0.tar.gz) = c79ad19d461c080011e12f5b9e6b1d3de4b8325e452ef4bb6e8a63a62ce9ffec
-SIZE (mirrormagic-3.0.0.tar.gz) = 4052452
+TIMESTAMP = 1672159268
+SHA256 (mirrormagic-3.1.0-linux.tar.gz) = 5b33074a5475c017c1fd8caf46a332054251ac65254fffc7d2c1501fb0d0ee48
+SIZE (mirrormagic-3.1.0-linux.tar.gz) = 5570889
diff --git a/games/mirrormagic/files/patch-src_Makefile b/games/mirrormagic/files/patch-src_Makefile
index 1ec43eaa7df0..841162fb4c08 100644
--- a/games/mirrormagic/files/patch-src_Makefile
+++ b/games/mirrormagic/files/patch-src_Makefile
@@ -1,31 +1,22 @@
---- src/Makefile.orig	2018-04-10 19:44:08 UTC
+--- src/Makefile.orig	2022-12-18 11:15:37 UTC
 +++ src/Makefile
-@@ -101,7 +101,7 @@ endif
- 
- CONFIG = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR) $(JOYSTICK)
- 
--DEBUG = -DDEBUG -g
-+DEBUG = 
- 
- # PROFILING = $(PROFILING_FLAGS)
- 
-@@ -119,8 +119,8 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAGS) |	\
- OPTIONS = -O3 -Wall
+@@ -136,7 +136,7 @@ DEBUG = -DDEBUG -g
+ # OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
+ # OPTIONS = $(DEBUG) -O2 -Wall			# only for debugging purposes
+ # OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
+-OPTIONS = $(DEBUG) -Wall -Wstrict-prototypes -Wmissing-prototypes
++OPTIONS = -Wall -Wstrict-prototypes -Wmissing-prototypes
+ # OPTIONS = $(DEBUG) -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes
+ # OPTIONS = $(DEBUG) -Wall -ansi -pedantic	# only for debugging purposes
+ # OPTIONS = -O2 -Wall -ansi -pedantic
+@@ -153,8 +153,8 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAGS) |	\
+ OPTIONS = -O2 -Wall
  endif
  
--CFLAGS = $(OPTIONS) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
--LDFLAGS =           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
-+CFLAGS += $(OPTIONS) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
-+LDFLAGS +=           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+-CFLAGS = $(OPTIONS) $(ANALYZE) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
+-LDFLAGS =           $(ANALYZE) $(SYS_LDFLAGS) $(EXTRA_LDFLAGS)
++CFLAGS += $(OPTIONS) $(ANALYZE) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
++LDFLAGS +=           $(ANALYZE) $(SYS_LDFLAGS) $(EXTRA_LDFLAGS)
  
  
  SRCS =	main.c		\
-@@ -221,7 +221,7 @@ GRAPHICS_DIR = ../graphics
- all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir game_mm_dir $(PROGNAME) graphics_dir
- 
- $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
--	$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
-+	$(CC) $(PROFILING) $(RNDLIBS) $(OBJS) $(ICON) $(LDFLAGS) -o $(PROGNAME)
- ifdef BUILD_DIST
- 	strip $(PROGNAME)
- endif
diff --git a/games/mirrormagic/files/patch-src_libgame_system.c b/games/mirrormagic/files/patch-src_libgame_system.c
deleted file mode 100644
index 0db9158632e9..000000000000
--- a/games/mirrormagic/files/patch-src_libgame_system.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Forcibly pump events, otherwise the game stops receiving events
-shortly after the start
-
---- src/libgame/system.c.orig	2018-04-10 19:44:08 UTC
-+++ src/libgame/system.c
-@@ -1579,6 +1579,7 @@ void SetAudioMode(boolean enabled)
- 
- boolean PendingEvent(void)
- {
-+  SDL_PumpEvents();
-   return (SDL_PollEvent(NULL) ? TRUE : FALSE);
- }
- 
diff --git a/games/mirrormagic/files/patch-src_main.c b/games/mirrormagic/files/patch-src_main.c
deleted file mode 100644
index d76e7a8686c5..000000000000
--- a/games/mirrormagic/files/patch-src_main.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/main.c.orig	2018-04-10 19:44:08 UTC
-+++ src/main.c
-@@ -69,7 +69,7 @@ short			ExplodeDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- int			RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- int			PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- 
--int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-+extern int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- int 			GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- int 			GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- int			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-@@ -138,7 +138,7 @@ struct LevelInfo	level, level_template;
- struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player = NULL;
- struct HiScore		highscore[MAX_SCORE_ENTRIES];
- struct TapeInfo		tape;
--struct SetupInfo	setup;
-+extern struct SetupInfo	setup;
- struct GameInfo		game;
- struct GlobalInfo	global;
- struct BorderInfo	border;
diff --git a/games/mirrormagic/pkg-plist b/games/mirrormagic/pkg-plist
deleted file mode 100644
index 32d02990e9ac..000000000000
--- a/games/mirrormagic/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@(,games,2555) bin/mirrormagic
-@dir(,games,775) /var/games/mirrormagic