Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Dec 2001 14:16:41 -0600 (CST)
From:      erik@smluc.org
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/32985: Update port: sysutils/x86info   1.6->1.7
Message-ID:  <200112182016.fBIKGfK29069@csc.smsu.edu>

next in thread | raw e-mail | index | archive | help

>Number:         32985
>Category:       ports
>Synopsis:       Update port: sysutils/x86info   1.6->1.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 18 12:20:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Erik Greenwald
>Release:        FreeBSD 4.2-RELEASE i386 (and -current 5.0)
>Organization:
>Environment:

Tested on 4.2-release and 5.0-current (17dec2001)

>Description:

upgrade for x86info from 1.6 to 1.7

Files were added, so patch -p0

>How-To-Repeat:

	

>Fix:


diff -ruN x86info.orig/Makefile x86info/Makefile
--- x86info.orig/Makefile	Fri Nov 23 00:25:01 2001
+++ x86info/Makefile	Tue Dec 18 13:20:51 2001
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	x86info
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -ruN x86info.orig/distinfo x86info/distinfo
--- x86info.orig/distinfo	Fri Nov 23 00:25:01 2001
+++ x86info/distinfo	Tue Dec 18 13:22:25 2001
@@ -1 +1 @@
-MD5 (x86info-1.6.tgz) = 4e8e031e96b584b4decd80bf607f4757
+MD5 (x86info-1.7.tgz) = d9b4e19dae0aeab1a7b2247f6251bb22
diff -ruN x86info.orig/files/patch-Intel_cachesize.c x86info/files/patch-Intel_cachesize.c
--- x86info.orig/files/patch-Intel_cachesize.c	Wed Dec 31 18:00:00 1969
+++ x86info/files/patch-Intel_cachesize.c	Tue Dec 18 13:47:19 2001
@@ -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 -ruN x86info.orig/files/patch-Makefile x86info/files/patch-Makefile
--- x86info.orig/files/patch-Makefile	Fri Nov 23 00:25:04 2001
+++ x86info/files/patch-Makefile	Tue Dec 18 13:53:43 2001
@@ -1,20 +1,25 @@
---- Makefile.orig	Fri Nov 23 01:07:07 2001
-+++ Makefile	Fri Nov 23 01:06:46 2001
-@@ -1,4 +1,3 @@
+--- Makefile.orig	Tue Dec 18 13:52:31 2001
++++ Makefile	Tue Dec 18 13:53:26 2001
+@@ -1,4 +1,4 @@
 -CFLAGS = -Wall -W -g -O2
++#CFLAGS = -Wall -W -g -O2
+ #CFLAGS += -mwin32 -DWIN32_LEAN_AND_MEAN
+ SHELL = /bin/sh
  
- all: x86info
- 
-@@ -30,10 +29,10 @@
- 	eblcr.o
+@@ -36,13 +36,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 -ruN x86info.orig/files/patch-cpuid_UP.S x86info/files/patch-cpuid_UP.S
--- x86info.orig/files/patch-cpuid_UP.S	Wed Dec 31 18:00:00 1969
+++ x86info/files/patch-cpuid_UP.S	Tue Dec 18 13:46:39 2001
@@ -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 */
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200112182016.fBIKGfK29069>