diff --git a/graphics/bsd-plotutils/Makefile b/graphics/bsd-plotutils/Makefile
index 689f72481b57..c638ae9221a4 100644
--- a/graphics/bsd-plotutils/Makefile
+++ b/graphics/bsd-plotutils/Makefile
@@ -1,37 +1,41 @@
 PORTNAME=	bsd-plotutils
 DISTVERSION=	1.4.2
 PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	toranktto@gmail.com
 COMMENT=	Traditional plotting utilities
 WWW=		https://github.com/Toranktto/bsd-plotutils
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	Toranktto
+USE_LDCONFIG=	yes
+
+CONFLICTS_INSTALL=	plotutils
+
 OPTIONS_DEFINE=	FORTRAN
 OPTIONS_SUB=	yes
+
 FORTRAN_DESC=	FORTRAN 77 support
 
-.include <bsd.port.options.mk>
+FORTRAN_USES=	fortran
 
-.if ${PORT_OPTIONS:MFORTRAN}
-USES+=	fortran
-.endif
+.include <bsd.port.pre.mk>
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	Toranktto
-
-CONFLICTS_INSTALL=	plotutils
-USE_LDCONFIG=	yes
+.if defined(NO_PROFILE) || ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 )
+PLIST_SUB+=	PROFILE="@comment "
+.else
+PLIST_SUB+=	PROFILE=""
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/py27plot//g" ${WRKSRC}/libplot/bindings/Makefile
 	@${REINPLACE_CMD} -e '/#pragma GCC diagnostic/d' ${WRKSRC}/graph/graph.c
 
-.if !${PORT_OPTIONS:MFORTRAN}
+post-patch-FORTRAN-on:
 	@${REINPLACE_CMD} -e "s/f77plot//g" ${WRKSRC}/libplot/bindings/Makefile
-.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/bsd-plotutils/pkg-plist b/graphics/bsd-plotutils/pkg-plist
index eb1ab56bc4f4..92bb9b2b4313 100644
--- a/graphics/bsd-plotutils/pkg-plist
+++ b/graphics/bsd-plotutils/pkg-plist
@@ -1,78 +1,78 @@
 bin/graph
 bin/plot
 bin/spline
 bin/plottoa
 bin/atoplot
 libexec/bgplot
 libexec/crtplot
 libexec/dumbplot
 libexec/gigiplot
 libexec/hp7221plot
 libexec/implot
 libexec/t4013plot
 libexec/tekplot
 include/plot.h
 include/plotcompat.h
 %%FORTRAN%%lib/libf77plot.a
 %%FORTRAN%%lib/libf77plot.so
 %%FORTRAN%%lib/libf77plot.so.1
-%%FORTRAN%%lib/libf77plot_p.a
+%%PROFILE%%%%FORTRAN%%lib/libf77plot_p.a
 lib/libplot.a
 lib/libplot.so
 lib/libplot.so.1
 lib/libplot4013.a
 lib/libplot4013.so
 lib/libplot4013.so.1
-lib/libplot4013_p.a
+%%PROFILE%%lib/libplot4013_p.a
 lib/libplot4014.a
 lib/libplot4014.so
 lib/libplot4014.so.1
-lib/libplot4014_p.a
+%%PROFILE%%lib/libplot4014_p.a
 lib/libplot7221.a
 lib/libplot7221.so
 lib/libplot7221.so.1
-lib/libplot7221_p.a
-lib/libplot_p.a
+%%PROFILE%%lib/libplot7221_p.a
+%%PROFILE%%lib/libplot_p.a
 lib/libplotbg.a
 lib/libplotbg.so
 lib/libplotbg.so.1
-lib/libplotbg_p.a
+%%PROFILE%%lib/libplotbg_p.a
 lib/libplotcrt.a
 lib/libplotcrt.so
 lib/libplotcrt.so.1
-lib/libplotcrt_p.a
+%%PROFILE%%lib/libplotcrt_p.a
 lib/libplotdumb.a
 lib/libplotdumb.so
 lib/libplotdumb.so.1
-lib/libplotdumb_p.a
+%%PROFILE%%lib/libplotdumb_p.a
 lib/libplotgigi.a
 lib/libplotgigi.so
 lib/libplotgigi.so.1
-lib/libplotgigi_p.a
+%%PROFILE%%lib/libplotgigi_p.a
 lib/libplotimagen.a
 lib/libplotimagen.so
 lib/libplotimagen.so.1
-lib/libplotimagen_p.a
+%%PROFILE%%lib/libplotimagen_p.a
 man/man1/graph.1.gz
 man/man1/spline.1.gz
 man/man1/plot.1.gz
 man/man1/plottoa.1.gz
 man/man1/atoplot.1.gz
 %%FORTRAN%%man/man3/f77plot.3.gz
 man/man3/pl_arc.3.gz
 man/man3/pl_box.3.gz
 man/man3/pl_circle.3.gz
 man/man3/pl_closepl.3.gz
 man/man3/pl_closevt.3.gz
 man/man3/pl_cont.3.gz
 man/man3/pl_dot.3.gz
 man/man3/pl_erase.3.gz
 man/man3/pl_line.3.gz
 man/man3/pl_linemod.3.gz
 man/man3/pl_move.3.gz
 man/man3/pl_openpl.3.gz
 man/man3/pl_openvt.3.gz
 man/man3/pl_point.3.gz
 man/man3/pl_space.3.gz
 man/man3/plot.3.gz
 man/man5/plot.5.gz