5 files changed, 26 insertions, 22 deletions
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 3554953403eb..6be0f36b1177 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	maxima
-DISTVERSION=	5.47.0
-PORTREVISION=	25
+DISTVERSION=	5.48.1
+PORTREVISION=	1
 CATEGORIES=	math lisp tk
 MASTER_SITES=	SF/maxima/Maxima-source/${PORTVERSION}-source
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tiga@FreeBSD.org
 COMMENT=	Symbolic mathematics program
 WWW=		http://maxima.sourceforge.net/
 
@@ -29,7 +29,7 @@ TEST_TARGET=	check
 
 BINARY_ALIAS=	expr=gexpr
 
-INFO=		imaxima maxima xmaxima abs_integrate drawutils kovacicODE logic \
+INFO=		imaxima maxima abs_integrate drawutils kovacicODE logic \
 		nelder_mead symplectic_ode
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
@@ -95,6 +95,7 @@ XMAXIMA_IMPLIES=		DOCS TEST
 XMAXIMA_USES=			tk
 XMAXIMA_CONFIGURE_WITH=		wish=${WISH}
 XMAXIMA_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-interfaces_Makefile.am
+XMAXIMA_INFO=			xmaxima
 
 post-patch:
 	${GREP} -Fe '.core' -l -r ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} 's;\.core;_core;g'
@@ -109,7 +110,6 @@ post-patch-XMAXIMA-on:
 	${WRKSRC}/interfaces/xmaxima/Tkmaxima/Paths.tcl
 
 post-configure:
-	${REINPLACE_CMD} '/ld-flags/s|" |"|' ${WRKSRC}/src/autoconf-variables.lisp
 	${REINPLACE_CMD} '/ld-flags/s| ")|")|' ${WRKSRC}/src/autoconf-variables.lisp
 
 pre-build-CCL-on:
@@ -118,6 +118,9 @@ pre-build-CCL-on:
 post-build-MANPAGES-on:
 	${GZIP_CMD} ${WRKSRC}/doc/man/maxima.1
 
+post-build-XMAXIMA-on:
+	${REINPLACE_CMD} "s;$$::xmaxima_priv(pReferenceToc);::xmaxima_priv(pReferenceToc);g" ${WRKSRC}/interfaces/xmaxima/xmaxima
+
 post-install:
 	for x in "" "-1" "-2" "-3"; do ${INSTALL_MAN} ${WRKSRC}/doc/info/maxima.info$$x ${STAGEDIR}${PREFIX}/${INFO_PATH}; done
 	${INSTALL_MAN} ${WRKSRC}/doc/info/maxima-index.lisp ${STAGEDIR}${PREFIX}/${INFO_PATH}
diff --git a/math/maxima/distinfo b/math/maxima/distinfo
index 891860f31cf1..a7eb241df6a7 100644
--- a/math/maxima/distinfo
+++ b/math/maxima/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685801901
-SHA256 (maxima-5.47.0.tar.gz) = 9104021b24fd53e8c03a983509cb42e937a925e8c0c85c335d7709a14fd40f7a
-SIZE (maxima-5.47.0.tar.gz) = 47939891
+TIMESTAMP = 1754550342
+SHA256 (maxima-5.48.1.tar.gz) = b0916b5fb37b6eeaae400083175e68e28f80b9a1ab580c106a05448cf1c496b2
+SIZE (maxima-5.48.1.tar.gz) = 46150379
diff --git a/math/maxima/files/patch-Makefile.am b/math/maxima/files/patch-Makefile.am
index 165de96d6477..0357a12fee00 100644
--- a/math/maxima/files/patch-Makefile.am
+++ b/math/maxima/files/patch-Makefile.am
@@ -1,11 +1,11 @@
---- Makefile.am.orig	2022-05-09 16:39:32 UTC
+--- Makefile.am.orig	2024-07-23 03:31:18 UTC
 +++ Makefile.am
 @@ -10,7 +10,7 @@ endif
     DOC_DIR = doc
  endif
  
--SUBDIRS = admin crosscompile-windows src lisp-utils tests $(DOC_DIR) interfaces share demo plotting desktopintegration $(LOCALE_DIR)
-+SUBDIRS = admin crosscompile-windows src lisp-utils tests interfaces share plotting desktopintegration $(LOCALE_DIR)
+-SUBDIRS = admin crosscompile-windows src lisp-utils $(DOC_DIR) interfaces share demo plotting desktopintegration $(LOCALE_DIR) tests
++SUBDIRS = admin crosscompile-windows src lisp-utils interfaces share demo plotting desktopintegration $(LOCALE_DIR) tests
  
  EXTRA_DIST = \
    common.mk maxima.iss.in \
