2 files changed, 59 insertions, 50 deletions

diff --git a/net/p5-Net-SSH-Perl/Makefile b/net/p5-Net-SSH-Perl/Makefile
index fe184e1bc43a..24ce1d748f11 100644
--- a/net/p5-Net-SSH-Perl/Makefile
+++ b/net/p5-Net-SSH-Perl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Net-SSH-Perl
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
@@ -15,63 +16,66 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jesper@FreeBSD.org
 COMMENT=	Perl5 module implements both the SSH1 and SSH2 protocols
 
-NO_PACKAGE=	"Runaway package build"
+PERL_CONFIGURE=	yes
 
-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 \
-		${PERL_BASE}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
-		${PERL_BASE}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${PERL_BASE}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
-		${PERL_BASE}/Digest/HMAC_SHA1.pm:${PORTSDIR}/security/p5-Digest-HMAC \
-		${PERL_BASE}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-HMAC \
-		${PERL_BASE}/Convert/PEM.pm:${PORTSDIR}/converters/p5-Convert-PEM \
-		${PERL_BASE}/Digest/BubbleBabble.pm:${PORTSDIR}/security/p5-Digest-BubbleBabble \
-		${PERL_BASE}/Crypt/RSA.pm:${PORTSDIR}/security/p5-Crypt-RSA \
-		${PERL_BASE}/${PERL_ARCH}/IO/Socket.pm:${PORTSDIR}/devel/p5-IO \
-		${PERL_BASE}/${PERL_ARCH}/String/CRC32.pm:${PORTSDIR}/devel/p5-String-CRC32 \
-		${PERL_BASE}/${PERL_ARCH}/Math/GMP.pm:${PORTSDIR}/math/p5-Math-GMP \
-		${PERL_BASE}/${PERL_ARCH}/Crypt/IDEA.pm:${PORTSDIR}/security/p5-Crypt-IDEA
-RUN_DEPENDS=	${BUILD_DEPENDS}
-FETCH_DEPENDS=	${BUILD_DEPENDS}
+.include <bsd.port.pre.mk>
 
-PERL_CONFIGURE=	yes
+BUILD_DEPENDS=	${SITE_PERL}/Crypt/DSA.pm:${PORTSDIR}/security/p5-Crypt-DSA \
+		${SITE_PERL}/Crypt/DH.pm:${PORTSDIR}/security/p5-Crypt-DH \
+		${SITE_PERL}/${PERL_ARCH}/Math/Pari.pm:${PORTSDIR}/math/p5-Math-Pari \
+		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+		${SITE_PERL}/Digest/HMAC_SHA1.pm:${PORTSDIR}/security/p5-Digest-HMAC \
+		${SITE_PERL}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-HMAC \
+		${SITE_PERL}/Convert/PEM.pm:${PORTSDIR}/converters/p5-Convert-PEM \
+		${SITE_PERL}/Digest/BubbleBabble.pm:${PORTSDIR}/security/p5-Digest-BubbleBabble \
+		${SITE_PERL}/Crypt/RSA.pm:${PORTSDIR}/security/p5-Crypt-RSA \
+		${SITE_PERL}/${PERL_ARCH}/String/CRC32.pm:${PORTSDIR}/devel/p5-String-CRC32 \
+		${SITE_PERL}/${PERL_ARCH}/Math/GMP.pm:${PORTSDIR}/math/p5-Math-GMP \
+		${SITE_PERL}/${PERL_ARCH}/Crypt/IDEA.pm:${PORTSDIR}/security/p5-Crypt-IDEA
 
-MAN3=		Net::SSH::Perl::Constants.3 \
-		Net::SSH::Perl::Util.3 \
-		Net::SSH::Perl::ChannelMgr.3 \
-		Net::SSH::Perl::SSH1.3 \
-		Net::SSH::Perl::Auth::Rhosts.3 \
-		Net::SSH::Perl::Cipher::DES.3 \
-		Net::SSH::Perl::Auth::RSA.3 \
-		Net::SSH::Perl::Kex.3 \
-		Net::SSH::Perl::Key::RSA1.3 \
-		Net::SSH::Perl::Comp.3 \
-		Net::SSH::Perl::Key::DSA.3 \
-		Net::SSH::Perl.3 \
-		Net::SSH::Perl::Mac.3 \
+.if ${PERL_LEVEL} <= 500600
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/IO/Socket.pm:${PORTSDIR}/devel/p5-IO
+.endif
+
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+MAN3=		Net::SSH::Perl.3 \
+		Net::SSH::Perl::Agent.3 \
 		Net::SSH::Perl::Auth.3 \
