From owner-svn-ports-all@FreeBSD.ORG Sun Aug 3 15:11:27 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CA84712A for ; Sun, 3 Aug 2014 15:11:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9B11E28DC for ; Sun, 3 Aug 2014 15:11:27 +0000 (UTC) Received: from adamw (uid 959) (envelope-from adamw@FreeBSD.org) id 5641 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Sun, 03 Aug 2014 15:11:27 +0000 From: Adam Weinberger Date: Sun, 3 Aug 2014 15:11:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363908 - head/games/tome4 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53de511f.5641.3426772e@svn.freebsd.org> X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Aug 2014 15:11:27 -0000 Author: adamw Date: Sun Aug 3 15:11:27 2014 New Revision: 363908 URL: http://svnweb.freebsd.org/changeset/ports/363908 QAT: https://qat.redports.org/buildarchive/r363908/ Log: This fixes games/tome4 after devel/premake4 update to 4.4-beta5 The new premake4 seems to hardcode "gcc" regardless of CC, command line flags, etc., and not in a way environment for gmake can override this. The patch fixes output of premake4 before running gmake. It a no-op on systems with premake4 4.3 and doesn't change the package on systems where tome4 already builds. PR: 192291 Palindromic PR: yes Submitted by: maintainer Modified: head/games/tome4/Makefile Modified: head/games/tome4/Makefile ============================================================================== --- head/games/tome4/Makefile Sun Aug 3 14:56:38 2014 (r363907) +++ head/games/tome4/Makefile Sun Aug 3 15:11:27 2014 (r363908) @@ -31,12 +31,10 @@ USE_CSTD= gnu89 SUB_FILES= tome4 MAKE_JOBS_UNSAFE=yes -post-patch: - @${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/src/lua/Makefile \ - ${WRKSRC}/src/luabitop/Makefile ${WRKSRC}/build/te4core.lua pre-build: @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/premake4.lua (cd ${WRKSRC} && premake4 gmake) + @${REINPLACE_CMD} 's|gcc|${CC}|' ${WRKSRC}/build/*.make @${REINPLACE_CMD} 's|-lpthread|-pthread|' ${WRKSRC}/build/TEngine.make do-install: