On Sun, Jul 09, 2017 at 10:22:51PM +0200, Rafael Sadowski wrote:
> > > +@conflict qca-1*
> > > +@pkgpath security/qca
> >
> > I suppose you've tested the upgrade path :)
>
> This was the last task after final diff and it works with the main port:
>
> "qca2-2.0.3p2->2.1.3: ok"
>
> but not with the new flavors. I'm going crazy, I've tried so much but
> nothing works :( Any advice?
>
> Final diff below expect for the last old qca-{ossl,gnupg} ->
> qca2,{ossl,gnupg} update bits.
You dont need this .if/.endif, as since we removed the pseudo flavors we're
always building those pkgs - just merge the CONFIGURE_ARGS (ie remove
-DBUILD_PLUGINS:Bool=OFF from above) and specify the DEPENDS for
subpackages. Those WANTLIB below are duplicate too.
> +.if ${BUILD_PACKAGES:M-ossl} || ${BUILD_PACKAGES:M-gnupg}
> +CONFIGURE_ARGS += -DBUILD_PLUGINS="ossl;gnupg"
> +LIB_DEPENDS-ossl += ${BUILD_PKGPATH},-main
> +LIB_DEPENDS-gnupg += ${BUILD_PKGPATH},-main
>
> -WANTLIB += c m pthread ${LIBCXX}
> +RUN_DEPENDS-gnupg += security/gnupg
> +.endif
Looking at other plugins, shouldnt you also merge qca-tls plugin ? Or
remove it as it's unused ? If it's not in qca2 it might be replaced by
ossl..
Now, for the upgrade paths:
> +++ security/qca2/pkg/PLIST-gnupg 9 Jul 2017 20:11:09 -0000
> +@conflict qca-gnupg-*
> +@pkgpath security/qca-gnupg
> +++ security/qca2/pkg/PLIST-main 9 Jul 2017 20:11:09 -0000
> +@conflict qca-<=1.0
> +@pkgpath security/qca2
here i think you also need @pkgpath security/qca if you want to upgrade
it to qca2. The first @pkgpath here is (i think) to update qca2 to
qca2,-main (ie the multipackage split)
And then if you remove qca, qca-ossl and qca-gnupg you *might* need a
quirks entry for their removal (unsure, as they should be updated.. to
test)
> +++ security/qca2/pkg/PLIST-ossl 9 Jul 2017 20:11:09 -0000
> +@conflict qca-ossl-*
> +@pkgpath security/qca-ossl
As for ossl and gnupg, the conflict/pkgpath look fine to me, did you try
upgrading all of them in a single updateset ? ie pkg_add qca qca-ossl
qca-gnupg && PKG_PATH=/wher/you/have/newpkg pkg_add -u qca qca-ossl
qca-gnupg ?
Landry
