diff --git a/math/reduce/Makefile b/math/reduce/Makefile
index d401a29ac9a2..ad599e875590 100644
--- a/math/reduce/Makefile
+++ b/math/reduce/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	reduce
 PORTVERSION=	${SFSUBDIR:S/snapshot_//:S/-//g}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math lang
 MASTER_SITES=	SF/${PORTNAME}-algebra/${SFSUBDIR}/
 DISTNAME=	Reduce-svn6339-src
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Codemist Standard Lisp REDUCE general-purpose computer system
 WWW=		http://www.reduce-algebra.com/
 
 LICENSE=	BSD2CLAUSE
 
 BROKEN_armv7=	fails to compile: error: no viable overloaded '=': return *this = int128_t(rhs);
 BROKEN_i386=	fails to compile: sysv.S:832:1: changed section flags for .eh_frame, expected: 0x2
 
 BUILD_DEPENDS=	gnuplot:math/gnuplot
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		autoreconf:build libtool gmake ncurses jpeg xorg
 USE_XORG=	x11 xcursor xext xorgproto xft xrandr xrender
 
 SFSUBDIR=	snapshot_2022-06-17
 
 TARGET_SDIR=	${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}
 CPPFLAGS+=	-I${NCURSESINC}
 
 # Avoid GNU_CONFIGURE as it breaks staging
 HAS_CONFIGURE=	yes
 ALL_TARGET=
 
 MAKE_JOBS_UNSAFE=	yes
 
 CONFIGURE_ARGS=	--with-csl
 CPPFLAGS+=	`freetype-config --cflags`
 LDFLAGS+=	`freetype-config --libs`
 
 REDUCE_BINS=	${WRKSRC}/cslbuild/${TARGET_SDIR}
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${REDUCE_BINS}/csl/reduce.img ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${REDUCE_BINS}/csl/reduce ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${FILESDIR}/runcsl.sh ${STAGEDIR}${PREFIX}/bin/redcsl
-	${INSTALL_MAN} ${FILESDIR}/redcsl.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${FILESDIR}/redcsl.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 	${MKDIR} ${STAGEDIR}${DATADIR}/reduce.doc
 	(cd ${REDUCE_BINS}/csl/reduce.doc && ${COPYTREE_SHARE} . \
 	    ${STAGEDIR}${DATADIR}/reduce.doc)
 	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}
 	(cd ${REDUCE_BINS}/csl/reduce.fonts && ${COPYTREE_SHARE} . \
 	    ${STAGEDIR}${DATADIR}/reduce.fonts)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/manual/manual.pdf\
 	    ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/primers/*.pdf \
 	    ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/reduce/pkg-plist b/math/reduce/pkg-plist
index b984e76e6372..55d29dfdd6d1 100644
--- a/math/reduce/pkg-plist
+++ b/math/reduce/pkg-plist
@@ -1,112 +1,112 @@
 bin/redcsl
-man/man1/redcsl.1.gz
+share/man/man1/redcsl.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/insidereduce.pdf
 %%PORTDOCS%%%%DOCSDIR%%/manual.pdf
 %%PORTDOCS%%%%DOCSDIR%%/primer.pdf
 %%PORTDOCS%%%%DOCSDIR%%/sl.pdf
 %%DATADIR%%/reduce
 %%DATADIR%%/reduce.doc/BINARY-LICENSE.txt
 %%DATADIR%%/reduce.doc/BSD-LICENSE.txt
 %%DATADIR%%/reduce.doc/LGPL-2.1.txt
 %%DATADIR%%/reduce.doc/abstract.tex
 %%DATADIR%%/reduce.doc/acknowl.tex
 %%DATADIR%%/reduce.doc/appenda.tex
 %%DATADIR%%/reduce.doc/aprop.tex
 %%DATADIR%%/reduce.doc/cfrac.tex
 %%DATADIR%%/reduce.doc/command.tex
 %%DATADIR%%/reduce.doc/convert.tex
 %%DATADIR%%/reduce.doc/exprn.tex
 %%DATADIR%%/reduce.doc/header.tex
 %%DATADIR%%/reduce.doc/hephys.tex
 %%DATADIR%%/reduce.doc/heugcd.tex
 %%DATADIR%%/reduce.doc/index.html
 %%DATADIR%%/reduce.doc/inter.tex
 %%DATADIR%%/reduce.doc/intro.tex
 %%DATADIR%%/reduce.doc/io.tex
 %%DATADIR%%/reduce.doc/list.tex
 %%DATADIR%%/reduce.doc/macros.tex
 %%DATADIR%%/reduce.doc/maintain.tex
 %%DATADIR%%/reduce.doc/manual.tex
 %%DATADIR%%/reduce.doc/map.tex
 %%DATADIR%%/reduce.doc/matrix.tex
 %%DATADIR%%/reduce.doc/oper.tex
 %%DATADIR%%/reduce.doc/oper2.tex
 %%DATADIR%%/reduce.doc/polyrat.tex
 %%DATADIR%%/reduce.doc/proc.tex
 %%DATADIR%%/reduce.doc/progstr.tex
 %%DATADIR%%/reduce.doc/r38_0001.html
 %%DATADIR%%/reduce.doc/r38_0050.html
 %%DATADIR%%/reduce.doc/r38_0100.html
 %%DATADIR%%/reduce.doc/r38_0150.html
 %%DATADIR%%/reduce.doc/r38_0200.html
 %%DATADIR%%/reduce.doc/r38_0250.html
 %%DATADIR%%/reduce.doc/r38_0300.html
 %%DATADIR%%/reduce.doc/r38_0350.html
 %%DATADIR%%/reduce.doc/r38_0400.html
 %%DATADIR%%/reduce.doc/r38_0450.html
 %%DATADIR%%/reduce.doc/r38_0500.html
 %%DATADIR%%/reduce.doc/r38_0550.html
 %%DATADIR%%/reduce.doc/r38_0600.html
 %%DATADIR%%/reduce.doc/r38_0650.html
 %%DATADIR%%/reduce.doc/r38_idx.html
 %%DATADIR%%/reduce.doc/redlogo.gif
 %%DATADIR%%/reduce.doc/rememb.tex
 %%DATADIR%%/reduce.doc/rest.tex
 %%DATADIR%%/reduce.doc/rlisp88.tex
 %%DATADIR%%/reduce.doc/rlispref.tex
 %%DATADIR%%/reduce.doc/solve.tex
 %%DATADIR%%/reduce.doc/statemnt.tex
 %%DATADIR%%/reduce.doc/structr.tex
 %%DATADIR%%/reduce.doc/subst.tex
 %%DATADIR%%/reduce.doc/symbolic.tex
 %%DATADIR%%/reduce.doc/title.tex
 %%DATADIR%%/reduce.doc/util.tex
 %%DATADIR%%/reduce.fonts/README
 %%DATADIR%%/reduce.fonts/README.BaKoMa
 %%DATADIR%%/reduce.fonts/README.cmps-fonts
 %%DATADIR%%/reduce.fonts/cmex10.pfa
 %%DATADIR%%/reduce.fonts/cmex10.pfb
 %%DATADIR%%/reduce.fonts/cmex10.ttf
 %%DATADIR%%/reduce.fonts/cmex7.ttf
 %%DATADIR%%/reduce.fonts/cmex8.ttf
 %%DATADIR%%/reduce.fonts/cmex9.ttf
 %%DATADIR%%/reduce.fonts/cmmi10.pfa
 %%DATADIR%%/reduce.fonts/cmmi10.pfb
 %%DATADIR%%/reduce.fonts/cmmi10.ttf
 %%DATADIR%%/reduce.fonts/cmmi12.ttf
 %%DATADIR%%/reduce.fonts/cmmi5.ttf
 %%DATADIR%%/reduce.fonts/cmmi6.ttf
 %%DATADIR%%/reduce.fonts/cmmi7.ttf
 %%DATADIR%%/reduce.fonts/cmmi8.ttf
 %%DATADIR%%/reduce.fonts/cmmi9.ttf
 %%DATADIR%%/reduce.fonts/cmr10.pfa
 %%DATADIR%%/reduce.fonts/cmr10.pfb
 %%DATADIR%%/reduce.fonts/cmr10.ttf
 %%DATADIR%%/reduce.fonts/cmr12.ttf
 %%DATADIR%%/reduce.fonts/cmr17.ttf
 %%DATADIR%%/reduce.fonts/cmr5.ttf
 %%DATADIR%%/reduce.fonts/cmr6.ttf
 %%DATADIR%%/reduce.fonts/cmr7.ttf
 %%DATADIR%%/reduce.fonts/cmr8.ttf
 %%DATADIR%%/reduce.fonts/cmr9.ttf
 %%DATADIR%%/reduce.fonts/cmsy10.pfa
 %%DATADIR%%/reduce.fonts/cmsy10.pfb
 %%DATADIR%%/reduce.fonts/cmsy10.ttf
 %%DATADIR%%/reduce.fonts/cmsy5.ttf
 %%DATADIR%%/reduce.fonts/cmsy6.ttf
 %%DATADIR%%/reduce.fonts/cmsy7.ttf
 %%DATADIR%%/reduce.fonts/cmsy8.ttf
 %%DATADIR%%/reduce.fonts/cmsy9.ttf
 %%DATADIR%%/reduce.fonts/cmuntt.pfb
 %%DATADIR%%/reduce.fonts/cmuntt.ttf
 %%DATADIR%%/reduce.fonts/fonts.dir
 %%DATADIR%%/reduce.fonts/fonts.scale
 %%DATADIR%%/reduce.fonts/pfmfiles/cmex10.pfm
 %%DATADIR%%/reduce.fonts/pfmfiles/cmmi10.pfm
 %%DATADIR%%/reduce.fonts/pfmfiles/cmr10.pfm
 %%DATADIR%%/reduce.fonts/pfmfiles/cmsy10.pfm
 %%DATADIR%%/reduce.fonts/src/cmex10.asm.gz
 %%DATADIR%%/reduce.fonts/src/cmmi10.asm.gz
 %%DATADIR%%/reduce.fonts/src/cmr10.asm.gz
 %%DATADIR%%/reduce.fonts/src/cmsy10.asm.gz
 %%DATADIR%%/reduce.img