diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 88facc003357..f9c55c9cee82 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,125 +1,125 @@
 PORTNAME=	spice
 PORTVERSION=	3f5.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	cad
 MASTER_SITES=	https://ptolemy.berkeley.edu/projects/embedded/pubs/downloads/spice/:srcs \
 		http://home.hiroshima-u.ac.jp/usdl/HiSIM2/:hisim2 \
 		LOCAL/hrs/${PORTNAME}
 DISTFILES=	spice3f5${EXTRACT_SUFX}:srcs \
 		BSIM3v330.tar.Z \
 		BSIM480_Code.zip \
 		HiSIM_2.8.0_Release_20140605.zip:hisim2 \
 		cp.ps toc.ps doc.ps
 DIST_SUBDIR=	spice
 EXTRACT_ONLY=	spice3f5${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	General-purpose circuit simulation program
 WWW=		http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 BROKEN_aarch64=	Fails to link: missing sbrk
 BROKEN_riscv64=	Fails to link: missing sbrk
 
 WRKSRC=		${WRKDIR}/${PORTNAME}3f5
 MAKEFILE=	${FILESDIR}/Makefile
 CONFIGURE_ENV=	CONFIGFILE="${CONFIGFILE}" \
 		LOCALBASE="${LOCALBASE}"
 MAKE_JOBS_UNSAFE=yes
 
 CFLAGS+=	-fcommon
 
 PORTDOCS=	spice3f3.ps.gz
 PORTEXAMPLES=	bjtnoise.cir bsim1tst.cir bsim2tst.cir diffpair.cir \
 		diodisto.cir ltra_1.cir ltra_2.cir ltra_3.cir \
 		mixdisto.cir mos6inv.cir mosamp2.cir mosmem.cir process.mod \
 		process.pro pz2.cir pzt.cir rc.cir rca3040.cir resnoise.cir \
 		rtlinv.cir schmitt.cir simplepz.cir
 
 OPTIONS_DEFINE=	DOCS EXAMPLES X11 DEV_BSIM3 DEV_BSIM4 DEV_HISIM2
 OPTIONS_DEFAULT=X11
 
 X11_USES=		xorg
 X11_USE=		XORG=x11,xaw,xext,xmu,xorgproto,xt
 X11_CONFIGURE_ENV=	WITH_X11=yes
 DEV_BSIM3_DESC=		BSIM3v3 MOS Transistor Model Support
 DEV_BSIM3_LICENSE=	BSIML
 DEV_BSIM3_LICENSE_FILE=	${WRKSRC}/src/lib/dev/bsim3/B3TERMS_OF_USE
 DEV_BSIM4_DESC=		BSIM4v4 MOS Transistor Model Support
 DEV_BSIM4_LICENSE=	BSIML
 DEV_BSIM4_LICENSE_FILE=	${WRKSRC}/src/lib/dev/bsim4/B4TERMS_OF_USE.txt
 DEV_HISIM2_DESC=	HiSIM2 IGFET Model Support
 DEV_HISIM2_LICENSE=	HISIML
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
 # Configuration parameters.
 CC_OPT=		${CFLAGS}
 CONFIGFILE=	${WRKSRC}/conf/FreeBSD
 DEVICES=
 
 LICENSE_FILE_MIT=	${WRKSRC}/COPYRIGHT
 LICENSE_NAME_BSIML=	BSIM license
 LICENSE_PERMS_BSIML=	dist-mirror pkg-mirror auto-accept
 LICENSE_NAME_HISIML=	HiSIM license
 LICENSE_PERMS_HISIML=	dist-mirror pkg-mirror auto-accept
 LICENSE_FILE_HISIML=	${FILESDIR}/hisim2-license.txt
 
 .for D in ${OPTIONS_DEFINE:MDEV_*:S/DEV_//}
 . if !empty(PORT_OPTIONS:MDEV_$D)
 LICENSE_COMB=	multi
 DEVICES+=	${D:tl}
 .  if  !empty(DEV_${D}_LICENSE)
 LICENSE+=	${DEV_${D}_LICENSE}
 .   if  !empty(DEV_${D}_LICENSE_FILE)
 LICENSE_FILE_${DEV_${D}_LICENSE}=	${DEV_${D}_LICENSE_FILE}
 .   endif
 .  endif
 . endif
 .endfor
 LICENSE:=	${LICENSE:O:u}
 
 post-extract:
 	@${DO_NADA}
 post-extract-DEV_BSIM3-on:
 	@${MKDIR} ${WRKSRC}/src/lib/dev/bsim3
 	${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/BSIM3v330.tar.Z \
 	    -C ${WRKSRC}/src/lib/dev/bsim3
 post-extract-DEV_BSIM4-on:
 	@${MKDIR} ${WRKSRC}/src/lib/dev/bsim4
 	${UNZIP_NATIVE_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/BSIM480_Code.zip \
 	    -d ${WRKSRC}/src/lib/dev/bsim4
 post-extract-DEV_HISIM2-on:
 	${UNZIP_NATIVE_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/HiSIM_2.8.0_Release_20140605.zip \
 	    -d ${WRKDIR}
 	${MV} ${WRKDIR}/HiSIM_2.8.0_Release_20140605/HiSIM_2.8.0_C-Code/hisim2 \
 	    ${WRKSRC}/src/lib/dev
 
 ${CONFIGFILE}::
 	@${SETENV} ${CONFIGURE_ENV} ${MAKE} -f ${MAKEFILE} configure
 .for V in CC MAKE CC_OPT
 	@${ECHO_CMD} "${V}=${$V}" >> ${WRKSRC}/conf/FreeBSD
 .endfor
 .for V in DEVICES
 	@${ECHO_CMD} "${V}+=${$V}" >> ${WRKSRC}/conf/FreeBSD
 .endfor
 
 do-configure: ${CONFIGFILE}
 	@${DO_NADA}
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/*.ps | ${GZIP_CMD} > \
 	    ${STAGEDIR}${DOCSDIR}/${PORTDOCS}
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && \
 	    ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/spice/files/Makefile b/cad/spice/files/Makefile
index fd6fb0b99830..fb14e19ec6c0 100644
--- a/cad/spice/files/Makefile
+++ b/cad/spice/files/Makefile
@@ -1,68 +1,68 @@
 all:
 	${SH} util/build FreeBSD default
 
 CONFIGFILE?=	conf/FreeBSD
 
 # Configuration parameters
 VARLIST=	SYS_CFLAGS LDFLAGS INTERFACE_OPTS X_DIR
 SYS_CFLAGS=	-Dbsd
 LDFLAGS=	-lm -ltermcap
 INTERFACE_OPTS=	-DWANT_MFB
 .if defined(WITH_X11) && !empty(WITH_X11)
 INTERFACE_OPTS+=-DWANT_X11
 .else
 VARLIST+=	INCX LIBX
 .endif
 X_DIR=		${LOCALBASE}
 
 configure: ${CONFIGFILE}
 
 ${CONFIGFILE}::
 .for V in ${VARLIST}
 	echo "$V=${${V}}" >> ${CONFIGFILE}
 .endfor
 
 PREFIX?=	/usr/local
 
 BINDIR=		${PREFIX}/bin
 SHAREFILESDIR=	${PREFIX}/share/spice
 HELPFILESDIR=	${SHAREFILESDIR}/helpdir
 SCRIPTFILESDIR=	${SHAREFILESDIR}/scripts
 
 PROGRAMS=	spice3 nutmeg sconvert help proc2mod multidec makeidx
 HELPFILES=	spice.txt spice.idx
 SCRIPTFILES=	setplot spinit
 SHAREFILES=	mfbcap news
 
 MAN=	spice.1 nutmeg.1 sconvert.1 mfb.3 mfbcap.5
-MANDIR=	${PREFIX}/man/man
+MANDIR=	${PREFIX}/share/man/man
 
 .for P in ${PROGRAMS}
 install:: ${DESTDIR}${BINDIR}/$P
 ${DESTDIR}${BINDIR}/$P: $P
 	${BSD_INSTALL_PROGRAM} ${.ALLSRC} ${.TARGET}
 .endfor
 .for n in 1 3 5
 . for M in ${MAN:M*.$n}
 install:: ${DESTDIR}${MANDIR}${n}/$M
 ${DESTDIR}${MANDIR}${n}/$M: $M
 	${BSD_INSTALL_MAN} ${.ALLSRC} ${.TARGET}
 . endfor
 .endfor
 	ln -s -f spice.1 ${DESTDIR}${MANDIR}1/spice3.1
 
 spice.idx: spice.txt
 	${DESTDIR}${BINDIR}/makeidx ${.ALLSRC}
 	${BSD_INSTALL_DATA} ${.CURDIR}/lib/helpdir/spice.idx \
 	    ${.CURDIR}/spice.idx
 
 .for D in HELPFILES SCRIPTFILES SHAREFILES
 . for F in ${${D}}
 install:: ${DESTDIR}${${D}DIR}/$F
 ${DESTDIR}${${D}DIR}/$F: $F
 	mkdir -p ${DESTDIR}${${D}DIR}
 	${BSD_INSTALL_DATA} ${.ALLSRC} ${.TARGET}
 . endfor
 .endfor
 
 .PATH: FreeBSD/obj/bin lib/helpdir lib/scripts lib man/man1 man/man3 man/man5
diff --git a/cad/spice/pkg-plist b/cad/spice/pkg-plist
index a2e9bf17b910..c6de155511ea 100644
--- a/cad/spice/pkg-plist
+++ b/cad/spice/pkg-plist
@@ -1,19 +1,19 @@
 bin/spice3
 bin/nutmeg
 bin/sconvert
 bin/help
 bin/proc2mod
 bin/multidec
 bin/makeidx
-man/man1/sconvert.1.gz
-man/man1/nutmeg.1.gz
-man/man1/spice.1.gz
-man/man1/spice3.1.gz
-man/man3/mfb.3.gz
-man/man5/mfbcap.5.gz
+share/man/man1/sconvert.1.gz
+share/man/man1/nutmeg.1.gz
+share/man/man1/spice.1.gz
+share/man/man1/spice3.1.gz
+share/man/man3/mfb.3.gz
+share/man/man5/mfbcap.5.gz
 %%DATADIR%%/helpdir/spice.txt
 %%DATADIR%%/helpdir/spice.idx
 %%DATADIR%%/scripts/setplot
 %%DATADIR%%/scripts/spinit
 %%DATADIR%%/mfbcap
 %%DATADIR%%/news