git: 95274bf4f99c - main - */*: Fix build with llvm16 on 13.2-STABLE
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 26 Jul 2023 00:48:36 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=95274bf4f99c71fc056013d966aec239161dfd74
commit 95274bf4f99c71fc056013d966aec239161dfd74
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-07-26 00:44:22 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-07-26 00:48:20 +0000
*/*: 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
---
accessibility/caribou/Makefile | 2 +-
archivers/dzip/Makefile | 2 +-
archivers/rubygem-bzip2-ruby/Makefile | 2 +-
audio/gstreamer1-plugins-sndio/Makefile | 2 +-
audio/libaudiofile/Makefile | 11 ++---------
audio/libfishsound/Makefile | 2 +-
audio/libsidplay/Makefile | 7 +------
audio/mpdcon/Makefile | 2 +-
audio/ocp/Makefile | 6 +++---
audio/play/Makefile | 5 ++---
audio/sidplayer/Makefile | 7 +------
audio/snack/Makefile | 2 +-
biology/ncbi-toolkit/Makefile | 5 ++---
biology/wise/Makefile | 5 ++---
cad/spice/Makefile | 2 +-
chinese/celvis/Makefile | 2 +-
chinese/libime/Makefile | 6 +++---
comms/uird/Makefile | 2 +-
converters/cocot/Makefile | 2 +-
converters/wkhtmltopdf/Makefile | 8 +++-----
converters/xdeview/Makefile | 2 +-
databases/R-cran-RSQLite/Makefile | 2 +-
databases/libgda5/Makefile | 2 +-
databases/pxlib/Makefile | 13 ++++++-------
databases/ruby-bdb/Makefile | 2 +-
databases/ruby-tokyocabinet/Makefile | 2 +-
deskutils/simpleagenda/Makefile | 2 +-
devel/antlr/Makefile | 9 +--------
devel/apache-commons-daemon/Makefile | 2 +-
devel/criterion/Makefile | 2 +-
devel/csmith/Makefile | 2 +-
devel/darts/Makefile | 2 +-
devel/directfb/Makefile | 7 ++-----
devel/gengetopt/Makefile | 9 +--------
devel/genht/Makefile | 2 +-
devel/gorm/Makefile | 2 +-
devel/ice/Makefile | 4 +---
devel/ice37/Makefile | 18 +-----------------
devel/libbinio/Makefile | 7 +------
devel/libgee06/Makefile | 2 +-
devel/libs11n/Makefile | 10 +---------
devel/libx86/Makefile | 2 +-
devel/mingw32-gcc/Makefile | 2 +-
devel/mpatrol/Makefile | 2 +-
devel/p5-Compiler-Lexer/Makefile | 6 +-----
devel/pecl-yac/Makefile | 2 +-
devel/py-donut-shellcode/Makefile | 2 +-
devel/py-fam/Makefile | 5 ++---
devel/py-pyyaml5/Makefile | 2 +-
devel/rubygem-cbor/Makefile | 2 +-
devel/rubygem-curses/Makefile | 2 +-
devel/rubygem-mmap2/Makefile | 2 +-
devel/rubygem-posix-spawn/Makefile | 2 +-
devel/rubygem-prometheus-client-mmap/Makefile | 2 +-
devel/rubygem-rbtrace/Makefile | 2 +-
devel/sfml/Makefile | 9 +--------
devel/sope/Makefile | 2 +-
devel/tla/Makefile | 5 ++---
devel/z80-asm/Makefile | 2 +-
editors/aewan/Makefile | 5 ++---
editors/led/Makefile | 2 +-
editors/morla/Makefile | 2 +-
editors/uzap/Makefile | 2 +-
emulators/dosbox/Makefile | 7 ++-----
emulators/hugo/Makefile | 5 ++---
emulators/qemu-cheri/Makefile | 2 +-
games/alienarena/Makefile | 6 +++---
games/dxx-rebirth/Makefile | 11 +++++------
games/falconseye/Makefile | 5 ++---
games/foobillard/Makefile | 2 +-
games/gnuchess/Makefile | 20 ++++++--------------
games/gshisen/Makefile | 2 +-
games/kevedit/Makefile | 2 +-
games/libgnome-games-support/Makefile | 2 +-
games/libretro-bluemsx/Makefile | 11 +++++------
games/nethack34/Makefile | 2 +-
games/prboom-plus/Makefile | 2 +-
games/tuxpaint/Makefile | 2 +-
games/tuxracer/Makefile | 2 +-
games/xbubble/Makefile | 2 +-
games/xlennart/Makefile | 2 +-
games/xpipeman/Makefile | 2 +-
games/xroach/Makefile | 2 +-
games/xtrojka/Makefile | 2 +-
graphics/agg/Makefile | 7 +------
graphics/anttweakbar/Makefile | 2 +-
graphics/devil/Makefile | 7 +------
graphics/dia/Makefile | 2 +-
graphics/djvulibre/Makefile | 7 +------
graphics/gdchart/Makefile | 2 +-
graphics/gle/Makefile | 2 +-
graphics/mesa-demos/Makefile | 2 +-
graphics/opennurbs/Makefile | 4 ++--
graphics/pixen/Makefile | 5 ++---
graphics/plotutils/Makefile | 7 +------
graphics/povray37/Makefile | 5 +----
graphics/py-pyvips/Makefile | 2 +-
graphics/quesoglc/Makefile | 2 +-
graphics/togl/Makefile | 2 +-
irc/bitchx/Makefile | 2 +-
irc/scrollz/Makefile | 5 ++---
japanese/FreeWnn-lib/Makefile | 2 +-
japanese/edict/Makefile | 2 +-
japanese/groff/Makefile | 20 ++++++++------------
japanese/libskk/Makefile | 2 +-
japanese/mecab/Makefile | 17 +++++------------
japanese/ruby-uconv/Makefile | 2 +-
java/jikes/Makefile | 7 +------
java/openjfx14/Makefile | 2 +-
java/sablevm-classpath/Makefile | 2 +-
lang/cim/Makefile | 5 ++---
lang/elk/Makefile | 2 +-
lang/squeak/Makefile | 5 ++---
mail/cclient/Makefile | 2 +-
mail/hbiff/Makefile | 5 ++---
mail/qmail-rblchk/Makefile | 2 +-
mail/xmailbox/Makefile | 2 +-
math/alps/Makefile | 9 +--------
math/eval/Makefile | 2 +-
math/form/Makefile | 2 +-
math/lemon/Makefile | 7 +------
multimedia/bcmatroska2/Makefile | 6 +++---
multimedia/mjpegtools/Makefile | 11 +----------
multimedia/phonon/Makefile | 6 +++---
multimedia/py-librtmp/Makefile | 2 +-
multimedia/smpeg2/Makefile | 5 +++--
multimedia/x264/Makefile | 6 +++---
net-im/libpurple/Makefile | 2 +-
net-im/libquotient/Makefile | 2 +-
net-im/neochat/Makefile | 2 +-
net-im/telepathy-gabble/Makefile | 2 +-
net-im/telepathy-glib/Makefile | 2 +-
net-mgmt/sysmon/Makefile | 2 +-
net-mgmt/wmi-client/Makefile | 2 +-
net-p2p/shx/Makefile | 5 ++---
net-p2p/tooth/Makefile | 2 +-
net/afpfs-ng/Makefile | 2 +-
net/ipsvd/Makefile | 2 +-
net/mptsd/Makefile | 2 +-
net/py-libdnet/Makefile | 2 +-
net/py-pcapy/Makefile | 8 ++------
net/skstream/Makefile | 7 +------
net/sniffit/Makefile | 5 ++---
net/spread/Makefile | 2 +-
net/ss5/Makefile | 2 +-
net/yptransitd/Makefile | 2 +-
print/cups-filters/Makefile | 7 ++++---
print/openprinting/Makefile | 2 +-
print/ttf2pt1/Makefile | 2 +-
russian/xruskb/Makefile | 2 +-
science/cgnslib/Makefile | 2 +-
science/gtamsanalyzer/Makefile | 5 ++---
science/paje/Makefile | 2 +-
security/mate-pam-helper/Makefile | 2 +-
security/pam_ocra/Makefile | 2 +-
security/pks/Makefile | 2 +-
security/rubygem-gpgme/Makefile | 2 +-
security/seahorse/Makefile | 2 +-
security/softether/Makefile | 2 +-
sysutils/gstopd/Makefile | 2 +-
sysutils/mate-settings-daemon/Makefile | 2 +-
sysutils/mtpfs/Makefile | 2 +-
sysutils/zeitgeist/Makefile | 2 +-
textproc/apertium/Makefile | 2 +-
textproc/gdome2/Makefile | 2 +-
textproc/lttoolbox/Makefile | 6 +++---
textproc/mgdiff/Makefile | 2 +-
textproc/p5-Senna/Makefile | 2 +-
textproc/rman/Makefile | 2 +-
textproc/rubygem-ruby-augeas/Makefile | 2 +-
textproc/sary/Makefile | 2 +-
textproc/wv/Makefile | 2 +-
www/libwww/Makefile | 2 +-
www/node16/Makefile | 6 +++---
www/p5-CGI-SpeedyCGI/Makefile | 2 +-
www/webkit2-gtk4/Makefile | 6 +++---
x11-drivers/xf86-video-savage/Makefile | 2 +-
x11-toolkits/blt/Makefile | 2 +-
x11-toolkits/granite/Makefile | 2 +-
x11-toolkits/irrlicht/Makefile | 7 +------
x11-toolkits/itk/Makefile | 2 +-
x11-toolkits/ntk/Makefile | 7 +------
x11-toolkits/plib/Makefile | 7 +------
x11-toolkits/rubygem-gtk2/Makefile | 2 +-
x11-toolkits/tix/Makefile | 12 ++++++------
x11-toolkits/tktable/Makefile | 2 +-
x11-toolkits/xmhtml/Makefile | 2 +-
x11-wm/compiz/Makefile | 2 +-
x11/budgie-desktop/Makefile | 2 +-
x11/xdtm/Makefile | 5 ++---
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
*** 2403 LINES SKIPPED ***