www/p5-CGI was repocopied to www/p5-CGI-modules. Finish this process:

  - remove www/p5-CGI/*;
  - modify www/p5-CGI-modules/Makefile to reflect the new name;
  - change p5-CGI to p5-CGI-modules in the category's Makefile.

OK'ed by:	markm
Reminded to _BE_CAREFUL_!! by:	markm

7 files changed, 4 insertions, 54 deletions

diff --git a/www/Makefile b/www/Makefile
index 23d8788ef281..9b74f7f69f25 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -198,14 +198,14 @@
     SUBDIR += p5-Apache-SSI
     SUBDIR += p5-Apache-Session
     SUBDIR += p5-Apache-Session-SharedMem
-    SUBDIR += p5-CGI
-    SUBDIR += p5-CGI.pm
-    SUBDIR += p5-CGI_Lite
     SUBDIR += p5-CGI-Application
     SUBDIR += p5-CGI-ArgChecker
     SUBDIR += p5-CGI-Cache
     SUBDIR += p5-CGI-FastTemplate
     SUBDIR += p5-CGI-Minimal
+    SUBDIR += p5-CGI-modules
+    SUBDIR += p5-CGI.pm
+    SUBDIR += p5-CGI_Lite
     SUBDIR += p5-FastCGI
     SUBDIR += p5-GtkHTML
     SUBDIR += p5-HTML
diff --git a/www/p5-CGI-modules/Makefile b/www/p5-CGI-modules/Makefile
index 62d1927ea7c0..8e1e2ffb9b53 100644
--- a/www/p5-CGI-modules/Makefile
+++ b/www/p5-CGI-modules/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	CGI
+PORTNAME=	CGI-modules
 PORTVERSION=	2.76
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI
 PKGNAMEPREFIX=	p5-
-DISTNAME=	CGI-modules-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
deleted file mode 100644
index 62d1927ea7c0..000000000000
--- a/www/p5-CGI/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for:	p5-CGI
-# Date created:				September 30th 1996
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	CGI
-PORTVERSION=	2.76
-CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
-PKGNAMEPREFIX=	p5-
-DISTNAME=	CGI-modules-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
-
-PERL_CONFIGURE=	yes
-
-MAN3=		CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 \
-		CGI::MiniSvr.3 CGI::Request.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-.include <bsd.port.mk>
diff --git a/www/p5-CGI/distinfo b/www/p5-CGI/distinfo
deleted file mode 100644
index 6fcc7311e40b..000000000000
--- a/www/p5-CGI/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (CGI-modules-2.76.tar.gz) = be3a6dff87ae14bbf54b60005ceb5bb3
diff --git a/www/p5-CGI/pkg-comment b/www/p5-CGI/pkg-comment
deleted file mode 100644
index 47578df5dc15..000000000000
--- a/www/p5-CGI/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Modules for perl5, for use in writing CGI scripts
diff --git a/www/p5-CGI/pkg-descr b/www/p5-CGI/pkg-descr
deleted file mode 100644
index db19ef4d69eb..000000000000
--- a/www/p5-CGI/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-These are the CGI:: modules for perl5, for use in writing CGI scripts.      
-
-Online documentation of these modules as well as related modules (such
-as the earlier CGI.pm module)  can be found at:
-
-WWW: http://www-genome.wi.mit.edu/ftp/pub/software/WWW/CGIperl/
-
-Many examples of CGI scripts of various degrees of complexity can be
-found at:
-
-        http://www-genome.wi.mit.edu/WWW/examples/Ch9/
diff --git a/www/p5-CGI/pkg-plist b/www/p5-CGI/pkg-plist
deleted file mode 100644
index 822174c9c235..000000000000
--- a/www/p5-CGI/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/BasePlus.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Carp.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Form.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/MiniSvr.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/Request.pm
-lib/perl5/site_perl/%%PERL_VER%%/CGI/test.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI