From ba3e33c3fc8e7659545653ab3cab4e8681df153f Mon Sep 17 00:00:00 2001
From: "Philip M. Gollucci" <pgollucci@FreeBSD.org>
Date: Thu, 3 Jun 2010 05:06:38 +0000
Subject: - Fix the build after the  pcre changes to www/apache20

  From www/apache20 cvs log:
  - There is a small chance you will need to change some of your custom modules
    to adapt to the ap_regex_t and ap_regmatch_t api changes.

- This will work with apr0, apr1, www/apache20 and www/apache22 despite
  despite the author's notiion it has something to do with the Debian Os.

Reported by:    pointy hat (via pav)
With Hat:       apache@
---
 www/mod_vhs/files/patch-mod_vhs.c | 71 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 www/mod_vhs/files/patch-mod_vhs.c

(limited to 'www/mod_vhs/files/patch-mod_vhs.c')

diff --git a/www/mod_vhs/files/patch-mod_vhs.c b/www/mod_vhs/files/patch-mod_vhs.c
new file mode 100644
index 000000000000..3cb800f50b2c
--- /dev/null
+++ b/www/mod_vhs/files/patch-mod_vhs.c
@@ -0,0 +1,71 @@
+--- ./mod_vhs.c.orig	2010-06-03 00:47:05.980134731 -0400
++++ ./mod_vhs.c	2010-06-03 00:48:23.301960660 -0400
+@@ -216,16 +216,7 @@
+ 	const char     *real;
+ 	const char     *fake;
+ 	char           *handler;
+-
+-#if APR_MAJOR_VERSION > 0
+-	ap_regex_t     *regexp;
+-#else
+-#ifdef DEBIAN
+ 	ap_regex_t     *regexp;
+-#else
+-	regex_t        *regexp;
+-#endif				/* DEBIAN */
+-#endif
+ 	int		redir_status;	/* 301, 302, 303, 410, etc... */
+ }		alias_entry;
+ 
+@@ -334,11 +325,7 @@
+ 	/* XX r can NOT be relative to DocumentRoot here... compat bug. */
+ 
+ 	if (use_regex) {
+-#ifdef DEBIAN
+ 		new->regexp = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED);
+-#else
+-		new->regexp = ap_pregcomp(cmd->pool, f, REG_EXTENDED);
+-#endif /* DEBIAN */
+ 		if (new->regexp == NULL)
+ 			return "Regular expression could not be compiled.";
+ 		new->real = r;
+@@ -403,15 +390,7 @@
+ 	vhs_config_rec *serverconf = ap_get_module_config(s->module_config,
+ 							  &vhs_module);
+ 	int		status = (int)(long)cmd->info;
+-#if APR_MAJOR_VERSION > 0
+ 	ap_regex_t     *r = NULL;
+-#else
+-#ifdef DEBIAN
+-	ap_regex_t     *r = NULL;
+-#else
+-	regex_t        *r = NULL;
+-#endif				/* DEBIAN */
+-#endif
+ 	const char     *f = arg2;
+ 	const char     *url = arg3;
+ 
+@@ -431,11 +410,7 @@
+ 	}
+ 
+ 	if (use_regex) {
+-#ifdef DEBIAN
+ 		r = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED);
+-#else
+-		r = ap_pregcomp(cmd->pool, f, REG_EXTENDED);
+-#endif /* DEBIAN */
+ 		if (r == NULL)
+ 			return "Regular expression could not be compiled.";
+ 	}
+@@ -531,11 +506,7 @@
+ 	       int doesc, int *status)
+ {
+ 	alias_entry    *entries = (alias_entry *) aliases->elts;
+-#ifdef DEBIAN
+ 	ap_regmatch_t	regm [AP_MAX_REG_MATCH];
+-#else
+-	regmatch_t	regm [AP_MAX_REG_MATCH];
+-#endif  /* DEBIAN */
+ 	char           *found = NULL;
+ 	int		i;
+ 
-- 
cgit v1.2.3