Update to 1.7

PR:		32985
Submitted by:	maintainer

5 files changed, 61 insertions, 11 deletions

diff --git a/sysutils/x86info/Makefile b/sysutils/x86info/Makefile
index 5509d99c97e1..d5bdf2e6d4f2 100644
--- a/sysutils/x86info/Makefile
+++ b/sysutils/x86info/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	x86info
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/x86info/distinfo b/sysutils/x86info/distinfo
index 5189dd7d6855..128434d9fba8 100644
--- a/sysutils/x86info/distinfo
+++ b/sysutils/x86info/distinfo
@@ -1 +1 @@
-MD5 (x86info-1.6.tgz) = 4e8e031e96b584b4decd80bf607f4757
+MD5 (x86info-1.7.tgz) = d9b4e19dae0aeab1a7b2247f6251bb22
diff --git a/sysutils/x86info/files/patch-Intel_cachesize.c b/sysutils/x86info/files/patch-Intel_cachesize.c
new file mode 100644
index 000000000000..48059956852b
--- /dev/null
+++ b/sysutils/x86info/files/patch-Intel_cachesize.c
@@ -0,0 +1,18 @@
+--- Intel/cachesize.c.orig	Tue Dec 18 13:43:49 2001
++++ Intel/cachesize.c	Tue Dec 18 13:45:27 2001
+@@ -2,6 +2,15 @@
+  * $Id: cachesize.c,v 1.2 2001/12/10 21:48:37 davej Exp $
+  */
+ 
++#ifdef __FreeBSD__
++#  if __FreeBSD__==5
++#    include <stdint.h>
++#  else
++#    include <inttypes.h>
++#    include <sys/types.h>
++#  endif
++#endif
++
+ #include "../x86info.h"
+ 
+ void get_intel_cacheinfo (struct cpudata *c)
diff --git a/sysutils/x86info/files/patch-Makefile b/sysutils/x86info/files/patch-Makefile
index c7c6e26f2423..225460eeaa61 100644
--- a/sysutils/x86info/files/patch-Makefile
+++ b/sysutils/x86info/files/patch-Makefile
@@ -1,20 +1,24 @@
---- Makefile.orig	Fri Nov 23 01:07:07 2001
-+++ Makefile	Fri Nov 23 01:06:46 2001
+--- Makefile.orig	Tue Dec 11 12:01:40 2001
++++ Makefile	Tue Dec 18 15:48:37 2001
 @@ -1,4 +1,3 @@
 -CFLAGS = -Wall -W -g -O2
+ #CFLAGS += -mwin32 -DWIN32_LEAN_AND_MEAN
+ SHELL = /bin/sh
  
- all: x86info
- 
-@@ -30,10 +29,10 @@
- 	eblcr.o
+@@ -36,13 +35,13 @@
+ 	get_model_name.o\
  
  x86info: $(OBJS)
 -	gcc -o x86info $(OBJS)
-+	$(CC) -o x86info $(OBJS)
++	${CC} -o x86info $(OBJS)
  
  .c.o:
 -	gcc $(CFLAGS) -o $@ -c $<
-+	$(CC) $(CFLAGS) -o $@ -c $<
++	${CC} $(CFLAGS) -o $@ -c $<
+ 
+ .S.o:
+-	gcc $(CFLAGS) -o $@ -c $<
++	${CC} $(CFLAGS) -o $@ -c $<
  
  clean:
- 	find . -name "*.o" -exec rm {} \;
+ 	@find . -name "*.o" -exec rm {} \;
diff --git a/sysutils/x86info/files/patch-cpuid_UP.S b/sysutils/x86info/files/patch-cpuid_UP.S
new file mode 100644
index 000000000000..3dd2f4671a02
--- /dev/null
+++ b/sysutils/x86info/files/patch-cpuid_UP.S
@@ -0,0 +1,28 @@
+--- cpuid_UP.S.orig	Tue Dec 11 11:01:41 2001
++++ cpuid_UP.S	Tue Dec 18 13:42:43 2001
+@@ -1,21 +1,14 @@
+ 	.align 4
+ 	.text
+ 
+-#ifdef linux
+ 
++#ifdef __WIN32__
++.globl _cpuid_UP
++	.def	_cpuid_UP;  .scl    2;      .type   32;     .endef
++#else	/* a sane system */
+ .globl cpuid_UP
+ 	.type	cpuid_UP,@function
+ cpuid_UP:
+-
+-#else /* BSD or WIN32 */
+-
+-.globl _cpuid_UP
+-
+-#ifdef __WIN32__
+-	.def	_cpuid_UP;  .scl    2;      .type   32;     .endef
+-#else /* BSD */
+-	.type	_cpuid_UP,@function
+-#endif /* __WIN32__ */
+ 
+ _cpuid_UP:
+ #endif /* linux */