- Update to 3.0800

- Add LICENSE (ART10 and GPLv1)
- Add new template suuport to options
- Sort MAN3
- Remove unnecessary post-patch target
- Give maintainership to submitter

PR:		ports/175364
Submitted by:	Po-Chien Lin <linpc@cs.nctu.edu.tw>

4 files changed, 50 insertions, 29 deletions

diff --git a/www/p5-CGI-FormBuilder/Makefile b/www/p5-CGI-FormBuilder/Makefile
index d0322fd46953..d7a67f5e011a 100644
--- a/www/p5-CGI-FormBuilder/Makefile
+++ b/www/p5-CGI-FormBuilder/Makefile
@@ -2,61 +2,71 @@
 # $FreeBSD$
 
 PORTNAME=	CGI-FormBuilder
-PORTVERSION=	3.0501
-PORTREVISION=	1
+PORTVERSION=	3.0800
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:NWIGER
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-${PORTVERSION:S,00$,,}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	linpc@cs.nctu.edu.tw
 COMMENT=	FormBuilder for CGI
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 PERL_CONFIGURE=	yes
 
-OPTIONS_DEFINE=	TT HTML_TEMPLATE TEXT_TEMPLATE CGI_FAST_TEMPLATE
+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
-CGI_FAST_TEMPLATE_DESC=	CGI::FastTemplate suppor
+CGI_FAST_TEMPLATE_DESC=	CGI::FastTemplate support
+CGI_SSI_DESC=	CGI::SSI support
+CGI_SESSION_DESC=	CGI::Session support
 
 MAN3=	CGI::FormBuilder.3 \
+	CGI::FormBuilder::Field.3 \
+	CGI::FormBuilder::Messages.3 \
+	CGI::FormBuilder::Multi.3 \
+	CGI::FormBuilder::Source.3 \
+	CGI::FormBuilder::Source::File.3 \
+	CGI::FormBuilder::Template.3 \
 	CGI::FormBuilder::Template::Builtin.3 \
+	CGI::FormBuilder::Template::CGI_SSI.3 \
 	CGI::FormBuilder::Template::Div.3 \
+	CGI::FormBuilder::Template::Fast.3 \
 	CGI::FormBuilder::Template::HTML.3 \
-	CGI::FormBuilder::Source::File.3 \
-	CGI::FormBuilder::Template.3 \
-	CGI::FormBuilder::Multi.3 \
 	CGI::FormBuilder::Template::TT2.3 \
-	CGI::FormBuilder::Test.3 \
-	CGI::FormBuilder::Util.3 \
 	CGI::FormBuilder::Template::Text.3 \
-	CGI::FormBuilder::Source.3 \
-	CGI::FormBuilder::Field.3 \
-	CGI::FormBuilder::Template::Fast.3 \
-	CGI::FormBuilder::Messages.3
-
-post-patch:
-	@${FIND} ${WRKSRC} -name "*.orig" -delete
+	CGI::FormBuilder::Test.3 \
+	CGI::FormBuilder::Util.3
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTT}
-RUN_DEPENDS+=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+RUN_DEPENDS+=	p5-Template-Toolkit>=2.08:${PORTSDIR}/www/p5-Template-Toolkit
 .endif
 
 .if ${PORT_OPTIONS:MHTML_TEMPLATE}
-RUN_DEPENDS+=	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template
+RUN_DEPENDS+=	p5-HTML-Template>=2.06:${PORTSDIR}/www/p5-HTML-Template
 .endif
 
 .if ${PORT_OPTIONS:MTEXT_TEMPLATE}
-RUN_DEPENDS+=	p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-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>=0:${PORTSDIR}/www/p5-CGI-FastTemplate
+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
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-FormBuilder/distinfo b/www/p5-CGI-FormBuilder/distinfo
index 6c16075d7942..1c1b68f91e7d 100644
--- a/www/p5-CGI-FormBuilder/distinfo
+++ b/www/p5-CGI-FormBuilder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (CGI-FormBuilder-3.0501.tgz) = 45e84b1f39730874b19f5982294abaa335bc7bb43b35a24943b809ea627f3a0c
-SIZE (CGI-FormBuilder-3.0501.tgz) = 167585
+SHA256 (CGI-FormBuilder-3.08.tgz) = f7af79df9af541d1ed12dc41a8d3e61b9a1037710308bd29213020d4e3ab074c
+SIZE (CGI-FormBuilder-3.08.tgz) = 155393
diff --git a/www/p5-CGI-FormBuilder/pkg-descr b/www/p5-CGI-FormBuilder/pkg-descr
index 07efbd9a6341..c9d2056ec83f 100644
--- a/www/p5-CGI-FormBuilder/pkg-descr
+++ b/www/p5-CGI-FormBuilder/pkg-descr
@@ -20,4 +20,4 @@ Its main features are:
 
 Plus, the native HTML generated is valid XHTML 1.0 Transitional.
 
