Update p5-CGI to 2.74. Changes from version 2.72:

    * Quashed one-character bug that caused CGI.pm to fail on file uploads.
    * Added -base to the list of arguments accepted by url().
    * Fixes to XHTML support.
    * POST parameters no longer show up in the Location box.

5 files changed, 28 insertions, 17 deletions

diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index e07a8faffdf..f78521f5f29 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2000/09/15 14:50:58 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2000/10/15 02:17:16 jlam Exp $
 #
 
-DISTNAME=       	CGI.pm-2.72
-PKGNAME=        	p5-CGI-2.72
+DISTNAME=       	CGI.pm-2.74
+PKGNAME=        	p5-CGI-2.74
 CATEGORIES=		www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=CGI/}
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=CGI/} \
+			http://stein.cshl.org/WWW/software/CGI/
 
 MAINTAINER=		christos@netbsd.org
+HOMEPAGE=		http://stein.cshl.org/WWW/software/CGI/
 
 # Some perl packages install their own versions of this module.
 # Can't simply define USE_PERL5.
@@ -23,22 +25,17 @@ post-extract:
 		${RM} -f $${file}.tmp; \
 	done
 
-pre-configure:
-	${CP} ${FILESDIR}/Makefile.PL ${WRKSRC}/Makefile.PL
-
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 post-build:
 	@cd ${WRKSRC}/examples; ${PERL5} make_links.pl
 
-pre-install:
-	@${RM} -rf ${WRKSRC}/examples/WORLD_WRITABLE
-
 post-install:
 	${INSTALL_DATA_DIR} ${HTMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/cgi*.html ${HTMLDIR}
-	${CP} -R ${WRKSRC}/examples ${HTMLDIR}/examples
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${HTMLDIR}/examples
+	${INSTALL_DATA_DIR} ${HTMLDIR}/examples
+	cd ${WRKSRC}; ${INSTALL_DATA} *.html ${HTMLDIR}
+	cd ${WRKSRC}/examples; ${INSTALL_DATA} *.cgi *.gif *.html *.txt *.xbm \
+		${HTMLDIR}/examples
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-CGI/files/md5 b/www/p5-CGI/files/md5
index 22aefd50d68..45ecd93a2bd 100644
--- a/www/p5-CGI/files/md5
+++ b/www/p5-CGI/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/08/28 23:06:00 jlam Exp $
+$NetBSD: md5,v 1.3 2000/10/15 02:17:16 jlam Exp $
 
-MD5 (CGI.pm-2.72.tar.gz) = 9751b2af9aba507583cc3e36249a76dd
+MD5 (CGI.pm-2.74.tar.gz) = ed84941bb444297527558a432c8c8195
diff --git a/www/p5-CGI/files/patch-sum b/www/p5-CGI/files/patch-sum
new file mode 100644
index 00000000000..20b3055d8f0
--- /dev/null
+++ b/www/p5-CGI/files/patch-sum
@@ -0,0 +1,3 @@
+$NetBSD: patch-sum,v 1.1 2000/10/15 02:17:16 jlam Exp $
+
+MD5 (patch-aa) = dee100236adb6af6f5da21584c9868b6
diff --git a/www/p5-CGI/patches/patch-aa b/www/p5-CGI/patches/patch-aa
new file mode 100644
index 00000000000..93055a23040
--- /dev/null
+++ b/www/p5-CGI/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2000/10/15 02:17:16 jlam Exp $
+
+--- Makefile.PL.orig	Tue Nov 24 07:29:59 1998
++++ Makefile.PL	Sun Sep 24 19:23:29 2000
+@@ -2,7 +2,6 @@
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.
+ WriteMakefile(
+-    'INSTALLDIRS' => 'perl',
+     'NAME'	=> 'CGI',
+     'DISTNAME'  => 'CGI.pm',
+     'VERSION_FROM'   => 'CGI.pm',
diff --git a/www/p5-CGI/pkg/PLIST b/www/p5-CGI/pkg/PLIST
index 0c3e9959ed0..0ff660e99da 100644
--- a/www/p5-CGI/pkg/PLIST
+++ b/www/p5-CGI/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/09/15 14:50:58 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/10/15 02:17:17 jlam Exp $
 share/doc/html/p5-CGI/cgi-lib_porting.html
 share/doc/html/p5-CGI/cgi_docs.html
 share/doc/html/p5-CGI/examples/caution.xbm
@@ -22,7 +22,6 @@ share/doc/html/p5-CGI/examples/internal_links.cgi
 share/doc/html/p5-CGI/examples/internal_links.txt
 share/doc/html/p5-CGI/examples/javascript.cgi
 share/doc/html/p5-CGI/examples/javascript.txt
-share/doc/html/p5-CGI/examples/make_links.pl
 share/doc/html/p5-CGI/examples/monty.cgi
 share/doc/html/p5-CGI/examples/monty.txt
 share/doc/html/p5-CGI/examples/multiple_forms.cgi