diff --git a/math/blocksolve95/Makefile b/math/blocksolve95/Makefile
index 77194f055073..4ab780170944 100644
--- a/math/blocksolve95/Makefile
+++ b/math/blocksolve95/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	blocksolve95
 PORTVERSION=	3.0
-PORTREVISION=	30
+PORTREVISION=	31
 CATEGORIES=	math parallel
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/BlockSolve95/ \
 		http://ftp.mcs.anl.gov/pub/BlockSolve95/
 DISTNAME=	BlockSolve95
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Software for the efficient solution of large, sparse linear systems
 WWW=		https://ftp.mcs.anl.gov/pub/BlockSolve95/
 
 LICENSE=	AS-IS
 LICENSE_NAME=	AS-IS
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libf2c.so:lang/f2c	\
 		libmpich.so:net/mpich
 
 USES=		fortran gmake tar:Z
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_RADIO=	BLAS
 OPTIONS_RADIO_BLAS=	REFERENCE ATLAS
 OPTIONS_DEFAULT=	REFERENCE
 
 REFERENCE_DESC=	Blas / Lapack
 REFERENCE_USES=	blaslapack:netlib
 
 ATLAS_DESC=	ATLAS
 ATLAS_USES=	blaslapack:atlas
 
 MAKEFILE=	makefile
 MAKE_ARGS=	GMAKE=${MAKE_CMD} PETSC_ARCH=${PETSC_ARCH} BOPT=${BOPT}	\
 		BLAS_LIB="${BLASLIB}" LAPACK_LIB="-L${LOCALBASE}/lib ${LAPACKLIB}"
 
 MPIDIR=		${LOCALBASE}
 PETSC_ARCH=	freebsd
 BOPT?=		O
 
 FFLAGS+=	-O2
 
 INCLUDES=	BMmsg.h BSdepend.h BSlog.h BSmy_blas.h BSprivate.h BSsparse.h
 PORTDOCS=	manual.ps
 
 do-install:
 	${INSTALL_DATA}	${WRKSRC}/lib/lib${BOPT}/${PETSC_ARCH}/libBS95.a	\
 		${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA}	${INCLUDES:S|^|${WRKSRC}/include/|} ${STAGEDIR}${PREFIX}/include
