diff options
| author | mm <mm@FreeBSD.org> | 2012-02-14 20:44:23 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-02-14 20:44:23 +0800 |
| commit | c0984d7212423fec61910cec885222df29522d13 (patch) | |
| tree | 00d73aa4bb38b5978fae38bed5387611768195d4 /www/hypermail | |
| parent | 1a52b304772d7d32b726994f9863e7666533c22c (diff) | |
| download | freebsd-ports-gnome-c0984d7212423fec61910cec885222df29522d13.tar.gz freebsd-ports-gnome-c0984d7212423fec61910cec885222df29522d13.tar.zst freebsd-ports-gnome-c0984d7212423fec61910cec885222df29522d13.zip | |
Bump pcre library dependency due to 8.30 update
Add (vendor) patch for deprecated pcre_info()
Diffstat (limited to 'www/hypermail')
| -rw-r--r-- | www/hypermail/Makefile | 4 | ||||
| -rw-r--r-- | www/hypermail/files/patch-src-pcre-pcreposix.c | 12 | ||||
| -rw-r--r-- | www/hypermail/files/patch-src-pcre-pcretest.c | 27 |
3 files changed, 41 insertions, 2 deletions
diff --git a/www/hypermail/Makefile b/www/hypermail/Makefile index 86c6c97dead0..9edebffc203e 100644 --- a/www/hypermail/Makefile +++ b/www/hypermail/Makefile @@ -7,7 +7,7 @@ PORTNAME= hypermail PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www mail MASTER_SITES= SF @@ -15,7 +15,7 @@ MAINTAINER= dan@langille.org COMMENT= A program to generate a cross-referenced HTML mail archive LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm \ - pcre.0:${PORTSDIR}/devel/pcre + pcre.1:${PORTSDIR}/devel/pcre GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-htmldir=${PREFIX}/share/doc/hypermail \ diff --git a/www/hypermail/files/patch-src-pcre-pcreposix.c b/www/hypermail/files/patch-src-pcre-pcreposix.c new file mode 100644 index 000000000000..415d4f4746fa --- /dev/null +++ b/www/hypermail/files/patch-src-pcre-pcreposix.c @@ -0,0 +1,12 @@ +--- src/pcre/pcreposix.c.orig 2003-07-03 20:04:06.000000000 +0200 ++++ src/pcre/pcreposix.c 2012-02-14 12:49:55.077985140 +0100 +@@ -217,7 +217,8 @@ + + if (preg->re_pcre == NULL) return pcre_posix_error_code(errorptr); + +-preg->re_nsub = pcre_info(preg->re_pcre, NULL, NULL); ++pcre_fullinfo((const pcre *)preg->re_pcre, NULL, ++ PCRE_INFO_CAPTURECOUNT, &(preg->re_nsub)); + return 0; + } + diff --git a/www/hypermail/files/patch-src-pcre-pcretest.c b/www/hypermail/files/patch-src-pcre-pcretest.c new file mode 100644 index 000000000000..389e9cb8e1b5 --- /dev/null +++ b/www/hypermail/files/patch-src-pcre-pcretest.c @@ -0,0 +1,27 @@ +--- src/pcre/pcretest.c.orig 2012-02-14 12:36:59.560983755 +0100 ++++ src/pcre/pcretest.c 2012-02-14 12:45:15.056415687 +0100 +@@ -748,24 +748,6 @@ + new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount); + new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable); + +- old_count = pcre_info(re, &old_options, &old_first_char); +- if (count < 0) fprintf(outfile, +- "Error %d from pcre_info()\n", count); +- else +- { +- if (old_count != count) fprintf(outfile, +- "Count disagreement: pcre_fullinfo=%d pcre_info=%d\n", count, +- old_count); +- +- if (old_first_char != first_char) fprintf(outfile, +- "First char disagreement: pcre_fullinfo=%d pcre_info=%d\n", +- first_char, old_first_char); +- +- if (old_options != (int)get_options) fprintf(outfile, +- "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n", +- get_options, old_options); +- } +- + if (size != gotten_store) fprintf(outfile, + "Size disagreement: pcre_fullinfo=%d call to malloc for %d\n", + size, gotten_store); |