Update to 3.65

- Use CONFLICTS_INSTALL instead of CONFLICTS
- Simplify CONFLICTS_INSTALL
- Remove outdated post-patch:
- Convert to options target helper
- Sort PLIST
- Update WWW

Changes:	https://metacpan.org/changes/release/MARKSTOS/CGI.pm-3.65

4 files changed, 18 insertions, 20 deletions

diff --git a/www/p5-CGI.pm/Makefile b/www/p5-CGI.pm/Makefile
index 08465843c362..c0e3efa2faab 100644
--- a/www/p5-CGI.pm/Makefile
+++ b/www/p5-CGI.pm/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	CGI.pm
-PORTVERSION=	3.63
-PORTREVISION=	1
+PORTVERSION=	3.65
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
@@ -15,10 +14,11 @@ COMMENT=	Simple Common Gateway Interface Class for Perl
 LICENSE=	ART20 GPLv1
 LICENSE_COMB=	dual
 
-CONFLICTS=	p5-CGI-[4-9]* p5-CGI-Fast-[0-9]*
+CONFLICTS_INSTALL=	p5-CGI p5-CGI-Fast
 
 USES=		perl5
 USE_PERL5=	configure
+
 NO_ARCH=	yes
 
 EXAMPLES=	examples/caution.xbm examples/clickable_image.cgi \
@@ -34,11 +34,8 @@ EXAMPLES=	examples/caution.xbm examples/clickable_image.cgi \
 
 OPTIONS_DEFINE=	EXAMPLES
 
-post-patch:
-	@${REINPLACE_CMD} -e '/require 5\.6/d; /INSTALLDIRS/d' ${WRKSRC}/Makefile.PL
-
-post-install:
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI.pm/distinfo b/www/p5-CGI.pm/distinfo
index 59af820a2d6b..bc6d53b23ec3 100644
--- a/www/p5-CGI.pm/distinfo
+++ b/www/p5-CGI.pm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (CGI.pm-3.63.tar.gz) = f180778f9d1bcb5029bffb8c6be305c6deec60bf71ef14170fce9dfe6c548e2c
-SIZE (CGI.pm-3.63.tar.gz) = 247277
+TIMESTAMP = 1536591757
+SHA256 (CGI.pm-3.65.tar.gz) = 556d0f9047affa6873da996d8cc077bff797c13f95be89eb771d7247b8f0828a
+SIZE (CGI.pm-3.65.tar.gz) = 247466
diff --git a/www/p5-CGI.pm/pkg-descr b/www/p5-CGI.pm/pkg-descr
index 8cb33d62b6b6..03035a3701b8 100644
--- a/www/p5-CGI.pm/pkg-descr
+++ b/www/p5-CGI.pm/pkg-descr
@@ -8,4 +8,4 @@ them.  Because each object corresponds to the "state" of the CGI script,
 and because each object's parameter list is independent of the others,
 this allows you to save the state of the script and restore it later.
 
-WWW: https://metacpan.org/release/MARKSTOS/CGI.pm-3.63
+WWW: https://metacpan.org/release/MARKSTOS/CGI.pm-3.65
diff --git a/www/p5-CGI.pm/pkg-plist b/www/p5-CGI.pm/pkg-plist
index ce5ecc5fa813..8c45a768cc5b 100644
--- a/www/p5-CGI.pm/pkg-plist
+++ b/www/p5-CGI.pm/pkg-plist
@@ -7,6 +7,15 @@
 %%SITE_PERL%%/CGI/Push.pm
 %%SITE_PERL%%/CGI/Switch.pm
 %%SITE_PERL%%/CGI/Util.pm
+%%PERL5_MAN3%%/CGI.3.gz
+%%PERL5_MAN3%%/CGI::Apache.3.gz
+%%PERL5_MAN3%%/CGI::Carp.3.gz
+%%PERL5_MAN3%%/CGI::Cookie.3.gz
+%%PERL5_MAN3%%/CGI::Fast.3.gz
+%%PERL5_MAN3%%/CGI::Pretty.3.gz
+%%PERL5_MAN3%%/CGI::Push.3.gz
+%%PERL5_MAN3%%/CGI::Switch.3.gz
+%%PERL5_MAN3%%/CGI::Util.3.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caution.xbm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clickable_image.cgi
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookie.cgi
@@ -28,12 +37,3 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/save_state.cgi
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tryit.cgi
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wilogo.gif
-%%PERL5_MAN3%%/CGI.3.gz
-%%PERL5_MAN3%%/CGI::Apache.3.gz
-%%PERL5_MAN3%%/CGI::Carp.3.gz
-%%PERL5_MAN3%%/CGI::Cookie.3.gz
-%%PERL5_MAN3%%/CGI::Fast.3.gz
-%%PERL5_MAN3%%/CGI::Pretty.3.gz
-%%PERL5_MAN3%%/CGI::Push.3.gz
-%%PERL5_MAN3%%/CGI::Switch.3.gz
-%%PERL5_MAN3%%/CGI::Util.3.gz