Re: update pcre2 MASTER_SITES

On Thu, Jan 31 2019, Stuart Henderson <stu@spacehopper.org> wrote:
> On 2019/01/31 18:35, Jeremie Courreges-Anglas wrote:
>> > What does 3.0 mean in "0.1 # 3.0" mean?
>>
>> It's what would have been used by the build system if we had not
>> overriden the version number in ports.
>>
>> > I see that 0.1 is major.minor.
>> > ${WRKBUILD}/shared_libs.log can be included in the port's Makefile. Is
>> > this only useful in initially drafting a new port and not so much in
>> > updating a port?
>>
>> It's not even useful when starting a port, since we completely ignore
>> upstream's choices and start at 0.0. I try to update those markers when
>> I can, but I think it's usually a lost cause. Some upstreams don't
>> properly bump the major/minor when due, and some upstreams bump the
>> major/minor even when not needed. So a porter has to make her own
>> checks anyway, and the marker has little value.
>
> In cases where the upstream does follow the rules, a bump there can be a
> useful indication that they've changed something which the porter might
> not have noticed (it's fairly common for people to take shortcuts and
> just check for new/removed symbols rather than looking at headers..)
> So I do try to keep these up to date.

I just doubt that people who like shortcuts and don't do a thorough
symbols + includes check will notice a change in shared_libs.log, but
YMMV. :)

Here's a proposal to unbreak the test. The idea is not to add yet
another hardcoded, os-specific workaround in that script, but to run all
tests even if that means a TEST_DEPENDS. I won't insist if people
prefer another approach, though.

ok?


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/pcre2/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 31 Jan 2019 17:40:30 -0000 1.8
+++ Makefile 31 Jan 2019 17:59:52 -0000
@@ -25,6 +25,7 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += bz2 c curses readline z

LIB_DEPENDS = archivers/bzip2
+TEST_DEPENDS = textproc/gsed

CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --enable-pcre2-16 \
Index: patches/patch-RunGrepTest
===================================================================
RCS file: patches/patch-RunGrepTest
diff -N patches/patch-RunGrepTest
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-RunGrepTest 31 Jan 2019 17:59:53 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Our sed(1) doesn't cope with NUL bytes and \x00-style notation.
+
+Index: RunGrepTest
+--- RunGrepTest.orig
++++ RunGrepTest
+@@ -723,7 +723,7 @@ printf '%c--------------------------- Test N7 --------
+ uname=`uname`
+ if [ "$uname" != "SunOS" -a "$uname" != "Darwin" ] ; then
+ printf 'abc\0def' >testNinputgrep
+- $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep | sed 's/\x00/ZERO/' >>testtrygrep
++ $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep | gsed 's/\x00/ZERO/' >>testtrygrep
+ echo "" >>testtrygrep
+ else
+ echo '1:abcZERO2:def' >>testtrygrep


--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE