Update to 20150818.

3 files changed, 7 insertions, 65 deletions

diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile
index 150db55ed3f9..d498a0e8ac32 100644
--- a/sysutils/acpica-tools/Makefile
+++ b/sysutils/acpica-tools/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	acpica
-PORTVERSION=	20150717
+PORTVERSION=	20150818
 CATEGORIES=	sysutils devel
 MASTER_SITES=	https://acpica.org/sites/acpica/files/ \
 		LOCAL/jkim
@@ -35,6 +35,10 @@ MAKE_ARGS+=	MACROPROC="${LOCALBASE}/bin/gm4"
 YACC=		${LOCALBASE}/bin/bison
 .endif
 
+post-patch:
+	${LN} -fs ${WRKSRC}/source/tools/acpinames/AcpiNames.h \
+	    ${WRKSRC}/source/tools/acpinames/acpinames.h
+
 do-install:
 	${INSTALL_PROGRAM} ${ACPICA_TOOLS:S,^,${BUILD_WRKSRC}/bin/,} \
 	    ${STAGEDIR}${PREFIX}/bin
diff --git a/sysutils/acpica-tools/distinfo b/sysutils/acpica-tools/distinfo
index 2f31984adcba..7512acaa5c75 100644
--- a/sysutils/acpica-tools/distinfo
+++ b/sysutils/acpica-tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (acpica-unix2-20150717.tar.gz) = dd60f846ad8393d89d2cbadf362c6547c5e53405f5ee51097c90db3636f79e0a
-SIZE (acpica-unix2-20150717.tar.gz) = 1376076
+SHA256 (acpica-unix2-20150818.tar.gz) = ec54dfa50c80402559079c60c38281fecaab0d1abdaf8bc297bce9dadd18bb7d
+SIZE (acpica-unix2-20150818.tar.gz) = 1381025
diff --git a/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile b/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile
deleted file mode 100644
index 5e82775b2e04..000000000000
--- a/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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 = \
-+	_f=`echo $(1) | tr '[:upper:]' '[:lower:]'` &&\
-+	_d=`mktemp -d $(OBJDIR)/$$_f.XXXXXX` &&\
-+	_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