sysutils/memtest86: update to 4.3.7

While here, add options for image types and assign maintainer to
submitter

PR:		237658
Submitted by:	Nuno Teixeira <ed.arrakis@gmail.com>

5 files changed, 56 insertions, 26 deletions

diff --git a/sysutils/memtest86/Makefile b/sysutils/memtest86/Makefile
index db00adce210a..4bef8eaa67b7 100644
--- a/sysutils/memtest86/Makefile
+++ b/sysutils/memtest86/Makefile
@@ -2,35 +2,46 @@
 # $FreeBSD$
 
 PORTNAME=	memtest86
-PORTVERSION=	4.0b
+PORTVERSION=	4.3.7
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.memtest86.com/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/s/}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}.iso.zip
+MASTER_SITES=	https://www.memtest86.com/downloads/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ed.arrakis@gmail.com
 COMMENT=	Stand alone memory test for x86 architecture computers
 
-ONLY_FOR_ARCHS=	i386
+NO_WRKSUBDIR=	yes
 
+NO_ARCH=	yes
 NO_BUILD=	yes
-ISO=		Memtest86_${PORTVERSION:S/b/s/}.iso
-ISODEST=	Memtest86_${PORTVERSION:S/b//}.iso
 
-PORTDOCS=	README
-PLIST_FILES=	%%DATADIR%%/floppy.bin \
-		%%DATADIR%%/${ISODEST}
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_MULTI=	IMAGE
+OPTIONS_MULTI_IMAGE=	USB CD-ROM FLOPPY
+OPTIONS_DEFAULT=	USB
+OPTIONS_SUB=	yes
+
+IMAGE_DESC=	Image selection
+
+USB_DESC=	Image for creating bootable USB Drive
+USB_DISTFILES=	${DISTNAME}-usb${EXTRACT_SUFX}
+
+CD-ROM_DESC=	Image for creating bootable CD-ROM Drive
+CD-ROM_DISTFILES=	${DISTNAME}-iso${EXTRACT_SUFX}
+
+FLOPPY_DESC=	Image for creating bootable Floppy Drive
+FLOPPY_DISTFILES=	${DISTNAME}-floppy${EXTRACT_SUFX}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/precomp.bin ${STAGEDIR}${DATADIR}/floppy.bin
-	${INSTALL_DATA} ${WRKDIR}/${ISO} ${STAGEDIR}${DATADIR}/${ISODEST}
-.for i in ${PORTDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
+
+do-install-USB-on:
+	${INSTALL_DATA} ${WRKSRC}/memtest86-usb.img ${STAGEDIR}${DATADIR}
+
+do-install-CD-ROM-on:
+	${INSTALL_DATA} ${WRKSRC}/Memtest86-4.3.7.iso ${STAGEDIR}${DATADIR}/memtest86-cdrom.iso
+
+do-install-FLOPPY-on:
+	${INSTALL_DATA} ${WRKSRC}/memtest86-floppy.img ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/memtest86/distinfo b/sysutils/memtest86/distinfo
index 6129b050a201..0688b80bd473 100644
--- a/sysutils/memtest86/distinfo
+++ b/sysutils/memtest86/distinfo
@@ -1,4 +1,7 @@
-SHA256 (memtest86-4.0s.tar.gz) = 05270483eef83683ede190750951387c4a7173568f5c8d7b82bb06824836cb79
-SIZE (memtest86-4.0s.tar.gz) = 157262
-SHA256 (memtest86-4.0s.iso.zip) = b3741456fd006bd1903b3a99f1e44966bf1421deb91343b8c64b8bc37dcec8bc
-SIZE (memtest86-4.0s.iso.zip) = 773918
+TIMESTAMP = 1556536139
+SHA256 (memtest86-4.3.7-iso.tar.gz) = 514860e6687c6b829267ece45a8d72e870e52f4d6d56e6c812a29a2d644d3c03
+SIZE (memtest86-4.3.7-iso.tar.gz) = 426736
+SHA256 (memtest86-4.3.7-floppy.tar.gz) = efcc70bdad10b9d66eb3fae2c9d98a459a37df2d6402032adbe04ae2755c3ab1
+SIZE (memtest86-4.3.7-floppy.tar.gz) = 423271
+SHA256 (memtest86-4.3.7-usb.tar.gz) = 1ed05c97786a102d6e55de02f5724c6bcf3e50e2558afb0dfaf255ed57a1e38b
+SIZE (memtest86-4.3.7-usb.tar.gz) = 424433
diff --git a/sysutils/memtest86/files/pkg-message.in b/sysutils/memtest86/files/pkg-message.in
index 8205d411c35e..47f40c82338a 100644
--- a/sysutils/memtest86/files/pkg-message.in
+++ b/sysutils/memtest86/files/pkg-message.in
@@ -1,7 +1,19 @@
 *
 * Usage:
 *
+* USB:
+* 1) Insert memstick
+* 2)	dd if=%%DATADIR%%/memtest86-usb.img \
+	of=/dev/daN bs=1m conv=sync
+* 3) Boot the memstick
+*
+* CD-ROM:
+* 1) Insert blank cd-rom
+* 2)	cdrecord dev=<device> %%DATADIR%%/memtest86-cdrom.iso
+* 3) Boot the memstick
+*
+* FLOPPY:
 * 1) Insert blank floppy
-* 2) dd if=%%DATADIR%%/floppy.bin of=/dev/fd0
+* 2)	dd if=%%DATADIR%%/memtest86-floppy.img of=/dev/fd0
 * 3) Boot the floppy
 *
diff --git a/sysutils/memtest86/pkg-descr b/sysutils/memtest86/pkg-descr
index 2c27b9f98ef0..9f35b7bc2a36 100644
--- a/sysutils/memtest86/pkg-descr
+++ b/sysutils/memtest86/pkg-descr
@@ -1,7 +1,8 @@
 Memtest86 - A Stand-alone Memory Diagnostic
 
-Memtest86 is thorough, stand alone memory test for x86 architecture computers.
-BIOS based memory tests are a quick, cursory check and often miss many of the
-failures that are detected by Memtest86.
+MemTest86 is the original, free, stand alone memory testing software for
+x86 computers. MemTest86 boots from a USB flash drive and tests the RAM
+in your computer for faults using a series of comprehensive algorithms and
+test patterns.
 
 WWW: http://www.memtest86.com/
diff --git a/sysutils/memtest86/pkg-plist b/sysutils/memtest86/pkg-plist
new file mode 100644
index 000000000000..afd5d5693486
--- /dev/null
+++ b/sysutils/memtest86/pkg-plist
@@ -0,0 +1,3 @@
+%%CD-ROM%%%%DATADIR%%/memtest86-cdrom.iso
+%%FLOPPY%%%%DATADIR%%/memtest86-floppy.img
+%%USB%%%%DATADIR%%/memtest86-usb.img