3 files changed, 43 insertions, 40 deletions

diff --git a/databases/p5-Class-DBI-AsForm/Makefile b/databases/p5-Class-DBI-AsForm/Makefile
index 18e2915aa75f..e530990cb106 100644
--- a/databases/p5-Class-DBI-AsForm/Makefile
+++ b/databases/p5-Class-DBI-AsForm/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	Class-DBI-AsForm
-PORTVERSION=	2.3
+PORTVERSION=	2.41
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Class
diff --git a/databases/p5-Class-DBI-AsForm/distinfo b/databases/p5-Class-DBI-AsForm/distinfo
index 3c71dbba03f7..8dca25a5fad7 100644
--- a/databases/p5-Class-DBI-AsForm/distinfo
+++ b/databases/p5-Class-DBI-AsForm/distinfo
@@ -1,2 +1,2 @@
-MD5 (Class-DBI-AsForm-2.3.tar.gz) = 158e2f3eb51f10bedbf36e5199802f9a
-SIZE (Class-DBI-AsForm-2.3.tar.gz) = 3825
+MD5 (Class-DBI-AsForm-2.41.tar.gz) = 123ef74dd79a632b881189334cfa6827
+SIZE (Class-DBI-AsForm-2.41.tar.gz) = 4104
diff --git a/databases/p5-Class-DBI-AsForm/files/500503-AsForm.pm b/databases/p5-Class-DBI-AsForm/files/500503-AsForm.pm
index e60c14f5cfba..905e18b07978 100644
--- a/databases/p5-Class-DBI-AsForm/files/500503-AsForm.pm
+++ b/databases/p5-Class-DBI-AsForm/files/500503-AsForm.pm
@@ -1,49 +1,52 @@
---- AsForm.pm.orig	Sat Apr  3 22:37:32 2004
-+++ AsForm.pm	Sat Apr  3 22:37:38 2004
-@@ -1,16 +1,14 @@
+--- AsForm.pm.orig	Mon Dec 27 16:43:44 2004
++++ AsForm.pm	Wed Dec 29 20:31:57 2004
+@@ -1,19 +1,18 @@
  package Class::DBI::AsForm;
+ 
 -use 5.006;
+ 
  use strict;
 -use warnings;
- use Class::DBI::Plugin::Type ();
--our $OLD_STYLE = 0;
-+use vars qw($OLD_STYLE);$OLD_STYLE = 0;
  
+ use base 'Exporter';
+ 
+ use Class::DBI::Plugin::Type ();
  use HTML::Element;
- require Exporter;
--our @ISA = qw(Exporter);
--our @EXPORT = qw( to_cgi to_field _to_textarea _to_textfield _to_select
-+use vars qw(@ISA);@ISA = qw(Exporter);
-+use vars qw(@EXPORT);@EXPORT = qw( to_cgi to_field _to_textarea _to_textfield _to_select
- type_of );
--our $VERSION = '2.3';
-+use vars qw($VERSION);$VERSION = '2.3';
+ 
+-our $OLD_STYLE = 0;
+-our @EXPORT    = qw( to_cgi to_field _to_textarea _to_textfield _to_select
++use vars qw($OLD_STYLE @EXPORT $VERSION);
++$OLD_STYLE = 0;
++@EXPORT    = qw( to_cgi to_field _to_textarea _to_textfield _to_select
+ 	type_of );
+-our $VERSION = '2.41';
++$VERSION = '2.41';
  
  =head1 NAME
  
-@@ -100,14 +98,14 @@
- sub _to_textarea {
-     my ($self, $col) = @_;
-     my $a = HTML::Element->new("textarea", name => $col);
--    if (ref $self) { $a->push_content($self->$col) }
-+    if (ref $self) { $a->push_content($self->$col()) }
-     $OLD_STYLE && return $a->as_HTML;
-     $a;
+@@ -106,14 +105,14 @@
+ 	my ($self, $col) = @_;
+ 	my $a =
+ 		HTML::Element->new("textarea", name => $col, rows => "3", cols => "22");
+-	if (ref $self) { $a->push_content($self->$col) }
++	if (ref $self) { $a->push_content($self->$col()) }
+ 	$OLD_STYLE && return $a->as_HTML;
+ 	$a;
  }
  
  sub _to_textfield {
-     my ($self, $col) = @_;
--    my $value = ref $self && $self->$col;
-+    my $value = ref $self && $self->$col();
-     my $a = HTML::Element->new("input", type=> "text", name => $col);
-     $a->attr("value" => $value) if $value;
-     $OLD_STYLE && return $a->as_HTML;
-@@ -122,7 +120,7 @@
-     for (@objs) { 
-         my $sel = HTML::Element->new("option", value => $_->id);
-         $sel->attr("selected" => "selected") if ref $self 
--                                                and eval { $_->id eq $self->$col->id };
-+                                                and eval { $_->id eq $self->$col()->id };
-         $sel->push_content($_->stringify_self);
-         $a->push_content($sel);
-     }
+ 	my ($self, $col) = @_;
+-	my $value = ref $self && $self->$col;
++	my $value = ref $self && $self->$col();
+ 	my $a = HTML::Element->new("input", type => "text", name => $col);
+ 	$a->attr("value" => $value) if $value;
+ 	$OLD_STYLE && return $a->as_HTML;
+@@ -129,7 +128,7 @@
+ 		my $sel = HTML::Element->new("option", value => $_->id);
+ 		$sel->attr("selected" => "selected")
+ 			if ref $self
+-			and eval { $_->id eq $self->$col->id };
++			and eval { $_->id eq $self->$col()->id };
+ 		$sel->push_content($_->stringify_self);
+ 		$a->push_content($sel);
+ 	}