3 files changed, 50 insertions, 42 deletions

diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile
index e90d305123af..ad83c2636bb5 100644
--- a/mail/p5-Mail-DKIM/Makefile
+++ b/mail/p5-Mail-DKIM/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Mail-DKIM
-PORTVERSION=	0.24
+PORTVERSION=	0.25
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
@@ -15,16 +15,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	yanagisawa@csg.is.titech.ac.jp
 COMMENT=	Perl5 module to process and/or create DKIM email
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/RSA.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/RSA.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
 		${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA \
 		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+		${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
-		${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
-		${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
-RUN_DEPENDS=	${BUILD_DEPENDS}
+		${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
-MASTER_SITE_BACKUP+=	http://freebsd.unixfreunde.de/sources/ \
+MASTER_SITE_BACKUP=	http://freebsd.unixfreunde.de/sources/ \
 			http://jason.long.name/dkimproxy/
 
 PERL_CONFIGURE=	yes
@@ -42,10 +41,13 @@ MAN3=		Mail::DKIM.3 \
 		Mail::DKIM::SignerPolicy.3 \
 		Mail::DKIM::Verifier.3
 
+post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/dkim*.pl ${PREFIX}/bin
+
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500600
-IGNORE=		require Perl 5.8 or newer. Install lang/perl5.8 and try again
+.if ${PERL_LEVEL} < 500800
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/p5-Mail-DKIM/distinfo b/mail/p5-Mail-DKIM/distinfo
index ec23c60f402f..65bc1280bcf8 100644
--- a/mail/p5-Mail-DKIM/distinfo
+++ b/mail/p5-Mail-DKIM/distinfo
@@ -1,3 +1,3 @@
-MD5 (Mail-DKIM-0.24.tar.gz) = 9d50bc57eeb41d36b9ccc1cb72a64e9a
-SHA256 (Mail-DKIM-0.24.tar.gz) = 108bc39e8955d5d5a9d16d9cedca8bd1168cb0ded9a55ea9002d18dbd1a23d49
-SIZE (Mail-DKIM-0.24.tar.gz) = 44325
+MD5 (Mail-DKIM-0.25.tar.gz) = f8a9b91ae16eeabbd72da098550ec569
+SHA256 (Mail-DKIM-0.25.tar.gz) = 4b284ec27ac64ccbec94e4311f2d1f1a3d4684135ac349e7367460cb165c1b38
+SIZE (Mail-DKIM-0.25.tar.gz) = 47549
diff --git a/mail/p5-Mail-DKIM/pkg-plist b/mail/p5-Mail-DKIM/pkg-plist
index 776ce0eef7d6..cf2e07d216ab 100644
--- a/mail/p5-Mail-DKIM/pkg-plist
+++ b/mail/p5-Mail-DKIM/pkg-plist
@@ -1,30 +1,36 @@
-lib/perl5/site_perl/5.8.8/Mail/DKIM.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Algorithm/Base.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Algorithm/dk_rsa_sha1.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Algorithm/rsa_sha1.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Algorithm/rsa_sha256.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Canonicalization/Base.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Canonicalization/DkCommon.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Canonicalization/DkimCommon.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Canonicalization/dk_nofws.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Canonicalization/dk_simple.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Canonicalization/nowsp.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Canonicalization/relaxed.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Canonicalization/simple.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Common.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/DkSignature.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Key.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/KeyValueList.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/MessageParser.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Policy.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/PrivateKey.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/PublicKey.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Signature.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Signer.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/SignerPolicy.pm
-lib/perl5/site_perl/5.8.8/Mail/DKIM/Verifier.pm
-lib/perl5/site_perl/5.8.8/mach/auto/Mail/DKIM/.packlist
-@dirrm lib/perl5/site_perl/5.8.8/mach/auto/Mail/DKIM
-@dirrm lib/perl5/site_perl/5.8.8/Mail/DKIM/Canonicalization
-@dirrm lib/perl5/site_perl/5.8.8/Mail/DKIM/Algorithm
-@dirrm lib/perl5/site_perl/5.8.8/Mail/DKIM
+@comment $FreeBSD$
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DKIM/.packlist
+%%SITE_PERL%%/Mail/DKIM.pm
+%%SITE_PERL%%/Mail/DKIM/Algorithm/Base.pm
+%%SITE_PERL%%/Mail/DKIM/Algorithm/dk_rsa_sha1.pm
+%%SITE_PERL%%/Mail/DKIM/Algorithm/rsa_sha1.pm
+%%SITE_PERL%%/Mail/DKIM/Algorithm/rsa_sha256.pm
+%%SITE_PERL%%/Mail/DKIM/Canonicalization/Base.pm
+%%SITE_PERL%%/Mail/DKIM/Canonicalization/DkCommon.pm
+%%SITE_PERL%%/Mail/DKIM/Canonicalization/DkimCommon.pm
+%%SITE_PERL%%/Mail/DKIM/Canonicalization/dk_nofws.pm
+%%SITE_PERL%%/Mail/DKIM/Canonicalization/dk_simple.pm
+%%SITE_PERL%%/Mail/DKIM/Canonicalization/nowsp.pm
+%%SITE_PERL%%/Mail/DKIM/Canonicalization/relaxed.pm
+%%SITE_PERL%%/Mail/DKIM/Canonicalization/simple.pm
+%%SITE_PERL%%/Mail/DKIM/Common.pm
+%%SITE_PERL%%/Mail/DKIM/DkSignature.pm
+%%SITE_PERL%%/Mail/DKIM/Key.pm
+%%SITE_PERL%%/Mail/DKIM/KeyValueList.pm
+%%SITE_PERL%%/Mail/DKIM/MessageParser.pm
+%%SITE_PERL%%/Mail/DKIM/Policy.pm
+%%SITE_PERL%%/Mail/DKIM/PrivateKey.pm
+%%SITE_PERL%%/Mail/DKIM/PublicKey.pm
+%%SITE_PERL%%/Mail/DKIM/Signature.pm
+%%SITE_PERL%%/Mail/DKIM/Signer.pm
+%%SITE_PERL%%/Mail/DKIM/SignerPolicy.pm
+%%SITE_PERL%%/Mail/DKIM/TextWrap.pm
+%%SITE_PERL%%/Mail/DKIM/Verifier.pm
+bin/dkimsign.pl
+bin/dkimverify.pl
+@dirrm %%SITE_PERL%%/Mail/DKIM/Canonicalization
+@dirrm %%SITE_PERL%%/Mail/DKIM/Algorithm
+@dirrm %%SITE_PERL%%/Mail/DKIM
+@dirrmtry %%SITE_PERL%%/Mail
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DKIM
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail