Date: Sat, 19 May 2018 06:54:55 +0000 (UTC) From: Kirill Ponomarev <krion@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470359 - in head/devel/monotone: . files Message-ID: <201805190654.w4J6stV1009855@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: krion Date: Sat May 19 06:54:54 2018 New Revision: 470359 URL: https://svnweb.freebsd.org/changeset/ports/470359 Log: Fix build with pcre 8.42 PR: 220613 Submitted by: maintainer Added: head/devel/monotone/files/patch-src_pcrewrap.cc (contents, props changed) head/devel/monotone/files/patch-src_pcrewrap.hh (contents, props changed) Modified: head/devel/monotone/Makefile Modified: head/devel/monotone/Makefile ============================================================================== --- head/devel/monotone/Makefile Sat May 19 06:54:14 2018 (r470358) +++ head/devel/monotone/Makefile Sat May 19 06:54:54 2018 (r470359) @@ -3,7 +3,7 @@ PORTNAME= monotone PORTVERSION= 1.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel MASTER_SITES= http://www.monotone.ca/downloads/${PORTVERSION}/ Added: head/devel/monotone/files/patch-src_pcrewrap.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/monotone/files/patch-src_pcrewrap.cc Sat May 19 06:54:54 2018 (r470359) @@ -0,0 +1,20 @@ +--- src/pcrewrap.cc.orig 2018-05-18 21:33:20 UTC ++++ src/pcrewrap.cc +@@ -74,7 +74,7 @@ get_capturecount(void const * bd) + namespace pcre + { + typedef map<char const *, +- pair<struct real_pcre const *, struct pcre_extra const *> > ++ pair<struct real_pcre8_or_16 const *, struct pcre_extra const *> > + regex_cache; + + class regex_cache_manager +@@ -86,7 +86,7 @@ namespace pcre (public) + } + + void store(char const * pattern, +- pair<struct real_pcre const *, struct pcre_extra const *> ++ pair<struct real_pcre8_or_16 const *, struct pcre_extra const *> + data) + { + cache[pattern] = data; Added: head/devel/monotone/files/patch-src_pcrewrap.hh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/monotone/files/patch-src_pcrewrap.hh Sat May 19 06:54:54 2018 (r470359) @@ -0,0 +1,20 @@ +--- src/pcrewrap.hh.orig 2018-05-18 21:33:29 UTC ++++ src/pcrewrap.hh +@@ -18,7 +18,7 @@ + // definitions and so we don't actually expose it here. Unfortunately, this + // means we have to hope this pair of forward declarations will not change... + +-struct real_pcre; ++struct real_pcre8_or_16; + struct pcre_extra; + + namespace pcre +@@ -61,7 +61,7 @@ namespace pcre + regex & operator=(regex const &); + + // data +- struct real_pcre const * basedat; ++ struct real_pcre8_or_16 const * basedat; + struct pcre_extra const * extradat; + + // used by constructors
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805190654.w4J6stV1009855>