Index: head/mail/p5-Email-Folder/Makefile
===================================================================
--- head/mail/p5-Email-Folder/Makefile	(revision 458324)
+++ head/mail/p5-Email-Folder/Makefile	(revision 458325)
@@ -1,25 +1,25 @@
 # Created by: Lars Thegler <lars@thegler.dk>
 # $FreeBSD$
 
 PORTNAME=	Email-Folder
 PORTVERSION=	0.860
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Read all the messages from a folder as Email::Simple objects
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Email-FolderType>=0.6:mail/p5-Email-FolderType \
+BUILD_DEPENDS=	p5-Email-FolderType>=0.600:mail/p5-Email-FolderType \
 		p5-Email-Simple>=0:mail/p5-Email-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
Index: head/mail/p5-Email-FolderType/Makefile
===================================================================
--- head/mail/p5-Email-FolderType/Makefile	(revision 458324)
+++ head/mail/p5-Email-FolderType/Makefile	(revision 458325)
@@ -1,26 +1,25 @@
 # Created by: Lars Thegler <lars@thegler.dk>
 # $FreeBSD$
 
 PORTNAME=	Email-FolderType
-PORTVERSION=	0.8.14
+PORTVERSION=	0.814
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Determine the type of a mail folder
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	p5-Module-Pluggable>0:devel/p5-Module-Pluggable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Capture-Tiny>0:devel/p5-Capture-Tiny
 
 NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
Index: head/mail/p5-Email-FolderType-Net/Makefile
===================================================================
--- head/mail/p5-Email-FolderType-Net/Makefile	(revision 458324)
+++ head/mail/p5-Email-FolderType-Net/Makefile	(revision 458325)
@@ -1,25 +1,25 @@
 # Created by: Lars Thegler <lth@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	Email-FolderType-Net
 PORTVERSION=	1.043
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Recognize folder types for network based message protocols
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Email-FolderType>=0.8:mail/p5-Email-FolderType \
+BUILD_DEPENDS=	p5-Email-FolderType>=0.800:mail/p5-Email-FolderType \
 		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>