diff options
author | kim <kim@pkgsrc.org> | 2014-09-05 20:23:06 +0000 |
---|---|---|
committer | kim <kim@pkgsrc.org> | 2014-09-05 20:23:06 +0000 |
commit | c7784804f349ffcdb2e0afbae0507fce0f9ade47 (patch) | |
tree | 74075df516cb87b348896c1bd7d2c3f910ebc670 /net | |
parent | 1814c6032b0c34d99889bc168537b3cc224f0470 (diff) | |
download | pkgsrc-c7784804f349ffcdb2e0afbae0507fce0f9ade47.tar.gz |
Improve patch to use an array of tested versions.
Submitted pull request upstream.
Diffstat (limited to 'net')
-rw-r--r-- | net/p5-Net-INET6Glue/Makefile | 4 | ||||
-rw-r--r-- | net/p5-Net-INET6Glue/distinfo | 4 | ||||
-rw-r--r-- | net/p5-Net-INET6Glue/patches/patch-aa | 22 |
3 files changed, 18 insertions, 12 deletions
diff --git a/net/p5-Net-INET6Glue/Makefile b/net/p5-Net-INET6Glue/Makefile index 4473ee37a61..78483356adb 100644 --- a/net/p5-Net-INET6Glue/Makefile +++ b/net/p5-Net-INET6Glue/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2014/09/03 06:19:44 kim Exp $ +# $NetBSD: Makefile,v 1.8 2014/09/05 20:23:06 kim Exp $ DISTNAME= Net-INET6Glue-0.602 PKGNAME= p5-${DISTNAME:S/602/6.2/} -#PKGREVISION= 0 +PKGREVISION= 1 CATEGORIES= net perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/modules\/by-module\//authors\/id\/S\/SU\/SULLR\//} diff --git a/net/p5-Net-INET6Glue/distinfo b/net/p5-Net-INET6Glue/distinfo index 61edc8506c6..4b385f17f0a 100644 --- a/net/p5-Net-INET6Glue/distinfo +++ b/net/p5-Net-INET6Glue/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2014/09/03 06:19:44 kim Exp $ +$NetBSD: distinfo,v 1.3 2014/09/05 20:23:06 kim Exp $ SHA1 (Net-INET6Glue-0.602.tar.gz) = 5c3bd152d05cea9c3db551174bd9819e8336c1a3 RMD160 (Net-INET6Glue-0.602.tar.gz) = 74d828ec12422ee813fcff3c4cb630d5e4645484 Size (Net-INET6Glue-0.602.tar.gz) = 5078 bytes -SHA1 (patch-aa) = e3a4154c82e04e25b360ebfb46fb6cef9b348bcc +SHA1 (patch-aa) = b177363b50789fd41b8e91aef168f711f62062fb diff --git a/net/p5-Net-INET6Glue/patches/patch-aa b/net/p5-Net-INET6Glue/patches/patch-aa index b543ef4f52f..7ef8475733e 100644 --- a/net/p5-Net-INET6Glue/patches/patch-aa +++ b/net/p5-Net-INET6Glue/patches/patch-aa @@ -1,19 +1,25 @@ -$NetBSD: patch-aa,v 1.1 2014/09/03 06:19:44 kim Exp $ +$NetBSD: patch-aa,v 1.2 2014/09/05 20:23:06 kim Exp $ Avoid warning when used with perl-5.20.0 from pkgsrc. -Maybe this should be a check against an array instead. ---- lib/Net/INET6Glue/FTP.pm.orig 2014-01-14 10:00:27.000000000 +0000 -+++ lib/Net/INET6Glue/FTP.pm 2014-09-03 06:12:30.000000000 +0000 -@@ -8,9 +8,9 @@ +https://github.com/noxxi/p5-net-inet6glue/pull/3.diff + +--- lib/Net/INET6Glue/FTP.pm ++++ lib/Net/INET6Glue/FTP.pm +@@ -7,11 +7,13 @@ our $VERSION = 0.5; + # implement EPRT, EPSV for Net::FTP to support IPv6 ############################################################################ ++use List::Util qw(first); use Net::INET6Glue::INET_is_INET6; -use Net::FTP; # tested with version 2.77 -+use Net::FTP; # tested with version 2.79 ++use Net::FTP; BEGIN { - $Net::FTP::VERSION eq '2.77' -+ $Net::FTP::VERSION eq '2.79' - or warn "Not tested with Net::FTP version $Net::FTP::VERSION"; +- or warn "Not tested with Net::FTP version $Net::FTP::VERSION"; ++ my @tested = qw(2.77 2.79); ++ warn "Not tested with Net::FTP version $Net::FTP::VERSION" ++ unless first { $_ eq $Net::FTP::VERSION } @tested; } + use Socket; |