summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorDmitry Morozovsky <marck@FreeBSD.org>2010-11-18 13:45:10 +0000
committerDmitry Morozovsky <marck@FreeBSD.org>2010-11-18 13:45:10 +0000
commitcd3d213b1913adb7ca560e3075b591b6b255f7f6 (patch)
tree033db97aa37a0fcdba05cdc94f6b49077caf4651 /sysutils
parentAdd devel/p5-Time-Out 0.11, an easy to use wrapper around alarm(3). (diff)
Add a knob to enable serial console (com1@115200), default to off.
Some cosmetics to make portlint a bit happier. Approved by: avg@ (maintainer)
Notes
Notes: svn path=/head/; revision=264767
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/memtest86+/Makefile10
-rw-r--r--sysutils/memtest86+/distinfo1
-rw-r--r--sysutils/memtest86+/files/extra-patch-config.h21
3 files changed, 29 insertions, 3 deletions
diff --git a/sysutils/memtest86+/Makefile b/sysutils/memtest86+/Makefile
index 183adc390f32..d1bb9a5c5bfe 100644
--- a/sysutils/memtest86+/Makefile
+++ b/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:
diff --git a/sysutils/memtest86+/distinfo b/sysutils/memtest86+/distinfo
index ebef5daa6376..f9a4c2004386 100644
--- a/sysutils/memtest86+/distinfo
+++ b/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
diff --git a/sysutils/memtest86+/files/extra-patch-config.h b/sysutils/memtest86+/files/extra-patch-config.h
new file mode 100644
index 000000000000..9033f592759e
--- /dev/null
+++ b/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