diff -urN /usr/ports/sysutils/memtest86+/Makefile memtest86+/Makefile
--- /usr/ports/sysutils/memtest86+/Makefile	2019-04-20 16:25:42.000000000 +0000
+++ memtest86+/Makefile	2020-05-02 07:55:29.986042000 +0000
@@ -2,8 +2,7 @@
 # $FreeBSD: head/sysutils/memtest86+/Makefile 499458 2019-04-20 16:25:42Z tobik $
 
 PORTNAME=	memtest86+
-PORTVERSION=	5.01
-PORTREVISION=	3
+PORTVERSION=	5.31b
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.memtest.org/download/${PORTVERSION}/
 
@@ -18,7 +17,7 @@
 ALL_TARGET=	all
 PORTDOCS=	*
 
-USE_GCC=	4.8
+USE_GCC=	9
 
 # Please provide absolute path below (cannot be root)
 BOOT_DIR?=	/boot/opt
diff -urN /usr/ports/sysutils/memtest86+/distinfo memtest86+/distinfo
--- /usr/ports/sysutils/memtest86+/distinfo	2016-09-30 11:40:44.000000000 +0000
+++ memtest86+/distinfo	2020-05-02 07:52:32.010614000 +0000
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465956443
-SHA256 (memtest86+-5.01.tar.gz) = 142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039
-SIZE (memtest86+-5.01.tar.gz) = 214877
+TIMESTAMP = 1588405952
+SHA256 (memtest86+-5.31b.tar.gz) = 7146ffb182c0eb324e216ec5db284ef4bd8296122cf45e1695eabd8320cb1f09
+SIZE (memtest86+-5.31b.tar.gz) = 227779
diff -urN /usr/ports/sysutils/memtest86+/files/patch-Makefile memtest86+/files/patch-Makefile
--- /usr/ports/sysutils/memtest86+/files/patch-Makefile	2016-09-30 11:40:44.000000000 +0000
+++ memtest86+/files/patch-Makefile	2020-05-02 07:54:56.115632000 +0000
@@ -1,12 +1,6 @@
---- Makefile.orig	2013-08-10 02:01:58 UTC
-+++ Makefile
-@@ -21,21 +21,20 @@ OBJS= head.o reloc.o main.o test.o init.
-       
- 
- all: clean memtest.bin memtest 
--		 scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
- 
- # Link it statically once so I know I don't have undefined
+--- Makefile.orig	2020-05-02 07:34:53.803925000 +0000
++++ Makefile	2020-05-02 07:39:31.301358000 +0000
+@@ -32,15 +32,15 @@
  # symbols and then link it dynamically so I have full
  # relocation information
  memtest_shared: $(OBJS) memtest_shared.lds Makefile
@@ -23,24 +17,14 @@
 -	$(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@
 +	$(LD) -s --oformat elf32-i386-freebsd -T memtest.lds -b binary memtest_shared.bin -o $@
  
- head.s: head.S config.h defs.h test.h
+ self_test : $(SELF_TEST_OBJS)
+ 	$(CC) $(SELF_TEST_CFLAGS) -o $@ $(SELF_TEST_OBJS)
+@@ -55,7 +55,7 @@
  	$(CC) -E -traditional $< -o $@
-@@ -47,7 +46,7 @@ setup.s: setup.S config.h defs.h
- 	$(CC) -E -traditional $< -o $@
  
  memtest.bin: memtest_shared.bin bootsect.o setup.o memtest.bin.lds
 -	$(LD) -T memtest.bin.lds bootsect.o setup.o -b binary \
 +	$(LD) --oformat elf32-i386-freebsd -T memtest.bin.lds bootsect.o setup.o -b binary \
  	memtest_shared.bin -o memtest.bin
  
- reloc.o: reloc.c
-@@ -67,8 +66,7 @@ clean:
- 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared \
- 		memtest_shared.bin memtest.iso
- 
--iso:
--	make all
-+iso:	all
- 	./makeiso.sh
- 
- install: all
+ self_test.o : self_test.c
diff -urN /usr/ports/sysutils/memtest86+/files/patch-test.c memtest86+/files/patch-test.c
--- /usr/ports/sysutils/memtest86+/files/patch-test.c	2016-09-30 11:40:44.000000000 +0000
+++ memtest86+/files/patch-test.c	2020-05-02 07:51:25.749300000 +0000
@@ -1,15 +1,15 @@
---- test.c.orig	2013-08-10 02:29:44 UTC
-+++ test.c
+--- test.c.orig	2020-05-02 07:40:33.395621000 +0000
++++ test.c	2020-05-02 07:43:36.559375000 +0000
 @@ -14,7 +14,6 @@
  #include "stdint.h"
  #include "cpuid.h"
  #include "smp.h"
--#include <sys/io.h>
+-#include "io.h"
  
  extern struct cpu_ident cpu_id;
  extern volatile int    mstr_cpu;
-@@ -1543,6 +1542,19 @@ void sleep(long n, int flag, int me, int
- 	}
+@@ -1521,6 +1520,19 @@
+     }
  }
  
 +static inline unsigned char inb(unsigned int port)
@@ -25,29 +25,30 @@
 +        asm __volatile__("outb %0,%1" : : "a" (data), "id" ((unsigned short)(port)));
 +}
 +
- /* Beep function */
- 
  void beep(unsigned int frequency)
-@@ -1551,18 +1563,18 @@ void beep(unsigned int frequency)
- 	unsigned int count = 1193180 / frequency;
+ {
+ #if 0
+@@ -1531,19 +1543,19 @@
+     unsigned int count = 1193180 / frequency;
  
- 	// Switch on the speaker
--	outb_p(inb_p(0x61)|3, 0x61);
-+	outb(inb(0x61)|3, 0x61);
+     // Switch on the speaker
+-    outb_p(inb_p(0x61)|3, 0x61);
++    outb(inb(0x61)|3, 0x61);
  
- 	// Set command for counter 2, 2 byte write
--	outb_p(0xB6, 0x43);
-+	outb(0xB6, 0x43);
+     // Set command for counter 2, 2 byte write
+-    outb_p(0xB6, 0x43);
++    outb(0xB6, 0x43);
  
- 	// Select desired Hz
--	outb_p(count & 0xff, 0x42);
-+	outb(count & 0xff, 0x42);
- 	outb((count >> 8) & 0xff, 0x42);
+     // Select desired Hz
+-    outb_p(count & 0xff, 0x42);
++    outb(count & 0xff, 0x42);
+     outb((count >> 8) & 0xff, 0x42);
  
- 	// Block for 100 microseconds
- 	sleep(100, 0, 0, 1);
+     // Block for 100 microseconds
+     sleep(100, 0, 0, 1);
  
- 	// Switch off the speaker
--	outb(inb_p(0x61)&0xFC, 0x61);
-+	outb(inb(0x61)&0xFC, 0x61);
+     // Switch off the speaker
+-    outb(inb_p(0x61)&0xFC, 0x61);
++    outb(inb(0x61)&0xFC, 0x61);
+ #endif
  }