From owner-svn-ports-all@FreeBSD.ORG  Thu Dec 11 10:10:57 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E81D36B4;
 Thu, 11 Dec 2014 10:10:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D3373B7A;
 Thu, 11 Dec 2014 10:10:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBBAAvov047578;
 Thu, 11 Dec 2014 10:10:57 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBBAAvZm047577;
 Thu, 11 Dec 2014 10:10:57 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201412111010.sBBAAvZm047577@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Thu, 11 Dec 2014 10:10:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r374519 - head/games/openttd
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Dec 2014 10:10:58 -0000

Author: danfe
Date: Thu Dec 11 10:10:56 2014
New Revision: 374519
URL: https://svnweb.freebsd.org/changeset/ports/374519
QAT: https://qat.redports.org/buildarchive/r374519/

Log:
  Unbreak the build against new freetype2 (v2.5.4).
  
  This is sed(1) version of submitted patch; it is slightly less accurate,
  but functionally equivalent.
  
  PR:		195869
  Submitted by:	amdmi3

Modified:
  head/games/openttd/Makefile

Modified: head/games/openttd/Makefile
==============================================================================
--- head/games/openttd/Makefile	Thu Dec 11 09:41:10 2014	(r374518)
+++ head/games/openttd/Makefile	Thu Dec 11 10:10:56 2014	(r374519)
@@ -92,6 +92,8 @@ pre-everything::
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' ${WRKSRC}/config.lib
+	@${REINPLACE_CMD} -e '/FS_NORMAL/s,max(1,&U,' \
+		${WRKSRC}/src/fontcache.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin