3 files changed, 17 insertions, 56 deletions

diff --git a/www/p5-CGI-Ex/Makefile b/www/p5-CGI-Ex/Makefile
index f7dfcb3f03f2..3f1fc8cfa863 100644
--- a/www/p5-CGI-Ex/Makefile
+++ b/www/p5-CGI-Ex/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	CGI-Ex
-PORTVERSION=	2.24
+PORTVERSION=	2.27
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	CGI utility suite - makes powerful application writing fun and easy
 
-RUN_DEPENDS=	${SITE_PERL}/Template/Alloy.pm:${PORTSDIR}/www/p5-Template-Alloy
+RUN_DEPENDS=	p5-Template-Alloy>=1.004:${PORTSDIR}/www/p5-Template-Alloy
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -23,6 +23,10 @@ MAN3=		CGI::Ex.3 CGI::Ex::App.3 CGI::Ex::Auth.3 CGI::Ex::Conf.3 \
 		CGI::Ex::Die.3 CGI::Ex::Dump.3 CGI::Ex::Fill.3 \
 		CGI::Ex::JSONDump.3 CGI::Ex::Template.3 CGI::Ex::Validate.3
 
+.if !defined(NOPORTEXAMPLES)
+
+PORTEXAMPLES=	*
+
 post-install:
 	${MKDIR} ${EXAMPLESDIR}
 .for i in app benchmark devel
@@ -30,13 +34,15 @@ post-install:
 .endfor
 	${CP} -R ${WRKSRC}/samples/* ${EXAMPLESDIR}
 
+.endif
+
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
-		${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils \
-		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+.if ${PERL_LEVEL} < 500703
+RUN_DEPENDS+=	p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \
+		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
+		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
+		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-CGI-Ex/distinfo b/www/p5-CGI-Ex/distinfo
index 3f1a300362db..c89dc938ad86 100644
--- a/www/p5-CGI-Ex/distinfo
+++ b/www/p5-CGI-Ex/distinfo
@@ -1,3 +1,3 @@
-MD5 (CGI-Ex-2.24.tar.gz) = 4e7bdecdcf2e71f1082941d51ed207dd
-SHA256 (CGI-Ex-2.24.tar.gz) = fb40558aa6cf79975ee9b761f43c7be168e47899c819ceae22ca56ce550b8777
-SIZE (CGI-Ex-2.24.tar.gz) = 180176
+MD5 (CGI-Ex-2.27.tar.gz) = d265456d515f478883a27e238306fce6
+SHA256 (CGI-Ex-2.27.tar.gz) = 9f486a6c6dff27c309fc872fdc29fe70060ce5fd86104e33e92a9c337118b63a
+SIZE (CGI-Ex-2.27.tar.gz) = 186078
diff --git a/www/p5-CGI-Ex/pkg-plist b/www/p5-CGI-Ex/pkg-plist
index 9d621d10aa9c..35245c7e768a 100644
--- a/www/p5-CGI-Ex/pkg-plist
+++ b/www/p5-CGI-Ex/pkg-plist
@@ -1,42 +1,4 @@
 @comment $FreeBSD$
-%%EXAMPLESDIR%%/app/app1/INSTALL
-%%EXAMPLESDIR%%/app/app1/app1.pl
-%%EXAMPLESDIR%%/app/app1/app1.yaml
-%%EXAMPLESDIR%%/app/app1/js.pl
-%%EXAMPLESDIR%%/app/app1/lib/App1.pm
-%%EXAMPLESDIR%%/app/app1/lib/App1/CustInfo.pm
-%%EXAMPLESDIR%%/app/app1/lib/App1/DoBill.pm
-%%EXAMPLESDIR%%/app/app1/lib/App1/PickDomain.pm
-%%EXAMPLESDIR%%/app/app1/lib/App1/PickDomainAlternate.pm
-%%EXAMPLESDIR%%/app/app1/lib/App1/Thankyou.pm
-%%EXAMPLESDIR%%/app/app1/tt/cust_info.html
-%%EXAMPLESDIR%%/app/app1/tt/footer.tt
-%%EXAMPLESDIR%%/app/app1/tt/header.tt
-%%EXAMPLESDIR%%/app/app1/tt/pick_domain.html
-%%EXAMPLESDIR%%/app/app1/tt/pick_domain_alternate.html
-%%EXAMPLESDIR%%/app/app1/tt/thankyou.html
-%%EXAMPLESDIR%%/app/cgi_ex_1.cgi
-%%EXAMPLESDIR%%/app/cgi_ex_2.cgi
-%%EXAMPLESDIR%%/benchmark/bench_auth.pl
-%%EXAMPLESDIR%%/benchmark/bench_cgix_hfif.pl
-%%EXAMPLESDIR%%/benchmark/bench_conf_readers.pl
-%%EXAMPLESDIR%%/benchmark/bench_conf_writers.pl
-%%EXAMPLESDIR%%/benchmark/bench_jsondump.pl
-%%EXAMPLESDIR%%/benchmark/bench_validation.pl
-%%EXAMPLESDIR%%/devel/dprof_conf.d
-%%EXAMPLESDIR%%/devel/dprof_validation.d
-%%EXAMPLESDIR%%/devel/memory_app.pl
-%%EXAMPLESDIR%%/index.cgi
-%%EXAMPLESDIR%%/validate_js_yaml_1.html
-%%EXAMPLESDIR%%/validate_js_yaml_2.html
-%%EXAMPLESDIR%%/validate_js_yaml_3.html
-%%EXAMPLESDIR%%/validate_js_0_tests.html
-%%EXAMPLESDIR%%/validate_js_1_onsubmit.html
-%%EXAMPLESDIR%%/validate_js_2_onchange.html
-%%EXAMPLESDIR%%/yaml_js_1.html
-%%EXAMPLESDIR%%/yaml_js_2.html
-%%EXAMPLESDIR%%/yaml_js_3.html
-%%EXAMPLESDIR%%/yaml_js_4.html
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ex/.packlist
 %%SITE_PERL%%/CGI/Ex.pm
 %%SITE_PERL%%/CGI/Ex/App.pm
@@ -49,18 +11,11 @@
 %%SITE_PERL%%/CGI/Ex/JSONDump.pm
 %%SITE_PERL%%/CGI/Ex/Template.pm
 %%SITE_PERL%%/CGI/Ex/Validate.pm
+%%SITE_PERL%%/CGI/Ex/Validate.pod
 %%SITE_PERL%%/CGI/Ex/md5.js
 %%SITE_PERL%%/CGI/Ex/sha1.js
 %%SITE_PERL%%/CGI/Ex/validate.js
 %%SITE_PERL%%/CGI/Ex/yaml_load.js
-@dirrm %%EXAMPLESDIR%%/app/app1/tt
-@dirrm %%EXAMPLESDIR%%/app/app1/lib/App1
-@dirrm %%EXAMPLESDIR%%/app/app1/lib
-@dirrm %%EXAMPLESDIR%%/app/app1
-@dirrm %%EXAMPLESDIR%%/app
-@dirrm %%EXAMPLESDIR%%/benchmark
-@dirrm %%EXAMPLESDIR%%/devel
-@dirrm %%EXAMPLESDIR%%
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ex
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
 @dirrmtry %%SITE_PERL%%/CGI/Ex/Template