git: 9b178ffd7e2f - main - */*: llvm15 build fixes

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Wed, 17 May 2023 16:30:24 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9b178ffd7e2fd77fecb8c80d22f7c80bc9e93977

commit 9b178ffd7e2fd77fecb8c80d22f7c80bc9e93977
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-05-17 16:27:49 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-05-17 16:30:15 +0000

    */*: llvm15 build fixes
    
    llvm15 was also merged into 13.2-STABLE effective from OSVERSION
    1302505. Fix the ports that failed to build with llvm15.
    
    Approved by:    portmgr (blanket)
---
 archivers/py-lzma/Makefile                     | 2 +-
 archivers/squsq/Makefile                       | 2 +-
 archivers/upx/Makefile                         | 2 +-
 audio/cava/Makefile                            | 2 +-
 audio/eteroj-lv2/Makefile                      | 2 +-
 audio/gnuitar/Makefile                         | 2 +-
 audio/play/Makefile                            | 2 +-
 benchmarks/siege/Makefile                      | 2 +-
 biology/biosig/Makefile                        | 2 +-
 biology/wise/Makefile                          | 2 +-
 cad/calculix/Makefile                          | 2 +-
 cad/magic/Makefile                             | 2 +-
 comms/bladerf/Makefile                         | 2 +-
 comms/xlog/Makefile                            | 2 +-
 databases/mongodb70/Makefile                   | 2 +-
 databases/p5-Memcached-libmemcached/Makefile   | 2 +-
 databases/pgpool-II-40/Makefile                | 2 +-
 databases/pgpool-II-41/Makefile                | 2 +-
 databases/pgpool-II-42/Makefile                | 2 +-
 databases/pgpool-II-43/Makefile                | 2 +-
 devel/dmucs/Makefile                           | 2 +-
 devel/frink/Makefile                           | 2 +-
 devel/leatherman/Makefile                      | 2 +-
 devel/libs11n/Makefile                         | 2 +-
 devel/libtecla/Makefile                        | 2 +-
 devel/pickle/Makefile                          | 2 +-
 devel/py-rchitect/Makefile                     | 2 +-
 devel/tcltls/Makefile                          | 2 +-
 devel/tla/Makefile                             | 2 +-
 editors/hexcurse/Makefile                      | 2 +-
 emulators/gngb/Makefile                        | 2 +-
 emulators/hugo/Makefile                        | 2 +-
 emulators/virtualbox-ose-kmod-legacy/Makefile  | 2 +-
 games/libretro-bluemsx/Makefile                | 2 +-
 games/libretro-mame2000/Makefile               | 2 +-
 games/libretro-mame2003_plus/Makefile          | 2 +-
 games/spellcast/Makefile                       | 2 +-
 games/tuxmath/Makefile                         | 2 +-
 graphics/bsd-plotutils/Makefile                | 2 +-
 graphics/liblug/Makefile                       | 2 +-
 graphics/pixen/Makefile                        | 2 +-
 graphics/urt/Makefile                          | 2 +-
 irc/scrollz/Makefile                           | 2 +-
 japanese/Wnn6-lib/Makefile                     | 2 +-
 japanese/ebview-gtk2/Makefile                  | 2 +-
 japanese/kinput2/Makefile                      | 2 +-
 japanese/sj3-server/Makefile                   | 2 +-
 lang/eisl/Makefile                             | 2 +-
 lang/sagittarius-scheme/Makefile               | 2 +-
 lang/solidity/Makefile                         | 2 +-
 mail/deforaos-mailer/Makefile                  | 2 +-
 mail/enma/Makefile                             | 2 +-
 mail/gnumail/Makefile                          | 2 +-
 mail/hbiff/Makefile                            | 2 +-
 mail/mailx/Makefile                            | 2 +-
 mail/meta1/Makefile                            | 2 +-
 mail/pantomime/Makefile                        | 2 +-
 mail/pfqueue/Makefile                          | 2 +-
 mail/rmilter/Makefile                          | 2 +-
 math/libpoly/Makefile                          | 2 +-
 math/scilab/Makefile                           | 2 +-
 math/spooles/Makefile                          | 2 +-
 misc/dynomite/Makefile                         | 2 +-
 net-im/pidgin-fetion/Makefile                  | 2 +-
 net-mgmt/ipv6calc/Makefile                     | 2 +-
 net-mgmt/nrpe3/Makefile                        | 2 +-
 net-mgmt/send/Makefile                         | 2 +-
 net-mgmt/tcptrack/Makefile                     | 2 +-
 net-p2p/shx/Makefile                           | 2 +-
 net/asterisk16/Makefile                        | 2 +-
 net/asterisk18/Makefile                        | 2 +-
 net/gq/Makefile                                | 2 +-
 net/guacamole-server/Makefile                  | 2 +-
 net/honeyd/Makefile                            | 2 +-
 net/libexosip2/Makefile                        | 2 +-
 net/libproxy/Makefile                          | 2 +-
 net/libtnl/Makefile                            | 2 +-
 net/p5-Net-TCLink/Makefile                     | 2 +-
 net/pichi/Makefile                             | 2 +-
 net/radsecproxy/Makefile                       | 2 +-
 net/tn5250/Makefile                            | 2 +-
 print/magicfilter/Makefile                     | 2 +-
 science/gtamsanalyzer/Makefile                 | 2 +-
 security/identify/Makefile                     | 2 +-
 security/lasso/Makefile                        | 2 +-
 security/libprelude/Makefile                   | 2 +-
 security/monkeysphere/Makefile                 | 2 +-
 security/opencryptoki/Makefile                 | 2 +-
 security/p5-Crypt-OpenSSL-PKCS10/Makefile      | 2 +-
 security/py-python-axolotl-curve25519/Makefile | 2 +-
 security/starttls/Makefile                     | 2 +-
 sysutils/fluent-bit/Makefile                   | 2 +-
 textproc/augeas/Makefile                       | 2 +-
 textproc/jshon/Makefile                        | 2 +-
 textproc/p5-XML-Bare/Makefile                  | 2 +-
 www/libdatachannel/Makefile                    | 2 +-
 www/mod_auth_mysql2/Makefile                   | 2 +-
 www/p5-HTTP-MHTTP/Makefile                     | 2 +-
 www/sogo/Makefile                              | 2 +-
 www/trafficserver/Makefile                     | 2 +-
 www/varnish6/Makefile                          | 2 +-
 www/wget2/Makefile                             | 2 +-
 x11-toolkits/rep-gtk2/Makefile                 | 2 +-
 x11-toolkits/swt/Makefile                      | 2 +-
 x11-toolkits/xbae/Makefile                     | 2 +-
 x11/kitty/Makefile                             | 2 +-
 x11/libsx/Makefile                             | 2 +-
 x11/xdtm/Makefile                              | 2 +-
 108 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/archivers/py-lzma/Makefile b/archivers/py-lzma/Makefile
