2 files changed, 29 insertions, 30 deletions

diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index 3e35b602d499..97dc600240cf 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 24th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.8 1997/06/24 18:43:25 jfitz Exp $
+# $Id: Makefile,v 1.9 1998/04/27 22:52:03 eivind Exp $
 #
 
 DISTNAME=	MailTools-1.11
@@ -23,7 +23,7 @@ MAN3=		Mail::Address.3 Mail::Cap.3 Mail::Field.3 Mail::Header.3 \
 		Mail::Internet.3 Mail::Alias.3 Mail::Mailer.3 Mail::Send.3 \
 		Mail::Util.3 Mail::Field::AddrList.3 Mail::Filter.3
 
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
diff --git a/mail/p5-Mail-Tools/pkg-plist b/mail/p5-Mail-Tools/pkg-plist
index 74840ef5b024..0e2ab4a52689 100644
--- a/mail/p5-Mail-Tools/pkg-plist
+++ b/mail/p5-Mail-Tools/pkg-plist
@@ -1,28 +1,27 @@
-lib/perl5/site_perl/Mail/Address.pm
-lib/perl5/site_perl/Mail/Alias.pm
-lib/perl5/site_perl/Mail/Cap.pm
-lib/perl5/site_perl/Mail/Field.pm
-lib/perl5/site_perl/Mail/Field/AddrList.pm
-lib/perl5/site_perl/Mail/Field/Date.pm
-lib/perl5/site_perl/Mail/Filter.pm
-lib/perl5/site_perl/Mail/Header.pm
-lib/perl5/site_perl/Mail/Internet.pm
-lib/perl5/site_perl/Mail/Mailer.pm
-lib/perl5/site_perl/Mail/Send.pm
-lib/perl5/site_perl/Mail/Util.pm
-lib/perl5/site_perl/auto/Mail/Internet/add_signature.al
-lib/perl5/site_perl/auto/Mail/Internet/autosplit.ix
-lib/perl5/site_perl/auto/Mail/Internet/escape_from.al
-lib/perl5/site_perl/auto/Mail/Internet/nntppost.al
-lib/perl5/site_perl/auto/Mail/Internet/reply.al
-lib/perl5/site_perl/auto/Mail/Internet/sign.al
-lib/perl5/site_perl/auto/Mail/Internet/smtpsend.al
-lib/perl5/site_perl/auto/Mail/Internet/unescape_from.al
-lib/perl5/site_perl/auto/Mail/Util/autosplit.ix
-lib/perl5/site_perl/auto/Mail/Util/mailaddress.al
-lib/perl5/site_perl/auto/Mail/Util/maildomain.al
-lib/perl5/site_perl/auto/Mail/Util/read_mbox.al
-lib/perl5/site_perl/i386-freebsd/auto/Mail/.packlist
-@dirrm lib/perl5/site_perl/auto/Mail/Util
-@dirrm lib/perl5/site_perl/auto/Mail/Internet
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Mail
+lib/perl5/site_perl/%%PERL_VER%%/Mail/Address.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/Alias.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/Cap.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/Field.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/Field/AddrList.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/Field/Date.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/Filter.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/Header.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/Internet.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/Mailer.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/Send.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/Util.pm
+lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/add_signature.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/escape_from.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/nntppost.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/reply.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/sign.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/smtpsend.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet/unescape_from.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util/mailaddress.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util/maildomain.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util/read_mbox.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Mail/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Util
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/Internet