- Update to 20130927.

- Support staging.

4 files changed, 238 insertions, 8 deletions

diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile
index eaeb6a3c5bbf..968c2e9d2a92 100644
--- a/sysutils/acpica-tools/Makefile
+++ b/sysutils/acpica-tools/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	acpica
-PORTVERSION=	20130823
+PORTVERSION=	20130927
 CATEGORIES=	sysutils devel
 MASTER_SITES=	https://acpica.org/sites/acpica/files/ \
 		LOCAL
@@ -18,12 +18,16 @@ MAKE_ARGS=	HOST=_FreeBSD INSTALLFLAGS="${INSTALL_PROGRAM:S/^${INSTALL}//}"
 USES=		gmake
 WRKSRC_SUBDIR=	generate/unix
 LFLAGS=		-i -s
-YFLAGS=		-v -d
-.if !empty(YACC:M*bison*)
-YFLAGS+=	-y
-.endif
 
-NO_STAGE=	yes
+# XXX 20130927 broke support for yacc.
+USES+=		bison
+YACC=		bison
+YFLAGS=		-y
+
+# XXX 20130927 did not include Makefile.config.
+post-extract:
+	@${CP} -f ${FILESDIR}/Makefile.config ${WRKSRC}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CC[[:blank:]]*=.*|CC = ${CC}|' \
 	    -e 's|^INSTALL[[:blank:]]*=.*|INSTALL = ${INSTALL}|g' \
diff --git a/sysutils/acpica-tools/distinfo b/sysutils/acpica-tools/distinfo
index cd21145d926f..9d1fa5e733bc 100644
--- a/sysutils/acpica-tools/distinfo
+++ b/sysutils/acpica-tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (acpica-unix2-20130823.tar.gz) = dcaf8bcdd146006e7c480d4249e014e38eb2ae3e4d2d40f90ec454312cc7e4d1
-SIZE (acpica-unix2-20130823.tar.gz) = 1229657
+SHA256 (acpica-unix2-20130927.tar.gz) = b96f9ca037bba2907a30fd0475a62e0ff41fcd54442384743126b129d06a6110
+SIZE (acpica-unix2-20130927.tar.gz) = 1234978
diff --git a/sysutils/acpica-tools/files/Makefile.config b/sysutils/acpica-tools/files/Makefile.config
new file mode 100644
index 000000000000..dc9fcaea91d6
--- /dev/null
+++ b/sysutils/acpica-tools/files/Makefile.config
@@ -0,0 +1,215 @@
+#
+# Makefile.config
+#
+# Common configuration and setup file to generate the ACPICA tools and
+# utilities: the iASL compiler, acpiexec, acpihelp, acpinames, acpisrc,
+# acpixtract, acpibin.
+#
+# This file is included by the individual makefiles for each tool.
+#
+
+#
+# Note: This makefile is intended to be used from within the native
+# ACPICA directory structure, from under generate/unix. It specifically
+# places all object files in a generate/unix subdirectory, not within
+# the various ACPICA source directories. This prevents collisions
+# between different compilations of the same source file with different
+# compile options, and prevents pollution of the source code.
+#
+
+#
+# Configuration
+#
+# OPT_CFLAGS can be overridden on the make command line by
+#   adding OPT_CFLAGS="..." to the invocation.
+#
+# Notes:
+#   gcc should be version 4 or greater, otherwise some of the options
+#     used will not be recognized.
+#   Optional: Set HOST to an appropriate value (_LINUX, _FreeBSD, _APPLE, _CYGWIN, etc.)
+#     See include/platform/acenv.h for supported values.
+#     Note: HOST is not nearly as important for applications as it
+#     is for the kernel-resident version of ACPICA, and it may
+#     not be necessary to change it.
+#
+.SUFFIXES :
+PROGS = acpibin acpidump acpiexec acpihelp acpinames acpisrc acpixtract iasl
+HOST ?= _CYGWIN
+CC =    gcc
+
+#
+# Common defines
+#
+OBJDIR =     obj
+BINDIR =     bin
+COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $<
+LINKPROG =   $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS)
+PREFIX ?=    /usr
+INSTALLDIR = $(PREFIX)/bin
+
+ifeq ($(HOST), _APPLE)
+INSTALL  =   cp
+INSTALLFLAGS ?= -f
+else
+INSTALL =    install
+INSTALLFLAGS ?= -m 555 -s
+endif
+
+INSTALLPROG = \
+	mkdir -p $(DESTDIR)$(INSTALLDIR); \
+	$(INSTALL) $(INSTALLFLAGS) ../$(BINDIR)/$(PROG) $(DESTDIR)$(INSTALLDIR)/$(PROG)
+
+#
+# Rename a .exe file if necessary
+#
+RENAMEPROG = \
+	@if [ -e "$(PROG).exe" ] ; then \
+		mv $(PROG).exe $(PROG); \
+		echo "Renamed $(PROG).exe to $(PROG)"; \
+	fi;
+
+#
+# Copy the final executable to the local bin directory
+#
+COPYPROG = \
+	@mkdir -p ../$(BINDIR); \
+	cp -f $(PROG) ../$(BINDIR); \
+	echo "Copied $(PROG) to $(FINAL_PROG)";
+
+#
+# Main ACPICA source directories
+#
+ACPICA_SRC =            ../../../source
+ACPICA_COMMON =         $(ACPICA_SRC)/common
+ACPICA_TOOLS =          $(ACPICA_SRC)/tools
+ACPICA_OSL =            $(ACPICA_SRC)/os_specific/service_layers
+ACPICA_CORE =           $(ACPICA_SRC)/components
+ACPICA_INCLUDE =        $(ACPICA_SRC)/include
+ACPICA_DEBUGGER =       $(ACPICA_CORE)/debugger
+ACPICA_DISASSEMBLER =   $(ACPICA_CORE)/disassembler
+ACPICA_DISPATCHER =     $(ACPICA_CORE)/dispatcher
+ACPICA_EVENTS =         $(ACPICA_CORE)/events
+ACPICA_EXECUTER =       $(ACPICA_CORE)/executer
+ACPICA_HARDWARE =       $(ACPICA_CORE)/hardware
+ACPICA_NAMESPACE =      $(ACPICA_CORE)/namespace
+ACPICA_PARSER =         $(ACPICA_CORE)/parser
+ACPICA_RESOURCES =      $(ACPICA_CORE)/resources
+ACPICA_TABLES =         $(ACPICA_CORE)/tables
+ACPICA_UTILITIES =      $(ACPICA_CORE)/utilities
+
+#
+# ACPICA tool and utility source directories
+#
+ACPIBIN =               $(ACPICA_TOOLS)/acpibin
+ACPIDUMP =              $(ACPICA_TOOLS)/acpidump
+ACPIEXEC =              $(ACPICA_TOOLS)/acpiexec
+ACPIHELP =              $(ACPICA_TOOLS)/acpihelp
+ACPINAMES =             $(ACPICA_TOOLS)/acpinames
+ACPISRC =               $(ACPICA_TOOLS)/acpisrc
+ACPIXTRACT =            $(ACPICA_TOOLS)/acpixtract
+ASL_COMPILER =          $(ACPICA_SRC)/compiler
+
+#
+# Common ACPICA header files
+#
+ACPICA_HEADERS = \
+    $(wildcard $(ACPICA_INCLUDE)/*.h) \
+    $(wildcard $(ACPICA_INCLUDE)/platform/*.h)
+
+#
+# Common compiler flags
+#
+# Flags/option notes:
+#   Global optimization flags (such as -O2, -Os) are not used,
+#       since they cause issues on some compilers (such as gcc 4.4)
+#   The _GNU_SOURCE symbol is required for many hosts.
+#
+OPT_CFLAGS ?= \
+    -D_FORTIFY_SOURCE=2\
+    $(CWARNINGFLAGS)
+
+CFLAGS += \
+    -D$(HOST)\
+    -D_GNU_SOURCE\
+    -I$(ACPICA_INCLUDE)
+
+#
+# Common compiler warning flags. The warning flags in addition
+# to -Wall are not automatically included in -Wall.
+#
+CWARNINGFLAGS = \
+    -ansi\
+    -Wall\
+    -Wbad-function-cast\
+    -Wdeclaration-after-statement\
+    -Werror\
+    -Wformat=2\
+    -Wmissing-declarations\
+    -Wmissing-prototypes\
+    -Wstrict-aliasing=0\
+    -Wstrict-prototypes\
+    -Wswitch-default\
+    -Wpointer-arith\
+    -Wundef
+
+#
+# Common gcc 4+ warning flags
+#
+CWARNINGFLAGS += \
+    -Waddress\
+    -Waggregate-return\
+    -Wchar-subscripts\
+    -Wmissing-declarations\
+    -Wmissing-field-initializers\
+    -Wnested-externs\
+    -Wold-style-definition\
+    -Wno-format-nonliteral\
+    -Wredundant-decls
+
+#
+# Per-host flags and exclusions
+#
+ifneq ($(HOST), _FreeBSD)
+    CWARNINGFLAGS += \
+        -Wempty-body
+
+    ifneq ($(HOST), _APPLE)
+        CWARNINGFLAGS += \
+        -Wlogical-op\
+        -Wmissing-parameter-type\
+        -Wold-style-declaration\
+        -Wtype-limits
+    endif
+endif
+
+#
+# Extra warning flags (for possible future use)
+#
+#CWARNINGFLAGS += \
+#	-Wcast-qual\
+#	-Wconversion\
+#	-Wshadow\
+
+#
+# Bison/Flex configuration
+#
+# -y: act like yacc
+#
+# -i: generate case insensitive scanner
+# -s: suppress default rule, abort on unknown input
+#
+# Optional for Bison/yacc:
+# -v: verbose, produces a .output file
+# -d: produces the defines header file
+#
+# Berkeley yacc configuration
+#
+#YACC=      byacc
+#YFLAGS +=
+#
+YACC=       bison
+YFLAGS +=   -y
+
+LEX=        flex
+LFLAGS +=   -i -s
+
diff --git a/sysutils/acpica-tools/files/patch-source__os_specific__service_layers__osunixxf.c b/sysutils/acpica-tools/files/patch-source__os_specific__service_layers__osunixxf.c
new file mode 100644
index 000000000000..840754bf9b91
--- /dev/null
+++ b/sysutils/acpica-tools/files/patch-source__os_specific__service_layers__osunixxf.c
@@ -0,0 +1,11 @@
+--- ../../source/os_specific/service_layers/osunixxf.c
++++ ../../source/os_specific/service_layers/osunixxf.c
+@@ -91,7 +91,7 @@
+ /* Terminal support for AcpiExec only */
+ 
+ #ifdef ACPI_EXEC_APP
+-#include <termio.h>
++#include <termios.h>
+ 
+ struct termios              OriginalTermAttributes;
+