Stuart Henderson <[email protected]> writes: > On 2021/10/30 20:26, Omar Polo wrote: >> Hello ports, >> >> Here's another attempt at updating devel/scons. The third time is the >> charm, right? :D >> >> Attaching: >> >> - a tarball for a "new" devel/scons2: it's the current scons ports with >> REVISION and MAINTAINER dropped and HOMEPAGE switched to https; this >> way we can still build databases/mongodb and games/thedarkmod > > I only just noticed that 3.x has python 2 support as well, so I wonder > if it would make sense to call the port py2-scons instead of scons2? > That would leave it open to changing it to 3.x without the version > getting out of sync with the directory name if we ever wanted to. > We might not want to but it's easier to avoid any possible need to > rename the directory later as it's a bit of a pain to do.
I don't see why we would want to have 3.x but seems the safer choice, so
it's fine with me.
By the way, I assumed that the py-* "namespace" was only for python
libraries, is it really ok to call the port py-scons?
>> - `modscons-usev2.diff': adds a MODSCONS_USE_V2 variable to
>> scons.ports.mk that makes MODSCONS use devel/scons2 instead of scons
>> if set to 'Yes' and sets it for mongodb and thedarkmod so they build.
>> Suggestion for a better name are welcome :)
>
> I think that's fine.
>
>> - `scons-update.diff': updates devel/scons to 4.2.0
>>
>> - `scons-fallout.diff': fixes the failures due to the scons update.
>> Most of them are straightforward, except for games/dangerdeep where
>> 2to3 doesn't work really well. I know that reviewing those bits
>> won't be a pleasure, I'm sorry!
>
> missing -w on the 2to3 line for dangerdeep :) replacement patch for
> dangerdeep below.
*facepalm*
>> (note that this time I haven't tried to build mongodb or tdm, I just
>> ensured that the right scons was picked.)
>>
>> devel/scons and devel/scons2 mark each others as @conflict: they both
>> install bin/scons and I don't feel comfortable enough to patch scons2
>> furthermore. It's not bad I guess, scons2 is meant only to build
>> our old mongodb and thedarkmod (until gets updated.) Hope it doesn't
>> cause problems in bulk builds thought.
>
> That is a problem for bulks, but it's easily fixed. Let's just install
> the XXX-${VERSION} scripts for the old version skipping the unversioned
> names, and rename the manpages according to the version number.
>
> New tar attached for this. Any OK to import that (either as scons2,
> or as py2-scons)?
there wasn't any tarball attached :P
Is the attached one ok with you? I went with py-scons; in post-install
it removes the unversioned executables and renames the manpages to
XXX-${VERSION}. No conflicts with the updated scons.
I started the build of mongodb and thedarkmod and it seems to work \o/
Thanks!
P.S.: let me know if it's easier for you if I re-attach all the patches.
py-scons.tar.gz
Description: Binary data
