Date: Mon, 23 Aug 2004 10:38:44 +0200 (CEST) From: Stefan Walter <sw@gegenunendlich.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jesper@FreeBSD.org Subject: ports/70847: [PATCH] net/p5-Net-SSH-Perl: fix dependencies and plist Message-ID: <20040823083844.86ED540AA@kyuzo.dunkelkammer.void> Resent-Message-ID: <200408230840.i7N8eLpv034795@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70847
>Category: ports
>Synopsis: [PATCH] net/p5-Net-SSH-Perl: fix dependencies and plist
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 23 08:40:20 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Stefan Walter
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
Infinity Approximation Task Force
>Environment:
System: FreeBSD kyuzo.dunkelkammer.void 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Wed Jul 28 20:21:17 CEST 2004
>Description:
- remove unnecessary FETCH_DEPENDS
- remove unnecessary variable PERL_BASE
- dependency on devel/p5-IO only if Perl < 5.6.x
- add a missing man page (Net::SSH::Perl::Config.3) and a missing file
(%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/Perl/.packlist)
- sort MAN3 in Makefile
- add a patch that suppresses the prompts in the Perl configure script
and always selects all modules for installation (This should hopefully
fix the package build on the cluster, so remove NO_PACKAGE as well.)
Port maintainer (jesper@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- p5-Net-SSH-Perl-1.23.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/p5-Net-SSH-Perl.old/Makefile /usr/ports/net/p5-Net-SSH-Perl/Makefile
--- /usr/ports/net/p5-Net-SSH-Perl.old/Makefile Sun Aug 22 18:47:13 2004
+++ /usr/ports/net/p5-Net-SSH-Perl/Makefile Mon Aug 23 09:06:47 2004
@@ -15,63 +15,66 @@
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 -ruN --exclude=CVS /usr/ports/net/p5-Net-SSH-Perl.old/files/patch-Makefile.PL /usr/ports/net/p5-Net-SSH-Perl/files/patch-Makefile.PL
--- /usr/ports/net/p5-Net-SSH-Perl.old/files/patch-Makefile.PL Thu Jan 1 01:00:00 1970
+++ /usr/ports/net/p5-Net-SSH-Perl/files/patch-Makefile.PL Mon Aug 23 09:12:11 2004
@@ -0,0 +1,22 @@
+--- Makefile.PL.old Mon Aug 23 09:08:34 2004
++++ Makefile.PL Mon Aug 23 09:11:38 2004
+@@ -81,7 +81,8 @@
+ }
+ printf " [3] Both SSH1 and SSH2\n";
+
+- my $p = prompt("\nWhich protocol(s) do you plan to use?", 3);
++ #my $p = prompt("\nWhich protocol(s) do you plan to use?", 3);
++ my $p = "3";
+ print "\n";
+
+ for my $mod (keys %{ $BASE_PREREQS{$p} }) {
+@@ -101,7 +102,8 @@
+ for my $ciph (sort { $a->[0] <=> $b->[0] } @cryptmod) {
+ printf " [%d] %s\n", $i++, $ciph->[0];
+ }
+- my $c = prompt("\nEnter your choices, separated by spaces:", 1);
++ #my $c = prompt("\nEnter your choices, separated by spaces:", 1);
++ my $c = "1 2 3 4 5";
+ print "\n";
+
+ for my $id (split /\s+/, $c) {
diff -ruN --exclude=CVS /usr/ports/net/p5-Net-SSH-Perl.old/pkg-plist /usr/ports/net/p5-Net-SSH-Perl/pkg-plist
--- /usr/ports/net/p5-Net-SSH-Perl.old/pkg-plist Sun Aug 22 18:47:13 2004
+++ /usr/ports/net/p5-Net-SSH-Perl/pkg-plist Mon Aug 23 09:26:15 2004
@@ -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
--- p5-Net-SSH-Perl-1.23.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040823083844.86ED540AA>