On Mon, Jul 10, 2017 at 06:53:39PM +0100, Stuart Henderson wrote:
> On 2017/07/10 19:49, Rafael Sadowski wrote:
> > > Personally I'd probably merge it all into security/qca and name
> > > it as qca-2.x.x, just get rid of qca2, then the only quirks entry
> > > would be one obsolete entry for qca-tls ...
> >
> > The idea is good and works for me:
> >
> > # -> pkg_info | grep qca
> > qca-1.0p8 Qt Cryptographic Architecture
> > qca-gnupg-2.0.0beta3 GnuPG plugin for QCA2
> > qca-ossl-2.0.0beta3p5 SSL/TLS plugin for QCA2
> > qca2-2.0.3p2 Qt Cryptographic Architecture
> >
> > # env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -u
> > qca-1.0p8+qca2-2.0.3p2->qca-2.1.3 forward dependencies:
> > | Dependency of qca-ossl-2.0.0beta3p5 on qca2-* doesn't match
> > | Dependency of qca-gnupg-2.0.0beta3 on qca2-* doesn't match
> > Merging qca-ossl-2.0.0beta3p5->2.1.3 (ok)
> > Merging qca-gnupg-2.0.0beta3->2.1.3 (ok)
> > qca-1.0p8+qca-gnupg-2.0.0beta3+qca-ossl-2.0.0beta3p5+qca2-2.0.3p2->qca-2.1.3+qca-gnupg-2.1.3+qca-ossl-2.1.3:
> > ok
> > Read shared items: ok
> >
> > # pkg_info | grep qca
> > qca-2.1.3 Qt Cryptographic Architecture for Qt4
> > qca-gnupg-2.1.3 GnuPG plugin
> > qca-ossl-2.1.3 SSL/TLS plugin
> >
> > I don't know if "Dependency of qca-ossl-2.0.0beta3p5 on qca2-* doesn't
> > match" noise is okay but it works with the (final) diff below.
>
> Yes, that's normal and expected.
>
> > When I get an OK I'll build all consumers again and commit.
>
> Perfect - I think it fits together much better this way.
> OK sthen@.
You still dont need that damn block:
.if ${BUILD_PACKAGES:M-ossl} || ${BUILD_PACKAGES:M-gnupg}
.endif
The dependencies in it should be merged with the others, and there's no
point in having theme after a .include bsd.arch.port.mk.
Landry
