5 files changed, 6 insertions, 49 deletions

diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile
index 2ba035be1ea8..694dc4f0c6a1 100644
--- a/sysutils/acpica-tools/Makefile
+++ b/sysutils/acpica-tools/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	acpica
-PORTVERSION=	20190816
-PORTREVISION=	1
+PORTVERSION=	20191018
 CATEGORIES=	sysutils devel
 MASTER_SITES=	https://acpica.org/sites/acpica/files/ \
 		LOCAL/jkim
@@ -17,7 +16,7 @@ LICENSE_COMB=	dual
 
 BROKEN_powerpc64=	fails to compile: comparison is always true due to limited range of data type
 
-USES=		bison gmake
+USES=		gmake
 
 BUILD_WRKSRC=	${WRKSRC}/generate/unix
 
@@ -27,7 +26,7 @@ ACPICA_TOOLS+=	acpixtract iasl
 PLIST_FILES=	${ACPICA_TOOLS:S,^,bin/,}
 
 MAKE_ARGS=	HOST=_FreeBSD PROGS="${ACPICA_TOOLS}"
-MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" YACC="${LOCALBASE}/bin/bison"
+MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" YACC="${YACC}"
 
 do-install:
 	${INSTALL_PROGRAM} ${ACPICA_TOOLS:S,^,${BUILD_WRKSRC}/bin/,} \
diff --git a/sysutils/acpica-tools/distinfo b/sysutils/acpica-tools/distinfo
index e2aa35dc3b85..1d34a10f490b 100644
--- a/sysutils/acpica-tools/distinfo
+++ b/sysutils/acpica-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565969994
-SHA256 (acpica-unix-20190816.tar.gz) = 7aec4dc88a3ba148eecd898e59fb5378573eb6a94585e5538e0b396840d0fc5c
-SIZE (acpica-unix-20190816.tar.gz) = 1856681
+TIMESTAMP = 1571421218
+SHA256 (acpica-unix-20191018.tar.gz) = 029db4014600e4b771b11a84276d2d76eb40fb26eabc85864852ef1f962be95f
+SIZE (acpica-unix-20191018.tar.gz) = 1859272
diff --git a/sysutils/acpica-tools/files/patch-source_common_dmtables.c b/sysutils/acpica-tools/files/patch-source_common_dmtables.c
deleted file mode 100644
index 58ec0a75042e..000000000000
--- a/sysutils/acpica-tools/files/patch-source_common_dmtables.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/common/dmtables.c.orig	2019-08-16 15:01:10 UTC
-+++ source/common/dmtables.c
-@@ -327,7 +327,7 @@ AdCreateTableHeader (
-      * makes it easier to rename the disassembled ASL file if needed.
-      */
-     AcpiOsPrintf (
--        "DefinitionBlock (\"\", \"%4.4s\", %hu, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
-+        "DefinitionBlock (\"\", \"%4.4s\", %u, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
-         Table->Signature, Table->Revision,
-         Table->OemId, Table->OemTableId, Table->OemRevision);
- }
diff --git a/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c b/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c
deleted file mode 100644
index adc056b30213..000000000000
--- a/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- source/components/namespace/nsdump.c.orig	2019-08-16 15:01:13 UTC
-+++ source/components/namespace/nsdump.c
-@@ -478,7 +478,7 @@ AcpiNsDumpOneObject (
-                     AcpiOsPrintf (" =");
-                     for (i = 0; (i < ObjDesc->Buffer.Length && i < 12); i++)
-                     {
--                        AcpiOsPrintf (" %.2hX", ObjDesc->Buffer.Pointer[i]);
-+                        AcpiOsPrintf (" %2.2X", ObjDesc->Buffer.Pointer[i]);
-                     }
-                 }
-                 AcpiOsPrintf ("\n");
-@@ -575,7 +575,7 @@ AcpiNsDumpOneObject (
-         case ACPI_TYPE_LOCAL_BANK_FIELD:
-         case ACPI_TYPE_LOCAL_INDEX_FIELD:
- 
--            AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2hd\n",
-+            AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2X\n",
-                 (ObjDesc->CommonField.BaseByteOffset * 8)
-                     + ObjDesc->CommonField.StartFieldBitOffset,
-                 ObjDesc->CommonField.BitLength,
diff --git a/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c b/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c
deleted file mode 100644
index e576e27d7be1..000000000000
--- a/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/components/utilities/uttrack.c.orig	2019-08-16 15:01:14 UTC
-+++ source/components/utilities/uttrack.c
-@@ -864,7 +864,7 @@ AcpiUtDumpAllocations (
- 
-                     case ACPI_DESC_TYPE_PARSER:
- 
--                        AcpiOsPrintf ("AmlOpcode 0x%04hX\n",
-+                        AcpiOsPrintf ("AmlOpcode 0x%04X\n",
-                             Descriptor->Op.Asl.AmlOpcode);
-                         break;
-