On 2023/05/30 13:38, Jonathan Drews wrote:
> On Tue, May 30, 2023 at 03:00:13PM +0200, Ingo Feinerer wrote:
> > Am 2023-05-30 03:13, schrieb George Koehler:
> > > ok gkoehler@ (with the PLIST fix)
> >
> > Also OK from my side (feinerer@). Thank you all for your efforts.
> >
> > I do not use Maxima any longer, so I would like to drop MAINTAINER.
> >
>
> I, Jonathan, would be willing to take tis port over.
>
> > > https://marc.info/?l=openbsd-ports&m=168501263910495&w=2 has the diff.
> > > After I applied the diff, I edited pkg/PLIST to change
> > > "${MODPY_BIN_SUFFIX}" back to "-2".
> > >
> > > On Thu, 25 May 2023 11:32:44 -0600
> > > Jonathan Drews <[email protected]> wrote:
> > >
> > > > Stuart and Theo:
> > > >
> > > > I compiled maxima with the Python entries removed and it
> > > > installed and runs ok. Here is the Makefile based on Suarts diff. I
> > > > did retain the references to tcl8.6.
> > > > ...
> > > > MODTCL_VERSION= 8.6
> > > > ...
> > > > pre-build:
> > > > ${MODTCL_WISH_ADJ} ${WRKSRC}/interfaces/xmaxima/xmaxima
> > >
> > > I didn't need the MODTCL_VERSION line nor the pre-build target, so
> > > I didn't add them to my Makefile.
> > >
> > > If your ports tree is from cvs (https://www.openbsd.org/anoncvs.html)
> > > then you can create a diff like,
> > >
> > > $ cd /usr/ports/math/maxima
> > > $ cvs -q diff > ~/my.diff
> > >
> > > This works if the update doesn't add or remove any files. After the
> > > update to 5.46.0 is in cvs, we will be able to create diffs to
> > > add the sbcl flavor.
>
> Here is what is going on. I applied Stuarts diff of May 25th and
> Maxima-ecl built (make build was successful). I am going to make the
> package and also do make test.
>
> Next I will make build the maxima-sbcl version and test it.
>
> Finally, I will combine the two into one Makefile. It will require a
> nested .if ... .endif as there is already two flavors to deal with.
> Namely:
>
> .if !${FLAVOR:Mno_x11}
> MODULES+= x11/tk
> MODTK_VERSION= 8.6
> RUN_DEPENDS += ${MODTK_RUN_DEPENDS} \
> math/gnuplot
> BUILD_DEPENDS += ${MODTK_BUILD_DEPENDS}
> CONFIGURE_ARGS += --with-wish=${MODTK_BIN}
> .endif
It wouldn't be nested, it would be separate to the no_x11 flavour.
You'd want to add a block along these lines.
FLAVORS= no_x11 sbcl
.if ${FLAVOR:Msbcl}
BUILD_DEPENDS += lang/sbcl
RUN_DEPENDS += lang/sbcl ## is that needed?
CONFIGURE_ARGS += --enable-sbcl
.else
LIB_DEPENDS += lang/ecl
WANTLIB += ecl
CONFIGURE_ARGS += --enable-ecl
.endif
(and add a note about flavours to pkg/DESCR).
> Alternatively we could split this into two ports called maxima-ecl and
> maxima-sbcl.
>
> Let me know what you think.
>
> --
> Kind regards,
>
> Jonathan
>
