On Sun, Dec 24, 2023 at 05:22:49PM +0000, Lucas Gabriel Vuotto wrote:
> On Sun, Dec 24, 2023 at 06:18:03AM +0100, Theo Buehler wrote:
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/boost/Makefile,v
> > diff -u -p -r1.140 Makefile
> > --- Makefile 24 Dec 2023 00:26:12 -0000 1.140
> > +++ Makefile 24 Dec 2023 04:57:15 -0000
> > @@ -11,8 +11,8 @@ COMMENT-md= machine-dependent libraries
> > VERSION= 1.84.0
> > DISTNAME= boost_${VERSION:S/./_/g}
> > PKGNAME= boost-${VERSION}
> > -REVISION= 0
> > -EPOCH = 0
> > +REVISION= 1
> > +EPOCH= 0
> > CATEGORIES= devel
> > SITES=
> > https://boostorg.jfrog.io/artifactory/main/release/${VERSION}/source/
> > EXTRACT_SUFX= .tar.bz2
> > @@ -151,7 +151,7 @@ do-install:
> > ${INSTALL_DATA_DIR} ${PREFIX}/include/boost
> > ${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
> > cd ${WRKSRC}/boost && \
> > - pax -rw -s ':^.*\.orig$$::' . ${PREFIX}/include/boost
> > + pax -rw -s ':^.*${PATCHORIG}$$::' . ${PREFIX}/include/boost
> > find ${PREFIX}/include/boost -type d -exec chmod ${DIRMODE} {} +
> > find ${PREFIX}/include/boost -type f -exec chmod ${SHAREMODE} {} +
> > # boost-build:
> > @@ -159,11 +159,11 @@ do-install:
> > ${PREFIX}/bin
> > ${INSTALL_DATA_DIR} ${PREFIX}/share/b2
> > @cd ${WRKSRC}/tools/build/src && \
> > - pax -r -w -p pm -s ':^./engine.*$$::' -s ':^.*\.orig$$::' . \
> > + pax -r -w -p pm -s ':^./engine.*$$::' -s ':^.*${PATCHORIG}$$::'
> > . \
> > ${PREFIX}/share/b2
> > ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/b2
> > @cd ${WRKSRC}/tools/build/example && \
> > - pax -r -w -p pm -s ':^.*\.orig$$::' . \
> > + pax -r -w -p pm -s ':^.*${PATCHORIG}$$::' . \
> > ${PREFIX}/share/examples/b2
> >
> > .include <bsd.port.mk>
>
> Shouldn't those "${PATCHORIG}" be replaced by "\.orig\.port"? It isn't
> an issue right now: "find $(make show=WRKSRC) -name '*?orig?port'"
> only returns the files actually ending in ${PATCHORIG} and I guess that
> if it actually becomes an issue in here, that also means that PATCHORIG
> should have been changed before.
I don't think so. I could do something like ${PATCHORIG:S/./\\./g} to
make extra sure that the two dots don't match anything but a '.'. This
is overdoing it and it isn't done elsewhere in the ports tree either.
Hardcoding \.orig\.port creates a problem for people having their
PATCHORIG set to thing else in their /etc/mk.conf. On several of my
oder dev machines where I have it set to .port.orig from the time when
PATCHORIG=.orig was the default and created a lot of pain with Rust
ports for example.
This is a lot more likely to bite people than a file foo.cppXorigYport
appearing in boost sources in the next 30 years.
