On 2017/07/09 23:24, Rafael Sadowski wrote:
> On Sun Jul 09, 2017 at 10:40:14PM +0200, Landry Breuil wrote:
> > 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..
>
> There is no qca-tls plugin, I'll remove it because no port use it.
>
> >
> > 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)
>
> I'll not update security/qca to security/qca2 because I think qca is
> dead. No port uses it.
>
> >
> > 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 ?
>
> Yes exactly.
>
> > ie pkg_add qca qca-ossl
> > qca-gnupg && PKG_PATH=/wher/you/have/newpkg pkg_add -u qca qca-ossl
> > qca-gnupg ?
> >
>
> both, `pkg_add` -u and `pkg_add -u qca qca-ossl qca-gnupg` only work
> with the quirks diff below (more precisely with the qca-{ossl,gnupg}
> entries in $stem_extensions):
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.492
> diff -u -p -u -p -r1.492 Makefile
> --- Makefile 9 Jul 2017 11:01:56 -0000 1.492
> +++ Makefile 9 Jul 2017 21:18:59 -0000
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-2.337
> +PKGNAME = quirks-2.338
> PKG_ARCH = *
> MAINTAINER = Marc Espie <es...@openbsd.org>
>
> Index: files/Quirks.pm
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.504
> diff -u -p -u -p -r1.504 Quirks.pm
> --- files/Quirks.pm 9 Jul 2017 11:01:57 -0000 1.504
> +++ files/Quirks.pm 9 Jul 2017 21:18:59 -0000
> @@ -412,8 +412,11 @@ my $stem_extensions = {
> 'markdown' => 'py-markdown',
> 'netperf-wrapper' => 'flent',
> 'kamailio-xmlrpc' => 'kamailio-xml',
> + 'qca-gnupg' => 'qca2-gnupg',
> + 'qca-ossl' => 'qca2-ossl',
> };
>
> +
> my $obsolete_reason = {
> 'BitTorrent' => 0,
> 'BitTorrent-gui' => 0,
> @@ -987,6 +990,8 @@ my $obsolete_reason = {
> 'mrxvt' => 2,
> 'net/cutegram' => 3,
> 'devel/libqtelegram-aseman-edition' => 5,
> + 'qca' => 3,
> + 'qca-tls' => 3,
> };
>
> # reasons for obsolete packages
>
>
>
Do you actually need to change the names for qca-gnupg / qca-ossl,
can't they just stay with the same names? Then you can drop the
renaming in quirks and the @conflict, then you just need @pkgpath
and the obsolete entries in quirks ..
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 ...
