Index: head/www/p5-CGI-FormBuilder/Makefile
===================================================================
--- head/www/p5-CGI-FormBuilder/Makefile	(revision 377357)
+++ head/www/p5-CGI-FormBuilder/Makefile	(revision 377358)
@@ -1,56 +1,44 @@
 # Created by: Fernan Aguero
 # $FreeBSD$
 
 PORTNAME=	CGI-FormBuilder
-PORTVERSION=	3.0800
-PORTREVISION=	1
+PORTVERSION=	3.0900
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S,00$,,}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/00$//}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	FormBuilder for CGI
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-USES=		perl5 tar:tgz
 USE_PERL5=	configure
+USES=		perl5 tar:tgz
 
-OPTIONS_DEFINE=	TT HTML_TEMPLATE TEXT_TEMPLATE CGI_FAST_TEMPLATE CGI_SSI CGI_SESSION
-OPTIONS_DEFAULT=	TT
-TT_DESC=	Template Toolkit support
-HTML_TEMPLATE_DESC=	HTML::Template support
-TEXT_TEMPLATE_DESC=	Text::Template support
+# Follow upstream order in Makefile.PL
+OPTIONS_DEFINE=	HTML_TEMPLATE TEXT_TEMPLATE TEMPLATE CGI_FAST_TEMPLATE CGI_SSI CGI_SESSION
+OPTIONS_DEFAULT=HTML_TEMPLATE
+NO_OPTIONS_SORT=yes
 CGI_FAST_TEMPLATE_DESC=	CGI::FastTemplate support
-CGI_SSI_DESC=	CGI::SSI support
 CGI_SESSION_DESC=	CGI::Session support
+CGI_SSI_DESC=		CGI::SSI support
+HTML_TEMPLATE_DESC=	HTML::Template support
+TEXT_TEMPLATE_DESC=	Text::Template support
+TEMPLATE_DESC=		Template Toolkit support
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTT}
-RUN_DEPENDS+=	p5-Template-Toolkit>=2.08:${PORTSDIR}/www/p5-Template-Toolkit
-.endif
-
-.if ${PORT_OPTIONS:MHTML_TEMPLATE}
-RUN_DEPENDS+=	p5-HTML-Template>=2.06:${PORTSDIR}/www/p5-HTML-Template
-.endif
-
-.if ${PORT_OPTIONS:MTEXT_TEMPLATE}
-RUN_DEPENDS+=	p5-Text-Template>=1.43:${PORTSDIR}/textproc/p5-Text-Template
-.endif
-
-.if ${PORT_OPTIONS:MCGI_FAST_TEMPLATE}
-RUN_DEPENDS+=	p5-CGI-FastTemplate>=1.09:${PORTSDIR}/www/p5-CGI-FastTemplate
-.endif
-
-.if ${PORT_OPTIONS:MCGI_SSI}
-RUN_DEPENDS+=	p5-CGI-SSI>=0.92:${PORTSDIR}/www/p5-CGI-SSI
-.endif
-
-.if ${PORT_OPTIONS:MCGI_SESSION}
-RUN_DEPENDS+=	p5-CGI-Session>=3.95:${PORTSDIR}/www/p5-CGI-Session
-.endif
+CGI_FAST_TEMPLATE_BUILD_DEPENDS=p5-CGI-FastTemplate>=1.09:${PORTSDIR}/www/p5-CGI-FastTemplate
+CGI_FAST_TEMPLATE_RUN_DEPENDS=	p5-CGI-FastTemplate>=1.09:${PORTSDIR}/www/p5-CGI-FastTemplate
+CGI_SESSION_BUILD_DEPENDS=	p5-CGI-Session>=3.95:${PORTSDIR}/www/p5-CGI-Session
+CGI_SESSION_RUN_DEPENDS=p5-CGI-Session>=3.95:${PORTSDIR}/www/p5-CGI-Session
+CGI_SSI_BUILD_DEPENDS=	p5-CGI-SSI>=0.92:${PORTSDIR}/www/p5-CGI-SSI
+CGI_SSI_RUN_DEPENDS=	p5-CGI-SSI>=0.92:${PORTSDIR}/www/p5-CGI-SSI
+HTML_TEMPLATE_BUILD_DEPENDS=	p5-HTML-Template>=2.06:${PORTSDIR}/www/p5-HTML-Template
+HTML_TEMPLATE_RUN_DEPENDS=	p5-HTML-Template>=2.06:${PORTSDIR}/www/p5-HTML-Template
+TEXT_TEMPLATE_BUILD_DEPENDS=	p5-Text-Template>=1.43:${PORTSDIR}/textproc/p5-Text-Template
+TEXT_TEMPLATE_RUN_DEPENDS=	p5-Text-Template>=1.43:${PORTSDIR}/textproc/p5-Text-Template
+TEMPLATE_BUILD_DEPENDS=	p5-Template-Toolkit>=2.08:${PORTSDIR}/www/p5-Template-Toolkit
+TEMPLATE_RUN_DEPENDS=	p5-Template-Toolkit>=2.08:${PORTSDIR}/www/p5-Template-Toolkit
 
 .include <bsd.port.mk>
Index: head/www/p5-CGI-FormBuilder/distinfo
===================================================================
--- head/www/p5-CGI-FormBuilder/distinfo	(revision 377357)
+++ head/www/p5-CGI-FormBuilder/distinfo	(revision 377358)
@@ -1,2 +1,2 @@
-SHA256 (CGI-FormBuilder-3.08.tgz) = f7af79df9af541d1ed12dc41a8d3e61b9a1037710308bd29213020d4e3ab074c
-SIZE (CGI-FormBuilder-3.08.tgz) = 155393
+SHA256 (CGI-FormBuilder-3.09.tgz) = 654907527717c3bbb169c739a9a817f14552054619ab3c93d6a5f808649fa863
+SIZE (CGI-FormBuilder-3.09.tgz) = 163526
Index: head/www/p5-CGI-FormBuilder/pkg-descr
===================================================================
--- head/www/p5-CGI-FormBuilder/pkg-descr	(revision 377357)
+++ head/www/p5-CGI-FormBuilder/pkg-descr	(revision 377358)
@@ -1,23 +1,23 @@
 The goal of CGI::FormBuilder (FormBuilder) is to provide an easy way
 for you to generate and process entire CGI form-based applications.
 Its main features are:
 
 * Field Abstraction
   Viewing fields as entities (instead of just params), where the HTML
   representation, CGI values, validation, and so on are properties of
   each field.
 * DWIMmery
   Lots of built-in "intelligence" (such as automatic field typing),
   giving you about a 4:1 ratio of the code it generates versus what
   you have to write.
 * Built-in Validation
   Full-blown regex validation for fields, even including JavaScript
   code generation.
 * Template Support
   Pluggable support for external template engines, such as
   HTML::Template, Text::Template, Template Toolkit, and
   CGI::FastTemplate.
 
 Plus, the native HTML generated is valid XHTML 1.0 Transitional.
 
-WWW: http://www.formbuilder.org/
+WWW: http://search.cpan.org/dist/CGI-FormBuilder/