3 files changed, 80 insertions, 77 deletions

diff --git a/security/p5-CryptX/Makefile b/security/p5-CryptX/Makefile
index 225882f8f174..db9a37536449 100644
--- a/security/p5-CryptX/Makefile
+++ b/security/p5-CryptX/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	CryptX
-PORTVERSION=	0.016
+PORTVERSION=	0.018
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Crypt
@@ -14,75 +14,7 @@ COMMENT=	Crypto toolkit
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Crypt::AuthEnc::CCM.3 \
-		Crypt::AuthEnc::EAX.3 \
-		Crypt::AuthEnc::GCM.3 \
-		Crypt::AuthEnc::OCB.3 \
-		Crypt::Cipher.3 \
-		Crypt::Cipher::AES.3 \
-		Crypt::Cipher::Anubis.3 \
-		Crypt::Cipher::Blowfish.3 \
-		Crypt::Cipher::CAST5.3 \
-		Crypt::Cipher::Camellia.3 \
-		Crypt::Cipher::DES.3 \
-		Crypt::Cipher::DES_EDE.3 \
-		Crypt::Cipher::KASUMI.3 \
-		Crypt::Cipher::Khazad.3 \
-		Crypt::Cipher::MULTI2.3 \
-		Crypt::Cipher::Noekeon.3 \
-		Crypt::Cipher::RC2.3 \
-		Crypt::Cipher::RC5.3 \
-		Crypt::Cipher::RC6.3 \
-		Crypt::Cipher::SAFERP.3 \
-		Crypt::Cipher::SAFER_K128.3 \
-		Crypt::Cipher::SAFER_K64.3 \
-		Crypt::Cipher::SAFER_SK128.3 \
-		Crypt::Cipher::SAFER_SK64.3 \
-		Crypt::Cipher::SEED.3 \
-		Crypt::Cipher::Skipjack.3 \
-		Crypt::Cipher::Twofish.3 \
-		Crypt::Cipher::XTEA.3 \
-		Crypt::Digest.3 \
-		Crypt::Digest::CHAES.3 \
-		Crypt::Digest::MD2.3 \
-		Crypt::Digest::MD4.3 \
-		Crypt::Digest::MD5.3 \
-		Crypt::Digest::RIPEMD128.3 \
-		Crypt::Digest::RIPEMD160.3 \
-		Crypt::Digest::RIPEMD256.3 \
-		Crypt::Digest::RIPEMD320.3 \
-		Crypt::Digest::SHA1.3 \
-		Crypt::Digest::SHA224.3 \
-		Crypt::Digest::SHA256.3 \
-		Crypt::Digest::SHA384.3 \
-		Crypt::Digest::SHA512.3 \
-		Crypt::Digest::Tiger192.3 \
-		Crypt::Digest::Whirlpool.3 \
-		Crypt::KeyDerivation.3 \
-		Crypt::Mac::F9.3 \
-		Crypt::Mac::HMAC.3 \
-		Crypt::Mac::OMAC.3 \
-		Crypt::Mac::PMAC.3 \
-		Crypt::Mac::Pelican.3 \
-		Crypt::Mac::XCBC.3 \
-		Crypt::Mode::CBC.3 \
-		Crypt::Mode::CFB.3 \
-		Crypt::Mode::CTR.3 \
-		Crypt::Mode::ECB.3 \
-		Crypt::Mode::OFB.3 \
-		Crypt::PK::DH.3 \
-		Crypt::PK::DSA.3 \
-		Crypt::PK::ECC.3 \
-		Crypt::PK::RSA.3 \
-		Crypt::PRNG.3 \
-		Crypt::PRNG::Fortuna.3 \
-		Crypt::PRNG::RC4.3 \
-		Crypt::PRNG::Sober128.3 \
-		Crypt::PRNG::Yarrow.3 \
-		CryptX.3
-
 regression-test: build
 	@cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} test
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/security/p5-CryptX/distinfo b/security/p5-CryptX/distinfo
index 0f54386d91b4..77ce4eccedde 100644
--- a/security/p5-CryptX/distinfo
+++ b/security/p5-CryptX/distinfo
@@ -1,2 +1,2 @@
-SHA256 (CryptX-0.016.tar.gz) = 81e8331c80ba4638ca8f6a3f4401de28bc42f918b5cb36d0365cb97da754c51a
-SIZE (CryptX-0.016.tar.gz) = 1018022
+SHA256 (CryptX-0.018.tar.gz) = 79b4fd1ef308131cedf17a09bd43ca93763712316fe13ff0fef176333064f6ac
+SIZE (CryptX-0.018.tar.gz) = 1039590
diff --git a/security/p5-CryptX/pkg-plist b/security/p5-CryptX/pkg-plist
index f13f86824a0d..81884874349e 100644
--- a/security/p5-CryptX/pkg-plist
+++ b/security/p5-CryptX/pkg-plist
@@ -1,8 +1,79 @@
+%%PERL5_MAN3%%/Crypt::AuthEnc.3.gz
+%%PERL5_MAN3%%/Crypt::AuthEnc::CCM.3.gz
+%%PERL5_MAN3%%/Crypt::AuthEnc::EAX.3.gz
+%%PERL5_MAN3%%/Crypt::AuthEnc::GCM.3.gz
+%%PERL5_MAN3%%/Crypt::AuthEnc::OCB.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::AES.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::Anubis.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::Blowfish.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::CAST5.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::Camellia.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::DES.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::DES_EDE.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::KASUMI.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::Khazad.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::MULTI2.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::Noekeon.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::RC2.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::RC5.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::RC6.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::SAFERP.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::SAFER_K128.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::SAFER_K64.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::SAFER_SK128.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::SAFER_SK64.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::SEED.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::Skipjack.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::Twofish.3.gz
+%%PERL5_MAN3%%/Crypt::Cipher::XTEA.3.gz
+%%PERL5_MAN3%%/Crypt::Digest.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::CHAES.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::MD2.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::MD4.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::MD5.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::RIPEMD128.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::RIPEMD160.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::RIPEMD256.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::RIPEMD320.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::SHA1.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::SHA224.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::SHA256.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::SHA384.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::SHA512.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::Tiger192.3.gz
+%%PERL5_MAN3%%/Crypt::Digest::Whirlpool.3.gz
+%%PERL5_MAN3%%/Crypt::KeyDerivation.3.gz
+%%PERL5_MAN3%%/Crypt::Mac.3.gz
+%%PERL5_MAN3%%/Crypt::Mac::F9.3.gz
+%%PERL5_MAN3%%/Crypt::Mac::HMAC.3.gz
+%%PERL5_MAN3%%/Crypt::Mac::OMAC.3.gz
+%%PERL5_MAN3%%/Crypt::Mac::PMAC.3.gz
+%%PERL5_MAN3%%/Crypt::Mac::Pelican.3.gz
+%%PERL5_MAN3%%/Crypt::Mac::XCBC.3.gz
+%%PERL5_MAN3%%/Crypt::Mode.3.gz
+%%PERL5_MAN3%%/Crypt::Mode::CBC.3.gz
+%%PERL5_MAN3%%/Crypt::Mode::CFB.3.gz
+%%PERL5_MAN3%%/Crypt::Mode::CTR.3.gz
+%%PERL5_MAN3%%/Crypt::Mode::ECB.3.gz
+%%PERL5_MAN3%%/Crypt::Mode::OFB.3.gz
+%%PERL5_MAN3%%/Crypt::PK.3.gz
+%%PERL5_MAN3%%/Crypt::PK::DH.3.gz
+%%PERL5_MAN3%%/Crypt::PK::DSA.3.gz
+%%PERL5_MAN3%%/Crypt::PK::ECC.3.gz
+%%PERL5_MAN3%%/Crypt::PK::RSA.3.gz
+%%PERL5_MAN3%%/Crypt::PRNG.3.gz
+%%PERL5_MAN3%%/Crypt::PRNG::Fortuna.3.gz
+%%PERL5_MAN3%%/Crypt::PRNG::RC4.3.gz
+%%PERL5_MAN3%%/Crypt::PRNG::Sober128.3.gz
+%%PERL5_MAN3%%/Crypt::PRNG::Yarrow.3.gz
+%%PERL5_MAN3%%/CryptX.3.gz
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/AuthEnc.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/AuthEnc/CCM.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/AuthEnc/EAX.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/AuthEnc/GCM.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/AuthEnc/OCB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/AuthEnc.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/AES.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/Anubis.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/Blowfish.pm
@@ -26,7 +97,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/Skipjack.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/Twofish.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher/XTEA.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Cipher.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/CHAES.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/MD2.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/MD4.pm
@@ -42,30 +113,30 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/SHA512.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/Tiger192.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest/Whirlpool.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Digest.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/KeyDerivation.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac/F9.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac/HMAC.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac/OMAC.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac/PMAC.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac/Pelican.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac/XCBC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mac.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mode.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mode/CBC.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mode/CFB.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mode/CTR.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mode/ECB.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mode/OFB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Mode.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PK.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PK/DH.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PK/DSA.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PK/ECC.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PK/RSA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PRNG.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PRNG/Fortuna.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PRNG/RC4.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PRNG/Sober128.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PRNG/Yarrow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/PRNG.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/CryptX.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CryptX/CryptX.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CryptX/CryptX.so