diff --git a/devel/rubygem-docopt/Makefile b/devel/rubygem-docopt/Makefile
index 2dd1083dacb4..58e91fb751da 100644
--- a/devel/rubygem-docopt/Makefile
+++ b/devel/rubygem-docopt/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	docopt
 DISTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	salvadore@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Parse command line arguments based on nothing more than a usage message
 WWW=		https://github.com/docopt/docopt.rb
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gem python:env shebangfix
 
 SHEBANG_FILES=	test/language_agnostic_tester.py
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/games/dreamchess/Makefile b/games/dreamchess/Makefile
index be8b13a168c1..1bd8294608f3 100644
--- a/games/dreamchess/Makefile
+++ b/games/dreamchess/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	dreamchess
 DISTVERSION=	0.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 
-MAINTAINER=	salvadore@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL chess game
 WWW=		https://www.dreamchess.org
 
 LICENSE=	BSD2CLAUSE BSD3CLAUSE GPLv3+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/LICENSE.txt
 LICENSE_DISTFILES_BSD2CLAUSE=		${DISTFILES:N*music*}
 LICENSE_DISTFILES_BSD3CLAUSE=		${DISTFILES:N*music*}
 LICENSE_DISTFILES_CC-BY-NC-ND-3.0=	${DISTFILES:M*music*:S/:music//}
 LICENSE_DISTFILES_GPLv3+ =		${DISTFILES:N*music*}
 
 BUILD_DEPENDS=	flex:textproc/flex
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		bison cmake gl sdl
 USE_GITHUB=	yes
 USE_GL=		gl glew glu
 USE_SDL=	image2 mixer2
 
 PLIST_FILES=	bin/dreamchess \
 		bin/dreamer \
 		share/applications/dreamchess.desktop \
 		share/icons/hicolor/256x256/apps/dreamchess.png \
 		share/icons/hicolor/48x48/apps/dreamchess.png \
 		share/man/man6/dreamchess.6.gz \
 		share/man/man6/dreamer.6.gz
 
 PORTDATA=	*
 PORTDOCS=	AUTHORS.txt
 
 OPTIONS_DEFINE=		DOCS MUSIC
 OPTIONS_DEFAULT=	MUSIC
 
 MUSIC_DESC=		Install DreamChess music
 MUSIC_GH_PROJECT=	${PORTNAME}-music:music
 MUSIC_GH_TAGNAME=	1.0:music
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMUSIC}
 LICENSE+=	CC-BY-NC-ND-3.0
 .endif
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MV} ${STAGEDIR}${PREFIX}/share/doc/DreamChess/AUTHORS.txt ${STAGEDIR}${DOCSDIR}
 	${RM} -R ${STAGEDIR}${PREFIX}/share/doc/DreamChess
 
 post-install-DOCS-off:
 	${RM} -R ${STAGEDIR}${PREFIX}/share/doc/DreamChess
 
 post-install-MUSIC-on:
 	cd ${WRKDIR}/${PORTNAME}-music-${MUSIC_GH_TAGNAME:S/:music//}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/math/armadillo/Makefile b/math/armadillo/Makefile
index 05a40654f19e..6ea088e1612a 100644
--- a/math/armadillo/Makefile
+++ b/math/armadillo/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	armadillo
 DISTVERSION=	12.6.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/arma
 
-MAINTAINER=	salvadore@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ linear algebra library
 WWW=		https://arma.sourceforge.net/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		liblapack.so:math/lapack \
 		libsuperlu.so:math/superlu
 
 USES=		blaslapack:openblas cmake:testing compiler:c++11-lang pkgconfig tar:xz
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DPKG_CONFIG_DIR=${LOCALBASE}/libdata/pkgconfig/
 CMAKE_OFF=	BUILD_SMOKE_TEST
 CMAKE_TESTING_ON=	BUILD_SMOKE_TEST
 
 .include <bsd.port.mk>
diff --git a/math/cocoalib/Makefile b/math/cocoalib/Makefile
index 53015ae266b7..b3ba3b89459d 100644
--- a/math/cocoalib/Makefile
+++ b/math/cocoalib/Makefile
@@ -1,115 +1,116 @@
 PORTNAME=	cocoalib
 DISTVERSION=	0.99800
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://cocoa.dima.unige.it/cocoa/cocoalib/tgz/
 DISTNAME=	CoCoALib-${DISTVERSION}
 
-MAINTAINER=	salvadore@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ library for doing Computations in Commutative Algebra
 WWW=		https://cocoa.dima.unige.it
 
 LICENSE=			GPLv3+ GFDL PD
 LICENSE_COMB=			multi
 LICENSE_FILE_GPLv3+ =		${WRKSRC}/COPYRIGHT-full-text
 LICENSE_FILE_GFDL=		${WRKSRC}/doc/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		compiler:c++11-lang localbase:ldflag shebangfix tar:tgz
 USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 
 SHEBANG_GLOB=	*.sh
 
 CXXFLAGS+=	-I${WRKSRC}/include \
 		-I${WRKSRC}/src/AlgebraicCore/TmpFactorDir \
 		-I${WRKSRC}/src/AlgebraicCore/TmpFactorDir/multivariate \
 		-I${WRKSRC}/src/AlgebraicCore/TmpFactorDir/linalg \
 		-DCoCoA_ULONG2LONG=1 \
 		-DCoCoA_ULONGLONG2LONGLONG=1 \
 		-fPIC
 LDFLAGS+=	-L${BUILD_WRKSRC} -lcocoa -lgmp
 
 BUILD_WRKSRC=	${WRKSRC}/src/AlgebraicCore
 
 TEST_TARGET=	all
 TEST_WRKSRC=	${WRKSRC}/src/tests
 
 PREPROCESSOR_DEFNS=	${WRKSRC}/include/CoCoA/PREPROCESSOR_DEFNS.H
 
 OPTIONS_DEFINE=		BOOST DOCS EXAMPLES FROBBY GFAN \
 			GSL NORMALIZ SMALLDEG TEST
 
 FROBBY_DESC=		Link with libfrobby.a
 GFAN_DESC=		Link with libgfan.a
 GSL_DESC=		Link with libgsl.a
 NORMALIZ_DESC=		Link with libnormaliz.a (might cause circular dependency)
 SMALLDEG_DESC=		Optimization for small degree polynomials
 
 BOOST_BUILD_DEPENDS=	${LOCALBASE}/include/boost/thread.hpp:devel/boost-libs
 BOOST_CXXFLAGS=		-pthread
 FROBBY_BUILD_DEPENDS=	${LOCALBASE}/lib/libfrobby.a:math/frobby
 GFAN_BUILD_DEPENDS=	${LOCALBASE}/lib/libgfan.a:math/gfanlib
 GSL_BUILD_DEPENDS=	${LOCALBASE}/lib/libgsl.a:math/gsl
 NORMALIZ_BUILD_DEPENDS=	${LOCALBASE}/lib/libnormaliz.a:math/libnormaliz
 SMALLDEG_EXTRA_PATCHES=	${FILESDIR}/extra-patch-include-CoCoA_config.H
 
 pre-configure:
 	${REINPLACE_CMD} "s,%%DISTVERSION%%,${DISTVERSION},g" ${BUILD_WRKSRC}/Makefile
 
 do-configure-BOOST-on:
 	${ECHO_CMD} "#define COCOA_WITH_BOOST" >> ${PREPROCESSOR_DEFNS}
 
 do-configure-BOOST-off:
 	${ECHO_CMD} "#undef COCOA_WITH_BOOST" >> ${PREPROCESSOR_DEFNS}
 
 do-configure-FROBBY-on:
 	${ECHO_CMD} "#define COCOA_WITH_FROBBY" >> ${PREPROCESSOR_DEFNS}
 
 do-configure-FROBBY-off:
 	${ECHO_CMD} "#undef COCOA_WITH_FROBBY" >> ${PREPROCESSOR_DEFNS}
 
 do-configure-GFAN-on:
 	${ECHO_CMD} "#define COCOA_WITH_GFAN" >> ${PREPROCESSOR_DEFNS}
 
 do-configure-GFAN-off:
 	${ECHO_CMD} "#undef COCOA_WITH_GFAN" >> ${PREPROCESSOR_DEFNS}
 
 do-configure-GSL-on:
 	${ECHO_CMD} "#define COCOA_WITH_GSL" >> ${PREPROCESSOR_DEFNS}
 
 do-configure-GSL-off:
 	${ECHO_CMD} "#undef COCOA_WITH_GSL" >> ${PREPROCESSOR_DEFNS}
 
 do-configure-NORMALIZ-on:
 	${ECHO_CMD} "#define COCOA_WITH_NORMALIZ" >> ${PREPROCESSOR_DEFNS}
 
 do-configure-NORMALIZ-off:
 	${ECHO_CMD} "#undef COCOA_WITH_NORMALIZ" >> ${PREPROCESSOR_DEFNS}
 
 pre-build:
 	cd ${WRKSRC}/include/CoCoA && ./MakeUnifiedHeader.sh --check
 
 post-build-TEST-on: do-test
 
 do-install:
 	${INSTALL_DATA} ${BUILD_WRKSRC}/libcocoa.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${BUILD_WRKSRC}/libcocoa.so.0 ${STAGEDIR}${PREFIX}/lib
 	cd ${STAGEDIR}${PREFIX}/lib &&	\
 	${LN} -sf libcocoa.so.0 ${STAGEDIR}${PREFIX}/lib/libcocoa.so
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/CoCoA
 	cd ${WRKSRC}/include/CoCoA && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/CoCoA '-name *\.H -a ! -name \._*'
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	${INSTALL_MAN} ${WRKSRC}/doc/CoCoALib.pdf ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html '! -name \._*'
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_MAN} ${WRKSRC}/examples/index.html ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} '-name ex-*\.C'
 
 .include <bsd.port.mk>
