2 files changed, 56 insertions, 57 deletions

diff --git a/net/p5-Net-SSH-Perl/Makefile b/net/p5-Net-SSH-Perl/Makefile
index cf1ea6564333..fe184e1bc43a 100644
--- a/net/p5-Net-SSH-Perl/Makefile
+++ b/net/p5-Net-SSH-Perl/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Perl5 module implements both the SSH1 and SSH2 protocols
 
 NO_PACKAGE=	"Runaway package build"
 
-PERL_BASE=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_BASE=	${SITE_PERL}
 BUILD_DEPENDS=	${PERL_BASE}/Crypt/DSA.pm:${PORTSDIR}/security/p5-Crypt-DSA \
 		${PERL_BASE}/Crypt/DH.pm:${PORTSDIR}/security/p5-Crypt-DH \
 		${PERL_BASE}/${PERL_ARCH}/Math/Pari.pm:${PORTSDIR}/math/p5-Math-Pari \
@@ -38,7 +38,6 @@ FETCH_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::SSH::Perl::Constants.3 \
 		Net::SSH::Perl::Util.3 \
 		Net::SSH::Perl::ChannelMgr.3 \
diff --git a/net/p5-Net-SSH-Perl/pkg-plist b/net/p5-Net-SSH-Perl/pkg-plist
index 3425a9e3cf1a..4191f1c6cdd2 100644
--- a/net/p5-Net-SSH-Perl/pkg-plist
+++ b/net/p5-Net-SSH-Perl/pkg-plist
@@ -1,55 +1,55 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Handle/SSH1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Handle/SSH2.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/Hosts.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/Authfile.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/Term.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/SSH2MP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/SSH1Misc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/SSH1MP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/RSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/SSH1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/ChannelMgr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/Rhosts.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/RSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/KeyboardInt.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/PublicKey.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/Rhosts_RSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/ChallengeResponse.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/Password.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/DES.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/CBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/RC4.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/IDEA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/Blowfish.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/CFB.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/DES3.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Kex.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key/RSA1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key/DSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key/RSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Comp.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Mac.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Kex/DH1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Buffer.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/SSH2.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Comp/Zlib.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Agent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/AuthMgr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Packet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Channel.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Handle
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Kex
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Comp
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH
+%%SITE_PERL%%/Net/SSH/Perl/Handle/SSH1.pm
+%%SITE_PERL%%/Net/SSH/Perl/Handle/SSH2.pm
+%%SITE_PERL%%/Net/SSH/Perl/Constants.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/Hosts.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/Authfile.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/Term.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/SSH2MP.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/SSH1Misc.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/SSH1MP.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/RSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util.pm
+%%SITE_PERL%%/Net/SSH/Perl/SSH1.pm
+%%SITE_PERL%%/Net/SSH/Perl/ChannelMgr.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/Rhosts.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/RSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/KeyboardInt.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/PublicKey.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/Rhosts_RSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/ChallengeResponse.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/Password.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/DES.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/CBC.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/RC4.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/IDEA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/Blowfish.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/CFB.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/DES3.pm
+%%SITE_PERL%%/Net/SSH/Perl/Kex.pm
+%%SITE_PERL%%/Net/SSH/Perl/Key/RSA1.pm
+%%SITE_PERL%%/Net/SSH/Perl/Key/DSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Key/RSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Comp.pm
+%%SITE_PERL%%/Net/SSH/Perl/Mac.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth.pm
+%%SITE_PERL%%/Net/SSH/Perl/Kex/DH1.pm
+%%SITE_PERL%%/Net/SSH/Perl/Buffer.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher.pm
+%%SITE_PERL%%/Net/SSH/Perl/SSH2.pm
+%%SITE_PERL%%/Net/SSH/Perl/Key.pm
+%%SITE_PERL%%/Net/SSH/Perl/Comp/Zlib.pm
+%%SITE_PERL%%/Net/SSH/Perl/Agent.pm
+%%SITE_PERL%%/Net/SSH/Perl/Config.pm
+%%SITE_PERL%%/Net/SSH/Perl/AuthMgr.pm
+%%SITE_PERL%%/Net/SSH/Perl/Packet.pm
+%%SITE_PERL%%/Net/SSH/Perl/Channel.pm
+%%SITE_PERL%%/Net/SSH/Perl.pm
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Handle
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Util
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Auth
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Cipher
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Key
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Kex
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Comp
+@dirrm %%SITE_PERL%%/Net/SSH/Perl
+@dirrm %%SITE_PERL%%/Net/SSH