Index: head/sysutils/acpica-tools/Makefile
===================================================================
--- head/sysutils/acpica-tools/Makefile	(revision 390063)
+++ head/sysutils/acpica-tools/Makefile	(revision 390064)
@@ -1,35 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	acpica
-PORTVERSION=	20150616
+PORTVERSION=	20150619
 CATEGORIES=	sysutils devel
 MASTER_SITES=	https://acpica.org/sites/acpica/files/ \
 		LOCAL/jkim
 PKGNAMESUFFIX=	-tools
 DISTNAME=	${PORTNAME}-unix2-${PORTVERSION}
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Tools from the ACPI Component Architecture (ACPICA) project
 
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USES=		bison gmake
 
+BUILD_WRKSRC=	${WRKSRC}/generate/unix
+WRKSRC=		${WRKDIR}/${PORTNAME}-unix2-20150618
+
 ACPICA_TOOLS=	acpibin acpidump acpiexec acpihelp acpinames acpisrc
 ACPICA_TOOLS+=	acpixtract iasl
 
 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}" MACROPROC="${LOCALBASE}/bin/gm4"
 MAKE_ARGS+=	YACC="${LOCALBASE}/bin/bison"
 
 do-install:
-	${INSTALL_PROGRAM} ${ACPICA_TOOLS:S,^,${WRKSRC}/bin/,} \
+	${INSTALL_PROGRAM} ${ACPICA_TOOLS:S,^,${BUILD_WRKSRC}/bin/,} \
 	    ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/sysutils/acpica-tools/distinfo
===================================================================
--- head/sysutils/acpica-tools/distinfo	(revision 390063)
+++ head/sysutils/acpica-tools/distinfo	(revision 390064)
@@ -1,2 +1,2 @@
-SHA256 (acpica-unix2-20150616.tar.gz) = f19e2d2d6a92f7bccd12fb0fc0354620bf611f83d3c345b1f93c108bb4396ebb
-SIZE (acpica-unix2-20150616.tar.gz) = 1367583
+SHA256 (acpica-unix2-20150619.tar.gz) = 7884f414a8f3bc58c21f3e9bc4f0094771fa665be0b24140b54bd7477764f215
+SIZE (acpica-unix2-20150619.tar.gz) = 1367646
Index: head/sysutils/acpica-tools/files/patch-Makefile.config
===================================================================
--- head/sysutils/acpica-tools/files/patch-Makefile.config	(revision 390063)
+++ head/sysutils/acpica-tools/files/patch-Makefile.config	(nonexistent)
@@ -1,18 +0,0 @@
---- Makefile.config	2014-02-14 18:23:32.000000000 -0500
-+++ Makefile.config	2014-02-17 11:59:27.000000000 -0500
-@@ -167,7 +167,6 @@
-     -Wmissing-field-initializers\
-     -Wnested-externs\
-     -Wold-style-definition\
--    -Woverride-init\
-     -Wno-format-nonliteral\
-     -Wredundant-decls
- #
-@@ -175,6 +174,7 @@
- #
- ifneq ($(HOST), _FreeBSD)
-     CWARNINGFLAGS += \
-+        -Woverride-init\
-         -Wempty-body
- 
-     ifneq ($(HOST), _APPLE)

Property changes on: head/sysutils/acpica-tools/files/patch-Makefile.config
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/acpica-tools/files/patch-generate_unix_Makefile.config
===================================================================
--- head/sysutils/acpica-tools/files/patch-generate_unix_Makefile.config	(nonexistent)
+++ head/sysutils/acpica-tools/files/patch-generate_unix_Makefile.config	(revision 390064)
@@ -0,0 +1,18 @@
+--- generate/unix/Makefile.config.orig	2015-06-18 15:15:59 UTC
++++ generate/unix/Makefile.config
+@@ -195,7 +195,6 @@ CWARNINGFLAGS += \
+     -Wmissing-field-initializers\
+     -Wnested-externs\
+     -Wold-style-definition\
+-    -Woverride-init\
+     -Wno-format-nonliteral\
+     -Wredundant-decls
+ #
+@@ -203,6 +202,7 @@ CWARNINGFLAGS += \
+ #
+ ifneq ($(HOST), _FreeBSD)
+     CWARNINGFLAGS += \
++        -Woverride-init\
+         -Wempty-body
+ 
+     ifneq ($(HOST), _APPLE)

Property changes on: head/sysutils/acpica-tools/files/patch-generate_unix_Makefile.config
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property