Stuart Henderson <[email protected]> writes: > On 2021/10/30 23:00, Omar Polo wrote: >> 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? > > Oops about my attachment, it is similar to yours of course :) > > I was thinking py2-scons for the directory (like some other py2-* > things) as an indication that it's deliberately sticking with py2 for > reasons. But on further reflection this maybe a bit confusing when > we also have an un-prefixed "scons". So maybe scons-py2 is better..
I agree with your reasoning. Furthermore, if the port is called
scons-py2 the scons.port.mk diff reads better IMHO.
>> > [...]
>> >
>> > 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.
>
> Should be man/man1/scons-time-${VERSION}.1 not scons-${VERSION}-time.1
> to match the script name, otherwise this is OK with me
*double facepalm*
I should have got some sleep before posting. Attaching another attempt:
scons-py2 with this fixed.
>> I started the build of mongodb and thedarkmod and it seems to work \o/
>
> I did a full build of mongodb btw.
>
>> Thanks!
>>
>> P.S.: let me know if it's easier for you if I re-attach all the patches.
>
> No that's ok I have them in my tree :)
Cheers,
Omar Polo
Index: scons.port.mk
===================================================================
RCS file: /home/cvs/ports/devel/scons/scons.port.mk,v
retrieving revision 1.7
diff -u -p -r1.7 scons.port.mk
--- scons.port.mk 29 Aug 2021 19:46:17 -0000 1.7
+++ scons.port.mk 31 Oct 2021 08:17:38 -0000
@@ -1,8 +1,14 @@
# $OpenBSD: scons.port.mk,v 1.7 2021/08/29 19:46:17 kirby Exp $
-BUILD_DEPENDS+= devel/scons
+MODSCONS_USE_V2?= No
+.if ${MODSCONS_USE_V2:L} == "yes"
+BUILD_DEPENDS+= devel/scons-py2
+MODSCONS_BIN= ${LOCALBASE}/bin/scons-2.5.1
+.else
+BUILD_DEPENDS+= devel/scons
MODSCONS_BIN= ${LOCALBASE}/bin/scons
+.endif
MODSCONS_ENV?= CC="${CC}" \
CXX="${CXX}" \
scons-py2.tar.gz
Description: Binary data
