Convert remaining p5-CGI.pm consumers to p5-CGI, and bump PORTREVISION.

All these changes are tested but the following are worth noting:

The following ports fail "make test", but did so before this change, and
fail in the same places:
- textproc/p5-xmltv
- www/p5-Business-Paypal
- www/p5-CGI-Enurl

www/p5-Apache-Gallery is missing all sorts of dependencies, fails all tests,
and should probably be marked BROKEN

For graphics/imc, move the OPTIONS_DEFINE block out of the LICENSE block area.

As long as we're here, sort plist on perl@-owned ports.

9 files changed, 43 insertions, 43 deletions

diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile
index 1db53be89648..663d05f082da 100644
--- a/www/p5-Apache-AuthTicket/Makefile
+++ b/www/p5-Apache-AuthTicket/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Apache-AuthTicket
 PORTVERSION=	0.93
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -13,7 +13,7 @@ COMMENT=	Perl modules that implement a cookie-based authentication system
 
 BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
 RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
-		p5-CGI.pm>=3.12:${PORTSDIR}/www/p5-CGI.pm \
+		p5-CGI>=3.12:${PORTSDIR}/www/p5-CGI \
 		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
 		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 19b5999f5c93..543406d07a57 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Apache-Gallery
 PORTVERSION=	1.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	http://apachegallery.dk/download/ \
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
 		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
 		p5-Image-Imlib2>=0:${PORTSDIR}/graphics/p5-Image-Imlib2 \
 		p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 \
-		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm
+		p5-CGI>=0:${PORTSDIR}/www/p5-CGI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-Business-PayPal/Makefile b/www/p5-Business-PayPal/Makefile
index 2e0504a7970b..09c9b7ec4ff4 100644
--- a/www/p5-Business-PayPal/Makefile
+++ b/www/p5-Business-PayPal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Business-PayPal
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -12,7 +12,7 @@ MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl extension for automating PayPal transactions
 
 RUN_DEPENDS=	p5-Net-SSLeay>=1.35:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-CGI.pm>=3.49:${PORTSDIR}/www/p5-CGI.pm \
+		p5-CGI>=3.49:${PORTSDIR}/www/p5-CGI \
 		p5-Digest-MD5>=2.52:${PORTSDIR}/security/p5-Digest-MD5
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
diff --git a/www/p5-CGI-Enurl/Makefile b/www/p5-CGI-Enurl/Makefile
index 8faa4ae9ced1..58e4815b6694 100644
--- a/www/p5-CGI-Enurl/Makefile
+++ b/www/p5-CGI-Enurl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	CGI-Enurl
 PORTVERSION=	1.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Perl module for URL-encoding strings and hashes
 
-RUN_DEPENDS=	p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm
+RUN_DEPENDS=	p5-CGI>=0:${PORTSDIR}/www/p5-CGI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-CGI-Framework/Makefile b/www/p5-CGI-Framework/Makefile
index 973dcfded9f5..db26766fb801 100644
--- a/www/p5-CGI-Framework/Makefile
+++ b/www/p5-CGI-Framework/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CGI-Framework
 PORTVERSION=	0.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -13,7 +13,7 @@ COMMENT=	Simple-to-use, lightweight web CGI framework
 
 BUILD_DEPENDS=	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
 		p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
-		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm
+		p5-CGI>=0:${PORTSDIR}/www/p5-CGI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-CGI-Framework/pkg-plist b/www/p5-CGI-Framework/pkg-plist
index 063faf8ede2f..abde3e1ac8c7 100644
--- a/www/p5-CGI-Framework/pkg-plist
+++ b/www/p5-CGI-Framework/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/CGI::Framework.3.gz
 %%SITE_PERL%%/CGI/Framework.pm
+%%PERL5_MAN3%%/CGI::Framework.3.gz
diff --git a/www/p5-CGI-Kwiki/Makefile b/www/p5-CGI-Kwiki/Makefile
index 8f79e1e52f78..637a505a3f1b 100644
--- a/www/p5-CGI-Kwiki/Makefile
+++ b/www/p5-CGI-Kwiki/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CGI-Kwiki
 PORTVERSION=	0.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Quickie Wiki Package that's not too Tricky
 
-BUILD_DEPENDS=	p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm
+BUILD_DEPENDS=	p5-CGI>=0:${PORTSDIR}/www/p5-CGI
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		p5-Locale-Maketext>=0:${PORTSDIR}/devel/p5-Locale-Maketext
 
diff --git a/www/p5-CGI-Kwiki/pkg-plist b/www/p5-CGI-Kwiki/pkg-plist
index a70ce3bf935c..610230ecaacf 100644
--- a/www/p5-CGI-Kwiki/pkg-plist
+++ b/www/p5-CGI-Kwiki/pkg-plist
@@ -1,32 +1,4 @@
 bin/kwiki-install
-%%PERL5_MAN3%%/CGI::Kwiki.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Blog.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::CGI.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Changes.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Config.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Config_yaml.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Cookie.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Database.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Display.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Driver.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Edit.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Formatter.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Import.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Javascript.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Metadata.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::New.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Pages.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Pages::zh_cn.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Pages::zh_tw.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Plugin.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Plugin::Diff.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Prefs.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Privacy.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Scripts.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Search.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Slides.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Style.3.gz
-%%PERL5_MAN3%%/CGI::Kwiki::Template.3.gz
 %%SITE_PERL%%/CGI/Kwiki.pm
 %%SITE_PERL%%/CGI/Kwiki/Backup.pm
 %%SITE_PERL%%/CGI/Kwiki/Backup/Rcs.pm
@@ -64,4 +36,32 @@ bin/kwiki-install
 %%SITE_PERL%%/CGI/Kwiki/Slides.pm
 %%SITE_PERL%%/CGI/Kwiki/Style.pm
 %%SITE_PERL%%/CGI/Kwiki/Template.pm
+%%PERL5_MAN3%%/CGI::Kwiki.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Blog.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::CGI.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Changes.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Config.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Config_yaml.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Cookie.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Database.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Display.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Driver.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Edit.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Formatter.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Import.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Javascript.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Metadata.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::New.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Pages.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Pages::zh_cn.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Pages::zh_tw.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Plugin.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Plugin::Diff.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Prefs.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Privacy.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Scripts.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Search.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Slides.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Style.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Template.3.gz
 man/man1/kwiki-install.1.gz
diff --git a/www/p5-CGI-Upload/Makefile b/www/p5-CGI-Upload/Makefile
index e3e794734b11..0f6ead0ec974 100644
--- a/www/p5-CGI-Upload/Makefile
+++ b/www/p5-CGI-Upload/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CGI-Upload
 PORTVERSION=	1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -16,7 +16,7 @@ LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-HTTP-BrowserDetect>=0:${PORTSDIR}/www/p5-HTTP-BrowserDetect \
 		p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic \
-		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm
+		p5-CGI>=0:${PORTSDIR}/www/p5-CGI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5