On 2023/09/25 20:25, Klemens Nanni wrote:
> On Mon, Sep 25, 2023 at 12:42:57PM -0700, JR Aquino wrote:
> > Attaching a very simple fix for the security/argon2 port where pkg-config
> > data is not properly recording the version data by setting the
> > ARGON2_VERSION value as one of the MAKE_FLAGS.
> >
> > Current behavior is breaking dependency checks for other software that
> > attempts to inspect version info:
>
> Cc'ing maintainer of the port and bumping revision as your diff changes
> the package's contents.
>
> This indeed fixes it, thanks.
> OK kn
Please add a comment next to GH_TAGNAME at the top of the file like
# GH_TAGNAME used in MAKE_FLAGS
that way it is obvious for anyone who might change to GH_COMMIT or
DIST_TUPLE.
then it is OK
>
> Index: security/argon2/Makefile
> ===================================================================
> RCS file: /cvs/ports/security/argon2/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- security/argon2/Makefile 11 Mar 2022 19:53:17 -0000 1.4
> +++ security/argon2/Makefile 25 Sep 2023 20:22:45 -0000
> @@ -4,6 +4,7 @@ GH_ACCOUNT = P-H-C
> GH_PROJECT = phc-winner-argon2
> GH_TAGNAME = 20190702
> DISTNAME = argon2-${GH_TAGNAME}
> +REVISION = 0
>
> SHARED_LIBS += argon2 0.0 # 0.0
>
> @@ -17,7 +18,8 @@ PERMIT_PACKAGE = Yes
> WANTLIB += c pthread
>
> MAKE_FLAGS = CC="$(CC)" INSTALL="$(INSTALL)" OPTTARGET=none \
> - PREFIX="${TRUEPREFIX}"
> ABI_VERSION="${LIBargon2_VERSION}"
> + PREFIX="${TRUEPREFIX}"
> ABI_VERSION="${LIBargon2_VERSION}" \
> + ARGON2_VERSION="${GH_TAGNAME}"
> TEST_FLAGS = OPTTARGET=none
>
> USE_GMAKE = Yes
>
