[92840] trunk/dports/www/apache2

[ryandesign at macports.org]

Revision: 92840
          https://trac.macports.org/changeset/92840
Author:   ryandesign at macports.org
Date:     2012-05-08 18:36:40 -0700 (Tue, 08 May 2012)
Log Message:
-----------
apache2: fix build failure with pcre 8.30

Modified Paths:
--------------
    trunk/dports/www/apache2/Portfile

Added Paths:
-----------
    trunk/dports/www/apache2/files/patch-server-util_pcre.c.diff

Modified: trunk/dports/www/apache2/Portfile
===================================================================
--- trunk/dports/www/apache2/Portfile	2012-05-09 01:31:27 UTC (rev 92839)
+++ trunk/dports/www/apache2/Portfile	2012-05-09 01:36:40 UTC (rev 92840)
@@ -38,6 +38,7 @@
 conflicts           apache
 
 patchfiles          patch-docs-cgi-examples-printenv.diff \
+                    patch-server-util_pcre.c.diff \
                     libtool-tag.diff
 
 post-patch {

Added: trunk/dports/www/apache2/files/patch-server-util_pcre.c.diff
===================================================================
--- trunk/dports/www/apache2/files/patch-server-util_pcre.c.diff	                        (rev 0)
+++ trunk/dports/www/apache2/files/patch-server-util_pcre.c.diff	2012-05-09 01:36:40 UTC (rev 92840)
@@ -0,0 +1,22 @@
+https://issues.apache.org/bugzilla/show_bug.cgi?id=52623
+--- server/util_pcre.c.orig	2005-11-10 09:20:05.000000000 -0600
++++ server/util_pcre.c	2012-05-08 20:23:28.000000000 -0500
+@@ -128,6 +128,7 @@
+ const char *errorptr;
+ int erroffset;
+ int options = 0;
++int nsub;
+ 
+ if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS;
+ if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
+@@ -137,7 +138,9 @@
+ 
+ if (preg->re_pcre == NULL) return AP_REG_INVARG;
+ 
+-preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
++pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
++               PCRE_INFO_CAPTURECOUNT, &nsub);
++preg->re_nsub = nsub;
+ return 0;
+ }
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120508/979804dc/attachment.html>