From owner-cvs-ports@FreeBSD.ORG  Wed Jul  4 16:01:54 2007
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
X-Original-To: cvs-ports@FreeBSD.org
Delivered-To: cvs-ports@FreeBSD.org
Received: by hub.freebsd.org (Postfix, from userid 1033)
	id 0E16616A421; Wed,  4 Jul 2007 16:01:54 +0000 (UTC)
Date: Wed, 4 Jul 2007 16:01:54 +0000
From: Alexey Dokuchaev <danfe@FreeBSD.org>
To: Michael Johnson <ahze@FreeBSD.org>
Message-ID: <20070704160154.GA9394@FreeBSD.org>
References: <200707041510.l64FAhY1080905@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="jRHKVT23PllUwdXP"
Content-Disposition: inline
In-Reply-To: <200707041510.l64FAhY1080905@repoman.freebsd.org>
User-Agent: Mutt/1.4.2.1i
Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org
Subject: Re: cvs commit: ports/games/supertux Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jul 2007 16:01:54 -0000


--jRHKVT23PllUwdXP
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline

On Wed, Jul 04, 2007 at 03:10:43PM +0000, Michael Johnson wrote:
> ahze        2007-07-04 15:10:43 UTC
> 
>   FreeBSD ports repository
> 
>   Modified files:
>     games/supertux       Makefile 
>   Log:
>   Use gcc3.4 on -CURRENT to fix build
>   
>   Reported by:    pointyhat via pav

How about attached patch?  We generally try to avoid forcing alternative
compiler when things can be trivially fixed.

./danfe

P.S.  This port also can be cleaned up a bit: extra whitespace after
WWW: in pkg-descr and Makefile header (the latter is up to you).

--jRHKVT23PllUwdXP
Content-Type: text/plain; charset=koi8-r
Content-Disposition: attachment; filename=d2

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/games/supertux/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	4 Jul 2007 15:10:43 -0000	1.14
+++ Makefile	4 Jul 2007 15:56:43 -0000
@@ -15,7 +15,6 @@
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Super Tux is a side-scroller similar to Super Mario Brothers
 
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_SDL=	image mixer
 USE_GL=		yes
@@ -24,10 +23,7 @@
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--disable-debug
 
-.include <bsd.port.pre.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's,Menu::,,' ${WRKSRC}/src/menu.h
 
-.if ${OSVERSION} > 700000
-USE_GCC=	3.4
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

--jRHKVT23PllUwdXP--