- Remove mail/p5-Email-MIME-Creator, it has been folded into mail/p5-Email-MIME

- Remove mail/p5-Email-MIME-Modifier, it has been folded into mail/p5-Email-MIME
- Remove mail/p5-Email-Simple-Creator, it has been folded into mail/p5-Email-Simple
- Adjust dependencies

Reported by:	pointyhat
With hat:	portmgr

19 files changed, 10 insertions, 133 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 80037690d44d..ccc4c9112458 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -337,16 +337,13 @@
     SUBDIR += p5-Email-MIME-Attachment-Stripper
     SUBDIR += p5-Email-MIME-ContentType
     SUBDIR += p5-Email-MIME-CreateHTML
-    SUBDIR += p5-Email-MIME-Creator
     SUBDIR += p5-Email-MIME-Creator-ISO_2022_JP
     SUBDIR += p5-Email-MIME-Encodings
-    SUBDIR += p5-Email-MIME-Modifier
     SUBDIR += p5-Email-MessageID
     SUBDIR += p5-Email-Reply
     SUBDIR += p5-Email-Send
     SUBDIR += p5-Email-Sender
     SUBDIR += p5-Email-Simple
-    SUBDIR += p5-Email-Simple-Creator
     SUBDIR += p5-Email-Stuff
     SUBDIR += p5-Email-Valid
     SUBDIR += p5-Email-Valid-Loose
diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index 165ef90795b2..72048ee30621 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	assp
 PORTVERSION=	1.5.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/OldFiles
 DISTNAME=	${PORTNAME:U}_${PORTVERSION}-Install
@@ -115,7 +115,7 @@ RUN_DEPENDS+=	${SITE_PERL}/Net/SenderBase.pm:${PORTSDIR}/mail/p5-Net-SenderBase
 .endif
 
 .if !defined(WITHOUT_MIMEMOD)
-RUN_DEPENDS+=	${SITE_PERL}/Email/MIME/Modifier.pm:${PORTSDIR}/mail/p5-Email-MIME-Modifier
+RUN_DEPENDS+=	${SITE_PERL}/Email/MIME/Modifier.pm:${PORTSDIR}/mail/p5-Email-MIME
 .endif
 
 .if !defined(WITHOUT_SSL)
diff --git a/mail/p5-Email-MIME-Attachment-Stripper/Makefile b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
index 9917fb6d8b14..4f2f736062e1 100644
--- a/mail/p5-Email-MIME-Attachment-Stripper/Makefile
+++ b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Email-MIME-Attachment-Stripper
 PORTVERSION=	1.31.6
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -16,8 +17,7 @@ MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Strip the attachments from a mail
 
 RUN_DEPENDS=	p5-Email-MIME>=1.861:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-MIME-ContentType>=1.0:${PORTSDIR}/mail/p5-Email-MIME-ContentType \
-		p5-Email-MIME-Modifier>=1.442:${PORTSDIR}/mail/p5-Email-MIME-Modifier
+		p5-Email-MIME-ContentType>=1.0:${PORTSDIR}/mail/p5-Email-MIME-ContentType
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/mail/p5-Email-MIME-CreateHTML/Makefile b/mail/p5-Email-MIME-CreateHTML/Makefile
index 43158a6aec56..55f21e4be822 100644
--- a/mail/p5-Email-MIME-CreateHTML/Makefile
+++ b/mail/p5-Email-MIME-CreateHTML/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Email-MIME-CreateHTML
 PORTVERSION=	1.026
+PORTREVISION=	1
 CATEGORIES=	mail www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -16,7 +17,7 @@ COMMENT=	Multipart HTML Email builder
 
 BUILD_DEPENDS=	${SITE_PERL}/File/Slurp/WithinPolicy.pm:${PORTSDIR}/devel/p5-File-Policy \
 		p5-Data-Serializer>0:${PORTSDIR}/devel/p5-Data-Serializer \
-		p5-Email-MIME-Creator>0:${PORTSDIR}/mail/p5-Email-MIME-Creator \
+		p5-Email-MIME>0:${PORTSDIR}/mail/p5-Email-MIME \
 		p5-HTML-Tagset>0:${PORTSDIR}/www/p5-HTML-Tagset \
 		p5-HTML-TokeParser-Simple>0:${PORTSDIR}/www/p5-HTML-TokeParser-Simple \
 		p5-Log-Trace>0:${PORTSDIR}/devel/p5-Log-Trace \
