Remove patches that avoided warning from CGI.pm 4.05 or newer by replacing

$self->{params}->param( with @{$self->{params}->param_fetch

as broke usage under Catalyst:
Can't locate object method "param_fetch" via package "Catalyst::Request"

4 files changed, 8 insertions, 35 deletions

diff --git a/www/p5-CGI-FormBuilder/Makefile b/www/p5-CGI-FormBuilder/Makefile
index f510ded1b9b..9d0772cdba5 100644
--- a/www/p5-CGI-FormBuilder/Makefile
+++ b/www/p5-CGI-FormBuilder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2015/06/12 10:51:53 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2016/02/26 22:27:43 abs Exp $
 
 DISTNAME=		CGI-FormBuilder-3.09
 PKGNAME=		p5-${DISTNAME}00
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=CGI/}
 EXTRACT_SUFX=		.tgz
@@ -18,6 +18,11 @@ DEPENDS+=		p5-HTML-Template>=2.6:../../www/p5-HTML-Template
 DEPENDS+=		p5-Text-Template>=1.43:../../textproc/p5-Text-Template
 #DEPENDS+=		p5-Template-Toolkit>=2.08:../../www/p5-Template-Toolkit
 
+# Note. Cannot avoid warning from CGI.pm 4.05 or newer by replacing
+# $self->{params}->param( with @{$self->{params}->param_fetch
+# as breaks usage under Catalyst:
+# Can't locate object method "param_fetch" via package "Catalyst::Request"
+
 post-extract:
 	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM} -f
 # garbage in the archive ?
diff --git a/www/p5-CGI-FormBuilder/distinfo b/www/p5-CGI-FormBuilder/distinfo
index 6de66aa126a..61f947886a6 100644
--- a/www/p5-CGI-FormBuilder/distinfo
+++ b/www/p5-CGI-FormBuilder/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 02:47:02 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/02/26 22:27:43 abs Exp $
 
 SHA1 (CGI-FormBuilder-3.09.tgz) = b255d05b4af376b304e752d122ce377915d2883f
 RMD160 (CGI-FormBuilder-3.09.tgz) = 01b3d3f410207258da65bd87d93fa3790048d15b
 SHA512 (CGI-FormBuilder-3.09.tgz) = 6907131de95ac0188a4a80e380fd81554bd9fb8d2566e961e5ff05a30e4498bccb157ecfdc77bdcd05427ebc5882caaea47b044aaaddae85f48231c0b7eef240
 Size (CGI-FormBuilder-3.09.tgz) = 163526 bytes
-SHA1 (patch-lib_CGI_FormBuilder.pm) = ea46077e1c5ceaf4409cf1a4f9459d00730a1069
-SHA1 (patch-lib_CGI_FormBuilder_Field.pm) = a4fc593652850402a258f60dc76041e2b99a48e5
diff --git a/www/p5-CGI-FormBuilder/patches/patch-lib_CGI_FormBuilder.pm b/www/p5-CGI-FormBuilder/patches/patch-lib_CGI_FormBuilder.pm
deleted file mode 100644
index 56e0c3ae8a7..00000000000
--- a/www/p5-CGI-FormBuilder/patches/patch-lib_CGI_FormBuilder.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_CGI_FormBuilder.pm,v 1.1 2014/10/14 14:43:09 schmonz Exp $
-
-Avoid unneeded warning from CGI.pm 4.05 or newer.
-
---- lib/CGI/FormBuilder.pm.orig	2007-03-02 18:13:14.000000000 +0000
-+++ lib/CGI/FormBuilder.pm
-@@ -855,7 +855,7 @@ sub keepextras {
- 
-     # Make sure to get all values
-     for my $p (@keep) {
--        for my $v ($self->{params}->param($p)) {
-+        for my $v (@{$self->{params}->param_fetch($p)}) {
-             debug 1, "keepextras: saving hidden param $p = $v";
-             push @html, htmltag('input', name => $p, type => 'hidden', value => $v);
-         }
diff --git a/www/p5-CGI-FormBuilder/patches/patch-lib_CGI_FormBuilder_Field.pm b/www/p5-CGI-FormBuilder/patches/patch-lib_CGI_FormBuilder_Field.pm
deleted file mode 100644
index 2a1d75df79d..00000000000
--- a/www/p5-CGI-FormBuilder/patches/patch-lib_CGI_FormBuilder_Field.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_CGI_FormBuilder_Field.pm,v 1.1 2014/10/14 14:43:09 schmonz Exp $
-
-Avoid unneeded warning from CGI.pm 4.05 or newer.
-
---- lib/CGI/FormBuilder/Field.pm.orig	2007-03-02 18:13:14.000000000 +0000
-+++ lib/CGI/FormBuilder/Field.pm
-@@ -189,7 +189,7 @@ sub cgi_value {
-     my $self = shift;
-     debug 2, "$self->{name}: called \$field->cgi_value";
-     puke "Cannot set \$field->cgi_value manually" if @_;
--    if (my @v = $self->{_form}{params}->param($self->name)) {
-+    if (my @v = @{$self->{_form}{params}->param_fetch($self->name)}) {
-         for my $v (@v) {
-             if ($self->other && $v eq $self->othername) {
-                 debug 1, "$self->{name}: redoing value from _other field";