diff --git a/devel/valgrind-devel/Makefile b/devel/valgrind-devel/Makefile
index adbe0bf1bb80..306e0b2647c5 100644
--- a/devel/valgrind-devel/Makefile
+++ b/devel/valgrind-devel/Makefile
@@ -1,85 +1,77 @@
 PORTNAME=	valgrind
 PORTVERSION=	3.21.0.g20221028
 DISTVERSIONPREFIX=	freebsd-
 PORTEPOCH=	1
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	pjfloyd@wanadoo.fr
 COMMENT=	Memory debugging and profiling tool
 WWW=		https://www.valgrind.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		cpe pathfix pkgconfig gmake perl5 shebangfix autoreconf
-USE_PERL5=	build
-
-GNU_CONFIGURE=	yes
-SHEBANG_FILES=	callgrind/callgrind_annotate.in callgrind/callgrind_control.in
-SSP_UNSAFE=	yes
-LIB32_PATH?=	/usr/lib32/libc.so
-
+USES=		autoreconf cpe gmake pathfix perl5 pkgconfig shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	paulfloyd
 GH_PROJECT=	freebsd_valgrind
 GH_TAGNAME=	8d64ffab7
-
-CONFLICTS=	valgrind
-
+USE_PERL5=	build
+SHEBANG_FILES=	callgrind/callgrind_annotate.in callgrind/callgrind_control.in
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL}
 
+SSP_UNSAFE=	yes
+LIB32_PATH?=	/usr/lib32/libc.so
+
+CONFLICTS=	valgrind
 PORTDOCS=	html
 
 OPTIONS_DEFINE=		DOCS MANPAGES MPI
 OPTIONS_DEFINE_amd64=	32BIT
 OPTIONS_DEFAULT=	MANPAGES
 .if exists(${LIB32_PATH})
 OPTIONS_DEFAULT_amd64=	32BIT
 .endif
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 32BIT_DESC=	Enable debugging of 32-bit programs (requires lib32)
 MPI_DESC=	Enable build of MPI wrappers
 
 DOCS_BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 MANPAGES_BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64"
-PLIST_SUB+=	AMD64=""
+PLIST_SUB+=		AMD64=""
 . if !${PORT_OPTIONS:M32BIT}
 CONFIGURE_ARGS+=	--enable-only64bit
-PLIST_SUB+=	X86="@comment "
+PLIST_SUB+=		X86="@comment "
 . else
 .  if !exists(${LIB32_PATH})
-IGNORE=The lib32 distribution was not found. Please install the lib32\
-distribution or run 'make config' and uncheck 32BIT option
+IGNORE=			please either install the lib32 distribution or unset the 32BIT option
 .  endif
-PLIST_SUB+=	X86=""
+PLIST_SUB+=		X86=""
 . endif
 .else
-PLIST_SUB+=	AMD64="@comment "
-PLIST_SUB+=	X86=""
+PLIST_SUB+=		AMD64="@comment " \
+			X86=""
 .endif
 
-.if !${PORT_OPTIONS:MDOCS}
-post-patch:
+post-patch-DOCS-off:
 	@${RM} -r ${WRKSRC}/docs/html
-.endif
 
-post-build:
-.if ${PORT_OPTIONS:MMANPAGES}
-	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages
-.endif
-.if ${PORT_OPTIONS:MDOCS}
+post-build-DOCS-on:
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html-docs
-.endif
+
+post-build-MANPAGES-on:
+	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages
 
 .include <bsd.port.mk>
diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index 12378e711623..eca7126db466 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -1,79 +1,72 @@
 PORTNAME=	valgrind
 PORTVERSION=	3.20.0
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SOURCEWARE/valgrind
 
 MAINTAINER=	pjfloyd@wanadoo.fr
 COMMENT=	Memory debugging and profiling tool
 WWW=		https://www.valgrind.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		cpe pathfix pkgconfig gmake perl5 shebangfix autoreconf tar:bz2
+USES=		autoreconf cpe gmake pathfix perl5 pkgconfig shebangfix tar:bz2
 USE_PERL5=	build
-
-GNU_CONFIGURE=	yes
 SHEBANG_FILES=	callgrind/callgrind_annotate.in callgrind/callgrind_control.in
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL}
+
 SSP_UNSAFE=	yes
 LIB32_PATH?=	/usr/lib32/libc.so
 
 CONFLICTS=	valgrind-devel
-
-CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL}
-
 PORTDOCS=	html
 
 OPTIONS_DEFINE=		DOCS MANPAGES MPI
 OPTIONS_DEFINE_amd64=	32BIT
 OPTIONS_DEFAULT=	MANPAGES
 .if exists(${LIB32_PATH})
 OPTIONS_DEFAULT_amd64=	32BIT
 .endif
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 32BIT_DESC=	Enable debugging of 32-bit programs (requires lib32)
 MPI_DESC=	Enable build of MPI wrappers
 
 DOCS_BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 MANPAGES_BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64"
-PLIST_SUB+=	AMD64=""
+PLIST_SUB+=		AMD64=""
 . if !${PORT_OPTIONS:M32BIT}
 CONFIGURE_ARGS+=	--enable-only64bit
-PLIST_SUB+=	X86="@comment "
+PLIST_SUB+=		X86="@comment "
 . else
 .  if !exists(${LIB32_PATH})
-IGNORE=The lib32 distribution was not found. Please install the lib32\
-distribution or run 'make config' and uncheck 32BIT option
+IGNORE=			please either install the lib32 distribution or unset the 32BIT option
 .  endif
-PLIST_SUB+=	X86=""
+PLIST_SUB+=		X86=""
 . endif
 .else
-PLIST_SUB+=	AMD64="@comment "
-PLIST_SUB+=	X86=""
+PLIST_SUB+=		AMD64="@comment " \
+			X86=""
 .endif
 
-.if !${PORT_OPTIONS:MDOCS}
-post-patch:
+post-patch-DOCS-off:
 	@${RM} -r ${WRKSRC}/docs/html
-.endif
 
-post-build:
-.if ${PORT_OPTIONS:MMANPAGES}
-	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages
-.endif
-.if ${PORT_OPTIONS:MDOCS}
+post-build-DOCS-on:
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html-docs
-.endif
+
+post-build-MANPAGES-on:
+	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages
 
 .include <bsd.port.mk>