Re: [UPDATE] geo/gpsbabel 1.4.4 -> 1.6.0

On 2019/08/26 11:24, Kirill Bychkov wrote:
> On Sat, August 24, 2019 17:19, SASANO Takayoshi wrote:
> > Hello,
>
> Hi,
> I have almost the same patch sitting in my tree for a long time.
> I've completly disabled building of docs in my patch.
> With your diff I get only display($template); ?> in all html docs.
> See comments below.
> >
> [...]
> >
> >
> > diff -uNpr gpsbabel/Makefile gpsbabel.new/Makefile
> > --- gpsbabel/Makefile Sat Aug 24 23:05:29 2019
> > +++ gpsbabel.new/Makefile Sat Aug 24 23:05:31 2019
> > @@ -1,30 +1,32 @@
> > -# $OpenBSD: Makefile,v 1.33 2018/10/24 14:28:04 sthen Exp $
> > +# $OpenBSD: Makefile,v 1.34 2019/07/12 20:46:29 sthen Exp $

Diff against -current, please.

> > COMMENT-main= GPS waypoint, track, and route conversion tool
> > COMMENT-tk= Tk front-end to gpsbabel
> > COMMENT-qt= Qt front-end to gpsbabel
> >
> > -VERSION= 1.4.4
> > +VERSION= 1.6.0
> > +GH_ACCOUNT= gpsbabel
> > +GH_PROJECT= gpsbabel
> > +GH_TAGNAME= gpsbabel_1_6_0
> > DISTNAME= gpsbabel-${VERSION}
> > PKGNAME-main= gpsbabel-${VERSION}
> > PKGNAME-tk= gpsbabel-tk-${VERSION}
> > PKGNAME-qt= gpsbabel-qt-${VERSION}
> > CATEGORIES= geo
>
> No need for GH_* vars - upstream is publishing normal releases.
> DISTNAME= gpsbabel_1_6_0
> MASTER_SITES= https://github.com/gpsbabel/gpsbabel/archive/

No that isn't a normal release - /archive/ URL means that it *should* use GH_* vars.

> >
> > -REVISION-main= 2
> > -REVISION-tk= 2
> > -REVISION-qt= 3
> > +REVISION-main=
> > +REVISION-tk=
> > +REVISION-qt=

REVISION lines should be removed.