From c93026b6a1cba0f7762606c909fe3c48f87beafc Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Mon, 5 Nov 2007 11:20:01 +0000 Subject: - Fix build with gcc 4.2 - Pass maintainership to submitter PR: 117731 Submitted by: Dmitry Marakasov Approved by: portmgr (pav) --- games/mirrormagic/Makefile | 16 ++++++++-------- games/mirrormagic/files/patch-src-main.h | 10 ++++++++++ 2 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 games/mirrormagic/files/patch-src-main.h (limited to 'games') diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile index d6be7227240a..f47da7a62dbc 100644 --- a/games/mirrormagic/Makefile +++ b/games/mirrormagic/Makefile @@ -9,15 +9,21 @@ PORTNAME= mirrormagic PORTVERSION= 2.0.2 PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= http://www.artsoft.org/RELEASES/unix/mirrormagic/ +MASTER_SITES= http://www.artsoft.org/RELEASES/unix/mirrormagic/ \ + http://www.amdmi3.ru/distfiles/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= amdmi3@amdmi3.ru COMMENT= An arcade style game with stereo sound for X Window System USE_GMAKE= yes MAKE_ARGS= CC="${CC}" MAKE="${GMAKE}" OPTIONS="${CFLAGS}" \ RO_GAME_DIR="${DATADIR}" RW_GAME_DIR="${DATADIR}/scores" \ X11_PATH="${X11BASE}" +WANT_SDL= yes + +OPTIONS= SDL "SDL support" on + +.include .if defined(WITH_SDL) USE_SDL= image mixer sdl @@ -27,12 +33,6 @@ USE_XLIB= yes ALL_TARGET= x11 .endif -.include - -.if ${OSVERSION} >= 700042 -BROKEN= Broken with gcc 4.2 -.endif - post-patch: @${REINPLACE_CMD} -e 's|sdl-config|$$(SDL_CONFIG)|g' \ ${WRKSRC}/src/Makefile diff --git a/games/mirrormagic/files/patch-src-main.h b/games/mirrormagic/files/patch-src-main.h new file mode 100644 index 000000000000..a2fa3e69df56 --- /dev/null +++ b/games/mirrormagic/files/patch-src-main.h @@ -0,0 +1,10 @@ +--- 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; -- cgit v1.2.3