*/*: Fix build with llvm16 on 13.2-STABLE

As like as HEAD(14.0-RELEASE) llvm16 was merged in base for 13.2-STABLE with the OSVERSION 1302507. - Utilize USE_CXXSTD=c++14 or similar solution where applicable - Update conditionals to addtionally check for OSVERSION greater than 1302507 and less than 1400000 Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation
author: Muhammad Moinur Rahman <bofh@FreeBSD.org> 2023-07-26 02:44:22 +0200
committer: Muhammad Moinur Rahman <bofh@FreeBSD.org> 2023-07-26 02:48:20 +0200
commit: 95274bf4f99c71fc056013d966aec239161dfd74 (patch)
tree: bc1e95977678cb5b6b00b33e333b28161885e706
parent: dbe06d2da8c38d9d058f7939a7c6af36a2c0f1c7 (diff)
download: freebsd-ports-95274bf4f99c71fc056013d966aec239161dfd74.zip
190 files changed, 271 insertions, 462 deletions
diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile
index b25aafe0909b..ef9f0c32131b 100644
--- a/accessibility/caribou/Makefile
+++ b/accessibility/caribou/Makefile
@@ -38,7 +38,7 @@ GLIB_SCHEMAS=	org.gnome.caribou.gschema.xml \
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/archivers/dzip/Makefile b/archivers/dzip/Makefile
index 037bd9efb2e4..c69cabe4b257 100644
--- a/archivers/dzip/Makefile
+++ b/archivers/dzip/Makefile
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/archivers/rubygem-bzip2-ruby/Makefile b/archivers/rubygem-bzip2-ruby/Makefile
index 60bd57a14ca0..0deef5a138af 100644
--- a/archivers/rubygem-bzip2-ruby/Makefile
+++ b/archivers/rubygem-bzip2-ruby/Makefile
@@ -15,7 +15,7 @@ USES=		gem
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CONFIGURE_ARGS+=	--with-cflags="-Wno-error=incompatible-function-pointer-types"
 .endif
 
diff --git a/audio/gstreamer1-plugins-sndio/Makefile b/audio/gstreamer1-plugins-sndio/Makefile
index 5ead937d9f41..31aecbf401e0 100644
--- a/audio/gstreamer1-plugins-sndio/Makefile
+++ b/audio/gstreamer1-plugins-sndio/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES=	lib/gstreamer-1.0/libgstsndio.so
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index bcf2bc021f1d..146f179b8ad0 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -16,20 +16,13 @@ LIB_DEPENDS=	libFLAC.so:audio/flac
 CONFLICTS=	osalp-0.7.*
 
 USES=		cpe pathfix pkgconfig tar:xz libtool
+USE_CXXSTD=	c++14
 CPE_PRODUCT=	audiofile
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-post-patch:
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-	@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
-		${WRKSRC}/libaudiofile/modules/SimpleModule.h
-.endif
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudiofile.so.1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/libfishsound/Makefile b/audio/libfishsound/Makefile
index 95bfdc1634e9..9ff7aaba0552 100644
--- a/audio/libfishsound/Makefile
+++ b/audio/libfishsound/Makefile
@@ -31,7 +31,7 @@ DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index 67081ebb6686..092c955dcb5c 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -12,6 +12,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf libtool tar:bz2
+USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
@@ -24,10 +25,4 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 CONFIGURE_ARGS_i386=	--enable-optendian --enable-optfixpoint
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 .include <bsd.port.mk>
diff --git a/audio/mpdcon/Makefile b/audio/mpdcon/Makefile
index e332a72c109b..8725614d8ca6 100644
--- a/audio/mpdcon/Makefile
+++ b/audio/mpdcon/Makefile
@@ -20,7 +20,7 @@ USE_GNUSTEP=	base gui back build
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 83b347e4c854..a9c34af4b58e 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -88,9 +88,9 @@ X11_PLIST_SUB_OFF=	DESKTOP='@comment ' \
 
 TIMIDITY_CFG=	${LOCALBASE}/share/timidity/timidity.cfg
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
@@ -99,4 +99,4 @@ post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocp/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocp/autoload/*.so
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/play/Makefile b/audio/play/Makefile
index 59cc796ed91e..7eaf446b2d84 100644
--- a/audio/play/Makefile
+++ b/audio/play/Makefile
@@ -23,11 +23,10 @@ PLIST_FILES=	bin/play man/ja/man1/play.1.gz
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 post-patch:
 .for file in play_audio.c mixer_ctl.c encode_sun.c speed.c
diff --git a/audio/sidplayer/Makefile b/audio/sidplayer/Makefile
index d65bcad41616..95d153508690 100644
--- a/audio/sidplayer/Makefile
+++ b/audio/sidplayer/Makefile
@@ -14,6 +14,7 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		sdl
+USE_CXXSTD=	c++14
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
 
@@ -21,12 +22,6 @@ OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 SUB_FILES=	pkg-message
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=	-Dregister=
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
diff --git a/audio/snack/Makefile b/audio/snack/Makefile
index d01123e960c5..bdad31f72fca 100644
--- a/audio/snack/Makefile
+++ b/audio/snack/Makefile
@@ -37,7 +37,7 @@ VORBIS_ALL_TARGET=	all libsnackogg.so
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/biology/ncbi-toolkit/Makefile b/biology/ncbi-toolkit/Makefile
index fe00defd475d..25a61920f6cf 100644
--- a/biology/ncbi-toolkit/Makefile
+++ b/biology/ncbi-toolkit/Makefile
@@ -35,11 +35,10 @@ OPTIONS_DEFINE=	DOCS
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/biology/wise/Makefile b/biology/wise/Makefile
index 4ec5fde05dd7..ec911f6763be 100644
--- a/biology/wise/Makefile
+++ b/biology/wise/Makefile
@@ -49,11 +49,10 @@ DATAFILES=	BLOSUM30.bla BLOSUM45.bla BLOSUM62.bla BLOSUM80.bla aa.rnd \
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 post-patch:
 	@${FIND} ${BUILD_WRKSRC} -name "makefile" | ${XARGS} \
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index bd76e0deb45e..88facc003357 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -55,7 +55,7 @@ DEV_HISIM2_LICENSE=	HISIML
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/chinese/celvis/Makefile b/chinese/celvis/Makefile
index cd7686f0c52b..f792123e4feb 100644
--- a/chinese/celvis/Makefile
+++ b/chinese/celvis/Makefile
@@ -15,7 +15,7 @@ CFLAGS+=	-Wno-error=return-type
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/chinese/libime/Makefile b/chinese/libime/Makefile
index 7ac105beb7da..7d3abe79c1bf 100644
--- a/chinese/libime/Makefile
+++ b/chinese/libime/Makefile
@@ -36,10 +36,10 @@ OPENGRAM_LM_TAR=	lm_sc.arpa-20220810.tar.xz
 OPENGRAM_DICT_TAR=	dict-20220810.tar.xz
 TABLE_DICT_TAR=		table.tar.gz
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 post-patch:
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
 	@${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \
 		${WRKSRC}/src/libime/core/kenlm/lm/trie_sort.hh \
 		${WRKSRC}/src/libime/core/kenlm/util/joint_sort.hh \
@@ -52,4 +52,4 @@ post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${OPENGRAM_DICT_TAR} ${WRKSRC}/data
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${TABLE_DICT_TAR} ${WRKSRC}/data
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/comms/uird/Makefile b/comms/uird/Makefile
index b24194d0ead3..20bc139897bd 100644
--- a/comms/uird/Makefile
+++ b/comms/uird/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/converters/cocot/Makefile b/converters/cocot/Makefile
index 96b896a2f505..17140293bb3d 100644
--- a/converters/cocot/Makefile
+++ b/converters/cocot/Makefile
@@ -26,7 +26,7 @@ DOCS_JA=	ChangeLog.ja README.ja
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile
index bd9433401cfd..232267b85446 100644
--- a/converters/wkhtmltopdf/Makefile
+++ b/converters/wkhtmltopdf/Makefile
@@ -78,11 +78,9 @@ post-patch:
 	${ECHO} 'LIBS+= -lcrypto' >>${WRKSRC}/src/pdf/pdf.pro
 	${MKDIR} ${WRKSRC}/build/app ${WRKSRC}/build/qt \
 		${WRKSRC}/build/wkhtmltox
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-	${REINPLACE_CMD} -e "s|register int|int|g" \
-		${PATCH_WRKSRC}/src/corelib/kernel/qcore_unix_p.h
-	${REINPLACE_CMD} -e "s|register UWORD32|UWORD32|g" \
-		${PATCH_WRKSRC}/../qt-5db36ec/src/3rdparty/md5/md5.cpp
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+	@${FIND} ${PATCH_WRKSRC}/../qt-5db36ec -name "*.cpp" -o -name "*.h" | \
+		${XARGS} ${REINPLACE_CMD} -e 's|register ||g'
 .endif
 
 
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index b202f2a2d125..32fa93f67229 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -35,7 +35,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/databases/R-cran-RSQLite/Makefile b/databases/R-cran-RSQLite/Makefile
index 57d259557186..b4f1606b222b 100644
--- a/databases/R-cran-RSQLite/Makefile
+++ b/databases/R-cran-RSQLite/Makefile
@@ -25,7 +25,7 @@ USES=		cran:auto-plist,compiles
 .include <bsd.port.options.mk>
 
 post-patch:
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 	@${REINPLACE_CMD} -e 's|PKG_CPPFLAGS=|PKG_CPPFLAGS=-Wno-error=enum-constexpr-conversion |g' \
 		${WRKSRC}/src/Makevars
 .endif
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index aca18c8b9767..9885c146e4b4 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -98,7 +98,7 @@ CFLAGS+=		-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 CONFIGURE_ARGS+=	--without-java
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile
index 06c033034d46..bd2db90d0012 100644
--- a/databases/pxlib/Makefile
+++ b/databases/pxlib/Makefile
@@ -11,26 +11,25 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
-USES=		gmake gnome iconv libtool pathfix perl5 pkgconfig
+USES=		gmake gnome iconv libtool localbase:ldflags pathfix perl5 pkgconfig
 USE_GNOME=	intltool
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
-USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	MANPAGES NLS
 OPTIONS_SUB=	yes
 
 MANPAGES_BUILD_DEPENDS=	docbook-to-man:textproc/docbook-to-man \
 			docbook2man:textproc/docbook-utils
-NLS_CONFIGURE_OFF=	--disable-nls
 NLS_USES=	gettext
-INSTALL_TARGET=	install-strip
+NLS_CONFIGURE_OFF=	--disable-nls
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile
index 7396ee4a97bc..9eea5f986fbd 100644
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@@ -43,7 +43,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CONFIGURE_ARGS+=	--with-cflags="-Wno-error=incompatible-function-pointer-types"
 .endif
 
diff --git a/databases/ruby-tokyocabinet/Makefile b/databases/ruby-tokyocabinet/Makefile
index 49c5cedd951d..34fddee3a907 100644
--- a/databases/ruby-tokyocabinet/Makefile
+++ b/databases/ruby-tokyocabinet/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CONFIGURE_ARGS+=	--with-cflags="-Wno-error=incompatible-function-pointer-types"
 .endif
 
diff --git a/deskutils/simpleagenda/Makefile b/deskutils/simpleagenda/Makefile
index ca8bf4799453..05948ebfaf53 100644
--- a/deskutils/simpleagenda/Makefile
+++ b/deskutils/simpleagenda/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/devel/antlr/Makefile b/devel/antlr/Makefile
index 12e84da2e33f..136bfebfd35d 100644
--- a/devel/antlr/Makefile
+++ b/devel/antlr/Makefile
@@ -14,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 CONFLICTS=	pccts
 
 USES=		compiler:c++11-lang gmake
+USE_CXXSTD=	c++14
 USE_JAVA=	yes
 
 HAS_CONFIGURE=	yes
@@ -35,17 +36,9 @@ PORTDOCS=	ANTLRException.gif closure.gif cpp-runtime.html \
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	(cd ${WRKSRC} && ${CP} antlr.jar antlrall.jar)
 
-post-patch:
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-	@${REINPLACE_CMD} -e 's|binary_function|__binary_function|' \
-		${WRKSRC}/lib/cpp/antlr/CharScanner.hpp
-.endif
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/antlr.jar ${STAGEDIR}${JAVAJARDIR}
diff --git a/devel/apache-commons-daemon/Makefile b/devel/apache-commons-daemon/Makefile
index b8665cdfbf87..df282cf4172a 100644
--- a/devel/apache-commons-daemon/Makefile
+++ b/devel/apache-commons-daemon/Makefile
@@ -29,7 +29,7 @@ PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/devel/criterion/Makefile b/devel/criterion/Makefile
index bf011f60e4f7..df99d0bc3014 100644
--- a/devel/criterion/Makefile
+++ b/devel/criterion/Makefile
@@ -39,7 +39,7 @@ MESON_ARGS=	-Dtests=false -Dsamples=false
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/devel/csmith/Makefile b/devel/csmith/Makefile
index d6672dde2d67..5cda8e795498 100644
--- a/devel/csmith/Makefile
+++ b/devel/csmith/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CPPFLAGS+=	-Wno-error=enum-constexpr-conversion
 .endif
 
diff --git a/devel/darts/Makefile b/devel/darts/Makefile
index 12aaeee8536b..2eeb3dc0b4dc 100644
--- a/devel/darts/Makefile
+++ b/devel/darts/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CPPFLAGS+=  -Dregister=
 .endif
 
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index 4dee67cfbcf5..76e1a3fe5d7d 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -21,6 +21,7 @@ USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
+USE_CXXSTD=	c++14
 CONFIGURE_ARGS=	--disable-osx --disable-extra-warnings --disable-profiling \
 		--disable-debug --enable-debug-support --disable-trace \
 		--enable-text --enable-gettid --enable-network \
@@ -63,14 +64,10 @@ X11_CONFIGURE_ENABLE=	x11
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 # assembly files use old split syntax which clang doesn't like
 .if ${ARCH:Marmv?} && ${COMPILER_TYPE} == "clang"
 BUILD_DEPENDS+=	as:devel/binutils
diff --git a/devel/gengetopt/Makefile b/devel/gengetopt/Makefile
index 1d1f56bad4df..b053fe0f4fdb 100644
--- a/devel/gengetopt/Makefile
+++ b/devel/gengetopt/Makefile
@@ -11,6 +11,7 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		makeinfo tar:xz
+USE_CXXSTD=	c++14
 
 GNU_CONFIGURE=	yes
 
@@ -31,14 +32,6 @@ DOC_EXAMPLES=	README.example cmdline1.c cmdline1.h cmdline2.c cmdline2.h \
 TESTS_EXAMPLES=	test_manual_help.c test_manual_help_cmd.c \
 		test_manual_help_cmd.ggo test_manual_help_cmd.h
 
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-	@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
-		${WRKSRC}/src/gm_utils.h
-.endif
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/
diff --git a/devel/genht/Makefile b/devel/genht/Makefile
index 502450972338..d5ec7e389717 100644
--- a/devel/genht/Makefile
+++ b/devel/genht/Makefile
@@ -22,7 +22,7 @@ OPTIONS_DEFINE=	EXAMPLES
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/devel/gorm/Makefile b/devel/gorm/Makefile
index 3564b591a5be..c97e086b056d 100644
--- a/devel/gorm/Makefile
+++ b/devel/gorm/Makefile
@@ -22,7 +22,7 @@ DEFAULT_LIBVERSION=	1.1.0
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CPPFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index 597fc068ed4d..e63317ea70c6 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -19,6 +19,7 @@ MAKE_JOBS_UNSAFE=	yes
 LIB_DEPENDS=		libexpat.so:textproc/expat2 \
 			libmcpp.so:devel/mcpp
 USES+=			compiler:c++11-lang ssl
+USE_CXXSTD=	c++11
 .else
 LIB_VRS=		${PORTVERSION:R:S|.||g}
 LIB_DEPENDS+=		libIce.so.${LIB_VRS}:devel/ice
@@ -60,9 +61,6 @@ MAKE_ENV+=		NOTESTS=yes
 
 .if ${SLAVE_PORT} == "no"
 MAKE_ENV+=		LD_LIBRARY_PATH=${WRKSRC}/cpp/lib:$$LD_LIBRARY_PATH
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-USE_CXXSTD=	c++11
-.endif
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/devel/ice37/Makefile b/devel/ice37/Makefile
index efc69f6c4d2f..4f72f851a071 100644
--- a/devel/ice37/Makefile
+++ b/devel/ice37/Makefile
@@ -29,6 +29,7 @@ OPTIONS_DEFINE?=	DEBUG STATIC TEST
 OPTIONS_SUB=		yes
 
 USES+=			compiler:c++14-lang iconv gmake
+USE_CXXSTD=	c++14
 DEBUG_MAKE_ENV=		OPTIMIZE=no
 TEST_ALL_TARGET_OFF=	srcs
 MAKE_ARGS+=		V=1
@@ -116,23 +117,6 @@ post-patch:
 		${WRKSRC}/scripts/Util.py
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g;' \
 		${WRKSRC}/scripts/Glacier2Util.py
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-	@${REINPLACE_CMD} -e 's|binary_function|__binary_function|g ; s|unary_function|__unary_function|g' \
-		${WRKSRC}/cpp/include/Ice/Proxy.h \
-		${WRKSRC}/cpp/include/IceUtil/Functional.h \
-		${WRKSRC}/cpp/src/IceGrid/AdapterCache.cpp \
-		${WRKSRC}/cpp/src/IceGrid/AllocatableObjectCache.cpp \
-		${WRKSRC}/cpp/src/IceGrid/Database.cpp \
-		${WRKSRC}/cpp/src/IceGrid/DescriptorHelper.cpp \
-		${WRKSRC}/cpp/src/IceGrid/NodeCache.cpp \
-		${WRKSRC}/cpp/src/IceGrid/ObjectCache.cpp \
-		${WRKSRC}/cpp/src/IceGrid/ServerCache.cpp \
-		${WRKSRC}/cpp/src/IceGrid/ServerI.cpp \
-		${WRKSRC}/cpp/src/IceGrid/Util.h \
-		${WRKSRC}/cpp/src/IcePatch2/Calc.cpp \
-		${WRKSRC}/cpp/src/IcePatch2Lib/Util.h \
-		${WRKSRC}/cpp/src/Slice/Parser.h
-.endif
 
 IS_JAILED_CMD=		${SYSCTL} -n security.jail.jailed
 JAILED_FILTER=		--rfilter=IceDiscovery \
diff --git a/devel/libbinio/Makefile b/devel/libbinio/Makefile
index 37ed4e48083c..3bb993d6aada 100644
--- a/devel/libbinio/Makefile
+++ b/devel/libbinio/Makefile
@@ -10,6 +10,7 @@ WWW=		https://adplug.github.io/libbinio/
 LICENSE=	LGPL21
 
 USES=		autoreconf compiler:c11 libtool pathfix
+USE_CXXSTD=	c++14
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
@@ -21,12 +22,6 @@ INSTALL_TARGET=	install-strip
 
 PORTSCOUT=	skipv:start
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\(SUBDIRS\ =\).*|\1 src|' ${WRKSRC}/Makefile.am
 
diff --git a/devel/libgee06/Makefile b/devel/libgee06/Makefile
index 0a0bec668d88..5a8a5d77ae36 100644
--- a/devel/libgee06/Makefile
+++ b/devel/libgee06/Makefile
@@ -21,7 +21,7 @@ INSTALL_TARGET=	install-strip
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/devel/libs11n/Makefile b/devel/libs11n/Makefile
index b16cb8f56611..0d1a61487adf 100644
--- a/devel/libs11n/Makefile
+++ b/devel/libs11n/Makefile
@@ -12,7 +12,7 @@ WWW=		http://s11n.net/
 LICENSE=	PD
 
 USES=		uidfix zip
-USE_CXXSTD=	c++11
+USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 
 PORTSCOUT=	limitw:1,even
@@ -30,14 +30,6 @@ PLIST_SUB+=	PROFILE=""
 post-extract:
 	@${CP} ${PATCHDIR}/Makefile.bsd ${WRKSRC}/Makefile
 
-post-patch:
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-	@${REINPLACE_CMD} -e 's|auto_ptr|unique_ptr|' \
-		${WRKSRC}/../include/s11n.net/s11n/algo.tpp \
-		${WRKSRC}/../include/s11n.net/s11n/io/data_node_format.hpp \
-		${WRKSRC}/../include/s11n.net/s11n/io/data_node_io.hpp
-.endif
-
 pre-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/s11n.net
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/s11n.net/s11n
diff --git a/devel/libx86/Makefile b/devel/libx86/Makefile
index afcf96d05e8e..668dc90ca3d1 100644
--- a/devel/libx86/Makefile
+++ b/devel/libx86/Makefile
@@ -24,7 +24,7 @@ PLIST_FILES=	include/libx86.h lib/libx86.a lib/libx86.so lib/libx86.so.1
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index d3e9a83b0dc9..124672e9b8e1 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -83,7 +83,7 @@ INFO+=		libquadmath
 .endif
 INSTALL_TARGET=	install-strip
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CPPFLAGS+=  -Wno-error=increment-bool \
 			-Dregister=
 .endif
diff --git a/devel/mpatrol/Makefile b/devel/mpatrol/Makefile
index 922d1aeec1d1..7774fa0a40eb 100644
--- a/devel/mpatrol/Makefile
+++ b/devel/mpatrol/Makefile
@@ -45,7 +45,7 @@ OPTIONS_DEFINE=	DOCS
 CFLAGS+=	-DENVIRON=\"ENVIRON_64\" -DMP_INIT_SUPPORT=0
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=dynamic-exception-spec
 .endif
 
diff --git a/devel/p5-Compiler-Lexer/Makefile b/devel/p5-Compiler-Lexer/Makefile
index 433d61c57629..b9cd137ac26c 100644
--- a/devel/p5-Compiler-Lexer/Makefile
+++ b/devel/p5-Compiler-Lexer/Makefile
@@ -16,11 +16,7 @@ BUILD_DEPENDS=	p5-Module-Build-XSUtil>0:devel/p5-Module-Build-XSUtil
 USES=		perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CFLAGS+=  -Dregister=
-.endif
+CFLAGS+=	--std=c++14
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Compiler/Lexer/Lexer.so
diff --git a/devel/pecl-yac/Makefile b/devel/pecl-yac/Makefile
index bfdd7fa61fe5..cd57c9ed6c27 100644
--- a/devel/pecl-yac/Makefile
+++ b/devel/pecl-yac/Makefile
@@ -18,7 +18,7 @@ MSGPACK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-m
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/devel/py-donut-shellcode/Makefile b/devel/py-donut-shellcode/Makefile
index d17f837bc721..25af624e2344 100644
--- a/devel/py-donut-shellcode/Makefile
+++ b/devel/py-donut-shellcode/Makefile
@@ -18,7 +18,7 @@ DOS2UNIX_GLOB=	*.py
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/devel/py-fam/Makefile b/devel/py-fam/Makefile
index a4bbbb814f37..b981f8c6e142 100644
--- a/devel/py-fam/Makefile
+++ b/devel/py-fam/Makefile
@@ -20,11 +20,10 @@ USE_PYTHON=	distutils autoplist
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 pre-patch:
 	${INSTALL_DATA} ${FILESDIR}/setup.py ${WRKSRC}
diff --git a/devel/py-pyyaml5/Makefile b/devel/py-pyyaml5/Makefile
index 5e172b4a8147..da0ea93fb036 100644
--- a/devel/py-pyyaml5/Makefile
+++ b/devel/py-pyyaml5/Makefile
@@ -38,7 +38,7 @@ PYDISTUTILS_SETUP+=		--without-libyaml
 NO_ARCH=			yes
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/devel/rubygem-cbor/Makefile b/devel/rubygem-cbor/Makefile
index 9a7f8555e951..be5047127d6c 100644
--- a/devel/rubygem-cbor/Makefile
+++ b/devel/rubygem-cbor/Makefile
@@ -13,7 +13,7 @@ USES=		gem
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CONFIGURE_ARGS+=	--with-cflags="-Wno-error=incompatible-function-pointer-types"
 .endif
 
diff --git a/devel/rubygem-curses/Makefile b/devel/rubygem-curses/Makefile
index c8e8a1fb2716..bcb8430cc655 100644
--- a/devel/rubygem-curses/Makefile
+++ b/devel/rubygem-curses/Makefile
@@ -14,7 +14,7 @@ USES=		gem ncurses
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CONFIGURE_ARGS+=	--with-cflags="-Wno-error=incompatible-function-pointer-types"
 .endif
 
diff --git a/devel/rubygem-mmap2/Makefile b/devel/rubygem-mmap2/Makefile
index 864ed2bac381..100da1ec9029 100644
--- a/devel/rubygem-mmap2/Makefile
+++ b/devel/rubygem-mmap2/Makefile
@@ -14,7 +14,7 @@ USES=		gem
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CONFIGURE_ARGS+=	--with-cflags="-Wno-error=incompatible-function-pointer-types"
 .endif
 
diff --git a/devel/rubygem-posix-spawn/Makefile b/devel/rubygem-posix-spawn/Makefile
index c271dfe200b8..03eafbe82aca 100644
--- a/devel/rubygem-posix-spawn/Makefile
+++ b/devel/rubygem-posix-spawn/Makefile
@@ -16,7 +16,7 @@ PLIST_FILES=	bin/posix-spawn-benchmark
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CONFIGURE_ARGS+=	--with-cflags="-Wno-error=incompatible-function-pointer-types"
 .endif
 
diff --git a/devel/rubygem-prometheus-client-mmap/Makefile b/devel/rubygem-prometheus-client-mmap/Makefile
index 60afa52c46fb..4805ca089ebf 100644
--- a/devel/rubygem-prometheus-client-mmap/Makefile
+++ b/devel/rubygem-prometheus-client-mmap/Makefile
@@ -15,7 +15,7 @@ USES=		gem
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CONFIGURE_ARGS+=	--with-cflags="-Wno-error=incompatible-function-pointer-types"
 .endif
 
diff --git a/devel/rubygem-rbtrace/Makefile b/devel/rubygem-rbtrace/Makefile
index ae92c0f65cfc..46618c15559d 100644
--- a/devel/rubygem-rbtrace/Makefile
+++ b/devel/rubygem-rbtrace/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES=	bin/rbtrace
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CONFIGURE_ARGS+=	--with-cflags="-Wno-error=incompatible-function-pointer-types"
 .endif
 
diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile
index 7299db5bd74b..b9d8a264b67f 100644
--- a/devel/sfml/Makefile
+++ b/devel/sfml/Makefile
@@ -15,6 +15,7 @@ GH_ACCOUNT=	SFML
 GH_PROJECT=	SFML
 
 USES=		cmake compiler:c++11-lang
+USE_CXXSTD=	c++14
 CMAKE_ARGS=	-DSFML_INSTALL_PKGCONFIG_FILES=ON \
 		-DSFML_USE_SYSTEM_DEPS=ON
 USE_LDCONFIG=	yes
@@ -58,14 +59,6 @@ DOXYGEN_IMPLIES=	DOCS
 
 EXAMPLES_CMAKE_BOOL=	SFML_BUILD_EXAMPLES
 
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-	@${REINPLACE_CMD} -e 's|auto_ptr|unique_ptr|' \
-		${WRKSRC}/src/SFML/Audio/AudioDevice.cpp
-.endif
-
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/*.pc
 
diff --git a/devel/sope/Makefile b/devel/sope/Makefile
index 52c317051d97..b2666788a8ca 100644
--- a/devel/sope/Makefile
+++ b/devel/sope/Makefile
@@ -45,7 +45,7 @@ PGSQL_USES=		pgsql
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CPPFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index 1810d12b7a17..0262147dbdb0 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -41,11 +41,10 @@ ORIGWRKSRC=	${WRKDIR}/${DISTNAME}/src
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CPPFLAGS+=       -Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CPPFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 pre-install:
 	${RM} -r ${ORIGWRKSRC}/docs-tla/PLUGIN \
diff --git a/devel/z80-asm/Makefile b/devel/z80-asm/Makefile
index 220e42101ae0..cc422953834c 100644
--- a/devel/z80-asm/Makefile
+++ b/devel/z80-asm/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/editors/aewan/Makefile b/editors/aewan/Makefile
index 2cf8078a0634..e7a27dc41249 100644
--- a/editors/aewan/Makefile
+++ b/editors/aewan/Makefile
@@ -28,11 +28,10 @@ OPTIONS_DEFINE=	DOCS
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|OSTYPE == |OSTYPE = |g' ${WRKSRC}/configure
diff --git a/editors/led/Makefile b/editors/led/Makefile
index d869259dcea6..66ab6729ad52 100644
--- a/editors/led/Makefile
+++ b/editors/led/Makefile
@@ -19,7 +19,7 @@ SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/editors/morla/Makefile b/editors/morla/Makefile
index 48c4123b59e2..33c078b5f6fd 100644
--- a/editors/morla/Makefile
+++ b/editors/morla/Makefile
@@ -47,7 +47,7 @@ XULRUNNER_CONFIGURE_OFF=	--with-javascript=none
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/editors/uzap/Makefile b/editors/uzap/Makefile
index c6d40adf57de..dc0bbfa9cb61 100644
--- a/editors/uzap/Makefile
+++ b/editors/uzap/Makefile
@@ -23,7 +23,7 @@ PLIST_FILES=	bin/uzap man/man1/uzap.1.gz
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index 6edeb5a531e2..586eef301369 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -36,11 +36,6 @@ DEBUGGER_HEAVY_DESC=Enable internal debugger with extra features
 DEBUGGER_ENABLE_CONFIGURE_ON=	--enable-debug=yes
 DEBUGGER_HEAVY_CONFIGURE_ON=	--enable-debug=heavy
 
-.include <bsd.port.options.mk>
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=	-Dregister=
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's#\/usr\/share\/doc\/dosbox#${DOCSDIR}#g' \
 		${WRKSRC}/docs/dosbox.1
@@ -49,6 +44,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dosbox ${STAGEDIR}${PREFIX}/bin/dosbox
 	${INSTALL_DATA} ${WRKSRC}/src/dosbox.ico ${STAGEDIR}${PREFIX}/share/pixmaps/
 	${INSTALL_MAN} ${WRKSRC}/docs/dosbox.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
diff --git a/emulators/hugo/Makefile b/emulators/hugo/Makefile
index ddaf65c1bf59..d9da1e934eee 100644
--- a/emulators/hugo/Makefile
+++ b/emulators/hugo/Makefile
@@ -50,10 +50,9 @@ SDL_MIXER_CFLAGS=	-DOGG_SUPPORT
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/emulators/qemu-cheri/Makefile b/emulators/qemu-cheri/Makefile
index 222fff20fb45..9f61afbe73af 100644
--- a/emulators/qemu-cheri/Makefile
+++ b/emulators/qemu-cheri/Makefile
@@ -65,7 +65,7 @@ PLIST_FILES=	bin/qemu-system-morello \
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index 5446bb523df7..0d0b49d9e9ee 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -57,9 +57,9 @@ CLIENT_USE=		GL=glu XORG=x11,xxf86dga,xxf86vm
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
@@ -91,4 +91,4 @@ do-install-DEDICATED-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-ded \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}-ded
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/dxx-rebirth/Makefile b/games/dxx-rebirth/Makefile
index 41689ce3133b..7e220e362b46 100644
--- a/games/dxx-rebirth/Makefile
+++ b/games/dxx-rebirth/Makefile
@@ -35,22 +35,21 @@ MAKE_ARGS=	ignore_unknown_variables=1 sdl2=1
 PLIST_FILES=	bin/d1x-rebirth \
 		bin/d2x-rebirth
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${ARCH} != powerpc64 && ${ARCH} != riscv64
 MAKE_ARGS+=	lto=1
 .endif
 
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150
 CPPFLAGS+=	-Wno-error=unused-but-set-parameter -Wno-error=unused-but-set-variable
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${COMPILER_VERSION} >= 160
 CPPFLAGS+=	-Wno-error=unused-result
 .endif
+.endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/d1x-rebirth \
 		${STAGEDIR}${PREFIX}/bin/d2x-rebirth
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile
index f00121a090e3..31dcdc0b7e1b 100644
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@@ -34,11 +34,10 @@ NETHACKCONFIG=	${FILESDIR}/x-config
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -e "s|<malloc.h>|<stdlib.h>|" \
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index da745cb82710..8a150a927014 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -44,7 +44,7 @@ FREETYPE_CONFIG?=	pkg-config freetype2
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index b474e3209ef1..b057034b63a9 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -14,6 +14,7 @@ LICENSE=	GPLv3+
 USES=		cpe shebangfix
 CPE_VENDOR=	gnu
 CPE_PRODUCT=	chess
+USE_CXXSTD=	c++14
 
 SHEBANG_FILES=	doc/quotes.rb
 
@@ -30,27 +31,18 @@ OPENING_BOOK_DESC=	Install opening book (25 MB download)
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
+OPENING_BOOK_DISTFILES=	book_1.02.pgn.gz
+OPENING_BOOK_EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOPENING_BOOK}
-DISTFILES+=	book_1.02.pgn.gz
-EXTRACT_ONLY+=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
-post-build:
-.if ${PORT_OPTIONS:MOPENING_BOOK}
+post-build-OPENING_BOOK-on:
 	zcat ${DISTDIR}/book_1.02.pgn.gz > ${WRKSRC}/src/book.pgn
 	cd ${WRKSRC}/src && ( ${ECHO} book add book.pgn; sleep 1; ${ECHO} quit ) | ./gnuchess
 	@${REINPLACE_CMD} -e '/Book =/s/false/true/' ${WRKSRC}/src/gnuchess.ini
-.endif
 
 post-install:
 	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -f gnuchess gnuchessx
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 	${RM} ${STAGEDIR}${DOCSDIR}/gnuchess.info
diff --git a/games/gshisen/Makefile b/games/gshisen/Makefile
index 61c0249d527f..a8960499570d 100644
--- a/games/gshisen/Makefile
+++ b/games/gshisen/Makefile
@@ -16,7 +16,7 @@ USE_GNUSTEP=	back build
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/games/kevedit/Makefile b/games/kevedit/Makefile
index 385ffa048691..f82ffb85a27a 100644
--- a/games/kevedit/Makefile
+++ b/games/kevedit/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/games/libgnome-games-support/Makefile b/games/libgnome-games-support/Makefile
index a231aab75def..9194b1ddb11e 100644
--- a/games/libgnome-games-support/Makefile
+++ b/games/libgnome-games-support/Makefile
@@ -21,7 +21,7 @@ USE_GNOME=	cairo gdkpixbuf2 gtk30
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/games/libretro-bluemsx/Makefile b/games/libretro-bluemsx/Makefile
index e1aea3ed4c80..8e3a77b27e0f 100644
--- a/games/libretro-bluemsx/Makefile
+++ b/games/libretro-bluemsx/Makefile
@@ -17,18 +17,17 @@ USE_LDCONFIG=	yes
 
 PLIST_FILES=	lib/libretro/bluemsx_libretro.so
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${COMPILER_VERSION} >= 160
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
 	${INSTALL_LIB} ${WRKSRC}/bluemsx_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index a2cf4a77951a..a7fc45c6480a 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -81,7 +81,7 @@ PLIST_SUB+=	HACKLINK=""
 PLIST_SUB+=	HACKLINK="@comment "
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/games/prboom-plus/Makefile b/games/prboom-plus/Makefile
index 0b0c62e51e15..6d2af709b358 100644
--- a/games/prboom-plus/Makefile
+++ b/games/prboom-plus/Makefile
@@ -35,7 +35,7 @@ OPENGL_CONFIGURE_ENABLE=	gl
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/games/tuxpaint/Makefile b/games/tuxpaint/Makefile
index b1666b0a5045..861d1fb26efb 100644
--- a/games/tuxpaint/Makefile
+++ b/games/tuxpaint/Makefile
@@ -55,7 +55,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index fb116f808253..7e3f7b4bbe6b 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -31,7 +31,7 @@ CPPFLAGS+=	-DGLX_GLXEXT_LEGACY
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index 00e3542d40ee..a47990e4fb76 100644
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -27,7 +27,7 @@ NLS_LIBS=	-lintl
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/games/xlennart/Makefile b/games/xlennart/Makefile
index 63f4392a2875..16bc7c44fe23 100644
--- a/games/xlennart/Makefile
+++ b/games/xlennart/Makefile
@@ -51,7 +51,7 @@ SCORES_DIR?=	${DATADIR}/scores
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index 31795e8d60e9..a4cc591c6eee 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -17,7 +17,7 @@ CFLAGS+=	-Wno-error=return-type
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/games/xroach/Makefile b/games/xroach/Makefile
index d0787a3d0f69..075cfd830895 100644
--- a/games/xroach/Makefile
+++ b/games/xroach/Makefile
@@ -24,7 +24,7 @@ PLIST_FILES=	bin/xroach man/man6/xroach.6.gz
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/games/xtrojka/Makefile b/games/xtrojka/Makefile
index 5ad5f0dfd1cc..282c055f3f3f 100644
--- a/games/xtrojka/Makefile
+++ b/games/xtrojka/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 .include <bsd.port.options.mk>
 
 post-patch:
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 	@${REINPLACE_CMD} -e 's|CFLAGS=|CFLAGS=-Wno-error=incompatible-function-pointer-types |g' \
 		${WRKSRC}/Makefile
 .endif
diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile
index 1564f22d1ed3..d36f004c0749 100644
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@@ -17,6 +17,7 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		autoreconf cpe gmake libtool pathfix pkgconfig sdl xorg
 CPE_VENDOR=	antigrain
+USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 USE_SDL=	sdl
 USE_XORG=	x11
@@ -25,12 +26,6 @@ GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} 's/_LDFLAGS/_LDADD/' ${WRKSRC}/examples/Makefile.am
 
diff --git a/graphics/anttweakbar/Makefile b/graphics/anttweakbar/Makefile
index 046e1d0b0028..a2914a650142 100644
--- a/graphics/anttweakbar/Makefile
+++ b/graphics/anttweakbar/Makefile
@@ -34,7 +34,7 @@ PLIST_FILES=	include/AntTweakBar.h \
 .include <bsd.port.options.mk>
 
 post-patch:
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 	@${REINPLACE_CMD} -e 's|public binary_function|public __binary_function|' \
 		${WRKSRC}/TwMgr.cpp
 .endif
diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile
index 9e32b36d06bc..38a32d02f057 100644
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@@ -13,6 +13,7 @@ LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake pkgconfig
+USE_CXXSTD=	c++14
 USE_GITHUB=	yes
 GH_ACCOUNT=	DentonW
 GH_PROJECT=	DevIL
@@ -62,12 +63,6 @@ SQUISH_CMAKE_BOOL=	IL_USE_DXTC_SQUISH
 #NVTT_CMAKE_BOOL=	IL_USE_DXTC_NVIDIA
 CMAKE_ARGS+=		-DIL_USE_DXTC_NVIDIA=0
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CXXFLAGS+=  -Dregister=
-.endif
-
 post-install-DOCS-on:
 	cd ${WRKSRC}/DevIL-docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/DevIL && ${INSTALL_DATA} CREDITS NEWS README.md TODO ${STAGEDIR}${DOCSDIR}/
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index db387895707d..1d1214ccda8e 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+=	--disable-libemf
 PLIST_SUB+=		WMF="@comment "
 #.endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 3dc7fe8f0ef1..54cf4a929c87 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -14,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 USES=		cpe gmake iconv jpeg libtool
+USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	djvulibre_project
@@ -38,12 +39,6 @@ DESKTOPFILES_DESC=	Install icons and mime types
 DESKTOPFILES_CONFIGURE_ENABLE=	desktopfiles
 DESKTOPFILES_USES=	gnome
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 post-patch:
 # Remove custom optimization compiler flags
 	@${REINPLACE_CMD} -e '/-[Og]\*)/d ; \
diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile
index 844cd6ae5305..eac798c22a53 100644
--- a/graphics/gdchart/Makefile
+++ b/graphics/gdchart/Makefile
@@ -32,7 +32,7 @@ PLIST_SUB+=	PROFILE="@comment "
 PLIST_SUB+=	PROFILE=""
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index 839d2bcb1922..bce3610a8951 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index dbfe288960dd..f8a8bb89904e 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--disable-gles1 --disable-osmesa --disable-vg --disable-wayland
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/graphics/opennurbs/Makefile b/graphics/opennurbs/Makefile
index 58b6fb58d7c3..bcbb8f284b46 100644
--- a/graphics/opennurbs/Makefile
+++ b/graphics/opennurbs/Makefile
@@ -37,8 +37,8 @@ MAKE_ARGS+=	ON_GNU_OPTIMIZER_FLAGS="-g -fPIC"
 .endif
 
 post-patch:
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-	@${REINPLACE_CMD} -e 's|D_GNU_SOURCE -I|D_GNU_SOURCE -Dregister= -I|g' \
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+	@${REINPLACE_CMD} -e 's|D_GNU_SOURCE -I|D_GNU_SOURCE --std=c++14 -I|g' \
 		${WRKSRC}/makefile
 .endif
 
diff --git a/graphics/pixen/Makefile b/graphics/pixen/Makefile
index e6e594945e27..dc4ce1d6c78e 100644
--- a/graphics/pixen/Makefile
+++ b/graphics/pixen/Makefile
@@ -21,11 +21,10 @@ ADDITIONAL_OBJCFLAGS+=	-Dlog2=logb
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/Pixen.app/Pixen
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index b9883a7df9d1..9f40d000611d 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -14,6 +14,7 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake libtool localbase:ldflags xorg	# parallel builds are broken with bmake(1)
+USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 USE_XORG=	ice sm x11 xaw xext xmu xt
 
@@ -24,10 +25,4 @@ TEST_TARGET=	check
 
 INFO=		libxmi plotutils
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 .include <bsd.port.mk>
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index ec3be553b1dc..dd0c62027ea5 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -15,6 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USES=		autoreconf:build compiler:c11 gmake
+USE_CXXSTD=	c++14
 USE_GITHUB=	yes
 GH_ACCOUNT=	POV-Ray
 
@@ -97,10 +98,6 @@ post-patch:
 	${REINPLACE_CMD} -e 's|@@EXAMPLESDIR@@|${EXAMPLESDIR}|' \
 		-e 's|@@ETCDIR@@|${ETCDIR}|' \
 		${WRKSRC}/unix/povray.conf
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-	@${REINPLACE_CMD} -e 's|auto_ptr|unique_ptr|' \
-		${WRKSRC}/source/backend/render/trace.cpp
-.endif
 
 pre-configure:
 	cd ${WRKSRC}/unix && ./prebuild.sh
diff --git a/graphics/py-pyvips/Makefile b/graphics/py-pyvips/Makefile
index c8567d469065..f4868665baf3 100644
--- a/graphics/py-pyvips/Makefile
+++ b/graphics/py-pyvips/Makefile
@@ -24,7 +24,7 @@ USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/graphics/quesoglc/Makefile b/graphics/quesoglc/Makefile
index d1f4af37b456..1b7230e876ac 100644
--- a/graphics/quesoglc/Makefile
+++ b/graphics/quesoglc/Makefile
@@ -42,7 +42,7 @@ TEST_TEST_TARGET=	check
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile
index 3943f03e8d82..2913857f8d5c 100644
--- a/graphics/togl/Makefile
+++ b/graphics/togl/Makefile
@@ -29,7 +29,7 @@ TOGL_INSTDIR=	${PREFIX}/lib/${DISTNAME}
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index 45c71ac286d5..ce71b9320344 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -48,7 +48,7 @@ PLUGIN_LIST=	abot acro arcfour autocycle blowfish cavlink cdrom encrypt \
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/irc/scrollz/Makefile b/irc/scrollz/Makefile
index ff31780f816d..ec5c0b7a511a 100644
--- a/irc/scrollz/Makefile
+++ b/irc/scrollz/Makefile
@@ -41,11 +41,10 @@ UTF8_CONFIGURE_ENABLE=	utf8
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 .if !empty(ICONV_LIB)
 CONFIGURE_ENV+=ac_cv_func_iconv_open=yes
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 1ccf40166e6c..32da107e1cc4 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -21,7 +21,7 @@ MANLANG?=		ja
 .include "${.CURDIR}/../../japanese/FreeWnn-lib/Makefile.common"
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile
index c2466a49c56a..82913c79a868 100644
--- a/japanese/edict/Makefile
+++ b/japanese/edict/Makefile
@@ -44,7 +44,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index c67f05c6f1b4..20e6af8b63d9 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -15,7 +15,8 @@ COMMENT=	Japanese enhancement of GNU groff
 
 LICENSE=	GPLv2
 
-USES=		iconv:wchar_t cpe gmake makeinfo shebangfix
+USES=		iconv:wchar_t cpe gmake localbase makeinfo shebangfix
+USE_CXXSTD=	c++14
 
 SHEBANG_FILES=	src/utils/afmtodit/afmtodit.pl \
 		contrib/mm/mmroff.pl
@@ -23,8 +24,7 @@ CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-multibyte
 CONFIGURE_ENV=	INSTALL_MAN="${INSTALL_MAN}"
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
+LIBS+=		${ICONV_LIB}
 MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install install_doc
 PLIST_SUB=	GROFF_VERSION=${PORTVERSION}
@@ -45,12 +45,6 @@ MDOCFILES=	ja.eucJP doc-common doc-syms
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -E -e 's|^@setfilename +groff|&.info|g;' \
 	    ${WRKSRC}/doc/groff.texinfo
@@ -71,11 +65,13 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/mdoc.local ${STAGEDIR}${DATADIR}/site-tmac
 	${INSTALL_DATA} ${WRKSRC}/doc/groff.info \
 	    ${STAGEDIR}${PREFIX}/${INFO_PATH}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} \
-	    ChangeLog.jp NEWS PROBLEMS README README.jp ${STAGEDIR}${DOCSDIR}
 	for F in eqn neqn pic tbl; do \
 		${LN} -sf $$F ${STAGEDIR}${PREFIX}/bin/g$$F; \
 	done
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} \
+	    ChangeLog.jp NEWS PROBLEMS README README.jp ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/japanese/libskk/Makefile b/japanese/libskk/Makefile
index d045e9d70004..bdf75d878837 100644
--- a/japanese/libskk/Makefile
+++ b/japanese/libskk/Makefile
@@ -35,7 +35,7 @@ NLS_USES_OFF=	gettext-tools
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index a86e474e22b1..9fc3ec3c931c 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -15,6 +15,7 @@ BROKEN_mips=		fails to link: Nonrepresentable section on output
 BROKEN_mips64=		fails to link: Nonrepresentable section on output
 
 USES=		gettext-tools iconv libtool localbase perl5
+USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
@@ -27,12 +28,6 @@ PORTDOCS=	AUTHORS README *.html
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} '/^libmecab_la_LIBADD =/s/$$/ $$(LTLIBICONV)/' \
 		${WRKSRC}/src/Makefile.in
@@ -40,16 +35,14 @@ post-patch:
 		-e '/CFLAGS/s|-O3|${CFLAGS}|' \
 		-e '/CXXFLAGS/s|-O3|${CXXFLAGS}|' \
 		${WRKSRC}/configure
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-	@${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \
-		${WRKSRC}/src/dictionary.cpp
-.endif
 
 post-install:
+	${MV} ${STAGEDIR}${PREFIX}/etc/mecabrc \
+		${STAGEDIR}${PREFIX}/etc/mecabrc.sample
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:N*.html:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
-	${MV} ${STAGEDIR}${PREFIX}/etc/mecabrc \
-		${STAGEDIR}${PREFIX}/etc/mecabrc.sample
 
 .include <bsd.port.mk>
diff --git a/japanese/ruby-uconv/Makefile b/japanese/ruby-uconv/Makefile
index d41ed161e394..b372f90ba99d 100644
--- a/japanese/ruby-uconv/Makefile
+++ b/japanese/ruby-uconv/Makefile
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	DOCS
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
 
 post-patch:
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 	@${REINPLACE_CMD} -e 's|fdeclspec|fdeclspec -Wno-error=incompatible-function-pointer-types|g' \
 				${WRKSRC}/extconf.rb
 .endif
diff --git a/java/jikes/Makefile b/java/jikes/Makefile
index 54e4adc31869..4ce1b78f56ed 100644
--- a/java/jikes/Makefile
+++ b/java/jikes/Makefile
@@ -9,6 +9,7 @@ COMMENT=	Java source to byte-code compiler made available by IBM
 WWW=		http://jikes.sf.net/
 
 USES=		autoreconf gmake iconv localbase tar:bzip2
+USE_CXXSTD=	c++14
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	ac_cv_search_iconv=${ICONV_LIB} \
@@ -16,10 +17,4 @@ CONFIGURE_ARGS=	ac_cv_search_iconv=${ICONV_LIB} \
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 .include <bsd.port.mk>
diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile
index 456fb2e5aed0..3b24de948f99 100644
--- a/java/openjfx14/Makefile
+++ b/java/openjfx14/Makefile
@@ -91,7 +91,7 @@ _INSTALLDIR=	${PREFIX}/${PKGBASE}
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/java/sablevm-classpath/Makefile b/java/sablevm-classpath/Makefile
index b192a207cdfb..247b7cb6a5cc 100644
--- a/java/sablevm-classpath/Makefile
+++ b/java/sablevm-classpath/Makefile
@@ -47,7 +47,7 @@ ZIP_PLIST_SUB_OFF=		WITHOUT_ZIP="" WITH_ZIP="@comment "
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index d1ca3f019b0e..81bdfdc85185 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -26,10 +26,9 @@ INFO=		cim
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 .include <bsd.port.mk>
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 4b71aa5cc48e..372edd5d5895 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -33,7 +33,7 @@ OPTIONS_DEFINE=	EXAMPLES
 CFLAGS=		-O0
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 8e39aeeb579c..e732495a826b 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -67,11 +67,10 @@ IMAGES=		Squeak${IMAGE_FULL_VERSION}.image \
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,<utmp\.h>,<utmpx.h>,' \
diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile
index 75d6991ac0ba..1d437bb834f1 100644
--- a/mail/cclient/Makefile
+++ b/mail/cclient/Makefile
@@ -32,7 +32,7 @@ SSL_USES=		ssl
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile
index 4e052d168fff..8792e829d8f7 100644
--- a/mail/hbiff/Makefile
+++ b/mail/hbiff/Makefile
@@ -20,11 +20,10 @@ PLIST_FILES=	bin/hbiff man/man1/hbiff.1.gz
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 do-build:
 	${CC} ${CFLAGS} ${LDFLAGS} ${WRKSRC}/hbiff.c -o ${WRKSRC}/${PORTNAME}
diff --git a/mail/qmail-rblchk/Makefile b/mail/qmail-rblchk/Makefile
index f1c76b242b06..646bc565aee1 100644
--- a/mail/qmail-rblchk/Makefile
+++ b/mail/qmail-rblchk/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	EXAMPLES
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 340b17166659..ec41818aea9e 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -14,7 +14,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/math/alps/Makefile b/math/alps/Makefile
index 9180c3dffb4d..24c6e415b514 100644
--- a/math/alps/Makefile
+++ b/math/alps/Makefile
@@ -15,6 +15,7 @@ LIB_DEPENDS=	libCoinUtils.so:math/coinutils \
 		libopenblas.so:math/openblas
 
 USES=		blaslapack gmake libtool pkgconfig
+USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
@@ -25,14 +26,6 @@ GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-	@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
-		${WRKSRC}/Alps/src/AlpsHelperFunctions.h
-.endif
-
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/share
 
diff --git a/math/eval/Makefile b/math/eval/Makefile
index 1093e38904ea..dc0c0b536928 100644
--- a/math/eval/Makefile
+++ b/math/eval/Makefile
@@ -19,7 +19,7 @@ PLIST_FILES=	bin/Eval
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/math/form/Makefile b/math/form/Makefile
index 4957163b59a3..bb946fdc542a 100644
--- a/math/form/Makefile
+++ b/math/form/Makefile
@@ -37,7 +37,7 @@ OPENMPI_CONFIGURE_ENV+=		MPICC="${MPICC}" \
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/math/lemon/Makefile b/math/lemon/Makefile
index a695e8fc07c1..79b26d1b75ea 100644
--- a/math/lemon/Makefile
+++ b/math/lemon/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	libCbc.so:math/cbc \
 		libOsi.so:math/osi
 
 USES=		cmake
+USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
@@ -32,12 +33,6 @@ GLPK_DESC=		Build with GLPK solver
 GLPK_CMAKE_BOOL=	LEMON_ENABLE_GLPK
 GLPK_LIB_DEPENDS=	libglpk.so:math/glpk
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CXXFLAGS+=  -Dregister=
-.endif
-
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-0.x-to-1.x.sh
 
diff --git a/multimedia/bcmatroska2/Makefile b/multimedia/bcmatroska2/Makefile
index 1d81944b033a..5b380b5434b2 100644
--- a/multimedia/bcmatroska2/Makefile
+++ b/multimedia/bcmatroska2/Makefile
@@ -20,10 +20,10 @@ USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DCMAKE_PREFIX_PATH=${LOCALBASE} \
 		-DENABLE_STATIC=NO
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index f90dba836a4f..ad5165c9a301 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -17,6 +17,7 @@ CONFLICTS=	mplex
 
 USES=		compiler:c++11-lang gmake gnome jpeg libtool localbase pathfix \
 		pkgconfig
+USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
@@ -39,20 +40,10 @@ SDL_USES=		sdl
 SDL_USE=		SDL=gfx,sdl
 SDL_CONFIGURE_OFF=	--without-libsdl --without-sdlgfx
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's| \*-\*-linux\*)| *-*-*)|' \
 		-e '/ARCHFLAGS=/d' ${WRKSRC}/configure
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-	@${REINPLACE_CMD} -e 's|auto_ptr|unique_ptr|' \
-		${WRKSRC}/mplex/main.cpp
-.endif
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index bf39783fee05..d055f723c397 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -32,10 +32,10 @@ PULSEAUDIO_USES=	gnome
 PULSEAUDIO_USE=		GNOME=glib20
 PULSEAUDIO_CMAKE_BOOL=	WITH_PulseAudio
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
 CXXFLAGS+=	-Wno-error=enum-constexpr-conversion
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/py-librtmp/Makefile b/multimedia/py-librtmp/Makefile
index 3306e1c84f32..8ff80c6e2cb8 100644
--- a/multimedia/py-librtmp/Makefile
+++ b/multimedia/py-librtmp/Makefile
@@ -21,7 +21,7 @@ USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/multimedia/smpeg2/Makefile b/multimedia/smpeg2/Makefile
index bc3e63ca92c3..bcfb5ee952ad 100644
--- a/multimedia/smpeg2/Makefile
+++ b/multimedia/smpeg2/Makefile
@@ -12,10 +12,11 @@ WWW=		https://icculus.org/smpeg/
 LICENSE=	MIT LGPL20+
 LICENSE_COMB=	multi
 
+USES=		compiler:features libtool sdl
+
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 CFLAGS+=	${COMPILER_FEATURES:Mc++11:C/.+/-Wno-error=narrowing/}
-USES=		compiler:features libtool sdl
 USE_SDL=	sdl2
 USE_LDCONFIG=	yes
 
@@ -31,7 +32,7 @@ PLAYMPEG_VARS=	LICENSE+=GPLv2+
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CPPFLAGS+=  -Dregister=
 .endif
 
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 731fa39e5561..425694d8274d 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -129,10 +129,10 @@ pre-build:
 	@(${RM} ${WRKSRC}/x264_config.h)
 .endif
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 8397d0312aae..b502a1ec1d0e 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -88,7 +88,7 @@ CONFIGURE_ARGS+=--disable-doxygen
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/net-im/libquotient/Makefile b/net-im/libquotient/Makefile
index b749b8c89d15..b383fc692926 100644
--- a/net-im/libquotient/Makefile
+++ b/net-im/libquotient/Makefile
@@ -28,7 +28,7 @@ CMAKE_ON=	Quotient_ENABLE_E2EE
 .include <bsd.port.options.mk>
 
 # Work around compiler bug, see pr: 272285
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 USES+=		llvm
 CC=		clang${LLVM_VERSION}
 CXX=		clang++${LLVM_VERSION}
diff --git a/net-im/neochat/Makefile b/net-im/neochat/Makefile
index 024a578fce1c..c0313b51917e 100644
--- a/net-im/neochat/Makefile
+++ b/net-im/neochat/Makefile
@@ -40,7 +40,7 @@ USE_XORG=	x11
 .if ${ARCH:Mpowerpc*}
 CXX=		clang++${LLVM_VERSION}
 USES+=		llvm:min=16
-.elif ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.elif ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 # Work around compiler bug, see pr: 272285
 USES+=		llvm
 CC=		clang${LLVM_VERSION}
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index 3491490aa89b..375335c8f905 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -44,7 +44,7 @@ PLIST_SUB=	PVERSION=${PORTVERSION}
 CONFIGURE_ENV+=	OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include"
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index a18857a34e59..da76aa8ce903 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -25,7 +25,7 @@ INSTALL_TARGET=	install-strip
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/net-mgmt/sysmon/Makefile b/net-mgmt/sysmon/Makefile
index cba5b6485a22..9600f0225a4f 100644
--- a/net-mgmt/sysmon/Makefile
+++ b/net-mgmt/sysmon/Makefile
@@ -24,7 +24,7 @@ MANPAGE=	sysmon.man.8 sysmon.conf.man.8
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/net-mgmt/wmi-client/Makefile b/net-mgmt/wmi-client/Makefile
index 13781005989a..83f6ed379b24 100644
--- a/net-mgmt/wmi-client/Makefile
+++ b/net-mgmt/wmi-client/Makefile
@@ -21,7 +21,7 @@ PROGS=	bin/wmic bin/winexe
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/net-p2p/shx/Makefile b/net-p2p/shx/Makefile
index 4fa18f0c331d..ce19d21eda34 100644
--- a/net-p2p/shx/Makefile
+++ b/net-p2p/shx/Makefile
@@ -57,11 +57,10 @@ XMMS_CONFIGURE_ENABLE=		xmms
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 do-install:
 	${CP} -fv ${WRKSRC}/run/hx ${STAGEDIR}${PREFIX}/bin/
diff --git a/net-p2p/tooth/Makefile b/net-p2p/tooth/Makefile
index 237665c24e3f..b3e68fd1869d 100644
--- a/net-p2p/tooth/Makefile
+++ b/net-p2p/tooth/Makefile
@@ -28,7 +28,7 @@ USE_GNOME=	gdkpixbuf2 glib20 gtk40 libxml2 pango
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/net/afpfs-ng/Makefile b/net/afpfs-ng/Makefile
index 8e62727d885a..063eea29fd47 100644
--- a/net/afpfs-ng/Makefile
+++ b/net/afpfs-ng/Makefile
@@ -32,7 +32,7 @@ GCRYPT_CONFIGURE_ENABLE=gcrypt
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/net/ipsvd/Makefile b/net/ipsvd/Makefile
index e63fdaa6cfa9..6c36072bf240 100644
--- a/net/ipsvd/Makefile
+++ b/net/ipsvd/Makefile
@@ -30,7 +30,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/net/mptsd/Makefile b/net/mptsd/Makefile
index 178cbe950052..5036e4f022f0 100644
--- a/net/mptsd/Makefile
+++ b/net/mptsd/Makefile
@@ -20,7 +20,7 @@ GH_TUPLE=       gfto:libfuncs:0dc8d87080badd7a276316ad7ae6e6f1aed2331b:libfuncs/
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/net/py-libdnet/Makefile b/net/py-libdnet/Makefile
index a4423d208eb4..58b553c1e3de 100644
--- a/net/py-libdnet/Makefile
+++ b/net/py-libdnet/Makefile
@@ -30,7 +30,7 @@ regression-test: install
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/net/py-pcapy/Makefile b/net/py-pcapy/Makefile
index 8d3dbc03c23b..e71be54ca7cf 100644
--- a/net/py-pcapy/Makefile
+++ b/net/py-pcapy/Makefile
@@ -14,17 +14,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		python dos2unix
 USE_PYTHON=	autoplist distutils
 
+CFLAGS+=	--std=c++14
+
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 PORTDOCS=	README pcapy.html
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pcapy*.so
 
diff --git a/net/skstream/Makefile b/net/skstream/Makefile
index c1444b4163f8..e957c4a4c1e2 100644
--- a/net/skstream/Makefile
+++ b/net/skstream/Makefile
@@ -12,6 +12,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		libtool pathfix pkgconfig compiler:c++11-lib gmake
+USE_CXXSTD=	c++14
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
@@ -20,12 +21,6 @@ CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CXXFLAGS+=  -Dregister=
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's| install-docdataDATA | |g'  ${WRKSRC}/Makefile.in
 
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index 40b1c93ce961..69e2bf46b32d 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -22,11 +22,10 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/sniffit ${STAGEDIR}${PREFIX}/sbin
diff --git a/net/spread/Makefile b/net/spread/Makefile
index 537d4e279fc3..1d02040d51fa 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -50,7 +50,7 @@ PERL_CONFIGURE_ARGS=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/net/ss5/Makefile b/net/ss5/Makefile
index e3ae3dcf4587..55b0048fe8d8 100644
--- a/net/ss5/Makefile
+++ b/net/ss5/Makefile
@@ -31,7 +31,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/net/yptransitd/Makefile b/net/yptransitd/Makefile
index c4844f88e880..b7a762c87f90 100644
--- a/net/yptransitd/Makefile
+++ b/net/yptransitd/Makefile
@@ -24,7 +24,7 @@ PLIST_FILES=	%%ETCDIR%%/ldap.conf %%ETCDIR%%/modules/ldap.so \
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index 31fdd056aeac..4e7dae6b67f2 100644
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -133,9 +133,10 @@ PSPOPPLER_RUN_DEPENDS=		pdftops:graphics/poppler-utils
 PSPOPPLER_CONFIGURE_ON=		--with-pdftops=pdftops
 PSPOPPLER_DESC=			Poppler pdftops(1)
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+#.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
 CFLAGS+=	-Wno-error=dynamic-exception-spec
 .endif
 
@@ -151,4 +152,4 @@ post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/etc/cups/cups-browsed.conf \
 		${STAGEDIR}${PREFIX}/etc/cups/cups-browsed.conf.sample
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/openprinting/Makefile b/print/openprinting/Makefile
index 7efa1c41bcb0..9f182cb50b19 100644
--- a/print/openprinting/Makefile
+++ b/print/openprinting/Makefile
@@ -35,7 +35,7 @@ LLD_UNSAFE=	yes
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/print/ttf2pt1/Makefile b/print/ttf2pt1/Makefile
index 588b287bd063..952698b5b598 100644
--- a/print/ttf2pt1/Makefile
+++ b/print/ttf2pt1/Makefile
@@ -33,7 +33,7 @@ LIBS+=		`pkg-config --libs freetype2` -lm
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/russian/xruskb/Makefile b/russian/xruskb/Makefile
index cb8f1b4ac1c6..dbf0c49ecec8 100644
--- a/russian/xruskb/Makefile
+++ b/russian/xruskb/Makefile
@@ -29,7 +29,7 @@ MOTIF_CONFIGURE_OFF=	--with-toolkit=none
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/science/cgnslib/Makefile b/science/cgnslib/Makefile
index c166ff2541f4..baa2b0dbcb40 100644
--- a/science/cgnslib/Makefile
+++ b/science/cgnslib/Makefile
@@ -54,7 +54,7 @@ TOOLS_CMAKE_ON=		-DTCL_INCLUDE_PATH:STRING="${TCL_INCLUDEDIR}" \
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/science/gtamsanalyzer/Makefile b/science/gtamsanalyzer/Makefile
index 113be78aa9a3..910599381d70 100644
--- a/science/gtamsanalyzer/Makefile
+++ b/science/gtamsanalyzer/Makefile
@@ -20,11 +20,10 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/Source
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 post-patch:
 	${RM} "${WRKSRC}/obj"
diff --git a/science/paje/Makefile b/science/paje/Makefile
index 5ebcc0992671..884d2f3e7aae 100644
--- a/science/paje/Makefile
+++ b/science/paje/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CPPFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/security/mate-pam-helper/Makefile b/security/mate-pam-helper/Makefile
index 46ef0b1c5dad..56f38feec174 100644
--- a/security/mate-pam-helper/Makefile
+++ b/security/mate-pam-helper/Makefile
@@ -17,7 +17,7 @@ PLIST_FILES=	bin/mate_pam_helper
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=unused-but-set-variable
 .endif
 
diff --git a/security/pam_ocra/Makefile b/security/pam_ocra/Makefile
index ebca30991ee4..64b1ecdc8d80 100644
--- a/security/pam_ocra/Makefile
+++ b/security/pam_ocra/Makefile
@@ -24,7 +24,7 @@ PLIST_FILES=	lib/pam_ocra.so \
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=cast-align
 .endif
 
diff --git a/security/pks/Makefile b/security/pks/Makefile
index ac5482fd76e0..8438a93303f5 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -33,7 +33,7 @@ PORTDOCS=	pks_help.* README EMAIL
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/security/rubygem-gpgme/Makefile b/security/rubygem-gpgme/Makefile
index 272ea86e2637..167b1344aee3 100644
--- a/security/rubygem-gpgme/Makefile
+++ b/security/rubygem-gpgme/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--use-system-libraries
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CONFIGURE_ARGS+=	--with-cflags="-Wno-error=incompatible-function-pointer-types"
 .endif
 
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 2efede5d53f9..be9bb7677f3d 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -56,7 +56,7 @@ LDAP_MESON_TRUE=	ldap-support
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/security/softether/Makefile b/security/softether/Makefile
index 1fc3ce0ab78b..36c01f3f3f6f 100644
--- a/security/softether/Makefile
+++ b/security/softether/Makefile
@@ -42,7 +42,7 @@ ALL_TARGET=	build
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/sysutils/gstopd/Makefile b/sysutils/gstopd/Makefile
index 607c8488975f..5dc098c07de1 100644
--- a/sysutils/gstopd/Makefile
+++ b/sysutils/gstopd/Makefile
@@ -10,7 +10,7 @@ PLIST_FILES=	sbin/gstopd man/man8/gstopd.8.gz
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=unused-but-set-variable
 .endif
 
diff --git a/sysutils/mate-settings-daemon/Makefile b/sysutils/mate-settings-daemon/Makefile
index a4bc08fcacc4..cd0be532734a 100644
--- a/sysutils/mate-settings-daemon/Makefile
+++ b/sysutils/mate-settings-daemon/Makefile
@@ -74,7 +74,7 @@ PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/sysutils/mtpfs/Makefile b/sysutils/mtpfs/Makefile
index b105fa5ad239..34c8db5c99e1 100644
--- a/sysutils/mtpfs/Makefile
+++ b/sysutils/mtpfs/Makefile
@@ -27,7 +27,7 @@ PLIST_FILES=	bin/mtpfs
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile
index 42f5711aa03a..016b48a8a020 100644
--- a/sysutils/zeitgeist/Makefile
+++ b/sysutils/zeitgeist/Makefile
@@ -47,7 +47,7 @@ DATAHUB_CONFIGURE_ENABLE=	datahub
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/textproc/apertium/Makefile b/textproc/apertium/Makefile
index 0a7034a9fbae..118f7304d9e3 100644
--- a/textproc/apertium/Makefile
+++ b/textproc/apertium/Makefile
@@ -47,7 +47,7 @@ CFLAGS+=	-I${LOCALBASE}/include/utf8cpp
 .include <bsd.port.options.mk>
 
 post-patch:
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 	@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
 		${WRKSRC}/apertium/perceptron_spec.h
 .endif
diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index 0f9c4a00c698..90802dbb0c82 100644
--- a/textproc/gdome2/Makefile
+++ b/textproc/gdome2/Makefile
@@ -32,7 +32,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/textproc/lttoolbox/Makefile b/textproc/lttoolbox/Makefile
index f4cc9306869d..be8e5c2bb804 100644
--- a/textproc/lttoolbox/Makefile
+++ b/textproc/lttoolbox/Makefile
@@ -25,10 +25,10 @@ INSTALL_TARGET=	install-strip
 CFLAGS+=	-I${LOCALBASE}/include/utf8cpp
 LDFLAGS+=	-lpthread
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-llvm16
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/mgdiff/Makefile b/textproc/mgdiff/Makefile
index 062925748c92..933234dcefae 100644
--- a/textproc/mgdiff/Makefile
+++ b/textproc/mgdiff/Makefile
@@ -23,7 +23,7 @@ DESKTOP_ENTRIES=	"mgdiff" "GUI front end to the UNIX diff command" \
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/textproc/p5-Senna/Makefile b/textproc/p5-Senna/Makefile
index d035c8578f95..f8d68483e5e5 100644
--- a/textproc/p5-Senna/Makefile
+++ b/textproc/p5-Senna/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=</dev/null
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile
index e39d7c96a0f2..d5ed34c6616a 100644
--- a/textproc/rman/Makefile
+++ b/textproc/rman/Makefile
@@ -13,7 +13,7 @@ PLIST_FILES=	bin/rman man/man1/rman.1.gz
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/textproc/rubygem-ruby-augeas/Makefile b/textproc/rubygem-ruby-augeas/Makefile
index 2643c91f3dd8..d94db10c445a 100644
--- a/textproc/rubygem-ruby-augeas/Makefile
+++ b/textproc/rubygem-ruby-augeas/Makefile
@@ -19,7 +19,7 @@ CONFIGURE_ARGS=	--with-opt-include="${LOCALBASE}/include/libxml2"
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CONFIGURE_ARGS+=	--with-cflags="-Wno-error=incompatible-function-pointer-types"
 .endif
 
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index 94f45315f854..7cafd3a4aac4 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -18,7 +18,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index a199e5b67889..b6b9d3181ee7 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -31,7 +31,7 @@ MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index db8aaf7acc1f..752878a03462 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -25,7 +25,7 @@ CPE_VENDOR=	w3c
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/www/node16/Makefile b/www/node16/Makefile
index 89c18633005e..bab79ade808a 100644
--- a/www/node16/Makefile
+++ b/www/node16/Makefile
@@ -94,7 +94,7 @@ NLS_CONFIGURE_ON=	--with-intl=system-icu
 
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-common.gypi
@@ -108,7 +108,7 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tools_v8__gypfiles_v8.gyp
 CONFIGURE_ARGS+=	--openssl-no-asm
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
 CXXFLAGS+=	-Wno-error=enum-constexpr-conversion
 .endif
 
@@ -134,4 +134,4 @@ post-install-DTRACE-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/dtrace
 	${INSTALL_DATA} ${WRKSRC}/out/Release/node.d ${STAGEDIR}${PREFIX}/lib/dtrace
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/p5-CGI-SpeedyCGI/Makefile b/www/p5-CGI-SpeedyCGI/Makefile
index 30c9f3d0d221..5ccc74e4be9a 100644
--- a/www/p5-CGI-SpeedyCGI/Makefile
+++ b/www/p5-CGI-SpeedyCGI/Makefile
@@ -25,7 +25,7 @@ APACHE_CONFIGURE_ENV_OFF=	WITHOUT_APACHE=yes
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/www/webkit2-gtk4/Makefile b/www/webkit2-gtk4/Makefile
index b0d7445a16b7..611f191b829c 100644
--- a/www/webkit2-gtk4/Makefile
+++ b/www/webkit2-gtk4/Makefile
@@ -99,9 +99,9 @@ WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland \
 			libwpe-1.0.so:www/libwpe \
 			libWPEBackend-fdo-1.0.so:www/wpebackend-fdo
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
 CXXFLAGS+=	-Wno-error=enum-constexpr-conversion
 .endif
 
@@ -124,4 +124,4 @@ post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-5.0/*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/WebKitWebDriver-5
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index fe577e67a954..7e543b225bb4 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -18,7 +18,7 @@ USE_GL=		gl
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 1ad5dd1f0cf8..782bca3d9a81 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -46,7 +46,7 @@ post-install:
 CFLAGS+=	-DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/x11-toolkits/granite/Makefile b/x11-toolkits/granite/Makefile
index 0928ebed7846..3a2270b0b790 100644
--- a/x11-toolkits/granite/Makefile
+++ b/x11-toolkits/granite/Makefile
@@ -26,7 +26,7 @@ PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index e6da6e43c716..955a370b1972 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -13,6 +13,7 @@ LICENSE_FILE=	${WRKSRC}/readme.txt
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		alias cpe dos2unix gl gmake jpeg zip xorg
+USE_CXXSTD=	gnu++11
 DOS2UNIX_GLOB=	Makefile *.cpp *.h *.txt
 USE_GL=		gl
 USE_XORG=	x11 xxf86vm
@@ -33,12 +34,6 @@ OPTIONS_DEFINE=	DEBUG EXAMPLES
 
 DEBUG_MAKE_ENV_OFF=	NDEBUG=1
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 post-extract:
 .for bundled in bzip2 jpeglib libpng zlib
 	@${RM} -r ${WRKSRC}/source/Irrlicht/${bundled}
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index 14dd675a42fa..c3fa794e3016 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -31,7 +31,7 @@ ITK_LIB_FILE=	${ITK_LIB}.${SHLIB_MAJOR}
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/x11-toolkits/ntk/Makefile b/x11-toolkits/ntk/Makefile
index e18439e5eba0..4e71247c4ef5 100644
--- a/x11-toolkits/ntk/Makefile
+++ b/x11-toolkits/ntk/Makefile
@@ -16,6 +16,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libpng.so:graphics/png
 
 USES=		gnome jpeg localbase:ldflags pkgconfig waf xorg
+USE_CXXSTD=	c++14
 USE_GNOME=	cairo
 USE_XORG=	x11 xft
 USE_LDCONFIG=	yes
@@ -24,12 +25,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PLIST_SUB=	SHLIB_VER=${PORTVERSION:R}
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e " \
 		s|conf\.env\['LIB_DL'\] = \['dl'\]|conf.env['LIB_DL'] = []|; \
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index d19072835cde..e238686d8465 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -12,6 +12,7 @@ LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe gl gmake localbase:ldflags xorg
+USE_CXXSTD=	c++14
 CPE_VENDOR=	${PORTNAME}_project
 USE_GL=		glu
 USE_XORG=	xt xi xmu xext x11
@@ -23,12 +24,6 @@ LDFLAGS+=	-lpthread
 
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-js-jsBSD.cxx
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread||g ; \
 		 s|-ldl||g ; \
diff --git a/x11-toolkits/rubygem-gtk2/Makefile b/x11-toolkits/rubygem-gtk2/Makefile
index 25845c278341..f9f16722cc59 100644
--- a/x11-toolkits/rubygem-gtk2/Makefile
+++ b/x11-toolkits/rubygem-gtk2/Makefile
@@ -20,7 +20,7 @@ USE_GNOME=	gtk20
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CONFIGURE_ARGS+=	--with-cflags="-Wno-error=incompatible-function-pointer-types"
 .endif
 
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 236788c1d526..2f1f5f125232 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -17,6 +17,12 @@ WRKSRC=		${WRKDIR}/Tix${DISTVERSION}
 TIX_LIB=	libTix${PORTVERSION}.so
 TIX_LIB_FILE=	${TIX_LIB}.0
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+.endif
+
 pre-configure:
 	@(cd ${WRKSRC} && \
 	    CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS}" \
@@ -46,10 +52,4 @@ post-install:
 	${LN} -sf ${PREFIX}/include/tix/generic/tix.h ${STAGEDIR}${PREFIX}/include/tix.h
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/Tix${PORTVERSION}/html
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CFLAGS+=	-Wno-error=incompatible-function-pointer-types
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/tktable/Makefile b/x11-toolkits/tktable/Makefile
index 36610f8dec8f..40b78fcbe74b 100644
--- a/x11-toolkits/tktable/Makefile
+++ b/x11-toolkits/tktable/Makefile
@@ -22,7 +22,7 @@ TEST_TARGET=	test
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 409035c88147..ea777b2305bd 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -24,7 +24,7 @@ LIBTOOL=	libtool
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 2e2360f1a7cb..16da3445787a 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -70,7 +70,7 @@ SVG_USE=	GNOME=librsvg2
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/x11/budgie-desktop/Makefile b/x11/budgie-desktop/Makefile
index 411ea080d915..c42ba0e700ee 100644
--- a/x11/budgie-desktop/Makefile
+++ b/x11/budgie-desktop/Makefile
@@ -72,7 +72,7 @@ GLIB_SCHEMAS=	20_buddiesofbudgie.budgie-desktop.notifications.gschema.override \
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile
index 2bfb3e801af0..7892b44fae30 100644
--- a/x11/xdtm/Makefile
+++ b/x11/xdtm/Makefile
@@ -21,10 +21,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
+.endif
 
 .include <bsd.port.mk>
author	Muhammad Moinur Rahman <bofh@FreeBSD.org>	2023-07-26 02:44:22 +0200
committer	Muhammad Moinur Rahman <bofh@FreeBSD.org>	2023-07-26 02:48:20 +0200
commit	95274bf4f99c71fc056013d966aec239161dfd74 (patch)
tree	bc1e95977678cb5b6b00b33e333b28161885e706
parent	dbe06d2da8c38d9d058f7939a7c6af36a2c0f1c7 (diff)
download	freebsd-ports-95274bf4f99c71fc056013d966aec239161dfd74.zip