4 files changed, 66 insertions, 5 deletions

diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile
index 9343e5e363b9..a2e1ff93b01c 100644
--- a/sysutils/acpica-tools/Makefile
+++ b/sysutils/acpica-tools/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	acpica
-PORTVERSION=	20240321
+PORTVERSION=	20240827
 CATEGORIES=	sysutils devel
-MASTER_SITES=	https://downloadmirror.intel.com/819451/ \
+MASTER_SITES=	https://github.com/user-attachments/files/16769900/ \
 		LOCAL/jkim
 PKGNAMESUFFIX=	-tools
 DISTNAME=	${PORTNAME}-unix-${PORTVERSION}
@@ -25,6 +25,9 @@ PLIST_FILES=	${ACPICA_TOOLS:S,^,bin/,}
 MAKE_ARGS=	HOST=_FreeBSD PROGS="${ACPICA_TOOLS}"
 MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" YACC="${YACC}"
 
+post-extract:
+	cd ${WRKSRC}/source/include && ${MV} ACPIXF.H acpixf.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 24e0bb529185..efc29f6bacb1 100644
--- a/sysutils/acpica-tools/distinfo
+++ b/sysutils/acpica-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713478248
-SHA256 (acpica-unix-20240321.tar.gz) = 54a299487925fd3e0551c95f9d5cee4f4984930273983eff67aa5cd46f8f338b
-SIZE (acpica-unix-20240321.tar.gz) = 1941366
+TIMESTAMP = 1725336777
+SHA256 (acpica-unix-20240827.tar.gz) = 373d4f08da7f1e838191311cb0fc2615ca9c76f47b1e103631e20292a38b4836
+SIZE (acpica-unix-20240827.tar.gz) = 1952580
diff --git a/sysutils/acpica-tools/files/patch-source_common_dmtbdump3.c b/sysutils/acpica-tools/files/patch-source_common_dmtbdump3.c
new file mode 100644
index 000000000000..0f2e65bc45f3
--- /dev/null
+++ b/sysutils/acpica-tools/files/patch-source_common_dmtbdump3.c
@@ -0,0 +1,11 @@
+--- source/common/dmtbdump3.c.orig	2024-08-27 21:14:55 UTC
++++ source/common/dmtbdump3.c
+@@ -178,7 +178,7 @@ AcpiDmDumpSlic (
+ {
+ 
+     (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER),
+-        (void *) (Table + sizeof (*Table)),
++        (void *) ((UINT8 *)Table + sizeof (*Table)),
+         Table->Length - sizeof (*Table), AcpiDmTableInfoSlic);
+ }
+ 
diff --git a/sysutils/acpica-tools/files/patch-source_components_namespace_nsaccess.c b/sysutils/acpica-tools/files/patch-source_components_namespace_nsaccess.c
new file mode 100644
index 000000000000..d5a700f0ad11
--- /dev/null
+++ b/sysutils/acpica-tools/files/patch-source_components_namespace_nsaccess.c
@@ -0,0 +1,47 @@
+--- source/components/namespace/nsaccess.c.orig	2024-08-27 21:14:58 UTC
++++ source/components/namespace/nsaccess.c
+@@ -449,7 +449,9 @@ AcpiNsLookup (
+     ACPI_NAMESPACE_NODE     *CurrentNode = NULL;
+     ACPI_NAMESPACE_NODE     *ThisNode = NULL;
+     UINT32                  NumSegments;
++#ifdef ACPI_DEBUG_OUTPUT
+     UINT32                  NumCarats;
++#endif
+     ACPI_NAME               SimpleName;
+     ACPI_OBJECT_TYPE        TypeToCheckFor;
+     ACPI_OBJECT_TYPE        ThisSearchType;
+@@ -573,7 +575,9 @@ AcpiNsLookup (
+              * the parent node for each prefix instance.
+              */
+             ThisNode = PrefixNode;
++#ifdef ACPI_DEBUG_OUTPUT
+             NumCarats = 0;
++#endif
+             while (*Path == (UINT8) AML_PARENT_PREFIX)
+             {
+                 /* Name is fully qualified, no search rules apply */
+@@ -588,7 +592,9 @@ AcpiNsLookup (
+ 
+                 /* Backup to the parent node */
+ 
++#ifdef ACPI_DEBUG_OUTPUT
+                 NumCarats++;
++#endif
+                 ThisNode = ThisNode->Parent;
+                 if (!ThisNode)
+                 {
+@@ -611,12 +617,14 @@ AcpiNsLookup (
+                 }
+             }
+ 
++#ifdef ACPI_DEBUG_OUTPUT
+             if (SearchParentFlag == ACPI_NS_NO_UPSEARCH)
+             {
+                 ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+                     "Search scope is [%4.4s], path has %u carat(s)\n",
+                     AcpiUtGetNodeName (ThisNode), NumCarats));
+             }
++#endif
+         }
+ 
+         /*