diff --git a/databases/p5-Class-DBI-AsForm/Makefile b/databases/p5-Class-DBI-AsForm/Makefile
index 9fc099e7917f..18e2915aa75f 100644
--- a/databases/p5-Class-DBI-AsForm/Makefile
+++ b/databases/p5-Class-DBI-AsForm/Makefile
@@ -1,35 +1,32 @@
 # New ports collection makefile for:	p5-Class-DBI-AsForm
 # Date created:				Apr 3 2004
 # Whom:					Lars Thegler <lars@thegler.dk>
 #
 # $FreeBSD$
 
 PORTNAME=	Class-DBI-AsForm
-PORTVERSION=	2.2
+PORTVERSION=	2.3
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Class
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Produce HTML form elements for database columns
 
 BUILD_DEPENDS=	${SITE_PERL}/Class/DBI.pm:${PORTSDIR}/databases/p5-Class-DBI \
 		${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
 		${SITE_PERL}/Class/DBI/Plugin/Type.pm:${PORTSDIR}/databases/p5-Class-DBI-Plugin-Type
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Class::DBI::AsForm.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
 EXTRA_PATCHES=	${PATCHDIR}/500503-AsForm.pm
-
-post-configure:
-	${PERL} -pi -e 's,/usr/local/,\$$(PREFIX)/,g' ${WRKSRC}/Makefile
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/p5-Class-DBI-AsForm/distinfo b/databases/p5-Class-DBI-AsForm/distinfo
index ee83807e5bbe..3c71dbba03f7 100644
--- a/databases/p5-Class-DBI-AsForm/distinfo
+++ b/databases/p5-Class-DBI-AsForm/distinfo
@@ -1,2 +1,2 @@
-MD5 (Class-DBI-AsForm-2.2.tar.gz) = 09a3824bfbf260f2b12583828dce5068
-SIZE (Class-DBI-AsForm-2.2.tar.gz) = 3558
+MD5 (Class-DBI-AsForm-2.3.tar.gz) = 158e2f3eb51f10bedbf36e5199802f9a
+SIZE (Class-DBI-AsForm-2.3.tar.gz) = 3825
diff --git a/databases/p5-Class-DBI-AsForm/files/500503-AsForm.pm b/databases/p5-Class-DBI-AsForm/files/500503-AsForm.pm
index e2841c0a0723..e60c14f5cfba 100644
--- a/databases/p5-Class-DBI-AsForm/files/500503-AsForm.pm
+++ b/databases/p5-Class-DBI-AsForm/files/500503-AsForm.pm
@@ -1,49 +1,49 @@
 --- AsForm.pm.orig	Sat Apr  3 22:37:32 2004
 +++ AsForm.pm	Sat Apr  3 22:37:38 2004
 @@ -1,16 +1,14 @@
  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 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.2';
-+use vars qw($VERSION);$VERSION = '2.2';
+-our $VERSION = '2.3';
++use vars qw($VERSION);$VERSION = '2.3';
  
  =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;
  }
  
  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 == $self->$col->id };
-+                                                and eval { $_->id == $self->$col()->id };
+-                                                and eval { $_->id eq $self->$col->id };
++                                                and eval { $_->id eq $self->$col()->id };
          $sel->push_content($_->stringify_self);
          $a->push_content($sel);
      }