Update to 1.7

PR:		32985
Submitted by:	maintainer
This commit is contained in:
Patrick Li 2001-12-18 20:54:24 +00:00
parent dfdba66be6
commit 609a70ed42
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=51754
5 changed files with 61 additions and 11 deletions

View file

@ -6,7 +6,7 @@
# #
PORTNAME= x86info PORTNAME= x86info
PORTVERSION= 1.6 PORTVERSION= 1.7
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} MASTER_SITE_SUBDIR= ${PORTNAME}

View file

@ -1 +1 @@
MD5 (x86info-1.6.tgz) = 4e8e031e96b584b4decd80bf607f4757 MD5 (x86info-1.7.tgz) = d9b4e19dae0aeab1a7b2247f6251bb22

View file

@ -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)

View file

@ -1,20 +1,24 @@
--- Makefile.orig Fri Nov 23 01:07:07 2001 --- Makefile.orig Tue Dec 11 12:01:40 2001
+++ Makefile Fri Nov 23 01:06:46 2001 +++ Makefile Tue Dec 18 15:48:37 2001
@@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
-CFLAGS = -Wall -W -g -O2 -CFLAGS = -Wall -W -g -O2
#CFLAGS += -mwin32 -DWIN32_LEAN_AND_MEAN
SHELL = /bin/sh
all: x86info @@ -36,13 +35,13 @@
get_model_name.o\
@@ -30,10 +29,10 @@
eblcr.o
x86info: $(OBJS) x86info: $(OBJS)
- gcc -o x86info $(OBJS) - gcc -o x86info $(OBJS)
+ $(CC) -o x86info $(OBJS) + ${CC} -o x86info $(OBJS)
.c.o: .c.o:
- gcc $(CFLAGS) -o $@ -c $< - gcc $(CFLAGS) -o $@ -c $<
+ $(CC) $(CFLAGS) -o $@ -c $< + ${CC} $(CFLAGS) -o $@ -c $<
.S.o:
- gcc $(CFLAGS) -o $@ -c $<
+ ${CC} $(CFLAGS) -o $@ -c $<
clean: clean:
find . -name "*.o" -exec rm {} \; @find . -name "*.o" -exec rm {} \;

View file

@ -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 */