Changes 3.29:

1. The position of file handles is now reset to zero when CGI->new is called.
2. uploadInfo() now works across multiple object instances. Also, the first
   tests for uploadInfo() were added as part of the fix.

Changes 3.28:
1. Applied patch from Allen Day that makes Cookie parsing RFC2109 compliant
   attribute/values can be separated by commas as well as semicolons).
2. Applied patch from Stephan Struckmann that allows script_name() to be set correctly.
3. Fixed problem with url(-full) in which port number appears twice.

3 files changed, 62 insertions, 66 deletions

diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 9f00ff55c69..5fe4592a4ce 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -1,39 +1,35 @@
-# $NetBSD: Makefile,v 1.41 2007/03/16 20:32:09 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.42 2007/10/13 11:55:14 adam Exp $
 
-VERS=			3.27
+VERS=		3.29
 DISTNAME=	CGI.pm-${VERS}
 PKGNAME=	p5-CGI-${VERS}
-SVR4_PKGNAME=		p5cgi
-CATEGORIES=		www perl5
-MASTER_SITES+=		${MASTER_SITE_PERL_CPAN:=CGI/}
+SVR4_PKGNAME=	p5cgi
+CATEGORIES=	www perl5
+MASTER_SITES+=	${MASTER_SITE_PERL_CPAN:=CGI/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://search.cpan.org/dist/CGI.pm/
-COMMENT=		Perl5 module for writing forms-based CGI programs
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://search.cpan.org/dist/CGI.pm/
+COMMENT=	Perl5 module for writing forms-based CGI programs
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=		# empty
+USE_TOOLS+=		perl
 PERL5_PACKLIST=		auto/CGI/.packlist
-HTMLDIR=		${PREFIX}/share/doc/html/p5-CGI
+REPLACE_PERL+=		examples/*.pl
+REPLACE_PERL+=		examples/*.cgi
+
+HTMLDIR=		${PREFIX}/share/doc/p5-CGI
 
 post-build:
-	cd ${WRKSRC}/examples;						\
-	for file in *.cgi *.pl; do					\
-		${SED}	-e "s|^#!/.*|#!${PERL5}|g"			\
-			$${file} > $${file}.tmp;			\
-		${MV} -f $${file}.tmp $${file};				\
-	done;								\
-	${CHMOD} +x *.cgi;						\
-	${PERL5} make_links.pl
+	cd ${WRKSRC}/examples && chmod +x *.cgi && perl make_links.pl
 
 post-install:
 	${INSTALL_DATA_DIR} ${HTMLDIR}
 	${INSTALL_DATA_DIR} ${HTMLDIR}/examples
-	cd ${WRKSRC}; ${INSTALL_DATA} *.html ${HTMLDIR}
-	cd ${WRKSRC}/examples;						\
-	${INSTALL_DATA} *.gif *.html *.txt *.xbm ${HTMLDIR}/examples;	\
+	cd ${WRKSRC} && ${INSTALL_DATA} *.html ${HTMLDIR}
+	cd ${WRKSRC}/examples &&					\
+	${INSTALL_DATA} *.gif *.html *.txt *.xbm ${HTMLDIR}/examples &&	\
 	${INSTALL_SCRIPT} *.cgi ${HTMLDIR}/examples
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-CGI/PLIST b/www/p5-CGI/PLIST
index 4dd8d52605c..04d70085e7a 100644
--- a/www/p5-CGI/PLIST
+++ b/www/p5-CGI/PLIST
@@ -1,41 +1,41 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:17:50 zuntum 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
-share/doc/html/p5-CGI/examples/clickable_image.cgi
-share/doc/html/p5-CGI/examples/clickable_image.txt
-share/doc/html/p5-CGI/examples/cookie.cgi
-share/doc/html/p5-CGI/examples/cookie.txt
-share/doc/html/p5-CGI/examples/crash.cgi
-share/doc/html/p5-CGI/examples/crash.txt
-share/doc/html/p5-CGI/examples/customize.cgi
-share/doc/html/p5-CGI/examples/customize.txt
-share/doc/html/p5-CGI/examples/diff_upload.cgi
-share/doc/html/p5-CGI/examples/diff_upload.txt
-share/doc/html/p5-CGI/examples/dna.small.gif
-share/doc/html/p5-CGI/examples/file_upload.cgi
-share/doc/html/p5-CGI/examples/file_upload.txt
-share/doc/html/p5-CGI/examples/frameset.cgi
-share/doc/html/p5-CGI/examples/frameset.txt
-share/doc/html/p5-CGI/examples/index.html
-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/monty.cgi
-share/doc/html/p5-CGI/examples/monty.txt
-share/doc/html/p5-CGI/examples/multiple_forms.cgi
-share/doc/html/p5-CGI/examples/multiple_forms.txt
-share/doc/html/p5-CGI/examples/nph-clock.cgi
-share/doc/html/p5-CGI/examples/nph-clock.txt
-share/doc/html/p5-CGI/examples/nph-multipart.cgi
-share/doc/html/p5-CGI/examples/nph-multipart.txt
-share/doc/html/p5-CGI/examples/popup.cgi
-share/doc/html/p5-CGI/examples/popup.txt
-share/doc/html/p5-CGI/examples/save_state.cgi
-share/doc/html/p5-CGI/examples/save_state.txt
-share/doc/html/p5-CGI/examples/tryit.cgi
-share/doc/html/p5-CGI/examples/tryit.txt
-share/doc/html/p5-CGI/examples/wilogo.gif
-@dirrm share/doc/html/p5-CGI/examples
-@dirrm share/doc/html/p5-CGI
+@comment $NetBSD: PLIST,v 1.2 2007/10/13 11:55:15 adam Exp $
+share/doc/p5-CGI/cgi-lib_porting.html
+share/doc/p5-CGI/cgi_docs.html
+share/doc/p5-CGI/examples/caution.xbm
+share/doc/p5-CGI/examples/clickable_image.cgi
+share/doc/p5-CGI/examples/clickable_image.txt
+share/doc/p5-CGI/examples/cookie.cgi
+share/doc/p5-CGI/examples/cookie.txt
+share/doc/p5-CGI/examples/crash.cgi
+share/doc/p5-CGI/examples/crash.txt
+share/doc/p5-CGI/examples/customize.cgi
+share/doc/p5-CGI/examples/customize.txt
+share/doc/p5-CGI/examples/diff_upload.cgi
+share/doc/p5-CGI/examples/diff_upload.txt
+share/doc/p5-CGI/examples/dna.small.gif
+share/doc/p5-CGI/examples/file_upload.cgi
+share/doc/p5-CGI/examples/file_upload.txt
+share/doc/p5-CGI/examples/frameset.cgi
+share/doc/p5-CGI/examples/frameset.txt
+share/doc/p5-CGI/examples/index.html
+share/doc/p5-CGI/examples/internal_links.cgi
+share/doc/p5-CGI/examples/internal_links.txt
+share/doc/p5-CGI/examples/javascript.cgi
+share/doc/p5-CGI/examples/javascript.txt
+share/doc/p5-CGI/examples/monty.cgi
+share/doc/p5-CGI/examples/monty.txt
+share/doc/p5-CGI/examples/multiple_forms.cgi
+share/doc/p5-CGI/examples/multiple_forms.txt
+share/doc/p5-CGI/examples/nph-clock.cgi
+share/doc/p5-CGI/examples/nph-clock.txt
+share/doc/p5-CGI/examples/nph-multipart.cgi
+share/doc/p5-CGI/examples/nph-multipart.txt
+share/doc/p5-CGI/examples/popup.cgi
+share/doc/p5-CGI/examples/popup.txt
+share/doc/p5-CGI/examples/save_state.cgi
+share/doc/p5-CGI/examples/save_state.txt
+share/doc/p5-CGI/examples/tryit.cgi
+share/doc/p5-CGI/examples/tryit.txt
+share/doc/p5-CGI/examples/wilogo.gif
+@dirrm share/doc/p5-CGI/examples
+@dirrm share/doc/p5-CGI
diff --git a/www/p5-CGI/distinfo b/www/p5-CGI/distinfo
index 2d87171078b..da3615cd375 100644
--- a/www/p5-CGI/distinfo
+++ b/www/p5-CGI/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2007/03/16 20:32:09 wiz Exp $
+$NetBSD: distinfo,v 1.15 2007/10/13 11:55:15 adam Exp $
 
-SHA1 (CGI.pm-3.27.tar.gz) = 874497c3be6de3fb5e731feab0ef78f8f93293f1
-RMD160 (CGI.pm-3.27.tar.gz) = b31fb63811b5da14f3ac5f2b77d638d736e85496
-Size (CGI.pm-3.27.tar.gz) = 236822 bytes
+SHA1 (CGI.pm-3.29.tar.gz) = db5db74d2377a322f68bbc4798e95636d151bd45
+RMD160 (CGI.pm-3.29.tar.gz) = ee17aa1ffdc2a839ff8a6c341a71a37f3d01c95b
+Size (CGI.pm-3.29.tar.gz) = 237899 bytes