On Fri, 04 Oct 2024 10:11:04 +0200,
Stuart Henderson <stu@spacehopper.org> wrote:
> 
> On 2024/10/03 19:39, Klemens Nanni wrote:
> > 30.09.2024 14:32, Kirill A. Korinsky пишет:
> > > jca_p had noted that it diff before had missed @pkgpath. Here an updated
> > > version which was tested to upgrade as:
> > 
> > Yes, the @pkgpath looks correct and a quirk is not needed to merge a flavour,
> > I think, but not entirely sure.  Do we need '@conflict hugo-*-extended'?
> 
> No need for @conflict for this.
> 
> I've updated DESCR and committed (including www/Makefile to remove the
> flavour).
>

Thanks, I defently missed that.

> > >     hugo $ doas pkg_add -Dunsigned  /build/packages/amd64/ftp/hugo-0.135.0.tgz
> > >     hugo-0.134.2-extended->0.135.0: ok
> > >     hugo $ 
> > 
> > If quirks were involved you'd have to point it at some PKG_PATH, pkg_add'ing
> > a single package is not enough then.  Perhaps wise to always test package updates
> > with anything special that way.
> 
> Definitely worth doing this for flavour changes etc, whether or not it
> touches quirks. Put the new tgz into a dir on their own, point PKG_PATH,
> and use pkg_add -u without specifying the package name.
> 

Just tested and it works as expected:

    ~ $ doas pkg_delete hugo                                              
    hugo-0.135.0: ok
    ~ $ doas pkg_add hugo                                                 
    quirks-7.50 signed on 2024-09-28T18:31:43Z
    Ambiguous: choose package for hugo
    a       0: <None>
            1: hugo-0.134.2
            2: hugo-0.134.2-extended
    Your choice: 2
    hugo-0.134.2-extended: ok
    ~ $ doas env PKG_PATH=/build/packages/amd64/all:installpath pkg_add -Dunsigned -u  
    hugo-0.134.2-extended->0.135.0: ok
    ~ $ 

-- 
wbr, Kirill