Index: head/sysutils/x86info/Makefile
===================================================================
--- head/sysutils/x86info/Makefile	(revision 479846)
+++ head/sysutils/x86info/Makefile	(revision 479847)
@@ -1,41 +1,41 @@
 # Created by: Erik Greenwald <erik@smluc.org>
 # $FreeBSD$
 
 PORTNAME=	x86info
-DISTVERSION=	1.31snap02
+DISTVERSION=	1.31snap03
 CATEGORIES=	sysutils
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ler@FreeBSD.org
 COMMENT=	x86 CPU identification and feature display utility
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpci.so:devel/libpci
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kernelslacker
-GH_TAGNAME=	b7d0839
+GH_TAGNAME=	1b41e8b
 
 USES=		gmake pkgconfig python:build
 
 PLIST_FILES=	bin/lsmsr bin/x86info man/man8/lsmsr.8.gz man/man1/x86info.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|python createheader.py|${PYTHON_CMD} createheader.py|' \
 		${WRKSRC}/lsmsr/Makefile
 
 do-build:
 	@cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS}
 	@cd ${WRKSRC}/lsmsr ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/x86info ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/lsmsr/lsmsr ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/x86info.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/lsmsr/lsmsr.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 
 .include <bsd.port.mk>
Index: head/sysutils/x86info/distinfo
===================================================================
--- head/sysutils/x86info/distinfo	(revision 479846)
+++ head/sysutils/x86info/distinfo	(revision 479847)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515691206
-SHA256 (kernelslacker-x86info-1.31snap02-b7d0839_GH0.tar.gz) = eda506bac6352ac3f0a2de26601fe98a399f055d52c65298a47e12ce5ef64677
-SIZE (kernelslacker-x86info-1.31snap02-b7d0839_GH0.tar.gz) = 85805
+TIMESTAMP = 1537051964
+SHA256 (kernelslacker-x86info-1.31snap03-1b41e8b_GH0.tar.gz) = a3fd00224315a07b9cc2009ea87d1c3f627795b818608149c1f257669ee441c9
+SIZE (kernelslacker-x86info-1.31snap03-1b41e8b_GH0.tar.gz) = 85780
Index: head/sysutils/x86info/files/patch-cpuid_freebsd.c
===================================================================
--- head/sysutils/x86info/files/patch-cpuid_freebsd.c	(revision 479846)
+++ head/sysutils/x86info/files/patch-cpuid_freebsd.c	(nonexistent)
@@ -1,25 +0,0 @@
---- cpuid-freebsd.c.orig	2017-09-06 10:17:13.000000000 -0600
-+++ cpuid-freebsd.c	2018-01-11 10:34:01.353720000 -0700
-@@ -39,7 +39,7 @@
- 	static int nodriver=0;
- 	char cpuname[20];
- 	int fh;
--	cpuctl_cpuid_args_t args;
-+	cpuctl_cpuid_count_args_t args;
- 
- 	if (nodriver == 1) {
- 		if (native_cpuid(CPU_number, idx, eax,ebx,ecx,edx))
-@@ -48,11 +48,12 @@
- 	}
- 
- 	args.level = idx;
-+	args.level_type = idx >> 32;
- 	/* Ok, use the /dev/CPU interface in preference to the _up code. */
- 	(void)snprintf(cpuname, sizeof(cpuname), "/dev/cpuctl%u", CPU_number);
- 	fh = open(cpuname, O_RDONLY);
- 	if (fh != -1) {
--		if (ioctl(fh, CPUCTL_CPUID, &args) != 0) {
-+		if (ioctl(fh, CPUCTL_CPUID_COUNT, &args) != 0) {
- 			perror(cpuname);
- 			exit(EXIT_FAILURE);
- 		}

Property changes on: head/sysutils/x86info/files/patch-cpuid_freebsd.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/x86info/files/patch-cpuid.c
===================================================================
--- head/sysutils/x86info/files/patch-cpuid.c	(revision 479846)
+++ head/sysutils/x86info/files/patch-cpuid.c	(nonexistent)
@@ -1,18 +0,0 @@
---- cpuid.c.orig	2017-09-06 10:17:13.000000000 -0600
-+++ cpuid.c	2018-01-11 10:34:12.018249000 -0700
-@@ -21,14 +21,7 @@
- {
- 	unsigned int a = 0, b = 0, c = 0, d = 0;
- 
--	if (eax != NULL)
--		a = *eax;
--	if (ebx != NULL)
--		b = *ebx;
--	if (ecx != NULL)
--		c = *ecx;
--	if (edx != NULL)
--		d = *edx;
-+	c = idx >> 32;
- 
- 	bind_cpu(cpunr);
- 

Property changes on: head/sysutils/x86info/files/patch-cpuid.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property