index 2ee88f54e6cb..2f79ab170478 100644
--- a/archivers/py-lzma/Makefile
+++ b/archivers/py-lzma/Makefile
@@ -33,7 +33,7 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=int-conversion
 .endif
 
diff --git a/archivers/squsq/Makefile b/archivers/squsq/Makefile
index e4ff661a20e0..6f13ec854f2b 100644
--- a/archivers/squsq/Makefile
+++ b/archivers/squsq/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index 3a101bfd2bed..edb0441335ad 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -26,7 +26,7 @@ CPE_VENDOR=	upx_project
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=unused-but-set-variable
 .endif
 
diff --git a/audio/cava/Makefile b/audio/cava/Makefile
index 2bf1f762bc57..1798a98ba018 100644
--- a/audio/cava/Makefile
+++ b/audio/cava/Makefile
@@ -52,7 +52,7 @@ VT_PLIST_FILES=		${DATADIR}/cava.fnt
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=deprecated-non-prototype
 .endif
 
diff --git a/audio/eteroj-lv2/Makefile b/audio/eteroj-lv2/Makefile
index 7247640a1f7c..70b38e5e08cf 100644
--- a/audio/eteroj-lv2/Makefile
+++ b/audio/eteroj-lv2/Makefile
@@ -28,7 +28,7 @@ PLIST_FILES=	lib/lv2/eteroj.lv2/eteroj.so \
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/audio/gnuitar/Makefile b/audio/gnuitar/Makefile
index 0b115486cb2b..65caf24ccfc9 100644
--- a/audio/gnuitar/Makefile
+++ b/audio/gnuitar/Makefile
@@ -42,7 +42,7 @@ SUID_DESC=	Use suid to allow highest priority (priv. dropped)
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/audio/play/Makefile b/audio/play/Makefile
index 978f9cf410d4..f58c839cbe9c 100644
--- a/audio/play/Makefile
+++ b/audio/play/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES=	bin/play man/ja/man1/play.1.gz
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/benchmarks/siege/Makefile b/benchmarks/siege/Makefile
index 066b4f2d8a3a..28e2f3ff3488 100644
--- a/benchmarks/siege/Makefile
+++ b/benchmarks/siege/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ENV=	PERL="${PERL}"
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/biology/biosig/Makefile b/biology/biosig/Makefile
index d735cfd16f67..4dfc496ca72a 100644
--- a/biology/biosig/Makefile
+++ b/biology/biosig/Makefile
@@ -30,7 +30,7 @@ LDFLAGS+=	-liconv
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/biology/wise/Makefile b/biology/wise/Makefile
index 863f30de76c8..8331a0ee0c81 100644
--- a/biology/wise/Makefile
+++ b/biology/wise/Makefile
@@ -47,7 +47,7 @@ DATAFILES=	BLOSUM30.bla BLOSUM45.bla BLOSUM62.bla BLOSUM80.bla aa.rnd \
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 82d43c702ba0..09924bb06395 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -42,7 +42,7 @@ PSVIEWER?=	gv
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CPPFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 770e775d22de..455aa64403bb 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -37,7 +37,7 @@ BINARY_ALIAS=	python3=${PYTHON_CMD} # this is needed, see https://github.com/RTi
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/comms/bladerf/Makefile b/comms/bladerf/Makefile
index 26064dd71104..028d3482824f 100644
--- a/comms/bladerf/Makefile
+++ b/comms/bladerf/Makefile
@@ -27,7 +27,7 @@ PLIST_FILES=	bin/bladeRF-cli \
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=unused-but-set-variable
 .endif
 
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 3c8190742154..8f0c846465be 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -35,7 +35,7 @@ NLS_CONFIGURE_OFF=	--disable-nls
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=deprecated-non-prototype
 .endif
 
diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile
index 1c696fb5cad2..b7b331d9b426 100644
--- a/databases/mongodb70/Makefile
+++ b/databases/mongodb70/Makefile
@@ -90,7 +90,7 @@ SSL_MAKE_ARGS=	--ssl
 .include <bsd.port.pre.mk>
 
 # MongoDB 7.0 fails on clang15.
-.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 _LLVM_VERSION=  14
 BUILD_DEPENDS+= clang${_LLVM_VERSION}:devel/llvm${_LLVM_VERSION}
 CC=             ${LOCALBASE}/bin/clang${_LLVM_VERSION}
diff --git a/databases/p5-Memcached-libmemcached/Makefile b/databases/p5-Memcached-libmemcached/Makefile
index 64a7625881c4..80ca682db0de 100644
--- a/databases/p5-Memcached-libmemcached/Makefile
+++ b/databases/p5-Memcached-libmemcached/Makefile
@@ -20,7 +20,7 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=int-conversion
 .endif
 
diff --git a/databases/pgpool-II-40/Makefile b/databases/pgpool-II-40/Makefile
index 24c2247598cd..19bd238af931 100644
--- a/databases/pgpool-II-40/Makefile
+++ b/databases/pgpool-II-40/Makefile
@@ -38,7 +38,7 @@ SSL_CONFIGURE_WITH=	openssl
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/databases/pgpool-II-41/Makefile b/databases/pgpool-II-41/Makefile
index 5fb5f66e6465..27e8e500f500 100644
--- a/databases/pgpool-II-41/Makefile
+++ b/databases/pgpool-II-41/Makefile
@@ -38,7 +38,7 @@ SSL_CONFIGURE_WITH=	openssl
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/databases/pgpool-II-42/Makefile b/databases/pgpool-II-42/Makefile
index 30d7431d5512..9e169c195fa8 100644
--- a/databases/pgpool-II-42/Makefile
+++ b/databases/pgpool-II-42/Makefile
@@ -38,7 +38,7 @@ SSL_CONFIGURE_WITH=	openssl
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/databases/pgpool-II-43/Makefile b/databases/pgpool-II-43/Makefile
index 6b3f6d5eca37..768fd56e480c 100644
--- a/databases/pgpool-II-43/Makefile
+++ b/databases/pgpool-II-43/Makefile
@@ -38,7 +38,7 @@ SSL_CONFIGURE_WITH=	openssl
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/devel/dmucs/Makefile b/devel/dmucs/Makefile
index e8f69f0a84a4..398c04665467 100644
--- a/devel/dmucs/Makefile
+++ b/devel/dmucs/Makefile
@@ -25,7 +25,7 @@ PLIST_FILES=	bin/dmucs bin/gethost bin/loadavg bin/monitor bin/remhost
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CPPFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/devel/frink/Makefile b/devel/frink/Makefile
index 95ee0c671da7..6463c08f4515 100644
--- a/devel/frink/Makefile
+++ b/devel/frink/Makefile
@@ -23,7 +23,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=strict-prototypes
 .endif
 
