--- ./p5-CGI-SpeedyCGI/Makefile	Tue Sep  9 21:01:48 2003
+++ ./p5-CGI-SpeedyCGI/Makefile	Sun Oct 12 23:00:22 2003
@@ -6,8 +6,8 @@ 
 #
 
 PORTNAME=	CGI-SpeedyCGI
-PORTVERSION=	2.21
-PORTREVISION=	3
+PORTVERSION=	2.22
+PORTREVISION=	0
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI
--- ./p5-CGI-SpeedyCGI/distinfo	Sat Mar  1 09:32:56 2003
+++ ./p5-CGI-SpeedyCGI/distinfo	Sun Oct 12 23:01:45 2003
@@ -1, +1, @@ 
-MD5 (CGI-SpeedyCGI-2.21.tar.gz) = ff43eaa899c5ff38f208ed692ab12bb4
+MD5 (CGI-SpeedyCGI-2.22.tar.gz) = 2f80df78874e3efa80f180923c4967a1
--- ./p5-CGI-SpeedyCGI/files/patch-Makefile.PL	Sat Mar  1 09:32:56 2003
+++ ./p5-CGI-SpeedyCGI/files/patch-Makefile.PL	Mon Oct 13 09:23:58 2003
@@ -1,6 +1,6 @@ 
---- Makefile.PL.orig	Sat Mar  1 09:16:07 2003
-+++ Makefile.PL	Sat Mar  1 09:17:19 2003
-@@ -6,26 +6,26 @@
+--- Makefile.PL.orig	Sun Oct  5 14:40:46 2003
++++ Makefile.PL	Mon Oct 13 09:23:45 2003
+@@ -6,28 +6,28 @@
      import SpeedyMake qw(%write_makefile_common);
  }
  
@@ -29,37 +29,21 @@ 
  
  my @dirs = qw(src speedy_backend speedy);
  my $macro = $write_makefile_common{macro};
+ my $apache_module = 0;
 -if (<STDIN> =~ /y/i) {
--    die "ERROR: Could not find a working copy of 'apxs' in your path.\n"
+-    die "ERROR: Command 'apxs -q CC' failed.\n"
 -	unless $macro->{APACHE_APXS_WORKS};
 -    print "Compiling for Apache version $macro->{APACHE_VERSION}\n";
 -    push(@dirs, $macro->{MOD_SPEEDYCGI_DIR});
+-    $apache_module = 1;
 -}
 +#if (<STDIN> =~ /y/i) {
-+#    die "ERROR: Could not find a working copy of 'apxs' in your path.\n"
++#    die "ERROR: Command 'apxs -q CC' failed.\n"
 +#	unless $macro->{APACHE_APXS_WORKS};
 +#    print "Compiling for Apache version $macro->{APACHE_VERSION}\n";
 +#    push(@dirs, $macro->{MOD_SPEEDYCGI_DIR});
++#    $apache_module = 1;
 +#}
  
  WriteMakefile(
      NAME		=> 'CGI::SpeedyCGI',
-@@ -47,12 +47,12 @@
- sub postamble {
-     my $extra = SpeedyMake->optdefs_cmds('src');
-     my $test_install_extra;
--    if (my $mod_dir = $macro->{MOD_SPEEDYCGI_DIR}) {
--	$extra .=
--	    "\ninstall ::\n\tcd $mod_dir && \$(MAKE) install\n";
--	$test_install_extra =
--	    "\t\@cd $mod_dir && \$(MAKE) test_install \$(PASTHRU)\n";
--    }
-+#    if (my $mod_dir = $macro->{MOD_SPEEDYCGI_DIR}) {
-+#	$extra .=
-+#	    "\ninstall ::\n\tcd $mod_dir && \$(MAKE) install\n";
-+#	$test_install_extra =
-+#	    "\t\@cd $mod_dir && \$(MAKE) test_install \$(PASTHRU)\n";
-+#    }
- 
- '
- test_install:
--- ./p5-CGI-SpeedyCGI/files/patch-speedy_opt.c	Wed May 21 18:43:18 2003
+++ ./p5-CGI-SpeedyCGI/files/patch-speedy_opt.c	Thu Jan  1 08:00:00 1970
@@ -1,20 +0,0 @@ 
---- src/speedy_opt.c	Mon Sep 30 07:19:54 2002
-+++ /tmp/speedy_opt.c	Tue May 20 11:11:28 2003
-@@ -165,6 +165,8 @@ static void cmdline_split(
- 		    ++p;
- 	    if (*p)
- 		strlist_append(doing_speedy_opts ? speedy_opts : perl_args, *p);
-+	    else
-+		break;
- 	}
- 
- 	if (*p) {
-@@ -422,7 +424,7 @@ const char * const *speedy_opt_script_ar
- }
- 
- SPEEDY_INLINE const char *speedy_opt_script_fname(void) {
--    return exec_argv.ptrs[script_argv_loc];
-+    return exec_argv.len > script_argv_loc ? exec_argv.ptrs[script_argv_loc] : NULL;
- }
- 
- #ifdef SPEEDY_BACKEND
--- ./p5-CGI-SpeedyCGI/files/patch-src::SpeedyMake.pl	Fri Apr 11 10:17:22 2003
+++ ./p5-CGI-SpeedyCGI/files/patch-src::SpeedyMake.pl	Mon Oct 13 09:30:22 2003
@@ -1,6 +1,6 @@ 
---- src/SpeedyMake.pl.orig	Sun Mar 30 08:17:01 2003
-+++ src/SpeedyMake.pl	Sun Mar 30 08:18:59 2003
-@@ -214,6 +214,7 @@
+--- src/SpeedyMake.pl.orig	Sun Oct 12 08:45:06 2003
++++ src/SpeedyMake.pl	Mon Oct 13 09:29:39 2003
+@@ -223,6 +223,7 @@
      join(' ',
  	"-DSPEEDY_PROGNAME=\\\"" . $class->my_name_full . "\\\"",
  	"-DSPEEDY_VERSION=\\\"\$(VERSION)\\\"",