Index: branches/2018Q4/mail/heirloom-mailx/Makefile
===================================================================
--- branches/2018Q4/mail/heirloom-mailx/Makefile	(revision 483783)
+++ branches/2018Q4/mail/heirloom-mailx/Makefile	(revision 483784)
@@ -1,46 +1,47 @@
 # $FreeBSD$
 
 PORTNAME=	mailx
 PORTVERSION=	12.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/heirloom/heirloom-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	heirloom-
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	BSD mail utility with MIME, IMAP, POP3, SMTP, and S/MIME extensions
 
 LICENSE=	BSD4CLAUSE
 
 OPTIONS_DEFINE=	IPV6 DOCS
 
 CONFLICTS=	mailx-[0-9]*
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		iconv localbase ssl tar:bzip2
+CPPFLAGS+=	-DOPENSSL_NO_SSL2
 MAKE_ARGS=	PREFIX="${PREFIX}" \
 		SYSCONFDIR="${PREFIX}/etc" \
 		SENDMAIL="/usr/sbin/sendmail" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
 PORTDOCS=	AUTHORS COPYING ChangeLog README TODO
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIPV6}
 MAKE_ARGS+=	IPv6="-DHAVE_IPv6_FUNCS"
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/nail.rc ${STAGEDIR}${PREFIX}/etc/nail.rc.sample
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.mk>
Index: branches/2018Q4/mail/heirloom-mailx/files/patch-mailx.1
===================================================================
--- branches/2018Q4/mail/heirloom-mailx/files/patch-mailx.1	(nonexistent)
+++ branches/2018Q4/mail/heirloom-mailx/files/patch-mailx.1	(revision 483784)
@@ -0,0 +1,14 @@
+--- mailx.1.orig	2007-10-01 06:00:39.000000000 -0700
++++ mailx.1	2018-10-14 19:36:55.360353000 -0700
+@@ -2683,11 +2683,6 @@
+ to verify SSL/TLS server certificates.
+ Only applicable if SSL/TLS support is built using OpenSSL.
+ .TP
+-.B ssl-v2-allow
+-Accept SSLv2 connections.
+-These are normally not allowed
+-because this protocol version is insecure.
+-.TP
+ .B stealthmua
+ Inhibits the generation of
+ the \fI`Message-Id:'\fR and \fI`User-Agent:'\fR

Property changes on: branches/2018Q4/mail/heirloom-mailx/files/patch-mailx.1
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q4/mail/heirloom-mailx/files/patch-mailx.1.html
===================================================================
--- branches/2018Q4/mail/heirloom-mailx/files/patch-mailx.1.html	(nonexistent)
+++ branches/2018Q4/mail/heirloom-mailx/files/patch-mailx.1.html	(revision 483784)
@@ -0,0 +1,15 @@
+--- mailx.1.html.orig	2008-07-28 15:33:37.000000000 -0700
++++ mailx.1.html	2018-10-14 19:38:44.077272000 -0700
+@@ -2953,12 +2953,6 @@
+ Only applicable if SSL/TLS support is built using OpenSSL.
+ </TD></TR>
+ <TR valign=top><TD colspan=2>
+-<B>ssl-v2-allow</B> </TD></TR><TR valign=top><TD width=6%>&nbsp;</TD><TD>
+-Accept SSLv2 connections.
+-These are normally not allowed
+-because this protocol version is insecure.
+-</TD></TR>
+-<TR valign=top><TD colspan=2>
+ <B>stealthmua</B> </TD></TR><TR valign=top><TD width=6%>&nbsp;</TD><TD>
+ Inhibits the generation of
+ the <I>&#39;Message-Id:&#39;</I> and <I>&#39;User-Agent:&#39;</I>

Property changes on: branches/2018Q4/mail/heirloom-mailx/files/patch-mailx.1.html
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q4
===================================================================
--- branches/2018Q4	(revision 483783)
+++ branches/2018Q4	(revision 483784)

Property changes on: branches/2018Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r482131