8 files changed, 11 insertions, 23 deletions

diff --git a/mail/p5-Mail-Mbox-MessageParser/Makefile b/mail/p5-Mail-Mbox-MessageParser/Makefile
index 3af825e90474..edd0b7a1d47c 100644
--- a/mail/p5-Mail-Mbox-MessageParser/Makefile
+++ b/mail/p5-Mail-Mbox-MessageParser/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Mail-Mbox-MessageParser
 PORTVERSION=	1.5002
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,8 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A fast and simple mbox folder reader
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
-		${SITE_PERL}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff \
+BUILD_DEPENDS=	${SITE_PERL}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff \
 		${SITE_PERL}/FileHandle/Unget.pm:${PORTSDIR}/devel/p5-FileHandle-Unget
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/mail/p5-Mail-MboxParser/Makefile b/mail/p5-Mail-MboxParser/Makefile
index f2abe093fbc0..c1012f14ae90 100644
--- a/mail/p5-Mail-MboxParser/Makefile
+++ b/mail/p5-Mail-MboxParser/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Mail-MboxParser
 PORTVERSION=	0.55
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,8 +16,6 @@ MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A module for working with UNIX-flavoured mailboxes
 
 BUILD_DEPENDS=	${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-		${SITE_PERL}//${PERL_ARCH}/MIME/QuotedPrint.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
-		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
 		${SITE_PERL}/Mail/Mbox/MessageParser.pm:${PORTSDIR}/mail/p5-Mail-Mbox-MessageParser
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/mail/p5-Mail-SRS/Makefile b/mail/p5-Mail-SRS/Makefile
index 03de12abe61a..cba632c24cee 100644
--- a/mail/p5-Mail-SRS/Makefile
+++ b/mail/p5-Mail-SRS/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Mail-SRS
 PORTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,9 +16,7 @@ MAINTAINER=	chifeng@gmail.com
 COMMENT=	Sender Rewriting Scheme
 
 BUILD_DEPENDS=	${SITE_PERL}/Digest/HMAC_SHA1.pm:${PORTSDIR}/security/p5-Digest-HMAC \
-		${SITE_PERL}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM \
-		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
-		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+		${SITE_PERL}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 MAN3=	Mail::SRS.3 \
diff --git a/mail/p5-Net-SMTP_auth/Makefile b/mail/p5-Net-SMTP_auth/Makefile
index c3efc9faed75..d29ab1af97af 100644
--- a/mail/p5-Net-SMTP_auth/Makefile
+++ b/mail/p5-Net-SMTP_auth/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Simple Mail Transfer Protocol Client with AUTHentication
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
-		${SITE_PERL}/Authen/SASL.pm:${PORTSDIR}/security/p5-Authen-SASL \
+BUILD_DEPENDS=	${SITE_PERL}/Authen/SASL.pm:${PORTSDIR}/security/p5-Authen-SASL \
 		${SITE_PERL}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-HMAC
 
 PERL_CONFIGURE=	yes
diff --git a/mail/p5-ZConf-Mail/Makefile b/mail/p5-ZConf-Mail/Makefile
index 6f1350cf416b..c8916f1c2268 100644
--- a/mail/p5-ZConf-Mail/Makefile
+++ b/mail/p5-ZConf-Mail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ZConf-Mail
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/V/VV/VVELOX
@@ -25,10 +25,9 @@ RUN_DEPENDS=	${SITE_PERL}/Email/Simple.pm:${PORTSDIR}/mail/p5-Email-Simple \
 		${SITE_PERL}/Mail/Box.pm:${PORTSDIR}/mail/p5-Mail-Box \
 		${SITE_PERL}/Curses/UI.pm:${PORTSDIR}/devel/p5-Curses-UI \
 		${SITE_PERL}/IO/MultiPipe.pm:${PORTSDIR}/devel/p5-IO-MultiPipe \
-    		${SITE_PERL}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite \
+		${SITE_PERL}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite \
 		${SITE_PERL}/File/MimeInfo/Magic.pm:${PORTSDIR}/devel/p5-File-MimeInfo \
 		${SITE_PERL}/Email/Date.pm:${PORTSDIR}/mail/p5-Email-Date \
-		${SITE_PERL}/mach/MIME/QuotedPrint.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		${SITE_PERL}/ZConf/GUI.pm:${PORTSDIR}/devel/p5-ZConf-GUI \
 		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
 		${SITE_PERL}/Mail/Cache.pm:${PORTSDIR}/mail/p5-Mail-Cache \
diff --git a/mail/qmail-scanner/Makefile b/mail/qmail-scanner/Makefile
index 24bf291f5622..96af0a5e3637 100644
--- a/mail/qmail-scanner/Makefile
+++ b/mail/qmail-scanner/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmail-scanner
 PORTVERSION=	2.01
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail security
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
@@ -17,13 +17,9 @@ COMMENT=	Content/Anti-virus Scanner for qmail
 
 RUN_DEPENDS+=	reformime:${PORTSDIR}/mail/maildrop \
 		unzip:${PORTSDIR}/archivers/unzip \
-		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
-		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		setuidgid:${PORTSDIR}/sysutils/daemontools
 BUILD_DEPENDS+=	reformime:${PORTSDIR}/mail/maildrop \
 		unzip:${PORTSDIR}/archivers/unzip \
-		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
-		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		setuidgid:${PORTSDIR}/sysutils/daemontools
 
 CONFLICTS=	qmail-scanner-1.*
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 546d6cdf3549..3020819db41e 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sympa
 PORTVERSION?=	4.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES?=	http://www.sympa.org/distribution/old/
 
@@ -17,14 +17,10 @@ COMMENT?=	Sympa is an electronic mailing list manager
 BUILD_DEPENDS+=	${SITE_PERL}/Mail/Mailer.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
 		${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
-		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
 		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
 		${SITE_PERL}/Crypt/CipherSaber.pm:${PORTSDIR}/security/p5-Crypt-CipherSaber \
 		${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap \
 		${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB \
-		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		${SITE_PERL}/${PERL_ARCH}/Locale/Msgcat.pm:${PORTSDIR}/misc/p5-Locale-Msgcat \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
diff --git a/mail/vodmr/Makefile b/mail/vodmr/Makefile
index 4da89b6f2728..016dc1cdb5ce 100644
--- a/mail/vodmr/Makefile
+++ b/mail/vodmr/Makefile
@@ -10,6 +10,7 @@
 
 PORTNAME=	vodmr
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://romana.now.ie/software/ \
 		http://www.lecter.phlegethon.org/vodmr/
@@ -18,7 +19,6 @@ MAINTAINER=	james@now.ie
 COMMENT=	An ODMR/ATRN server for vpopmail+qmail
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/CDB_File.pm:${PORTSDIR}/databases/p5-CDB_File \
-		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		${SITE_PERL}/${PERL_ARCH}/vpopmail.pm:${PORTSDIR}/mail/p5-vpopmail \
 		${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${SITE_PERL}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-HMAC