-		Net::SSH::Perl::Cipher::CBC.3 \
-		Net::SSH::Perl::Cipher::RC4.3 \
-		Net::SSH::Perl::Kex::DH1.3 \
+		Net::SSH::Perl::Auth::KeyboardInt.3 \
+		Net::SSH::Perl::Auth::Password.3 \
+		Net::SSH::Perl::Auth::PublicKey.3 \
+		Net::SSH::Perl::Auth::RSA.3 \
+		Net::SSH::Perl::Auth::Rhosts.3 \
+		Net::SSH::Perl::Auth::Rhosts_RSA.3 \
+		Net::SSH::Perl::AuthMgr.3 \
 		Net::SSH::Perl::Buffer.3 \
+		Net::SSH::Perl::Channel.3 \
+		Net::SSH::Perl::ChannelMgr.3 \
 		Net::SSH::Perl::Cipher.3 \
-		Net::SSH::Perl::Cipher::IDEA.3 \
-		Net::SSH::Perl::Auth::KeyboardInt.3 \
-		Net::SSH::Perl::Key::RSA.3 \
-		Net::SSH::Perl::SSH2.3 \
 		Net::SSH::Perl::Cipher::Blowfish.3 \
-		Net::SSH::Perl::Auth::Rhosts_RSA.3 \
-		Net::SSH::Perl::Auth::PublicKey.3 \
-		Net::SSH::Perl::Key.3 \
-		Net::SSH::Perl::Agent.3 \
-		Net::SSH::Perl::Comp::Zlib.3 \
-		Net::SSH::Perl::Auth::Password.3 \
+		Net::SSH::Perl::Cipher::CBC.3 \
 		Net::SSH::Perl::Cipher::CFB.3 \
-		Net::SSH::Perl::Packet.3 \
-		Net::SSH::Perl::AuthMgr.3 \
+		Net::SSH::Perl::Cipher::DES.3 \
 		Net::SSH::Perl::Cipher::DES3.3 \
-		Net::SSH::Perl::Channel.3
+		Net::SSH::Perl::Cipher::IDEA.3 \
+		Net::SSH::Perl::Cipher::RC4.3 \
+		Net::SSH::Perl::Comp.3 \
+		Net::SSH::Perl::Comp::Zlib.3 \
+		Net::SSH::Perl::Config.3 \
+		Net::SSH::Perl::Constants.3 \
+		Net::SSH::Perl::Kex.3 \
+		Net::SSH::Perl::Kex::DH1.3 \
+		Net::SSH::Perl::Key.3 \
+		Net::SSH::Perl::Key::DSA.3 \
+		Net::SSH::Perl::Key::RSA.3 \
+		Net::SSH::Perl::Key::RSA1.3 \
+		Net::SSH::Perl::Mac.3 \
+		Net::SSH::Perl::Packet.3 \
+		Net::SSH::Perl::SSH1.3 \
+		Net::SSH::Perl::SSH2.3 \
+		Net::SSH::Perl::Util.3 \
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/p5-Net-SSH-Perl/pkg-plist b/net/p5-Net-SSH-Perl/pkg-plist
index 4191f1c6cdd2..3091157237ed 100644
--- a/net/p5-Net-SSH-Perl/pkg-plist
+++ b/net/p5-Net-SSH-Perl/pkg-plist
@@ -44,6 +44,7 @@
 %%SITE_PERL%%/Net/SSH/Perl/Packet.pm
 %%SITE_PERL%%/Net/SSH/Perl/Channel.pm
 %%SITE_PERL%%/Net/SSH/Perl.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/Perl/.packlist
 @dirrm %%SITE_PERL%%/Net/SSH/Perl/Handle
 @dirrm %%SITE_PERL%%/Net/SSH/Perl/Util
 @dirrm %%SITE_PERL%%/Net/SSH/Perl/Auth
@@ -53,3 +54,7 @@
 @dirrm %%SITE_PERL%%/Net/SSH/Perl/Comp
 @dirrm %%SITE_PERL%%/Net/SSH/Perl
 @dirrm %%SITE_PERL%%/Net/SSH
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/Perl
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true