diff -urN /usr/ports/sysutils/x86info/Makefile sysutils/x86info/Makefile
--- /usr/ports/sysutils/x86info/Makefile	2011-10-24 18:56:51.000000000 +0900
+++ sysutils/x86info/Makefile	2011-12-19 03:41:18.000000000 +0900
@@ -6,36 +6,44 @@
 #
 
 PORTNAME=	x86info
-PORTVERSION=	1.29
-PORTREVISION=	0
+PORTVERSION=	1.30
 CATEGORIES=	sysutils
-MASTER_SITES=	http://codemonkey.org.uk/projects/x86info/ \
-		http://codemonkey.org.uk/projects/x86info/old/
+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
-LICENSE=	GPLv2
+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
+
+MAN1=		x86info.1
+MAN8=		lsmsr.8
+PLIST_FILES=	bin/lsmsr bin/x86info
 
 post-patch:
-	${REINPLACE_CMD} -E -e 's,-g -O2,${CFLAGS},g' ${WRKSRC}/Makefile
+	@${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
+CFLAGS+=	-I${LOCALBASE}/include
 .endif
 
 do-install:
diff -urN /usr/ports/sysutils/x86info/distinfo sysutils/x86info/distinfo
--- /usr/ports/sysutils/x86info/distinfo	2011-09-16 19:57:00.000000000 +0900
+++ sysutils/x86info/distinfo	2011-12-19 03:17:30.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (x86info-1.29.tgz) = 9f9a36717af60194fcab2eee39f24a1fa5a01d50b848149da3b63ed39161555c
-SIZE (x86info-1.29.tgz) = 87526
+SHA256 (x86info-1.30.tgz) = fe3009850e93a9c5fa38ed6bf74d72686043329fead8f1b2be4b5943d4fc9428
+SIZE (x86info-1.30.tgz) = 95727
diff -urN /usr/ports/sysutils/x86info/files/patch-features.c sysutils/x86info/files/patch-features.c
--- /usr/ports/sysutils/x86info/files/patch-features.c	2011-09-17 08:59:30.000000000 +0900
+++ sysutils/x86info/files/patch-features.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- features.c.orig	2011-09-16 16:57:57.000000000 -0700
-+++ features.c	2011-09-16 16:58:06.000000000 -0700
-@@ -469,7 +469,7 @@
- 	died = sigsetjmp(out, 1);
- 
- 	if (!died)
--		asm volatile("nopl 0(%eax)");
-+		asm volatile(".byte 0x0f,0x1f,0x00 /* nopl 0(%eax) */");
- 
- 	printf("Long NOPs supported: %s\n", died ? "no" : "yes");
- }