From c0984d7212423fec61910cec885222df29522d13 Mon Sep 17 00:00:00 2001 From: mm Date: Tue, 14 Feb 2012 12:44:23 +0000 Subject: Bump pcre library dependency due to 8.30 update Add (vendor) patch for deprecated pcre_info() --- www/httest/Makefile | 3 ++- www/httest/files/patch-src-regex.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 www/httest/files/patch-src-regex.c (limited to 'www/httest') diff --git a/www/httest/Makefile b/www/httest/Makefile index 82c76007b4f0..8a1c19444927 100644 --- a/www/httest/Makefile +++ b/www/httest/Makefile @@ -7,6 +7,7 @@ PORTNAME= httest PORTVERSION= 2.1.12 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF MASTER_SITE_SUBDIR= htt/htt2.1/${PORTNAME}-${PORTVERSION} @@ -15,7 +16,7 @@ MAINTAINER= mm@FreeBSD.org COMMENT= HTTP Test Tool LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1 \ - pcre.0:${PORTSDIR}/devel/pcre + pcre.1:${PORTSDIR}/devel/pcre LICENSE= AL2 diff --git a/www/httest/files/patch-src-regex.c b/www/httest/files/patch-src-regex.c new file mode 100644 index 000000000000..6536595245c9 --- /dev/null +++ b/www/httest/files/patch-src-regex.c @@ -0,0 +1,12 @@ +--- src/regex.c.orig 2012-02-14 10:50:10.169982096 +0100 ++++ src/regex.c 2012-02-14 10:51:09.360982595 +0100 +@@ -88,7 +88,8 @@ + if (preg->re_pcre == NULL) + return NULL; + +- preg->re_nsub = pcre_info((const pcre *) preg->re_pcre, NULL, NULL); ++ pcre_fullinfo((const pcre *)preg->re_pcre, NULL, ++ PCRE_INFO_CAPTURECOUNT, &(preg->re_nsub)); + + apr_pool_cleanup_register(p, (void *) preg, regex_cleanup, + apr_pool_cleanup_null); -- cgit