aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2014-11-26 13:08:24 +0000
committerMathieu Arnold <mat@FreeBSD.org>2014-11-26 13:08:24 +0000
commiteee58d187e2c55fca6f53b9e482d33cf5346fe81 (patch)
tree0d350fe6ad6a2fe3222d838f3c72856c78cd449f /mail
parent3f1df82a16a1e89db9a69b36ade7342f34095ab4 (diff)
downloadports-eee58d187e2c55fca6f53b9e482d33cf5346fe81.tar.gz
ports-eee58d187e2c55fca6f53b9e482d33cf5346fe81.zip
Change the way Perl modules are installed, update the default Perl to 5.18.
Before, we had: site_perl : lib/perl5/site_perl/5.18 site_perl/perl_arch : lib/perl5/site_perl/5.18/mach perl_man3 : lib/perl5/5.18/man/man3 Now we have: site_perl : lib/perl5/site_perl site_arch : lib/perl5/site_perl/mach/5.18 perl_man3 : lib/perl5/site_perl/man/man3 Modules without any .so will be installed at the same place regardless of the Perl version, minimizing the upgrade when the major Perl version is changed. It uses a version dependent directory for modules with compiled bits. As PERL_ARCH is no longer needed in plists, it has been removed from PLIST_SUB. The USE_PERL5=fixpacklist keyword is removed, the .packlist file is now always removed, as is perllocal.pod. The old site_perl and site_perl/arch directories have been kept in the default Perl @INC for all Perl ports, and will be phased out as these old Perl versions expire. PR: 194969 Differential Revision: https://reviews.freebsd.org/D1019 Exp-run by: antoine Reviewed by: perl@ Approved by: portmgr
Notes
Notes: svn path=/head/; revision=373448
Diffstat (limited to 'mail')
-rw-r--r--mail/anomy-sanitizer/Makefile20
-rw-r--r--mail/anomy-sanitizer/pkg-plist2
-rw-r--r--mail/bayespam/Makefile1
-rw-r--r--mail/bayespam/pkg-plist1
-rw-r--r--mail/cyrus-imapd23/Makefile3
-rw-r--r--mail/cyrus-imapd23/pkg-plist23
-rw-r--r--mail/cyrus-imapd24/Makefile3
-rw-r--r--mail/cyrus-imapd24/pkg-plist23
-rw-r--r--mail/grepmail/Makefile1
-rw-r--r--mail/grepmail/pkg-plist2
-rw-r--r--mail/imaputils/Makefile1
-rw-r--r--mail/imaputils/pkg-plist2
-rw-r--r--mail/mbx2mbox/Makefile1
-rw-r--r--mail/mbx2mbox/pkg-plist2
-rw-r--r--mail/mime-construct/Makefile1
-rw-r--r--mail/mime-construct/pkg-plist2
-rw-r--r--mail/p5-CGP-CLI/Makefile1
-rw-r--r--mail/p5-CGP-CLI/pkg-plist4
-rw-r--r--mail/p5-Clamd/Makefile2
-rw-r--r--mail/p5-Clamd/pkg-plist2
-rw-r--r--mail/p5-Dancer-Plugin-Email/Makefile1
-rw-r--r--mail/p5-Dancer-Plugin-Email/pkg-plist6
-rw-r--r--mail/p5-Data-Validate-Email/Makefile1
-rw-r--r--mail/p5-Data-Validate-Email/pkg-plist9
-rw-r--r--mail/p5-Email-Abstract/Makefile1
-rw-r--r--mail/p5-Email-Abstract/pkg-plist4
-rw-r--r--mail/p5-Email-Address-List/Makefile1
-rw-r--r--mail/p5-Email-Address-List/pkg-plist1
-rw-r--r--mail/p5-Email-Address-Loose/Makefile1
-rw-r--r--mail/p5-Email-Address-Loose/pkg-plist4
-rw-r--r--mail/p5-Email-Address/Makefile1
-rw-r--r--mail/p5-Email-Address/pkg-plist4
-rw-r--r--mail/p5-Email-AddressParser/Makefile1
-rw-r--r--mail/p5-Email-AddressParser/pkg-plist8
-rw-r--r--mail/p5-Email-Date-Format/Makefile1
-rw-r--r--mail/p5-Email-Date-Format/pkg-plist6
-rw-r--r--mail/p5-Email-Date/Makefile1
-rw-r--r--mail/p5-Email-Date/pkg-plist4
-rw-r--r--mail/p5-Email-Delete/Makefile1
-rw-r--r--mail/p5-Email-Delete/pkg-plist5
-rw-r--r--mail/p5-Email-Filter/Makefile1
-rw-r--r--mail/p5-Email-Filter/pkg-plist4
-rw-r--r--mail/p5-Email-Find/Makefile1
-rw-r--r--mail/p5-Email-Find/pkg-plist3
-rw-r--r--mail/p5-Email-Folder-IMAP/Makefile1
-rw-r--r--mail/p5-Email-Folder-IMAP/pkg-plist6
-rw-r--r--mail/p5-Email-Folder-IMAPS/Makefile1
-rw-r--r--mail/p5-Email-Folder-IMAPS/pkg-plist6
-rw-r--r--mail/p5-Email-Folder-POP3/Makefile1
-rw-r--r--mail/p5-Email-Folder-POP3/pkg-plist6
-rw-r--r--mail/p5-Email-Folder/Makefile1
-rw-r--r--mail/p5-Email-Folder/pkg-plist5
-rw-r--r--mail/p5-Email-FolderType-Net/Makefile1
-rw-r--r--mail/p5-Email-FolderType-Net/pkg-plist6
-rw-r--r--mail/p5-Email-FolderType/Makefile2
-rw-r--r--mail/p5-Email-FolderType/pkg-plist5
-rw-r--r--mail/p5-Email-LocalDelivery-Ezmlm/Makefile1
-rw-r--r--mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist6
-rw-r--r--mail/p5-Email-LocalDelivery/Makefile1
-rw-r--r--mail/p5-Email-LocalDelivery/pkg-plist5
-rw-r--r--mail/p5-Email-MIME-Attachment-Stripper/Makefile2
-rw-r--r--mail/p5-Email-MIME-Attachment-Stripper/pkg-plist8
-rw-r--r--mail/p5-Email-MIME-ContentType/Makefile1
-rw-r--r--mail/p5-Email-MIME-ContentType/pkg-plist6
-rw-r--r--mail/p5-Email-MIME-CreateHTML/Makefile1
-rw-r--r--mail/p5-Email-MIME-CreateHTML/pkg-plist8
-rw-r--r--mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile1
-rw-r--r--mail/p5-Email-MIME-Creator-ISO_2022_JP/pkg-plist9
-rw-r--r--mail/p5-Email-MIME-Encodings/Makefile1
-rw-r--r--mail/p5-Email-MIME-Encodings/pkg-plist6
-rw-r--r--mail/p5-Email-MIME/Makefile1
-rw-r--r--mail/p5-Email-MIME/pkg-plist5
-rw-r--r--mail/p5-Email-MessageID/Makefile1
-rw-r--r--mail/p5-Email-MessageID/pkg-plist4
-rw-r--r--mail/p5-Email-Reply/Makefile1
-rw-r--r--mail/p5-Email-Reply/pkg-plist4
-rw-r--r--mail/p5-Email-Send/Makefile1
-rw-r--r--mail/p5-Email-Send/pkg-plist5
-rw-r--r--mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile1
-rw-r--r--mail/p5-Email-Sender-Transport-SMTP-TLS/pkg-plist9
-rw-r--r--mail/p5-Email-Sender-Transport-SMTPS/Makefile1
-rw-r--r--mail/p5-Email-Sender-Transport-SMTPS/pkg-plist2
-rw-r--r--mail/p5-Email-Sender-Transport-SQLite/Makefile1
-rw-r--r--mail/p5-Email-Sender-Transport-SQLite/pkg-plist8
-rw-r--r--mail/p5-Email-Sender/Makefile1
-rw-r--r--mail/p5-Email-Sender/pkg-plist11
-rw-r--r--mail/p5-Email-Simple-FromHandle/Makefile1
-rw-r--r--mail/p5-Email-Simple-FromHandle/pkg-plist3
-rw-r--r--mail/p5-Email-Simple/Makefile1
-rw-r--r--mail/p5-Email-Simple/pkg-plist5
-rw-r--r--mail/p5-Email-Stuffer/Makefile1
-rw-r--r--mail/p5-Email-Stuffer/pkg-plist4
-rw-r--r--mail/p5-Email-Valid-Loose/Makefile1
-rw-r--r--mail/p5-Email-Valid-Loose/pkg-plist3
-rw-r--r--mail/p5-Email-Valid/Makefile1
-rw-r--r--mail/p5-Email-Valid/pkg-plist4
-rw-r--r--mail/p5-FuzzyOcr-devel/Makefile8
-rw-r--r--mail/p5-GMail-IMAPD/Makefile1
-rw-r--r--mail/p5-GMail-IMAPD/pkg-plist4
-rw-r--r--mail/p5-IMAP-Admin/Makefile1
-rw-r--r--mail/p5-IMAP-Admin/pkg-plist4
-rw-r--r--mail/p5-IMAP-Client/Makefile1
-rw-r--r--mail/p5-IMAP-Client/pkg-plist4
-rw-r--r--mail/p5-IMAP-Sieve/Makefile2
-rw-r--r--mail/p5-IMAP-Sieve/pkg-plist4
-rw-r--r--mail/p5-LMAP-CID2SPF/Makefile6
-rw-r--r--mail/p5-LMAP-CID2SPF/pkg-plist1
-rw-r--r--mail/p5-Log-Procmail/Makefile1
-rw-r--r--mail/p5-Log-Procmail/pkg-plist4
-rw-r--r--mail/p5-MIME-AltWords/Makefile1
-rw-r--r--mail/p5-MIME-AltWords/pkg-plist4
-rw-r--r--mail/p5-MIME-Charset/Makefile1
-rw-r--r--mail/p5-MIME-Charset/pkg-plist8
-rw-r--r--mail/p5-MIME-EcoEncode/Makefile1
-rw-r--r--mail/p5-MIME-EcoEncode/pkg-plist5
-rw-r--r--mail/p5-MIME-EncWords/Makefile1
-rw-r--r--mail/p5-MIME-EncWords/pkg-plist5
-rw-r--r--mail/p5-MIME-Explode/Makefile1
-rw-r--r--mail/p5-MIME-Explode/pkg-plist10
-rw-r--r--mail/p5-MIME-Fast/Makefile2
-rw-r--r--mail/p5-MIME-Fast/pkg-plist12
-rw-r--r--mail/p5-MIME-Lite-HTML/Makefile1
-rw-r--r--mail/p5-MIME-Lite-HTML/pkg-plist6
-rw-r--r--mail/p5-MIME-Lite-TT-HTML/Makefile1
-rw-r--r--mail/p5-MIME-Lite-TT-HTML/pkg-plist3
-rw-r--r--mail/p5-MIME-Lite-TT/Makefile2
-rw-r--r--mail/p5-MIME-Lite-TT/pkg-plist7
-rw-r--r--mail/p5-MIME-Lite/Makefile1
-rw-r--r--mail/p5-MIME-Lite/pkg-plist4
-rw-r--r--mail/p5-MIME-Tools/Makefile1
-rw-r--r--mail/p5-MIME-Tools/pkg-plist7
-rw-r--r--mail/p5-MIME-Types/Makefile1
-rw-r--r--mail/p5-MIME-Types/pkg-plist6
-rw-r--r--mail/p5-Mail-Address-MobileJp/Makefile1
-rw-r--r--mail/p5-Mail-Address-MobileJp/pkg-plist6
-rw-r--r--mail/p5-Mail-Alias/Makefile1
-rw-r--r--mail/p5-Mail-Alias/pkg-plist4
-rw-r--r--mail/p5-Mail-Audit-Attach/Makefile1
-rw-r--r--mail/p5-Mail-Audit-Attach/pkg-plist6
-rw-r--r--mail/p5-Mail-Audit/Makefile1
-rw-r--r--mail/p5-Mail-Audit/pkg-plist6
-rw-r--r--mail/p5-Mail-Box-Parser-C/Makefile1
-rw-r--r--mail/p5-Mail-Box-Parser-C/pkg-plist14
-rw-r--r--mail/p5-Mail-Box/Makefile2
-rw-r--r--mail/p5-Mail-Box/pkg-plist33
-rw-r--r--mail/p5-Mail-Bulkmail/Makefile1
-rw-r--r--mail/p5-Mail-Bulkmail/pkg-plist5
-rw-r--r--mail/p5-Mail-Cache/Makefile1
-rw-r--r--mail/p5-Mail-Cache/pkg-plist4
-rw-r--r--mail/p5-Mail-CheckUser/Makefile2
-rw-r--r--mail/p5-Mail-CheckUser/pkg-plist4
-rw-r--r--mail/p5-Mail-ClamAV/Makefile2
-rw-r--r--mail/p5-Mail-ClamAV/pkg-plist8
-rw-r--r--mail/p5-Mail-DKIM/Makefile1
-rw-r--r--mail/p5-Mail-DKIM/pkg-plist7
-rw-r--r--mail/p5-Mail-DeliveryStatus-BounceParser/Makefile1
-rw-r--r--mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist6
-rw-r--r--mail/p5-Mail-DomainKeys/Makefile2
-rw-r--r--mail/p5-Mail-DomainKeys/pkg-plist6
-rw-r--r--mail/p5-Mail-Ezmlm/Makefile2
-rw-r--r--mail/p5-Mail-Ezmlm/pkg-plist5
-rw-r--r--mail/p5-Mail-Field-Received/Makefile1
-rw-r--r--mail/p5-Mail-Field-Received/pkg-plist6
-rw-r--r--mail/p5-Mail-FilterXML/Makefile1
-rw-r--r--mail/p5-Mail-FilterXML/pkg-plist4
-rw-r--r--mail/p5-Mail-Folder/Makefile1
-rw-r--r--mail/p5-Mail-Folder/pkg-plist5
-rw-r--r--mail/p5-Mail-Freshmeat/Makefile1
-rw-r--r--mail/p5-Mail-Freshmeat/pkg-plist5
-rw-r--r--mail/p5-Mail-GnuPG/Makefile1
-rw-r--r--mail/p5-Mail-GnuPG/pkg-plist1
-rw-r--r--mail/p5-Mail-Graph/Makefile2
-rw-r--r--mail/p5-Mail-Graph/pkg-plist3
-rw-r--r--mail/p5-Mail-IMAPClient/Makefile1
-rw-r--r--mail/p5-Mail-IMAPClient/pkg-plist6
-rw-r--r--mail/p5-Mail-IMAPTalk-MailCache/Makefile1
-rw-r--r--mail/p5-Mail-IMAPTalk-MailCache/pkg-plist6
-rw-r--r--mail/p5-Mail-IMAPTalk/Makefile1
-rw-r--r--mail/p5-Mail-IMAPTalk/pkg-plist4
-rw-r--r--mail/p5-Mail-LMLM/Makefile1
-rw-r--r--mail/p5-Mail-LMLM/pkg-plist7
-rw-r--r--mail/p5-Mail-ListDetector/Makefile1
-rw-r--r--mail/p5-Mail-ListDetector/pkg-plist8
-rw-r--r--mail/p5-Mail-MailStats/Makefile1
-rw-r--r--mail/p5-Mail-MailStats/pkg-plist5
-rw-r--r--mail/p5-Mail-Mbox-MessageParser/Makefile2
-rw-r--r--mail/p5-Mail-Mbox-MessageParser/pkg-plist7
-rw-r--r--mail/p5-Mail-MboxParser/Makefile2
-rw-r--r--mail/p5-Mail-MboxParser/pkg-plist4
-rw-r--r--mail/p5-Mail-OpenDKIM/Makefile18
-rw-r--r--mail/p5-Mail-OpenRelay-Simple/Makefile1
-rw-r--r--mail/p5-Mail-OpenRelay-Simple/pkg-plist6
-rw-r--r--mail/p5-Mail-POP3Client/Makefile1
-rw-r--r--mail/p5-Mail-POP3Client/pkg-plist4
-rw-r--r--mail/p5-Mail-Procmail/Makefile2
-rw-r--r--mail/p5-Mail-Procmail/pkg-plist4
-rw-r--r--mail/p5-Mail-Procmailrc/Makefile1
-rw-r--r--mail/p5-Mail-Procmailrc/pkg-plist4
-rw-r--r--mail/p5-Mail-RBL/Makefile2
-rw-r--r--mail/p5-Mail-RBL/pkg-plist4
-rw-r--r--mail/p5-Mail-RFC822-Address/Makefile1
-rw-r--r--mail/p5-Mail-RFC822-Address/pkg-plist6
-rw-r--r--mail/p5-Mail-SPF/Makefile2
-rw-r--r--mail/p5-Mail-SPF/pkg-plist6
-rw-r--r--mail/p5-Mail-SRS/Makefile2
-rw-r--r--mail/p5-Mail-SRS/pkg-plist5
-rw-r--r--mail/p5-Mail-SendEasy/Makefile1
-rw-r--r--mail/p5-Mail-SendEasy/pkg-plist5
-rw-r--r--mail/p5-Mail-Sender/Makefile1
-rw-r--r--mail/p5-Mail-Sender/pkg-plist6
-rw-r--r--mail/p5-Mail-Sendmail/Makefile1
-rw-r--r--mail/p5-Mail-Sendmail/pkg-plist4
-rw-r--r--mail/p5-Mail-Spool/Makefile1
-rw-r--r--mail/p5-Mail-Spool/pkg-plist3
-rw-r--r--mail/p5-Mail-Tools/Makefile1
-rw-r--r--mail/p5-Mail-Tools/pkg-plist5
-rw-r--r--mail/p5-Mail-Transport-Dbx/Makefile1
-rw-r--r--mail/p5-Mail-Transport-Dbx/pkg-plist12
-rw-r--r--mail/p5-Mail-Verify/Makefile1
-rw-r--r--mail/p5-Mail-Verify/pkg-plist4
-rw-r--r--mail/p5-Mail-Verp/Makefile1
-rw-r--r--mail/p5-Mail-Verp/pkg-plist4
-rw-r--r--mail/p5-Mail-Webmail-Gmail/Makefile1
-rw-r--r--mail/p5-Mail-Webmail-Gmail/pkg-plist6
-rw-r--r--mail/p5-Net-IMAP-Client/Makefile1
-rw-r--r--mail/p5-Net-IMAP-Client/pkg-plist7
-rw-r--r--mail/p5-Net-IMAP-Server/Makefile1
-rw-r--r--mail/p5-Net-IMAP-Server/pkg-plist8
-rw-r--r--mail/p5-Net-IMAP-Simple-SSL/Makefile1
-rw-r--r--mail/p5-Net-IMAP-Simple-SSL/pkg-plist8
-rw-r--r--mail/p5-Net-IMAP-Simple/Makefile1
-rw-r--r--mail/p5-Net-IMAP-Simple/pkg-plist7
-rw-r--r--mail/p5-Net-ManageSieve/Makefile1
-rw-r--r--mail/p5-Net-ManageSieve/pkg-plist4
-rw-r--r--mail/p5-Net-POP3-SSLWrapper/Makefile1
-rw-r--r--mail/p5-Net-POP3-SSLWrapper/pkg-plist6
-rw-r--r--mail/p5-Net-QMTP/Makefile1
-rw-r--r--mail/p5-Net-QMTP/pkg-plist4
-rw-r--r--mail/p5-Net-SMTP-SSL/Makefile2
-rw-r--r--mail/p5-Net-SMTP-SSL/pkg-plist6
-rw-r--r--mail/p5-Net-SMTP-Server/Makefile2
-rw-r--r--mail/p5-Net-SMTP-Server/pkg-plist12
-rw-r--r--mail/p5-Net-SMTP-TLS-ButMaintained/Makefile1
-rw-r--r--mail/p5-Net-SMTP-TLS-ButMaintained/pkg-plist8
-rw-r--r--mail/p5-Net-SMTP-TLS/Makefile2
-rw-r--r--mail/p5-Net-SMTP-TLS/pkg-plist6
-rw-r--r--mail/p5-Net-SMTPS/Makefile2
-rw-r--r--mail/p5-Net-SMTPS/pkg-plist4
-rw-r--r--mail/p5-Net-SMTP_auth/Makefile1
-rw-r--r--mail/p5-Net-SMTP_auth/pkg-plist4
-rw-r--r--mail/p5-Net-SenderBase/Makefile1
-rw-r--r--mail/p5-Net-SenderBase/pkg-plist6
-rw-r--r--mail/p5-Net-Server-Mail/Makefile1
-rw-r--r--mail/p5-Net-Server-Mail/pkg-plist8
-rw-r--r--mail/p5-POE-Component-Client-POP3/Makefile1
-rw-r--r--mail/p5-POE-Component-Client-POP3/pkg-plist8
-rw-r--r--mail/p5-POE-Component-Client-SMTP/Makefile1
-rw-r--r--mail/p5-POE-Component-Client-SMTP/pkg-plist3
-rw-r--r--mail/p5-POE-Component-SMTP/Makefile2
-rw-r--r--mail/p5-POE-Component-SMTP/pkg-plist8
-rw-r--r--mail/p5-POE-Filter-Transparent-SMTP/Makefile1
-rw-r--r--mail/p5-POE-Filter-Transparent-SMTP/pkg-plist8
-rw-r--r--mail/p5-Parse-Syslog-Mail/Makefile1
-rw-r--r--mail/p5-Parse-Syslog-Mail/pkg-plist6
-rw-r--r--mail/p5-Qmail-Envelope/Makefile1
-rw-r--r--mail/p5-Qmail-Envelope/pkg-plist4
-rw-r--r--mail/p5-SES/Makefile2
-rw-r--r--mail/p5-Sendmail-AccessDB/Makefile1
-rw-r--r--mail/p5-Sendmail-AccessDB/pkg-plist1
-rw-r--r--mail/p5-Sendmail-Milter/Makefile1
-rw-r--r--mail/p5-Sendmail-Milter/pkg-plist12
-rw-r--r--mail/p5-Test-Email/Makefile2
-rw-r--r--mail/p5-Test-Email/pkg-plist4
-rw-r--r--mail/p5-URI-imap/Makefile1
-rw-r--r--mail/p5-URI-imap/pkg-plist4
-rw-r--r--mail/p5-URI-imaps/Makefile1
-rw-r--r--mail/p5-URI-imaps/pkg-plist4
-rw-r--r--mail/p5-WWW-GMail/Makefile1
-rw-r--r--mail/p5-WWW-GMail/pkg-plist4
-rw-r--r--mail/p5-WWW-Hotmail/Makefile1
-rw-r--r--mail/p5-WWW-Hotmail/pkg-plist4
-rw-r--r--mail/p5-ZConf-Mail/Makefile2
-rw-r--r--mail/p5-ZConf-Mail/pkg-plist5
-rw-r--r--mail/p5-qpsmtpd/Makefile1
-rw-r--r--mail/p5-qpsmtpd/pkg-plist10
-rw-r--r--mail/pflogstats/Makefile2
-rw-r--r--mail/pflogstats/pkg-plist1
-rw-r--r--mail/policyd2/Makefile6
-rw-r--r--mail/razor-agents/Makefile1
-rw-r--r--mail/razor-agents/pkg-plist57
-rw-r--r--mail/slapd-cyrus/Makefile6
-rw-r--r--mail/slapd-cyrus/pkg-plist6
-rw-r--r--mail/spamassassin/Makefile2
-rw-r--r--mail/spamassassin/pkg-plist14
-rw-r--r--mail/spamcup/Makefile7
295 files changed, 233 insertions, 915 deletions
diff --git a/mail/anomy-sanitizer/Makefile b/mail/anomy-sanitizer/Makefile
index adee6898c8f1..25cb76afacae 100644
--- a/mail/anomy-sanitizer/Makefile
+++ b/mail/anomy-sanitizer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= anomy-sanitizer
PORTVERSION= 1.76
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= mail security
MASTER_SITES= http://mailtools.anomy.net/dist/
@@ -18,15 +18,15 @@ DOCS= CHANGELOG.sanitizer CREDITS README.sanitizer sanitizer.html
OPTIONS_DEFINE= DOCS
do-install:
- @${MKDIR} ${STAGEDIR}${SITE_PERL}/Anomy/Sanitizer/
- ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/HTMLCleaner.pm ${STAGEDIR}${SITE_PERL}/Anomy
- ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Log.pm ${STAGEDIR}${SITE_PERL}/Anomy
- ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/MIMEStream.pm ${STAGEDIR}${SITE_PERL}/Anomy
- ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer.pm ${STAGEDIR}${SITE_PERL}/Anomy
- ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/FProt.pm ${STAGEDIR}${SITE_PERL}/Anomy/Sanitizer/
- ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/FileTypes.pm ${STAGEDIR}${SITE_PERL}/Anomy/Sanitizer/
- ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/MacroScanner.pm ${STAGEDIR}${SITE_PERL}/Anomy/Sanitizer/
- ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/Scoring.pm ${STAGEDIR}${SITE_PERL}/Anomy/Sanitizer/
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy/Sanitizer/
+ ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/HTMLCleaner.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy
+ ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Log.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy
+ ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/MIMEStream.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy
+ ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy
+ ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/FProt.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy/Sanitizer/
+ ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/FileTypes.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy/Sanitizer/
+ ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/MacroScanner.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy/Sanitizer/
+ ${INSTALL_DATA} ${WRKSRC}/bin/Anomy/Sanitizer/Scoring.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Anomy/Sanitizer/
${INSTALL_SCRIPT} ${WRKSRC}/bin/sanitizer.pl ${STAGEDIR}${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/bin/simplify.pl ${STAGEDIR}${PREFIX}/bin
diff --git a/mail/anomy-sanitizer/pkg-plist b/mail/anomy-sanitizer/pkg-plist
index 2646f5e9276a..6c55cef61bdc 100644
--- a/mail/anomy-sanitizer/pkg-plist
+++ b/mail/anomy-sanitizer/pkg-plist
@@ -14,5 +14,3 @@ bin/simplify.pl
%%PORTDOCS%%%%DOCSDIR%%/README.sanitizer
%%PORTDOCS%%%%DOCSDIR%%/sanitizer.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/Anomy/Sanitizer/
-@dirrm %%SITE_PERL%%/Anomy/
diff --git a/mail/bayespam/Makefile b/mail/bayespam/Makefile
index 8eb56c11b6b2..0de057333e83 100644
--- a/mail/bayespam/Makefile
+++ b/mail/bayespam/Makefile
@@ -3,6 +3,7 @@
PORTNAME= bayespam
PORTVERSION= 0.9.2
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.garyarnold.com/sites/default/files/
EXTRACT_SUFX= .tar_.gz
diff --git a/mail/bayespam/pkg-plist b/mail/bayespam/pkg-plist
index ee78e836b847..aa19e3cbbb0b 100644
--- a/mail/bayespam/pkg-plist
+++ b/mail/bayespam/pkg-plist
@@ -10,4 +10,3 @@ bin/bayestest.pl
%%PORTDOCS%%share/doc/bayespam/TODO
%%PORTDOCS%%share/doc/bayespam/qmail.sample
%%PORTDOCS%%@dirrm share/doc/bayespam
-@dirrm %%SITE_PERL%%/Bayespam
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index fa24ee0d6763..883989a3434b 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.3.18
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/
PKGNAMESUFFIX= 23
@@ -24,7 +24,6 @@ PERLMAN= ${SITE_PERL_REL:S/site_perl\///}
USE_RC_SUBR= imapd
USES= perl5
-USE_PERL5= run build fixpacklist
USE_OPENSSL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index cec25a2ca8a8..f734f5600cfe 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -96,15 +96,13 @@ include/cyrus/xstrlcat.h
include/cyrus/xstrlcpy.h
lib/libcyrus.a
lib/libcyrus_min.a
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%SITE_ARCH%%/Cyrus/IMAP/Admin.pm
+%%SITE_ARCH%%/Cyrus/IMAP/IMSP.pm
+%%SITE_ARCH%%/Cyrus/IMAP/Shell.pm
+%%SITE_ARCH%%/Cyrus/IMAP.pm
+%%SITE_ARCH%%/Cyrus/SIEVE/managesieve.pm
+%%SITE_ARCH%%/auto/Cyrus/IMAP/IMAP.so
+%%SITE_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
man/man1/cyradm.1.gz
man/man1/imtest.1.gz
man/man1/installsieve.1.gz
@@ -120,12 +118,5 @@ man/man5/cyrus.conf.5.gz
man/man5/imapd.conf.5.gz
man/man5/krb.equiv.5.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imapd.conf
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
@dirrm include/cyrus
@dirrm cyrus/bin
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index efdf05464296..a73bc9893960 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.4.17
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \
http://cyrusimap.org/releases/
@@ -24,7 +24,6 @@ PERLMAN= ${SITE_PERL_REL:S/site_perl\///}
USE_RC_SUBR= imapd
USES= perl5
-USE_PERL5= run build fixpacklist
USE_OPENSSL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index 4c89c0be9c9c..53bc21bc63f7 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -97,15 +97,13 @@ include/cyrus/xstrlcat.h
include/cyrus/xstrlcpy.h
lib/libcyrus.a
lib/libcyrus_min.a
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
+%%SITE_ARCH%%/Cyrus/IMAP/Admin.pm
+%%SITE_ARCH%%/Cyrus/IMAP/IMSP.pm
+%%SITE_ARCH%%/Cyrus/IMAP/Shell.pm
+%%SITE_ARCH%%/Cyrus/IMAP.pm
+%%SITE_ARCH%%/Cyrus/SIEVE/managesieve.pm
+%%SITE_ARCH%%/auto/Cyrus/IMAP/IMAP.so
+%%SITE_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
man/man1/cyradm.1.gz
man/man1/imtest.1.gz
man/man1/installsieve.1.gz
@@ -121,12 +119,5 @@ man/man5/cyrus.conf.5.gz
man/man5/imapd.conf.5.gz
man/man5/krb.equiv.5.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imapd.conf
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
@dirrm include/cyrus
@dirrm cyrus/bin
diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index dd3aa841e78a..2ce727379e23 100644
--- a/mail/grepmail/Makefile
+++ b/mail/grepmail/Makefile
@@ -3,6 +3,7 @@
PORTNAME= grepmail
PORTVERSION= 5.3033
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= SF
diff --git a/mail/grepmail/pkg-plist b/mail/grepmail/pkg-plist
index 6c5ccd7ab1f1..d4c0acf15137 100644
--- a/mail/grepmail/pkg-plist
+++ b/mail/grepmail/pkg-plist
@@ -1,4 +1,2 @@
bin/grepmail
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/grepmail/.packlist
man/man1/grepmail.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/grepmail
diff --git a/mail/imaputils/Makefile b/mail/imaputils/Makefile
index d23d68cf21a6..22d014d8f6ee 100644
--- a/mail/imaputils/Makefile
+++ b/mail/imaputils/Makefile
@@ -3,6 +3,7 @@
PORTNAME= imaputils
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://tsatsenko.ru/ports/distfiles/
diff --git a/mail/imaputils/pkg-plist b/mail/imaputils/pkg-plist
index cbd4619b0cee..94a6c0789529 100644
--- a/mail/imaputils/pkg-plist
+++ b/mail/imaputils/pkg-plist
@@ -20,5 +20,3 @@ bin/iu-purge
bin/iu-restore
bin/iu-sync
bin/iu-trash
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/imaputils/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/imaputils
diff --git a/mail/mbx2mbox/Makefile b/mail/mbx2mbox/Makefile
index ee1907a6c6b3..989d20a95566 100644
--- a/mail/mbx2mbox/Makefile
+++ b/mail/mbx2mbox/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mbx2mbox
PORTVERSION= 0.34
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= SF
diff --git a/mail/mbx2mbox/pkg-plist b/mail/mbx2mbox/pkg-plist
index df8473ab921c..550d228fa606 100644
--- a/mail/mbx2mbox/pkg-plist
+++ b/mail/mbx2mbox/pkg-plist
@@ -1,4 +1,2 @@
bin/mbx2mbox
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/mbx2mbox/.packlist
man/man1/mbx2mbox.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mbx2mbox
diff --git a/mail/mime-construct/Makefile b/mail/mime-construct/Makefile
index a81327e6d0f7..be70644298d2 100644
--- a/mail/mime-construct/Makefile
+++ b/mail/mime-construct/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mime-construct
PORTVERSION= 1.11
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.argon.org/~roderick/ \
ftp://renatasystems.org/pub/FreeBSD/ports/distfiles/
diff --git a/mail/mime-construct/pkg-plist b/mail/mime-construct/pkg-plist
index e6308c09b8b2..baa8f8f7de87 100644
--- a/mail/mime-construct/pkg-plist
+++ b/mail/mime-construct/pkg-plist
@@ -1,4 +1,2 @@
bin/mime-construct
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/mime-construct/.packlist
man/man1/mime-construct.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mime-construct
diff --git a/mail/p5-CGP-CLI/Makefile b/mail/p5-CGP-CLI/Makefile
index aedb24d091e2..0eb1da1b3bf4 100644
--- a/mail/p5-CGP-CLI/Makefile
+++ b/mail/p5-CGP-CLI/Makefile
@@ -3,6 +3,7 @@
PORTNAME= CGP-CLI
PORTVERSION= 2.7.5
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:JBUHACOFF
diff --git a/mail/p5-CGP-CLI/pkg-plist b/mail/p5-CGP-CLI/pkg-plist
index 0e18750ac2a4..2803bcc70777 100644
--- a/mail/p5-CGP-CLI/pkg-plist
+++ b/mail/p5-CGP-CLI/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGP/CLI/.packlist
%%SITE_PERL%%/CGP/CLI.pm
%%PERL5_MAN3%%/CGP::CLI.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGP/CLI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGP
-@dirrmtry %%SITE_PERL%%/CGP
diff --git a/mail/p5-Clamd/Makefile b/mail/p5-Clamd/Makefile
index eff68662cb5e..43e8359eeaed 100644
--- a/mail/p5-Clamd/Makefile
+++ b/mail/p5-Clamd/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Clamd
PORTVERSION= 1.04
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MSERGEANT
diff --git a/mail/p5-Clamd/pkg-plist b/mail/p5-Clamd/pkg-plist
index 820dd583c4f5..1c046f383d74 100644
--- a/mail/p5-Clamd/pkg-plist
+++ b/mail/p5-Clamd/pkg-plist
@@ -1,4 +1,2 @@
%%PERL5_MAN3%%/Clamd.3.gz
%%SITE_PERL%%/Clamd.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clamd/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Clamd
diff --git a/mail/p5-Dancer-Plugin-Email/Makefile b/mail/p5-Dancer-Plugin-Email/Makefile
index 80595da360d5..a562ea45085c 100644
--- a/mail/p5-Dancer-Plugin-Email/Makefile
+++ b/mail/p5-Dancer-Plugin-Email/Makefile
@@ -2,6 +2,7 @@
PORTNAME= Dancer-Plugin-Email
PORTVERSION= 1.0201
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:IRONCAMEL
diff --git a/mail/p5-Dancer-Plugin-Email/pkg-plist b/mail/p5-Dancer-Plugin-Email/pkg-plist
index c336d71e3426..b08611949d46 100644
--- a/mail/p5-Dancer-Plugin-Email/pkg-plist
+++ b/mail/p5-Dancer-Plugin-Email/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Email/.packlist
%%SITE_PERL%%/Dancer/Plugin/Email.pm
%%PERL5_MAN3%%/Dancer::Plugin::Email.3.gz
-@dirrmtry %%SITE_PERL%%/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/Dancer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin/Email
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Dancer
diff --git a/mail/p5-Data-Validate-Email/Makefile b/mail/p5-Data-Validate-Email/Makefile
index 0a3037ab4515..0a3f54547adc 100644
--- a/mail/p5-Data-Validate-Email/Makefile
+++ b/mail/p5-Data-Validate-Email/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Data-Validate-Email
PORTVERSION= 0.04
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Data-Validate-Email/pkg-plist b/mail/p5-Data-Validate-Email/pkg-plist
index 2e4b85ada8a1..0acdb8fbbad7 100644
--- a/mail/p5-Data-Validate-Email/pkg-plist
+++ b/mail/p5-Data-Validate-Email/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate/Email/.packlist
%%SITE_PERL%%/Data/Validate/Email.pm
%%SITE_PERL%%/auto/Data/Validate/Email/new.al
%%SITE_PERL%%/auto/Data/Validate/Email/is_email.al
@@ -7,11 +6,3 @@
%%SITE_PERL%%/auto/Data/Validate/Email/is_username.al
%%SITE_PERL%%/auto/Data/Validate/Email/autosplit.ix
%%PERL5_MAN3%%/Data::Validate::Email.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate/Email
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
-@dirrm %%SITE_PERL%%/auto/Data/Validate/Email
-@dirrmtry %%SITE_PERL%%/auto/Data/Validate
-@dirrmtry %%SITE_PERL%%/auto/Data
-@dirrmtry %%SITE_PERL%%/Data/Validate
-@dirrmtry %%SITE_PERL%%/Data
diff --git a/mail/p5-Email-Abstract/Makefile b/mail/p5-Email-Abstract/Makefile
index 2345c7858529..eef68918f235 100644
--- a/mail/p5-Email-Abstract/Makefile
+++ b/mail/p5-Email-Abstract/Makefile
@@ -2,6 +2,7 @@
PORTNAME= Email-Abstract
PORTVERSION= 3.007
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Email
diff --git a/mail/p5-Email-Abstract/pkg-plist b/mail/p5-Email-Abstract/pkg-plist
index c4ef8bb5ae5b..79cf6e35abdc 100644
--- a/mail/p5-Email-Abstract/pkg-plist
+++ b/mail/p5-Email-Abstract/pkg-plist
@@ -5,7 +5,6 @@
%%SITE_PERL%%/Email/Abstract/MailInternet.pm
%%SITE_PERL%%/Email/Abstract/MailMessage.pm
%%SITE_PERL%%/Email/Abstract/Plugin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Abstract/.packlist
%%PERL5_MAN3%%/Email::Abstract.3.gz
%%PERL5_MAN3%%/Email::Abstract::EmailMIME.3.gz
%%PERL5_MAN3%%/Email::Abstract::EmailSimple.3.gz
@@ -13,6 +12,3 @@
%%PERL5_MAN3%%/Email::Abstract::MailInternet.3.gz
%%PERL5_MAN3%%/Email::Abstract::MailMessage.3.gz
%%PERL5_MAN3%%/Email::Abstract::Plugin.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Abstract
-@dirrmtry %%SITE_PERL%%/Email/Abstract
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Address-List/Makefile b/mail/p5-Email-Address-List/Makefile
index 7887b2270cd5..49093dfb1bf6 100644
--- a/mail/p5-Email-Address-List/Makefile
+++ b/mail/p5-Email-Address-List/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Address-List
PORTVERSION= 0.05
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= http://download.bestpractical.com/mirror/ \
CPAN
diff --git a/mail/p5-Email-Address-List/pkg-plist b/mail/p5-Email-Address-List/pkg-plist
index 7101bbd67aa0..133361c1ed82 100644
--- a/mail/p5-Email-Address-List/pkg-plist
+++ b/mail/p5-Email-Address-List/pkg-plist
@@ -1,5 +1,4 @@
%%PERL5_MAN3%%/Email::Address::List.3.gz
%%SITE_PERL%%/Email/Address/List.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address/List/.packlist
diff --git a/mail/p5-Email-Address-Loose/Makefile b/mail/p5-Email-Address-Loose/Makefile
index 97c424e9bd39..3879ceb85efe 100644
--- a/mail/p5-Email-Address-Loose/Makefile
+++ b/mail/p5-Email-Address-Loose/Makefile
@@ -2,6 +2,7 @@
PORTNAME= Email-Address-Loose
PORTVERSION= 0.10
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Address-Loose/pkg-plist b/mail/p5-Email-Address-Loose/pkg-plist
index 54351e9d2f7c..0105eb3b8dc2 100644
--- a/mail/p5-Email-Address-Loose/pkg-plist
+++ b/mail/p5-Email-Address-Loose/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address/Loose/.packlist
%%SITE_PERL%%/Email/Address/Loose.pm
%%SITE_PERL%%/Email/Address/Loose/EmailAddress.pm
%%SITE_PERL%%/Email/Address/Loose/EmailValidLoose.pm
%%PERL5_MAN3%%/Email::Address::Loose.3.gz
-@dirrm %%SITE_PERL%%/Email/Address/Loose
-@dirrmtry %%SITE_PERL%%/Email/Address
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address/Loose
diff --git a/mail/p5-Email-Address/Makefile b/mail/p5-Email-Address/Makefile
index 6dbc68d311f9..65c46033689f 100644
--- a/mail/p5-Email-Address/Makefile
+++ b/mail/p5-Email-Address/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Address
PORTVERSION= 1.90.5
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Address/pkg-plist b/mail/p5-Email-Address/pkg-plist
index 2debdbae848f..a8d620398dc0 100644
--- a/mail/p5-Email-Address/pkg-plist
+++ b/mail/p5-Email-Address/pkg-plist
@@ -1,6 +1,2 @@
%%PERL5_MAN3%%/Email::Address.3.gz
%%SITE_PERL%%/Email/Address.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-AddressParser/Makefile b/mail/p5-Email-AddressParser/Makefile
index 01089afa25ed..c5bf4956f182 100644
--- a/mail/p5-Email-AddressParser/Makefile
+++ b/mail/p5-Email-AddressParser/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-AddressParser
PORTVERSION= 0.04
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-AddressParser/pkg-plist b/mail/p5-Email-AddressParser/pkg-plist
index cf76cd90f229..9bab30ae1cfb 100644
--- a/mail/p5-Email-AddressParser/pkg-plist
+++ b/mail/p5-Email-AddressParser/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/AddressParser/AddressParser.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/AddressParser/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Email/AddressParser.pm
+%%SITE_ARCH%%/auto/Email/AddressParser/AddressParser.so
+%%SITE_ARCH%%/Email/AddressParser.pm
%%PERL5_MAN3%%/Email::AddressParser.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/AddressParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Email
diff --git a/mail/p5-Email-Date-Format/Makefile b/mail/p5-Email-Date-Format/Makefile
index 374616a55ead..0e6869b3cd2a 100644
--- a/mail/p5-Email-Date-Format/Makefile
+++ b/mail/p5-Email-Date-Format/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Date-Format
PORTVERSION= 1.004
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Email
diff --git a/mail/p5-Email-Date-Format/pkg-plist b/mail/p5-Email-Date-Format/pkg-plist
index 674ab05f213c..333e925beaba 100644
--- a/mail/p5-Email-Date-Format/pkg-plist
+++ b/mail/p5-Email-Date-Format/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Date/Format/.packlist
%%SITE_PERL%%/Email/Date/Format.pm
%%PERL5_MAN3%%/Email::Date::Format.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Date/Format
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Date
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Date
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Date/Makefile b/mail/p5-Email-Date/Makefile
index 92ed7787af46..131b17efcae9 100644
--- a/mail/p5-Email-Date/Makefile
+++ b/mail/p5-Email-Date/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Date
PORTVERSION= 1.10.4
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Date/pkg-plist b/mail/p5-Email-Date/pkg-plist
index 4e06a70650de..a0d6395cc645 100644
--- a/mail/p5-Email-Date/pkg-plist
+++ b/mail/p5-Email-Date/pkg-plist
@@ -1,6 +1,2 @@
%%PERL5_MAN3%%/Email::Date.3.gz
%%SITE_PERL%%/Email/Date.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Date/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Date
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Delete/Makefile b/mail/p5-Email-Delete/Makefile
index 1171fc3a762c..aa7db19825ef 100644
--- a/mail/p5-Email-Delete/Makefile
+++ b/mail/p5-Email-Delete/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Delete
PORTVERSION= 2.00.1
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Email
diff --git a/mail/p5-Email-Delete/pkg-plist b/mail/p5-Email-Delete/pkg-plist
index 7116ef9263ab..3254b64cd729 100644
--- a/mail/p5-Email-Delete/pkg-plist
+++ b/mail/p5-Email-Delete/pkg-plist
@@ -1,11 +1,6 @@
%%SITE_PERL%%/Email/Delete.pm
%%SITE_PERL%%/Email/Delete/Maildir.pm
%%SITE_PERL%%/Email/Delete/Mbox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Delete/.packlist
%%PERL5_MAN3%%/Email::Delete.3.gz
%%PERL5_MAN3%%/Email::Delete::Maildir.3.gz
%%PERL5_MAN3%%/Email::Delete::Mbox.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Delete
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Delete
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Filter/Makefile b/mail/p5-Email-Filter/Makefile
index 29a077cff81a..5b0963f180bb 100644
--- a/mail/p5-Email-Filter/Makefile
+++ b/mail/p5-Email-Filter/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Filter
PORTVERSION= 1.03.3
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Filter/pkg-plist b/mail/p5-Email-Filter/pkg-plist
index de5a92d84d95..48abd2e1880c 100644
--- a/mail/p5-Email-Filter/pkg-plist
+++ b/mail/p5-Email-Filter/pkg-plist
@@ -1,6 +1,2 @@
%%PERL5_MAN3%%/Email::Filter.3.gz
%%SITE_PERL%%/Email/Filter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Filter/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Find/Makefile b/mail/p5-Email-Find/Makefile
index 78ca637389d7..0a4d5d758902 100644
--- a/mail/p5-Email-Find/Makefile
+++ b/mail/p5-Email-Find/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Find
PORTVERSION= 0.10
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Find/pkg-plist b/mail/p5-Email-Find/pkg-plist
index eb4fed1c376d..12f5a38549ed 100644
--- a/mail/p5-Email-Find/pkg-plist
+++ b/mail/p5-Email-Find/pkg-plist
@@ -1,7 +1,4 @@
%%SITE_PERL%%/Email/Find.pm
%%SITE_PERL%%/Email/Find/addrspec.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Find/.packlist
%%PERL5_MAN3%%/Email::Find.3.gz
%%PERL5_MAN3%%/Email::Find::addrspec.3.gz
-@dirrm %%SITE_PERL%%/Email/Find
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Find
diff --git a/mail/p5-Email-Folder-IMAP/Makefile b/mail/p5-Email-Folder-IMAP/Makefile
index 8a712eda9032..d6ed353b2b05 100644
--- a/mail/p5-Email-Folder-IMAP/Makefile
+++ b/mail/p5-Email-Folder-IMAP/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Folder-IMAP
PORTVERSION= 1.10.2
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Folder-IMAP/pkg-plist b/mail/p5-Email-Folder-IMAP/pkg-plist
index 8fc1f8d73d66..ceafa34311c9 100644
--- a/mail/p5-Email-Folder-IMAP/pkg-plist
+++ b/mail/p5-Email-Folder-IMAP/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/Email/Folder/IMAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAP/.packlist
%%PERL5_MAN3%%/Email::Folder::IMAP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Folder
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Folder-IMAPS/Makefile b/mail/p5-Email-Folder-IMAPS/Makefile
index f171f0292efe..b4274937cab9 100644
--- a/mail/p5-Email-Folder-IMAPS/Makefile
+++ b/mail/p5-Email-Folder-IMAPS/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Folder-IMAPS
PORTVERSION= 1.10.2
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Folder-IMAPS/pkg-plist b/mail/p5-Email-Folder-IMAPS/pkg-plist
index 8d55ffb72e28..b25ffe05f967 100644
--- a/mail/p5-Email-Folder-IMAPS/pkg-plist
+++ b/mail/p5-Email-Folder-IMAPS/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/Email/Folder/IMAPS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAPS/.packlist
%%PERL5_MAN3%%/Email::Folder::IMAPS.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAPS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Folder
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Folder-POP3/Makefile b/mail/p5-Email-Folder-POP3/Makefile
index 78899c7e8e32..f149290ab394 100644
--- a/mail/p5-Email-Folder-POP3/Makefile
+++ b/mail/p5-Email-Folder-POP3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Folder-POP3
PORTVERSION= 1.01.3
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Folder-POP3/pkg-plist b/mail/p5-Email-Folder-POP3/pkg-plist
index 6264fa52618b..95bf0874011a 100644
--- a/mail/p5-Email-Folder-POP3/pkg-plist
+++ b/mail/p5-Email-Folder-POP3/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/Email/Folder/POP3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/POP3/.packlist
%%PERL5_MAN3%%/Email::Folder::POP3.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/POP3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Folder
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Folder/Makefile b/mail/p5-Email-Folder/Makefile
index dcf9b8b99734..e0ac92cd4ca8 100644
--- a/mail/p5-Email-Folder/Makefile
+++ b/mail/p5-Email-Folder/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Folder
PORTVERSION= 0.85.5
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Folder/pkg-plist b/mail/p5-Email-Folder/pkg-plist
index a39461f67200..8fac282875ca 100644
--- a/mail/p5-Email-Folder/pkg-plist
+++ b/mail/p5-Email-Folder/pkg-plist
@@ -4,13 +4,8 @@
%%SITE_PERL%%/Email/Folder/Maildir.pm
%%SITE_PERL%%/Email/Folder/Mbox.pm
%%SITE_PERL%%/Email/Folder/Reader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/.packlist
%%PERL5_MAN3%%/Email::Folder.3.gz
%%PERL5_MAN3%%/Email::Folder::MH.3.gz
%%PERL5_MAN3%%/Email::Folder::Maildir.3.gz
%%PERL5_MAN3%%/Email::Folder::Mbox.3.gz
%%PERL5_MAN3%%/Email::Folder::Reader.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Folder
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-FolderType-Net/Makefile b/mail/p5-Email-FolderType-Net/Makefile
index f1d24d978d09..35c1002ca800 100644
--- a/mail/p5-Email-FolderType-Net/Makefile
+++ b/mail/p5-Email-FolderType-Net/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-FolderType-Net
PORTVERSION= 1.04.1
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Email
diff --git a/mail/p5-Email-FolderType-Net/pkg-plist b/mail/p5-Email-FolderType-Net/pkg-plist
index 79c83d0b996d..a05b412b2289 100644
--- a/mail/p5-Email-FolderType-Net/pkg-plist
+++ b/mail/p5-Email-FolderType-Net/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/Email/FolderType/Net.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType/Net/.packlist
%%PERL5_MAN3%%/Email::FolderType::Net.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/FolderType
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-FolderType/Makefile b/mail/p5-Email-FolderType/Makefile
index 661eaed96955..fe06e12df574 100644
--- a/mail/p5-Email-FolderType/Makefile
+++ b/mail/p5-Email-FolderType/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Email-FolderType
PORTVERSION= 0.8.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-FolderType/pkg-plist b/mail/p5-Email-FolderType/pkg-plist
index 9aafc1c97ab1..06cd4f07588f 100644
--- a/mail/p5-Email-FolderType/pkg-plist
+++ b/mail/p5-Email-FolderType/pkg-plist
@@ -3,13 +3,8 @@
%%SITE_PERL%%/Email/FolderType/MH.pm
%%SITE_PERL%%/Email/FolderType/Maildir.pm
%%SITE_PERL%%/Email/FolderType/Mbox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType/.packlist
%%PERL5_MAN3%%/Email::FolderType.3.gz
%%PERL5_MAN3%%/Email::FolderType::Ezmlm.3.gz
%%PERL5_MAN3%%/Email::FolderType::MH.3.gz
%%PERL5_MAN3%%/Email::FolderType::Maildir.3.gz
%%PERL5_MAN3%%/Email::FolderType::Mbox.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/FolderType
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
index 718cea24192e..abed0fdcb5a6 100644
--- a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
+++ b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-LocalDelivery-Ezmlm
PORTVERSION= 0.10
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist b/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist
index aadab7433141..f0ee8312c724 100644
--- a/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist
+++ b/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/Email/LocalDelivery/Ezmlm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery/Ezmlm/.packlist
%%PERL5_MAN3%%/Email::LocalDelivery::Ezmlm.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery/Ezmlm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/LocalDelivery
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-LocalDelivery/Makefile b/mail/p5-Email-LocalDelivery/Makefile
index 8865cf5d0aa6..1314d20feac5 100644
--- a/mail/p5-Email-LocalDelivery/Makefile
+++ b/mail/p5-Email-LocalDelivery/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-LocalDelivery
PORTVERSION= 1.200
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-LocalDelivery/pkg-plist b/mail/p5-Email-LocalDelivery/pkg-plist
index bdf011fd5841..a5dfa34b4f1d 100644
--- a/mail/p5-Email-LocalDelivery/pkg-plist
+++ b/mail/p5-Email-LocalDelivery/pkg-plist
@@ -4,8 +4,3 @@
%%SITE_PERL%%/Email/LocalDelivery.pm
%%SITE_PERL%%/Email/LocalDelivery/Maildir.pm
%%SITE_PERL%%/Email/LocalDelivery/Mbox.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/LocalDelivery
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME-Attachment-Stripper/Makefile b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
index fc0e1d89252b..986b772a8430 100644
--- a/mail/p5-Email-MIME-Attachment-Stripper/Makefile
+++ b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Email-MIME-Attachment-Stripper
PORTVERSION= 1.31.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist b/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist
index 10f619a35aa0..6cbe77e1df12 100644
--- a/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist
+++ b/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist
@@ -1,10 +1,2 @@
%%SITE_PERL%%/Email/MIME/Attachment/Stripper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment/Stripper/.packlist
%%PERL5_MAN3%%/Email::MIME::Attachment::Stripper.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment/Stripper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/MIME/Attachment
-@dirrmtry %%SITE_PERL%%/Email/MIME
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME-ContentType/Makefile b/mail/p5-Email-MIME-ContentType/Makefile
index 0998799c840b..ddc25472af58 100644
--- a/mail/p5-Email-MIME-ContentType/Makefile
+++ b/mail/p5-Email-MIME-ContentType/Makefile
@@ -2,6 +2,7 @@
PORTNAME= Email-MIME-ContentType
PORTVERSION= 1.01.7
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Email
diff --git a/mail/p5-Email-MIME-ContentType/pkg-plist b/mail/p5-Email-MIME-ContentType/pkg-plist
index 8b81d3cae57b..e12b0ed500a8 100644
--- a/mail/p5-Email-MIME-ContentType/pkg-plist
+++ b/mail/p5-Email-MIME-ContentType/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/Email/MIME/ContentType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/ContentType/.packlist
%%PERL5_MAN3%%/Email::MIME::ContentType.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/ContentType
-@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-CreateHTML/Makefile b/mail/p5-Email-MIME-CreateHTML/Makefile
index 6a7f47bc6515..10d153b2f242 100644
--- a/mail/p5-Email-MIME-CreateHTML/Makefile
+++ b/mail/p5-Email-MIME-CreateHTML/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-MIME-CreateHTML
PORTVERSION= 1.040
+PORTREVISION= 1
CATEGORIES= mail www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-MIME-CreateHTML/pkg-plist b/mail/p5-Email-MIME-CreateHTML/pkg-plist
index a3d0d8144b6f..357b9e776128 100644
--- a/mail/p5-Email-MIME-CreateHTML/pkg-plist
+++ b/mail/p5-Email-MIME-CreateHTML/pkg-plist
@@ -8,11 +8,3 @@
%%SITE_PERL%%/Email/MIME/CreateHTML/Resolver/Cached.pm
%%SITE_PERL%%/Email/MIME/CreateHTML/Resolver/Filesystem.pm
%%SITE_PERL%%/Email/MIME/CreateHTML/Resolver/LWP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/CreateHTML/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/CreateHTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/MIME/CreateHTML/Resolver
-@dirrmtry %%SITE_PERL%%/Email/MIME/CreateHTML
-@dirrmtry %%SITE_PERL%%/Email/MIME
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile b/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
index a44fa44f75dc..4ffcc8338f88 100644
--- a/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
+++ b/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
@@ -2,6 +2,7 @@
PORTNAME= Email-MIME-Creator-ISO_2022_JP
PORTVERSION= 0.02
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-MIME-Creator-ISO_2022_JP/pkg-plist b/mail/p5-Email-MIME-Creator-ISO_2022_JP/pkg-plist
index 21a9cbec7310..27107298ee5e 100644
--- a/mail/p5-Email-MIME-Creator-ISO_2022_JP/pkg-plist
+++ b/mail/p5-Email-MIME-Creator-ISO_2022_JP/pkg-plist
@@ -1,11 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Creator/ISO_2022_JP/.packlist
%%SITE_PERL%%/Email/MIME/Creator/ISO_2022_JP.pm
%%PERL5_MAN3%%/Email::MIME::Creator::ISO_2022_JP.3.gz
-@dirrmtry %%SITE_PERL%%/Email/MIME/Creator
-@dirrmtry %%SITE_PERL%%/Email/MIME
-@dirrmtry %%SITE_PERL%%/Email
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Creator/ISO_2022_JP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Creator/ISO_2022_JP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Creator
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
diff --git a/mail/p5-Email-MIME-Encodings/Makefile b/mail/p5-Email-MIME-Encodings/Makefile
index 1a3a30631d00..75aaae917b0b 100644
--- a/mail/p5-Email-MIME-Encodings/Makefile
+++ b/mail/p5-Email-MIME-Encodings/Makefile
@@ -2,6 +2,7 @@
PORTNAME= Email-MIME-Encodings
PORTVERSION= 1.315
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-MIME-Encodings/pkg-plist b/mail/p5-Email-MIME-Encodings/pkg-plist
index dd82cc26942e..05d706c19aa0 100644
--- a/mail/p5-Email-MIME-Encodings/pkg-plist
+++ b/mail/p5-Email-MIME-Encodings/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/Email/MIME/Encodings.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Encodings/.packlist
%%PERL5_MAN3%%/Email::MIME::Encodings.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Encodings
-@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 281d863af7fc..80db42a34be1 100644
--- a/mail/p5-Email-MIME/Makefile
+++ b/mail/p5-Email-MIME/Makefile
@@ -2,6 +2,7 @@
PORTNAME= Email-MIME
PORTVERSION= 1.926
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-MIME/pkg-plist b/mail/p5-Email-MIME/pkg-plist
index 82dfbc4921a0..9e4924c69e7d 100644
--- a/mail/p5-Email-MIME/pkg-plist
+++ b/mail/p5-Email-MIME/pkg-plist
@@ -3,13 +3,8 @@
%%SITE_PERL%%/Email/MIME/Encode.pm
%%SITE_PERL%%/Email/MIME/Header.pm
%%SITE_PERL%%/Email/MIME/Modifier.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/.packlist
%%PERL5_MAN3%%/Email::MIME.3.gz
%%PERL5_MAN3%%/Email::MIME::Creator.3.gz
%%PERL5_MAN3%%/Email::MIME::Encode.3.gz
%%PERL5_MAN3%%/Email::MIME::Header.3.gz
%%PERL5_MAN3%%/Email::MIME::Modifier.3.gz
-@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-MessageID/Makefile b/mail/p5-Email-MessageID/Makefile
index e3a7dd8b28b1..2f038cd787e7 100644
--- a/mail/p5-Email-MessageID/Makefile
+++ b/mail/p5-Email-MessageID/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-MessageID
PORTVERSION= 1.405
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-MessageID/pkg-plist b/mail/p5-Email-MessageID/pkg-plist
index 8180dfd7eab5..df987616026b 100644
--- a/mail/p5-Email-MessageID/pkg-plist
+++ b/mail/p5-Email-MessageID/pkg-plist
@@ -1,6 +1,2 @@
%%PERL5_MAN3%%/Email::MessageID.3.gz
%%SITE_PERL%%/Email/MessageID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MessageID/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MessageID
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Reply/Makefile b/mail/p5-Email-Reply/Makefile
index 08fcbe5f5937..805685dd1082 100644
--- a/mail/p5-Email-Reply/Makefile
+++ b/mail/p5-Email-Reply/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Reply
PORTVERSION= 1.203
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Reply/pkg-plist b/mail/p5-Email-Reply/pkg-plist
index 28cc0e85f9e6..ec27b83e0088 100644
--- a/mail/p5-Email-Reply/pkg-plist
+++ b/mail/p5-Email-Reply/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/Email/Reply.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Reply/.packlist
%%PERL5_MAN3%%/Email::Reply.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Reply
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Send/Makefile b/mail/p5-Email-Send/Makefile
index 2fefcd5e0d4d..f25b35631dcd 100644
--- a/mail/p5-Email-Send/Makefile
+++ b/mail/p5-Email-Send/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Send
PORTVERSION= 2.199
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Send/pkg-plist b/mail/p5-Email-Send/pkg-plist
index f8578751e59e..d3d001071403 100644
--- a/mail/p5-Email-Send/pkg-plist
+++ b/mail/p5-Email-Send/pkg-plist
@@ -4,14 +4,9 @@
%%SITE_PERL%%/Email/Send/SMTP.pm
%%SITE_PERL%%/Email/Send/Sendmail.pm
%%SITE_PERL%%/Email/Send/Test.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Send/.packlist
%%PERL5_MAN3%%/Email::Send.3.gz
%%PERL5_MAN3%%/Email::Send::NNTP.3.gz
%%PERL5_MAN3%%/Email::Send::Qmail.3.gz
%%PERL5_MAN3%%/Email::Send::SMTP.3.gz
%%PERL5_MAN3%%/Email::Send::Sendmail.3.gz
%%PERL5_MAN3%%/Email::Send::Test.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Send
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Send
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile b/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile
index 76cb7cecc9f4..99b9321f64b1 100644
--- a/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile
+++ b/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Sender-Transport-SMTP-TLS
PORTVERSION= 0.14
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Sender-Transport-SMTP-TLS/pkg-plist b/mail/p5-Email-Sender-Transport-SMTP-TLS/pkg-plist
index 015169648fdd..31687cb136cc 100644
--- a/mail/p5-Email-Sender-Transport-SMTP-TLS/pkg-plist
+++ b/mail/p5-Email-Sender-Transport-SMTP-TLS/pkg-plist
@@ -1,11 +1,2 @@
%%SITE_PERL%%/Email/Sender/Transport/SMTP/TLS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SMTP/TLS/.packlist
%%PERL5_MAN3%%/Email::Sender::Transport::SMTP::TLS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SMTP/TLS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Sender/Transport
-@dirrmtry %%SITE_PERL%%/Email/Sender
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Sender-Transport-SMTPS/Makefile b/mail/p5-Email-Sender-Transport-SMTPS/Makefile
index dec5a7ea72e9..b7bbfd928a7a 100644
--- a/mail/p5-Email-Sender-Transport-SMTPS/Makefile
+++ b/mail/p5-Email-Sender-Transport-SMTPS/Makefile
@@ -2,6 +2,7 @@
PORTNAME= Email-Sender-Transport-SMTPS
PORTVERSION= 0.03
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Sender-Transport-SMTPS/pkg-plist b/mail/p5-Email-Sender-Transport-SMTPS/pkg-plist
index 1fe96164363b..260865366c4f 100644
--- a/mail/p5-Email-Sender-Transport-SMTPS/pkg-plist
+++ b/mail/p5-Email-Sender-Transport-SMTPS/pkg-plist
@@ -1,4 +1,2 @@
%%PERL5_MAN3%%/Email::Sender::Transport::SMTPS.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SMTPS/.packlist
%%SITE_PERL%%/Email/Sender/Transport/SMTPS.pm
-@dirrmtry %%SITE_PERL%%/Email/Sender/Transport
diff --git a/mail/p5-Email-Sender-Transport-SQLite/Makefile b/mail/p5-Email-Sender-Transport-SQLite/Makefile
index 98c9cf80a2e5..43dbe90f98af 100644
--- a/mail/p5-Email-Sender-Transport-SQLite/Makefile
+++ b/mail/p5-Email-Sender-Transport-SQLite/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Sender-Transport-SQLite
PORTVERSION= 0.092002
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Sender-Transport-SQLite/pkg-plist b/mail/p5-Email-Sender-Transport-SQLite/pkg-plist
index 6c203ab100c5..240a9c1bba8c 100644
--- a/mail/p5-Email-Sender-Transport-SQLite/pkg-plist
+++ b/mail/p5-Email-Sender-Transport-SQLite/pkg-plist
@@ -1,10 +1,2 @@
%%SITE_PERL%%/Email/Sender/Transport/SQLite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SQLite/.packlist
%%PERL5_MAN3%%/Email::Sender::Transport::SQLite.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SQLite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Sender/Transport
-@dirrmtry %%SITE_PERL%%/Email/Sender
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Sender/Makefile b/mail/p5-Email-Sender/Makefile
index 125dc6b64388..dd6003c65c14 100644
--- a/mail/p5-Email-Sender/Makefile
+++ b/mail/p5-Email-Sender/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Sender
PORTVERSION= 1.300011
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:RJBS
diff --git a/mail/p5-Email-Sender/pkg-plist b/mail/p5-Email-Sender/pkg-plist
index 37219d7e65de..790107e315bb 100644
--- a/mail/p5-Email-Sender/pkg-plist
+++ b/mail/p5-Email-Sender/pkg-plist
@@ -22,7 +22,6 @@
%%SITE_PERL%%/Email/Sender/Transport/Test.pm
%%SITE_PERL%%/Email/Sender/Transport/Wrapper.pm
%%SITE_PERL%%/Email/Sender/Util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/.packlist
%%PERL5_MAN3%%/Email::Sender.3.gz
%%PERL5_MAN3%%/Email::Sender::Failure.3.gz
%%PERL5_MAN3%%/Email::Sender::Failure::Multi.3.gz
@@ -47,13 +46,3 @@
%%PERL5_MAN3%%/Email::Sender::Transport::Test.3.gz
%%PERL5_MAN3%%/Email::Sender::Transport::Wrapper.3.gz
%%PERL5_MAN3%%/Email::Sender::Util.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Sender/Transport/SMTP
-@dirrmtry %%SITE_PERL%%/Email/Sender/Transport
-@dirrmtry %%SITE_PERL%%/Email/Sender/Success
-@dirrmtry %%SITE_PERL%%/Email/Sender/Role
-@dirrmtry %%SITE_PERL%%/Email/Sender/Manual
-@dirrmtry %%SITE_PERL%%/Email/Sender/Failure
-@dirrmtry %%SITE_PERL%%/Email/Sender
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Simple-FromHandle/Makefile b/mail/p5-Email-Simple-FromHandle/Makefile
index 984bd443c816..2f874e5d288a 100644
--- a/mail/p5-Email-Simple-FromHandle/Makefile
+++ b/mail/p5-Email-Simple-FromHandle/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Simple-FromHandle
PORTVERSION= 0.054
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Simple-FromHandle/pkg-plist b/mail/p5-Email-Simple-FromHandle/pkg-plist
index 5672e2809fdb..db6dd57f2f09 100644
--- a/mail/p5-Email-Simple-FromHandle/pkg-plist
+++ b/mail/p5-Email-Simple-FromHandle/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/mach/auto/Email/Simple/FromHandle/.packlist
%%SITE_PERL%%/Email/Simple/FromHandle.pm
%%PERL5_MAN3%%/Email::Simple::FromHandle.3.gz
-@dirrmtry %%SITE_PERL%%/Email/Simple
-@dirrmtry %%SITE_PERL%%/mach/auto/Email/Simple/FromHandle
diff --git a/mail/p5-Email-Simple/Makefile b/mail/p5-Email-Simple/Makefile
index 82e00133ae62..20cf2691b0a3 100644
--- a/mail/p5-Email-Simple/Makefile
+++ b/mail/p5-Email-Simple/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Simple
PORTVERSION= 2.203
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:RJBS
diff --git a/mail/p5-Email-Simple/pkg-plist b/mail/p5-Email-Simple/pkg-plist
index 92ae840b4f88..0054552e6e2c 100644
--- a/mail/p5-Email-Simple/pkg-plist
+++ b/mail/p5-Email-Simple/pkg-plist
@@ -4,8 +4,3 @@
%%SITE_PERL%%/Email/Simple.pm
%%SITE_PERL%%/Email/Simple/Creator.pm
%%SITE_PERL%%/Email/Simple/Header.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email/Simple
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Stuffer/Makefile b/mail/p5-Email-Stuffer/Makefile
index d40bdfbf56bf..d2f33ca6a1bb 100644
--- a/mail/p5-Email-Stuffer/Makefile
+++ b/mail/p5-Email-Stuffer/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Stuffer
PORTVERSION= 0.009
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Stuffer/pkg-plist b/mail/p5-Email-Stuffer/pkg-plist
index 9beb7071674b..8d1b6822a634 100644
--- a/mail/p5-Email-Stuffer/pkg-plist
+++ b/mail/p5-Email-Stuffer/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/Email/Stuffer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Stuffer/.packlist
%%PERL5_MAN3%%/Email::Stuffer.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Stuffer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Valid-Loose/Makefile b/mail/p5-Email-Valid-Loose/Makefile
index d89d69ad7c96..9186f2e65165 100644
--- a/mail/p5-Email-Valid-Loose/Makefile
+++ b/mail/p5-Email-Valid-Loose/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Valid-Loose
PORTVERSION= 0.05
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-Valid-Loose/pkg-plist b/mail/p5-Email-Valid-Loose/pkg-plist
index 25628901a574..d58e9f8ce635 100644
--- a/mail/p5-Email-Valid-Loose/pkg-plist
+++ b/mail/p5-Email-Valid-Loose/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Valid/Loose/.packlist
%%SITE_PERL%%/Email/Valid/Loose.pm
%%PERL5_MAN3%%/Email::Valid::Loose.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Valid/Loose
-@dirrm %%SITE_PERL%%/Email/Valid
diff --git a/mail/p5-Email-Valid/Makefile b/mail/p5-Email-Valid/Makefile
index e8e6f79a7fab..9d3864d727ee 100644
--- a/mail/p5-Email-Valid/Makefile
+++ b/mail/p5-Email-Valid/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Email-Valid
PORTVERSION= 1.192
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:RJBS
diff --git a/mail/p5-Email-Valid/pkg-plist b/mail/p5-Email-Valid/pkg-plist
index 1060781de992..af1573800c26 100644
--- a/mail/p5-Email-Valid/pkg-plist
+++ b/mail/p5-Email-Valid/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Valid/.packlist
%%SITE_PERL%%/Email/Valid.pm
%%PERL5_MAN3%%/Email::Valid.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Valid
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
-@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-FuzzyOcr-devel/Makefile b/mail/p5-FuzzyOcr-devel/Makefile
index 42d93bb86dca..36a5902d7538 100644
--- a/mail/p5-FuzzyOcr-devel/Makefile
+++ b/mail/p5-FuzzyOcr-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= FuzzyOcr
DISTVERSION= 3.6.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= mail perl5
MASTER_SITES= http://users.own-hero.net/~decoder/${PORTNAME:tl}/
PKGNAMEPREFIX= p5-
@@ -73,9 +73,9 @@ post-patch:
${WRKSRC}/FuzzyOcr.pm
do-install:
- @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${SITE_PERL}/${SA_PLUGINDIR}/FuzzyOcr
- ${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.pm ${STAGEDIR}${SITE_PERL}/${SA_PLUGINDIR}
- ${INSTALL_DATA} ${WRKSRC}/FuzzyOcr/*.pm ${STAGEDIR}${SITE_PERL}/${SA_PLUGINDIR}/FuzzyOcr
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${SA_PLUGINDIR}/FuzzyOcr
+ ${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${SA_PLUGINDIR}
+ ${INSTALL_DATA} ${WRKSRC}/FuzzyOcr/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${SA_PLUGINDIR}/FuzzyOcr
${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.cf ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.words ${STAGEDIR}${EXAMPLESDIR}/FuzzyOcr.words
${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.scansets ${STAGEDIR}${EXAMPLESDIR}/FuzzyOcr.scansets
diff --git a/mail/p5-GMail-IMAPD/Makefile b/mail/p5-GMail-IMAPD/Makefile
index 056a1e02bc88..4e33e47173c1 100644
--- a/mail/p5-GMail-IMAPD/Makefile
+++ b/mail/p5-GMail-IMAPD/Makefile
@@ -3,6 +3,7 @@
PORTNAME= GMail-IMAPD
PORTVERSION= 0.94
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-GMail-IMAPD/pkg-plist b/mail/p5-GMail-IMAPD/pkg-plist
index 158589efb383..5017734167bd 100644
--- a/mail/p5-GMail-IMAPD/pkg-plist
+++ b/mail/p5-GMail-IMAPD/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/GMail/IMAPD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GMail/IMAPD/.packlist
%%PERL5_MAN3%%/GMail::IMAPD.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GMail/IMAPD
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GMail
-@dirrm %%SITE_PERL%%/GMail
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index 66b83e76f469..3489ee3dfa5b 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= IMAP-Admin
PORTVERSION= 1.6.7
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-IMAP-Admin/pkg-plist b/mail/p5-IMAP-Admin/pkg-plist
index 17ee383e6465..defaef1a73d5 100644
--- a/mail/p5-IMAP-Admin/pkg-plist
+++ b/mail/p5-IMAP-Admin/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/IMAP/Admin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Admin/.packlist
%%PERL5_MAN3%%/IMAP::Admin.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Admin
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP
-@dirrm %%SITE_PERL%%/IMAP
diff --git a/mail/p5-IMAP-Client/Makefile b/mail/p5-IMAP-Client/Makefile
index d17cb41a9569..ee11092db66b 100644
--- a/mail/p5-IMAP-Client/Makefile
+++ b/mail/p5-IMAP-Client/Makefile
@@ -3,6 +3,7 @@
PORTNAME= IMAP-Client
PORTVERSION= 0.13
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-IMAP-Client/pkg-plist b/mail/p5-IMAP-Client/pkg-plist
index b31f38bab8ee..f1c6f754dc6f 100644
--- a/mail/p5-IMAP-Client/pkg-plist
+++ b/mail/p5-IMAP-Client/pkg-plist
@@ -1,6 +1,2 @@
%%PERL5_MAN3%%/IMAP::Client.3.gz
%%SITE_PERL%%/IMAP/Client.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Client/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP
-@dirrmtry %%SITE_PERL%%/IMAP
diff --git a/mail/p5-IMAP-Sieve/Makefile b/mail/p5-IMAP-Sieve/Makefile
index 60b1e0c47ec0..6fb276e9d8df 100644
--- a/mail/p5-IMAP-Sieve/Makefile
+++ b/mail/p5-IMAP-Sieve/Makefile
@@ -3,7 +3,7 @@
PORTNAME= IMAP-Sieve
PORTVERSION= 0.4.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail perl5
MASTER_SITES= SF/websieve/websieve/063a
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-IMAP-Sieve/pkg-plist b/mail/p5-IMAP-Sieve/pkg-plist
index 8b4ee3a0d4ba..a67d62a0955a 100644
--- a/mail/p5-IMAP-Sieve/pkg-plist
+++ b/mail/p5-IMAP-Sieve/pkg-plist
@@ -1,5 +1 @@
%%SITE_PERL%%/IMAP/Sieve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Sieve/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Sieve
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP
-@dirrmtry %%SITE_PERL%%/IMAP
diff --git a/mail/p5-LMAP-CID2SPF/Makefile b/mail/p5-LMAP-CID2SPF/Makefile
index 61652d99f4dd..9f9048b1cfb4 100644
--- a/mail/p5-LMAP-CID2SPF/Makefile
+++ b/mail/p5-LMAP-CID2SPF/Makefile
@@ -3,7 +3,7 @@
PORTNAME= LMAP-CID2SPF
PORTVERSION= 0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= http://www.baschny.de/spf/
PKGNAMEPREFIX= p5-
@@ -23,8 +23,8 @@ USE_PERL5= configure
SHEBANG_FILES= cid2spf
do-install:
- @${MKDIR} ${STAGEDIR}${SITE_PERL}/LMAP
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/LMAP
cd ${WRKSRC} && ${INSTALL_SCRIPT} cid2spf ${STAGEDIR}${PREFIX}/bin
- cd ${WRKSRC} && ${INSTALL_DATA} CID2SPF.pm ${STAGEDIR}${SITE_PERL}/LMAP
+ cd ${WRKSRC} && ${INSTALL_DATA} CID2SPF.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/LMAP
.include <bsd.port.mk>
diff --git a/mail/p5-LMAP-CID2SPF/pkg-plist b/mail/p5-LMAP-CID2SPF/pkg-plist
index ce9adbaed876..98e3ab4d55ba 100644
--- a/mail/p5-LMAP-CID2SPF/pkg-plist
+++ b/mail/p5-LMAP-CID2SPF/pkg-plist
@@ -1,3 +1,2 @@
bin/cid2spf
%%SITE_PERL%%/LMAP/CID2SPF.pm
-@dirrmtry %%SITE_PERL%%/LMAP
diff --git a/mail/p5-Log-Procmail/Makefile b/mail/p5-Log-Procmail/Makefile
index 05bc0cebfefc..2b5e257ec1c3 100644
--- a/mail/p5-Log-Procmail/Makefile
+++ b/mail/p5-Log-Procmail/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Log-Procmail
PORTVERSION= 0.12
+PORTREVISION= 1
CATEGORIES= mail devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Log-Procmail/pkg-plist b/mail/p5-Log-Procmail/pkg-plist
index 9abf3db55d35..06b2beb5c038 100644
--- a/mail/p5-Log-Procmail/pkg-plist
+++ b/mail/p5-Log-Procmail/pkg-plist
@@ -1,8 +1,4 @@
bin/mailstat.pl
%%PERL5_MAN3%%/Log::Procmail.3.gz
%%SITE_PERL%%/Log/Procmail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Procmail/.packlist
man/man1/mailstat.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Procmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
-@dirrmtry %%SITE_PERL%%/Log
diff --git a/mail/p5-MIME-AltWords/Makefile b/mail/p5-MIME-AltWords/Makefile
index 49c7f6f18cde..24084156a4ba 100644
--- a/mail/p5-MIME-AltWords/Makefile
+++ b/mail/p5-MIME-AltWords/Makefile
@@ -3,6 +3,7 @@
PORTNAME= MIME-AltWords
PORTVERSION= 0.12
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-MIME-AltWords/pkg-plist b/mail/p5-MIME-AltWords/pkg-plist
index 497d30d01d96..aa6ac19917a1 100644
--- a/mail/p5-MIME-AltWords/pkg-plist
+++ b/mail/p5-MIME-AltWords/pkg-plist
@@ -1,8 +1,4 @@
%%SITE_PERL%%/MIME/AltWords.pm
%%SITE_PERL%%/MIME/AltWords0.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/AltWords/.packlist
%%PERL5_MAN3%%/MIME::AltWords.3.gz
%%PERL5_MAN3%%/MIME::AltWords0.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/AltWords
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Charset/Makefile b/mail/p5-MIME-Charset/Makefile
index e07d05adacc8..df69aa791d42 100644
--- a/mail/p5-MIME-Charset/Makefile
+++ b/mail/p5-MIME-Charset/Makefile
@@ -3,6 +3,7 @@
PORTNAME= MIME-Charset
PORTVERSION= 1.011.1
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-MIME-Charset/pkg-plist b/mail/p5-MIME-Charset/pkg-plist
index 40a4158f613b..1525e08c69a3 100644
--- a/mail/p5-MIME-Charset/pkg-plist
+++ b/mail/p5-MIME-Charset/pkg-plist
@@ -3,13 +3,5 @@
%%SITE_PERL%%/MIME/Charset/UTF.pm
%%SITE_PERL%%/MIME/Charset/_Compat.pm
%%SITE_PERL%%/POD2/JA/MIME/Charset.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Charset/.packlist
%%PERL5_MAN3%%/MIME::Charset.3.gz
%%PERL5_MAN3%%/POD2::JA::MIME::Charset.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Charset
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/MIME/Charset
-@dirrmtry %%SITE_PERL%%/MIME
-@dirrmtry %%SITE_PERL%%/POD2/JA/MIME
-@dirrmtry %%SITE_PERL%%/POD2/JA
-@dirrmtry %%SITE_PERL%%/POD2
diff --git a/mail/p5-MIME-EcoEncode/Makefile b/mail/p5-MIME-EcoEncode/Makefile
index 005a4c13ebb6..a38f4f99a0c3 100644
--- a/mail/p5-MIME-EcoEncode/Makefile
+++ b/mail/p5-MIME-EcoEncode/Makefile
@@ -2,6 +2,7 @@
PORTNAME= MIME-EcoEncode
PORTVERSION= 0.95
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-MIME-EcoEncode/pkg-plist b/mail/p5-MIME-EcoEncode/pkg-plist
index 4ada70a4df34..d293b3019164 100644
--- a/mail/p5-MIME-EcoEncode/pkg-plist
+++ b/mail/p5-MIME-EcoEncode/pkg-plist
@@ -1,7 +1,6 @@
%%PERL5_MAN3%%/MIME::EcoEncode.3.gz
%%PERL5_MAN3%%/MIME::EcoEncode::Fold.3.gz
%%PERL5_MAN3%%/MIME::EcoEncode::Param.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/EcoEncode/.packlist
%%SITE_PERL%%/MIME/EcoEncode.pm
%%SITE_PERL%%/MIME/EcoEncode.pod
%%SITE_PERL%%/MIME/EcoEncode/Fold.pm
@@ -10,7 +9,3 @@
%%SITE_PERL%%/MIME/EcoEncode/JP_Q.pm
%%SITE_PERL%%/MIME/EcoEncode/Param.pm
%%SITE_PERL%%/MIME/EcoEncode/Param.pod
-@dirrm %%SITE_PERL%%/MIME/EcoEncode
-@dirrmtry %%SITE_PERL%%/MIME
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/EcoEncode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
diff --git a/mail/p5-MIME-EncWords/Makefile b/mail/p5-MIME-EncWords/Makefile
index 0b0939eef425..6e03490c1690 100644
--- a/mail/p5-MIME-EncWords/Makefile
+++ b/mail/p5-MIME-EncWords/Makefile
@@ -3,6 +3,7 @@
PORTNAME= MIME-EncWords
PORTVERSION= 1.011.1
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-MIME-EncWords/pkg-plist b/mail/p5-MIME-EncWords/pkg-plist
index 3f2389de8860..1ef6770c3dde 100644
--- a/mail/p5-MIME-EncWords/pkg-plist
+++ b/mail/p5-MIME-EncWords/pkg-plist
@@ -1,10 +1,5 @@
%%SITE_PERL%%/MIME/EncWords.pm
%%SITE_PERL%%/MIME/EncWords/Defaults.pm.sample
%%SITE_PERL%%/MIME/EncWords/JA_JP.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/EncWords/.packlist
%%PERL5_MAN3%%/MIME::EncWords.3.gz
%%PERL5_MAN3%%/MIME::EncWords::JA_JP.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/EncWords
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/MIME/EncWords
-@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Explode/Makefile b/mail/p5-MIME-Explode/Makefile
index c6b265b6332c..0992d4fc6dc6 100644
--- a/mail/p5-MIME-Explode/Makefile
+++ b/mail/p5-MIME-Explode/Makefile
@@ -3,6 +3,7 @@
PORTNAME= MIME-Explode
PORTVERSION= 0.39
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-MIME-Explode/pkg-plist b/mail/p5-MIME-Explode/pkg-plist
index 112c0ace4cd7..108303daadfa 100644
--- a/mail/p5-MIME-Explode/pkg-plist
+++ b/mail/p5-MIME-Explode/pkg-plist
@@ -1,8 +1,4 @@
%%PERL5_MAN3%%/MIME::Explode.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/MIME/Explode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Explode/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Explode/Explode.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Explode/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Explode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MIME
+%%SITE_ARCH%%/MIME/Explode.pm
+%%SITE_ARCH%%/auto/MIME/Explode/Explode.so
+%%SITE_ARCH%%/auto/MIME/Explode/autosplit.ix
diff --git a/mail/p5-MIME-Fast/Makefile b/mail/p5-MIME-Fast/Makefile
index 5eae7e572508..ae625532996e 100644
--- a/mail/p5-MIME-Fast/Makefile
+++ b/mail/p5-MIME-Fast/Makefile
@@ -3,7 +3,7 @@
PORTNAME= MIME-Fast
PORTVERSION= 1.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-MIME-Fast/pkg-plist b/mail/p5-MIME-Fast/pkg-plist
index d95dc13f23f4..01f8b60db063 100644
--- a/mail/p5-MIME-Fast/pkg-plist
+++ b/mail/p5-MIME-Fast/pkg-plist
@@ -1,9 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/MIME/Fast.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MIME/Fast.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast/Fast.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast/autosplit.ix
+%%SITE_ARCH%%/MIME/Fast.pm
+%%SITE_ARCH%%/MIME/Fast.pod
+%%SITE_ARCH%%/auto/MIME/Fast/Fast.so
+%%SITE_ARCH%%/auto/MIME/Fast/autosplit.ix
%%PERL5_MAN3%%/MIME::Fast.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MIME
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
diff --git a/mail/p5-MIME-Lite-HTML/Makefile b/mail/p5-MIME-Lite-HTML/Makefile
index 9e6ab0d19754..5c59f50061c5 100644
--- a/mail/p5-MIME-Lite-HTML/Makefile
+++ b/mail/p5-MIME-Lite-HTML/Makefile
@@ -3,6 +3,7 @@
PORTNAME= MIME-Lite-HTML
PORTVERSION= 1.24
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-MIME-Lite-HTML/pkg-plist b/mail/p5-MIME-Lite-HTML/pkg-plist
index 330242735982..a65c41b977ab 100644
--- a/mail/p5-MIME-Lite-HTML/pkg-plist
+++ b/mail/p5-MIME-Lite-HTML/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/MIME/Lite/HTML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/HTML/.packlist
%%PERL5_MAN3%%/MIME::Lite::HTML.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/HTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/MIME/Lite
-@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Lite-TT-HTML/Makefile b/mail/p5-MIME-Lite-TT-HTML/Makefile
index e7a265071ef8..3a1cdac920fd 100644
--- a/mail/p5-MIME-Lite-TT-HTML/Makefile
+++ b/mail/p5-MIME-Lite-TT-HTML/Makefile
@@ -3,6 +3,7 @@
PORTNAME= MIME-Lite-TT-HTML
PORTVERSION= 0.04
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-MIME-Lite-TT-HTML/pkg-plist b/mail/p5-MIME-Lite-TT-HTML/pkg-plist
index f5cbf702b892..b7ae1d37e5a0 100644
--- a/mail/p5-MIME-Lite-TT-HTML/pkg-plist
+++ b/mail/p5-MIME-Lite-TT-HTML/pkg-plist
@@ -1,5 +1,2 @@
%%SITE_PERL%%/MIME/Lite/TT/HTML.pm
%%PERL5_MAN3%%/MIME::Lite::TT::HTML.3.gz
-@dirrmtry %%SITE_PERL%%/MIME/Lite/TT
-@dirrmtry %%SITE_PERL%%/MIME/Lite
-@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Lite-TT/Makefile b/mail/p5-MIME-Lite-TT/Makefile
index 83678cae3b89..c18f619a3116 100644
--- a/mail/p5-MIME-Lite-TT/Makefile
+++ b/mail/p5-MIME-Lite-TT/Makefile
@@ -3,7 +3,7 @@
PORTNAME= MIME-Lite-TT
PORTVERSION= 0.02
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-MIME-Lite-TT/pkg-plist b/mail/p5-MIME-Lite-TT/pkg-plist
index e0528d4b3d77..6a6c8106b3cb 100644
--- a/mail/p5-MIME-Lite-TT/pkg-plist
+++ b/mail/p5-MIME-Lite-TT/pkg-plist
@@ -1,9 +1,2 @@
%%SITE_PERL%%/MIME/Lite/TT.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/TT/.packlist
%%PERL5_MAN3%%/MIME::Lite::TT.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/TT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%/MIME/Lite
-@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Lite/Makefile b/mail/p5-MIME-Lite/Makefile
index f73da155383e..a3213adb9a8c 100644
--- a/mail/p5-MIME-Lite/Makefile
+++ b/mail/p5-MIME-Lite/Makefile
@@ -3,6 +3,7 @@
PORTNAME= MIME-Lite
PORTVERSION= 3.03.0
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-MIME-Lite/pkg-plist b/mail/p5-MIME-Lite/pkg-plist
index 64d15f6193b5..b7640d87f907 100644
--- a/mail/p5-MIME-Lite/pkg-plist
+++ b/mail/p5-MIME-Lite/pkg-plist
@@ -1,8 +1,4 @@
%%SITE_PERL%%/MIME/Lite.pm
%%SITE_PERL%%/MIME/changes.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/.packlist
%%PERL5_MAN3%%/MIME::Lite.3.gz
%%PERL5_MAN3%%/MIME::changes.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Tools/Makefile b/mail/p5-MIME-Tools/Makefile
index 8bc3f41f3b46..03d9e1e424fd 100644
--- a/mail/p5-MIME-Tools/Makefile
+++ b/mail/p5-MIME-Tools/Makefile
@@ -3,6 +3,7 @@
PORTNAME= MIME-Tools
PORTVERSION= 5.505
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
diff --git a/mail/p5-MIME-Tools/pkg-plist b/mail/p5-MIME-Tools/pkg-plist
index daa52f36c42c..7feb44b10e6b 100644
--- a/mail/p5-MIME-Tools/pkg-plist
+++ b/mail/p5-MIME-Tools/pkg-plist
@@ -42,10 +42,3 @@
%%SITE_PERL%%/MIME/Tools.pm
%%SITE_PERL%%/MIME/WordDecoder.pm
%%SITE_PERL%%/MIME/Words.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Tools/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Tools
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/MIME/Parser
-@dirrmtry %%SITE_PERL%%/MIME/Field
-@dirrmtry %%SITE_PERL%%/MIME/Decoder
-@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Types/Makefile b/mail/p5-MIME-Types/Makefile
index 7c8c7e8e2ed8..afe602d4c699 100644
--- a/mail/p5-MIME-Types/Makefile
+++ b/mail/p5-MIME-Types/Makefile
@@ -2,6 +2,7 @@
PORTNAME= MIME-Types
PORTVERSION= 2.09
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MARKOV
diff --git a/mail/p5-MIME-Types/pkg-plist b/mail/p5-MIME-Types/pkg-plist
index e41848c0bdee..5d2b8e26337c 100644
--- a/mail/p5-MIME-Types/pkg-plist
+++ b/mail/p5-MIME-Types/pkg-plist
@@ -8,9 +8,3 @@
%%SITE_PERL%%/MIME/types.db
%%SITE_PERL%%/MojoX/MIME/Types.pm
%%SITE_PERL%%/MojoX/MIME/Types.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Types/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Types
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
-@dirrmtry %%SITE_PERL%%/MIME
-@dirrmtry %%SITE_PERL%%/MojoX/MIME
-@dirrmtry %%SITE_PERL%%/MojoX
diff --git a/mail/p5-Mail-Address-MobileJp/Makefile b/mail/p5-Mail-Address-MobileJp/Makefile
index a467929c5b28..43f1b0b578eb 100644
--- a/mail/p5-Mail-Address-MobileJp/Makefile
+++ b/mail/p5-Mail-Address-MobileJp/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Address-MobileJp
PORTVERSION= 0.09
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Address-MobileJp/pkg-plist b/mail/p5-Mail-Address-MobileJp/pkg-plist
index b9aaed64fd0e..3d6e05226a1d 100644
--- a/mail/p5-Mail-Address-MobileJp/pkg-plist
+++ b/mail/p5-Mail-Address-MobileJp/pkg-plist
@@ -1,8 +1,2 @@
%%PERL5_MAN3%%/Mail::Address::MobileJp.3.gz
%%SITE_PERL%%/Mail/Address/MobileJp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address/MobileJp/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address/MobileJp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Address
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Alias/Makefile b/mail/p5-Mail-Alias/Makefile
index 830fdaa3c130..3a65c92bccf2 100644
--- a/mail/p5-Mail-Alias/Makefile
+++ b/mail/p5-Mail-Alias/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Alias
PORTVERSION= 1.12
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Alias/pkg-plist b/mail/p5-Mail-Alias/pkg-plist
index e36a99f7e505..beee3127cc7c 100644
--- a/mail/p5-Mail-Alias/pkg-plist
+++ b/mail/p5-Mail-Alias/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/Mail/Alias.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Alias/.packlist
%%PERL5_MAN3%%/Mail::Alias.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Alias
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Audit-Attach/Makefile b/mail/p5-Mail-Audit-Attach/Makefile
index b0c63a4231c2..a8e403b97515 100644
--- a/mail/p5-Mail-Audit-Attach/Makefile
+++ b/mail/p5-Mail-Audit-Attach/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Audit-Attach
PORTVERSION= 0.96
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Audit-Attach/pkg-plist b/mail/p5-Mail-Audit-Attach/pkg-plist
index 94c93d104029..e6d180c9307a 100644
--- a/mail/p5-Mail-Audit-Attach/pkg-plist
+++ b/mail/p5-Mail-Audit-Attach/pkg-plist
@@ -1,8 +1,2 @@
%%PERL5_MAN3%%/Mail::Audit::Attach.3.gz
%%SITE_PERL%%/Mail/Audit/Attach.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit/Attach/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit/Attach
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Audit
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Audit/Makefile b/mail/p5-Mail-Audit/Makefile
index ece8eaabe401..c1b506d35fb3 100644
--- a/mail/p5-Mail-Audit/Makefile
+++ b/mail/p5-Mail-Audit/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Audit
PORTVERSION= 2.2.27
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Audit/pkg-plist b/mail/p5-Mail-Audit/pkg-plist
index 7e989aa6b591..6e5944db4643 100644
--- a/mail/p5-Mail-Audit/pkg-plist
+++ b/mail/p5-Mail-Audit/pkg-plist
@@ -12,9 +12,3 @@
%%SITE_PERL%%/Mail/Audit/MimeEntity.pm
%%SITE_PERL%%/Mail/Audit/Util/Tempdir.pm
%%SITE_PERL%%/Mail/Audit/Vacation.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Audit/Util
-@dirrmtry %%SITE_PERL%%/Mail/Audit
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Box-Parser-C/Makefile b/mail/p5-Mail-Box-Parser-C/Makefile
index f193b3f82940..1125afdb3807 100644
--- a/mail/p5-Mail-Box-Parser-C/Makefile
+++ b/mail/p5-Mail-Box-Parser-C/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Box-Parser-C
PORTVERSION= 3.007
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Box-Parser-C/pkg-plist b/mail/p5-Mail-Box-Parser-C/pkg-plist
index ef42309c4845..79d3709a4b30 100644
--- a/mail/p5-Mail-Box-Parser-C/pkg-plist
+++ b/mail/p5-Mail-Box-Parser-C/pkg-plist
@@ -1,12 +1,4 @@
%%PERL5_MAN3%%/Mail::Box::Parser::C.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box/Parser/C.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box/Parser/C.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C/C.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box/Parser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail
+%%SITE_ARCH%%/Mail/Box/Parser/C.pm
+%%SITE_ARCH%%/Mail/Box/Parser/C.pod
+%%SITE_ARCH%%/auto/Mail/Box/Parser/C/C.so
diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
index 7e06430ced06..7a2439c4882f 100644
--- a/mail/p5-Mail-Box/Makefile
+++ b/mail/p5-Mail-Box/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Mail-Box
PORTVERSION= 2.109
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MARKOV
diff --git a/mail/p5-Mail-Box/pkg-plist b/mail/p5-Mail-Box/pkg-plist
index 5f58d0049a01..755405b3d4b1 100644
--- a/mail/p5-Mail-Box/pkg-plist
+++ b/mail/p5-Mail-Box/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/.packlist
%%SITE_PERL%%/Mail/Box-Cookbook.pod
%%SITE_PERL%%/Mail/Box-Index.pod
%%SITE_PERL%%/Mail/Box-Overview.pod
@@ -371,35 +370,3 @@
%%PERL5_MAN3%%/Mail::Transport::SMTP.3.gz
%%PERL5_MAN3%%/Mail::Transport::Send.3.gz
%%PERL5_MAN3%%/Mail::Transport::Sendmail.3.gz
-@dirrmtry %%SITE_PERL%%/Mail/Transport
-@dirrmtry %%SITE_PERL%%/Mail/Server/IMAP4
-@dirrmtry %%SITE_PERL%%/Mail/Server
-@dirrmtry %%SITE_PERL%%/Mail/Message/Wrapper
-@dirrmtry %%SITE_PERL%%/Mail/Message/TransferEnc
-@dirrmtry %%SITE_PERL%%/Mail/Message/Replace
-@dirrmtry %%SITE_PERL%%/Mail/Message/Head
-@dirrmtry %%SITE_PERL%%/Mail/Message/Field
-@dirrmtry %%SITE_PERL%%/Mail/Message/Convert
-@dirrmtry %%SITE_PERL%%/Mail/Message/Construct
-@dirrmtry %%SITE_PERL%%/Mail/Message/Body
-@dirrmtry %%SITE_PERL%%/Mail/Message
-@dirrmtry %%SITE_PERL%%/Mail/Box/Tie
-@dirrmtry %%SITE_PERL%%/Mail/Box/Thread
-@dirrmtry %%SITE_PERL%%/Mail/Box/Search
-@dirrmtry %%SITE_PERL%%/Mail/Box/Parser
-@dirrmtry %%SITE_PERL%%/Mail/Box/POP3
-@dirrmtry %%SITE_PERL%%/Mail/Box/Net
-@dirrmtry %%SITE_PERL%%/Mail/Box/Message
-@dirrmtry %%SITE_PERL%%/Mail/Box/Mbox
-@dirrmtry %%SITE_PERL%%/Mail/Box/Manage
-@dirrmtry %%SITE_PERL%%/Mail/Box/Maildir
-@dirrmtry %%SITE_PERL%%/Mail/Box/MH
-@dirrmtry %%SITE_PERL%%/Mail/Box/Locker
-@dirrmtry %%SITE_PERL%%/Mail/Box/IMAP4
-@dirrmtry %%SITE_PERL%%/Mail/Box/File
-@dirrmtry %%SITE_PERL%%/Mail/Box/Dir
-@dirrmtry %%SITE_PERL%%/Mail/Box/Dbx
-@dirrmtry %%SITE_PERL%%/Mail/Box
-@dirrmtry %%SITE_PERL%%/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-Bulkmail/Makefile b/mail/p5-Mail-Bulkmail/Makefile
index b8988a6d4e34..9544903e11e1 100644
--- a/mail/p5-Mail-Bulkmail/Makefile
+++ b/mail/p5-Mail-Bulkmail/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Bulkmail
PORTVERSION= 3.12
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Bulkmail/pkg-plist b/mail/p5-Mail-Bulkmail/pkg-plist
index bcbc5589a9ed..3d4d5c7449ad 100644
--- a/mail/p5-Mail-Bulkmail/pkg-plist
+++ b/mail/p5-Mail-Bulkmail/pkg-plist
@@ -3,13 +3,8 @@
%%SITE_PERL%%/Mail/Bulkmail/Object.pm
%%SITE_PERL%%/Mail/Bulkmail/Server.pm
%%SITE_PERL%%/Mail/Bulkmail/DummyServer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Bulkmail/.packlist
%%PERL5_MAN3%%/Mail::Bulkmail.3.gz
%%PERL5_MAN3%%/Mail::Bulkmail::DummyServer.3.gz
%%PERL5_MAN3%%/Mail::Bulkmail::Dynamic.3.gz
%%PERL5_MAN3%%/Mail::Bulkmail::Object.3.gz
%%PERL5_MAN3%%/Mail::Bulkmail::Server.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Bulkmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/Bulkmail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Cache/Makefile b/mail/p5-Mail-Cache/Makefile
index 455a6577260a..370a919a1de1 100644
--- a/mail/p5-Mail-Cache/Makefile
+++ b/mail/p5-Mail-Cache/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Cache
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:VVELOX
diff --git a/mail/p5-Mail-Cache/pkg-plist b/mail/p5-Mail-Cache/pkg-plist
index 6eb9a05cebc3..66fe5e4bd65d 100644
--- a/mail/p5-Mail-Cache/pkg-plist
+++ b/mail/p5-Mail-Cache/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/Mail/Cache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cache/.packlist
%%PERL5_MAN3%%/Mail::Cache.3.gz
-@dirrmtry %%SITE_PERL%%/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-CheckUser/Makefile b/mail/p5-Mail-CheckUser/Makefile
index db31ae61f339..00220121ac44 100644
--- a/mail/p5-Mail-CheckUser/Makefile
+++ b/mail/p5-Mail-CheckUser/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Mail-CheckUser
PORTVERSION= 1.21
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-CheckUser/pkg-plist b/mail/p5-Mail-CheckUser/pkg-plist
index 497cea77f5ca..5e9dfc4814c0 100644
--- a/mail/p5-Mail-CheckUser/pkg-plist
+++ b/mail/p5-Mail-CheckUser/pkg-plist
@@ -1,8 +1,4 @@
%%SITE_PERL%%/Mail/CheckUser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/CheckUser/.packlist
bin/cufilter
%%PERL5_MAN3%%/Mail::CheckUser.3.gz
man/man1/cufilter.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/CheckUser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
index c2a4026eb96c..e04a666de419 100644
--- a/mail/p5-Mail-ClamAV/Makefile
+++ b/mail/p5-Mail-ClamAV/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Mail-ClamAV
PORTVERSION= 0.29
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-ClamAV/pkg-plist b/mail/p5-Mail-ClamAV/pkg-plist
index d381790e0642..fca4e126b388 100644
--- a/mail/p5-Mail-ClamAV/pkg-plist
+++ b/mail/p5-Mail-ClamAV/pkg-plist
@@ -1,7 +1,3 @@
%%PERL5_MAN3%%/Mail::ClamAV.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Mail/ClamAV.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ClamAV/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ClamAV/ClamAV.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ClamAV
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail
+%%SITE_ARCH%%/Mail/ClamAV.pm
+%%SITE_ARCH%%/auto/Mail/ClamAV/ClamAV.so
diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile
index 22f7b418424c..b2453282c27e 100644
--- a/mail/p5-Mail-DKIM/Makefile
+++ b/mail/p5-Mail-DKIM/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-DKIM
PORTVERSION= 0.40
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-DKIM/pkg-plist b/mail/p5-Mail-DKIM/pkg-plist
index 044b0b2ed13d..e2344097ed6e 100644
--- a/mail/p5-Mail-DKIM/pkg-plist
+++ b/mail/p5-Mail-DKIM/pkg-plist
@@ -48,10 +48,3 @@ bin/dkimverify.pl
%%SITE_PERL%%/Mail/DKIM/TextWrap.pm
%%SITE_PERL%%/Mail/DKIM/Verifier.pm
%%SITE_PERL%%/Mail/sample_mime_lite.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DKIM/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DKIM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/DKIM/Canonicalization
-@dirrmtry %%SITE_PERL%%/Mail/DKIM/Algorithm
-@dirrmtry %%SITE_PERL%%/Mail/DKIM
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile b/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
index ec50bea279f3..eef62fd20f6a 100644
--- a/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
+++ b/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-DeliveryStatus-BounceParser
PORTVERSION= 1.5.34
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist b/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist
index c641e811191e..ffe3e2693dc9 100644
--- a/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist
+++ b/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist
@@ -1,9 +1,3 @@
%%SITE_PERL%%/Mail/DeliveryStatus/BounceParser.pm
%%SITE_PERL%%/Mail/DeliveryStatus/Report.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus/BounceParser/.packlist
%%PERL5_MAN3%%/Mail::DeliveryStatus::BounceParser.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus/BounceParser
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/DeliveryStatus
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-DomainKeys/Makefile b/mail/p5-Mail-DomainKeys/Makefile
index 772349ddf8d5..e4bec9eb7185 100644
--- a/mail/p5-Mail-DomainKeys/Makefile
+++ b/mail/p5-Mail-DomainKeys/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Mail-DomainKeys
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-DomainKeys/pkg-plist b/mail/p5-Mail-DomainKeys/pkg-plist
index 2214f0c244e5..0a9017777df5 100644
--- a/mail/p5-Mail-DomainKeys/pkg-plist
+++ b/mail/p5-Mail-DomainKeys/pkg-plist
@@ -7,9 +7,3 @@
%%SITE_PERL%%/Mail/DomainKeys/Message.pm
%%SITE_PERL%%/Mail/DomainKeys/Policy.pm
%%SITE_PERL%%/Mail/DomainKeys/Signature.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DomainKeys/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DomainKeys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/DomainKeys/Key
-@dirrmtry %%SITE_PERL%%/Mail/DomainKeys
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
index 9221349239bf..b52c70fb3117 100644
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ b/mail/p5-Mail-Ezmlm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Mail-Ezmlm
PORTVERSION= 0.08.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Ezmlm/pkg-plist b/mail/p5-Mail-Ezmlm/pkg-plist
index 8dc087741c75..edff8a23f653 100644
--- a/mail/p5-Mail-Ezmlm/pkg-plist
+++ b/mail/p5-Mail-Ezmlm/pkg-plist
@@ -1,11 +1,6 @@
%%SITE_PERL%%/Mail/Ezmlm.pm
%%SITE_PERL%%/Mail/Ezmlm/GpgEzmlm.pm
%%SITE_PERL%%/Mail/Ezmlm/GpgKeyRing.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Ezmlm/.packlist
%%PERL5_MAN3%%/Mail::Ezmlm.3.gz
%%PERL5_MAN3%%/Mail::Ezmlm::GpgKeyRing.3.gz
%%PERL5_MAN3%%/Mail::Ezmlm::GpgEzmlm.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Ezmlm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Ezmlm
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Field-Received/Makefile b/mail/p5-Mail-Field-Received/Makefile
index a0892ba316f0..f5b6ebee0795 100644
--- a/mail/p5-Mail-Field-Received/Makefile
+++ b/mail/p5-Mail-Field-Received/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Field-Received
PORTVERSION= 0.26
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Field-Received/pkg-plist b/mail/p5-Mail-Field-Received/pkg-plist
index 6c273c3ccc67..dbc51c8fa869 100644
--- a/mail/p5-Mail-Field-Received/pkg-plist
+++ b/mail/p5-Mail-Field-Received/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/Mail/Field/Received.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Field/Received/.packlist
%%PERL5_MAN3%%/Mail::Field::Received.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Field/Received
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Field
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Field
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-FilterXML/Makefile b/mail/p5-Mail-FilterXML/Makefile
index 1c0608744e22..5d224f850872 100644
--- a/mail/p5-Mail-FilterXML/Makefile
+++ b/mail/p5-Mail-FilterXML/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-FilterXML
PORTVERSION= 0.3
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-FilterXML/pkg-plist b/mail/p5-Mail-FilterXML/pkg-plist
index 5c6578c75c26..fa04b4a5cbfe 100644
--- a/mail/p5-Mail-FilterXML/pkg-plist
+++ b/mail/p5-Mail-FilterXML/pkg-plist
@@ -1,7 +1,3 @@
%%PERL5_MAN3%%/Mail::FilterXML.3.gz
%%SITE_PERL%%/Mail/FilterXML.pm
%%SITE_PERL%%/Mail/mailfilter.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/FilterXML/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/FilterXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index be6ad8a0ec9a..0632a08c6e14 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Folder
PORTVERSION= 0.07
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Folder/pkg-plist b/mail/p5-Mail-Folder/pkg-plist
index ecd54ace2644..d805210a9a71 100644
--- a/mail/p5-Mail-Folder/pkg-plist
+++ b/mail/p5-Mail-Folder/pkg-plist
@@ -3,13 +3,8 @@
%%SITE_PERL%%/Mail/Folder/Maildir.pm
%%SITE_PERL%%/Mail/Folder/Mbox.pm
%%SITE_PERL%%/Mail/Folder/NNTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Folder/.packlist
%%PERL5_MAN3%%/Mail::Folder.3.gz
%%PERL5_MAN3%%/Mail::Folder::Emaul.3.gz
%%PERL5_MAN3%%/Mail::Folder::Mbox.3.gz
%%PERL5_MAN3%%/Mail::Folder::NNTP.3.gz
%%PERL5_MAN3%%/Mail::Folder::Maildir.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Folder
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/Folder
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Freshmeat/Makefile b/mail/p5-Mail-Freshmeat/Makefile
index 90f388517143..59e57b64aa5a 100644
--- a/mail/p5-Mail-Freshmeat/Makefile
+++ b/mail/p5-Mail-Freshmeat/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Freshmeat
PORTVERSION= 1.20
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:FOX
diff --git a/mail/p5-Mail-Freshmeat/pkg-plist b/mail/p5-Mail-Freshmeat/pkg-plist
index e27132bcf89a..bbc5011f8bb3 100644
--- a/mail/p5-Mail-Freshmeat/pkg-plist
+++ b/mail/p5-Mail-Freshmeat/pkg-plist
@@ -3,8 +3,3 @@
%%SITE_PERL%%/Mail/Freshmeat/Article.pm
%%SITE_PERL%%/Mail/Freshmeat/Entry.pm
%%SITE_PERL%%/Mail/Freshmeat/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Freshmeat/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Freshmeat
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Freshmeat
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-GnuPG/Makefile b/mail/p5-Mail-GnuPG/Makefile
index 47f0310490cb..0e8aef778d22 100644
--- a/mail/p5-Mail-GnuPG/Makefile
+++ b/mail/p5-Mail-GnuPG/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-GnuPG
PORTVERSION= 0.21
+PORTREVISION= 1
CATEGORIES= mail security perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-GnuPG/pkg-plist b/mail/p5-Mail-GnuPG/pkg-plist
index b4b3acedb5ff..5b5467160484 100644
--- a/mail/p5-Mail-GnuPG/pkg-plist
+++ b/mail/p5-Mail-GnuPG/pkg-plist
@@ -1,3 +1,2 @@
%%PERL5_MAN3%%/Mail::GnuPG.3.gz
%%SITE_PERL%%/Mail/GnuPG.pm
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Graph/Makefile b/mail/p5-Mail-Graph/Makefile
index 90df67adaf8d..ddb8dadb668a 100644
--- a/mail/p5-Mail-Graph/Makefile
+++ b/mail/p5-Mail-Graph/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Mail-Graph
PORTVERSION= 0.14
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Graph/pkg-plist b/mail/p5-Mail-Graph/pkg-plist
index 55d782037205..9d3d36aaf0ac 100644
--- a/mail/p5-Mail-Graph/pkg-plist
+++ b/mail/p5-Mail-Graph/pkg-plist
@@ -1,5 +1,4 @@
%%SITE_PERL%%/Mail/Graph.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail-Graph/.packlist
%%EXAMPLESDIR%%/sample.pl
%%EXAMPLESDIR%%/convert.pl
%%EXAMPLESDIR%%/index/dummy.txt
@@ -13,5 +12,3 @@
@dirrm %%EXAMPLESDIR%%/index
@dirrm %%EXAMPLESDIR%%/output
@dirrm %%EXAMPLESDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail-Graph
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-IMAPClient/Makefile b/mail/p5-Mail-IMAPClient/Makefile
index 56747f5207f7..5c2f6b26c7f4 100644
--- a/mail/p5-Mail-IMAPClient/Makefile
+++ b/mail/p5-Mail-IMAPClient/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-IMAPClient
PORTVERSION= 3.35
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:PLOBBES
diff --git a/mail/p5-Mail-IMAPClient/pkg-plist b/mail/p5-Mail-IMAPClient/pkg-plist
index b6ba6ac02d82..b4e178ba4c27 100644
--- a/mail/p5-Mail-IMAPClient/pkg-plist
+++ b/mail/p5-Mail-IMAPClient/pkg-plist
@@ -8,14 +8,8 @@
%%SITE_PERL%%/Mail/IMAPClient/Thread.grammar
%%SITE_PERL%%/Mail/IMAPClient/Thread.pm
%%SITE_PERL%%/Mail/IMAPClient/Thread.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPClient/.packlist
%%PERL5_MAN3%%/Mail::IMAPClient.3.gz
%%PERL5_MAN3%%/Mail::IMAPClient::BodyStructure.3.gz
%%PERL5_MAN3%%/Mail::IMAPClient::BodyStructure::Parse.3.gz
%%PERL5_MAN3%%/Mail::IMAPClient::MessageSet.3.gz
%%PERL5_MAN3%%/Mail::IMAPClient::Thread.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPClient
-@dirrm %%SITE_PERL%%/Mail/IMAPClient/BodyStructure
-@dirrm %%SITE_PERL%%/Mail/IMAPClient
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-IMAPTalk-MailCache/Makefile b/mail/p5-Mail-IMAPTalk-MailCache/Makefile
index 28799d50d569..695f0bd94ac2 100644
--- a/mail/p5-Mail-IMAPTalk-MailCache/Makefile
+++ b/mail/p5-Mail-IMAPTalk-MailCache/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-IMAPTalk-MailCache
PORTVERSION= 0.0.1
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:VVELOX
diff --git a/mail/p5-Mail-IMAPTalk-MailCache/pkg-plist b/mail/p5-Mail-IMAPTalk-MailCache/pkg-plist
index edad6cac19fe..1c1fa57285aa 100644
--- a/mail/p5-Mail-IMAPTalk-MailCache/pkg-plist
+++ b/mail/p5-Mail-IMAPTalk-MailCache/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/Mail/IMAPTalk/MailCache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPTalk/MailCache/.packlist
%%PERL5_MAN3%%/Mail::IMAPTalk::MailCache.3.gz
-@dirrmtry %%SITE_PERL%%/Mail/IMAPTalk
-@dirrmtry %%SITE_PERL%%/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPTalk/MailCache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPTalk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-IMAPTalk/Makefile b/mail/p5-Mail-IMAPTalk/Makefile
index 17368232cb51..3defb829405f 100644
--- a/mail/p5-Mail-IMAPTalk/Makefile
+++ b/mail/p5-Mail-IMAPTalk/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-IMAPTalk
PORTVERSION= 3.01
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-IMAPTalk/pkg-plist b/mail/p5-Mail-IMAPTalk/pkg-plist
index b28499cf9ae3..656aa10a13f5 100644
--- a/mail/p5-Mail-IMAPTalk/pkg-plist
+++ b/mail/p5-Mail-IMAPTalk/pkg-plist
@@ -1,6 +1,2 @@
%%PERL5_MAN3%%/Mail::IMAPTalk.3.gz
%%SITE_PERL%%/Mail/IMAPTalk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPTalk/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPTalk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-LMLM/Makefile b/mail/p5-Mail-LMLM/Makefile
index c8e9062303a7..966c5ff89958 100644
--- a/mail/p5-Mail-LMLM/Makefile
+++ b/mail/p5-Mail-LMLM/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-LMLM
PORTVERSION= 0.6803
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Mail
diff --git a/mail/p5-Mail-LMLM/pkg-plist b/mail/p5-Mail-LMLM/pkg-plist
index 27c1614451ae..0c23a906747f 100644
--- a/mail/p5-Mail-LMLM/pkg-plist
+++ b/mail/p5-Mail-LMLM/pkg-plist
@@ -23,7 +23,6 @@
%%SITE_PERL%%/Mail/LMLM/Types/Mailman.pm
%%SITE_PERL%%/Mail/LMLM/Types/Majordomo.pm
%%SITE_PERL%%/Mail/get-version.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/LMLM/.packlist
%%DATADIR%%/COPYING
%%EXAMPLESDIR%%/Iglu/Iglu/LMLM/Types/Hamakor.pm
%%EXAMPLESDIR%%/Iglu/Iglu/LMLM/Types/Iglu.pm
@@ -39,9 +38,3 @@
@dirrmtry %%EXAMPLESDIR%%/Iglu
@dirrmtry %%EXAMPLESDIR%%
@dirrmtry %%DATADIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/LMLM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/LMLM/Types
-@dirrmtry %%SITE_PERL%%/Mail/LMLM/Render
-@dirrmtry %%SITE_PERL%%/Mail/LMLM
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-ListDetector/Makefile b/mail/p5-Mail-ListDetector/Makefile
index d1af3e545a22..964290b3604e 100644
--- a/mail/p5-Mail-ListDetector/Makefile
+++ b/mail/p5-Mail-ListDetector/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-ListDetector
PORTVERSION= 1.04
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MSTEVENS
diff --git a/mail/p5-Mail-ListDetector/pkg-plist b/mail/p5-Mail-ListDetector/pkg-plist
index 68cf68a9bec7..859f9982136c 100644
--- a/mail/p5-Mail-ListDetector/pkg-plist
+++ b/mail/p5-Mail-ListDetector/pkg-plist
@@ -45,13 +45,5 @@
%%SITE_PERL%%/Mail/ListDetector/Detector/Yahoogroups.pm
%%SITE_PERL%%/Mail/ListDetector/List.pm
%%SITE_PERL%%/auto/Mail/ListDetector/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ListDetector/.packlist
%%EXAMPLESDIR%%/sample.pl
@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ListDetector
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/auto/Mail/ListDetector
-@dirrmtry %%SITE_PERL%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/ListDetector/Detector
-@dirrmtry %%SITE_PERL%%/Mail/ListDetector
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-MailStats/Makefile b/mail/p5-Mail-MailStats/Makefile
index aec841cdf77c..d1f8b0f5e018 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -3,6 +3,7 @@
PORTNAME= MailStats
PORTVERSION= 0.02
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-MailStats/pkg-plist b/mail/p5-Mail-MailStats/pkg-plist
index 07420862e9c1..baaa41120ced 100644
--- a/mail/p5-Mail-MailStats/pkg-plist
+++ b/mail/p5-Mail-MailStats/pkg-plist
@@ -3,10 +3,5 @@ bin/countmail
%%SITE_PERL%%/Mail/Stats/Config.pm
%%SITE_PERL%%/Mail/Stats/Parser.pm
%%SITE_PERL%%/Mail/Stats/Record.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Stats/.packlist
%%PERL5_MAN3%%/Mail::Stats::Record.3.gz
%%PERL5_MAN3%%/Mail::Stats.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Stats
-@dirrm %%SITE_PERL%%/Mail/Stats
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Mbox-MessageParser/Makefile b/mail/p5-Mail-Mbox-MessageParser/Makefile
index cd1c820fb674..c9ffdc8e2434 100644
--- a/mail/p5-Mail-Mbox-MessageParser/Makefile
+++ b/mail/p5-Mail-Mbox-MessageParser/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Mail-Mbox-MessageParser
PORTVERSION= 1.5002
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Mbox-MessageParser/pkg-plist b/mail/p5-Mail-Mbox-MessageParser/pkg-plist
index 07876e546d33..01690ce4fe3b 100644
--- a/mail/p5-Mail-Mbox-MessageParser/pkg-plist
+++ b/mail/p5-Mail-Mbox-MessageParser/pkg-plist
@@ -9,10 +9,3 @@
%%SITE_PERL%%/Mail/Mbox/MessageParser/Grep.pm
%%SITE_PERL%%/Mail/Mbox/MessageParser/MetaInfo.pm
%%SITE_PERL%%/Mail/Mbox/MessageParser/Perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Mbox/MessageParser/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Mbox/MessageParser
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Mbox
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Mbox/MessageParser
-@dirrmtry %%SITE_PERL%%/Mail/Mbox
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-MboxParser/Makefile b/mail/p5-Mail-MboxParser/Makefile
index d42f69b585dc..75a06f9c5dd7 100644
--- a/mail/p5-Mail-MboxParser/Makefile
+++ b/mail/p5-Mail-MboxParser/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Mail-MboxParser
PORTVERSION= 0.55
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-MboxParser/pkg-plist b/mail/p5-Mail-MboxParser/pkg-plist
index c470f92b3949..0f4b4fcadc05 100644
--- a/mail/p5-Mail-MboxParser/pkg-plist
+++ b/mail/p5-Mail-MboxParser/pkg-plist
@@ -3,12 +3,8 @@
%%SITE_PERL%%/Mail/MboxParser/Mail.pm
%%SITE_PERL%%/Mail/MboxParser/Mail/Convertable.pm
%%SITE_PERL%%/Mail/MboxParser/Mail/Body.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/MboxParser/.packlist
%%PERL5_MAN3%%/Mail::MboxParser.3.gz
%%PERL5_MAN3%%/Mail::MboxParser::Base.3.gz
%%PERL5_MAN3%%/Mail::MboxParser::Mail.3.gz
%%PERL5_MAN3%%/Mail::MboxParser::Mail::Body.3.gz
%%PERL5_MAN3%%/Mail::MboxParser::Mail::Convertable.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/MboxParser
-@dirrm %%SITE_PERL%%/Mail/MboxParser/Mail
-@dirrm %%SITE_PERL%%/Mail/MboxParser
diff --git a/mail/p5-Mail-OpenDKIM/Makefile b/mail/p5-Mail-OpenDKIM/Makefile
index 01c15477e345..bad821ea2d0e 100644
--- a/mail/p5-Mail-OpenDKIM/Makefile
+++ b/mail/p5-Mail-OpenDKIM/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-OpenDKIM
PORTVERSION= 4201
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -21,21 +22,16 @@ RUN_DEPENDS= opendkim>=2.5.0:${PORTSDIR}/mail/opendkim \
USES= perl5
USE_PERL5= configure
-PLIST_FILES= %%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM.pm \
- %%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM/DKIM.pm \
- %%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM/PrivateKey.pm \
- %%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM/Signature.pm \
- %%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM/Signer.pm \
- %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM/.packlist \
- %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM/OpenDKIM.so \
+PLIST_FILES= %%SITE_ARCH%%/Mail/OpenDKIM.pm \
+ %%SITE_ARCH%%/Mail/OpenDKIM/DKIM.pm \
+ %%SITE_ARCH%%/Mail/OpenDKIM/PrivateKey.pm \
+ %%SITE_ARCH%%/Mail/OpenDKIM/Signature.pm \
+ %%SITE_ARCH%%/Mail/OpenDKIM/Signer.pm \
+ %%SITE_ARCH%%/auto/Mail/OpenDKIM/OpenDKIM.so \
%%PERL5_MAN3%%/Mail::OpenDKIM.3.gz \
%%PERL5_MAN3%%/Mail::OpenDKIM::DKIM.3.gz \
%%PERL5_MAN3%%/Mail::OpenDKIM::PrivateKey.3.gz \
%%PERL5_MAN3%%/Mail::OpenDKIM::Signature.3.gz \
%%PERL5_MAN3%%/Mail::OpenDKIM::Signer.3.gz
-PLIST_DIRS= %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM \
- %%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM
-PLIST_DIRSTRY= %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail \
- %%SITE_PERL%%/%%PERL_ARCH%%/Mail
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-OpenRelay-Simple/Makefile b/mail/p5-Mail-OpenRelay-Simple/Makefile
index bde7679733f4..88fe2d722929 100644
--- a/mail/p5-Mail-OpenRelay-Simple/Makefile
+++ b/mail/p5-Mail-OpenRelay-Simple/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-OpenRelay-Simple
PORTVERSION= 0.02
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-OpenRelay-Simple/pkg-plist b/mail/p5-Mail-OpenRelay-Simple/pkg-plist
index fcac331db677..311211d873d7 100644
--- a/mail/p5-Mail-OpenRelay-Simple/pkg-plist
+++ b/mail/p5-Mail-OpenRelay-Simple/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/Mail/OpenRelay/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenRelay/Simple/.packlist
%%PERL5_MAN3%%/Mail::OpenRelay::Simple.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenRelay/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenRelay
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/OpenRelay
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-POP3Client/Makefile b/mail/p5-Mail-POP3Client/Makefile
index a6f3e2d84d30..9d3549de1e1a 100644
--- a/mail/p5-Mail-POP3Client/Makefile
+++ b/mail/p5-Mail-POP3Client/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-POP3Client
PORTVERSION= 2.19
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-POP3Client/pkg-plist b/mail/p5-Mail-POP3Client/pkg-plist
index a89dcb3c84c1..9e84d44c756d 100644
--- a/mail/p5-Mail-POP3Client/pkg-plist
+++ b/mail/p5-Mail-POP3Client/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/Mail/POP3Client.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/POP3Client/.packlist
%%PERL5_MAN3%%/Mail::POP3Client.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/POP3Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Procmail/Makefile b/mail/p5-Mail-Procmail/Makefile
index c7bea8cfd610..8f7c13683574 100644
--- a/mail/p5-Mail-Procmail/Makefile
+++ b/mail/p5-Mail-Procmail/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Mail-Procmail
PORTVERSION= 1.08
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Procmail/pkg-plist b/mail/p5-Mail-Procmail/pkg-plist
index 130744b68795..1836d07e822c 100644
--- a/mail/p5-Mail-Procmail/pkg-plist
+++ b/mail/p5-Mail-Procmail/pkg-plist
@@ -1,6 +1,2 @@
%%PERL5_MAN3%%/Mail::Procmail.3.gz
%%SITE_PERL%%/Mail/Procmail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmail/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Procmailrc/Makefile b/mail/p5-Mail-Procmailrc/Makefile
index 027aa5ce552b..6dce68f5dec0 100644
--- a/mail/p5-Mail-Procmailrc/Makefile
+++ b/mail/p5-Mail-Procmailrc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Procmailrc
PORTVERSION= 1.09
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN \
http://scott.wiersdorf.org/perl/
diff --git a/mail/p5-Mail-Procmailrc/pkg-plist b/mail/p5-Mail-Procmailrc/pkg-plist
index 0ee7e42804e6..f834e1eaf107 100644
--- a/mail/p5-Mail-Procmailrc/pkg-plist
+++ b/mail/p5-Mail-Procmailrc/pkg-plist
@@ -1,6 +1,2 @@
%%PERL5_MAN3%%/Mail::Procmailrc.3.gz
%%SITE_PERL%%/Mail/Procmailrc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmailrc/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmailrc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-RBL/Makefile b/mail/p5-Mail-RBL/Makefile
index a94a1d69004b..ba5e30f5f1ef 100644
--- a/mail/p5-Mail-RBL/Makefile
+++ b/mail/p5-Mail-RBL/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Mail-RBL
PORTVERSION= 1.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-RBL/pkg-plist b/mail/p5-Mail-RBL/pkg-plist
index b390e3c1fd7f..86a7efbba58e 100644
--- a/mail/p5-Mail-RBL/pkg-plist
+++ b/mail/p5-Mail-RBL/pkg-plist
@@ -1,6 +1,2 @@
%%PERL5_MAN3%%/Mail::RBL.3.gz
%%SITE_PERL%%/Mail/RBL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RBL/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RBL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-RFC822-Address/Makefile b/mail/p5-Mail-RFC822-Address/Makefile
index 3b47c78bfe71..4a7aa9bd3dbf 100644
--- a/mail/p5-Mail-RFC822-Address/Makefile
+++ b/mail/p5-Mail-RFC822-Address/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-RFC822-Address
PORTVERSION= 0.3
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-RFC822-Address/pkg-plist b/mail/p5-Mail-RFC822-Address/pkg-plist
index 76c085b13cd2..04ddda905c63 100644
--- a/mail/p5-Mail-RFC822-Address/pkg-plist
+++ b/mail/p5-Mail-RFC822-Address/pkg-plist
@@ -1,8 +1,2 @@
%%PERL5_MAN3%%/Mail::RFC822::Address.3.gz
%%SITE_PERL%%/Mail/RFC822/Address.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RFC822/Address/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RFC822/Address
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RFC822
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/RFC822
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-SPF/Makefile b/mail/p5-Mail-SPF/Makefile
index d0a743d415e0..524297f42510 100644
--- a/mail/p5-Mail-SPF/Makefile
+++ b/mail/p5-Mail-SPF/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Mail-SPF
PORTVERSION= 2.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-SPF/pkg-plist b/mail/p5-Mail-SPF/pkg-plist
index d66867ee2617..1fdfebf5049a 100644
--- a/mail/p5-Mail-SPF/pkg-plist
+++ b/mail/p5-Mail-SPF/pkg-plist
@@ -50,9 +50,3 @@ sbin/spfd.pl
%%PERL5_MAN3%%/Mail::SPF::v1::Record.3.gz
%%PERL5_MAN3%%/Mail::SPF::v2::Record.3.gz
man/man1/spfquery.pl.1.gz
-@dirrmtry %%SITE_PERL%%/Mail/SPF/v2
-@dirrmtry %%SITE_PERL%%/Mail/SPF/v1
-@dirrmtry %%SITE_PERL%%/Mail/SPF/Mod
-@dirrmtry %%SITE_PERL%%/Mail/SPF/Mech
-@dirrmtry %%SITE_PERL%%/Mail/SPF
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-SRS/Makefile b/mail/p5-Mail-SRS/Makefile
index 9b0ff96a9014..0999063423ea 100644
--- a/mail/p5-Mail-SRS/Makefile
+++ b/mail/p5-Mail-SRS/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Mail-SRS
PORTVERSION= 0.31
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-SRS/pkg-plist b/mail/p5-Mail-SRS/pkg-plist
index a9962d1c156d..aca33d46aa68 100644
--- a/mail/p5-Mail-SRS/pkg-plist
+++ b/mail/p5-Mail-SRS/pkg-plist
@@ -5,7 +5,6 @@
%%SITE_PERL%%/Mail/SRS/Reversible.pm
%%SITE_PERL%%/Mail/SRS/Shortcut.pm
%%SITE_PERL%%/Mail/SRS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SRS/.packlist
bin/srs
bin/srsd
%%PERL5_MAN3%%/Mail::SRS.3.gz
@@ -16,7 +15,3 @@ bin/srsd
%%PERL5_MAN3%%/Mail::SRS::Shortcut.3.gz
man/man1/srs.1.gz
man/man1/srsd.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SRS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/SRS
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-SendEasy/Makefile b/mail/p5-Mail-SendEasy/Makefile
index 6a2f5210833f..f80fcf2a3fe3 100644
--- a/mail/p5-Mail-SendEasy/Makefile
+++ b/mail/p5-Mail-SendEasy/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-SendEasy
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-SendEasy/pkg-plist b/mail/p5-Mail-SendEasy/pkg-plist
index 41687dfaa3a1..b43bde1ba940 100644
--- a/mail/p5-Mail-SendEasy/pkg-plist
+++ b/mail/p5-Mail-SendEasy/pkg-plist
@@ -3,11 +3,6 @@
%%SITE_PERL%%/Mail/SendEasy/Base64.pm
%%SITE_PERL%%/Mail/SendEasy/IOScalar.pm
%%SITE_PERL%%/Mail/SendEasy/SMTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SendEasy/.packlist
%%PERL5_MAN3%%/Mail::SendEasy.3.gz
%%PERL5_MAN3%%/Mail::SendEasy::AUTH.3.gz
%%PERL5_MAN3%%/Mail::SendEasy::SMTP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SendEasy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/SendEasy
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Sender/Makefile b/mail/p5-Mail-Sender/Makefile
index f4a3c1a89107..0ab44c0d2d09 100644
--- a/mail/p5-Mail-Sender/Makefile
+++ b/mail/p5-Mail-Sender/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Sender
PORTVERSION= 0.8.22
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Sender/pkg-plist b/mail/p5-Mail-Sender/pkg-plist
index 91370e50d5c8..03cc6c9cce55 100644
--- a/mail/p5-Mail-Sender/pkg-plist
+++ b/mail/p5-Mail-Sender/pkg-plist
@@ -1,10 +1,4 @@
%%SITE_PERL%%/Mail/Sender.pm
%%SITE_PERL%%/Mail/Sender/CType/Ext.pm
%%SITE_PERL%%/Mail/Sender/CType/Win32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sender/.packlist
%%PERL5_MAN3%%/Mail::Sender.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sender
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/Sender/CType
-@dirrm %%SITE_PERL%%/Mail/Sender
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Sendmail/Makefile b/mail/p5-Mail-Sendmail/Makefile
index 115d0f3482e5..c8a3682894c3 100644
--- a/mail/p5-Mail-Sendmail/Makefile
+++ b/mail/p5-Mail-Sendmail/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Sendmail
PORTVERSION= 0.79
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Sendmail/pkg-plist b/mail/p5-Mail-Sendmail/pkg-plist
index 4dde6af80b64..0c8f2695996d 100644
--- a/mail/p5-Mail-Sendmail/pkg-plist
+++ b/mail/p5-Mail-Sendmail/pkg-plist
@@ -1,6 +1,2 @@
%%PERL5_MAN3%%/Mail::Sendmail.3.gz
%%SITE_PERL%%/Mail/Sendmail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sendmail/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sendmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index 1a2581a04c7b..dd140a7d3751 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Spool
PORTVERSION= 0.50
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Spool/pkg-plist b/mail/p5-Mail-Spool/pkg-plist
index 61644117af09..1b15c860eeaa 100644
--- a/mail/p5-Mail-Spool/pkg-plist
+++ b/mail/p5-Mail-Spool/pkg-plist
@@ -1,9 +1,6 @@
%%SITE_PERL%%/Mail/Spool.pm
%%SITE_PERL%%/Mail/Spool/Handle.pm
%%SITE_PERL%%/Mail/Spool/Node.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Spool/.packlist
%%PERL5_MAN3%%/Mail::Spool.3.gz
%%PERL5_MAN3%%/Mail::Spool::Handle.3.gz
%%PERL5_MAN3%%/Mail::Spool::Node.3.gz
-@dirrm %%SITE_PERL%%/Mail/Spool
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Spool
diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index e8bf28a963e4..47d613dfacd2 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Tools
PORTVERSION= 2.13
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Tools/pkg-plist b/mail/p5-Mail-Tools/pkg-plist
index 3372e155a594..55777c2df5bf 100644
--- a/mail/p5-Mail-Tools/pkg-plist
+++ b/mail/p5-Mail-Tools/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/.packlist
%%SITE_PERL%%/Mail/Address.pm
%%SITE_PERL%%/Mail/Address.pod
%%SITE_PERL%%/Mail/Cap.pm
@@ -41,7 +40,3 @@
%%PERL5_MAN3%%/Mail::Mailer.3.gz
%%PERL5_MAN3%%/Mail::Send.3.gz
%%PERL5_MAN3%%/Mail::Util.3.gz
-@dirrmtry %%SITE_PERL%%/Mail/Mailer
-@dirrmtry %%SITE_PERL%%/Mail/Field
-@dirrmtry %%SITE_PERL%%/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-Transport-Dbx/Makefile b/mail/p5-Mail-Transport-Dbx/Makefile
index f8cb2bdfbe70..47f0d2047f3d 100644
--- a/mail/p5-Mail-Transport-Dbx/Makefile
+++ b/mail/p5-Mail-Transport-Dbx/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Transport-Dbx
PORTVERSION= 0.07
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Transport-Dbx/pkg-plist b/mail/p5-Mail-Transport-Dbx/pkg-plist
index b078dd68302d..ccc00fc43e0d 100644
--- a/mail/p5-Mail-Transport-Dbx/pkg-plist
+++ b/mail/p5-Mail-Transport-Dbx/pkg-plist
@@ -1,10 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Transport/Dbx.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport/Dbx/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport/Dbx/Dbx.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport/Dbx/autosplit.ix
+%%SITE_ARCH%%/Mail/Transport/Dbx.pm
+%%SITE_ARCH%%/auto/Mail/Transport/Dbx/Dbx.so
+%%SITE_ARCH%%/auto/Mail/Transport/Dbx/autosplit.ix
%%PERL5_MAN3%%/Mail::Transport::Dbx.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport/Dbx
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail/Transport
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail
diff --git a/mail/p5-Mail-Verify/Makefile b/mail/p5-Mail-Verify/Makefile
index d44abd4a4672..5004dd2c7090 100644
--- a/mail/p5-Mail-Verify/Makefile
+++ b/mail/p5-Mail-Verify/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Verify
PORTVERSION= 0.02
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Verify/pkg-plist b/mail/p5-Mail-Verify/pkg-plist
index f7420ca4f4de..1b3842319839 100644
--- a/mail/p5-Mail-Verify/pkg-plist
+++ b/mail/p5-Mail-Verify/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/Mail/Verify.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verify/.packlist
%%PERL5_MAN3%%/Mail::Verify.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verify
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Verp/Makefile b/mail/p5-Mail-Verp/Makefile
index eb6fc9b1b842..9299cbccd65a 100644
--- a/mail/p5-Mail-Verp/Makefile
+++ b/mail/p5-Mail-Verp/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Verp
PORTVERSION= 0.06
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Verp/pkg-plist b/mail/p5-Mail-Verp/pkg-plist
index d38b598a61a4..5db06834144b 100644
--- a/mail/p5-Mail-Verp/pkg-plist
+++ b/mail/p5-Mail-Verp/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/Mail/Verp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verp/.packlist
%%PERL5_MAN3%%/Mail::Verp.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Webmail-Gmail/Makefile b/mail/p5-Mail-Webmail-Gmail/Makefile
index 23a30cd2dd73..0a6475bbdd18 100644
--- a/mail/p5-Mail-Webmail-Gmail/Makefile
+++ b/mail/p5-Mail-Webmail-Gmail/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Mail-Webmail-Gmail
PORTVERSION= 1.09
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Mail-Webmail-Gmail/pkg-plist b/mail/p5-Mail-Webmail-Gmail/pkg-plist
index 9c12be6c9df9..5b7c46ad409d 100644
--- a/mail/p5-Mail-Webmail-Gmail/pkg-plist
+++ b/mail/p5-Mail-Webmail-Gmail/pkg-plist
@@ -1,8 +1,2 @@
%%PERL5_MAN3%%/Mail::Webmail::Gmail.3.gz
%%SITE_PERL%%/Mail/Webmail/Gmail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Webmail/Gmail/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Webmail/Gmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Webmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrmtry %%SITE_PERL%%/Mail/Webmail
-@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Net-IMAP-Client/Makefile b/mail/p5-Net-IMAP-Client/Makefile
index 3bbe2390b846..0b72b2a90af5 100644
--- a/mail/p5-Net-IMAP-Client/Makefile
+++ b/mail/p5-Net-IMAP-Client/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Net-IMAP-Client
PORTVERSION= 0.9505
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Net-IMAP-Client/pkg-plist b/mail/p5-Net-IMAP-Client/pkg-plist
index 53700efc14b5..564a7e770564 100644
--- a/mail/p5-Net-IMAP-Client/pkg-plist
+++ b/mail/p5-Net-IMAP-Client/pkg-plist
@@ -4,10 +4,3 @@
%%SITE_PERL%%/Net/IMAP/Client.pm
%%SITE_PERL%%/Net/IMAP/Client/MsgAddress.pm
%%SITE_PERL%%/Net/IMAP/Client/MsgSummary.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Client/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/IMAP/Client
-@dirrmtry %%SITE_PERL%%/Net/IMAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-IMAP-Server/Makefile b/mail/p5-Net-IMAP-Server/Makefile
index 8c4c9ea6d5f1..53a8cc6ff80b 100644
--- a/mail/p5-Net-IMAP-Server/Makefile
+++ b/mail/p5-Net-IMAP-Server/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Net-IMAP-Server
PORTVERSION= 1.38
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Net-IMAP-Server/pkg-plist b/mail/p5-Net-IMAP-Server/pkg-plist
index 9be021da830b..1d1bc0d0f895 100644
--- a/mail/p5-Net-IMAP-Server/pkg-plist
+++ b/mail/p5-Net-IMAP-Server/pkg-plist
@@ -33,7 +33,6 @@
%%SITE_PERL%%/Net/IMAP/Server/DefaultModel.pm
%%SITE_PERL%%/Net/IMAP/Server/DefaultAuth.pm
%%SITE_PERL%%/Net/IMAP/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Server/.packlist
%%PERL5_MAN3%%/Net::IMAP::Server.3.gz
%%PERL5_MAN3%%/Net::IMAP::Server::Command.3.gz
%%PERL5_MAN3%%/Net::IMAP::Server::Connection.3.gz
@@ -42,10 +41,3 @@
%%PERL5_MAN3%%/Net::IMAP::Server::Error.3.gz
%%PERL5_MAN3%%/Net::IMAP::Server::Mailbox.3.gz
%%PERL5_MAN3%%/Net::IMAP::Server::Message.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/IMAP/Server/Command
-@dirrmtry %%SITE_PERL%%/Net/IMAP/Server
-@dirrmtry %%SITE_PERL%%/Net/IMAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-IMAP-Simple-SSL/Makefile b/mail/p5-Net-IMAP-Simple-SSL/Makefile
index 0a686df88b93..94f29a3726b7 100644
--- a/mail/p5-Net-IMAP-Simple-SSL/Makefile
+++ b/mail/p5-Net-IMAP-Simple-SSL/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Net-IMAP-Simple-SSL
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Net-IMAP-Simple-SSL/pkg-plist b/mail/p5-Net-IMAP-Simple-SSL/pkg-plist
index c4f1c1e3343c..aaab28babd16 100644
--- a/mail/p5-Net-IMAP-Simple-SSL/pkg-plist
+++ b/mail/p5-Net-IMAP-Simple-SSL/pkg-plist
@@ -1,10 +1,2 @@
%%SITE_PERL%%/Net/IMAP/Simple/SSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple/SSL/.packlist
%%PERL5_MAN3%%/Net::IMAP::Simple::SSL.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple/SSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/IMAP/Simple
-@dirrmtry %%SITE_PERL%%/Net/IMAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-IMAP-Simple/Makefile b/mail/p5-Net-IMAP-Simple/Makefile
index 684ce6f5b2a1..98667c6f01fa 100644
--- a/mail/p5-Net-IMAP-Simple/Makefile
+++ b/mail/p5-Net-IMAP-Simple/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Net-IMAP-Simple
PORTVERSION= 1.2205
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:JETTERO
diff --git a/mail/p5-Net-IMAP-Simple/pkg-plist b/mail/p5-Net-IMAP-Simple/pkg-plist
index 25297ddac221..38affd0e5429 100644
--- a/mail/p5-Net-IMAP-Simple/pkg-plist
+++ b/mail/p5-Net-IMAP-Simple/pkg-plist
@@ -3,13 +3,6 @@
%%SITE_PERL%%/Net/IMAP/Simple/PipeSocket.pm
%%SX%%%%SITE_PERL%%/Net/IMAP/SimpleX.pm
%%SX%%%%SITE_PERL%%/Net/IMAP/SimpleX.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple/.packlist
%%PERL5_MAN3%%/Net::IMAP::Simple.3.gz
%%PERL5_MAN3%%/Net::IMAP::Simple::PipeSocket.3.gz
%%SX%%%%PERL5_MAN3%%/Net::IMAP::SimpleX.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/IMAP/Simple
-@dirrmtry %%SITE_PERL%%/Net/IMAP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-ManageSieve/Makefile b/mail/p5-Net-ManageSieve/Makefile
index 9db0ff4d8480..30f90fe14dd0 100644
--- a/mail/p5-Net-ManageSieve/Makefile
+++ b/mail/p5-Net-ManageSieve/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Net-ManageSieve
PORTVERSION= 0.12
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Net-ManageSieve/pkg-plist b/mail/p5-Net-ManageSieve/pkg-plist
index 01facbf5218a..0999af98dcaa 100644
--- a/mail/p5-Net-ManageSieve/pkg-plist
+++ b/mail/p5-Net-ManageSieve/pkg-plist
@@ -1,6 +1,2 @@
%%PERL5_MAN3%%/Net::ManageSieve.3.gz
%%SITE_PERL%%/Net/ManageSieve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ManageSieve/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ManageSieve
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-POP3-SSLWrapper/Makefile b/mail/p5-Net-POP3-SSLWrapper/Makefile
index dfdfe185dbf6..844fd3d06ac6 100644
--- a/mail/p5-Net-POP3-SSLWrapper/Makefile
+++ b/mail/p5-Net-POP3-SSLWrapper/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Net-POP3-SSLWrapper
PORTVERSION= 0.06
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Net-POP3-SSLWrapper/pkg-plist b/mail/p5-Net-POP3-SSLWrapper/pkg-plist
index 61dfe2e3f578..db6cd4d914eb 100644
--- a/mail/p5-Net-POP3-SSLWrapper/pkg-plist
+++ b/mail/p5-Net-POP3-SSLWrapper/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/Net/POP3/SSLWrapper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/POP3/SSLWrapper/.packlist
%%PERL5_MAN3%%/Net::POP3::SSLWrapper.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/POP3/SSLWrapper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/POP3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/POP3
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-QMTP/Makefile b/mail/p5-Net-QMTP/Makefile
index f9576c882116..42782eca7718 100644
--- a/mail/p5-Net-QMTP/Makefile
+++ b/mail/p5-Net-QMTP/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Net-QMTP
PORTVERSION= 0.06
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Net-QMTP/pkg-plist b/mail/p5-Net-QMTP/pkg-plist
index 24b1ef3513b7..a3d21aeb47fd 100644
--- a/mail/p5-Net-QMTP/pkg-plist
+++ b/mail/p5-Net-QMTP/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/Net/QMTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/QMTP/.packlist
%%PERL5_MAN3%%/Net::QMTP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/QMTP
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/mail/p5-Net-SMTP-SSL/Makefile b/mail/p5-Net-SMTP-SSL/Makefile
index 616447ef1c34..bcfea1bb0f76 100644
--- a/mail/p5-Net-SMTP-SSL/Makefile
+++ b/mail/p5-Net-SMTP-SSL/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Net-SMTP-SSL
PORTVERSION= 1.01
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Net-SMTP-SSL/pkg-plist b/mail/p5-Net-SMTP-SSL/pkg-plist
index cdcc80bb590e..c414bf92cb56 100644
--- a/mail/p5-Net-SMTP-SSL/pkg-plist
+++ b/mail/p5-Net-SMTP-SSL/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/Net/SMTP/SSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/SSL/.packlist
%%PERL5_MAN3%%/Net::SMTP::SSL.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/SSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SMTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-SMTP-Server/Makefile b/mail/p5-Net-SMTP-Server/Makefile
index 9441b0db728e..ccd3f6e42392 100644
--- a/mail/p5-Net-SMTP-Server/Makefile
+++ b/mail/p5-Net-SMTP-Server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Net-SMTP-Server
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Net-SMTP-Server/pkg-plist b/mail/p5-Net-SMTP-Server/pkg-plist
index f13343b0a53c..ecc432e7bf5b 100644
--- a/mail/p5-Net-SMTP-Server/pkg-plist
+++ b/mail/p5-Net-SMTP-Server/pkg-plist
@@ -7,15 +7,3 @@
%%SITE_PERL%%/auto/Net/SMTP/Server/Client/autosplit.ix
%%SITE_PERL%%/auto/Net/SMTP/Server/Relay/autosplit.ix
%%SITE_PERL%%/auto/Net/SMTP/Server/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/Server/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/auto/Net/SMTP/Server/Relay
-@dirrmtry %%SITE_PERL%%/auto/Net/SMTP/Server/Client
-@dirrmtry %%SITE_PERL%%/auto/Net/SMTP/Server
-@dirrmtry %%SITE_PERL%%/auto/Net/SMTP
-@dirrmtry %%SITE_PERL%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SMTP/Server
-@dirrmtry %%SITE_PERL%%/Net/SMTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-SMTP-TLS-ButMaintained/Makefile b/mail/p5-Net-SMTP-TLS-ButMaintained/Makefile
index 7b54ff5b769a..116b2eb7ec0a 100644
--- a/mail/p5-Net-SMTP-TLS-ButMaintained/Makefile
+++ b/mail/p5-Net-SMTP-TLS-ButMaintained/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Net-SMTP-TLS-ButMaintained
PORTVERSION= 0.24
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Net-SMTP-TLS-ButMaintained/pkg-plist b/mail/p5-Net-SMTP-TLS-ButMaintained/pkg-plist
index 57a945e24557..2898d46ada6e 100644
--- a/mail/p5-Net-SMTP-TLS-ButMaintained/pkg-plist
+++ b/mail/p5-Net-SMTP-TLS-ButMaintained/pkg-plist
@@ -1,10 +1,2 @@
%%PERL5_MAN3%%/Net::SMTP::TLS::ButMaintained.3.gz
%%SITE_PERL%%/Net/SMTP/TLS/ButMaintained.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/TLS/ButMaintained/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/TLS/ButMaintained
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/TLS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SMTP/TLS
-@dirrmtry %%SITE_PERL%%/Net/SMTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-SMTP-TLS/Makefile b/mail/p5-Net-SMTP-TLS/Makefile
index c0afbcf37bb1..eedff1c172b9 100644
--- a/mail/p5-Net-SMTP-TLS/Makefile
+++ b/mail/p5-Net-SMTP-TLS/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Net-SMTP-TLS
PORTVERSION= 0.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Net-SMTP-TLS/pkg-plist b/mail/p5-Net-SMTP-TLS/pkg-plist
index fa52e4cc7479..cdfddf6551e0 100644
--- a/mail/p5-Net-SMTP-TLS/pkg-plist
+++ b/mail/p5-Net-SMTP-TLS/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/Net/SMTP/TLS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/TLS/.packlist
%%PERL5_MAN3%%/Net::SMTP::TLS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/TLS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/SMTP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-SMTPS/Makefile b/mail/p5-Net-SMTPS/Makefile
index 1bd83ccf139f..0a0c3f825f41 100644
--- a/mail/p5-Net-SMTPS/Makefile
+++ b/mail/p5-Net-SMTPS/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Net-SMTPS
PORTVERSION= 0.03
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Net-SMTPS/pkg-plist b/mail/p5-Net-SMTPS/pkg-plist
index 24891bd80552..c0cbc2a94d8c 100644
--- a/mail/p5-Net-SMTPS/pkg-plist
+++ b/mail/p5-Net-SMTPS/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/Net/SMTPS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTPS/.packlist
%%PERL5_MAN3%%/Net::SMTPS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTPS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-SMTP_auth/Makefile b/mail/p5-Net-SMTP_auth/Makefile
index 857ddd258c3e..053fb9e7039a 100644
--- a/mail/p5-Net-SMTP_auth/Makefile
+++ b/mail/p5-Net-SMTP_auth/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Net-SMTP_auth
PORTVERSION= 0.08
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Net-SMTP_auth/pkg-plist b/mail/p5-Net-SMTP_auth/pkg-plist
index 1bfe2cf7e8ad..21a0d6f3a857 100644
--- a/mail/p5-Net-SMTP_auth/pkg-plist
+++ b/mail/p5-Net-SMTP_auth/pkg-plist
@@ -1,6 +1,2 @@
%%PERL5_MAN3%%/Net::SMTP_auth.3.gz
%%SITE_PERL%%/Net/SMTP_auth.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP_auth/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP_auth
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-SenderBase/Makefile b/mail/p5-Net-SenderBase/Makefile
index 34310120dfae..ba6712f2c033 100644
--- a/mail/p5-Net-SenderBase/Makefile
+++ b/mail/p5-Net-SenderBase/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Net-SenderBase
PORTVERSION= 1.02
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:JOENIO
diff --git a/mail/p5-Net-SenderBase/pkg-plist b/mail/p5-Net-SenderBase/pkg-plist
index c3a6617f00ea..96be43268925 100644
--- a/mail/p5-Net-SenderBase/pkg-plist
+++ b/mail/p5-Net-SenderBase/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SenderBase/.packlist
%%SITE_PERL%%/Net/SenderBase.pm
%%SITE_PERL%%/Net/SenderBase/Query.pm
%%SITE_PERL%%/Net/SenderBase/Results.pm
@@ -6,8 +5,3 @@
%%PERL5_MAN3%%/Net::SenderBase.3.gz
%%PERL5_MAN3%%/Net::SenderBase::Query.3.gz
%%PERL5_MAN3%%/Net::SenderBase::Results.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SenderBase
-@dirrm %%SITE_PERL%%/Net/SenderBase/Query
-@dirrm %%SITE_PERL%%/Net/SenderBase
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-Server-Mail/Makefile b/mail/p5-Net-Server-Mail/Makefile
index 8eac8e590f32..23b71a74f192 100644
--- a/mail/p5-Net-Server-Mail/Makefile
+++ b/mail/p5-Net-Server-Mail/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Net-Server-Mail
PORTVERSION= 0.18
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:GUIMARD
diff --git a/mail/p5-Net-Server-Mail/pkg-plist b/mail/p5-Net-Server-Mail/pkg-plist
index a894dc0d68de..88b7d7a92c08 100644
--- a/mail/p5-Net-Server-Mail/pkg-plist
+++ b/mail/p5-Net-Server-Mail/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/Mail/.packlist
%%SITE_PERL%%/Net/Server/Mail.pm
%%SITE_PERL%%/Net/Server/Mail/ESMTP.pm
%%SITE_PERL%%/Net/Server/Mail/ESMTP/Extension.pm
@@ -13,10 +12,3 @@
%%PERL5_MAN3%%/Net::Server::Mail::ESMTP::XFORWARD.3.gz
%%PERL5_MAN3%%/Net::Server::Mail::LMTP.3.gz
%%PERL5_MAN3%%/Net::Server::Mail::SMTP.3.gz
-@dirrm %%SITE_PERL%%/Net/Server/Mail/ESMTP
-@dirrm %%SITE_PERL%%/Net/Server/Mail
-@dirrmtry %%SITE_PERL%%/Net/Server
-@dirrmtry %%SITE_PERL%%/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/mail/p5-POE-Component-Client-POP3/Makefile b/mail/p5-POE-Component-Client-POP3/Makefile
index de765f16ebaa..482519bbdc7e 100644
--- a/mail/p5-POE-Component-Client-POP3/Makefile
+++ b/mail/p5-POE-Component-Client-POP3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= POE-Component-Client-POP3
PORTVERSION= 0.02
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-POE-Component-Client-POP3/pkg-plist b/mail/p5-POE-Component-Client-POP3/pkg-plist
index bcdb092b9088..31910002b937 100644
--- a/mail/p5-POE-Component-Client-POP3/pkg-plist
+++ b/mail/p5-POE-Component-Client-POP3/pkg-plist
@@ -1,13 +1,5 @@
%%PERL5_MAN3%%/POE::Component::Client::POP3.3.gz
%%SITE_PERL%%/POE/Component/Client/POP3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3/.packlist
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/term.perl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.perl
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/mail/p5-POE-Component-Client-SMTP/Makefile b/mail/p5-POE-Component-Client-SMTP/Makefile
index 572e3eec4a7f..86ef8f4299f0 100644
--- a/mail/p5-POE-Component-Client-SMTP/Makefile
+++ b/mail/p5-POE-Component-Client-SMTP/Makefile
@@ -3,6 +3,7 @@
PORTNAME= POE-Component-Client-SMTP
PORTVERSION= 0.22
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-POE-Component-Client-SMTP/pkg-plist b/mail/p5-POE-Component-Client-SMTP/pkg-plist
index d1ac33b2ae4d..3b9b78e05f1a 100644
--- a/mail/p5-POE-Component-Client-SMTP/pkg-plist
+++ b/mail/p5-POE-Component-Client-SMTP/pkg-plist
@@ -1,5 +1,2 @@
%%PERL5_MAN3%%/POE::Component::Client::SMTP.3.gz
%%SITE_PERL%%/POE/Component/Client/SMTP.pm
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/mail/p5-POE-Component-SMTP/Makefile b/mail/p5-POE-Component-SMTP/Makefile
index 022506483327..fee8f355eaf7 100644
--- a/mail/p5-POE-Component-SMTP/Makefile
+++ b/mail/p5-POE-Component-SMTP/Makefile
@@ -3,7 +3,7 @@
PORTNAME= POE-Component-SMTP
PORTVERSION= 1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-POE-Component-SMTP/pkg-plist b/mail/p5-POE-Component-SMTP/pkg-plist
index a4987863e9ff..f76625adc16e 100644
--- a/mail/p5-POE-Component-SMTP/pkg-plist
+++ b/mail/p5-POE-Component-SMTP/pkg-plist
@@ -2,11 +2,3 @@
%%PERL5_MAN3%%/POE::Filter::SMTP.3.gz
%%SITE_PERL%%/POE/Component/Server/SMTP.pm
%%SITE_PERL%%/POE/Filter/SMTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SMTP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Filter
-@dirrmtry %%SITE_PERL%%/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/mail/p5-POE-Filter-Transparent-SMTP/Makefile b/mail/p5-POE-Filter-Transparent-SMTP/Makefile
index 6a198867da3a..7bda65ffbf60 100644
--- a/mail/p5-POE-Filter-Transparent-SMTP/Makefile
+++ b/mail/p5-POE-Filter-Transparent-SMTP/Makefile
@@ -3,6 +3,7 @@
PORTNAME= POE-Filter-Transparent-SMTP
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-POE-Filter-Transparent-SMTP/pkg-plist b/mail/p5-POE-Filter-Transparent-SMTP/pkg-plist
index a5e3c06a8dd2..7b9cd286af49 100644
--- a/mail/p5-POE-Filter-Transparent-SMTP/pkg-plist
+++ b/mail/p5-POE-Filter-Transparent-SMTP/pkg-plist
@@ -1,10 +1,2 @@
%%PERL5_MAN3%%/POE::Filter::Transparent::SMTP.3.gz
%%SITE_PERL%%/POE/Filter/Transparent/SMTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/Transparent/SMTP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/Transparent/SMTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/Transparent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Filter/Transparent
-@dirrmtry %%SITE_PERL%%/POE/Filter
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/mail/p5-Parse-Syslog-Mail/Makefile b/mail/p5-Parse-Syslog-Mail/Makefile
index bd4629ee403d..0fa02fa1508c 100644
--- a/mail/p5-Parse-Syslog-Mail/Makefile
+++ b/mail/p5-Parse-Syslog-Mail/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Parse-Syslog-Mail
PORTVERSION= 0.17
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Parse-Syslog-Mail/pkg-plist b/mail/p5-Parse-Syslog-Mail/pkg-plist
index 3eb9d20509ef..f1b3f1262427 100644
--- a/mail/p5-Parse-Syslog-Mail/pkg-plist
+++ b/mail/p5-Parse-Syslog-Mail/pkg-plist
@@ -1,8 +1,2 @@
%%SITE_PERL%%/Parse/Syslog/Mail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog/Mail/.packlist
%%PERL5_MAN3%%/Parse::Syslog::Mail.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
-@dirrmtry %%SITE_PERL%%/Parse/Syslog
-@dirrmtry %%SITE_PERL%%/Parse
diff --git a/mail/p5-Qmail-Envelope/Makefile b/mail/p5-Qmail-Envelope/Makefile
index 33a4f2878719..0c0ab332fe45 100644
--- a/mail/p5-Qmail-Envelope/Makefile
+++ b/mail/p5-Qmail-Envelope/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Qmail-Envelope
PORTVERSION= 0.53
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MJA
diff --git a/mail/p5-Qmail-Envelope/pkg-plist b/mail/p5-Qmail-Envelope/pkg-plist
index ddf7cb00e6b5..6bee09835e52 100644
--- a/mail/p5-Qmail-Envelope/pkg-plist
+++ b/mail/p5-Qmail-Envelope/pkg-plist
@@ -1,6 +1,2 @@
%%PERL5_MAN3%%/Qmail::Envelope.3.gz
%%SITE_PERL%%/Qmail/Envelope.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Qmail/Envelope/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Qmail/Envelope
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Qmail
-@dirrmtry %%SITE_PERL%%/Qmail
diff --git a/mail/p5-SES/Makefile b/mail/p5-SES/Makefile
index 90897ecdbee3..fd69d6040ed5 100644
--- a/mail/p5-SES/Makefile
+++ b/mail/p5-SES/Makefile
@@ -3,7 +3,7 @@
PORTNAME= SES
PORTVERSION= 1.01
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= http://d36cz9buwru1tt.cloudfront.net/catalog/attachments/
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Sendmail-AccessDB/Makefile b/mail/p5-Sendmail-AccessDB/Makefile
index 15f320b6908c..303e37bcf98c 100644
--- a/mail/p5-Sendmail-AccessDB/Makefile
+++ b/mail/p5-Sendmail-AccessDB/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Sendmail-AccessDB
PORTVERSION= 1.03
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Sendmail-AccessDB/pkg-plist b/mail/p5-Sendmail-AccessDB/pkg-plist
index 8d162e64faca..1393672f513e 100644
--- a/mail/p5-Sendmail-AccessDB/pkg-plist
+++ b/mail/p5-Sendmail-AccessDB/pkg-plist
@@ -1,3 +1,2 @@
%%SITE_PERL%%/Sendmail/AccessDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/AccessDB/.packlist
%%PERL5_MAN3%%/Sendmail::AccessDB.3.gz
diff --git a/mail/p5-Sendmail-Milter/Makefile b/mail/p5-Sendmail-Milter/Makefile
index 68b66012562d..4154d0b007e3 100644
--- a/mail/p5-Sendmail-Milter/Makefile
+++ b/mail/p5-Sendmail-Milter/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Sendmail-Milter
PORTVERSION= 0.18
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Sendmail-Milter/pkg-plist b/mail/p5-Sendmail-Milter/pkg-plist
index 1f524c09b760..e6fa1efbfaba 100644
--- a/mail/p5-Sendmail-Milter/pkg-plist
+++ b/mail/p5-Sendmail-Milter/pkg-plist
@@ -1,9 +1,5 @@
%%PERL5_MAN3%%/Sendmail::Milter.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Sendmail/Milter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Sendmail/sample.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter/Milter.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter/autosplit.ix
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/Milter
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Sendmail
+%%SITE_ARCH%%/Sendmail/Milter.pm
+%%SITE_ARCH%%/Sendmail/sample.pl
+%%SITE_ARCH%%/auto/Sendmail/Milter/Milter.so
+%%SITE_ARCH%%/auto/Sendmail/Milter/autosplit.ix
diff --git a/mail/p5-Test-Email/Makefile b/mail/p5-Test-Email/Makefile
index b8e1bf16aa1b..ec3df05dc11d 100644
--- a/mail/p5-Test-Email/Makefile
+++ b/mail/p5-Test-Email/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Test-Email
PORTVERSION= 0.07
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:JAMES
diff --git a/mail/p5-Test-Email/pkg-plist b/mail/p5-Test-Email/pkg-plist
index 99c9e5a57bcc..1869e1d68229 100644
--- a/mail/p5-Test-Email/pkg-plist
+++ b/mail/p5-Test-Email/pkg-plist
@@ -2,7 +2,3 @@
%%PERL5_MAN3%%/Test::POP3.3.gz
%%SITE_PERL%%/Test/Email.pm
%%SITE_PERL%%/Test/POP3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Email/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Email
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
-@dirrmtry %%SITE_PERL%%/Test
diff --git a/mail/p5-URI-imap/Makefile b/mail/p5-URI-imap/Makefile
index 0c0805355de4..159a79a6f5d3 100644
--- a/mail/p5-URI-imap/Makefile
+++ b/mail/p5-URI-imap/Makefile
@@ -3,6 +3,7 @@
PORTNAME= URI-imap
PORTVERSION= 1.01
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-URI-imap/pkg-plist b/mail/p5-URI-imap/pkg-plist
index dcff72a25334..cc0b65f1a940 100644
--- a/mail/p5-URI-imap/pkg-plist
+++ b/mail/p5-URI-imap/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/URI/imap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imap/.packlist
%%PERL5_MAN3%%/URI::imap.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imap
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/mail/p5-URI-imaps/Makefile b/mail/p5-URI-imaps/Makefile
index b67dc798d73e..aeffae6a96d2 100644
--- a/mail/p5-URI-imaps/Makefile
+++ b/mail/p5-URI-imaps/Makefile
@@ -3,6 +3,7 @@
PORTNAME= URI-imaps
PORTVERSION= 1.02
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ALEXM
diff --git a/mail/p5-URI-imaps/pkg-plist b/mail/p5-URI-imaps/pkg-plist
index 39861afea06f..c6542f28e75d 100644
--- a/mail/p5-URI-imaps/pkg-plist
+++ b/mail/p5-URI-imaps/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/URI/imaps.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imaps/.packlist
%%PERL5_MAN3%%/URI::imaps.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imaps
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
-@dirrmtry %%SITE_PERL%%/URI
diff --git a/mail/p5-WWW-GMail/Makefile b/mail/p5-WWW-GMail/Makefile
index 9b1656e78a54..b3d159e81a20 100644
--- a/mail/p5-WWW-GMail/Makefile
+++ b/mail/p5-WWW-GMail/Makefile
@@ -3,6 +3,7 @@
PORTNAME= WWW-GMail
PORTVERSION= 0.07
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-WWW-GMail/pkg-plist b/mail/p5-WWW-GMail/pkg-plist
index edfdab1890dc..46305fa9dfd1 100644
--- a/mail/p5-WWW-GMail/pkg-plist
+++ b/mail/p5-WWW-GMail/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/WWW/GMail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/GMail/.packlist
%%PERL5_MAN3%%/WWW::GMail.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/GMail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/mail/p5-WWW-Hotmail/Makefile b/mail/p5-WWW-Hotmail/Makefile
index 5ca031d37cf0..3dd017840427 100644
--- a/mail/p5-WWW-Hotmail/Makefile
+++ b/mail/p5-WWW-Hotmail/Makefile
@@ -3,6 +3,7 @@
PORTNAME= WWW-Hotmail
PORTVERSION= 0.10
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-WWW-Hotmail/pkg-plist b/mail/p5-WWW-Hotmail/pkg-plist
index cd590db8071c..3ad82dca3641 100644
--- a/mail/p5-WWW-Hotmail/pkg-plist
+++ b/mail/p5-WWW-Hotmail/pkg-plist
@@ -1,6 +1,2 @@
%%SITE_PERL%%/WWW/Hotmail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Hotmail/.packlist
%%PERL5_MAN3%%/WWW::Hotmail.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Hotmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/mail/p5-ZConf-Mail/Makefile b/mail/p5-ZConf-Mail/Makefile
index a403fecfacda..80a3bf341cb3 100644
--- a/mail/p5-ZConf-Mail/Makefile
+++ b/mail/p5-ZConf-Mail/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ZConf-Mail
PORTVERSION= 2.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:VVELOX
diff --git a/mail/p5-ZConf-Mail/pkg-plist b/mail/p5-ZConf-Mail/pkg-plist
index d161505d6355..46e8d50052e1 100644
--- a/mail/p5-ZConf-Mail/pkg-plist
+++ b/mail/p5-ZConf-Mail/pkg-plist
@@ -1,9 +1,4 @@
bin/zcgetmail
bin/zcmailaccount
%%SITE_PERL%%/ZConf/Mail.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Mail/.packlist
%%PERL5_MAN3%%/ZConf::Mail.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Mail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%/ZConf
diff --git a/mail/p5-qpsmtpd/Makefile b/mail/p5-qpsmtpd/Makefile
index 9376e6a835a7..783bf909c958 100644
--- a/mail/p5-qpsmtpd/Makefile
+++ b/mail/p5-qpsmtpd/Makefile
@@ -3,6 +3,7 @@
PORTNAME= qpsmtpd
PORTVERSION= 0.93
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= https://github.com/smtpd/qpsmtpd/archive/
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-qpsmtpd/pkg-plist b/mail/p5-qpsmtpd/pkg-plist
index 472735cf6962..858c01bc3330 100644
--- a/mail/p5-qpsmtpd/pkg-plist
+++ b/mail/p5-qpsmtpd/pkg-plist
@@ -124,7 +124,6 @@ man/man1/qpsmtpd-async.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tls_ciphers
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/dkim
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/qpsmtpd/.packlist
%%SITE_PERL%%/Apache/Qpsmtpd.pm
%%SITE_PERL%%/Danga/Client.pm
%%SITE_PERL%%/Danga/TimeoutSocket.pm
@@ -158,12 +157,3 @@ man/man1/qpsmtpd-async.1.gz
@dirrmtry %%DATADIR%%/plugins/logging
@dirrmtry %%DATADIR%%/plugins/queue
@dirrmtry %%DATADIR%%/plugins/virus
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/qpsmtpd
-@dirrmtry %%SITE_PERL%%/Apache
-@dirrmtry %%SITE_PERL%%/Danga
-@dirrmtry %%SITE_PERL%%/Qpsmtpd
-@dirrmtry %%SITE_PERL%%/Qpsmtpd/Plugin
-@dirrmtry %%SITE_PERL%%/Qpsmtpd/Plugin/Async
-@dirrmtry %%SITE_PERL%%/Qpsmtpd/Postfix
-@dirrmtry %%SITE_PERL%%/Qpsmtpd/SMTP
-@dirrmtry %%SITE_PERL%%/Qpsmtpd/TcpServer
diff --git a/mail/pflogstats/Makefile b/mail/pflogstats/Makefile
index b6cd1a4ae752..87a66157dfd0 100644
--- a/mail/pflogstats/Makefile
+++ b/mail/pflogstats/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pflogstats
PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.aerasec.de/pub/linux/postfix/pflogsumm/${PORTNAME}/
diff --git a/mail/pflogstats/pkg-plist b/mail/pflogstats/pkg-plist
index 3a5b8b54aa9b..89a2049f2b94 100644
--- a/mail/pflogstats/pkg-plist
+++ b/mail/pflogstats/pkg-plist
@@ -20,4 +20,3 @@ bin/pflogstats
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/Pflogstats
diff --git a/mail/policyd2/Makefile b/mail/policyd2/Makefile
index 40bede30eb5a..7d1e01e3684f 100644
--- a/mail/policyd2/Makefile
+++ b/mail/policyd2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= policyd2
PORTVERSION= 2.0.12
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= http://devlabs.linuxassist.net/attachments/download/${DOWNLOAD_FOLDER}/
DISTNAME= cluebringer-${PORTVERSION}
@@ -58,7 +58,7 @@ post-patch:
do-install:
@${MKDIR} ${STAGEDIR}${WWWDIR} \
- ${STAGEDIR}${SITE_PERL}/cbp \
+ ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/cbp \
${STAGEDIR}${DATADIR} \
${STAGEDIR}${DOCSDIR}
${INSTALL_SCRIPT} ${WRKSRC}/cbpadmin ${STAGEDIR}${PREFIX}/bin
@@ -66,7 +66,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/cluebringer.conf \
${STAGEDIR}${PREFIX}/etc/cluebringer.conf.sample
(cd ${WRKSRC}/webui && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR})
- (cd ${WRKSRC}/cbp && ${COPYTREE_SHARE} \* ${STAGEDIR}${SITE_PERL}/cbp)
+ (cd ${WRKSRC}/cbp && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/cbp)
(cd ${WRKSRC} && ${COPYTREE_SHARE} contrib ${STAGEDIR}${DATADIR})
(cd ${WRKSRC} && ${COPYTREE_SHARE} database ${STAGEDIR}${DATADIR})
(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
diff --git a/mail/razor-agents/Makefile b/mail/razor-agents/Makefile
index f6970cfad526..a6dfe2e99006 100644
--- a/mail/razor-agents/Makefile
+++ b/mail/razor-agents/Makefile
@@ -3,6 +3,7 @@
PORTNAME= razor-agents
PORTVERSION= 2.84
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= SF/razor/${PORTNAME}/${PORTVERSION}
diff --git a/mail/razor-agents/pkg-plist b/mail/razor-agents/pkg-plist
index b17ef499fab8..9fb953204757 100644
--- a/mail/razor-agents/pkg-plist
+++ b/mail/razor-agents/pkg-plist
@@ -13,37 +13,26 @@ man/man1/razor-revoke.1.gz
man/man5/razor-agent.conf.5.gz
man/man5/razor-agents.5.gz
man/man5/razor-whitelist.5.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Agent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Core.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Engine.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Engine/VR8.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Errorhandler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Logger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/Manager.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deBase64.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deHTML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deHTML_comment.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deHTMLxs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deNewline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deQP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/enBase64.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Signature/Ephemeral.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Signature/Whiplash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/String.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Syslog.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Preproc/deHTMLxs/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Preproc/deHTMLxs/deHTMLxs.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Syslog/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/razor-agents/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Signature
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Engine
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Razor2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Preproc/deHTMLxs
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Preproc
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Syslog
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/razor-agents
+%%SITE_ARCH%%/Razor2/Client/Agent.pm
+%%SITE_ARCH%%/Razor2/Client/Config.pm
+%%SITE_ARCH%%/Razor2/Client/Core.pm
+%%SITE_ARCH%%/Razor2/Client/Engine.pm
+%%SITE_ARCH%%/Razor2/Client/Version.pm
+%%SITE_ARCH%%/Razor2/Engine/VR8.pm
+%%SITE_ARCH%%/Razor2/Errorhandler.pm
+%%SITE_ARCH%%/Razor2/Logger.pm
+%%SITE_ARCH%%/Razor2/Preproc/Manager.pm
+%%SITE_ARCH%%/Razor2/Preproc/deBase64.pm
+%%SITE_ARCH%%/Razor2/Preproc/deHTML.pm
+%%SITE_ARCH%%/Razor2/Preproc/deHTML_comment.pm
+%%SITE_ARCH%%/Razor2/Preproc/deHTMLxs.pm
+%%SITE_ARCH%%/Razor2/Preproc/deNewline.pm
+%%SITE_ARCH%%/Razor2/Preproc/deQP.pm
+%%SITE_ARCH%%/Razor2/Preproc/enBase64.pm
+%%SITE_ARCH%%/Razor2/Signature/Ephemeral.pm
+%%SITE_ARCH%%/Razor2/Signature/Whiplash.pm
+%%SITE_ARCH%%/Razor2/String.pm
+%%SITE_ARCH%%/Razor2/Syslog.pm
+%%SITE_ARCH%%/auto/Razor2/Preproc/deHTMLxs/autosplit.ix
+%%SITE_ARCH%%/auto/Razor2/Preproc/deHTMLxs/deHTMLxs.so
+%%SITE_ARCH%%/auto/Razor2/Syslog/autosplit.ix
diff --git a/mail/slapd-cyrus/Makefile b/mail/slapd-cyrus/Makefile
index 6c63346950d1..fdf24ba525fc 100644
--- a/mail/slapd-cyrus/Makefile
+++ b/mail/slapd-cyrus/Makefile
@@ -3,7 +3,7 @@
PORTNAME= slapd-cyrus
PORTVERSION= 1.00
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail net
MASTER_SITES= SF/${PORTNAME}
DISTNAME= Slapd-Backend-Cyrus-${PORTVERSION}
@@ -29,9 +29,9 @@ PLIST_SUB= SITE_PERL_REL=${SITE_PERL_REL} \
PORTDOCS= slapd-cyrus.conf.sample
do-install:
- ${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${SITE_PERL}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
${INSTALL_DATA} -m 0444 ${WRKSRC}/t/etc/slapd.conf.dist \
${STAGEDIR}${DOCSDIR}/slapd-cyrus.conf.sample
- cd ${WRKSRC}/lib && ${PAX} -r -w . ${STAGEDIR}${SITE_PERL}
+ cd ${WRKSRC}/lib && ${PAX} -r -w . ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
.include <bsd.port.mk>
diff --git a/mail/slapd-cyrus/pkg-plist b/mail/slapd-cyrus/pkg-plist
index 150d3a94c322..f73baf7db9e7 100644
--- a/mail/slapd-cyrus/pkg-plist
+++ b/mail/slapd-cyrus/pkg-plist
@@ -7,9 +7,3 @@
%%SITE_PERL_REL%%/Slapd/Backend/Proxy.pm
%%SITE_PERL_REL%%/Slapd/Backend/Proxy/Store.pm
%%SITE_PERL_REL%%/Slapd/Backend/Proxy/Store/BerkeleyDB.pm
-@dirrmtry %%SITE_PERL_REL%%/Slapd/Backend/Proxy/Store
-@dirrmtry %%SITE_PERL_REL%%/Slapd/Backend/Proxy
-@dirrmtry %%SITE_PERL_REL%%/Slapd/Backend/Cyrus
-@dirrmtry %%SITE_PERL_REL%%/Slapd/Backend
-@dirrmtry %%SITE_PERL_REL%%/Slapd
-@dirrmtry %%SITE_PERL_REL%%
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 946a125887d7..4ee4ff5eb029 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= spamassassin
PORTVERSION= 3.4.0
-PORTREVISION?= 13 # also bump japanese/spamassassin
+PORTREVISION?= 14 # also bump japanese/spamassassin
CATEGORIES?= mail perl5
MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan
diff --git a/mail/spamassassin/pkg-plist b/mail/spamassassin/pkg-plist
index 065dc27c0f04..5f70c0ad445a 100644
--- a/mail/spamassassin/pkg-plist
+++ b/mail/spamassassin/pkg-plist
@@ -196,25 +196,11 @@ man/man1/spamd.1.gz
%%SITE_PERL%%/Mail/SpamAssassin/Util/ScopedTimer.pm
%%SITE_PERL%%/Mail/SpamAssassin/Util/TieOneStringHash.pm
%%SITE_PERL%%/Mail/SpamAssassin/Util/TinyRedis.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
%%SITE_PERL%%/spamassassin-run.pod
%%DATADIR%%/languages
%%DATADIR%%/sa-update-pubkey.txt
%%DATADIR%%/user_prefs.template
@dirrm %%DATADIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Util
-@dirrmtry %%SITE_PERL%%/Mail/SpamAssassin/Plugin
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Message/Metadata
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Message
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Logger
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Locker
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Conf
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/BayesStore
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Bayes
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin
-@dirrmtry %%SITE_PERL%%/Mail
@dirrmtry %%ETCDIR%%
@dirrmtry etc/mail
diff --git a/mail/spamcup/Makefile b/mail/spamcup/Makefile
index 9bd12a2ffeee..c17834a8a5a5 100644
--- a/mail/spamcup/Makefile
+++ b/mail/spamcup/Makefile
@@ -3,7 +3,7 @@
PORTNAME= spamcup
PORTVERSION= 1.09
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= SF
@@ -19,9 +19,6 @@ RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
USES= perl5
USE_PERL5= configure
-PLIST_FILES= bin/spamcup.pl ${SITE_PERL_REL}/spamcup.pl \
- ${SITE_PERL_REL}/${PERL_ARCH}/auto/Spamcup/.packlist
-
-PLIST_DIRS= ${SITE_PERL_REL}/${PERL_ARCH}/auto/Spamcup
+PLIST_FILES= bin/spamcup.pl ${SITE_PERL_REL}/spamcup.pl
.include <bsd.port.mk>