Wednesday, May 24, 2023

Re: Problems updating math/maxima

On Tue, May 23, 2023, at 06:03, Jonathan Drews wrote:
> On Tue, May 23, 2023 at 03:41:05AM -0600, Jonathan Drews wrote:
> > On Mon, May 22, 2023 at 07:43:20PM +0100, Stuart Henderson wrote:
> > > On 2023/05/22 09:11, Jonathan Drews wrote:
> > > > My system: OpenBSD 7.3 GENERIC.MP#1125 amd64
> > > > The port: math/maxima
> > > >
> > > >
> > > > and the xmaxima shell script says requires tk8.6:
> > > >
> > > > #!/bin/sh
> > > > # -*- mode: tcl; fill-column: 75; tab-width: 8 -*- \
> > > > exec /usr/local/bin/wish8.5 "$0" -- "$@"
> > > >
> > > > package require Tk 8.6
> > >
> > > you have the wrong wish version in the exec line. this is usually fixed
> > > up by passing the file to ${MODTCL_WISH_ADJ} in some build/configure
> > > stage. maybe along the lines of
> > >
> > > pre-build:
> > > ${MODTCL_WISH_ADJ} ${WRKSRC}/path/to/file
>
Folks this is my latest Makefile:

COMMENT= GPL computer algebra system based on DOE Macsyma

VERSION= 5.46.0
DISTNAME= maxima-${VERSION}
CATEGORIES= math

HOMEPAGE= http://maxima.sourceforge.net/
MAINTAINER= Ingo Feinerer <feinerer@logic.at>

# GPLv2+
PERMIT_PACKAGE= Yes

WANTLIB += c ecl ffi gc gmp m pthread

MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=maxima/}

USE_GMAKE= yes

# Python is not needed for building but configure fails without it.
# Instead of patching just add the lang/python dependency.
# http://sourceforge.net/p/maxima/mailman/message/34462954/
MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
MODPY_RUNDEP = No

BUILD_DEPENDS = print/texinfo \
lang/tcl/8.6
LIB_DEPENDS= lang/ecl \
lang/tcl/8.6
RUN_DEPENDS = devel/desktop-file-utils \
misc/rlwrap \
misc/shared-mime-info \
lang/tcl/8.6

pre-build:
${MODTCL_WISH_ADJ} ${WRKSRC}/interfaces/xmaxima/xmaxima

SUBST_VARS= VERSION

MAKE_FLAGS = MAKEINFO="${LOCALBASE}/bin/gtexi2any" \
TEXI2DVI="${LOCALBASE}/bin/gtexi2dvi"

CONFIGURE_ARGS+= --enable-ecl
CONFIGURE_STYLE= gnu

FLAVORS= no_x11
FLAVOR?=

.if !${FLAVOR:Mno_x11}
MODULES+= x11/tk
MODTK_VERSION = 8.6
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
RUN_DEPENDS += ${MODTK_RUN_DEPENDS} \
math/gnuplot
BUILD_DEPENDS += ${MODTK_BUILD_DEPENDS}
CONFIGURE_ARGS += --with-wish=${MODTK_BIN}
.endif

It is still not replacing wish 8.5 with wish8.6:
# cat /usr/local/bin/xmaxima | head
#!/bin/sh
# -*- mode: tcl; fill-column: 75; tab-width: 8 -*- \
exec /usr/local/bin/wish8.5 "$0" -- "$@"

package require Tk 8.6

BUT, the file in /usr/ports/pobj/maxima-5.46.0/maxima-5.46.0/interfaces/xmaxima/xmaxima
*IS* getting replaced.

# cat /usr/ports/pobj/maxima-5.46.0/maxima-5.46.0/interfaces/xmaxima/xmaxima | head
#!/bin/sh
# -*- mode: tcl; fill-column: 75; tab-width: 8 -*- \
exec /usr/local/bin/wish8.6 "$0" -- "$@"

package require Tk 8.6

What am I missing here?

--
Kind regards,
Jonathan

No comments:

Post a Comment