diff --git a/devel/pcre2/Makefile b/devel/pcre2/Makefile index 66ef4f909a30..c9a14faf6b57 100644 --- a/devel/pcre2/Makefile +++ b/devel/pcre2/Makefile @@ -1,85 +1,81 @@ # Created by: Mark Felder PORTNAME= pcre2 -PORTVERSION= 10.39 -PORTREVISION= 1 +PORTVERSION= 10.40 CATEGORIES= devel +MASTER_SITES= https://github.com/PCRE2Project/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/ MAINTAINER= krion@FreeBSD.org COMMENT= Perl Compatible Regular Expressions library, version 2 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENCE -USES= autoreconf cpe libtool pkgconfig +USES= autoreconf cpe libtool pkgconfig tar:bz2 CPE_VENDOR= pcre -USE_GITHUB= yes -GH_ACCOUNT= PhilipHazel -GH_TAGNAME= 35fee41 - USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-pcre2-16 \ --enable-pcre2-32 INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS OPTIONS_RADIO= CLI OPTIONS_RADIO_CLI= LIBEDIT READLINE LIBEDIT_USES= libedit LIBEDIT_CONFIGURE_ENABLE= pcre2test-libedit READLINE_USES= readline READLINE_CONFIGURE_ENABLE= pcre2test-libreadline .include .if ${ARCH} != "sparc64" && ${ARCH:Mmips64*} == "" && ${ARCH:Mriscv64*} == "" CONFIGURE_ARGS+= --enable-jit .else CONFIGURE_ARGS+= --disable-jit .endif .if ${PORT_OPTIONS:MDOCS} PORTDOCS= * .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 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 #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 do-test: @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 diff --git a/devel/pcre2/distinfo b/devel/pcre2/distinfo index 16b8dd8d4a20..0ab535aaee6d 100644 --- a/devel/pcre2/distinfo +++ b/devel/pcre2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635843393 -SHA256 (PhilipHazel-pcre2-10.39-35fee41_GH0.tar.gz) = 601e9a5ebe3245711c5ba5fb597e3b4008a41fa9c10aea28d2548133754622b3 -SIZE (PhilipHazel-pcre2-10.39-35fee41_GH0.tar.gz) = 2383154 +TIMESTAMP = 1651504783 +SHA256 (pcre2-10.40.tar.bz2) = 14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68 +SIZE (pcre2-10.40.tar.bz2) = 1765440 diff --git a/devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h b/devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h index 96f61b289b02..7d14d71c3d86 100644 --- a/devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h +++ b/devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h @@ -1,11 +1,11 @@ ---- src/sljit/sljitConfigInternal.h.orig 2022-03-25 09:54:56 UTC +--- src/sljit/sljitConfigInternal.h.orig 2022-05-02 15:22:09 UTC +++ src/sljit/sljitConfigInternal.h -@@ -283,7 +283,7 @@ - /* Instruction cache flush. */ - /****************************/ - +@@ -333,7 +333,7 @@ extern "C" { + * beware APPLE is known to have removed the code in iOS so + * it will need to be excempted or result in broken builds + */ -#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin) +#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin && !defined SLJIT_CONFIG_PPC_32) - #if __has_builtin(__builtin___clear_cache) + #if __has_builtin(__builtin___clear_cache) && !defined(__clang__) - #define SLJIT_CACHE_FLUSH(from, to) \ + /* diff --git a/devel/pcre2/pkg-plist b/devel/pcre2/pkg-plist index 949f0f3c8971..542541b41d3f 100644 --- a/devel/pcre2/pkg-plist +++ b/devel/pcre2/pkg-plist @@ -1,119 +1,119 @@ bin/pcre2-config bin/pcre2grep bin/pcre2test include/pcre2.h include/pcre2posix.h lib/libpcre2-16.a lib/libpcre2-16.so lib/libpcre2-16.so.0 -lib/libpcre2-16.so.0.10.4 +lib/libpcre2-16.so.0.11.0 lib/libpcre2-32.a lib/libpcre2-32.so lib/libpcre2-32.so.0 -lib/libpcre2-32.so.0.10.4 +lib/libpcre2-32.so.0.11.0 lib/libpcre2-8.a lib/libpcre2-8.so lib/libpcre2-8.so.0 -lib/libpcre2-8.so.0.10.4 +lib/libpcre2-8.so.0.11.0 lib/libpcre2-posix.a lib/libpcre2-posix.so lib/libpcre2-posix.so.3 -lib/libpcre2-posix.so.3.0.1 +lib/libpcre2-posix.so.3.0.2 libdata/pkgconfig/libpcre2-16.pc libdata/pkgconfig/libpcre2-32.pc libdata/pkgconfig/libpcre2-8.pc libdata/pkgconfig/libpcre2-posix.pc man/man1/pcre2-config.1.gz man/man1/pcre2grep.1.gz man/man1/pcre2test.1.gz man/man3/pcre2.3.gz man/man3/pcre2_callout_enumerate.3.gz man/man3/pcre2_code_copy.3.gz man/man3/pcre2_code_copy_with_tables.3.gz man/man3/pcre2_code_free.3.gz man/man3/pcre2_compile.3.gz man/man3/pcre2_compile_context_copy.3.gz man/man3/pcre2_compile_context_create.3.gz man/man3/pcre2_compile_context_free.3.gz man/man3/pcre2_config.3.gz man/man3/pcre2_convert_context_copy.3.gz man/man3/pcre2_convert_context_create.3.gz man/man3/pcre2_convert_context_free.3.gz man/man3/pcre2_converted_pattern_free.3.gz man/man3/pcre2_dfa_match.3.gz man/man3/pcre2_general_context_copy.3.gz man/man3/pcre2_general_context_create.3.gz man/man3/pcre2_general_context_free.3.gz man/man3/pcre2_get_error_message.3.gz man/man3/pcre2_get_mark.3.gz man/man3/pcre2_get_match_data_size.3.gz man/man3/pcre2_get_ovector_count.3.gz man/man3/pcre2_get_ovector_pointer.3.gz man/man3/pcre2_get_startchar.3.gz man/man3/pcre2_jit_compile.3.gz man/man3/pcre2_jit_free_unused_memory.3.gz man/man3/pcre2_jit_match.3.gz man/man3/pcre2_jit_stack_assign.3.gz man/man3/pcre2_jit_stack_create.3.gz man/man3/pcre2_jit_stack_free.3.gz man/man3/pcre2_maketables.3.gz man/man3/pcre2_maketables_free.3.gz man/man3/pcre2_match.3.gz man/man3/pcre2_match_context_copy.3.gz man/man3/pcre2_match_context_create.3.gz man/man3/pcre2_match_context_free.3.gz man/man3/pcre2_match_data_create.3.gz man/man3/pcre2_match_data_create_from_pattern.3.gz man/man3/pcre2_match_data_free.3.gz man/man3/pcre2_pattern_convert.3.gz man/man3/pcre2_pattern_info.3.gz man/man3/pcre2_serialize_decode.3.gz man/man3/pcre2_serialize_encode.3.gz man/man3/pcre2_serialize_free.3.gz man/man3/pcre2_serialize_get_number_of_codes.3.gz man/man3/pcre2_set_bsr.3.gz man/man3/pcre2_set_callout.3.gz man/man3/pcre2_set_character_tables.3.gz man/man3/pcre2_set_compile_extra_options.3.gz man/man3/pcre2_set_compile_recursion_guard.3.gz man/man3/pcre2_set_depth_limit.3.gz man/man3/pcre2_set_glob_escape.3.gz man/man3/pcre2_set_glob_separator.3.gz man/man3/pcre2_set_heap_limit.3.gz man/man3/pcre2_set_match_limit.3.gz man/man3/pcre2_set_max_pattern_length.3.gz man/man3/pcre2_set_newline.3.gz man/man3/pcre2_set_offset_limit.3.gz man/man3/pcre2_set_parens_nest_limit.3.gz man/man3/pcre2_set_recursion_limit.3.gz man/man3/pcre2_set_recursion_memory_management.3.gz man/man3/pcre2_set_substitute_callout.3.gz man/man3/pcre2_substitute.3.gz man/man3/pcre2_substring_copy_byname.3.gz man/man3/pcre2_substring_copy_bynumber.3.gz man/man3/pcre2_substring_free.3.gz man/man3/pcre2_substring_get_byname.3.gz man/man3/pcre2_substring_get_bynumber.3.gz man/man3/pcre2_substring_length_byname.3.gz man/man3/pcre2_substring_length_bynumber.3.gz man/man3/pcre2_substring_list_free.3.gz man/man3/pcre2_substring_list_get.3.gz man/man3/pcre2_substring_nametable_scan.3.gz man/man3/pcre2_substring_number_from_name.3.gz man/man3/pcre2api.3.gz man/man3/pcre2build.3.gz man/man3/pcre2callout.3.gz man/man3/pcre2compat.3.gz man/man3/pcre2convert.3.gz man/man3/pcre2demo.3.gz man/man3/pcre2jit.3.gz man/man3/pcre2limits.3.gz man/man3/pcre2matching.3.gz man/man3/pcre2partial.3.gz man/man3/pcre2pattern.3.gz man/man3/pcre2perform.3.gz man/man3/pcre2posix.3.gz man/man3/pcre2sample.3.gz man/man3/pcre2serialize.3.gz man/man3/pcre2syntax.3.gz man/man3/pcre2unicode.3.gz