diff --git a/x11-fm/wcmcommander/Makefile b/x11-fm/wcmcommander/Makefile
index 9f4f6679be75..5f486b6c14b3 100644
--- a/x11-fm/wcmcommander/Makefile
+++ b/x11-fm/wcmcommander/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	wcmcommander
 PORTVERSION=	0.20.0
-PORTREVISION=	1
 DISTVERSIONPREFIX=	release-
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -27,14 +27,11 @@ OPTIONS_DEFINE=	FREETYPE SMB SSH DOCS
 OPTIONS_DEFAULT=FREETYPE SMB SSH
 
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
-FREETYPE_CMAKE_ON=	-DWITH_FREETYPE=ON
-FREETYPE_CMAKE_OFF=	-DWITH_FREETYPE=OFF
+FREETYPE_CMAKE_BOOL=	WITH_FREETYPE
 SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
-SMB_CMAKE_ON=		-DWITH_SMBCLIENT=ON
-SMB_CMAKE_OFF=		-DWITH_SMBCLIENT=OFF
+SMB_CMAKE_BOOL=		WITH_SMBCLIENT
 SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
-SSH_CMAKE_ON=		-DWITH_LIBSSH2=ON
-SSH_CMAKE_OFF=		-DWITH_LIBSSH2=OFF
+SSH_CMAKE_BOOL=		WITH_LIBSSH2
 
 .include <bsd.port.pre.mk>
 
@@ -42,8 +39,8 @@ SSH_CMAKE_OFF=		-DWITH_LIBSSH2=OFF
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD
 .endif
 
-post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor