From fa66eb42d0bd2fec7b364644684e6a4cc9ae9baa Mon Sep 17 00:00:00 2001 From: Matija Skala <msk...@gmx.com> Date: Thu, 28 Nov 2019 19:24:42 +0100 Subject: [PATCH] add support for versions with '-' before a/b/rc
--- usr.bin/pkg-config/pkg-config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/pkg-config/pkg-config b/usr.bin/pkg-config/pkg-config index 6dfbd3224eb..c050e9b058e 100644 --- a/usr.bin/pkg-config/pkg-config +++ b/usr.bin/pkg-config/pkg-config @@ -674,13 +674,13 @@ sub compare # is there a valid non-numeric suffix to deal with later? # accepted are (in order): a(lpha) < b(eta) < rc < ' '. # suffix[0] is the 'alpha' part, suffix[1] is the '1' part in 'alpha1'. - if ($a =~ s/(rc|beta|b|alpha|a)(\d+)$//) { + if ($a =~ s/-?(rc|beta|b|alpha|a)(\d+)$//) { say_debug("valid suffix $1$2 found in $a$1$2."); $suffix_a[0] = $1; $suffix_a[1] = $2; } - if ($b =~ s/(rc|beta|b|alpha|a)(\d+)$//) { + if ($b =~ s/-?(rc|beta|b|alpha|a)(\d+)$//) { say_debug("valid suffix $1$2 found in $b$1$2."); $suffix_b[0] = $1; $suffix_b[1] = $2;