Update to 1.04.

PR:		142113
Submitted by:	Alex Deiter <alex.deiter@gmail.com>

3 files changed, 11 insertions, 64 deletions

diff --git a/security/p5-Crypt-OpenPGP/Makefile b/security/p5-Crypt-OpenPGP/Makefile
index 58417ef0e8ea..12227d2da5fd 100644
--- a/security/p5-Crypt-OpenPGP/Makefile
+++ b/security/p5-Crypt-OpenPGP/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Crypt-OpenPGP
-PORTVERSION=	1.03
-PORTREVISION=	1
+PORTVERSION=	1.04
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -20,16 +19,23 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Crypt/DES.pm:${PORTSDIR}/security/p5-Cr
 		${SITE_PERL}/${PERL_ARCH}/Crypt/IDEA.pm:${PORTSDIR}/security/p5-Crypt-IDEA \
 		${SITE_PERL}/Crypt/DSA.pm:${PORTSDIR}/security/p5-Crypt-DSA \
 		${SITE_PERL}/Crypt/RSA.pm:${PORTSDIR}/security/p5-Crypt-RSA \
+		${SITE_PERL}/Crypt/DES_EDE3.pm:${PORTSDIR}/security/p5-Crypt-DES_EDE3 \
 		${SITE_PERL}/${PERL_ARCH}/Crypt/RIPEMD160.pm:${PORTSDIR}/security/p5-Crypt-RIPEMD160 \
 		${SITE_PERL}/${PERL_ARCH}/Crypt/Rijndael.pm:${PORTSDIR}/security/p5-Crypt-Rijndael \
+		${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception \
 		${SITE_PERL}/Crypt/CAST5_PP.pm:${PORTSDIR}/security/p5-Crypt-CAST5_PP \
 		${SITE_PERL}/Crypt/DES_EDE3.pm:${PORTSDIR}/security/p5-Crypt-DES_EDE3 \
+		${SITE_PERL}/File/HomeDir.pm:${PORTSDIR}/devel/p5-File-HomeDir \
 		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
 		p5-Compress-Zlib>0:${PORTSDIR}/archivers/p5-Compress-Zlib \
+		${SITE_PERL}/${PERL_ARCH}/Crypt/Twofish.pm:${PORTSDIR}/security/p5-Crypt-Twofish \
+		${SITE_PERL}/${PERL_ARCH}/Crypt/Rijndael.pm:${PORTSDIR}/security/p5-Crypt-Rijndael \
+		${SITE_PERL}/Crypt/RSA.pm:${PORTSDIR}/security/p5-Crypt-RSA \
 		${SITE_PERL}/${PERL_ARCH}/Math/Pari.pm:${PORTSDIR}/math/p5-Math-Pari \
 		${SITE_PERL}/Data/Buffer.pm:${PORTSDIR}/misc/p5-Data-Buffer \
 		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
 		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+		${SITE_PERL}/Data/Buffer.pm:${PORTSDIR}/misc/p5-Data-Buffer \
 		p5-Math-BigInt>=1.78:${PORTSDIR}/math/p5-Math-BigInt \
 		p5-Math-BigInt-GMP>=1.21:${PORTSDIR}/math/p5-Math-BigInt-GMP
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/security/p5-Crypt-OpenPGP/distinfo b/security/p5-Crypt-OpenPGP/distinfo
index a1ebd54ef9ba..f1ad95484aae 100644
--- a/security/p5-Crypt-OpenPGP/distinfo
+++ b/security/p5-Crypt-OpenPGP/distinfo
@@ -1,3 +1,3 @@
-MD5 (Crypt-OpenPGP-1.03.tar.gz) = 020141cf2a3c22b50373fc5aeb7914d2
-SHA256 (Crypt-OpenPGP-1.03.tar.gz) = a602fd8383349ed352614acf984103dfd6b9d2fc721262238bb9080ded1bed08
-SIZE (Crypt-OpenPGP-1.03.tar.gz) = 96872
+MD5 (Crypt-OpenPGP-1.04.tar.gz) = 981cb9387728918e5c37524bb3787dc8
+SHA256 (Crypt-OpenPGP-1.04.tar.gz) = 8a5826bd9627016cfbc054189dab8a15e1e229e8db2fd27833df8a41226c9f33
+SIZE (Crypt-OpenPGP-1.04.tar.gz) = 108477
diff --git a/security/p5-Crypt-OpenPGP/files/patch-makefile b/security/p5-Crypt-OpenPGP/files/patch-makefile
deleted file mode 100644
index db58f8ffab8c..000000000000
--- a/security/p5-Crypt-OpenPGP/files/patch-makefile
+++ /dev/null
@@ -1,59 +0,0 @@
---- Makefile.PL.orig	Tue Dec 10 02:48:09 2002
-+++ Makefile.PL	Tue Apr  8 10:33:08 2003
-@@ -11,56 +11,6 @@
- use File::Basename qw/dirname/;
- use lib File::Spec->catdir(dirname($0), 'inc');
- 
--use ExtUtils::AutoInstall (
--    -core => [
--        'Data::Buffer'     => '0.04',
--        'MIME::Base64'     => 0,
--        'Math::Pari'       => 0,
--        'Compress::Zlib'   => 0,
--        'LWP::UserAgent'   => 0,
--        'URI::Escape'      => 0,
--
--        'Crypt::DSA'       => 0,
--        'Crypt::RSA'       => 0,
--    ],
--
--    'PGP2 Compatibility (Minimum)' => [
--        -default           => $is_sdk,
--        'Crypt::IDEA'      => 0,
--        'Digest::MD5'      => 0,
--    ],
--
--    'PGP5 Compatibility (Minimum)' => [
--        -default           => $is_sdk,
--        'Crypt::DES_EDE3'  => 0,
--        'Digest::SHA1'     => 0,
--    ],
--
--    'GnuPG Compatibility (Minimum)' => [
--        -default           => $is_sdk,
--        'Crypt::Rijndael'  => 0,
--        'Crypt::CAST5_PP'  => 0,
--        'Crypt::RIPEMD160' => 0,
--    ],
--
--    'Support for all ciphers' => [
--        -default           => $is_sdk,
--        'Crypt::IDEA'      => 0,
--        'Crypt::DES_EDE3'  => 0,
--        'Crypt::CAST5_PP'  => 0,
--        'Crypt::Blowfish'  => 0,
--        'Crypt::Twofish'   => '2.00',
--        'Crypt::Rijndael'  => 0,
--    ],
--
--    'Support for all digests' => [
--        -default           => $is_sdk,
--        'Digest::MD5'      => 0,
--        'Digest::SHA1'     => 0,
--        'Crypt::RIPEMD160' => 0,
--    ],
--);
--
- WriteMakefile(
-     AUTHOR       => 'Benjamin Trott <cpan@stupidfool.org>',
-     ABSTRACT     => 'Pure-Perl OpenPGP-compatible PGP implementation',