From c0efcff271dc57745fc275d484ac7de377e3fcf3 Mon Sep 17 00:00:00 2001
From: Nate Lawson <njl@FreeBSD.org>
Date: Mon, 11 Aug 2003 15:49:14 +0000
Subject: [PATCH] Remove the band-aid to make these compile on amd64/ia64.

---
 usr.sbin/acpi/acpidb/Makefile | 7 +------
 usr.sbin/acpi/iasl/Makefile   | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 79d66e00b5ba..e8c98a6b4eb1 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	acpidb
 SRCS+=	acpidb.c
-SRCS+=	osunixxf-xxx.c
+SRCS+=	osunixxf.c
 SRCS+=	dbcmds.c dbdisply.c dbexec.c dbfileio.c \
 	dbhistry.c dbinput.c dbstats.c dbutils.c \
 	dbxface.c dmbuffer.c dmnames.c dmobject.c \
@@ -39,9 +39,4 @@ MAN=	acpidb.8
 CFLAGS+= -DACPI_APPLICATION -DACPI_DEBUG_OUTPUT -DACPI_DEBUGGER \
 	-DACPI_DISASSEMBLER
 
-# The following band-aid is also present in ../iasl/Makefile
-CLEANFILES+= osunixxf-xxx.c
-osunixxf-xxx.c: osunixxf.c
-	cat ${.ALLSRC} | sed -e 's/UINT32 *length/ACPI_SIZE length/g' -e 's/UINT32 *size/ACPI_SIZE size/g' -e 's/(UINT32) where/(uintptr_t)where/g' > ${.TARGET}
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index 5e27c26217c1..49a5b57c8ef6 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -7,7 +7,7 @@ SRCS+=	aslcompilerparse.c aslcompilerlex.c aslanalyze.c aslcodegen.c \
 	aslmap.c aslopcodes.c asloperands.c aslresource.c \
 	aslrestype1.c aslrestype2.c asltree.c aslutils.c \
 	asltransform.c aslfold.c aslstubs.c aslopt.c
-SRCS+=	adisasm.c getopt.c osunixxf-xxx.c
+SRCS+=	adisasm.c getopt.c osunixxf.c
 SRCS+=	dbfileio.c dmbuffer.c dmnames.c dmopcode.c dmobject.c \
         dmresrc.c dmresrcl.c dmresrcs.c dmutils.c dmwalk.c \
         dsopcode.c dsutils.c dswexec.c dswload.c \
@@ -49,9 +49,4 @@ aslcompilerlex.c: aslcompiler.l
 	${LEX} ${LFLAGS} -PAslCompiler -oaslcompilerlex.c \
 		${ACPICA_DIR}/compiler/aslcompiler.l
 
-# The following band-aid is also present in ../acpidb/Makefile
-CLEANFILES+= osunixxf-xxx.c
-osunixxf-xxx.c: osunixxf.c
-	cat ${.ALLSRC} | sed -e 's/UINT32 *length/ACPI_SIZE length/g' -e 's/UINT32 *size/ACPI_SIZE size/g' -e 's/(UINT32) where/(uintptr_t)where/g' > ${.TARGET}
-
 .include <bsd.prog.mk>