Attachment #121237 for bug #164167

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




#

PORTNAME=	x86info
PORTVERSION=	1.30
PORTREVISION=	0
CATEGORIES=	sysutils
MASTER_SITES=	http://codemonkey.org.uk/projects/x86info/%SUBDIR%/
MASTER_SITE_SUBDIR=	. old
EXTRACT_SUFX=	.tgz

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Utility to display information about the systems x86 processor(s)

LICENSE=	GPLv2

ONLY_FOR_ARCHS=	i386 amd64

LIB_DEPENDS=	pci.3:${PORTSDIR}/devel/libpci

USE_GMAKE=	yes
USE_PYTHON_BUILD=	yes
USE_GNOME=	pkgconfig
USE_PYTHON_BUILD=yes
USE_GMAKE=	yes
ALL_TARGET=	x86info lsmsr
ONLY_FOR_ARCHS=	i386 amd64
PLIST_FILES=	bin/x86info bin/lsmsr
MAKE_JOBS_SAFE=	yes

MAN1=		x86info.1
MAN8=		lsmsr.8
PLIST_FILES=	bin/lsmsr bin/x86info

post-patch:
	@${REINPLACE_CMD} -e \
		'/^CFLAGS/s| =| +=|g ; \
		 /^CFLAGS/s| -g|| ; \
		 /^CFLAGS/s| -O2|| ; \
		 /^CFLAGS/s| -Werror|| ; \
		 /^CC/s| =| ?=|' ${WRKSRC}/Makefile

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 701102
BUILD_DEPENDS+=	${LOCALBASE}/include/cpu.h:${PORTSDIR}/sysutils/devcpu
CFLAGS+=	-I${LOCALBASE}/include
.endif

do-install:

Lines 1-2 Link Here

(-)sysutils/x86info/distinfo (-2 / +2 lines)
1	SHA256 (x86info-1.29.tgz) = 9f9a36717af60194fcab2eee39f24a1fa5a01d50b848149da3b63ed39161555c	1	SHA256 (x86info-1.30.tgz) = fe3009850e93a9c5fa38ed6bf74d72686043329fead8f1b2be4b5943d4fc9428
2	SIZE (x86info-1.29.tgz) = 87526	2	SIZE (x86info-1.30.tgz) = 95727

Lines 1-11 Link Here

(-)sysutils/x86info/files/patch-features.c (-11 lines)
1	--- features.c.orig 2011-09-16 16:57:57.000000000 -0700
2	+++ features.c 2011-09-16 16:58:06.000000000 -0700
3	@@ -469,7 +469,7 @@
4	died = sigsetjmp(out, 1);
5
6	if (!died)
7	- asm volatile("nopl 0(%eax)");
8	+ asm volatile(".byte 0x0f,0x1f,0x00 /* nopl 0(%eax) */");
9
10	printf("Long NOPs supported: %s\n", died ? "no" : "yes");
11	}

Return to bug 164167

Lines 6-41 Link Here

(-)sysutils/x86info/Makefile (-13 / +21 lines)
6	#	6	#
7		7
8	PORTNAME= x86info	8	PORTNAME= x86info
9	PORTVERSION= 1.29	9	PORTVERSION= 1.30
10	PORTREVISION= 0
11	CATEGORIES= sysutils	10	CATEGORIES= sysutils
12	MASTER_SITES= http://codemonkey.org.uk/projects/x86info/ \	11	MASTER_SITES= http://codemonkey.org.uk/projects/x86info/%SUBDIR%/
13	http://codemonkey.org.uk/projects/x86info/old/	12	MASTER_SITE_SUBDIR= . old
14	EXTRACT_SUFX= .tgz	13	EXTRACT_SUFX= .tgz
15		14
16	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
17	COMMENT= Utility to display information about the systems x86 processor(s)	16	COMMENT= Utility to display information about the systems x86 processor(s)
18		17
		18	LICENSE= GPLv2
		19
		20	ONLY_FOR_ARCHS= i386 amd64
		21
19	LIB_DEPENDS= pci.3:${PORTSDIR}/devel/libpci	22	LIB_DEPENDS= pci.3:${PORTSDIR}/devel/libpci
20		23
21	USE_GMAKE= yes
22	USE_PYTHON_BUILD= yes
23	USE_GNOME= pkgconfig	24	USE_GNOME= pkgconfig
24	LICENSE= GPLv2	25	USE_PYTHON_BUILD=yes
		26	USE_GMAKE= yes
25	ALL_TARGET= x86info lsmsr	27	ALL_TARGET= x86info lsmsr
26	ONLY_FOR_ARCHS= i386 amd64
27	PLIST_FILES= bin/x86info bin/lsmsr
28	MAKE_JOBS_SAFE= yes	28	MAKE_JOBS_SAFE= yes
29	MAN1= x86info.1	29
30	MAN8= lsmsr.8	30	MAN1= x86info.1
		31	MAN8= lsmsr.8
		32	PLIST_FILES= bin/lsmsr bin/x86info
31		33
32	post-patch:	34	post-patch:
33	${REINPLACE_CMD} -E -e 's,-g -O2,${CFLAGS},g' ${WRKSRC}/Makefile	35	@${REINPLACE_CMD} -e \
		36	'/^CFLAGS/s\| =\| +=\|g ; \
		37	/^CFLAGS/s\| -g\|\| ; \
		38	/^CFLAGS/s\| -O2\|\| ; \
		39	/^CFLAGS/s\| -Werror\|\| ; \
		40	/^CC/s\| =\| ?=\|' ${WRKSRC}/Makefile
34		41
35	.include <bsd.port.pre.mk>	42	.include <bsd.port.pre.mk>
		43
36	.if ${OSVERSION} < 701102	44	.if ${OSVERSION} < 701102
37	BUILD_DEPENDS+= ${LOCALBASE}/include/cpu.h:${PORTSDIR}/sysutils/devcpu	45	BUILD_DEPENDS+= ${LOCALBASE}/include/cpu.h:${PORTSDIR}/sysutils/devcpu
38	CFLAGS+= -I"${LOCALBASE}"/include	46	CFLAGS+= -I${LOCALBASE}/include
39	.endif	47	.endif
40		48
41	do-install:	49	do-install: