From owner-svn-ports-head@FreeBSD.ORG  Mon Sep 22 19:28:13 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 3E44013D;
 Mon, 22 Sep 2014 19:28:13 +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 29397B22;
 Mon, 22 Sep 2014 19:28:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8MJSDO3071161;
 Mon, 22 Sep 2014 19:28:13 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8MJSDgP071160;
 Mon, 22 Sep 2014 19:28:13 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201409221928.s8MJSDgP071160@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org
 using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 22 Sep 2014 19:28:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r368991 - head/sysutils/acpica-tools
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Sep 2014 19:28:13 -0000

Author: jkim
Date: Mon Sep 22 19:28:12 2014
New Revision: 368991
URL: http://svnweb.freebsd.org/changeset/ports/368991
QAT: https://qat.redports.org/buildarchive/r368991/

Log:
  Unconditionally use devel/m4.

Modified:
  head/sysutils/acpica-tools/Makefile

Modified: head/sysutils/acpica-tools/Makefile
==============================================================================
--- head/sysutils/acpica-tools/Makefile	Mon Sep 22 19:12:49 2014	(r368990)
+++ head/sysutils/acpica-tools/Makefile	Mon Sep 22 19:28:12 2014	(r368991)
@@ -15,8 +15,9 @@ COMMENT=	Tools from the ACPI Component A
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	dual
 
+BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+
 USES=		bison gmake
-YACC=		${LOCALBASE}/bin/bison
 
 ACPICA_TOOLS=	acpibin acpidump acpiexec acpihelp acpinames acpisrc
 ACPICA_TOOLS+=	acpixtract iasl
@@ -25,17 +26,11 @@ PLIST_FILES=	${ACPICA_TOOLS:S,^,bin/,}
 WRKSRC_SUBDIR=	generate/unix
 
 MAKE_ARGS=	HOST=_FreeBSD NOOPT=TRUE PROGS="${ACPICA_TOOLS}"
-MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" YACC="${YACC}"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 902505
-BUILD_DEPENDS+=	gm4:${PORTSDIR}/devel/m4
-MAKE_ARGS+=	MACROPROC="${LOCALBASE}/bin/gm4"
-.endif
+MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" MACROPROC="${LOCALBASE}/bin/gm4"
+MAKE_ARGS+=	YACC="${LOCALBASE}/bin/bison"
 
 do-install:
 	@${INSTALL_PROGRAM} ${ACPICA_TOOLS:S,^,${WRKSRC}/bin/,} \
 	    ${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>