From owner-svn-ports-head@freebsd.org  Sat Dec  5 01:08:23 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6DC03A41D92;
 Sat,  5 Dec 2015 01:08:23 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 327641C97;
 Sat,  5 Dec 2015 01:08:23 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB518M9E047435;
 Sat, 5 Dec 2015 01:08:22 GMT (envelope-from rakuco@FreeBSD.org)
Received: (from rakuco@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB518MmX047434;
 Sat, 5 Dec 2015 01:08:22 GMT (envelope-from rakuco@FreeBSD.org)
Message-Id: <201512050108.tB518MmX047434@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rakuco set sender to
 rakuco@FreeBSD.org using -f
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sat, 5 Dec 2015 01:08:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r403016 - head/benchmarks/fio
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Dec 2015 01:08:23 -0000

Author: rakuco
Date: Sat Dec  5 01:08:22 2015
New Revision: 403016
URL: https://svnweb.freebsd.org/changeset/ports/403016

Log:
  Depend on flex and bison from ports on 9.
  
  According to portsmon, benchmarks/fio's build is currently broken on 9 after
  the update to 2.2.11:
  
    lex: can't open lex.yy.c
  
  with a verbose build it's possible to see that this is because base's flex
  on 9 is too old and does not support "-o foo", it requires "-ofoo".
  
  Depending on flex from ports to fix the build is not enough, as then the
  yacc call fails:
  
    /usr/bin/yacc -o y.tab.c -l -d -b y exp/expression-parser.y
    yacc: e - line 68 of "exp/expression-parser.y", syntax error
    %parse-param { long long *result }
    ^
    Makefile:312: recipe for target 'y.tab.c' failed
  
  Fix it by depending on both textproc/flex and devel/bison when the versions
  in base are too old.
  
  PR:		205022
  Approved by:	bapt (maintainer)

Modified:
  head/benchmarks/fio/Makefile

Modified: head/benchmarks/fio/Makefile
==============================================================================
--- head/benchmarks/fio/Makefile	Sat Dec  5 00:12:31 2015	(r403015)
+++ head/benchmarks/fio/Makefile	Sat Dec  5 01:08:22 2015	(r403016)
@@ -18,6 +18,18 @@ GNUPLOT_DESC=	Support for plotting graph
 
 GNUPLOT_BUILD_DEPENDS=	${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot
 
+.include <bsd.port.options.mk>
+
+if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000013
+USES+=		bison
+MAKE_ARGS+=	YACC=${LOCALBASE}/bin/bison
+.endif
+
+if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033
+BUILD_DEPENDS+=	flex>0:${PORTSDIR}/textproc/flex
+MAKE_ARGS+=	LEX=${LOCALBASE}/bin/flex
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fio ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/fio_generate_plots ${STAGEDIR}${PREFIX}/bin