On 2020/10/02 22:08, Klemens Nanni wrote: > On Fri, Oct 02, 2020 at 08:44:51PM +0100, Stuart Henderson wrote: > > On 2020/10/02 21:25, Klemens Nanni wrote: > > > Updated diff after quirks churn. > > > > -common should get merged back in too, I think this is the way: > As noted in my other (older) mail the -common subpackage also hardcodes > "py-" instead of "py3-" as prefix, but I wanted to fix this in a > separate diff. > > Yours looks better of course, are you fine with doing these as separate > commits? If so, OK kn for yours after I removed the Python 2 flavour.
I guess, it is a pain with cvs though. > > Index: geo/qgis/Makefile > > =================================================================== > > RCS file: /cvs/ports/geo/qgis/Makefile,v > > retrieving revision 1.134 > > diff -u -p -r1.134 Makefile > > --- geo/qgis/Makefile 14 Sep 2020 07:25:27 -0000 1.134 > > +++ geo/qgis/Makefile 2 Oct 2020 19:44:45 -0000 > > @@ -8,6 +8,7 @@ COMMENT = desktop geographical informati > > DPB_PROPERTIES = parallel > > > > DISTNAME = qgis-3.14.16 > > +REVISION = 0 > > EXTRACT_SUFX = .tar.bz2 > > CATEGORIES = geo x11 > > DEBUG_PACKAGES =${BUILD_PACKAGES} > > Is this bump required? It is, the pkgpath of the dependency changes