diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 17029347b120..d62ad4ee5582 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,210 +1,210 @@
 PORTNAME=	clisp
 PORTVERSION=	2.49.93+
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang lisp
 
 MAINTAINER=	kiri@TrueFC.org
 COMMENT=	Common Lisp implementation
 WWW=		https://www.gnu.org/software/clisp/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/GNU-GPL
 
 LIB_DEPENDS=	libffcall.so:devel/libffcall \
 		libreadline.so:devel/readline \
 		libsigsegv.so:devel/libsigsegv
 
 USES=		compiler gettext ghostscript gnome iconv localbase:ldflags
 USE_GCC=	yes
 USE_GITLAB=	yes
 
 GL_ACCOUNT=	gnu-clisp
 GL_PROJECT=	clisp
 GL_TAGNAME=	df3b9f6fdcff22832898e89a989eb499c0f842ed
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	FORCE_UNSAFE_CONFIGURE=1
-CONFIGURE_ARGS=	--prefix="${PREFIX}" --mandir="${MANPREFIX}/man" \
+CONFIGURE_ARGS=	--prefix="${PREFIX}" --mandir="${PREFIX}/share/man" \
 		--elispdir="${DATADIR}/emacs" --vimdir="${DATADIR}/vim" \
 		--docdir="${DOCSDIR}" --with-libiconv=${ICONV_PREFIX}
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
 # Complaints if the environment changes between build stages.
 LDFLAGS+=	${LDFLAGS_${CHOSEN_COMPILER_TYPE}}
 LDFLAGS_gcc=	-lthr
 MAKE_ENV=	${CONFIGURE_ENV}
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	ASDF BDB CLX_MIT CLX_NEW DBUS FASTCGI GDBM GLIBC GTK2 \
 		JITC MATLAB NETICA ORACLE PARI PCRE PGSQL QUEENS RAWSOCK \
 		SVM THREADS ZLIB
 ASDF_DESC=	Another System Definition Facility
 BDB_DESC=	Interface to Berkeley DB from Sleepycat Software
 CLX_MIT_DESC=	Classical X11 Interface
 CLX_NEW_DESC=	Faster X11 Interface (replaces clx/mit-clx)
 DBUS_DESC=	Interface to the D-Bus message bus system
 FASTCGI_DESC=	FastCGI interface for web development
 GDBM_DESC=	Interface to GNU DBM
 GLIBC_DESC=	Interface to most of the GNU libc library
 GTK2_DESC=	Interface to the GTK library using glade
 JITC_DESC=	Use a given Just-In-Time Compiler
 SVM_DESC=	Support Vector Machine predictive analytics
 MATLAB_DESC=	Matrix calculations using Matlab
 NETICA_DESC=	Bayesian belief networks and influence diagrams
 ORACLE_DESC=	Oracle RDMBS interface
 PARI_DESC=	PARI Computer Algebra System
 PCRE_DESC=	Perl-compatible regular expressions
 PGSQL_DESC=	PostGreSQL RDMBS interface
 QUEENS_DESC=	The Queens Function (a toy example)
 RAWSOCK_DESC=	Low level socket interface
 THREADS_DESC=	Multithreaded Support (Experimental)
 ZLIB_DESC=	Compress vectors
 
 OPTIONS_RADIO=	CLX
 OPTIONS_RADIO_CLX=	CLX_MIT CLX_NEW
 CLX_DESC=	X11 Module Selection
 
 OPTIONS_DEFAULT=BDB RAWSOCK ZLIB
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
 
 # Segmentation fault in amd64 when using 'mmap(2)', errno = EINVAL.
 .if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=--disable-mmap
 .endif
 
 MODULES=	ASDF BDB CLX_MIT CLX_NEW DBUS FASTCGI GDBM GLIBC GTK2 \
 		JITC MATLAB NETICA ORACLE PARI PCRE PGSQL QUEENS RAWSOCK \
 		SVM ZLIB
 
 .for mod in ${MODULES}
 .   if ${PORT_OPTIONS:M${mod}}
 PLIST_SUB+=	${mod}=""
 .   else
 PLIST_SUB+=	${mod}="@comment "
 .   endif
 .endfor
 
 .if ${PORT_OPTIONS:MASDF}
 CONFIGURE_ARGS+=--with-module=asdf
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
 USES+=		bdb
 CONFIGURE_ARGS+=--with-module=berkeley-db
 CPPFLAGS+=	-I${LOCALBASE}/include/db${BDB_VER}
 LDFLAGS+=	-L${LOCALBASE}/lib/db${BDB_VER}
 .endif
 
 .if ${PORT_OPTIONS:MCLX_MIT} || ${PORT_OPTIONS:MCLX_NEW}
 USES+=		xorg
 USE_XORG=	x11
 .endif
 .if ${PORT_OPTIONS:MCLX_MIT}
 CONFIGURE_ARGS+=--with-module=clx/mit-clx
 .endif
 .if ${PORT_OPTIONS:MCLX_NEW}
 CONFIGURE_ARGS+=--with-module=clx/new-clx
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=	libdbus-1.so:devel/dbus
 CONFIGURE_ARGS+=--with-module=dbus
 .endif
 
 .if ${PORT_OPTIONS:MFASTCGI}
 LIB_DEPENDS+=	libfcgi.so:www/fcgi
 CONFIGURE_ARGS+=--with-module=fastcgi
 .endif
 
 .if ${PORT_OPTIONS:MGDBM}
 LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 CONFIGURE_ARGS+=--with-module=gdbm
 .endif
 
 .if ${PORT_OPTIONS:MGLIBC}
 USE_LINUX=	base
 CONFIGURE_ARGS+=--with-module=bindings/glibc
 .endif
 
 .if ${PORT_OPTIONS:MGTK2}
 USES+=		gnome
 USE_GNOME=	gtk20 libglade2
 CONFIGURE_ARGS+=--with-module=gtk2
 .endif
 
 .if ${PORT_OPTIONS:MJITC}
 BUILD_DEPENDS+=	${LOCALBASE}/include/lightning.h:devel/lightning
 LIB_DEPENDS+=	liblightning.so:devel/lightning
 CONFIGURE_ARGS+=--with-jitc=lightning
 .endif
 
 .if ${PORT_OPTIONS:MMATLAB}
 CONFIGURE_ARGS+=--with-module=matlab
 .endif
 
 .if ${PORT_OPTIONS:MNETICA}
 CONFIGURE_ARGS+=--with-module=netica
 .endif
 
 .if ${PORT_OPTIONS:MORACLE}
 CONFIGURE_ARGS+=--with-module=oracle
 .endif
 
 .if ${PORT_OPTIONS:MPARI}
 LIB_DEPENDS+=	libpari.so:math/pari
 CONFIGURE_ARGS+=--with-module=pari
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
 LIB_DEPENDS+=	libpcre.so:devel/pcre
 CONFIGURE_ARGS+=--with-module=pcre
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
 CONFIGURE_ARGS+=--with-module=postgresql
 .endif
 
 .if ${PORT_OPTIONS:MQUEENS}
 CONFIGURE_ARGS+=--with-module=queens
 .endif
 
 .if ${PORT_OPTIONS:MRAWSOCK}
 CONFIGURE_ARGS+=--with-module=rawsock
 .endif
 
 .if ${PORT_OPTIONS:MSVM}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/svm-predict:science/libsvm
 CONFIGURE_ARGS+=--with-module=libsvm
 .endif
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=--with-threads=POSIX_THREADS \
 		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
 PKGNAMESUFFIX=	-threaded
 .endif
 
 .if ${PORT_OPTIONS:MZLIB}
 CONFIGURE_ARGS+=--with-module=zlib
 .endif
 
 post-patch:
 .if ${PORT_OPTIONS:MORACLE}
 	@${REINPLACE_CMD} -e 's|-ldl||; s|-lpthread|-lcompat ${PTHREAD_LIBS}|' \
 		${WRKSRC}/modules/oracle/link.sh.in
 .endif
 
 pre-install:
 .if ${PORT_OPTIONS:MCLX_MIT}
 	${CP} ${WRKSRC}/modules/clx/mit-clx/README.CLISP \
 		${WRKSRC}/src/clx/mit-clx/README.CLISP
 .endif
 
 post-install:
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.mk>
diff --git a/lang/clisp/pkg-plist b/lang/clisp/pkg-plist
index 14dd788bba50..a30350b1cd80 100644
--- a/lang/clisp/pkg-plist
+++ b/lang/clisp/pkg-plist
@@ -1,191 +1,191 @@
 bin/clisp
 bin/clisp-link
 %%ASDF%%lib/clisp/asdf/Makefile
 %%ASDF%%lib/clisp/asdf/asdf.fas
 %%ASDF%%lib/clisp/asdf/asdf.lisp
 %%ASDF%%lib/clisp/asdf/link.sh
 lib/clisp/base/calls.o
 lib/clisp/base/gettext.o
 lib/clisp/base/libgnu.a
 lib/clisp/base/libnoreadline.a
 lib/clisp/base/lisp.a
 lib/clisp/base/lisp.run
 lib/clisp/base/lispinit.mem
 lib/clisp/base/makevars
 lib/clisp/base/modules.h
 lib/clisp/base/modules.o
 lib/clisp/base/readline.o
 lib/clisp/base/regexi.o
 %%BDB%%lib/clisp/berkeley-db/Makefile
 %%BDB%%lib/clisp/berkeley-db/bdb.o
 %%BDB%%lib/clisp/berkeley-db/dbi.fas
 %%BDB%%lib/clisp/berkeley-db/dbi.lisp
 %%BDB%%lib/clisp/berkeley-db/link.sh
 %%BDB%%lib/clisp/berkeley-db/preload.lisp
 lib/clisp/build-aux/config.guess
 lib/clisp/build-aux/config.rpath
 lib/clisp/build-aux/config.sub
 lib/clisp/build-aux/depcomp
 lib/clisp/build-aux/install-sh
 %%CLX_MIT%%lib/clisp/clx/mit-clx/Makefile
 %%CLX_MIT%%lib/clisp/clx/mit-clx/README.CLISP
 %%CLX_MIT%%lib/clisp/clx/mit-clx/attributes.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/buffer.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/bufmac.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/clx.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/depdefs.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/dependent.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/describe.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/display.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/fonts.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/gcontext.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/graphics.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/image.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/input.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/keysyms.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/link.sh
 %%CLX_MIT%%lib/clisp/clx/mit-clx/macros.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/manager.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/package.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/requests.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/resource.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/shape.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/text.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/trace.fas
 %%CLX_MIT%%lib/clisp/clx/mit-clx/translate.fas
 lib/clisp/data/Symbol-Table.text
 lib/clisp/data/UnicodeDataFull.txt
 %%DBUS%%lib/clisp/dbus/Makefile
 %%DBUS%%lib/clisp/dbus/dbus.fas
 %%DBUS%%lib/clisp/dbus/dbus.lisp
 %%DBUS%%lib/clisp/dbus/dbus.o
 %%DBUS%%lib/clisp/dbus/link.sh
 %%ASDF%%lib/clisp/dynmod/asdf.lisp
 %%BDB%%lib/clisp/dynmod/bdb.lisp
 %%CLX_MIT%%lib/clisp/dynmod/clx.lisp
 %%DBUS%%lib/clisp/dynmod/dbus.lisp
 %%FASTCGI%%lib/clisp/dynmod/fastcgi.lisp
 %%GDBM%%lib/clisp/dynmod/gdbm.lisp
 %%GTK2%%lib/clisp/dynmod/gtk.lisp
 %%BDB%%lib/clisp/dynmod/lib-bdb.so
 %%DBUS%%lib/clisp/dynmod/lib-dbus.so
 %%FASTCGI%%lib/clisp/dynmod/lib-fastcgi.so
 %%GDBM%%lib/clisp/dynmod/lib-gdbm.so
 %%GTK2%%lib/clisp/dynmod/lib-gtk.so
 %%SVM%%lib/clisp/dynmod/lib-libsvm.so
 %%PCRE%%lib/clisp/dynmod/lib-pcre.so
 %%PGSQL%%lib/clisp/dynmod/lib-postgresql.so
 %%QUEENS%%lib/clisp/dynmod/lib-queens.so
 %%RAWSOCK%%lib/clisp/dynmod/lib-rawsock.so
 %%ZLIB%%lib/clisp/dynmod/lib-zlib.so
 %%SVM%%lib/clisp/dynmod/libsvm.lisp
 %%PCRE%%lib/clisp/dynmod/pcre.lisp
 %%PGSQL%%lib/clisp/dynmod/postgresql.lisp
 %%QUEENS%%lib/clisp/dynmod/queens.lisp
 %%RAWSOCK%%lib/clisp/dynmod/rawsock.lisp
 %%ZLIB%%lib/clisp/dynmod/zlib.lisp
 %%FASTCGI%%lib/clisp/fastcgi/Makefile
 %%FASTCGI%%lib/clisp/fastcgi/README
 %%FASTCGI%%lib/clisp/fastcgi/fastcgi.fas
 %%FASTCGI%%lib/clisp/fastcgi/fastcgi.lisp
 %%FASTCGI%%lib/clisp/fastcgi/fastcgi.o
 %%FASTCGI%%lib/clisp/fastcgi/fastcgi_wrappers.o
 %%FASTCGI%%lib/clisp/fastcgi/link.sh
 %%GDBM%%lib/clisp/gdbm/Makefile
 %%GDBM%%lib/clisp/gdbm/gdbm.fas
 %%GDBM%%lib/clisp/gdbm/gdbm.lisp
 %%GDBM%%lib/clisp/gdbm/gdbm.o
 %%GDBM%%lib/clisp/gdbm/link.sh
 %%GDBM%%lib/clisp/gdbm/preload.lisp
 %%GTK2%%lib/clisp/gtk2/Makefile
 %%GTK2%%lib/clisp/gtk2/gtk-server.cfg
 %%GTK2%%lib/clisp/gtk2/gtk.fas
 %%GTK2%%lib/clisp/gtk2/gtk.lisp
 %%GTK2%%lib/clisp/gtk2/gtk.o
 %%GTK2%%lib/clisp/gtk2/link.sh
 %%GTK2%%lib/clisp/gtk2/preload.lisp
 %%GTK2%%lib/clisp/gtk2/ui.glade
 %%SVM%%lib/clisp/libsvm/Makefile
 %%SVM%%lib/clisp/libsvm/README
 %%SVM%%lib/clisp/libsvm/libsvm.fas
 %%SVM%%lib/clisp/libsvm/libsvm.lisp
 %%SVM%%lib/clisp/libsvm/libsvm.o
 %%SVM%%lib/clisp/libsvm/link.sh
 %%SVM%%lib/clisp/libsvm/preload.lisp
 %%PCRE%%lib/clisp/pcre/Makefile
 %%PCRE%%lib/clisp/pcre/cpcre.o
 %%PCRE%%lib/clisp/pcre/link.sh
 %%PCRE%%lib/clisp/pcre/pcre.fas
 %%PCRE%%lib/clisp/pcre/pcre.lisp
 %%PCRE%%lib/clisp/pcre/preload.lisp
 %%PGSQL%%lib/clisp/postgresql/Makefile
 %%PGSQL%%lib/clisp/postgresql/README
 %%PGSQL%%lib/clisp/postgresql/link.sh
 %%PGSQL%%lib/clisp/postgresql/postgresql.fas
 %%PGSQL%%lib/clisp/postgresql/postgresql.lisp
 %%PGSQL%%lib/clisp/postgresql/postgresql.o
 %%PGSQL%%lib/clisp/postgresql/sql.fas
 %%PGSQL%%lib/clisp/postgresql/sql.lisp
 %%QUEENS%%lib/clisp/queens/Makefile
 %%QUEENS%%lib/clisp/queens/callqueens.o
 %%QUEENS%%lib/clisp/queens/link.sh
 %%QUEENS%%lib/clisp/queens/queens.o
 %%RAWSOCK%%lib/clisp/rawsock/Makefile
 %%RAWSOCK%%lib/clisp/rawsock/demos/README
 %%RAWSOCK%%lib/clisp/rawsock/demos/sniffer.lisp
 %%RAWSOCK%%lib/clisp/rawsock/link.sh
 %%RAWSOCK%%lib/clisp/rawsock/preload.lisp
 %%RAWSOCK%%lib/clisp/rawsock/rawsock.o
 %%RAWSOCK%%lib/clisp/rawsock/sock.fas
 %%RAWSOCK%%lib/clisp/rawsock/sock.lisp
 %%ZLIB%%lib/clisp/zlib/Makefile
 %%ZLIB%%lib/clisp/zlib/link.sh
 %%ZLIB%%lib/clisp/zlib/zlib.fas
 %%ZLIB%%lib/clisp/zlib/zlib.lisp
 %%ZLIB%%lib/clisp/zlib/zlib.o
 lib/clisp/linkkit/clisp.h
 lib/clisp/linkkit/modprep.lisp
 lib/clisp/linkkit/modules.c
-man/man1/clisp-link.1.gz
-man/man1/clisp.1.gz
+share/man/man1/clisp-link.1.gz
+share/man/man1/clisp.1.gz
 share/aclocal/clisp.m4
 %%DATADIR%%/emacs/clhs.el
 %%DATADIR%%/emacs/clisp-coding.el
 %%DATADIR%%/emacs/clisp-ffi.el
 %%DATADIR%%/emacs/clisp-indent.el
 %%DATADIR%%/emacs/clisp-indent.lisp
 %%DATADIR%%/vim/lisp.vim
 %%DOCSDIR%%/ANNOUNCE
 %%DOCSDIR%%/CLOS-guide.txt
 %%DOCSDIR%%/COPYRIGHT
 %%DOCSDIR%%/GNU-GPL
 %%DOCSDIR%%/LISP-tutorial.txt
 %%DOCSDIR%%/MAGIC.add
 %%DOCSDIR%%/NEWS
 %%DOCSDIR%%/README
 %%DOCSDIR%%/README.de
 %%DOCSDIR%%/README.es
 %%DOCSDIR%%/SUMMARY
 %%DOCSDIR%%/clisp-link.1
 %%DOCSDIR%%/clisp-link.html
 %%DOCSDIR%%/clisp.1
 %%DOCSDIR%%/clisp.html
 %%DOCSDIR%%/clisp.png
 %%DOCSDIR%%/impnotes.css
 %%DOCSDIR%%/impnotes.html
 share/locale/da/LC_MESSAGES/clisp.mo
 share/locale/da/LC_MESSAGES/clisplow.mo
 share/locale/de/LC_MESSAGES/clisp.mo
 share/locale/de/LC_MESSAGES/clisplow.mo
 share/locale/en/LC_MESSAGES/clisp.mo
 share/locale/en/LC_MESSAGES/clisplow.mo
 share/locale/es/LC_MESSAGES/clisp.mo
 share/locale/es/LC_MESSAGES/clisplow.mo
 share/locale/fr/LC_MESSAGES/clisp.mo
 share/locale/fr/LC_MESSAGES/clisplow.mo
 share/locale/nl/LC_MESSAGES/clisp.mo
 share/locale/nl/LC_MESSAGES/clisplow.mo
 share/locale/ru/LC_MESSAGES/clisp.mo
 share/locale/ru/LC_MESSAGES/clisplow.mo
 share/locale/sv/LC_MESSAGES/clisp.mo
 share/locale/sv/LC_MESSAGES/clisplow.mo