3 files changed, 30 insertions, 27 deletions

diff --git a/www/p5-CGI.pm/Makefile b/www/p5-CGI.pm/Makefile
index c4c7bdd80e15..b2f8f399bd9e 100644
--- a/www/p5-CGI.pm/Makefile
+++ b/www/p5-CGI.pm/Makefile
@@ -6,23 +6,26 @@
 #
 
 PORTNAME=	CGI.pm
-PORTVERSION=	3.50
+PORTVERSION=	3.52
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITE_SUBDIR=	../../authors/id/M/MA/MARKSTOS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Simple Common Gateway Interface Class for Perl
 
+LICENSE=	ART20 GPLv1
+LICENSE_COMB=	dual
+
 PERL_CONFIGURE=	yes
 
 MAN3=		CGI.3 CGI::Apache.3 CGI::Carp.3 CGI::Cookie.3 \
 		CGI::Fast.3 CGI::Pretty.3 CGI::Push.3 CGI::Switch.3 \
 		CGI::Util.3
 
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 EXAMPLES=	examples/caution.xbm examples/clickable_image.cgi \
 		examples/cookie.cgi examples/crash.cgi examples/customize.cgi \
 		examples/diff_upload.cgi examples/dna.small.gif \
diff --git a/www/p5-CGI.pm/distinfo b/www/p5-CGI.pm/distinfo
index 3d5c813eaba3..74fe7333e0ff 100644
--- a/www/p5-CGI.pm/distinfo
+++ b/www/p5-CGI.pm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (CGI.pm-3.50.tar.gz) = 63095e54d44478e9ed783f7be3c74bb8d3c90515dc858ed8303ddfc17621e9d1
-SIZE (CGI.pm-3.50.tar.gz) = 242347
+SHA256 (CGI.pm-3.52.tar.gz) = 9616718b2653daeb5085ff613a37daa78353bc82955bf8fc6161b0da6f40936d
+SIZE (CGI.pm-3.52.tar.gz) = 243159
diff --git a/www/p5-CGI.pm/pkg-plist b/www/p5-CGI.pm/pkg-plist
index e9e52beb5084..e355f6d5a2be 100644
--- a/www/p5-CGI.pm/pkg-plist
+++ b/www/p5-CGI.pm/pkg-plist
@@ -8,27 +8,27 @@
 %%SITE_PERL%%/CGI/Switch.pm
 %%SITE_PERL%%/CGI/Util.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/.packlist
-%%PORTDOCS%%%%EXAMPLESDIR%%/caution.xbm
-%%PORTDOCS%%%%EXAMPLESDIR%%/clickable_image.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/cookie.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/crash.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/customize.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/diff_upload.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/dna.small.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/file_upload.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/frameset.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/index.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/internal_links.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/javascript.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/make_links.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/monty.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/multiple_forms.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/nph-clock.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/nph-multipart.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/popup.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/save_state.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/tryit.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/wilogo.gif
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/caution.xbm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clickable_image.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookie.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crash.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/customize.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diff_upload.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dna.small.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/file_upload.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/frameset.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/index.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/internal_links.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/make_links.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/monty.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multiple_forms.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nph-clock.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nph-multipart.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/popup.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/save_state.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tryit.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wilogo.gif
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
 @dirrmtry %%SITE_PERL%%/CGI