Index: branches/2015Q2/devel/pcre/Makefile
===================================================================
--- branches/2015Q2/devel/pcre/Makefile	(revision 387090)
+++ branches/2015Q2/devel/pcre/Makefile	(revision 387091)
@@ -1,118 +1,117 @@
 # Created by: dom
 # $FreeBSD$
 
 PORTNAME=	pcre
-PORTVERSION=	8.35
-PORTREVISION=	2
+PORTVERSION=	8.37
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
 		ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/ \
 		ftp://ftp.fu-berlin.de/unix/misc/%SUBDIR%/ \
 		ftp://ftp.tin.org/pub/libs/%SUBDIR%/
 MASTER_SITE_SUBDIR=${PORTNAME}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Perl Compatible Regular Expressions library
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 GNU_CONFIGURE=	yes
 USES=		libtool pathfix tar:bzip2
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-utf --enable-unicode-properties \
 		--enable-pcre8 --enable-pcre16 --enable-pcre32
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		DOCS LIBEDIT READLINE STACK_RECURSION
 OPTIONS_DEFAULT=	STACK_RECURSION
 
 STACK_RECURSION_DESC=	Use the stack for recursion during matching
 
 LIBEDIT_CONFIGURE_ENABLE=	pcretest-libedit
 
 READLINE_USES=			readline
 READLINE_CONFIGURE_ENABLE=	pcretest-libreadline
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} != "sparc64" && ${ARCH} != "ia64" && ${ARCH:Mmips64*} == ""
 CONFIGURE_ARGS+=	--enable-jit
 .else
 CONFIGURE_ARGS+=	--disable-jit
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 .endif
 
 # Using the heap rather than the stack for recursion is slower but less
 # prone to segfaults from stack exhaustion when matching certain patterns
 .if !${PORT_OPTIONS:MSTACK_RECURSION}
 CONFIGURE_ARGS+=	--disable-stack-for-recursion
 .endif
 
 # libedit
 .if ${PORT_OPTIONS:MLIBEDIT}
 CFLAGS+=	-I /usr/include/edit
 .endif
 
 # Optional knobs that accept positive integer parameters (see pcrebuild(3)):
 
 # Allow the use of very large patterns (> 64K) with the 8- and 16-bit
 # libraries, at the expense of longer load times (possible values:
 # 2 (default), 3, and 4):
 .if defined(WITH_LINK_SIZE)
 CONFIGURE_ARGS+=	--with-link-size=${WITH_LINK_SIZE}
 .endif
 
 # Control PCRE resource use by limiting the default number of times pcre_exec()
 # can call match() during a single operation (default: 10 million):
 .if defined(WITH_MATCH_LIMIT)
 CONFIGURE_ARGS+=	--with-match-limit=${WITH_MATCH_LIMIT}
 .endif
 
 # Control PCRE resource use by limiting the default number of times pcre_exec()
 # can call match() recursively during a single operation (default: 10 million):
 .if defined(WITH_MATCH_LIMIT_RECURSION)
 CONFIGURE_ARGS+=	--with-match-limit-recursion=${WITH_MATCH_LIMIT_RECURSION}
 .endif
 
 # Control PCRE resource use by limiting the nesting depth of parentheses in
 # patterns compiled with pcre_compile() (default: 250):
 .if defined(WITH_PARENS_NEST_LIMIT)
 CONFIGURE_ARGS+=	--with-parens-nest-limit=${WITH_PARENS_NEST_LIMIT}
 .endif
 
 # Adjust the default maximum number of substrings that will be stored on the stack
 # when the 8-bit library is called via the POSIX interface (default: 10):
 .if defined(WITH_POSIX_MALLOC_THRESHOLD)
 CONFIGURE_ARGS+=	--with-posix-malloc-threshold=${WITH_POSIX_MALLOC_THRESHOLD}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "/^\.rs/d" ${WRKSRC}/doc/*.3 ${WRKSRC}/doc/*.1
 	@${REINPLACE_CMD} -e "s/£//g" ${WRKSRC}/doc/pcre_compile2.3
 .if !${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -E -e '/^install-data-am/,/^$$/ s,install-(dist_doc|dist_html|html)DATA,,g' \
 		${WRKSRC}/Makefile.in
 .endif
 
 #prevent regression test coredumps from causing failures on the
 #package-building cluster:
 .ifndef(MAINTAINER_MODE)
 CORELIMIT?=	/usr/bin/limits -Sc 0
 .endif
 TESTLOGS?=	RunGrepTest RunTest pcre_jit_test pcre_scanner_unittest \
 		pcre_stringpiece_unittest pcrecpp_unittest
 
 post-stage:
 	${LN} -s libpcre.so.1 ${STAGEDIR}${PREFIX}/lib/libpcre.so.3
 
 check regression-test test: build
 	@cd ${WRKSRC} ; \
 	${SETENV} ${MAKE_ENV} ${CORELIMIT} ${MAKE_CMD} ${MAKE_ARGS} check ; \
 	for _l in ${TESTLOGS} ; do if ${TEST} -f $${_l}.log ; then \
 	${PRINTF} "\n\n$${_l}.log\n\n\n" ; ${CAT} $${_l}.log ; fi ; done
 
 .include <bsd.port.mk>
Index: branches/2015Q2/devel/pcre/distinfo
===================================================================
--- branches/2015Q2/devel/pcre/distinfo	(revision 387090)
+++ branches/2015Q2/devel/pcre/distinfo	(revision 387091)
@@ -1,2 +1,2 @@
-SHA256 (pcre-8.35.tar.bz2) = a961c1c78befef263cc130756eeca7b674b4e73a81533293df44e4265236865b
-SIZE (pcre-8.35.tar.bz2) = 1522220
+SHA256 (pcre-8.37.tar.bz2) = 51679ea8006ce31379fb0860e46dd86665d864b5020fc9cd19e71260eef4789d
+SIZE (pcre-8.37.tar.bz2) = 1557603
Index: branches/2015Q2/devel/pcre/files/patch-configure
===================================================================
--- branches/2015Q2/devel/pcre/files/patch-configure	(nonexistent)
+++ branches/2015Q2/devel/pcre/files/patch-configure	(revision 387091)
@@ -0,0 +1,13 @@
+--- configure.orig	2015-04-28 11:17:21 UTC
++++ configure
+@@ -14090,8 +14090,8 @@ striplib=
+ old_striplib=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+ $as_echo_n "checking whether stripping libraries is possible... " >&6; }
+-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null ||
++   test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
+   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }

Property changes on: branches/2015Q2/devel/pcre/files/patch-configure
___________________________________________________________________
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: branches/2015Q2/devel/pcre/pkg-plist
===================================================================
--- branches/2015Q2/devel/pcre/pkg-plist	(revision 387090)
+++ branches/2015Q2/devel/pcre/pkg-plist	(revision 387091)
@@ -1,138 +1,138 @@
 bin/pcre-config
 bin/pcregrep
 bin/pcretest
 include/pcre.h
 include/pcreposix.h
 include/pcre_scanner.h
 include/pcre_stringpiece.h
 include/pcrecpparg.h
 include/pcrecpp.h
 lib/libpcre.a
 lib/libpcre.so
 lib/libpcre.so.1
-lib/libpcre.so.1.2.3
+lib/libpcre.so.1.2.5
 lib/libpcre.so.3
 lib/libpcre16.a
 lib/libpcre16.so
 lib/libpcre16.so.0
-lib/libpcre16.so.0.2.3
+lib/libpcre16.so.0.2.5
 lib/libpcre32.a
 lib/libpcre32.so
 lib/libpcre32.so.0
-lib/libpcre32.so.0.0.3
+lib/libpcre32.so.0.0.5
 lib/libpcrecpp.a
 lib/libpcrecpp.so
 lib/libpcrecpp.so.0
-lib/libpcrecpp.so.0.0.0
+lib/libpcrecpp.so.0.0.1
 lib/libpcreposix.a
 lib/libpcreposix.so
 lib/libpcreposix.so.0
-lib/libpcreposix.so.0.0.2
+lib/libpcreposix.so.0.0.3
 libdata/pkgconfig/libpcre.pc
 libdata/pkgconfig/libpcre16.pc
 libdata/pkgconfig/libpcre32.pc
 libdata/pkgconfig/libpcrecpp.pc
 libdata/pkgconfig/libpcreposix.pc
 man/man1/pcre-config.1.gz
 man/man1/pcregrep.1.gz
 man/man1/pcretest.1.gz
 man/man3/pcre.3.gz
 man/man3/pcre16.3.gz
 man/man3/pcre16_assign_jit_stack.3.gz
 man/man3/pcre16_compile.3.gz
 man/man3/pcre16_compile2.3.gz
 man/man3/pcre16_config.3.gz
 man/man3/pcre16_copy_named_substring.3.gz
 man/man3/pcre16_copy_substring.3.gz
 man/man3/pcre16_dfa_exec.3.gz
 man/man3/pcre16_exec.3.gz
 man/man3/pcre16_free_study.3.gz
 man/man3/pcre16_free_substring.3.gz
 man/man3/pcre16_free_substring_list.3.gz
 man/man3/pcre16_fullinfo.3.gz
 man/man3/pcre16_get_named_substring.3.gz
 man/man3/pcre16_get_stringnumber.3.gz
 man/man3/pcre16_get_stringtable_entries.3.gz
 man/man3/pcre16_get_substring.3.gz
 man/man3/pcre16_get_substring_list.3.gz
 man/man3/pcre16_jit_exec.3.gz
 man/man3/pcre16_jit_stack_alloc.3.gz
 man/man3/pcre16_jit_stack_free.3.gz
 man/man3/pcre16_maketables.3.gz
 man/man3/pcre16_pattern_to_host_byte_order.3.gz
 man/man3/pcre16_refcount.3.gz
 man/man3/pcre16_study.3.gz
 man/man3/pcre16_utf16_to_host_byte_order.3.gz
 man/man3/pcre16_version.3.gz
 man/man3/pcre32.3.gz
 man/man3/pcre32_assign_jit_stack.3.gz
 man/man3/pcre32_compile.3.gz
 man/man3/pcre32_compile2.3.gz
 man/man3/pcre32_config.3.gz
 man/man3/pcre32_copy_named_substring.3.gz
 man/man3/pcre32_copy_substring.3.gz
 man/man3/pcre32_dfa_exec.3.gz
 man/man3/pcre32_exec.3.gz
 man/man3/pcre32_free_study.3.gz
 man/man3/pcre32_free_substring.3.gz
 man/man3/pcre32_free_substring_list.3.gz
 man/man3/pcre32_fullinfo.3.gz
 man/man3/pcre32_get_named_substring.3.gz
 man/man3/pcre32_get_stringnumber.3.gz
 man/man3/pcre32_get_stringtable_entries.3.gz
 man/man3/pcre32_get_substring.3.gz
 man/man3/pcre32_get_substring_list.3.gz
 man/man3/pcre32_jit_exec.3.gz
 man/man3/pcre32_jit_stack_alloc.3.gz
 man/man3/pcre32_jit_stack_free.3.gz
 man/man3/pcre32_maketables.3.gz
 man/man3/pcre32_pattern_to_host_byte_order.3.gz
 man/man3/pcre32_refcount.3.gz
 man/man3/pcre32_study.3.gz
 man/man3/pcre32_utf32_to_host_byte_order.3.gz
 man/man3/pcre32_version.3.gz
 man/man3/pcre_assign_jit_stack.3.gz
 man/man3/pcre_compile.3.gz
 man/man3/pcre_compile2.3.gz
 man/man3/pcre_config.3.gz
 man/man3/pcre_copy_named_substring.3.gz
 man/man3/pcre_copy_substring.3.gz
 man/man3/pcre_dfa_exec.3.gz
 man/man3/pcre_exec.3.gz
 man/man3/pcre_free_study.3.gz
 man/man3/pcre_free_substring.3.gz
 man/man3/pcre_free_substring_list.3.gz
 man/man3/pcre_fullinfo.3.gz
 man/man3/pcre_get_named_substring.3.gz
 man/man3/pcre_get_stringnumber.3.gz
 man/man3/pcre_get_stringtable_entries.3.gz
 man/man3/pcre_get_substring.3.gz
 man/man3/pcre_get_substring_list.3.gz
 man/man3/pcre_jit_exec.3.gz
 man/man3/pcre_jit_stack_alloc.3.gz
 man/man3/pcre_jit_stack_free.3.gz
 man/man3/pcre_maketables.3.gz
 man/man3/pcre_pattern_to_host_byte_order.3.gz
 man/man3/pcre_refcount.3.gz
 man/man3/pcre_study.3.gz
 man/man3/pcre_utf16_to_host_byte_order.3.gz
 man/man3/pcre_utf32_to_host_byte_order.3.gz
 man/man3/pcre_version.3.gz
 man/man3/pcreapi.3.gz
 man/man3/pcrebuild.3.gz
 man/man3/pcrecallout.3.gz
 man/man3/pcrecompat.3.gz
 man/man3/pcrecpp.3.gz
 man/man3/pcredemo.3.gz
 man/man3/pcrejit.3.gz
 man/man3/pcrelimits.3.gz
 man/man3/pcrematching.3.gz
 man/man3/pcrepartial.3.gz
 man/man3/pcrepattern.3.gz
 man/man3/pcreperform.3.gz
 man/man3/pcreposix.3.gz
 man/man3/pcreprecompile.3.gz
 man/man3/pcresample.3.gz
 man/man3/pcrestack.3.gz
 man/man3/pcresyntax.3.gz
 man/man3/pcreunicode.3.gz
Index: branches/2015Q2
===================================================================
--- branches/2015Q2	(revision 387090)
+++ branches/2015Q2	(revision 387091)

Property changes on: branches/2015Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r387090