Index: head/devel/monotone/Makefile
===================================================================
--- head/devel/monotone/Makefile	(revision 470358)
+++ head/devel/monotone/Makefile	(revision 470359)
@@ -1,63 +1,63 @@
 # Created by: Mark A. Wicks <mwicks@kettering.edu>
 # $FreeBSD$
 
 PORTNAME=	monotone
 PORTVERSION=	1.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel
 MASTER_SITES=	http://www.monotone.ca/downloads/${PORTVERSION}/
 
 MAINTAINER=	lapo@lapo.it
 COMMENT=	Distributed version control system with digital signatures
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libidn.so:dns/libidn \
 		libsqlite3.so:databases/sqlite3 \
 		libbotan-1.10.so:security/botan110
 
 SUB_FILES=	pkg-message
 USES=		cpe gmake iconv localbase lua:51 makeinfo perl5 \
 		pkgconfig python:run shebangfix tar:bzip2
 SHEBANG_FILES=	extra/mtn-hooks/monotone-ciabot.py
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 
 INFO=		monotone
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
 post-extract:
 	@${RM} ${WRKSRC}/monotone.info*
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s/REBUILD_NLS=true/REBUILD_NLS=false/g" \
 		-e "s/std::tr1::/std::/g" \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 		-e "s/std::tr1::/std::/g" \
 		${WRKSRC}/src/hash_map.hh
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -Ee '/^install-(contrib|examples)-data:/{' -e 'n' -e 'd' -e '}' ${WRKSRC}/Makefile.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_mtn
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/monotone/files/patch-src_pcrewrap.cc
===================================================================
--- head/devel/monotone/files/patch-src_pcrewrap.cc	(nonexistent)
+++ head/devel/monotone/files/patch-src_pcrewrap.cc	(revision 470359)
@@ -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;

Property changes on: head/devel/monotone/files/patch-src_pcrewrap.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/monotone/files/patch-src_pcrewrap.hh
===================================================================
--- head/devel/monotone/files/patch-src_pcrewrap.hh	(nonexistent)
+++ head/devel/monotone/files/patch-src_pcrewrap.hh	(revision 470359)
@@ -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

Property changes on: head/devel/monotone/files/patch-src_pcrewrap.hh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property