Index: mail/p5-Email-Address-UseXS/Makefile
===================================================================
--- /dev/null
+++ mail/p5-Email-Address-UseXS/Makefile
@@ -0,0 +1,20 @@
+# Created by: Dan Langille <dvl@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	Email-Address-UseXS
+PORTVERSION=	1.000
+CATEGORIES=	mail perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	dvl@FreeBSD.org
+COMMENT=	Ensure that any code uses Email::Address::XS instead of Email::Address
+
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+
+NO_ARCH=	yes
+USES=		perl5
+USE_PERL5=	configure
+
+.include <bsd.port.mk>
Index: mail/p5-Email-Address-UseXS/distinfo
===================================================================
--- /dev/null
+++ mail/p5-Email-Address-UseXS/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1544210127
+SHA256 (Email-Address-UseXS-1.000.tar.gz) = b10a52409a2c85b65afcd4ed108233833440d298689bb97a256c75b5b7802df0
+SIZE (Email-Address-UseXS-1.000.tar.gz) = 14040
Index: mail/p5-Email-Address-UseXS/pkg-descr
===================================================================
--- /dev/null
+++ mail/p5-Email-Address-UseXS/pkg-descr
@@ -0,0 +1,12 @@
+To use, simply add use Email::Address::UseXS; in your code before anything that
+tries to load in Email::Address.
+
+use Email::Address::UseXS;
+print Email::Address->parse('user@example.com');
+
+Email::Address is dangerous, badly-formed input can cause very slow regex
+expressions (taking minutes or more to run).
+
+See https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7686 for details.
+
+WWW: https://metacpan.org/pod/Email::Address::UseXS
Index: mail/p5-Email-Address-UseXS/pkg-plist
===================================================================
--- /dev/null
+++ mail/p5-Email-Address-UseXS/pkg-plist
@@ -0,0 +1,2 @@
+%%SITE_PERL%%/Email/Address/UseXS.pm
+%%PERL5_MAN3%%/Email::Address::UseXS.3.gz
Index: mail/p5-Email-Sender/Makefile
===================================================================
--- mail/p5-Email-Sender/Makefile
+++ mail/p5-Email-Sender/Makefile
@@ -4,8 +4,6 @@
 PORTNAME=	Email-Sender
 PORTVERSION=	1.300031
 CATEGORIES=	mail perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:RJBS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bill.brinzer@gmail.com
@@ -16,7 +14,8 @@
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Email-Abstract>=3.006:mail/p5-Email-Abstract \
-		p5-Email-Address>=0:mail/p5-Email-Address \
+		p5-Email-Address-UseXS>=0:mail/p5-Email-Address-UseXS \
+		p5-Email-Address-XS>=0:mail/p5-Email-Address-XS \
 		p5-Email-Simple>=1.998:mail/p5-Email-Simple \
 		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
 		p5-Module-Runtime>=0:devel/p5-Module-Runtime \