5 files changed, 42 insertions, 37 deletions

diff --git a/devel/acpicatools/Makefile b/devel/acpicatools/Makefile
index f050cef98bcd..c3728376d495 100644
--- a/devel/acpicatools/Makefile
+++ b/devel/acpicatools/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	acpicatools
-PORTVERSION=	20020404.0
+PORTVERSION=	20020517.0
 CATEGORIES=	devel
 MASTER_SITES=	http://people.FreeBSD.org/~iwasaki/acpi/ \
 		http://developer.intel.com/technology/iapc/acpi/downloads/ \
 		${MASTER_SITE_PORTS_JP}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		acpica-unix-20020404.tar.gz
+		acpica-unix-20020517.tar.gz
 NO_WRKSUBDIR=	yes
 
 MAINTAINER=	iwasaki@FreeBSD.org
diff --git a/devel/acpicatools/distinfo b/devel/acpicatools/distinfo
index ce1eeb187cbe..9b02ef240f2d 100644
--- a/devel/acpicatools/distinfo
+++ b/devel/acpicatools/distinfo
@@ -1,2 +1,2 @@
-MD5 (acpica-unix-20020404.tar.gz) = b1b8b067dd9101579e7dab2bcc063e6f
-MD5 (acpicatools-20020404.0.tar.gz) = ab280215f5c882a1d83243b126bc3e81
+MD5 (acpica-unix-20020517.tar.gz) = f6d5322df80f5c2ff3f85a1764fef3ca
+MD5 (acpicatools-20020517.0.tar.gz) = f0335b98d625bcd315f7d3f2f367541f
diff --git a/devel/acpicatools/files/patch-20020404 b/devel/acpicatools/files/patch-20020404
deleted file mode 100644
index 53a25f43cd6d..000000000000
--- a/devel/acpicatools/files/patch-20020404
+++ /dev/null
@@ -1,33 +0,0 @@
---- osunixxf.c.orig	Fri Oct 19 05:21:52 2001
-+++ osunixxf.c	Thu Nov  1 21:44:36 2001
-@@ -706,7 +706,7 @@
-     UINT32                  milliseconds)
- {
- 
--    sleep ((seconds * 1000) + milliseconds);
-+    usleep ((seconds * 1000) + milliseconds);
-     return;
- }
- 
-@@ -965,4 +965,11 @@
-     return (AE_OK);
- }
- 
-+ACPI_STATUS
-+AcpiOsGetRootPointer (
-+    UINT32                  Flags,
-+    ACPI_POINTER            *RsdpPhysicalAddress)
-+{
-+    return (AE_OK);
-+}
- 
---- include/platform/acfreebsd.h.orig	Fri Apr  5 08:43:53 2002
-+++ include/platform/acfreebsd.h	Thu Apr 11 14:38:34 2002
-@@ -156,6 +156,7 @@
- 
- #define __cli()
- #define __sti()
-+#define ACPI_FLUSH_CPU_CACHE()
- 
- #endif /* _KERNEL */
- 
diff --git a/devel/acpicatools/files/patch-include::platform::acfreebsd.h b/devel/acpicatools/files/patch-include::platform::acfreebsd.h
new file mode 100644
index 000000000000..721ffc899f0a
--- /dev/null
+++ b/devel/acpicatools/files/patch-include::platform::acfreebsd.h
@@ -0,0 +1,27 @@
+--- include/platform/acfreebsd.h.orig	Mon May 20 23:27:26 2002
++++ include/platform/acfreebsd.h	Sat Jun  1 01:12:11 2002
+@@ -156,6 +156,7 @@
+ 
+ #define __cli()
+ #define __sti()
++#define ACPI_FLUSH_CPU_CACHE()
+ 
+ #endif /* _KERNEL */
+ 
+@@ -195,5 +196,16 @@
+     return ((char *)s);
+ }
+ #endif /* _KERNEL */
++
++#if defined(__ia64__) || defined(__x86_64__)
++#define ACPI_MACHINE_WIDTH             64
++#define COMPILER_DEPENDENT_INT64       long
++#define COMPILER_DEPENDENT_UINT64      unsigned long
++#else
++#define ACPI_MACHINE_WIDTH             32
++#define COMPILER_DEPENDENT_INT64       long long
++#define COMPILER_DEPENDENT_UINT64      unsigned long long
++#define ACPI_USE_NATIVE_DIVIDE
++#endif
+ 
+ #endif /* __ACFREEBSD_H__ */
diff --git a/devel/acpicatools/files/patch-osunixxf.c b/devel/acpicatools/files/patch-osunixxf.c
new file mode 100644
index 000000000000..eb77fc184132
--- /dev/null
+++ b/devel/acpicatools/files/patch-osunixxf.c
@@ -0,0 +1,11 @@
+--- osunixxf.c.orig	Mon May 20 23:27:31 2002
++++ osunixxf.c	Fri Jun  7 22:23:11 2002
+@@ -728,7 +728,7 @@
+     UINT32                  milliseconds)
+ {
+ 
+-    sleep ((seconds * 1000) + milliseconds);
++    usleep ((seconds * 1000) + milliseconds);
+     return;
+ }
+