diff --git a/devel/libdistance/Makefile b/devel/libdistance/Makefile
index 23a51d24cb71..e9fd246392d6 100644
--- a/devel/libdistance/Makefile
+++ b/devel/libdistance/Makefile
@@ -1,31 +1,39 @@
 PORTNAME=	libdistance
 PORTVERSION=	0.2.2
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://monkey.org/~jose/software/libdistance/
 
 MAINTAINER=	jonathan@FreeBSD.org
 COMMENT=	Compute the distance between two pieces of data
 WWW=		https://monkey.org/~jose/software/libdistance
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	swig:devel/swig
 
 USES+=		fakeroot pkgconfig tcl
 USE_LDCONFIG=	yes
 
 MAKE_ARGS+=	INCLUDEDIR=${PREFIX}/include LIBDIR=${PREFIX}/lib
 MAKE_ARGS+=	MANDIR=${PREFIX}/man/man SWIG=swig
+MAKE_JOBS_UNSAFE=	yes
+
 CFLAGS+=	-fPIC
 
-pre-build:
-	mkdir -p ${STAGEDIR}/usr/local/tests/${PORTNAME}
+.include <bsd.port.options.mk>
+
+.if defined(NOPROFILE) || defined(NO_PROFILE) || ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 )
+PLIST_SUB+=	PROFILE="@comment "
+.else
+PLIST_SUB+=	PROFILE=""
+.endif
 
 post-patch:
 	${REINPLACE_CMD} 's|%%TCL_SHLIB_VER%%|${TCL_SHLIB_VER}|' \
 	    ${WRKSRC}/swig/tcl/Makefile
 
-MAKE_JOBS_UNSAFE=	yes
+pre-build:
+	${MKDIR} ${STAGEDIR}${PREFIX}/tests/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/libdistance/pkg-plist b/devel/libdistance/pkg-plist
index 744590efbbbc..cc78d8e97114 100644
--- a/devel/libdistance/pkg-plist
+++ b/devel/libdistance/pkg-plist
@@ -1,11 +1,11 @@
 include/distance.h
 lib/libdistance.a
 lib/libdistance.so
 lib/libdistance.so.1
-lib/libdistance_p.a
+%%PROFILE%%lib/libdistance_p.a
 lib/libdistance_wrap.a
 lib/libdistance_wrap.so
 lib/libdistance_wrap.so.1
-lib/libdistance_wrap_p.a
+%%PROFILE%%lib/libdistance_wrap_p.a
 man/man3/distance.3.gz
 tests/libdistance/test