diff --git a/devel/leatherman/Makefile b/devel/leatherman/Makefile
index ff5b8d2222e4..6ddd060dd609 100644
--- a/devel/leatherman/Makefile
+++ b/devel/leatherman/Makefile
@@ -29,7 +29,7 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION}
 post-configure:
 	# This file is vendored in vendor/Catch-1.10.0.zip and extracted at configure step
 	${SED} -i '' -e '1s|\(.*\)|#include <sys/signal.h>\n\1|' ${CONFIGURE_WRKSRC}/src/Catch-1.10.0/single_include/catch.hpp
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 	${REINPLACE_CMD} -e 's|ptrdiff_t|size_t|' ${CONFIGURE_WRKSRC}/src/Catch-1.10.0/single_include/catch.hpp
 .endif
 
diff --git a/devel/libs11n/Makefile b/devel/libs11n/Makefile
index 559c8c488665..6001298e0ce8 100644
--- a/devel/libs11n/Makefile
+++ b/devel/libs11n/Makefile
@@ -20,7 +20,7 @@ WRKSRC_SUBDIR=	src
 
 .include <bsd.port.pre.mk>
 
-.if defined(NO_PROFILE) || ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 )
+.if defined(NO_PROFILE) || ( ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )))
 PLIST_SUB+=	PROFILE="@comment "
 .else
 PLIST_SUB+=	PROFILE=""
diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile
index b4e39cb06772..1976e52a429a 100644
--- a/devel/libtecla/Makefile
+++ b/devel/libtecla/Makefile
@@ -24,7 +24,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=int-conversion
 .endif
 
diff --git a/devel/pickle/Makefile b/devel/pickle/Makefile
index 427eff1ea3ff..544fd9487500 100644
--- a/devel/pickle/Makefile
+++ b/devel/pickle/Makefile
@@ -37,7 +37,7 @@ BIN_SYMLINKS=	bin/n14 \
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/devel/py-rchitect/Makefile b/devel/py-rchitect/Makefile
index 4bb2231071a7..2374f7463997 100644
--- a/devel/py-rchitect/Makefile
+++ b/devel/py-rchitect/Makefile
@@ -20,7 +20,7 @@ USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile
index 6e3d841be608..0480c0772178 100644
--- a/devel/tcltls/Makefile
+++ b/devel/tcltls/Makefile
@@ -32,7 +32,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=int-conversion
 .endif
 
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index 7a093e9db138..bc3bcb5158b7 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -39,7 +39,7 @@ ORIGWRKSRC=	${WRKDIR}/${DISTNAME}/src
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CPPFLAGS+=       -Wno-error=int-conversion
 .endif
 
diff --git a/editors/hexcurse/Makefile b/editors/hexcurse/Makefile
index d1d068223dce..2b29ef2492c7 100644
--- a/editors/hexcurse/Makefile
+++ b/editors/hexcurse/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES=	bin/hexcurse man/man1/hexcurse.1.gz
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=deprecated-non-prototype
 .endif
 
diff --git a/emulators/gngb/Makefile b/emulators/gngb/Makefile
index d09881bf8dd9..1892a3c1640a 100644
--- a/emulators/gngb/Makefile
+++ b/emulators/gngb/Makefile
@@ -27,7 +27,7 @@ OPENGL_CONFIGURE_ENABLE=gl
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/emulators/hugo/Makefile b/emulators/hugo/Makefile
index 5da1c5c26f33..fcd3ea2b8e43 100644
--- a/emulators/hugo/Makefile
+++ b/emulators/hugo/Makefile
@@ -48,7 +48,7 @@ SDL_MIXER_CFLAGS=	-DOGG_SUPPORT
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile
index 1f22215cd453..40f783cc46d1 100644
--- a/emulators/virtualbox-ose-kmod-legacy/Makefile
+++ b/emulators/virtualbox-ose-kmod-legacy/Makefile
@@ -77,7 +77,7 @@ KMK_ARCH=	freebsd.${ARCH}
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/games/libretro-bluemsx/Makefile b/games/libretro-bluemsx/Makefile
index 451f6b608347..3197bb9b96a1 100644
--- a/games/libretro-bluemsx/Makefile
+++ b/games/libretro-bluemsx/Makefile
@@ -19,7 +19,7 @@ PLIST_FILES=	lib/libretro/bluemsx_libretro.so
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/games/libretro-mame2000/Makefile b/games/libretro-mame2000/Makefile
index 2932af3207c4..10661009ae88 100644
--- a/games/libretro-mame2000/Makefile
+++ b/games/libretro-mame2000/Makefile
@@ -22,7 +22,7 @@ PLIST_FILES=	lib/libretro/mame2000_libretro.so
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/games/libretro-mame2003_plus/Makefile b/games/libretro-mame2003_plus/Makefile
index eeb4d606b206..c4a8f579fe47 100644
--- a/games/libretro-mame2003_plus/Makefile
+++ b/games/libretro-mame2003_plus/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES=	lib/libretro/mame2003_plus_libretro.so
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile
index ac996cda9ce5..6e3b9410a498 100644
--- a/games/spellcast/Makefile
+++ b/games/spellcast/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile
index 41c71aaa016f..4041dfd6ebe0 100644
--- a/games/tuxmath/Makefile
+++ b/games/tuxmath/Makefile
@@ -53,7 +53,7 @@ SVG_CONFIGURE_WITH=	rsvg
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/graphics/bsd-plotutils/Makefile b/graphics/bsd-plotutils/Makefile
index c638ae9221a4..247c8d1da8c3 100644
--- a/graphics/bsd-plotutils/Makefile
+++ b/graphics/bsd-plotutils/Makefile
@@ -25,7 +25,7 @@ FORTRAN_USES=	fortran
 
 .include <bsd.port.pre.mk>
 
-.if defined(NO_PROFILE) || ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 )
+.if defined(NO_PROFILE) || ( ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )))
 PLIST_SUB+=	PROFILE="@comment "
 .else
 PLIST_SUB+=	PROFILE=""
