svn commit: r509622 - in head/sysutils/acpica-tools: . files

[Jung-uk Kim]

Author: jkim
Date: Thu Aug 22 19:41:54 2019
New Revision: 509622
URL: https://svnweb.freebsd.org/changeset/ports/509622

Log:
  - Use upstream patches.
  - Use compiler optimization flags.

Added:
  head/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c   (contents, props changed)
Modified:
  head/sysutils/acpica-tools/Makefile
  head/sysutils/acpica-tools/files/patch-source_common_dmtables.c
  head/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c

Modified: head/sysutils/acpica-tools/Makefile
==============================================================================
--- head/sysutils/acpica-tools/Makefile	Thu Aug 22 19:31:07 2019	(r509621)
+++ head/sysutils/acpica-tools/Makefile	Thu Aug 22 19:41:54 2019	(r509622)
@@ -2,6 +2,7 @@
 
 PORTNAME=	acpica
 PORTVERSION=	20190816
+PORTREVISION=	1
 CATEGORIES=	sysutils devel
 MASTER_SITES=	https://acpica.org/sites/acpica/files/ \
 		LOCAL/jkim
@@ -25,7 +26,7 @@ ACPICA_TOOLS+=	acpixtract iasl
 
 PLIST_FILES=	${ACPICA_TOOLS:S,^,bin/,}
 
-MAKE_ARGS=	HOST=_FreeBSD NOOPT=TRUE PROGS="${ACPICA_TOOLS}"
+MAKE_ARGS=	HOST=_FreeBSD PROGS="${ACPICA_TOOLS}"
 MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" YACC="${LOCALBASE}/bin/bison"
 
 do-install:

Modified: head/sysutils/acpica-tools/files/patch-source_common_dmtables.c
==============================================================================
--- head/sysutils/acpica-tools/files/patch-source_common_dmtables.c	Thu Aug 22 19:31:07 2019	(r509621)
+++ head/sysutils/acpica-tools/files/patch-source_common_dmtables.c	Thu Aug 22 19:41:54 2019	(r509622)
@@ -5,7 +5,7 @@
       */
      AcpiOsPrintf (
 -        "DefinitionBlock (\"\", \"%4.4s\", %hu, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
-+        "DefinitionBlock (\"\", \"%4.4s\", %hhu, \"%.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);
  }

Modified: head/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c
==============================================================================
--- head/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c	Thu Aug 22 19:31:07 2019	(r509621)
+++ head/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c	Thu Aug 22 19:41:54 2019	(r509622)
@@ -5,7 +5,7 @@
                      for (i = 0; (i < ObjDesc->Buffer.Length && i < 12); i++)
                      {
 -                        AcpiOsPrintf (" %.2hX", ObjDesc->Buffer.Pointer[i]);
-+                        AcpiOsPrintf (" %.2hhX", ObjDesc->Buffer.Pointer[i]);
++                        AcpiOsPrintf (" %2.2X", ObjDesc->Buffer.Pointer[i]);
                      }
                  }
                  AcpiOsPrintf ("\n");
@@ -14,7 +14,7 @@
          case ACPI_TYPE_LOCAL_INDEX_FIELD:
  
 -            AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2hd\n",
-+            AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2hhd\n",
++            AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2X\n",
                  (ObjDesc->CommonField.BaseByteOffset * 8)
                      + ObjDesc->CommonField.StartFieldBitOffset,
                  ObjDesc->CommonField.BitLength,

Added: head/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c	Thu Aug 22 19:41:54 2019	(r509622)
@@ -0,0 +1,11 @@
+--- 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;
+