From e2001a42a721f77f6595a6983db8c36991fb5470 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Fri, 22 Mar 2013 15:55:53 +0000
Subject: [PATCH] update to an svn snapshot of mod_perl. fix configure script
 for our shell.

---
 www/mod_perl/Makefile                      | 17 +++++++++--------
 www/mod_perl/distinfo                      |  7 ++-----
 www/mod_perl/patches/patch-apaci_configure | 12 ++++++++++++
 3 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 www/mod_perl/patches/patch-apaci_configure

diff --git a/www/mod_perl/Makefile b/www/mod_perl/Makefile
index fc27990576e..c39e21d61e0 100644
--- a/www/mod_perl/Makefile
+++ b/www/mod_perl/Makefile
@@ -1,13 +1,14 @@
-# $OpenBSD: Makefile,v 1.39 2013/03/11 11:44:43 espie Exp $
+# $OpenBSD: Makefile,v 1.40 2013/03/22 15:55:53 sthen Exp $
 
 COMMENT=	module that embeds a Perl interpreter into Apache
 
-DISTNAME=	mod_perl-1.31
-PKGNAME=	${DISTNAME}
-REVISION=	6
+DISTNAME=	mod_perl-1.32pre20130312
 CATEGORIES=	www perl5
-MASTER_SITES=	http://perl.apache.org/dist/ \
-		${MASTER_SITE_PERL_CPAN:=Apache/}
+
+# svn checkout; upstream is at http://perl.apache.org/dist/
+# or ${MASTER_SITE_PERL_CPAN:=Apache/} but is now mostly dead
+# for apache 1.x
+MASTER_SITES=	http://spacehopper.org/mirrors/
 
 HOMEPAGE=	http://perl.apache.org/
 
@@ -19,7 +20,8 @@ MODAPACHE_FILE=	${MODAPACHE_LOCATION}/libperl.so
 
 # Apache
 PERMIT_PACKAGE_CDROM=	Yes
-WANTLIB=		c m perl util 
+
+WANTLIB=		c m perl util
 
 RUN_DEPENDS=		devel/p5-Devel-Symdump \
 			www/p5-libwww \
@@ -32,7 +34,6 @@ NO_TEST=	Yes
 
 CONFIGURE_STYLE= perl
 CONFIGURE_ARGS=	USE_APXS="1" EVERYTHING="1" WITH_APXS="/usr/sbin/apxs"
-USE_GROFF =	Yes
 
 INSTALL_TARGET=	pure_install doc_install
 
diff --git a/www/mod_perl/distinfo b/www/mod_perl/distinfo
index 9d1750b9ae0..4e675242ed0 100644
--- a/www/mod_perl/distinfo
+++ b/www/mod_perl/distinfo
@@ -1,5 +1,2 @@
-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
+SHA256 (mod_perl-1.32pre20130312.tar.gz) = Tc2Zg4gmgXHjmd66dDT9uBMNFHXB9X3W0sD8QpeLO/A=
+SIZE (mod_perl-1.32pre20130312.tar.gz) = 390926
diff --git a/www/mod_perl/patches/patch-apaci_configure b/www/mod_perl/patches/patch-apaci_configure
new file mode 100644
index 00000000000..a3c83b9272e
--- /dev/null
+++ b/www/mod_perl/patches/patch-apaci_configure
@@ -0,0 +1,12 @@
+$OpenBSD: patch-apaci_configure,v 1.1 2013/03/22 15:55:53 sthen Exp $
+--- apaci/configure.orig	Wed Mar 20 21:28:50 2013
++++ apaci/configure	Wed Mar 20 21:31:08 2013
+@@ -42,7 +42,7 @@ for my_dir in $PATH; do
+     if test -f "$my_dir/apxs"; then
+         if test -x "$my_dir/apxs"; then
+             my_apxs="$my_dir/apxs"
+-            break 2
++            break
+         fi
+     fi
+ done