Index: head/mail/p5-Email-MIME/Makefile
===================================================================
--- head/mail/p5-Email-MIME/Makefile	(revision 439324)
+++ head/mail/p5-Email-MIME/Makefile	(revision 439325)
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	Email-MIME
 PORTVERSION=	1.940
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Easy MIME message parsing
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Email-Simple>=2.206:mail/p5-Email-Simple \
+BUILD_DEPENDS=	p5-Email-MIME-Encodings>=1.313:mail/p5-Email-MIME-Encodings \
+		p5-Email-MIME-ContentType>=1.016:mail/p5-Email-MIME-ContentType \
 		p5-Email-MessageID>=0:mail/p5-Email-MessageID \
-		p5-Email-MIME-Encodings>=1.313:mail/p5-Email-MIME-Encodings \
-		p5-Email-MIME-ContentType>=1.01.6:mail/p5-Email-MIME-ContentType \
+		p5-Email-Simple>=2.206:mail/p5-Email-Simple \
 		p5-MIME-Types>=1.13:mail/p5-MIME-Types
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
Index: head/mail/p5-Email-MIME-ContentType/Makefile
===================================================================
--- head/mail/p5-Email-MIME-ContentType/Makefile	(revision 439324)
+++ head/mail/p5-Email-MIME-ContentType/Makefile	(revision 439325)
@@ -1,17 +1,20 @@
 # $FreeBSD$
 
 PORTNAME=	Email-MIME-ContentType
-PORTVERSION=	1.01.7
-PORTREVISION=	1
+PORTVERSION=	1.018
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:C|\.([0-9])$|\1|}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse a MIME Content-Type Header
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
Index: head/mail/p5-Email-MIME-ContentType/distinfo
===================================================================
--- head/mail/p5-Email-MIME-ContentType/distinfo	(revision 439324)
+++ head/mail/p5-Email-MIME-ContentType/distinfo	(revision 439325)
@@ -1,2 +1,3 @@
-SHA256 (Email-MIME-ContentType-1.017.tar.gz) = 963da3b0446317e64ba3d41f0f59c05475e84fc49080130f6c2099474fa281b2
-SIZE (Email-MIME-ContentType-1.017.tar.gz) = 14300
+TIMESTAMP = 1492963717
+SHA256 (Email-MIME-ContentType-1.018.tar.gz) = 7508cd1227b8f150a403ca49658cb4a0892836dd8f01ff95f049957b2abf10f9
+SIZE (Email-MIME-ContentType-1.018.tar.gz) = 17195