Giovanni Bechis writes: > On Wed, Feb 12, 2020 at 06:26:35PM +0000, Stuart Henderson wrote: >> On 2020/02/12 13:15, Giovanni Bechis wrote: >> > Update to latest version, ok ? comments ? >> >> Please run update-patches, update-plist, and bump the shared library minor >> versions for all libraries. >> > new diff follows
Thank you for the update. It looks good except for some nits. Here is a diff that: - resyncs shared_libs.log to the # numbers. - keeps pcre2-posix as is, as I did not see a reason to bump it. (I do see the new functions for the other minor bumps.) 19. Implemented pcre2_get_match_data_size(). 28. Add the pcre2_maketables_free() function. from Changelog https://www.pcre.org/changelog.txt 22. Corrected pcre2_set_character_tables() tables data type: was const unsigned char * instead of const uint8_t *, as generated by pcre2_maketables(). pcre2_set_character_tables(pcre2_compile_context *, const unsigned char *); pcre2_set_character_tables(pcre2_compile_context *, const uint8_t *); \ All arches define: ./amd64/include/_types.h:typedef unsigned char __uint8_t; "If a type changes in an incompatible way, the library major number must be bumped." This seems like the type was changed in a compatible way, so I agree that a major bump is not necessary. I tested against net/wget and shells/fish with runtime testing and they work. Index: Makefile =================================================================== RCS file: /cvs/ports/devel/pcre2/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile 12 Jul 2019 20:45:15 -0000 1.11 +++ Makefile 13 Feb 2020 10:06:10 -0000 @@ -2,12 +2,12 @@ COMMENT = perl-compatible regular expression library, version 2 -DISTNAME = pcre2-10.33 +DISTNAME = pcre2-10.34 -SHARED_LIBS += pcre2-16 0.3 # 8.0 -SHARED_LIBS += pcre2-32 0.3 # 8.0 -SHARED_LIBS += pcre2-8 0.4 # 8.0 -SHARED_LIBS += pcre2-posix 0.3 # 2.2 +SHARED_LIBS += pcre2-16 0.4 # 9.0 +SHARED_LIBS += pcre2-32 0.4 # 9.0 +SHARED_LIBS += pcre2-8 0.5 # 9.0 +SHARED_LIBS += pcre2-posix 0.3 # 2.3 CATEGORIES = devel Index: distinfo =================================================================== RCS file: /cvs/ports/devel/pcre2/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 1 May 2019 21:47:27 -0000 1.5 +++ distinfo 13 Feb 2020 10:06:10 -0000 @@ -1,2 +1,2 @@ -SHA256 (pcre2-10.33.tar.gz) = 4uKJmpdIn8atGwzD2nlSx8ypkbSg99tmSbddlyECXTE= -SIZE (pcre2-10.33.tar.gz) = 2234905 +SHA256 (pcre2-10.34.tar.gz) = 2mq6e6JQnpGOQfT3RKWfpBokJcWaKYojLn/oVpHgA3k= +SIZE (pcre2-10.34.tar.gz) = 2271533 Index: patches/patch-RunGrepTest =================================================================== RCS file: /cvs/ports/devel/pcre2/patches/patch-RunGrepTest,v retrieving revision 1.2 diff -u -p -r1.2 patch-RunGrepTest --- patches/patch-RunGrepTest 1 May 2019 21:47:27 -0000 1.2 +++ patches/patch-RunGrepTest 13 Feb 2020 10:06:10 -0000 @@ -5,7 +5,7 @@ Our sed(1) doesn't cope with NUL bytes a Index: RunGrepTest --- RunGrepTest.orig +++ RunGrepTest -@@ -723,9 +723,9 @@ $valgrind $vjs $pcre2grep -n --newline=anycrlf "^(abc| +@@ -740,9 +740,9 @@ $valgrind $vjs $pcre2grep -n --newline=anycrlf "^(abc| printf '%c--------------------------- Test N7 ------------------------------\r\n' - >>testtrygrep uname=`uname` case $uname in Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/pcre2/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 1 May 2019 21:47:27 -0000 1.4 +++ pkg/PLIST 13 Feb 2020 10:06:10 -0000 @@ -4,16 +4,16 @@ bin/pcre2-config @bin bin/pcre2test include/pcre2.h include/pcre2posix.h -lib/libpcre2-16.a +@static-lib lib/libpcre2-16.a lib/libpcre2-16.la @lib lib/libpcre2-16.so.${LIBpcre2-16_VERSION} -lib/libpcre2-32.a +@static-lib lib/libpcre2-32.a lib/libpcre2-32.la @lib lib/libpcre2-32.so.${LIBpcre2-32_VERSION} -lib/libpcre2-8.a +@static-lib lib/libpcre2-8.a lib/libpcre2-8.la @lib lib/libpcre2-8.so.${LIBpcre2-8_VERSION} -lib/libpcre2-posix.a +@static-lib lib/libpcre2-posix.a lib/libpcre2-posix.la @lib lib/libpcre2-posix.so.${LIBpcre2-posix_VERSION} lib/pkgconfig/libpcre2-16.pc @@ -43,6 +43,7 @@ lib/pkgconfig/libpcre2-posix.pc @man man/man3/pcre2_general_context_free.3 @man man/man3/pcre2_get_error_message.3 @man man/man3/pcre2_get_mark.3 +@man man/man3/pcre2_get_match_data_size.3 @man man/man3/pcre2_get_ovector_count.3 @man man/man3/pcre2_get_ovector_pointer.3 @man man/man3/pcre2_get_startchar.3 @@ -53,6 +54,7 @@ lib/pkgconfig/libpcre2-posix.pc @man man/man3/pcre2_jit_stack_create.3 @man man/man3/pcre2_jit_stack_free.3 @man man/man3/pcre2_maketables.3 +@man man/man3/pcre2_maketables_free.3 @man man/man3/pcre2_match.3 @man man/man3/pcre2_match_context_copy.3 @man man/man3/pcre2_match_context_create.3 @@ -144,6 +146,7 @@ share/doc/pcre2/html/pcre2_general_conte share/doc/pcre2/html/pcre2_general_context_free.html share/doc/pcre2/html/pcre2_get_error_message.html share/doc/pcre2/html/pcre2_get_mark.html +share/doc/pcre2/html/pcre2_get_match_data_size.html share/doc/pcre2/html/pcre2_get_ovector_count.html share/doc/pcre2/html/pcre2_get_ovector_pointer.html share/doc/pcre2/html/pcre2_get_startchar.html @@ -154,6 +157,7 @@ share/doc/pcre2/html/pcre2_jit_stack_ass share/doc/pcre2/html/pcre2_jit_stack_create.html share/doc/pcre2/html/pcre2_jit_stack_free.html share/doc/pcre2/html/pcre2_maketables.html +share/doc/pcre2/html/pcre2_maketables_free.html share/doc/pcre2/html/pcre2_match.html share/doc/pcre2/html/pcre2_match_context_copy.html share/doc/pcre2/html/pcre2_match_context_create.html
