Avoid unneeded warnings from CGI.pm 4.05 or newer. Bump PKGREVISION.

4 files changed, 39 insertions, 3 deletions

diff --git a/www/p5-CGI-FormBuilder/Makefile b/www/p5-CGI-FormBuilder/Makefile
index 45e21d157ea..6b98e2d8fcc 100644
--- a/www/p5-CGI-FormBuilder/Makefile
+++ b/www/p5-CGI-FormBuilder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2014/05/29 23:38:00 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2014/10/14 14:43:09 schmonz Exp $
 
 DISTNAME=		CGI-FormBuilder-3.0501
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=CGI/}
 EXTRACT_SUFX=		.tgz
@@ -10,6 +10,7 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Perl5 module for building HTML forms
 HOMEPAGE=		http://www.formbuilder.org/
+LICENSE=		${PERL5_LICENSE}
 
 PERL5_PACKLIST=		auto/CGI/FormBuilder/.packlist
 
@@ -17,6 +18,9 @@ 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
 
+post-extract:
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM} -f
+
 pre-configure:
 	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM} -f
 
diff --git a/www/p5-CGI-FormBuilder/distinfo b/www/p5-CGI-FormBuilder/distinfo
index 646cbf559e9..2f02987bdda 100644
--- a/www/p5-CGI-FormBuilder/distinfo
+++ b/www/p5-CGI-FormBuilder/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.6 2007/04/30 21:36:24 heinz Exp $
+$NetBSD: distinfo,v 1.7 2014/10/14 14:43:09 schmonz Exp $
 
 SHA1 (CGI-FormBuilder-3.0501.tgz) = f682cad5f66c7b545c31605d521340e3f0c15ac5
 RMD160 (CGI-FormBuilder-3.0501.tgz) = 94e2dd395b87071c8dc72276026770e565016463
 Size (CGI-FormBuilder-3.0501.tgz) = 167585 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
new file mode 100644
index 00000000000..56e0c3ae8a7
--- /dev/null
+++ b/www/p5-CGI-FormBuilder/patches/patch-lib_CGI_FormBuilder.pm
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..2a1d75df79d
--- /dev/null
+++ b/www/p5-CGI-FormBuilder/patches/patch-lib_CGI_FormBuilder_Field.pm
@@ -0,0 +1,15 @@
+$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";