diff --git a/mail/p5-Email-MIME-Creator/Makefile b/mail/p5-Email-MIME-Creator/Makefile
deleted file mode 100644
index 878e0ea651fd..000000000000
--- a/mail/p5-Email-MIME-Creator/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:	mail/p5-Email-MIME-Creator
-# Date created:				31 Ma 2006
-# Whom:					Hashi, Hiroaki <hashiz@tomba.meridiani.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Email-MIME-Creator
-PORTVERSION=	1.455
-CATEGORIES=	mail perl5
-MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	hashiz@tomba.meridiani.jp
-COMMENT=	Email::MIME constructor for starting anew
-
-BUILD_DEPENDS=	p5-Email-MIME>=1.82:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-MIME-Modifier>=1.440:${PORTSDIR}/mail/p5-Email-MIME-Modifier \
-		p5-Email-Simple>=1.92:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Email-Simple-Creator>=1.4:${PORTSDIR}/mail/p5-Email-Simple-Creator
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MAN3=	Email::MIME::Creator.3
-
-.include <bsd.port.mk>
diff --git a/mail/p5-Email-MIME-Creator/distinfo b/mail/p5-Email-MIME-Creator/distinfo
deleted file mode 100644
index dccbf8fff98e..000000000000
--- a/mail/p5-Email-MIME-Creator/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (Email-MIME-Creator-1.455.tar.gz) = 4dbaf20060158505b50d3851bd147982
-SHA256 (Email-MIME-Creator-1.455.tar.gz) = 9ee58ac5dfee2be52f8f16ddeb55067ab630a824b44230ded1587fd2104ff78c
-SIZE (Email-MIME-Creator-1.455.tar.gz) = 12535
diff --git a/mail/p5-Email-MIME-Creator/pkg-descr b/mail/p5-Email-MIME-Creator/pkg-descr
deleted file mode 100644
index 810a7ae9e936..000000000000
--- a/mail/p5-Email-MIME-Creator/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This software provides a constructor to Email::MIME for creating
-messages from scratch.
-
-WWW: http://search.cpan.org/dist/Email-MIME-Creator/
diff --git a/mail/p5-Email-MIME-Creator/pkg-plist b/mail/p5-Email-MIME-Creator/pkg-plist
deleted file mode 100644
index 692e5ad95eb4..000000000000
--- a/mail/p5-Email-MIME-Creator/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%SITE_PERL%%/Email/MIME/Creator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Creator/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Creator
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/MIME
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME-Modifier/Makefile b/mail/p5-Email-MIME-Modifier/Makefile
deleted file mode 100644
index badb1f23aeae..000000000000
--- a/mail/p5-Email-MIME-Modifier/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:	mail/p5-Email-MIME-Modifier
-# Date created:				27 December 2004
-# Whom:					Lars Thegler <lth@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Email-MIME-Modifier
-PORTVERSION=	1.444
-CATEGORIES=	mail perl5
-MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	lth@FreeBSD.org
-COMMENT=	Modify Email::MIME Objects Easily
-
-BUILD_DEPENDS=	p5-Email-MIME-Encodings>=1.313:${PORTSDIR}/mail/p5-Email-MIME-Encodings \
-		p5-Email-MIME>=1.82:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-MessageID>=1.2:${PORTSDIR}/mail/p5-Email-MessageID \
-		p5-Email-MIME-ContentType>=1.0:${PORTSDIR}/mail/p5-Email-MIME-ContentType \
-		p5-Email-Simple>=1.92:${PORTSDIR}/mail/p5-Email-Simple
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MAN3=	Email::MIME::Modifier.3
-
-.include <bsd.port.mk>
diff --git a/mail/p5-Email-MIME-Modifier/distinfo b/mail/p5-Email-MIME-Modifier/distinfo
deleted file mode 100644
index f9c6d3ed802e..000000000000
--- a/mail/p5-Email-MIME-Modifier/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (Email-MIME-Modifier-1.444.tar.gz) = 3f75aad8a6683a23075ced1ed0eb41e4
-SHA256 (Email-MIME-Modifier-1.444.tar.gz) = 4521cf361527cd9b5e8b0db3d2e6c9588c52de6a8997e1daf5c21ed1eb7a4ba2
-SIZE (Email-MIME-Modifier-1.444.tar.gz) = 7233
diff --git a/mail/p5-Email-MIME-Modifier/pkg-descr b/mail/p5-Email-MIME-Modifier/pkg-descr
deleted file mode 100644
index 71bd13d1ece2..000000000000
--- a/mail/p5-Email-MIME-Modifier/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Provides a number of useful methods for manipulating MIME messages.
-
-WWW: http://search.cpan.org/dist/Email-MIME-Modifier/
diff --git a/mail/p5-Email-MIME-Modifier/pkg-plist b/mail/p5-Email-MIME-Modifier/pkg-plist
deleted file mode 100644
index 9a21de7ff13d..000000000000
--- a/mail/p5-Email-MIME-Modifier/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%SITE_PERL%%/Email/MIME/Modifier.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Modifier/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Modifier
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/MIME
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME/Makefile b/mail/p5-Email-MIME/Makefile
index 4b5aad761c3c..976a71643ddb 100644
--- a/mail/p5-Email-MIME/Makefile
+++ b/mail/p5-Email-MIME/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Email-MIME
 PORTVERSION=	1.902
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,7 +16,6 @@ MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Easy MIME message parsing
 
 BUILD_DEPENDS=	p5-Email-Simple>=2.00.4:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Email-Simple-Creator>=0:${PORTSDIR}/mail/p5-Email-Simple-Creator \
 		p5-Email-MessageID>=0:${PORTSDIR}/mail/p5-Email-MessageID \
 		p5-Email-MIME-Encodings>=1.313:${PORTSDIR}/mail/p5-Email-MIME-Encodings \
 		p5-Email-MIME-ContentType>=1.01.1:${PORTSDIR}/mail/p5-Email-MIME-ContentType \