-WWW: http://www.formbuilder.org
+WWW: http://www.formbuilder.org/
diff --git a/www/p5-CGI-FormBuilder/pkg-plist b/www/p5-CGI-FormBuilder/pkg-plist
index 0738b7f4e928..cc30a8365a63 100644
--- a/www/p5-CGI-FormBuilder/pkg-plist
+++ b/www/p5-CGI-FormBuilder/pkg-plist
@@ -1,12 +1,16 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FormBuilder/.packlist
 %%SITE_PERL%%/CGI/FormBuilder.pm
 %%SITE_PERL%%/CGI/FormBuilder.pod
 %%SITE_PERL%%/CGI/FormBuilder/Field.pm
 %%SITE_PERL%%/CGI/FormBuilder/Field/button.pm
 %%SITE_PERL%%/CGI/FormBuilder/Field/checkbox.pm
+%%SITE_PERL%%/CGI/FormBuilder/Field/date.pm
+%%SITE_PERL%%/CGI/FormBuilder/Field/datetime.pm
+%%SITE_PERL%%/CGI/FormBuilder/Field/datetime_local.pm
+%%SITE_PERL%%/CGI/FormBuilder/Field/email.pm
 %%SITE_PERL%%/CGI/FormBuilder/Field/file.pm
 %%SITE_PERL%%/CGI/FormBuilder/Field/hidden.pm
 %%SITE_PERL%%/CGI/FormBuilder/Field/image.pm
+%%SITE_PERL%%/CGI/FormBuilder/Field/number.pm
 %%SITE_PERL%%/CGI/FormBuilder/Field/password.pm
 %%SITE_PERL%%/CGI/FormBuilder/Field/radio.pm
 %%SITE_PERL%%/CGI/FormBuilder/Field/select.pm
@@ -14,9 +18,12 @@
 %%SITE_PERL%%/CGI/FormBuilder/Field/submit.pm
 %%SITE_PERL%%/CGI/FormBuilder/Field/text.pm
 %%SITE_PERL%%/CGI/FormBuilder/Field/textarea.pm
+%%SITE_PERL%%/CGI/FormBuilder/Field/time.pm
+%%SITE_PERL%%/CGI/FormBuilder/Field/url.pm
 %%SITE_PERL%%/CGI/FormBuilder/Messages.pm
 %%SITE_PERL%%/CGI/FormBuilder/Messages/C.pm
 %%SITE_PERL%%/CGI/FormBuilder/Messages/_example.pm
+%%SITE_PERL%%/CGI/FormBuilder/Messages/base.pm
 %%SITE_PERL%%/CGI/FormBuilder/Messages/da.pm
 %%SITE_PERL%%/CGI/FormBuilder/Messages/da_DK.pm
 %%SITE_PERL%%/CGI/FormBuilder/Messages/de.pm
@@ -32,6 +39,10 @@
 %%SITE_PERL%%/CGI/FormBuilder/Messages/ja_JP.pm
 %%SITE_PERL%%/CGI/FormBuilder/Messages/no.pm
 %%SITE_PERL%%/CGI/FormBuilder/Messages/no_NO.pm
+%%SITE_PERL%%/CGI/FormBuilder/Messages/ru.pm
+%%SITE_PERL%%/CGI/FormBuilder/Messages/ru_RU.pm
+%%SITE_PERL%%/CGI/FormBuilder/Messages/sv.pm
+%%SITE_PERL%%/CGI/FormBuilder/Messages/sv_SE.pm
 %%SITE_PERL%%/CGI/FormBuilder/Messages/tr.pm
 %%SITE_PERL%%/CGI/FormBuilder/Messages/tr_TR.pm
 %%SITE_PERL%%/CGI/FormBuilder/Multi.pm
@@ -39,6 +50,7 @@
 %%SITE_PERL%%/CGI/FormBuilder/Source/File.pm
 %%SITE_PERL%%/CGI/FormBuilder/Template.pm
 %%SITE_PERL%%/CGI/FormBuilder/Template/Builtin.pm
+%%SITE_PERL%%/CGI/FormBuilder/Template/CGI_SSI.pm
 %%SITE_PERL%%/CGI/FormBuilder/Template/Div.pm
 %%SITE_PERL%%/CGI/FormBuilder/Template/Fast.pm
 %%SITE_PERL%%/CGI/FormBuilder/Template/HTML.pm
@@ -46,13 +58,12 @@
 %%SITE_PERL%%/CGI/FormBuilder/Template/Text.pm
 %%SITE_PERL%%/CGI/FormBuilder/Test.pm
 %%SITE_PERL%%/CGI/FormBuilder/Util.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FormBuilder/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FormBuilder
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
 @dirrm %%SITE_PERL%%/CGI/FormBuilder/Field
-@dirrm %%SITE_PERL%%/CGI/FormBuilder/Template
 @dirrm %%SITE_PERL%%/CGI/FormBuilder/Messages
 @dirrm %%SITE_PERL%%/CGI/FormBuilder/Source
+@dirrm %%SITE_PERL%%/CGI/FormBuilder/Template
 @dirrm %%SITE_PERL%%/CGI/FormBuilder
 @dirrmtry %%SITE_PERL%%/CGI
-@dirrmtry %%SITE_PERL%%