From clsung@dragon2.net  Sun Oct 12 18:32:58 2003
Return-Path: <clsung@dragon2.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7DC3A16A4B3
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 12 Oct 2003 18:32:58 -0700 (PDT)
Received: from mail.dragon2.net (sungsung.csie.nctu.edu.tw [140.113.215.201])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6A14643FBD
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 12 Oct 2003 18:32:57 -0700 (PDT)
	(envelope-from clsung@dragon2.net)
Received: from localhost (unknown [127.0.0.1])
	by mail.dragon2.net (Postfix) with ESMTP
	id 6DC01155AC; Mon, 13 Oct 2003 01:34:20 +0000 (GMT)
Received: from mail.dragon2.net ([127.0.0.1])
 by localhost (sungsung.csie.nctu.edu.tw [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 93940-10; Mon, 13 Oct 2003 09:34:19 +0800 (CST)
Received: by mail.dragon2.net (Postfix, from userid 1022)
	id C772B1557E; Mon, 13 Oct 2003 09:34:19 +0800 (CST)
Message-Id: <20031013013419.C772B1557E@mail.dragon2.net>
Date: Mon, 13 Oct 2003 09:34:19 +0800 (CST)
From: Cheng-Lung Sung <clsung@dragon2.net>
Reply-To: Cheng-Lung Sung <clsung@dragon2.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: clsung@tiger2.net
Subject: Update ports: www/p5-CGI-SpeedyCGI
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         57925
>Category:       ports
>Synopsis:       Update ports: www/p5-CGI-SpeedyCGI
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mat
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 12 18:40:14 PDT 2003
>Closed-Date:    Thu Oct 30 05:11:07 PST 2003
>Last-Modified:  Thu Oct 30 05:11:07 PST 2003
>Originator:     Cheng-Lung Sung
>Release:        FreeBSD 4.8-RELEASE-p13 i386
>Organization:
FreeBSD @ Taiwan
>Environment:
System: FreeBSD sungsung.csie.nctu.edu.tw 4.8-RELEASE-p13 FreeBSD 4.8-RELEASE-p13 #3: Wed Oct 8 07:32:16 CST 2003 root@sungsung.csie.nctu.edu.tw:/usr/obj/usr/src/sys/SUNGSUNG i386

>Description:
- 	Update www/p5-CGI-SpeedyCGI to 2.22
>How-To-Repeat:
>Fix:

diff -ruN /usr/ports/www/p5-CGI-SpeedyCGI/Makefile ./p5-CGI-SpeedyCGI/Makefile
--- /usr/ports/www/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
diff -ruN /usr/ports/www/p5-CGI-SpeedyCGI/distinfo ./p5-CGI-SpeedyCGI/distinfo
--- /usr/ports/www/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
diff -ruN /usr/ports/www/p5-CGI-SpeedyCGI/files/patch-Makefile.PL ./p5-CGI-SpeedyCGI/files/patch-Makefile.PL
--- /usr/ports/www/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:
diff -ruN /usr/ports/www/p5-CGI-SpeedyCGI/files/patch-speedy_opt.c ./p5-CGI-SpeedyCGI/files/patch-speedy_opt.c
--- /usr/ports/www/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
diff -ruN /usr/ports/www/p5-CGI-SpeedyCGI/files/patch-src::SpeedyMake.pl ./p5-CGI-SpeedyCGI/files/patch-src::SpeedyMake.pl
--- /usr/ports/www/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)\\\"",
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mat 
Responsible-Changed-By: mat 
Responsible-Changed-When: Mon Oct 13 01:56:42 PDT 2003 
Responsible-Changed-Why:  
I'll take this 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57920 
Responsible-Changed-From-To: freebsd-ports-bugs->mat 
Responsible-Changed-By: mat 
Responsible-Changed-When: Mon Oct 13 01:56:42 PDT 2003 
Responsible-Changed-Why:  
I'll take this 


http://www.freebsd.org/cgi/query-pr.cgi?pr=57921 
Responsible-Changed-From-To: freebsd-ports-bugs->mat 
Responsible-Changed-By: mat 
Responsible-Changed-When: Mon Oct 13 01:56:42 PDT 2003 
Responsible-Changed-Why:  
I'll take this 


http://www.freebsd.org/cgi/query-pr.cgi?pr=57922 
Responsible-Changed-From-To: freebsd-ports-bugs->mat 
Responsible-Changed-By: mat 
Responsible-Changed-When: Mon Oct 13 01:56:42 PDT 2003 
Responsible-Changed-Why:  
I'll take this 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57923 
Responsible-Changed-From-To: freebsd-ports-bugs->mat 
Responsible-Changed-By: mat 
Responsible-Changed-When: Mon Oct 13 01:56:42 PDT 2003 
Responsible-Changed-Why:  
I'll take this 


http://www.freebsd.org/cgi/query-pr.cgi?pr=57924 
Responsible-Changed-From-To: freebsd-ports-bugs->mat 
Responsible-Changed-By: mat 
Responsible-Changed-When: Mon Oct 13 01:56:42 PDT 2003 
Responsible-Changed-Why:  
I'll take this 


http://www.freebsd.org/cgi/query-pr.cgi?pr=57925 

From: "Lars Thegler" <lars@thegler.dk>
To: <FreeBSD-gnats-submit@FreeBSD.org>,
	"Mathieu Arnold" <mat@FreeBSD.org>
Cc: <clsung@tiger2.net>, "Cheng-Lung Sung" <clsung@dragon2.net>
Subject: Re: ports/57925: Update ports: www/p5-CGI-SpeedyCGI
Date: Sun, 19 Oct 2003 15:11:32 +0200

 This is a multi-part message in MIME format.
 
 ------=_NextPart_000_00E5_01C39653.47D2DFC0
 Content-Type: text/plain;
 	charset="Windows-1252"
 Content-Transfer-Encoding: 7bit
 
 I've added conditional installation of mod_speedycgi.
 
 Please note, that files/patch-speedy_opt.c should be removed now.
 
 Thanks for the effort, all!
 
 /Lars
 ------=_NextPart_000_00E5_01C39653.47D2DFC0
 Content-Type: application/octet-stream;
 	name="p5-CGI-SpeedyCGI.diff"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment;
 	filename="p5-CGI-SpeedyCGI.diff"
 
 diff -Naur p5-CGI-SpeedyCGI.orig/Makefile p5-CGI-SpeedyCGI/Makefile=0A=
 --- p5-CGI-SpeedyCGI.orig/Makefile	Wed May 21 12:43:18 2003=0A=
 +++ p5-CGI-SpeedyCGI/Makefile	Sat Oct 18 15:19:58 2003=0A=
 @@ -6,8 +6,7 @@=0A=
  #=0A=
  =0A=
  PORTNAME=3D	CGI-SpeedyCGI=0A=
 -PORTVERSION=3D	2.21=0A=
 -PORTREVISION=3D	3=0A=
 +PORTVERSION=3D	2.22=0A=
  CATEGORIES=3D	www perl5=0A=
  MASTER_SITES=3D	${MASTER_SITE_PERL_CPAN}=0A=
  MASTER_SITE_SUBDIR=3D	CGI=0A=
 @@ -18,11 +17,35 @@=0A=
  =0A=
  PERL_CONFIGURE=3D	yes=0A=
  =0A=
 +.include <bsd.port.pre.mk>=0A=
 +=0A=
 +APXS?=3D		${LOCALBASE}/sbin/apxs=0A=
 +=0A=
 +# define WITHOUT_APACHE to prevent mod_speedycgi from being built even =
 if Apache is installed=0A=
 +=0A=
 +.if !exists(${APXS}) || defined(WITHOUT_APACHE)=0A=
 +PLIST_SUB+=3D	APACHE=3D"@comment "=0A=
 +CONFIGURE_ENV+=3D	WITHOUT_APACHE=3Dyes=0A=
 +.else=0A=
 +PLIST_SUB+=3D	APACHE=3D""=0A=
 +.if exists(${APXS})=0A=
 +APXS_WORKS!=3D	${APXS} -q TARGET 2>/dev/null || echo no=0A=
 +.endif=0A=
 +.if exists(${APXS}) && ${APXS_WORKS} !=3D no=0A=
 +AP_LIBEXEC!=3D	${APXS} -q LIBEXECDIR=0A=
 +.else=0A=
 +AP_LIBEXEC?=3D	${PREFIX}/libexec/apache=0A=
 +.endif=0A=
 +PLIST_SUB+=3D	AP_LIBEXEC=3D${AP_LIBEXEC:S/^${PREFIX}\///}=0A=
 +.endif=0A=
 +=0A=
  post-configure:=0A=
 -	@${PERL} -pi.bak -e 's,^PREFIX =3D /usr$$,PREFIX =3D ${PREFIX},g' =
 ${WRKSRC}/*/Makefile=0A=
 +	@${PERL} -pi -e 's,^PREFIX =3D /usr$$,PREFIX =3D ${PREFIX},g;' \=0A=
 +		     -e 's,/usr/local,${PREFIX},g;' \=0A=
 +		${WRKSRC}/Makefile ${WRKSRC}/*/Makefile=0A=
  =0A=
  post-install:=0A=
  	@${INSTALL_PROGRAM} ${WRKSRC}/speedy/speedy ${PREFIX}/bin/speedy_suid=0A=
  	@${CHMOD} 4755 ${PREFIX}/bin/speedy_suid=0A=
  =0A=
 -.include <bsd.port.mk>=0A=
 +.include <bsd.port.post.mk>=0A=
 diff -Naur p5-CGI-SpeedyCGI.orig/distinfo p5-CGI-SpeedyCGI/distinfo=0A=
 --- p5-CGI-SpeedyCGI.orig/distinfo	Sat Mar  1 02:32:56 2003=0A=
 +++ p5-CGI-SpeedyCGI/distinfo	Tue Oct 14 21:25:35 2003=0A=
 @@ -1 +1 @@=0A=
 -MD5 (CGI-SpeedyCGI-2.21.tar.gz) =3D ff43eaa899c5ff38f208ed692ab12bb4=0A=
 +MD5 (CGI-SpeedyCGI-2.22.tar.gz) =3D 2f80df78874e3efa80f180923c4967a1=0A=
 diff -Naur p5-CGI-SpeedyCGI.orig/files/patch-Makefile.PL =
 p5-CGI-SpeedyCGI/files/patch-Makefile.PL=0A=
 --- p5-CGI-SpeedyCGI.orig/files/patch-Makefile.PL	Sat Mar  1 02:32:56 =
 2003=0A=
 +++ p5-CGI-SpeedyCGI/files/patch-Makefile.PL	Sat Oct 18 12:28:38 2003=0A=
 @@ -1,6 +1,6 @@=0A=
 ---- Makefile.PL.orig	Sat Mar  1 09:16:07 2003=0A=
 -+++ Makefile.PL	Sat Mar  1 09:17:19 2003=0A=
 -@@ -6,26 +6,26 @@=0A=
 +--- Makefile.PL.orig	Sat Oct 18 12:27:13 2003=0A=
 ++++ Makefile.PL	Sat Oct 18 12:28:18 2003=0A=
 +@@ -6,22 +6,23 @@=0A=
       import SpeedyMake qw(%write_makefile_common);=0A=
   }=0A=
   =0A=
 @@ -29,37 +29,10 @@=0A=
   =0A=
   my @dirs =3D qw(src speedy_backend speedy);=0A=
   my $macro =3D $write_makefile_common{macro};=0A=
 + my $apache_module =3D 0;=0A=
  -if (<STDIN> =3D~ /y/i) {=0A=
 --    die "ERROR: Could not find a working copy of 'apxs' in your =
 path.\n"=0A=
 --	unless $macro->{APACHE_APXS_WORKS};=0A=
 --    print "Compiling for Apache version $macro->{APACHE_VERSION}\n";=0A=
 --    push(@dirs, $macro->{MOD_SPEEDYCGI_DIR});=0A=
 --}=0A=
  +#if (<STDIN> =3D~ /y/i) {=0A=
 -+#    die "ERROR: Could not find a working copy of 'apxs' in your =
 path.\n"=0A=
 -+#	unless $macro->{APACHE_APXS_WORKS};=0A=
 -+#    print "Compiling for Apache version $macro->{APACHE_VERSION}\n";=0A=
 -+#    push(@dirs, $macro->{MOD_SPEEDYCGI_DIR});=0A=
 -+#}=0A=
 - =0A=
 - WriteMakefile(=0A=
 -     NAME		=3D> 'CGI::SpeedyCGI',=0A=
 -@@ -47,12 +47,12 @@=0A=
 - sub postamble {=0A=
 -     my $extra =3D SpeedyMake->optdefs_cmds('src');=0A=
 -     my $test_install_extra;=0A=
 --    if (my $mod_dir =3D $macro->{MOD_SPEEDYCGI_DIR}) {=0A=
 --	$extra .=3D=0A=
 --	    "\ninstall ::\n\tcd $mod_dir && \$(MAKE) install\n";=0A=
 --	$test_install_extra =3D=0A=
 --	    "\t\@cd $mod_dir && \$(MAKE) test_install \$(PASTHRU)\n";=0A=
 --    }=0A=
 -+#    if (my $mod_dir =3D $macro->{MOD_SPEEDYCGI_DIR}) {=0A=
 -+#	$extra .=3D=0A=
 -+#	    "\ninstall ::\n\tcd $mod_dir && \$(MAKE) install\n";=0A=
 -+#	$test_install_extra =3D=0A=
 -+#	    "\t\@cd $mod_dir && \$(MAKE) test_install \$(PASTHRU)\n";=0A=
 -+#    }=0A=
 - =0A=
 - '=0A=
 - test_install:=0A=
 ++unless ($ENV{WITHOUT_APACHE}) {=0A=
 +     die "ERROR: Command 'apxs -q CC' failed.\n"=0A=
 + 	unless $macro->{APACHE_APXS_WORKS};=0A=
 +     print "Compiling for Apache version $macro->{APACHE_VERSION}\n";=0A=
 diff -Naur p5-CGI-SpeedyCGI.orig/files/patch-speedy_opt.c =
 p5-CGI-SpeedyCGI/files/patch-speedy_opt.c=0A=
 --- p5-CGI-SpeedyCGI.orig/files/patch-speedy_opt.c	Wed May 21 12:43:18 =
 2003=0A=
 +++ p5-CGI-SpeedyCGI/files/patch-speedy_opt.c	Thu Jan  1 01:00:00 1970=0A=
 @@ -1,20 +0,0 @@=0A=
 ---- src/speedy_opt.c	Mon Sep 30 07:19:54 2002=0A=
 -+++ /tmp/speedy_opt.c	Tue May 20 11:11:28 2003=0A=
 -@@ -165,6 +165,8 @@ static void cmdline_split(=0A=
 - 		    ++p;=0A=
 - 	    if (*p)=0A=
 - 		strlist_append(doing_speedy_opts ? speedy_opts : perl_args, *p);=0A=
 -+	    else=0A=
 -+		break;=0A=
 - 	}=0A=
 - =0A=
 - 	if (*p) {=0A=
 -@@ -422,7 +424,7 @@ const char * const *speedy_opt_script_ar=0A=
 - }=0A=
 - =0A=
 - SPEEDY_INLINE const char *speedy_opt_script_fname(void) {=0A=
 --    return exec_argv.ptrs[script_argv_loc];=0A=
 -+    return exec_argv.len > script_argv_loc ? =
 exec_argv.ptrs[script_argv_loc] : NULL;=0A=
 - }=0A=
 - =0A=
 - #ifdef SPEEDY_BACKEND=0A=
 diff -Naur p5-CGI-SpeedyCGI.orig/pkg-plist p5-CGI-SpeedyCGI/pkg-plist=0A=
 --- p5-CGI-SpeedyCGI.orig/pkg-plist	Fri Apr 11 04:17:22 2003=0A=
 +++ p5-CGI-SpeedyCGI/pkg-plist	Sat Oct 18 15:19:33 2003=0A=
 @@ -1,8 +1,11 @@=0A=
 -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI/.packl=
 ist=0A=
 -lib/perl5/site_perl/%%PERL_VER%%/CGI/SpeedyCGI.pm=0A=
 +%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI/.packlist=0A=
 +%%SITE_PERL%%/CGI/SpeedyCGI.pm=0A=
  bin/speedy=0A=
  bin/speedy_backend=0A=
  bin/speedy_suid=0A=
 -@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI=0A=
 -@unexec rmdir =
 %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null =
 || true=0A=
 -@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || =
 true=0A=
 +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI=0A=
 +@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || =
 true=0A=
 +@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true=0A=
 +%%APACHE%%%%AP_LIBEXEC%%/mod_speedycgi.so=0A=
 +%%APACHE%%@exec %D/sbin/apxs -e -a -n speedycgi %D/%F=0A=
 +%%APACHE%%@unexec %D/sbin/apxs -e -A -n speedycgi %D/%F=0A=
 
 ------=_NextPart_000_00E5_01C39653.47D2DFC0--
 
 
State-Changed-From-To: open->closed 
State-Changed-By: foxfair 
State-Changed-When: Thu Oct 30 05:04:46 PST 2003 
State-Changed-Why:  
Per the submitter's request, I'd like to commit this patch but use Lars'  
version. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=57925 
>Unformatted:
