From nobody Wed Mar 16 13:22:43 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 184B81A26BC2; Wed, 16 Mar 2022 13:22:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KJWD372gFz4s6g; Wed, 16 Mar 2022 13:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647436964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w9aMD73NLSOEqPTULwKqDygBwKntFFe1p5dPMHa1LY0=; b=D9H7qSoZQvAZ+OXllE+frJKqfo+mpyUOrle6rwJeGdpjvCI51thra78kJqOu7YSeXtyVK9 VBE6fYUECuf6LcSfd1WDRlNcQTBDMyn0S3iLD5bPjgQtOuwp/Iscx7EHGQANlNiDp0uJti 9yZ7DDqtsZJajJVSUeJFhatz06prikF9cdNySqpzQuYP7l+lMzqz4BNi2Or5BoxRUSc6dx Mwz0wu2o+H+jrvGQO43wsKvpolMVZUtoavHZRA83Wq12Y3u7tJt93J261MNLg9lmLchqRS r3RyIw+sTX64F5evSByB1hwVp3qUXN13b1PDkwEMDhjcXc3cxzhR9ANtHagNqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D2DCB1744D; Wed, 16 Mar 2022 13:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22GDMhvF022084; Wed, 16 Mar 2022 13:22:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22GDMh9t022083; Wed, 16 Mar 2022 13:22:43 GMT (envelope-from git) Date: Wed, 16 Mar 2022 13:22:43 GMT Message-Id: <202203161322.22GDMh9t022083@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 2a8fed7897c7 - main - =?utf-8?Q?games/mirrormagic: update 2.0.2 =E2=86=92 3.0.0?= List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a8fed7897c79d491bbead041574488999483e53 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647436964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w9aMD73NLSOEqPTULwKqDygBwKntFFe1p5dPMHa1LY0=; b=bQ3D2sGXRWia9N4vM2qawS6qjhmkfnSy2uMKGlOxxpEhwam6Hvoku9I06UFNowX1wyuE+Q +/5KjEXaSg7RxLY4HhI21VWZe07bbPyvEJnS4RBg4qh/+70bIwf8o5t/uVSOLQN4MCuu/Q zouV+uCrtzxQ5+QKJ8rZWG2/X1W53SPyrv3siQenx4/rkBU9uenEFhGOihvxaK1PX2caMq 1QvLx9hoJsxWMSus4hdPuFn6vnlTydc/wKPKn2hcgAwA6NaOC9hbTL7uWBo8szSRAzMoCd ilbEouKcoiQ7tHwHA7Ctq/CUC+igdK/GPVAfwCz1nZGI58aY+6FUPyIMdza5BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647436964; a=rsa-sha256; cv=none; b=IF4NQB2CUGLanOymBfoseALl9VY2A05W1lQfkpj+ZrOgHlRwGzYwV0N6t9xo5mIWi++WJO ZNy6DVstJ/IpGZUxf8NbmYA2vXnDgYlw+Vc9cBpakePT8Kc9wTZd15/ocjPF6TO6OD6nGa BFmGjJvKR+I4TZ2gKTewvn12D8H9H/qMoK3ilx3lq00PllrPX0KfjGqYmXSUWo6mwZCsOD /7aWTEF2ThLWKGyVWi9EEYUgqrUkQ5xtrTG5N4CA8nVo9Aj553+XChhOmIknUCGBkZc9Ha mKGztZNomddC+GhOj2Y5dO0PQeefsIjcGcgu35yiVruStHH961Th2vsXq070xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a8fed7897c79d491bbead041574488999483e53 commit 2a8fed7897c79d491bbead041574488999483e53 Author: Dmitry Marakasov AuthorDate: 2022-03-15 21:05:01 +0000 Commit: Dmitry Marakasov CommitDate: 2022-03-16 12:57:31 +0000 games/mirrormagic: update 2.0.2 → 3.0.0 --- games/mirrormagic/Makefile | 59 ++++++++-------------- games/mirrormagic/distinfo | 5 +- games/mirrormagic/files/patch-src-main.h | 10 ---- games/mirrormagic/files/patch-src_Makefile | 31 ++++++++++++ games/mirrormagic/files/patch-src_libgame_system.c | 10 ++++ games/mirrormagic/files/patch-src_main.c | 20 ++++++++ 6 files changed, 85 insertions(+), 50 deletions(-) diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile index ede639c69356..12fbd4879930 100644 --- a/games/mirrormagic/Makefile +++ b/games/mirrormagic/Makefile @@ -1,22 +1,21 @@ -# Created by: Andrey Zakhvatov - PORTNAME= mirrormagic -PORTVERSION= 2.0.2 -PORTREVISION= 21 +PORTVERSION= 3.0.0 CATEGORIES= games -MASTER_SITES= http://www.artsoft.org/RELEASES/unix/mirrormagic/ \ - http://mirror.amdmi3.ru/distfiles/ +MASTER_SITES= https://www.artsoft.org/RELEASES/unix/mirrormagic/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Arcade style game with stereo sound for X Window System LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake -MAKE_ARGS= CC="${CC}" MAKE="${MAKE_CMD}" OPTIONS="${CFLAGS}" \ - RO_GAME_DIR="${DATADIR}" RW_GAME_DIR="${DATADIR}/scores" \ - X11_PATH="${LOCALBASE}" -USE_GCC= yes # doesn't start otherwise (UB?) +USES= gmake perl5 sdl +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}" PORTDATA= * PORTDOCS= * @@ -28,36 +27,20 @@ DESKTOP_ENTRIES="Mirror Magic" \ "Game;LogicGame;" \ "" -OPTIONS_DEFINE= SDL DOCS -OPTIONS_DEFAULT=SDL - -SDL_USES= sdl -SDL_USE= SDL=image,mixer,sdl -SDL_ALL_TARGET= sdl -SDL_USES_OFF= xorg -SDL_USE_OFF= XORG=x11,xt -SDL_ALL_TARGET_OFF= x11 - -post-patch: - @${REINPLACE_CMD} -e 's|sdl-config|$$(SDL_CONFIG)|g' \ - ${WRKSRC}/src/Makefile - @${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' \ - ${WRKSRC}/src/libgame/sound.h - @${REINPLACE_CMD} -e 's|machine/joystick.h|sys/joystick.h|' \ - ${WRKSRC}/src/tools.c - @${REINPLACE_CMD} -e 's|inline||' ${WRKSRC}/src/libgame/*.[ch] +OPTIONS_DEFINE= DOCS + +post-extract: + @${RM} -r ${WRKSRC}/lib ${WRKSRC}/mirrormagic # linux binaries do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mirrormagic ${STAGEDIR}${PREFIX}/bin - @${MKDIR} ${STAGEDIR}${DATADIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} "graphics levels music scores sounds" \ + ${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds \ + ${STAGEDIR}${PREFIX}/bin/mirrormagic + cd ${WRKSRC} && ${COPYTREE_SHARE} "conf docs graphics levels music sounds" \ ${STAGEDIR}${DATADIR} - ${RMDIR} ${STAGEDIR}${DATADIR}/scores - ${LN} -s /var/games/${PORTNAME} ${STAGEDIR}${DATADIR}/scores + @${MKDIR} ${STAGEDIR}/var/games/${PORTNAME} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for file in CHANGES CREDITS README - ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} -.endfor - ${MKDIR} ${STAGEDIR}/var/games/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/CREDITS ${STAGEDIR}${DOCSDIR} .include diff --git a/games/mirrormagic/distinfo b/games/mirrormagic/distinfo index a0a98d4d26c4..3e7b0c29c038 100644 --- a/games/mirrormagic/distinfo +++ b/games/mirrormagic/distinfo @@ -1,2 +1,3 @@ -SHA256 (mirrormagic-2.0.2.tar.gz) = 79b3f13d493523438eeb988beffc272c804bc7a4361b83167a082c77e74b3ce2 -SIZE (mirrormagic-2.0.2.tar.gz) = 1168098 +TIMESTAMP = 1647375691 +SHA256 (mirrormagic-3.0.0.tar.gz) = c79ad19d461c080011e12f5b9e6b1d3de4b8325e452ef4bb6e8a63a62ce9ffec +SIZE (mirrormagic-3.0.0.tar.gz) = 4052452 diff --git a/games/mirrormagic/files/patch-src-main.h b/games/mirrormagic/files/patch-src-main.h deleted file mode 100644 index a2fa3e69df56..000000000000 --- a/games/mirrormagic/files/patch-src-main.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/main.h.orig Sat Jun 7 20:04:37 2003 -+++ src/main.h Thu Nov 1 02:12:04 2007 -@@ -459,7 +459,6 @@ - #endif - extern struct HiScore highscore[]; - extern struct TapeInfo tape; --extern struct JoystickInfo joystick[]; - extern struct SetupInfo setup; - extern struct GameInfo game; - extern struct LaserInfo laser; diff --git a/games/mirrormagic/files/patch-src_Makefile b/games/mirrormagic/files/patch-src_Makefile new file mode 100644 index 000000000000..1ec43eaa7df0 --- /dev/null +++ b/games/mirrormagic/files/patch-src_Makefile @@ -0,0 +1,31 @@ +--- src/Makefile.orig 2018-04-10 19:44:08 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 + 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 + + + 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 new file mode 100644 index 000000000000..dffd7522d0f4 --- /dev/null +++ b/games/mirrormagic/files/patch-src_libgame_system.c @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..d76e7a8686c5 --- /dev/null +++ b/games/mirrormagic/files/patch-src_main.c @@ -0,0 +1,20 @@ +--- 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;