diff --git a/math/frobby/Makefile b/math/frobby/Makefile
index f4530ff13ed3..5bc61f13eb0f 100644
--- a/math/frobby/Makefile
+++ b/math/frobby/Makefile
@@ -1,101 +1,101 @@
 PORTNAME=	frobby
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	5b9e4ac4057f5693f53c321eeb5bfb387f6b69fb.patch:-p1
 
-MAINTAINER=	salvadore@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Software system and project for computations with monomial ideals
 WWW=		https://github.com/Macaulay2/frobby
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		gmake localbase:ldflags shebangfix
 USE_CXXSTD=	c++14
 USE_GITHUB=	yes
 GH_ACCOUNT=	Macaulay2
 
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	test/latticeFormats/runtest* test/runSplitTests test/runTests \
 		test/testScripts/*
 
 MAKE_ENV=	RANLIB=${RANLIB}
 
 ALL_TARGET=	# Empty
 
 OPTIONS_DEFINE=		DOCS LIBDOCS STATIC TEST
 OPTIONS_DEFAULT=	STATIC
 OPTIONS_SUB=		yes
 LIBDOCS_DESC=		Build and install documentation for frobby library
 DOCS_BUILD_DEPENDS=	dvips:print/tex-dvipsk \
 			latex:print/tex-formats
 LIBDOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			dvips:print/tex-dvipsk \
 			epstopdf:print/texlive-base \
 			latex:print/tex-formats
 TEST_BUILD_DEPENDS=	bash:shells/bash
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSTATIC}
 PLIST_SUB+=	LIBRARY="" \
 		NO_LIBRARY="@comment "
 .else
 PLIST_SUB+=	LIBRARY="@comment " \
 		NO_LIBRARY=""
 .endif
 
 # The following variables should be defined to the same values
 # that can be found in ${WRKSRC}/Makefile
 FROBBY_SOVERSION=	1
 FROBBY_AGE=		0
 FROBBY_REVISION=	0
 FROBBY_VERSION=		${FROBBY_SOVERSION}.${FROBBY_AGE}.${FROBBY_REVISION}
 
 do-build-DOCS-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} doc
 
 do-build-LIBDOCS-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} develDoc
 
 do-build-STATIC-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} library
 
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} MODE=shared library
 
 post-build-TEST-on:
 	cd ${WRKSRC} && test/runTests _full
 	cd ${WRKSRC} && test/runSplitTests _full
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/release/frobby ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/src/frobby.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_LIB} ${WRKSRC}/bin/libfrobby.so.${FROBBY_VERSION} ${STAGEDIR}${PREFIX}/lib/libfrobby.so.${FROBBY_VERSION}
 	cd ${STAGEDIR}${PREFIX}/lib && \
 		${RLN} libfrobby.so.${FROBBY_VERSION} ${STAGEDIR}${PREFIX}/lib/libfrobby.so && \
 		${RLN} libfrobby.so.${FROBBY_VERSION} ${STAGEDIR}${PREFIX}/lib/libfrobby.so.${FROBBY_SOVERSION}
 
 do-install-STATIC-on:
 	${INSTALL_DATA} ${WRKSRC}/src/frobby.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/bin/libfrobby.a ${STAGEDIR}${PREFIX}/lib
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/bin/manual.ps ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/bin/manual.pdf ${STAGEDIR}${DOCSDIR}
 
 do-install-LIBDOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/bin/develDoc/develDoc.ps ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/bin/develDoc/develDoc.pdf ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/bin/develDoc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/ised/Makefile b/math/ised/Makefile
index 5766809c87ab..c530c4271019 100644
--- a/math/ised/Makefile
+++ b/math/ised/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	ised
 PORTVERSION=	2.7.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}
 
-MAINTAINER=	salvadore@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for generating number sequences and arithmetic evaluation
 WWW=		https://ised.sourceforge.net/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		libedit tar:bzip2
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 64498e779e67..986783c8fbad 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -1,140 +1,140 @@
 PORTNAME=	maxima
 PORTVERSION=	5.47.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math lisp tk
 MASTER_SITES=	SF/maxima/Maxima-source/${PORTVERSION}-source
 
-MAINTAINER=	salvadore@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Symbolic mathematics program
 WWW=		http://maxima.sourceforge.net/
 
 LICENSE=	BSD3CLAUSE GPLv2 MAXIMAEXTRACLAUSE
 LICENSE_COMB=	multi
 LICENSE_NAME_MAXIMAEXTRACLAUSE=	Maxima extra clause
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSES/getopt-license.txt
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_MAXIMAEXTRACLAUSE=	${FILESDIR}/license-extra-clause.txt
 LICENSE_PERMS_MAXIMAEXTRACLAUSE=	dist-mirror dist-sell pkg-mirror \
 					pkg-sell auto-accept
 
 RUN_DEPENDS=	gnuplot:math/gnuplot \
 		rlwrap:devel/rlwrap
 
 USES=		autoreconf gmake makeinfo shared-mime-info
 
 GNU_CONFIGURE=	yes
 
 TEST_TARGET=	check
 
 INFO=		imaxima maxima xmaxima abs_integrate drawutils kovacicODE logic \
 		nelder_mead symplectic_ode
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 PORTDATA=	*
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		DOCS EXAMPLES MANPAGES NOUSERINIT SAGE TEST XMAXIMA
 OPTIONS_DEFAULT=	ECL MANPAGES NOUSERINIT SAGE TEST XMAXIMA
 OPTIONS_SINGLE=		LISP
 OPTIONS_SINGLE_LISP=	CCL ECL SBCL
 
 OPTIONS_SUB=	yes
 
 CCL_DESC=		Build with Clozure Common Lisp
 ECL_DESC=		Build with Embedabble Common Lisp
 NOUSERINIT_DESC=	Do not load user init file for lisp (only for sbcl)
 SAGE_DESC=		Build with patches from Sage (implies ECL)
 SBCL_DESC=		Build with Steel Bank Common Lisp
 XMAXIMA_DESC=		Install xmaxima (implies DOCS and TEST)
 
 CCL_BUILD_DEPENDS=	ccl:lang/ccl
 CCL_RUN_DEPENDS=	ccl:lang/ccl
 CCL_CONFIGURE_ON=	--with-ccl=ccl
 CCL_PLIST_SUB=		BINDIR=binary-openmcl \
 			BINNAME=maxima.image
 CCL_VARS=		NO_ARCH=yes
 
 ECL_BUILD_DEPENDS=	ecl:lang/ecl
 ECL_LIB_DEPENDS=	libffi.so:devel/libffi \
 			libgc-threaded.so:devel/boehm-gc-threaded \
 			libgc.so:devel/boehm-gc \
 			libgmp.so:math/gmp
 ECL_RUN_DEPENDS=	ecl:lang/ecl
 # libgc-threaded.so is really only used when ecl is built with THREADS on,
 # which is the default. See https://reviews.freebsd.org/D24959 for more
 # details.
 ECL_CONFIGURE_ON=	--with-ecl=ecl
 ECL_PLIST_SUB=		BINDIR=binary-ecl \
 			BINNAME=maxima
 
 NOUSERINIT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nouserinit-src_maxima.in
 
 SAGE_IMPLIES=		ECL
 SAGE_BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 SAGE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-share_linearalgebra_matrixexp.lisp \
 			${PATCHDIR}/extra-patch-src_grind.lisp \
 			${PATCHDIR}/extra-patch-src_hayat.lisp \
 			${PATCHDIR}/extra-patch-src_init-cl.lisp
 
 SBCL_BUILD_DEPENDS=	sbcl:lang/sbcl
 SBCL_RUN_DEPENDS=	sbcl:lang/sbcl
 SBCL_CONFIGURE_ON=	--enable-sbcl
 SBCL_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-sbcl-src_maxima.in
 SBCL_PLIST_SUB=		BINDIR=binary-sbcl \
 			BINNAME=maxima_core
 SBCL_VARS=		NO_ARCH=yes
 
 TEST_BUILD_DEPENDS=	gnuplot:math/gnuplot \
 			rlwrap:devel/rlwrap
 
 XMAXIMA_IMPLIES=		DOCS TEST
 XMAXIMA_USES=			tk
 XMAXIMA_CONFIGURE_WITH=		wish=${WISH}
 XMAXIMA_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-interfaces_Makefile.am
 
 post-patch:
 	${GREP} -Fe '.core' -l -r ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} 's;\.core;_core;g'
 	${REINPLACE_CMD} "s;tclsh;${TCLSH};g" ${WRKSRC}/interfaces/xmaxima/Makefile.in
 	${REINPLACE_CMD} "s;/usr;${LOCALBASE};g" ${WRKSRC}/src/intl.lisp
 
 post-patch-TEST-off:
 	${REINPLACE_CMD} 's;tests;;' ${WRKSRC}/Makefile.am
 
 post-patch-XMAXIMA-on:
 	${REINPLACE_CMD} "s;%%DOCSDIR%%;/${DOCSDIR:S,/, ,g};" \
 	${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:
 	cd ${WRKSRC}/src/ && ${MKDIR} binary-ccl && ${LN} -s binary-ccl binary-openmcl
 
 post-build-MANPAGES-on:
 	${GZIP_CMD} ${WRKSRC}/doc/man/maxima.1
 
 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}
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/info && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} '-name maxima*\.html'
 
 post-install-ECL-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/ecl
 	${INSTALL_LIB} ${WRKSRC}/src/binary-ecl/maxima.fas \
 		${STAGEDIR}${PREFIX}/lib/ecl
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/maxima/${PORTVERSION}/binary-ecl/maxima
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} '-name *\.dem'
 
 post-install-MANPAGES-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/man/man1 && \
 	${INSTALL_MAN} ${WRKSRC}/doc/man/maxima.1.gz ${STAGEDIR}${PREFIX}/man/man1/maxima.1.gz
 
 .include <bsd.port.mk>
diff --git a/math/wxmaxima/Makefile b/math/wxmaxima/Makefile
index c0401fcceb89..d636fb6a4c27 100644
--- a/math/wxmaxima/Makefile
+++ b/math/wxmaxima/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	wxmaxima
 PORTVERSION=	23.12.0
 DISTVERSIONPREFIX=	Version-
+PORTREVISION=	1
 CATEGORIES=	math
 
-MAINTAINER=	salvadore@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	WxWidgets GUI for the computer algebra system maxima
 WWW=		https://wxmaxima-developers.github.io/wxmaxima/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	maxima:math/maxima
 
 USES=		cmake compiler:c++14-lang desktop-file-utils shared-mime-info
 USE_GITHUB=	yes
 GH_ACCOUNT=	wxMaxima-Developers
 
 USE_WX=		3.0
 WX_COMPS=	wx
 WX_CONF_ARGS=	absolute
 
 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile
index 0a8afdf21236..f6f595c23d8f 100644
--- a/print/qpdfview/Makefile
+++ b/print/qpdfview/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	qpdfview
 DISTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	https://launchpad.net/${PORTNAME}/trunk/${DISTVERSION}/+download/
 DISTNAME=	${PORTNAME}-0.5
 
-MAINTAINER=	salvadore@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tabbed DjVu/PDF/PS document viewer
 WWW=		https://launchpad.net/qpdfview
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
 
 USES=		compiler:c++17-lang desktop-file-utils gl pkgconfig qmake qt:5
 USE_GL=		gl
 USE_LDCONFIG=	yes
 USE_QT=		concurrent core dbus gui imageformats linguisttools \
 		printsupport sql sql-sqlite3 svg widgets xml buildtools:build
 
 QMAKE_SOURCE_PATH=	${PORTNAME}.pro
 
 DATADIR=	${PREFIX}/share/${PORTNAME}
 
 OPTIONS_DEFINE=		CUPS DJVU PS
 OPTIONS_DEFAULT=	CUPS DJVU PS
 OPTIONS_SUB=		yes
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_QMAKE_OFF=		"CONFIG+=without_cups"
 
 DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
 DJVU_QMAKE_OFF=		"CONFIG+=without_djvu"
 
 PS_LIB_DEPENDS=	libspectre.so:print/libspectre
 PS_QMAKE_OFF=	"CONFIG+=without_ps"
 
 .include <bsd.port.options.mk>
 
 pre-configure:
 	${REINPLACE_CMD} -e 's#/usr#${PREFIX}#g;s#${PREFIX}/share/man#${PREFIX}/man#g' \
 		${WRKSRC}/${PORTNAME}.pri
 	cd ${WRKSRC} && ${LRELEASE} ${PORTNAME}.pro
 
 .include <bsd.port.mk>
diff --git a/science/massxpert/Makefile b/science/massxpert/Makefile
index e4aefe3ff966..af5fd4ad4209 100644
--- a/science/massxpert/Makefile
+++ b/science/massxpert/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	massxpert
 DISTVERSION=	6.0.3
+PORTREVISION=	1
 CATEGORIES=	science
 
-MAINTAINER=	salvadore@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Software suite for (bio)chemists
 WWW=		http://www.msxpertsuite.org
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png
 
 USES=		cmake compiler:c++17-lang gnome qt:5 xorg
 USE_GITLAB=	yes
 GL_SITE=	https://salsa.debian.org/
 GL_ACCOUNT=	debichem-team
 GL_TAGNAME=	a21ad33eee0314df202146392023dfb3868b7d84
 USE_GNOME=	glib20
 USE_QT=		core gui printsupport svg widgets xml buildtools:build \
 		qmake:build
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
 
 .include <bsd.port.mk>