Attachment #56479 for bug #85274

View | Details | Raw Unified | Return to bug 85274
Collapse All | Expand All

Lines 6-12 Link Here

(-)sysutils/x86info/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= x86info	8	PORTNAME= x86info
9	PORTVERSION= 1.12b	9	PORTVERSION= 1.14
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= http://www.codemonkey.org.uk/projects/x86info/ \	11	MASTER_SITES= http://www.codemonkey.org.uk/projects/x86info/ \
12	${MASTER_SITE_SOURCEFORGE}	12	${MASTER_SITE_SOURCEFORGE}
Lines 16-22 Link Here
16	MAINTAINER= erik@smluc.org	16	MAINTAINER= erik@smluc.org
17	COMMENT= Utility to display information about the systems x86 processor(s)	17	COMMENT= Utility to display information about the systems x86 processor(s)
18		18
19	ONLY_FOR_ARCHS= i386	19	ONLY_FOR_ARCHS= i386 amd64
20	PLIST_FILES= bin/x86info	20	PLIST_FILES= bin/x86info
21	USE_REINPLACE= yes	21	USE_REINPLACE= yes
22		22

Lines 1-2 Link Here

(-)sysutils/x86info/distinfo (-2 / +2 lines)
1	MD5 (x86info-1.12b.tgz) = 4f0ce10a00db5778b16a09f68f5f6767	1	MD5 (x86info-1.14.tgz) = a819dcf9b5deff3dee383edffa81fbca
2	SIZE (x86info-1.12b.tgz) = 54200	2	SIZE (x86info-1.14.tgz) = 59072




--- cpuid_UP.S.orig	Wed Aug 24 20:15:46 2005
+++ cpuid_UP.S	Wed Aug 24 20:16:16 2005
@@ -1,24 +1,9 @@
 	.align 4
 	.text
 
-#ifdef linux
-
 .globl cpuid_UP
 	.type	cpuid_UP,@function
 cpuid_UP:
-
-#else /* BSD or WIN32 */

-
-_cpuid_UP:
-#endif /* linux */
 
 #ifdef __x86_64__
 /* x86_64 calling convention: Args passed in rdi, rsi, rdx, rcx, r8, r9;
 	pushl %edi

Return to bug 85274

Lines 1-13 Link Here

(-)sysutils/x86info/files/patch-cpuid_UP.S (-8 / +7 lines)
1	--- cpuid_UP.S.orig Tue Nov 26 20:20:07 2002	1	--- cpuid_UP.S.orig Wed Aug 24 20:15:46 2005
2	+++ cpuid_UP.S Sun Aug 24 16:12:12 2003	2	+++ cpuid_UP.S Wed Aug 24 20:16:16 2005
3	@@ -1,25 +1,8 @@	3	@@ -1,24 +1,9 @@
4	.align 4	4	.align 4
5	.text	5	.text
6		6
7	-#ifdef linux	7	-#ifdef linux
8	-	8	-
9	.globl cpuid_UP	9	.globl cpuid_UP
10	- .type cpuid_UP,@function	10	.type cpuid_UP,@function
11	cpuid_UP:	11	cpuid_UP:
12	-	12	-
13	-#else /* BSD or WIN32 */	13	-#else /* BSD or WIN32 */
Lines 22-28 Link Here
22	-	22	-
23	-_cpuid_UP:	23	-_cpuid_UP:
24	-#endif /* linux */	24	-#endif /* linux */
25	-	25
26	pushl %ebp	26	#ifdef __x86_64__
27	movl %esp,%ebp	27	/* x86_64 calling convention: Args passed in rdi, rsi, rdx, rcx, r8, r9;
28	pushl %edi