From: Klemens Nanni <kn@openbsd.org>
Subject: Re: DIST_TUPLE fix for project string with subdir
To: Thomas Frohwein <tfrohwein@fastmail.com>
Cc: ports@openbsd.org, Rafael Sadowski <rafael@sizeofvoid.org>
Date: Wed, 14 Feb 2024 18:27:39 +0000

On Wed, Feb 14, 2024 at 12:39:31PM -0500, Thomas Frohwein wrote:
> On Wed, Feb 14, 2024 at 04:59:17PM +0000, Klemens Nanni wrote:
> 
> [...]
> 
> > > without a '/' in the project string and no breakage observed. Rafael
> > > reports success with his qt5 submodule draft if this diff is applied.
> > 
> > This looks safe to me, but :C,^.*/,, is the same as :T, so I'd prefer that.
> 
> Even better, still yields the same result indeed. Update diff at the
> bottom. ok?

OK kn

> > > ok?
> > > 
> > > Index: dist-tuple.port.mk
> > > ===================================================================
> > > RCS file: /cvs/ports/infrastructure/mk/dist-tuple.port.mk,v
> > > retrieving revision 1.15
> > > diff -u -p -r1.15 dist-tuple.port.mk
> > > --- dist-tuple.port.mk	6 Nov 2023 07:02:08 -0000	1.15
> > > +++ dist-tuple.port.mk	4 Feb 2024 18:32:53 -0000
> > > @@ -45,7 +45,7 @@ HOMEPAGE ?=	${TEMPLATE_HOMEPAGE.${_templ
> > >  MODDIST-TUPLE_post-extract += \
> > >  	t=${WRKDIST}/${_targetdir}; [[ -d $$t ]] && rmdir $$t \
> > >  	|| mkdir -p `dirname $$t` ; \
> > > -	mv ${WRKDIR}/${_project}-${_id:S/refs\/tags\///:S/^v//} $$t;
> > > +	mv ${WRKDIR}/${_project:C,^.*/,,}-${_id:S/refs\/tags\///:S/^v//} $$t;
> > >  .      endif
> > >  .    endfor
> > >  
> > > 
> 
> Index: dist-tuple.port.mk
> ===================================================================
> RCS file: /cvs/ports/infrastructure/mk/dist-tuple.port.mk,v
> retrieving revision 1.15
> diff -u -p -r1.15 dist-tuple.port.mk
> --- dist-tuple.port.mk	6 Nov 2023 07:02:08 -0000	1.15
> +++ dist-tuple.port.mk	14 Feb 2024 17:36:50 -0000
> @@ -45,7 +45,7 @@ HOMEPAGE ?=	${TEMPLATE_HOMEPAGE.${_templ
>  MODDIST-TUPLE_post-extract += \
>  	t=${WRKDIST}/${_targetdir}; [[ -d $$t ]] && rmdir $$t \
>  	|| mkdir -p `dirname $$t` ; \
> -	mv ${WRKDIR}/${_project}-${_id:S/refs\/tags\///:S/^v//} $$t;
> +	mv ${WRKDIR}/${_project:T}-${_id:S/refs\/tags\///:S/^v//} $$t;
>  .      endif
>  .    endfor
>