Index: sysutils/x86info/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/x86info/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- sysutils/x86info/Makefile	5 Sep 2005 19:27:38 -0000	1.17
+++ sysutils/x86info/Makefile	4 Oct 2005 23:24:50 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	x86info
-PORTVERSION=	1.14
+PORTVERSION=	1.16
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.codemonkey.org.uk/projects/x86info/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -21,11 +21,6 @@
 USE_REINPLACE=	yes
 MAKE_ARGS=	CFLAGS="${CFLAGS}"
 
-post-patch:
-.for file in x86info.h mptable.c
-	@${REINPLACE_CMD} -e "s|machine/types.h|sys/types.h|g" ${WRKSRC}/${file}
-.endfor
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/x86info ${PREFIX}/bin
 
Index: sysutils/x86info/distinfo
===================================================================
RCS file: /home/ncvs/ports/sysutils/x86info/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- sysutils/x86info/distinfo	31 Aug 2005 07:30:59 -0000	1.10
+++ sysutils/x86info/distinfo	4 Oct 2005 23:24:50 -0000
@@ -1,2 +1,2 @@
-MD5 (x86info-1.14.tgz) = a819dcf9b5deff3dee383edffa81fbca
-SIZE (x86info-1.14.tgz) = 59072
+MD5 (x86info-1.16.tgz) = 57cfb84b006f0f5634ee8bd458330328
+SIZE (x86info-1.16.tgz) = 51410
Index: sysutils/x86info/files/patch-bench_benchmarks.c
===================================================================
RCS file: /home/ncvs/ports/sysutils/x86info/files/patch-bench_benchmarks.c,v
retrieving revision 1.1
diff -u -r1.1 patch-bench_benchmarks.c
--- sysutils/x86info/files/patch-bench_benchmarks.c	25 Aug 2003 01:29:34 -0000	1.1
+++ sysutils/x86info/files/patch-bench_benchmarks.c	4 Oct 2005 23:24:50 -0000
@@ -1,21 +1,17 @@
---- bench/benchmarks.c.orig	Sun Aug 24 11:04:51 2003
-+++ bench/benchmarks.c	Sun Aug 24 11:08:26 2003
-@@ -1,7 +1,8 @@
+--- bench/benchmarks.c.orig	Tue Oct  4 19:22:20 2005
++++ bench/benchmarks.c	Tue Oct  4 19:22:40 2005
+@@ -1,6 +1,5 @@
  #include <time.h>
  #include <sys/time.h>
 -#include <asm/unistd.h>
-+#include <sys/unistd.h>
  #include <sys/stat.h>
-+#include <sys/syscall.h>
  #include <stdio.h>
  #include "../x86info.h"
- #include "bench.h"
-@@ -13,7 +14,7 @@
+@@ -13,7 +12,6 @@
  	if (show_bench != 1)
  		return;
  
 -	TIME(asm volatile("int $0x80" :"=a" (ret) :"0" (__NR_getppid)), "int 0x80");
-+	TIME(asm volatile("int $0x80" :"=a" (ret) :"0" (SYS_getppid)), "int 0x80");
  	TIME(asm volatile("cpuid": : :"ax", "dx", "cx", "bx"), "cpuid");
  
  	TIME(asm volatile("addl $1,0(%esp)"), "addl");
Index: sysutils/x86info/files/patch-mptable.c
===================================================================
RCS file: sysutils/x86info/files/patch-mptable.c
diff -N sysutils/x86info/files/patch-mptable.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysutils/x86info/files/patch-mptable.c	4 Oct 2005 23:24:50 -0000
@@ -0,0 +1,11 @@
+--- mptable.c.orig	Tue Oct  4 19:15:02 2005
++++ mptable.c	Tue Oct  4 19:15:09 2005
+@@ -39,8 +39,6 @@
+ #include "mptable.h"
+ #include "x86info.h"
+ 
+-typedef unsigned long vm_offset_t;
+-
+ /* EBDA is @ 40:0e in real-mode terms */
+ #define EBDA_POINTER			0x040e		  /* location of EBDA pointer */
+ 
Index: sysutils/x86info/files/patch-x86info.h
===================================================================
RCS file: /home/ncvs/ports/sysutils/x86info/files/patch-x86info.h,v
retrieving revision 1.3
diff -u -r1.3 patch-x86info.h
--- sysutils/x86info/files/patch-x86info.h	25 Aug 2003 01:29:34 -0000	1.3
+++ sysutils/x86info/files/patch-x86info.h	4 Oct 2005 23:24:50 -0000
@@ -1,22 +1,11 @@
---- x86info.h.orig	Sun Aug 24 10:59:27 2003
-+++ x86info.h	Sun Aug 24 11:00:47 2003
-@@ -1,15 +1,10 @@
+--- x86info.h.orig	Tue Oct  4 19:13:58 2005
++++ x86info.h	Tue Oct  4 19:14:04 2005
+@@ -1,7 +1,7 @@
  #ifndef _X86INFO_H
  #define _X86INFO_H
  
--#ifdef linux
 -#include <linux/types.h>
--typedef unsigned char u8;
--typedef unsigned short u16;
--typedef unsigned int u32;
--#else
--#include <machine/types.h>
--#define __u32 int
--#endif /* linux */
 +#include <sys/types.h>
-+typedef u_int8_t u8;
-+typedef u_int16_t u16;
-+typedef u_int32_t u32;
- 
- #define VENDOR_AMD	1
- #define VENDOR_CENTAUR 2
+ typedef unsigned char u8;
+ typedef unsigned short u16;
+ typedef unsigned int u32;