diff --git a/graphics/liblug/Makefile b/graphics/liblug/Makefile
index efdb26426f6a..a56e8b2470dc 100644
--- a/graphics/liblug/Makefile
+++ b/graphics/liblug/Makefile
@@ -26,7 +26,7 @@ PLIST_FILES=		lib/liblug.a
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/graphics/pixen/Makefile b/graphics/pixen/Makefile
index 4df47653c226..7c89eea52d59 100644
--- a/graphics/pixen/Makefile
+++ b/graphics/pixen/Makefile
@@ -19,7 +19,7 @@ ADDITIONAL_OBJCFLAGS+=	-Dlog2=logb
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index 89f90cca261b..d6af3c2d63fc 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -32,7 +32,7 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=int-conversion
 .endif
 
diff --git a/irc/scrollz/Makefile b/irc/scrollz/Makefile
index 3ab611a8f603..57d7257c0710 100644
--- a/irc/scrollz/Makefile
+++ b/irc/scrollz/Makefile
@@ -37,7 +37,7 @@ UTF8_CONFIGURE_ENABLE=	utf8
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=int-conversion
 .endif
 
diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile
index 3f29d4b54865..691a3275d511 100644
--- a/japanese/Wnn6-lib/Makefile
+++ b/japanese/Wnn6-lib/Makefile
@@ -18,7 +18,7 @@ PORTDOCS=	README
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=int-conversion
 .endif
 
diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile
index 5718f5dbd2f3..9d6c0f972cd4 100644
--- a/japanese/ebview-gtk2/Makefile
+++ b/japanese/ebview-gtk2/Makefile
@@ -28,7 +28,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
index 39d90aca2309..7fdabbb618b3 100644
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@@ -91,7 +91,7 @@ CONF+=	TRANSPORTDEFS="-DNO_TCP_TRANSPORT"
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile
index e091aa4f28db..7a5bfea4aa11 100644
--- a/japanese/sj3-server/Makefile
+++ b/japanese/sj3-server/Makefile
@@ -47,7 +47,7 @@ POSTPATCHES.nodocports= \
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/lang/eisl/Makefile b/lang/eisl/Makefile
index 3130a72c137c..92eca4d62633 100644
--- a/lang/eisl/Makefile
+++ b/lang/eisl/Makefile
@@ -34,7 +34,7 @@ EXTRA_PATCHES=	${FILESDIR}/extra-patch-makefile
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/lang/sagittarius-scheme/Makefile b/lang/sagittarius-scheme/Makefile
index 08849c80522d..ecb913db05f7 100644
--- a/lang/sagittarius-scheme/Makefile
+++ b/lang/sagittarius-scheme/Makefile
@@ -33,7 +33,7 @@ OPTIONS_SUB=		yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=int-conversion
 .endif
 
diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile
index 10766d583385..6d29a884ac74 100644
--- a/lang/solidity/Makefile
+++ b/lang/solidity/Makefile
@@ -43,7 +43,7 @@ PLIST_FILES=	bin/solc \
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CXXFLAGS+=	-Wno-unqualified-std-cast-call
 .endif
 
diff --git a/mail/deforaos-mailer/Makefile b/mail/deforaos-mailer/Makefile
index 1cb2f8e28475..6f9d3cf81148 100644
--- a/mail/deforaos-mailer/Makefile
+++ b/mail/deforaos-mailer/Makefile
@@ -59,7 +59,7 @@ post-patch:
 	${REINPLACE_CMD} 's|-Wl,-pie||g' \
 		${WRKSRC}/src/Makefile \
 		${WRKSRC}/tests/Makefile
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 	${REINPLACE_CMD} 's/stack-protector-all/stack-protector-all -Wno-error=int-conversion/g' \
 		${WRKSRC}/src/Makefile \
 		${WRKSRC}/src/account/Makefile \
