diff --git a/databases/p5-POE-Component-EasyDBI/Makefile b/databases/p5-POE-Component-EasyDBI/Makefile
index a5f3298db08d..17ccc2a3143e 100644
--- a/databases/p5-POE-Component-EasyDBI/Makefile
+++ b/databases/p5-POE-Component-EasyDBI/Makefile
@@ -1,40 +1,41 @@
 # New ports collection makefile for:	POE-Component-EasyDBI
 # Date created:		31 Jan 2004
 # Whom:			Zach Thompson <lin-chi@lastamericanempire.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	POE-Component-EasyDBI
-PORTVERSION=	0.03
+PORTVERSION=	0.07
 CATEGORIES=	devel databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lin-chi@lastamericanempire.com
 COMMENT=	POE Component for simplified DBI usage
 
 BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
 		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
 		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		POE::Component::EasyDBI.3 \
 		POE::Component::EasyDBI::SubProcess.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
 post-patch:
-	@${PERL} -pi -e 's/^our (\S+)/use vars qw($$1); $$1/;' \
+	@${PERL} -pi -e 's/^our\s+(.VERSION).+?Revision:\s+(\S+).+$$/use vars qw($$1);\n$$1 = q($$2);/o;' \
 			-e '$$_ = "" if /(no|use) warnings/;' \
-       			${WRKSRC}/EasyDBI.pm ${WRKSRC}/EasyDBI/SubProcess.pm
+       			${WRKSRC}/lib/POE/Component/EasyDBI.pm \
+			${WRKSRC}/lib/POE/Component/EasyDBI/SubProcess.pm
 .else
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/p5-POE-Component-EasyDBI/distinfo b/databases/p5-POE-Component-EasyDBI/distinfo
index b236cd825f90..889ccc707efb 100644
--- a/databases/p5-POE-Component-EasyDBI/distinfo
+++ b/databases/p5-POE-Component-EasyDBI/distinfo
@@ -1,2 +1,2 @@
-MD5 (POE-Component-EasyDBI-0.03.tar.gz) = 3bc6a18be6bc109040e62e6a3d5337bc
-SIZE (POE-Component-EasyDBI-0.03.tar.gz) = 14158
+MD5 (POE-Component-EasyDBI-0.07.tar.gz) = 338b03116aa16aba07864d419f725289
+SIZE (POE-Component-EasyDBI-0.07.tar.gz) = 19022
diff --git a/databases/p5-POE-Component-EasyDBI/pkg-descr b/databases/p5-POE-Component-EasyDBI/pkg-descr
index 38926ea88768..c523024fbd8d 100644
--- a/databases/p5-POE-Component-EasyDBI/pkg-descr
+++ b/databases/p5-POE-Component-EasyDBI/pkg-descr
@@ -1,4 +1,6 @@
 Simplified use of DBI in the POE environment.
 
+WWW: http://teknikill.net/?POE::Component::EasyDBI
+
 - Zach Thompson
 lin-chi@lastamericanempire.com
diff --git a/devel/p5-POE-Component-EasyDBI/Makefile b/devel/p5-POE-Component-EasyDBI/Makefile
index a5f3298db08d..17ccc2a3143e 100644
--- a/devel/p5-POE-Component-EasyDBI/Makefile
+++ b/devel/p5-POE-Component-EasyDBI/Makefile
@@ -1,40 +1,41 @@
 # New ports collection makefile for:	POE-Component-EasyDBI
 # Date created:		31 Jan 2004
 # Whom:			Zach Thompson <lin-chi@lastamericanempire.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	POE-Component-EasyDBI
-PORTVERSION=	0.03
+PORTVERSION=	0.07
 CATEGORIES=	devel databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lin-chi@lastamericanempire.com
 COMMENT=	POE Component for simplified DBI usage
 
 BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
 		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
 		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		POE::Component::EasyDBI.3 \
 		POE::Component::EasyDBI::SubProcess.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
 post-patch:
-	@${PERL} -pi -e 's/^our (\S+)/use vars qw($$1); $$1/;' \
+	@${PERL} -pi -e 's/^our\s+(.VERSION).+?Revision:\s+(\S+).+$$/use vars qw($$1);\n$$1 = q($$2);/o;' \
 			-e '$$_ = "" if /(no|use) warnings/;' \
-       			${WRKSRC}/EasyDBI.pm ${WRKSRC}/EasyDBI/SubProcess.pm
+       			${WRKSRC}/lib/POE/Component/EasyDBI.pm \
+			${WRKSRC}/lib/POE/Component/EasyDBI/SubProcess.pm
 .else
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-POE-Component-EasyDBI/distinfo b/devel/p5-POE-Component-EasyDBI/distinfo
index b236cd825f90..889ccc707efb 100644
--- a/devel/p5-POE-Component-EasyDBI/distinfo
+++ b/devel/p5-POE-Component-EasyDBI/distinfo
@@ -1,2 +1,2 @@
-MD5 (POE-Component-EasyDBI-0.03.tar.gz) = 3bc6a18be6bc109040e62e6a3d5337bc
-SIZE (POE-Component-EasyDBI-0.03.tar.gz) = 14158
+MD5 (POE-Component-EasyDBI-0.07.tar.gz) = 338b03116aa16aba07864d419f725289
+SIZE (POE-Component-EasyDBI-0.07.tar.gz) = 19022
diff --git a/devel/p5-POE-Component-EasyDBI/pkg-descr b/devel/p5-POE-Component-EasyDBI/pkg-descr
index 38926ea88768..c523024fbd8d 100644
--- a/devel/p5-POE-Component-EasyDBI/pkg-descr
+++ b/devel/p5-POE-Component-EasyDBI/pkg-descr
@@ -1,4 +1,6 @@
 Simplified use of DBI in the POE environment.
 
+WWW: http://teknikill.net/?POE::Component::EasyDBI
+
 - Zach Thompson
 lin-chi@lastamericanempire.com