Date: Wed, 31 Oct 2007 03:01:15 +0300 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/117702: [PATCH] games/openmortal: unbreak on 7.x, take maintainership Message-ID: <20071031000115.CFAB34278@hades.panopticon> Resent-Message-ID: <200710310020.l9V0K1Ia016532@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117702
>Category: ports
>Synopsis: [PATCH] games/openmortal: unbreak on 7.x, take maintainership
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Oct 31 00:20:01 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@hades.panopticon:/usr/obj/usr/src/sys/HADES i386
>Description:
* Take maintainership
* Trivial unbreak for gcc42
>How-To-Repeat:
>Fix:
--- openmortal.patch begins here ---
diff -ruN openmortal.orig/Makefile openmortal/Makefile
--- openmortal.orig/Makefile 2007-10-31 02:39:11.000000000 +0000
+++ openmortal/Makefile 2007-10-31 02:40:30.000000000 +0000
@@ -9,10 +9,9 @@
PORTVERSION= 0.7
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= amdmi3@amdmi3.ru
COMMENT= A parody of the once popular coin-up fighting game, Mortal Kombat
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
@@ -25,12 +24,5 @@
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
-post-patch:
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN= Broken with gcc 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN openmortal.orig/files/patch-src-OnlineChat.cpp openmortal/files/patch-src-OnlineChat.cpp
--- openmortal.orig/files/patch-src-OnlineChat.cpp 1970-01-01 00:00:00.000000000 +0000
+++ openmortal/files/patch-src-OnlineChat.cpp 2007-10-31 02:54:34.000000000 +0000
@@ -0,0 +1,11 @@
+--- src/OnlineChat.cpp.orig 2004-04-29 16:32:35.000000000 +0000
++++ src/OnlineChat.cpp 2007-10-31 02:54:07.000000000 +0000
+@@ -56,7 +56,7 @@
+ class CChallengeMenu: public Menu
+ {
+ public:
+- CChallengeMenu::CChallengeMenu( std::string a_sChallenger )
++ CChallengeMenu( std::string a_sChallenger )
+ : Menu( "You have been challenged!" ),
+ m_sChallenger( a_sChallenger )
+ {
--- openmortal.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071031000115.CFAB34278>