Add a knob to enable serial console (com1@115200), default to off.

Some cosmetics to make portlint a bit happier.

Approved by:	avg@ (maintainer)

sysutils/memtest86+/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	memtest86+
 PORTVERSION=	4.10
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.memtest.org/download/${PORTVERSION}/
 
@@ -24,7 +25,8 @@ PORTDOCS=	*
 BOOT_DIR?=	/boot/opt
 
 OPTIONS=	ISO	"Build bootable ISO image"			off \
-		BOOT	"Build ELF image loadable by boot2 and loader"	on
+		BOOT	"Build ELF image loadable by boot2 and loader"	on \
+		SERIAL	"Enable serial console at COM1/115200"		off
 
 .include <bsd.port.pre.mk>
 
@@ -42,8 +44,12 @@ USE_CDRTOOLS=	yes
 ALL_TARGET+=	iso
 .endif
 
+.if defined(WITH_SERIAL)
+EXTRA_PATCHES+=	${PATCHDIR}//extra-patch-config.h
+.endif
+
 .if ${OSVERSION} < 700042
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Makefile
 .endif
 
 pre-fetch:

sysutils/memtest86+/distinfo

@@ -1,3 +1,2 @@
-MD5 (memtest86+-4.10.tar.gz) = 2144f21d4489a04149b1891b8d97e8fc
 SHA256 (memtest86+-4.10.tar.gz) = f81935088726e75c0faab9fcf6ab08b73829b509db8d72f920a532b74f15aa4f
 SIZE (memtest86+-4.10.tar.gz) = 205077

sysutils/memtest86+/files/extra-patch-config.h

@@ -0,0 +1,21 @@
+
+$FreeBSD$
+
+--- config.h.orig
++++ config.h
+@@ -13,13 +13,13 @@
+ /* SERIAL_CONSOLE_DEFAULT -  The default state of the serial console. */
+ /*	This is normally off since it slows down testing.  Change to a 1 */
+ /*	to enable. */
+-#define SERIAL_CONSOLE_DEFAULT 0
++#define SERIAL_CONSOLE_DEFAULT 1
+ 
+ /* SERIAL_TTY - The default serial port to use. 0=ttyS0, 1=ttyS1 */ 
+ #define SERIAL_TTY 0
+ 
+ /* SERIAL_BAUD_RATE - Baud rate for the serial console */
+-#define SERIAL_BAUD_RATE 9600
++#define SERIAL_BAUD_RATE 115200
+ 
+ /* BEEP_MODE - Beep on error. Default off, Change to 1 to enable */
+ #define BEEP_MODE 0