diff --git a/math/maxima/files/patch-configure.ac b/math/maxima/files/patch-configure.ac
index 4d03280b444b..e41566c43930 100644
--- a/math/maxima/files/patch-configure.ac
+++ b/math/maxima/files/patch-configure.ac
@@ -1,4 +1,4 @@
---- configure.ac.orig	2024-09-01 19:17:42 UTC
+--- configure.ac.orig	2025-08-06 06:49:54 UTC
 +++ configure.ac
 @@ -165,21 +165,21 @@ dnl See if git exists.  If it does, update VERSION to 
  
@@ -37,11 +37,11 @@
  
  dnl Parses the version number for the manual
  manual_version=`echo $VERSION | sed 's+branch_++; s+_base++; s+_dirty++; s+_+.+g'`
-@@ -644,7 +644,7 @@ if test x"${enable_build_docs}" = xtrue ; then
+@@ -697,7 +697,7 @@ if test x"${enable_build_docs}" = xtrue ; then
  	dnl assuming that the end of the version string contains the
  	dnl version number consisting of digits separated by a period.
  	dnl This allows for version numbers like 6.8.90.
--	makeinfo_version_string=`expr "\`makeinfo --version | head -1\`" : '.* \([[.0-9]]\+\)'`
+-	makeinfo_version_string=`expr "\`$MAKEINFO --version | head -1\`" : '.* \([[.0-9]][[.0-9]]*\)'`
 +	makeinfo_version_string=`expr "$(makeinfo --version | head -1)" : '.* \([[.0-9]]\+\)'`
  	dnl echo Makeinfo version ${makeinfo_version}
  
diff --git a/math/maxima/pkg-plist b/math/maxima/pkg-plist
index 6e9cbc661984..4986fdf117fe 100644
--- a/math/maxima/pkg-plist
+++ b/math/maxima/pkg-plist
@@ -4,7 +4,9 @@ bin/rmaxima
 %%SAGE%%lib/ecl/maxima.fas
 lib/maxima/%%PORTVERSION%%/%%BINDIR%%/%%BINNAME%%
 libexec/maxima/%%PORTVERSION%%/mgnuplot
-share/applications/net.sourceforge.maxima.xmaxima.desktop
+%%MANPAGES%%share/man/man1/maxima.1.gz
+%%PORTDOCS%%@dir %%DOCSDIR%%
+%%ECL%%%%XMAXIMA%%share/applications/X%%BINNAME%%.desktop
 share/bash-completion/completions/maxima
 share/bash-completion/completions/rmaxima
 share/bash-completion/completions/xmaxima
@@ -23,13 +25,12 @@ share/emacs/site-lisp/mylatex.ltx.el
 share/emacs/site-lisp/setup-imaxima-imath.el
 share/emacs/site-lisp/smart-complete.el
 share/emacs/site-lisp/sshell.el
-share/info/maxima-index.lisp
+%%ECL%%%%XMAXIMA%%share/icons/text-x-%%BINNAME%%-out.svg
+%%ECL%%%%XMAXIMA%%share/icons/text-x-%%BINNAME%%session.svg
+%%ECL%%%%XMAXIMA%%share/icons/x%%BINNAME%%.png
+%%ECL%%%%XMAXIMA%%share/icons/x%%BINNAME%%.svg
 share/info/maxima-index-html.lisp
-%%MANPAGES%%share/man/man1/maxima.1.gz
-share/metainfo/net.sourceforge.maxima.xmaxima.appdata.xml
+share/info/maxima-index.lisp
+%%ECL%%%%XMAXIMA%%share/metainfo/net.sourceforge.%%BINNAME%%.x%%BINNAME%%.appdata.xml
 share/mime/packages/x-mac.xml
 share/mime/packages/x-maxima-out.xml
-%%XMAXIMA%%share/pixmaps/net.sourceforge.maxima.png
-%%XMAXIMA%%share/pixmaps/net.sourceforge.maxima.svg
-share/pixmaps/text-x-maxima-out.svg
-share/pixmaps/text-x-maximasession.svg