update to 1.31

ok simon@ merdely@

www/mod_perl/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.28 2009/06/03 00:48:51 pyr Exp $
+# $OpenBSD: Makefile,v 1.29 2009/06/05 16:13:15 dhill Exp $
 
 COMMENT=	module that embeds a Perl interpreter into Apache
 
-DISTNAME=	mod_perl-1.30
-PKGNAME=	${DISTNAME}p7
+DISTNAME=	mod_perl-1.31
 CATEGORIES=	www perl5
 MASTER_SITES=	http://perl.apache.org/dist/ \
 		${MASTER_SITE_PERL_CPAN:=Apache/}
@@ -23,6 +22,10 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c m perl util 
 
+RUN_DEPENDS=		::www/p5-libwww \
+			::www/p5-HTML-Parser
+BUILD_DEPENDS=		${RUN_DEPENDS}
+
 SUBST_VARS=	PKGNAME
 
 NO_REGRESS=	Yes

www/mod_perl/distinfo

@@ -1,5 +1,5 @@
-MD5 (mod_perl-1.30.tar.gz) = v9b2z/GrHMPbtYojZwHRaQ==
-RMD160 (mod_perl-1.30.tar.gz) = 9xYT8vw4blbknBZRI+jSIm835/w=
-SHA1 (mod_perl-1.30.tar.gz) = Q+lqGjZWorD518WwFHoCMJ4Ndfs=
-SHA256 (mod_perl-1.30.tar.gz) = r24TgKkZd1Cy1EPwKnoNujWGw/wMgmm+qv7wkVkYSgg=
-SIZE (mod_perl-1.30.tar.gz) = 389029
+MD5 (mod_perl-1.31.tar.gz) = 0hiL9QDp8AzXjcl8P79rlw==
+RMD160 (mod_perl-1.31.tar.gz) = KWvV6VAYwxO6uErnshrp9kvUo5Q=
+SHA1 (mod_perl-1.31.tar.gz) = X26t8rD8JO1DdtdwgiY5G6oUxz8=
+SHA256 (mod_perl-1.31.tar.gz) = C8fSY4E5t6yXQuJwUVE++zMlBAk+yoRIjKFVhbFIYME=
+SIZE (mod_perl-1.31.tar.gz) = 389960

www/mod_perl/patches/patch-src_modules_perl_mod_perl_c

@@ -1,41 +0,0 @@
-Fix to work with perl-5.10, from mod_perl SVN repository at
-http://svn.apache.org/viewvc?view=rev&revision=555908
-
-Log message:
-Don't call av_undef() on a NULL AV*.
-
-This fixes some horrible nastiness when using perl-5.9.5, which no longer
-returns early from av_undef() in the case that the AV* is NULL, as of perl
-change #26513.
-
-$OpenBSD: patch-src_modules_perl_mod_perl_c,v 1.4 2008/10/11 10:58:59 simon Exp $
---- src/modules/perl/mod_perl.c.orig	Sat Oct 11 11:04:09 2008
-+++ src/modules/perl/mod_perl.c	Sat Oct 11 11:05:42 2008
-@@ -277,14 +277,9 @@ void perl_shutdown (server_rec *s, pool *p)
- 
-     mp_request_rec = 0;
- 
--    av_undef(orig_inc);
--    SvREFCNT_dec((SV*)orig_inc);
--    orig_inc = Nullav;
-+    MP_safe_av_undef(orig_inc)
-+    MP_safe_av_undef(cleanup_av)
- 
--    av_undef(cleanup_av);
--    SvREFCNT_dec((SV*)cleanup_av);
--    cleanup_av = Nullav;
--
- #ifdef PERL_STACKED_HANDLERS
-     hv_undef(stacked_handlers);
-     SvREFCNT_dec((SV*)stacked_handlers);
-@@ -1159,9 +1154,7 @@ void mod_perl_end_cleanup(void *data)
-     perl_clear_env();
- 
-     /* reset @INC */
--    av_undef(GvAV(incgv));
--    SvREFCNT_dec(GvAV(incgv));
--    GvAV(incgv) = Nullav;
-+    MP_safe_av_undef(GvAV(incgv))
-     GvAV(incgv) = av_copy_array(orig_inc);
- 
-     /* reset $/ */

www/mod_perl/patches/patch-src_modules_perl_mod_perl_h

@@ -1,27 +0,0 @@
-Fix to work with perl-5.10, from mod_perl SVN repository at
-http://svn.apache.org/viewvc?view=rev&revision=555908  
-
-Log message:
-Don't call av_undef() on a NULL AV*.
-
-This fixes some horrible nastiness when using perl-5.9.5, which no longer
-returns early from av_undef() in the case that the AV* is NULL, as of perl
-change #26513.
-
-$OpenBSD: patch-src_modules_perl_mod_perl_h,v 1.1 2008/10/11 10:58:59 simon Exp $
---- src/modules/perl/mod_perl.h.orig	Sat Oct 11 11:03:21 2008
-+++ src/modules/perl/mod_perl.h	Sat Oct 11 11:03:58 2008
-@@ -301,6 +301,13 @@ if(arg) \
- 
- #define av_copy_array(av) av_make(av_len(av)+1, AvARRAY(av))  
- 
-+#define MP_safe_av_undef(av) \
-+if (av != Nullav) { \
-+    av_undef(av); \
-+    SvREFCNT_dec((SV*)av); \
-+    av = Nullav; \
-+}
-+
- #ifndef newRV_noinc
- #define newRV_noinc(sv)	((Sv = newRV(sv)), --SvREFCNT(SvRV(Sv)), Sv)
- #endif