ports/117651: [MAINTAINER] games/ivan: fix build on amd64/gcc42

[Dmitry Marakasov]

>Number:         117651
>Category:       ports
>Synopsis:       [MAINTAINER] games/ivan: fix build on amd64/gcc42
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 30 00:00:07 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 on amd64/gcc42
>How-To-Repeat:
>Fix:

--- ivan.patch begins here ---
diff -ruN ivan.orig/Makefile ivan/Makefile
--- ivan.orig/Makefile	Tue Oct 30 02:31:24 2007
+++ ivan/Makefile	Tue Oct 30 02:44:25 2007
@@ -7,10 +7,9 @@
 
 PORTNAME=	ivan
 PORTVERSION=	0.50
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ivan
+MASTER_SITES=	SF
 
 MAINTAINER=	amdmi3 at amdmi3.ru
 COMMENT=	A graphical roguelike game
@@ -30,6 +29,12 @@
 		${WRKSRC}/FeLib/Include/fearray.h
 	@${REINPLACE_CMD} -Ee 's|([a-z]+<[a-z ,]+>::~?[a-z]+)<[a-z ,]+>|\1|' \
 		${WRKSRC}/Main/Source/script.cpp
+	@${REINPLACE_CMD} -e 's|truth(|bool(|' ${WRKSRC}/Main/Source/fluid.cpp \
+		${WRKSRC}/Main/Include/char.h ${WRKSRC}/Main/Include/lsquare.h \
+		${WRKSRC}/FeLib/Include/save.h ${WRKSRC}/Main/Include/lsquare.h \
+		${WRKSRC}/Main/Include/human.h ${WRKSRC}/Main/Source/command.cpp \
+		${WRKSRC}/Main/Include/stack.h ${WRKSRC}/Main/Source/lsquare.cpp \
+		${WRKSRC}/Main/Source/lterras.cpp
 
 post-install:
 	${CHGRP} games ${PREFIX}/bin/ivan
@@ -42,12 +47,4 @@
 	${CHMOD} -R g+w ${STATEDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile with GCC 4.2
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- ivan.patch ends here ---

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