ports/117731: [PATCH] games/mirrormagic: fix for gcc42, take maintainership

[Dmitry Marakasov]

>Number:         117731
>Category:       ports
>Synopsis:       [PATCH] games/mirrormagic: fix for gcc42, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 01 01:00:08 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 6.1-RELEASE-p20 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p20 FreeBSD 6.1-RELEASE-p20 #1: Tue Oct 23 05:28:10 MSD 2007 root at hades.panopticon:/usr/obj/usr/src/sys/HADES i386


>Description:
* Fix build with gcc42
* Take maintainership
* While here, optionize
>How-To-Repeat:
>Fix:

--- mirrormagic.patch begins here ---
diff -ruN mirrormagic.orig/Makefile mirrormagic/Makefile
--- mirrormagic.orig/Makefile	Thu Nov  1 02:10:04 2007
+++ mirrormagic/Makefile	Thu Nov  1 02:11:11 2007
@@ -9,15 +9,21 @@
 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 at FreeBSD.org
+MAINTAINER=	amdmi3 at 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 <bsd.port.pre.mk>
 
 .if defined(WITH_SDL)
 USE_SDL=	image mixer sdl
@@ -25,12 +31,6 @@
 .else
 USE_XLIB=	yes
 ALL_TARGET=	x11
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
 .endif
 
 post-patch:
diff -ruN mirrormagic.orig/files/patch-src-main.h mirrormagic/files/patch-src-main.h
--- mirrormagic.orig/files/patch-src-main.h	Thu Jan  1 03:00:00 1970
+++ mirrormagic/files/patch-src-main.h	Thu Nov  1 02:12:42 2007
@@ -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;
--- mirrormagic.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: