From 8ea1503fb1bbc49b306bc2951ed6a97bcf546f91 Mon Sep 17 00:00:00 2001
From: simon <simon@openbsd.org>
Date: Mon, 5 May 2008 21:21:43 +0000
Subject: [PATCH] update to version 2.0.4 and enable tests

help by Sergey Skvortsov
confirmed by maintainer
---
 www/ap2-mod_perl/Makefile                             |  9 +++++----
 www/ap2-mod_perl/distinfo                             | 10 +++++-----
 .../patch-src_modules_perl_modperl_apache_compat_h    | 11 +++++++++++
 3 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 www/ap2-mod_perl/patches/patch-src_modules_perl_modperl_apache_compat_h

diff --git a/www/ap2-mod_perl/Makefile b/www/ap2-mod_perl/Makefile
index 3ddf5b416f3..ba0f85c82bd 100644
--- a/www/ap2-mod_perl/Makefile
+++ b/www/ap2-mod_perl/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2007/09/15 20:38:20 merdely Exp $
+# $OpenBSD: Makefile,v 1.11 2008/05/05 21:21:43 simon Exp $
 
 COMMENT=	module that embeds a Perl interpreter into Apache2
 
-DISTNAME=	mod_perl-2.0.3
-PKGNAME=	ap2-${DISTNAME}p6
+DISTNAME=	mod_perl-2.0.4
+PKGNAME=	ap2-${DISTNAME}
 CATEGORIES=	www net
 
 WANTLIB=	c m perl util apr-1 aprutil-1 db expat
@@ -19,7 +19,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-NO_REGRESS=		Yes
 SHARED_ONLY=		Yes
 
 CONFIGURE_ARGS+=	MP_APXS=${LOCALBASE}/sbin/apxs2
@@ -27,6 +26,8 @@ RUN_DEPENDS=		::www/apache-httpd
 BUILD_DEPENDS=		${RUN_DEPENDS} \
 			:p5-Apache-Test->=1.29:www/p5-Apache-Test
 
+PORTHOME=		${WRKDIR}
+
 # avoid conflicts
 post-extract:
 	@rm -rf ${WRKSRC}/Apache-Test
diff --git a/www/ap2-mod_perl/distinfo b/www/ap2-mod_perl/distinfo
index b72164f93be..688826e3830 100644
--- a/www/ap2-mod_perl/distinfo
+++ b/www/ap2-mod_perl/distinfo
@@ -1,5 +1,5 @@
-MD5 (mod_perl-2.0.3.tar.gz) = tA4q32fGvhWgBBrxxntplw==
-RMD160 (mod_perl-2.0.3.tar.gz) = KWYqExwb725K3FUdRGfRKTGk2Rk=
-SHA1 (mod_perl-2.0.3.tar.gz) = 5dizzXJzwoTPvXmsuVPOF5Mivck=
-SHA256 (mod_perl-2.0.3.tar.gz) = 3yV/Iz7Wpcn4WJ1uBZVj+Ba/QX8WT8M2SipDTeEwRfI=
-SIZE (mod_perl-2.0.3.tar.gz) = 3714974
+MD5 (mod_perl-2.0.4.tar.gz) = GgViWuaEMIX5hfXaghRQKg==
+RMD160 (mod_perl-2.0.4.tar.gz) = ERuPM+LcxD73oKfVV860Z/DFXG0=
+SHA1 (mod_perl-2.0.4.tar.gz) = ZSmaFuxBSmkKSKK75jrKo8a7iXs=
+SHA256 (mod_perl-2.0.4.tar.gz) = faIEaqZdvvZP9bcUAL7UtrgkQeYxPIykvsuF+0qJoPA=
+SIZE (mod_perl-2.0.4.tar.gz) = 3727717
diff --git a/www/ap2-mod_perl/patches/patch-src_modules_perl_modperl_apache_compat_h b/www/ap2-mod_perl/patches/patch-src_modules_perl_modperl_apache_compat_h
new file mode 100644
index 00000000000..cf383c0bfce
--- /dev/null
+++ b/www/ap2-mod_perl/patches/patch-src_modules_perl_modperl_apache_compat_h
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_modules_perl_modperl_apache_compat_h,v 1.1 2008/05/05 21:21:43 simon Exp $
+--- src/modules/perl/modperl_apache_compat.h.orig	Fri May  2 22:44:18 2008
++++ src/modules/perl/modperl_apache_compat.h	Fri May  2 22:44:43 2008
+@@ -22,6 +22,7 @@
+ #if !APR_HAS_THREADS
+ typedef unsigned long apr_os_thread_t;
+ typedef void * apr_thread_mutex_t;
++typedef void * apr_thread_rwlock_t;
+ #endif
+ 
+ /* back compat adjustements for older Apache versions