diff --git a/mail/enma/Makefile b/mail/enma/Makefile
index 9fa659ab90af..343fc427462d 100644
--- a/mail/enma/Makefile
+++ b/mail/enma/Makefile
@@ -51,7 +51,7 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:mail/postfix
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index e4da2a7caf8d..0e6634addbc6 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile
index b8151ac8d443..89bf325cdbe1 100644
--- a/mail/hbiff/Makefile
+++ b/mail/hbiff/Makefile
@@ -18,7 +18,7 @@ PLIST_FILES=	bin/hbiff man/man1/hbiff.1.gz
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/mail/mailx/Makefile b/mail/mailx/Makefile
index 91c82038c594..420d488a51d7 100644
--- a/mail/mailx/Makefile
+++ b/mail/mailx/Makefile
@@ -24,7 +24,7 @@ WRKSRC=		${WRKDIR}/mail-2.2.8
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile
index 25cf0c4c1521..58226e95235a 100644
--- a/mail/meta1/Makefile
+++ b/mail/meta1/Makefile
@@ -72,7 +72,7 @@ TLS_LDFLAGS=		-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index 953889e35531..42a069ddb3ac 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -24,7 +24,7 @@ DEFAULT_LIBVERSION=	1.3
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=int-conversion
 .endif
 
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index 45c30fe5383e..c4f21721c889 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -21,7 +21,7 @@ INSTALL_TARGET=	install-strip
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile
index ef22a1356216..f678a5f626a0 100644
--- a/mail/rmilter/Makefile
+++ b/mail/rmilter/Makefile
@@ -34,7 +34,7 @@ DKIM_CMAKE_OFF=	-DENABLE_DKIM=OFF
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=int-conversion
 .endif
 
diff --git a/math/libpoly/Makefile b/math/libpoly/Makefile
index 09cb3a214f0b..685d1a4b2f29 100644
--- a/math/libpoly/Makefile
+++ b/math/libpoly/Makefile
@@ -21,7 +21,7 @@ CMAKE_OFF=	LIBPOLY_BUILD_PYTHON_API LIBPOLY_BUILD_STATIC LIBPOLY_BUILD_STATIC_PI
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=unused-but-set-variable
 .endif
 
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 3eb274c15f89..17328fd12fa8 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -132,7 +132,7 @@ CONFIGURE_ARGS+=	--enable-debug
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/math/spooles/Makefile b/math/spooles/Makefile
index ab06eebca7fa..c8b002c4e35b 100644
--- a/math/spooles/Makefile
+++ b/math/spooles/Makefile
@@ -38,7 +38,7 @@ DOCS_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} AllInOne.ps.gz Eigen.ps.gz \
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/misc/dynomite/Makefile b/misc/dynomite/Makefile
index cf0c9553e93d..899663cb3109 100644
--- a/misc/dynomite/Makefile
+++ b/misc/dynomite/Makefile
@@ -31,7 +31,7 @@ PLIST_FILES=	bin/dynomite-hash-tool \
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=int-conversion
 .endif
 
diff --git a/net-im/pidgin-fetion/Makefile b/net-im/pidgin-fetion/Makefile
index 29cecaa0a99b..c46d228eaa8f 100644
--- a/net-im/pidgin-fetion/Makefile
+++ b/net-im/pidgin-fetion/Makefile
@@ -25,7 +25,7 @@ PLIST_FILES=	lib/purple-2/libfetion.so
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/net-mgmt/ipv6calc/Makefile b/net-mgmt/ipv6calc/Makefile
index f5cfe2d64bed..dccfcd5af307 100644
--- a/net-mgmt/ipv6calc/Makefile
+++ b/net-mgmt/ipv6calc/Makefile
@@ -22,7 +22,7 @@ SHEBANG_FILES=	tools/*
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=       -Wno-error=deprecated-non-prototype
 .endif
 
diff --git a/net-mgmt/nrpe3/Makefile b/net-mgmt/nrpe3/Makefile
index 8f1152e9ded9..324afabb16b8 100644
--- a/net-mgmt/nrpe3/Makefile
+++ b/net-mgmt/nrpe3/Makefile
@@ -68,7 +68,7 @@ SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
diff --git a/net-mgmt/send/Makefile b/net-mgmt/send/Makefile
index ef3e9932bde7..727bb7909f5d 100644
*** 544 LINES SKIPPED ***