Update to 20150717.

3 files changed, 77 insertions, 10 deletions

diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile
index 4f1f015eac18..150db55ed3f9 100644
--- a/sysutils/acpica-tools/Makefile
+++ b/sysutils/acpica-tools/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	acpica
-PORTVERSION=	20150619
+PORTVERSION=	20150717
 CATEGORIES=	sysutils devel
 MASTER_SITES=	https://acpica.org/sites/acpica/files/ \
 		LOCAL/jkim
@@ -14,12 +14,9 @@ COMMENT=	Tools from the ACPI Component Architecture (ACPICA) project
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-
-USES=		bison gmake
+USES=		gmake
 
 BUILD_WRKSRC=	${WRKSRC}/generate/unix
-WRKSRC=		${WRKDIR}/${PORTNAME}-unix2-20150618
 
 ACPICA_TOOLS=	acpibin acpidump acpiexec acpihelp acpinames acpisrc
 ACPICA_TOOLS+=	acpixtract iasl
@@ -27,11 +24,19 @@ ACPICA_TOOLS+=	acpixtract iasl
 PLIST_FILES=	${ACPICA_TOOLS:S,^,bin/,}
 
 MAKE_ARGS=	HOST=_FreeBSD NOOPT=TRUE PROGS="${ACPICA_TOOLS}"
-MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" MACROPROC="${LOCALBASE}/bin/gm4"
-MAKE_ARGS+=	YACC="${LOCALBASE}/bin/bison"
+MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" YACC="${YACC}"
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1001506
+BUILD_DEPENDS+=	bison:${PORTSDIR}/devel/bison
+BUILD_DEPENDS+=	gm4:${PORTSDIR}/devel/m4
+MAKE_ARGS+=	MACROPROC="${LOCALBASE}/bin/gm4"
+YACC=		${LOCALBASE}/bin/bison
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${ACPICA_TOOLS:S,^,${BUILD_WRKSRC}/bin/,} \
 	    ${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/acpica-tools/distinfo b/sysutils/acpica-tools/distinfo
index 341c92a94064..2f31984adcba 100644
--- a/sysutils/acpica-tools/distinfo
+++ b/sysutils/acpica-tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (acpica-unix2-20150619.tar.gz) = 7884f414a8f3bc58c21f3e9bc4f0094771fa665be0b24140b54bd7477764f215
-SIZE (acpica-unix2-20150619.tar.gz) = 1367646
+SHA256 (acpica-unix2-20150717.tar.gz) = dd60f846ad8393d89d2cbadf362c6547c5e53405f5ee51097c90db3636f79e0a
+SIZE (acpica-unix2-20150717.tar.gz) = 1376076
diff --git a/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile b/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile
new file mode 100644
index 000000000000..a0c860f782f5
--- /dev/null
+++ b/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile
@@ -0,0 +1,62 @@
+--- generate/unix/iasl/Makefile.orig	2015-07-17 16:04:37 UTC
++++ generate/unix/iasl/Makefile
+@@ -260,10 +260,21 @@ CFLAGS += \
+ include ../Makefile.rules
+ 
+ #
++# Function to safely execute yacc
++#
++safe_yacc = \
++	_d=`mktemp -d $(OBJDIR)/$$_f.XXXXXX` &&\
++	_f=`echo $(1) | tr '[:upper:]' '[:lower:]'` &&\
++	_t=`basename $(3)` &&\
++	$(YACC) $(YFLAGS) -p$(1) -o$$_d/$$_f.c -d $(2) &&\
++	mv $$_d/$$_f.$${_t\#\#*.} $(3);\
++	test -d $$_d && rm -fr $$_d
++
++#
+ # Macro processing for iASL .y files
+ #
+ $(OBJDIR)/aslcompiler.y :      $(ASL_PARSER)
+-	$(MACROPROC) $(MFLAGS) $(ASL_COMPILER)/aslparser.y > $(OBJDIR)/aslcompiler.y
++	$(MACROPROC) $(MFLAGS) $(ASL_COMPILER)/aslparser.y > $@
+ 
+ #
+ # Parser and Lexer - intermediate C files
+@@ -271,30 +282,20 @@ $(OBJDIR)/aslcompiler.y :      $(ASL_PAR
+ $(OBJDIR)/aslcompilerlex.c :   $(ASL_LEXER)
+ 	$(LEX) $(LFLAGS) -PAslCompiler -o$@ $(ASL_COMPILER)/aslcompiler.l
+ 
+-$(OBJDIR)/aslcompiler.y.h :    $(OBJDIR)/aslcompiler.y
+-	$(YACC) $(YFLAGS) -pAslCompiler -o/dev/null --defines=$@ $<
+-
+-$(OBJDIR)/aslcompilerparse.c : $(OBJDIR)/aslcompiler.y
+-	$(YACC) $(YFLAGS) -pAslCompiler -o$@ --defines=/dev/null $<
++$(OBJDIR)/aslcompilerparse.c $(OBJDIR)/aslcompiler.y.h : $(OBJDIR)/aslcompiler.y
++	$(call safe_yacc,AslCompiler,$<,$@)
+ 
+ $(OBJDIR)/dtparserlex.c :      $(ASL_COMPILER)/dtparser.l $(OBJDIR)/dtparser.y.h
+ 	$(LEX) $(LFLAGS) -PDtParser -o$@ $<
+ 
+-$(OBJDIR)/dtparser.y.h :       $(ASL_COMPILER)/dtparser.y
+-	$(YACC) $(YFLAGS) -pDtParser -o/dev/null --defines=$@ $<
+-
+-$(OBJDIR)/dtparserparse.c :    $(ASL_COMPILER)/dtparser.y
+-	$(YACC) $(YFLAGS) -pDtParser -o$@ --defines=/dev/null $<
++$(OBJDIR)/dtparserparse.c $(OBJDIR)/dtparser.y.h :       $(ASL_COMPILER)/dtparser.y
++	$(call safe_yacc,DtParser,$<,$@)
+ 
+ $(OBJDIR)/prparserlex.c :      $(ASL_COMPILER)/prparser.l $(OBJDIR)/prparser.y.h
+ 	$(LEX) $(LFLAGS) -PPrParser -o$@ $<
+ 
+-$(OBJDIR)/prparser.y.h :       $(ASL_COMPILER)/prparser.y
+-	$(YACC) $(YFLAGS) -pPrParser -o/dev/null --defines=$@ $<
+-
+-$(OBJDIR)/prparserparse.c :    $(ASL_COMPILER)/prparser.y
+-	$(YACC) $(YFLAGS) -pPrParser -o$@ --defines=/dev/null $<
+-
++$(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h :       $(ASL_COMPILER)/prparser.y
++	$(call safe_yacc,PrParser,$<,$@)
+ 
+ #
+ # Parsers and Lexers - final object files