-	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/* ${STAGEDIR}${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/* ${STAGEDIR}${PREFIX}/share/man/man3
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA}	${PORTDOCS:S|^|${WRKSRC}/doc/manual/|} ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA}	${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	@${RM} ${STAGEDIR}${EXAMPLESDIR}/makefile.orig
 
 .if defined(MAINTAINER_MODE)
 do-test:
 . if !exists(${HOME}/.mpd.conf)
 	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf
 	${CHMOD} go-r ${HOME}/.mpd.conf
 	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
 . endif
 	${LOCALBASE}/bin/mpd &
 	(cd ${BUILD_WRKSRC}/examples &&	\
 	${SETENV} ${MAKE_ENV:C|HOME=|wHOME=|} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} bsrunexamples clean)
 	${LOCALBASE}/bin/mpdallexit
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/blocksolve95/pkg-plist b/math/blocksolve95/pkg-plist
index 7b14da600f0d..584320eb4b7a 100644
--- a/math/blocksolve95/pkg-plist
+++ b/math/blocksolve95/pkg-plist
@@ -1,127 +1,127 @@
 include/BMmsg.h
 include/BSdepend.h
 include/BSlog.h
 include/BSmy_blas.h
 include/BSprivate.h
 include/BSsparse.h
 lib/libBS95.a
-man/man3/BSb_back_solve.3.gz
-man/man3/BSb_backward.3.gz
-man/man3/BSb_for_solve.3.gz
-man/man3/BSb_forward.3.gz
-man/man3/BSback_solve.3.gz
-man/man3/BSback_solve1.3.gz
-man/man3/BSbackward.3.gz
-man/man3/BSbackward1.3.gz
-man/man3/BSbjacobi.3.gz
-man/man3/BScopy_nz.3.gz
-man/man3/BScopy_par_mat.3.gz
-man/man3/BScreate_ctx.3.gz
-man/man3/BSctx_print.3.gz
-man/man3/BSctx_set_cs.3.gz
-man/man3/BSctx_set_ct.3.gz
-man/man3/BSctx_set_err.3.gz
-man/man3/BSctx_set_guess.3.gz
-man/man3/BSctx_set_id.3.gz
-man/man3/BSctx_set_is.3.gz
-man/man3/BSctx_set_max_it.3.gz
-man/man3/BSctx_set_method.3.gz
-man/man3/BSctx_set_np.3.gz
-man/man3/BSctx_set_num_rhs.3.gz
-man/man3/BSctx_set_pr.3.gz
-man/man3/BSctx_set_pre.3.gz
-man/man3/BSctx_set_print_log.3.gz
-man/man3/BSctx_set_ps.3.gz
-man/man3/BSctx_set_restart.3.gz
-man/man3/BSctx_set_rt.3.gz
-man/man3/BSctx_set_scaling.3.gz
-man/man3/BSctx_set_si.3.gz
-man/man3/BSctx_set_tol.3.gz
-man/man3/BSeasy_A.3.gz
-man/man3/BSfactor.3.gz
-man/man3/BSfinalize.3.gz
-man/man3/BSfor_solve.3.gz
-man/man3/BSfor_solve1.3.gz
-man/man3/BSforward.3.gz
-man/man3/BSforward1.3.gz
-man/man3/BSfree_comm.3.gz
-man/man3/BSfree_copy_par_mat.3.gz
-man/man3/BSfree_ctx.3.gz
-man/man3/BSfree_easymat.3.gz
-man/man3/BSfree_off_map.3.gz
-man/man3/BSfree_par_mat.3.gz
-man/man3/BSfree_reperm.3.gz
-man/man3/BSfree_spmat.3.gz
-man/man3/BSfreeg2l.3.gz
-man/man3/BSfreel2g.3.gz
-man/man3/BSget_diag.3.gz
-man/man3/BSglob2loc.3.gz
-man/man3/BSglob2proc.3.gz
-man/man3/BSglobal_flops.3.gz
-man/man3/BSglobal_nnz.3.gz
-man/man3/BSglobal_num_cliques.3.gz
-man/man3/BSglobal_num_inodes.3.gz
-man/man3/BSinit.3.gz
-man/man3/BSinv_diag_block.3.gz
-man/man3/BSloc2glob.3.gz
-man/man3/BSlocal_flops.3.gz
-man/man3/BSlocal_nnz.3.gz
-man/man3/BSlocal_num_cliques.3.gz
-man/man3/BSlocal_num_inodes.3.gz
-man/man3/BSmain_perm.3.gz
-man/man3/BSmain_reperm.3.gz
-man/man3/BSmake_off_map.3.gz
-man/man3/BSmat_subtract.3.gz
-man/man3/BSnum_colors.3.gz
-man/man3/BSoffset.3.gz
-man/man3/BSpar_gmres.3.gz
-man/man3/BSpar_isolve.3.gz
-man/man3/BSpar_solve.3.gz
-man/man3/BSpar_sym_solve.3.gz
-man/man3/BSprint_log.3.gz
-man/man3/BSsave_diag.3.gz
-man/man3/BSscale_diag.3.gz
-man/man3/BSset_diag.3.gz
-man/man3/BSset_diagv.3.gz
-man/man3/BSset_mat_icc_storage.3.gz
-man/man3/BSset_mat_symmetric.3.gz
-man/man3/BSsetup_block.3.gz
-man/man3/BSsetup_factor.3.gz
-man/man3/BSsetup_forward.3.gz
-man/man3/BStri_mult.3.gz
-man/man3/BStri_solve.3.gz
+share/man/man3/BSb_back_solve.3.gz
+share/man/man3/BSb_backward.3.gz
+share/man/man3/BSb_for_solve.3.gz
+share/man/man3/BSb_forward.3.gz
+share/man/man3/BSback_solve.3.gz
+share/man/man3/BSback_solve1.3.gz
+share/man/man3/BSbackward.3.gz
+share/man/man3/BSbackward1.3.gz
+share/man/man3/BSbjacobi.3.gz
+share/man/man3/BScopy_nz.3.gz
+share/man/man3/BScopy_par_mat.3.gz
+share/man/man3/BScreate_ctx.3.gz
+share/man/man3/BSctx_print.3.gz
+share/man/man3/BSctx_set_cs.3.gz
+share/man/man3/BSctx_set_ct.3.gz
+share/man/man3/BSctx_set_err.3.gz
+share/man/man3/BSctx_set_guess.3.gz
+share/man/man3/BSctx_set_id.3.gz
+share/man/man3/BSctx_set_is.3.gz
+share/man/man3/BSctx_set_max_it.3.gz
+share/man/man3/BSctx_set_method.3.gz
+share/man/man3/BSctx_set_np.3.gz
+share/man/man3/BSctx_set_num_rhs.3.gz
+share/man/man3/BSctx_set_pr.3.gz
+share/man/man3/BSctx_set_pre.3.gz
+share/man/man3/BSctx_set_print_log.3.gz
+share/man/man3/BSctx_set_ps.3.gz
+share/man/man3/BSctx_set_restart.3.gz
+share/man/man3/BSctx_set_rt.3.gz
+share/man/man3/BSctx_set_scaling.3.gz
+share/man/man3/BSctx_set_si.3.gz
+share/man/man3/BSctx_set_tol.3.gz
+share/man/man3/BSeasy_A.3.gz
+share/man/man3/BSfactor.3.gz
+share/man/man3/BSfinalize.3.gz
+share/man/man3/BSfor_solve.3.gz
+share/man/man3/BSfor_solve1.3.gz
+share/man/man3/BSforward.3.gz
+share/man/man3/BSforward1.3.gz
+share/man/man3/BSfree_comm.3.gz
+share/man/man3/BSfree_copy_par_mat.3.gz
+share/man/man3/BSfree_ctx.3.gz
+share/man/man3/BSfree_easymat.3.gz
+share/man/man3/BSfree_off_map.3.gz
+share/man/man3/BSfree_par_mat.3.gz
+share/man/man3/BSfree_reperm.3.gz
+share/man/man3/BSfree_spmat.3.gz
+share/man/man3/BSfreeg2l.3.gz
+share/man/man3/BSfreel2g.3.gz
+share/man/man3/BSget_diag.3.gz
+share/man/man3/BSglob2loc.3.gz
+share/man/man3/BSglob2proc.3.gz
+share/man/man3/BSglobal_flops.3.gz
+share/man/man3/BSglobal_nnz.3.gz
+share/man/man3/BSglobal_num_cliques.3.gz
+share/man/man3/BSglobal_num_inodes.3.gz
+share/man/man3/BSinit.3.gz
+share/man/man3/BSinv_diag_block.3.gz
+share/man/man3/BSloc2glob.3.gz
+share/man/man3/BSlocal_flops.3.gz
+share/man/man3/BSlocal_nnz.3.gz
+share/man/man3/BSlocal_num_cliques.3.gz
+share/man/man3/BSlocal_num_inodes.3.gz
+share/man/man3/BSmain_perm.3.gz
+share/man/man3/BSmain_reperm.3.gz
+share/man/man3/BSmake_off_map.3.gz
+share/man/man3/BSmat_subtract.3.gz
+share/man/man3/BSnum_colors.3.gz
+share/man/man3/BSoffset.3.gz
+share/man/man3/BSpar_gmres.3.gz
+share/man/man3/BSpar_isolve.3.gz
+share/man/man3/BSpar_solve.3.gz
+share/man/man3/BSpar_sym_solve.3.gz
+share/man/man3/BSprint_log.3.gz
+share/man/man3/BSsave_diag.3.gz
+share/man/man3/BSscale_diag.3.gz
+share/man/man3/BSset_diag.3.gz
+share/man/man3/BSset_diagv.3.gz
+share/man/man3/BSset_mat_icc_storage.3.gz
+share/man/man3/BSset_mat_symmetric.3.gz
+share/man/man3/BSsetup_block.3.gz
+share/man/man3/BSsetup_factor.3.gz
+share/man/man3/BSsetup_forward.3.gz
+share/man/man3/BStri_mult.3.gz
+share/man/man3/BStri_solve.3.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.examples
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/free_grid.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/get_mat.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/get_mat3.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/get_mat3d.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/get_mat4.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map3.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/master0.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/master1.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/master2.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/master3.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/master4.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/master5.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/master6.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/master7.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/master8.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/num_grid3d.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pargrid.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/res.m
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/res2.m
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/run.paragon
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/worker0.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/worker1.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/worker2.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/worker3.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/worker4.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/worker5.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/worker5.c.free
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/worker5.c.nofree
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/worker6.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/worker7.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/worker8.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/write_mat_matlab.c