diff --git a/mail/p5-Email-Reply/Makefile b/mail/p5-Email-Reply/Makefile
index 8d275bb426c4..788a4d62cd16 100644
--- a/mail/p5-Email-Reply/Makefile
+++ b/mail/p5-Email-Reply/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Email-Reply
 PORTVERSION=	1.202
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -19,8 +20,7 @@ BUILD_DEPENDS=	p5-ExtUtils-MakeMaker>=0:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
 RUN_DEPENDS=	p5-Email-Abstract>=2.01:${PORTSDIR}/mail/p5-Email-Abstract \
 		p5-Email-Address>=1.80:${PORTSDIR}/mail/p5-Email-Address \
 		p5-Email-MIME>=1.82:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-MIME-Creator>=1.41:${PORTSDIR}/mail/p5-Email-MIME-Creator \
-		p5-Email-Simple-Creator>=1.4:${PORTSDIR}/mail/p5-Email-Simple-Creator
+		p5-Email-Simple>=2.100:${PORTSDIR}/mail/p5-Email-Simple
 
 PERL_CONFIGURE=	5.8.1+
 
diff --git a/mail/p5-Email-Simple-Creator/Makefile b/mail/p5-Email-Simple-Creator/Makefile
deleted file mode 100644
index f5c70410f432..000000000000
--- a/mail/p5-Email-Simple-Creator/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	p5-Email-Simple-Creator
-# Date created:				Jul 11 2004
-# Whom:					Lars Thegler <lth@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Email-Simple-Creator
-PORTVERSION=	1.424
-CATEGORIES=	mail perl5
-MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	perl@FreeBSD.org
-COMMENT=	A constructor to Email::Simple for creating messages from scratch
-
-BUILD_DEPENDS=	${SITE_PERL}/Email/Simple.pm:${PORTSDIR}/mail/p5-Email-Simple \
-		${SITE_PERL}/Email/Date.pm:${PORTSDIR}/mail/p5-Email-Date
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MAN3=		Email::Simple::Creator.3
-
-.include <bsd.port.mk>
diff --git a/mail/p5-Email-Simple-Creator/distinfo b/mail/p5-Email-Simple-Creator/distinfo
deleted file mode 100644
index 354936da1ea7..000000000000
--- a/mail/p5-Email-Simple-Creator/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (Email-Simple-Creator-1.424.tar.gz) = 423317f420cc64183d933db1cb15a8bb
-SHA256 (Email-Simple-Creator-1.424.tar.gz) = f0a25180b9f426a963b8581adc512ce7924d5b5b0d18ca0d7a4c319b952e219a
-SIZE (Email-Simple-Creator-1.424.tar.gz) = 11562
diff --git a/mail/p5-Email-Simple-Creator/pkg-descr b/mail/p5-Email-Simple-Creator/pkg-descr
deleted file mode 100644
index a316ce66070d..000000000000
--- a/mail/p5-Email-Simple-Creator/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This software provides a constructor to Email::Simple for creating
-messages from scratch.
-
-WWW: http://search.cpan.org/dist/Email-Simple-Creator/
diff --git a/mail/p5-Email-Simple-Creator/pkg-plist b/mail/p5-Email-Simple-Creator/pkg-plist
deleted file mode 100644
index b778ed6c92d8..000000000000
--- a/mail/p5-Email-Simple-Creator/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%SITE_PERL%%/Email/Simple/Creator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple/Creator/.packlist
-@dirrmtry %%SITE_PERL%%/Email/Simple
-@dirrmtry %%SITE_PERL%%/Email
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple/Creator
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
diff --git a/mail/p5-ZConf-Mail/Makefile b/mail/p5-ZConf-Mail/Makefile
index 42f81f6cdb75..6f1350cf416b 100644
--- a/mail/p5-ZConf-Mail/Makefile
+++ b/mail/p5-ZConf-Mail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ZConf-Mail
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/V/VV/VVELOX
@@ -17,7 +18,6 @@ COMMENT=	Misc mail client functions backed by ZConf
 
 RUN_DEPENDS=	${SITE_PERL}/Email/Simple.pm:${PORTSDIR}/mail/p5-Email-Simple \
 		${SITE_PERL}/ZConf.pm:${PORTSDIR}/net/p5-ZConf \
-		${SITE_PERL}/Email/Simple/Creator.pm:${PORTSDIR}/mail/p5-Email-Simple-Creator \
 		${SITE_PERL}/Mail/IMAPTalk.pm:${PORTSDIR}/mail/p5-Mail-IMAPTalk \
 		${SITE_PERL}/Mail/POP3Client.pm:${PORTSDIR}/mail/p5-Mail-POP3Client \
 		${SITE_PERL}/Net/SMTP_auth.pm:${PORTSDIR}/mail/p5-Net-SMTP_auth \