diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1179,7 +1179,7 @@ . endif _EXPORTED_VARS+= OSVERSION -. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1303000 ) +. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1303000 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1401000)) _UNSUPPORTED_SYSTEM_MESSAGE= Ports Collection support for your ${OPSYS} version has ended, and no ports\ are guaranteed to build on this system. Please upgrade to a supported release. . if defined(ALLOW_UNSUPPORTED_SYSTEM) diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile --- a/accessibility/caribou/Makefile +++ b/accessibility/caribou/Makefile @@ -38,7 +38,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/archivers/dzip/Makefile b/archivers/dzip/Makefile --- a/archivers/dzip/Makefile +++ b/archivers/dzip/Makefile @@ -26,7 +26,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/archivers/py-lzma/Makefile b/archivers/py-lzma/Makefile --- a/archivers/py-lzma/Makefile +++ b/archivers/py-lzma/Makefile @@ -33,8 +33,8 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -CFLAGS+= -Wno-error=int-conversion +.if ${OPSYS} == FreeBSD +CFLAGS+= -Wno-error=int-conversion .endif .include diff --git a/archivers/squsq/Makefile b/archivers/squsq/Makefile --- a/archivers/squsq/Makefile +++ b/archivers/squsq/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/archivers/unalz/Makefile b/archivers/unalz/Makefile --- a/archivers/unalz/Makefile +++ b/archivers/unalz/Makefile @@ -26,8 +26,8 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) -CFLAGS+= -Dregister= +.if ${OPSYS} == FreeBSD +CFLAGS+= -Dregister= .endif post-patch: diff --git a/astro/foxtrotgps/Makefile b/astro/foxtrotgps/Makefile --- a/astro/foxtrotgps/Makefile +++ b/astro/foxtrotgps/Makefile @@ -39,7 +39,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/audio/cardinal/Makefile b/audio/cardinal/Makefile --- a/audio/cardinal/Makefile +++ b/audio/cardinal/Makefile @@ -61,7 +61,7 @@ .include # workaround for ld: error: undefined symbol: roundevenf -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 .endif diff --git a/audio/dssi/Makefile b/audio/dssi/Makefile --- a/audio/dssi/Makefile +++ b/audio/dssi/Makefile @@ -39,7 +39,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/audio/espressivo-lv2/Makefile b/audio/espressivo-lv2/Makefile --- a/audio/espressivo-lv2/Makefile +++ b/audio/espressivo-lv2/Makefile @@ -26,7 +26,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/audio/eteroj-lv2/Makefile b/audio/eteroj-lv2/Makefile --- a/audio/eteroj-lv2/Makefile +++ b/audio/eteroj-lv2/Makefile @@ -28,7 +28,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/audio/fluida-lv2/Makefile b/audio/fluida-lv2/Makefile --- a/audio/fluida-lv2/Makefile +++ b/audio/fluida-lv2/Makefile @@ -33,7 +33,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/audio/fluidplug-lv2/Makefile b/audio/fluidplug-lv2/Makefile --- a/audio/fluidplug-lv2/Makefile +++ b/audio/fluidplug-lv2/Makefile @@ -28,7 +28,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/audio/gstreamer1-plugins-sndio/Makefile b/audio/gstreamer1-plugins-sndio/Makefile --- a/audio/gstreamer1-plugins-sndio/Makefile +++ b/audio/gstreamer1-plugins-sndio/Makefile @@ -21,7 +21,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/audio/lv2proc/Makefile b/audio/lv2proc/Makefile --- a/audio/lv2proc/Makefile +++ b/audio/lv2proc/Makefile @@ -26,7 +26,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=strict-prototypes .endif diff --git a/audio/mpdcon/Makefile b/audio/mpdcon/Makefile --- a/audio/mpdcon/Makefile +++ b/audio/mpdcon/Makefile @@ -20,7 +20,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/audio/orbit-lv2/Makefile b/audio/orbit-lv2/Makefile --- a/audio/orbit-lv2/Makefile +++ b/audio/orbit-lv2/Makefile @@ -26,7 +26,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/audio/psindustrializer/Makefile b/audio/psindustrializer/Makefile --- a/audio/psindustrializer/Makefile +++ b/audio/psindustrializer/Makefile @@ -43,7 +43,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/audio/sherlock-lv2/Makefile b/audio/sherlock-lv2/Makefile --- a/audio/sherlock-lv2/Makefile +++ b/audio/sherlock-lv2/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/audio/snack/Makefile b/audio/snack/Makefile --- a/audio/snack/Makefile +++ b/audio/snack/Makefile @@ -37,7 +37,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/audio/surge-synthesizer-xt-lv2/Makefile b/audio/surge-synthesizer-xt-lv2/Makefile --- a/audio/surge-synthesizer-xt-lv2/Makefile +++ b/audio/surge-synthesizer-xt-lv2/Makefile @@ -89,7 +89,7 @@ .include post-patch: -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD #@${REINPLACE_CMD} -e 's|move (group)|std::move (group)|g' \ # ${WRKSRC}/libs/JUCE/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp .endif diff --git a/audio/vm-lv2/Makefile b/audio/vm-lv2/Makefile --- a/audio/vm-lv2/Makefile +++ b/audio/vm-lv2/Makefile @@ -26,7 +26,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile --- a/audio/xmcd/Makefile +++ b/audio/xmcd/Makefile @@ -27,7 +27,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/benchmarks/siege/Makefile b/benchmarks/siege/Makefile --- a/benchmarks/siege/Makefile +++ b/benchmarks/siege/Makefile @@ -22,7 +22,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/biology/abyss/Makefile b/biology/abyss/Makefile --- a/biology/abyss/Makefile +++ b/biology/abyss/Makefile @@ -45,7 +45,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=unused-but-set-variable .endif diff --git a/biology/biosig/Makefile b/biology/biosig/Makefile --- a/biology/biosig/Makefile +++ b/biology/biosig/Makefile @@ -30,7 +30,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/biology/mothur/Makefile b/biology/mothur/Makefile --- a/biology/mothur/Makefile +++ b/biology/mothur/Makefile @@ -26,7 +26,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 .endif diff --git a/biology/ncbi-toolkit/Makefile b/biology/ncbi-toolkit/Makefile --- a/biology/ncbi-toolkit/Makefile +++ b/biology/ncbi-toolkit/Makefile @@ -33,12 +33,10 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -.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 --- a/biology/wise/Makefile +++ b/biology/wise/Makefile @@ -47,12 +47,10 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -.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/brlcad/Makefile b/cad/brlcad/Makefile --- a/cad/brlcad/Makefile +++ b/cad/brlcad/Makefile @@ -42,7 +42,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=14 .endif diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile --- a/cad/calculix/Makefile +++ b/cad/calculix/Makefile @@ -41,7 +41,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 .endif @@ -50,7 +50,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Wno-error=int-conversion .endif diff --git a/cad/electric/Makefile b/cad/electric/Makefile --- a/cad/electric/Makefile +++ b/cad/electric/Makefile @@ -31,7 +31,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types -Dregister= .endif diff --git a/cad/ldview/Makefile b/cad/ldview/Makefile --- a/cad/ldview/Makefile +++ b/cad/ldview/Makefile @@ -36,7 +36,7 @@ post-patch: @${REINPLACE_CMD} -e 's|"/usr/share/ldraw"|"${PREFIX}/share/ldraw"|' ${WRKSRC}/ModelViewerWidget.cpp -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD @${REINPLACE_CMD} -e 's|register ||' ${WRKSRC}/../LDLoader/LDrawIni.c .endif diff --git a/cad/magic/Makefile b/cad/magic/Makefile --- a/cad/magic/Makefile +++ b/cad/magic/Makefile @@ -36,7 +36,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile --- a/cad/oregano/Makefile +++ b/cad/oregano/Makefile @@ -27,7 +27,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/cad/spice/Makefile b/cad/spice/Makefile --- a/cad/spice/Makefile +++ b/cad/spice/Makefile @@ -55,7 +55,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/cad/tochnog/Makefile b/cad/tochnog/Makefile --- a/cad/tochnog/Makefile +++ b/cad/tochnog/Makefile @@ -46,7 +46,7 @@ LIB_DEPENDS+= libsuperlu.so:math/superlu SUPERLU= superlu -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Dregister= .endif diff --git a/cad/z88/Makefile b/cad/z88/Makefile --- a/cad/z88/Makefile +++ b/cad/z88/Makefile @@ -35,7 +35,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/comms/bladerf/Makefile b/comms/bladerf/Makefile --- a/comms/bladerf/Makefile +++ b/comms/bladerf/Makefile @@ -18,8 +18,8 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -CFLAGS+= -Wno-error=unused-but-set-variable +.if ${OPSYS} == FreeBSD +CFLAGS+= -Wno-error=unused-but-set-variable .endif .include diff --git a/comms/libfap/Makefile b/comms/libfap/Makefile --- a/comms/libfap/Makefile +++ b/comms/libfap/Makefile @@ -21,7 +21,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/comms/qico/Makefile b/comms/qico/Makefile --- a/comms/qico/Makefile +++ b/comms/qico/Makefile @@ -52,7 +52,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/comms/rubygem-serialport/Makefile b/comms/rubygem-serialport/Makefile --- a/comms/rubygem-serialport/Makefile +++ b/comms/rubygem-serialport/Makefile @@ -15,7 +15,7 @@ .include post-patch: -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD @${REINPLACE_CMD} -e 's|-DOS_\#{os.upcase}|-DOS_\#{os.upcase} -Wno-error=int-conversion|g' \ ${WRKSRC}/ext/native/extconf.rb .endif diff --git a/comms/uird/Makefile b/comms/uird/Makefile --- a/comms/uird/Makefile +++ b/comms/uird/Makefile @@ -21,7 +21,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile --- a/comms/xlog/Makefile +++ b/comms/xlog/Makefile @@ -36,7 +36,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=deprecated-non-prototype .endif diff --git a/converters/aish/Makefile b/converters/aish/Makefile --- a/converters/aish/Makefile +++ b/converters/aish/Makefile @@ -16,7 +16,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/converters/cocot/Makefile b/converters/cocot/Makefile --- a/converters/cocot/Makefile +++ b/converters/cocot/Makefile @@ -20,7 +20,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/converters/ish/Makefile b/converters/ish/Makefile --- a/converters/ish/Makefile +++ b/converters/ish/Makefile @@ -18,7 +18,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/converters/ta2as/Makefile b/converters/ta2as/Makefile --- a/converters/ta2as/Makefile +++ b/converters/ta2as/Makefile @@ -23,7 +23,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile --- a/converters/wkhtmltopdf/Makefile +++ b/converters/wkhtmltopdf/Makefile @@ -71,7 +71,7 @@ ${ECHO} 'LIBS+= -lcrypto' >>${WRKSRC}/src/pdf/pdf.pro ${MKDIR} ${WRKSRC}/build/app ${WRKSRC}/build/qt \ ${WRKSRC}/build/wkhtmltox -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD @${FIND} ${PATCH_WRKSRC}/../qt-5db36ec -name "*.cpp" -o -name "*.h" | \ ${XARGS} ${REINPLACE_CMD} -E 's|register ([a-zA-Z])|\1|g' .endif diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile --- a/converters/xdeview/Makefile +++ b/converters/xdeview/Makefile @@ -35,7 +35,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile --- a/databases/clickhouse/Makefile +++ b/databases/clickhouse/Makefile @@ -229,7 +229,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 CFLAGS+=-Wno-error=int-conversion .endif diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile --- a/databases/libgda5/Makefile +++ b/databases/libgda5/Makefile @@ -99,7 +99,7 @@ CONFIGURE_ARGS+= --without-java .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/databases/libzdb/files/patch-clang16 b/databases/libzdb/files/patch-clang16 deleted file mode 100644 --- a/databases/libzdb/files/patch-clang16 +++ /dev/null @@ -1,16 +0,0 @@ -Workaround for FreeBSD 14.0 (Clang 16) which is expected to be EOL on 2024-09-30 - -Reference: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255374 - https://forums.freebsd.org/threads/freebsd-release-14-0-and-clang-2020-std-format.91114/ - ---- configure.orig 2024-08-01 01:02:16 UTC -+++ configure -@@ -6239,7 +6239,7 @@ printf "%s\n" "$ac_cv_cxx_compile_cxx20" >&6; } - fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compile_cxx20" >&5 - printf "%s\n" "$ac_cv_cxx_compile_cxx20" >&6; } --CXXFLAGS="$CXXFLAGS -std=c++20" -+CXXFLAGS="$CXXFLAGS -std=c++20 -fexperimental-library" - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/databases/mdcached/Makefile b/databases/mdcached/Makefile --- a/databases/mdcached/Makefile +++ b/databases/mdcached/Makefile @@ -21,7 +21,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=dynamic-exception-spec .endif diff --git a/databases/nanodbc/Makefile b/databases/nanodbc/Makefile --- a/databases/nanodbc/Makefile +++ b/databases/nanodbc/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=deprecated-declarations -Wno-error=unused-command-line-argument .endif diff --git a/databases/p5-DBD-InterBase/Makefile b/databases/p5-DBD-InterBase/Makefile --- a/databases/p5-DBD-InterBase/Makefile +++ b/databases/p5-DBD-InterBase/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/databases/p5-Memcached-libmemcached/Makefile b/databases/p5-Memcached-libmemcached/Makefile --- a/databases/p5-Memcached-libmemcached/Makefile +++ b/databases/p5-Memcached-libmemcached/Makefile @@ -20,7 +20,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/databases/pgpool-II-41/Makefile b/databases/pgpool-II-41/Makefile --- a/databases/pgpool-II-41/Makefile +++ b/databases/pgpool-II-41/Makefile @@ -41,7 +41,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/databases/pgpool-II-42/Makefile b/databases/pgpool-II-42/Makefile --- a/databases/pgpool-II-42/Makefile +++ b/databases/pgpool-II-42/Makefile @@ -41,7 +41,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/databases/pgpool-II-43/Makefile b/databases/pgpool-II-43/Makefile --- a/databases/pgpool-II-43/Makefile +++ b/databases/pgpool-II-43/Makefile @@ -38,7 +38,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile --- a/databases/pxlib/Makefile +++ b/databases/pxlib/Makefile @@ -30,7 +30,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile --- a/databases/py-postgresql/Makefile +++ b/databases/py-postgresql/Makefile @@ -17,7 +17,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/databases/ruby-tokyocabinet/Makefile b/databases/ruby-tokyocabinet/Makefile --- a/databases/ruby-tokyocabinet/Makefile +++ b/databases/ruby-tokyocabinet/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CONFIGURE_ARGS+= --with-cflags="-Wno-error=incompatible-function-pointer-types" .endif diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile --- a/deskutils/cairo-dock-plugins/Makefile +++ b/deskutils/cairo-dock-plugins/Makefile @@ -97,8 +97,7 @@ .include -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400079 || (${OSVERSION} >= 1302505 && \ - ${OSVERSION} < 1400000)) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile --- a/deskutils/gtimer/Makefile +++ b/deskutils/gtimer/Makefile @@ -23,7 +23,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/deskutils/helpviewer/Makefile b/deskutils/helpviewer/Makefile --- a/deskutils/helpviewer/Makefile +++ b/deskutils/helpviewer/Makefile @@ -16,7 +16,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD ADDITIONAL_CPPFLAGS+= -Wno-error=int-conversion .endif diff --git a/devel/boost-all/compiled.mk b/devel/boost-all/compiled.mk --- a/devel/boost-all/compiled.mk +++ b/devel/boost-all/compiled.mk @@ -45,8 +45,6 @@ .if ${OPSYS} == FreeBSD && \ ((${OSVERSION} >= 1500000 && ${OSVERSION} < 1500017) || \ - (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400097)|| \ - (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300137) || \ ${PORT_OPTIONS:MLLVM_FROM_PORTS}) USES+= llvm:build CHOSEN_COMPILER_TYPE= clang diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -17,8 +17,8 @@ # following conditions are satisfied. # * OSVERSION is included in either of following ranges. # 1. 1500000 <= OSVERSION < 1500017 -# 2. 1400000 <= OSVERSION < 1400509 -# 3. 1300000 <= OSVERSION < 1303502 +# 2. 1400000 <= OSVERSION < 1400509 (no longer relevant) +# 3. 1300000 <= OSVERSION < 1303502 (no longer relevant) # * Base system is built with WITH_LLVM_ASSERTIONS variable set. # So if your base system fulfills them you need to use LLVM ports to # build this port. diff --git a/devel/criterion/Makefile b/devel/criterion/Makefile --- a/devel/criterion/Makefile +++ b/devel/criterion/Makefile @@ -40,7 +40,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/devel/csmith/Makefile b/devel/csmith/Makefile --- a/devel/csmith/Makefile +++ b/devel/csmith/Makefile @@ -27,7 +27,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Wno-error=enum-constexpr-conversion .endif diff --git a/devel/darts/Makefile b/devel/darts/Makefile --- a/devel/darts/Makefile +++ b/devel/darts/Makefile @@ -27,7 +27,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Dregister= .endif diff --git a/devel/flatbuffers205/Makefile b/devel/flatbuffers205/Makefile --- a/devel/flatbuffers205/Makefile +++ b/devel/flatbuffers205/Makefile @@ -26,7 +26,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CXXFLAGS+= -Wno-error=unused-command-line-argument .endif diff --git a/devel/frink/Makefile b/devel/frink/Makefile --- a/devel/frink/Makefile +++ b/devel/frink/Makefile @@ -23,7 +23,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=strict-prototypes .endif diff --git a/devel/gcc-arm-embedded/Makefile b/devel/gcc-arm-embedded/Makefile --- a/devel/gcc-arm-embedded/Makefile +++ b/devel/gcc-arm-embedded/Makefile @@ -101,7 +101,7 @@ #IGNORE= PURE option is not valid anymore, no libraries are bundled #.endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USE_GCC= yes .endif diff --git a/devel/gcc-arm-embedded/files/Makefile b/devel/gcc-arm-embedded/files/Makefile --- a/devel/gcc-arm-embedded/files/Makefile +++ b/devel/gcc-arm-embedded/files/Makefile @@ -19,7 +19,7 @@ LDFLAGS+= -L${WORLD_LIB}/lib -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD MAKE_ARGS+= CFLAGS="-Wno-error -Wno-deprecated-register" CXXFLAGS="-Wno-error -Wno-deprecated-register" .else .if ${CHOSEN_COMPILER_TYPE} == clang diff --git a/devel/gcc-msp430-ti-toolchain/Makefile b/devel/gcc-msp430-ti-toolchain/Makefile --- a/devel/gcc-msp430-ti-toolchain/Makefile +++ b/devel/gcc-msp430-ti-toolchain/Makefile @@ -91,11 +91,11 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USE_GCC= yes:build .endif diff --git a/devel/genht/Makefile b/devel/genht/Makefile --- a/devel/genht/Makefile +++ b/devel/genht/Makefile @@ -22,7 +22,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/devel/gorm/Makefile b/devel/gorm/Makefile --- a/devel/gorm/Makefile +++ b/devel/gorm/Makefile @@ -21,7 +21,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/devel/hyprlang/Makefile b/devel/hyprlang/Makefile --- a/devel/hyprlang/Makefile +++ b/devel/hyprlang/Makefile @@ -20,9 +20,4 @@ lib/lib${PORTNAME}.so.${PORTVERSION} \ libdata/pkgconfig/${PORTNAME}.pc -# XXX Drop after FreeBSD 14.0 EOL around 2024-10-01 -.if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) -CXXFLAGS+= -fexperimental-library -.endif - .include diff --git a/devel/hyprutils/Makefile b/devel/hyprutils/Makefile --- a/devel/hyprutils/Makefile +++ b/devel/hyprutils/Makefile @@ -17,11 +17,6 @@ GH_ACCOUNT= hyprwm PLIST_SUB= VERSION=${DISTVERSION:C/-.*//} -# XXX Drop after FreeBSD 14.0 EOL around 2024-10-01 -.if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) -CXXFLAGS+= -fexperimental-library -.endif - post-patch: # Respect PREFIX for system-wide config @${REINPLACE_CMD} 's,/etc,${PREFIX}&,' \ diff --git a/devel/hyprwayland-scanner/Makefile b/devel/hyprwayland-scanner/Makefile --- a/devel/hyprwayland-scanner/Makefile +++ b/devel/hyprwayland-scanner/Makefile @@ -20,10 +20,4 @@ lib/cmake/${PORTNAME}/${PORTNAME}-config.cmake \ libdata/pkgconfig/${PORTNAME}.pc -# XXX Drop after FreeBSD 14.0 EOL around 2024-10-01 -.if exists(/usr/include/c++/v1/__format/format_functions.h) && \ - !exists(/usr/include/c++/v1/__format/write_escaped.h) -CXXFLAGS+= -fexperimental-library -.endif - .include diff --git a/devel/leatherman/Makefile b/devel/leatherman/Makefile --- a/devel/leatherman/Makefile +++ b/devel/leatherman/Makefile @@ -29,7 +29,7 @@ post-configure: # This file is vendored in vendor/Catch-1.10.0.zip and extracted at configure step ${SED} -i '' -e '1s|\(.*\)|#include \n\1|' ${CONFIGURE_WRKSRC}/src/Catch-1.10.0/single_include/catch.hpp -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD ${REINPLACE_CMD} -e 's|ptrdiff_t|size_t|' ${CONFIGURE_WRKSRC}/src/Catch-1.10.0/single_include/catch.hpp .endif diff --git a/devel/libafterbase/Makefile b/devel/libafterbase/Makefile --- a/devel/libafterbase/Makefile +++ b/devel/libafterbase/Makefile @@ -20,7 +20,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/devel/libepp-nicbr/Makefile b/devel/libepp-nicbr/Makefile --- a/devel/libepp-nicbr/Makefile +++ b/devel/libepp-nicbr/Makefile @@ -35,7 +35,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=unused-but-set-variable .endif diff --git a/devel/libfortuna/Makefile b/devel/libfortuna/Makefile --- a/devel/libfortuna/Makefile +++ b/devel/libfortuna/Makefile @@ -16,7 +16,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=array-parameter .endif diff --git a/devel/libgee06/Makefile b/devel/libgee06/Makefile --- a/devel/libgee06/Makefile +++ b/devel/libgee06/Makefile @@ -21,7 +21,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/devel/libs11n/Makefile b/devel/libs11n/Makefile --- a/devel/libs11n/Makefile +++ b/devel/libs11n/Makefile @@ -21,7 +21,7 @@ .include -.if defined(NO_PROFILE) || ( ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))) +.if defined(NO_PROFILE) || ${OPSYS} == FreeBSD PLIST_SUB+= PROFILE="@comment " .else PLIST_SUB+= PROFILE="" diff --git a/devel/libshbuf/Makefile b/devel/libshbuf/Makefile --- a/devel/libshbuf/Makefile +++ b/devel/libshbuf/Makefile @@ -21,7 +21,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile --- a/devel/libtecla/Makefile +++ b/devel/libtecla/Makefile @@ -26,7 +26,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/devel/libx86/Makefile b/devel/libx86/Makefile --- a/devel/libx86/Makefile +++ b/devel/libx86/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/devel/mpatrol/Makefile b/devel/mpatrol/Makefile --- a/devel/mpatrol/Makefile +++ b/devel/mpatrol/Makefile @@ -45,7 +45,7 @@ CFLAGS+= -DENVIRON=\"ENVIRON_64\" -DMP_INIT_SUPPORT=0 .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=dynamic-exception-spec .endif diff --git a/devel/pecl-yac/Makefile b/devel/pecl-yac/Makefile --- a/devel/pecl-yac/Makefile +++ b/devel/pecl-yac/Makefile @@ -18,7 +18,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/devel/pickle/Makefile b/devel/pickle/Makefile --- a/devel/pickle/Makefile +++ b/devel/pickle/Makefile @@ -36,7 +36,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=14 .endif diff --git a/devel/py-ctags/Makefile b/devel/py-ctags/Makefile --- a/devel/py-ctags/Makefile +++ b/devel/py-ctags/Makefile @@ -17,7 +17,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/devel/py-donut-shellcode/Makefile b/devel/py-donut-shellcode/Makefile --- a/devel/py-donut-shellcode/Makefile +++ b/devel/py-donut-shellcode/Makefile @@ -18,7 +18,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/devel/py-fam/Makefile b/devel/py-fam/Makefile --- a/devel/py-fam/Makefile +++ b/devel/py-fam/Makefile @@ -18,12 +18,10 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -.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-rchitect/Makefile b/devel/py-rchitect/Makefile --- a/devel/py-rchitect/Makefile +++ b/devel/py-rchitect/Makefile @@ -20,7 +20,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -Wno-error=incompatible-function-pointer-types .endif diff --git a/devel/replay/Makefile b/devel/replay/Makefile --- a/devel/replay/Makefile +++ b/devel/replay/Makefile @@ -14,7 +14,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=unused-but-set-variable .endif diff --git a/devel/root/Makefile b/devel/root/Makefile --- a/devel/root/Makefile +++ b/devel/root/Makefile @@ -209,13 +209,6 @@ PLIST_SUB+= NOT_INSTALLED_ON_AARCH64="" ONLY_INSTALLED_ON_AARCH64="@comment " .endif -# std_config.pcm exclusive to FreeBSD 14.0 -.if ${OPSYS} == FreeBSD && ${OSREL} == 14.0 -PLIST_SUB+= ONLY_INSTALLED_ON_FBSD140="" -.else -PLIST_SUB+= ONLY_INSTALLED_ON_FBSD140="@comment " -.endif - # Files in lib/root/__pycache__ have links into WRKDIR and should not be staged. This happens even when PYROOT option is OFF. post-install: ${RM} -r ${STAGEDIR}${PREFIX}/lib/root/__pycache__ diff --git a/devel/root/pkg-plist b/devel/root/pkg-plist --- a/devel/root/pkg-plist +++ b/devel/root/pkg-plist @@ -3917,7 +3917,6 @@ lib/root/libvectorDict.so.%%SHLIB_VER%% %%NOT_INSTALLED_ON_AARCH64%%lib/root/modules.idx %%NOT_INSTALLED_ON_AARCH64%%lib/root/std.pcm -%%ONLY_INSTALLED_ON_FBSD140%%%%NOT_INSTALLED_ON_AARCH64%%lib/root/std_config.pcm %%PORTDOCS%%%%DOCSDIR%%/CREDITS %%PORTDOCS%%%%DOCSDIR%%/DEVELOPMENT.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile --- a/devel/ruby-subversion/Makefile +++ b/devel/ruby-subversion/Makefile @@ -27,7 +27,7 @@ CFLAGS+= -fdeclspec -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -Wno-error=incompatible-function-pointer-types .endif diff --git a/devel/rubygem-cbor/Makefile b/devel/rubygem-cbor/Makefile --- a/devel/rubygem-cbor/Makefile +++ b/devel/rubygem-cbor/Makefile @@ -13,7 +13,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CONFIGURE_ARGS+= --with-cflags="-Wno-error=incompatible-function-pointer-types" .endif diff --git a/devel/rubygem-curses/Makefile b/devel/rubygem-curses/Makefile --- a/devel/rubygem-curses/Makefile +++ b/devel/rubygem-curses/Makefile @@ -14,7 +14,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CONFIGURE_ARGS+= --with-cflags="-Wno-error=incompatible-function-pointer-types" .endif diff --git a/devel/rubygem-mmap2/Makefile b/devel/rubygem-mmap2/Makefile --- a/devel/rubygem-mmap2/Makefile +++ b/devel/rubygem-mmap2/Makefile @@ -14,7 +14,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD 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 --- a/devel/rubygem-prometheus-client-mmap/Makefile +++ b/devel/rubygem-prometheus-client-mmap/Makefile @@ -34,7 +34,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD RUBYGEM_ARGS+= --with-cflags="-Wno-error=incompatible-function-pointer-types" .endif diff --git a/devel/sope/Makefile b/devel/sope/Makefile --- a/devel/sope/Makefile +++ b/devel/sope/Makefile @@ -45,7 +45,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/devel/sope2/Makefile b/devel/sope2/Makefile --- a/devel/sope2/Makefile +++ b/devel/sope2/Makefile @@ -41,7 +41,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD ADDITIONAL_CPPFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile --- a/devel/tcltls/Makefile +++ b/devel/tcltls/Makefile @@ -33,7 +33,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/editors/aewan/Makefile b/editors/aewan/Makefile --- a/editors/aewan/Makefile +++ b/editors/aewan/Makefile @@ -27,12 +27,10 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -.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/gnome-latex/Makefile b/editors/gnome-latex/Makefile --- a/editors/gnome-latex/Makefile +++ b/editors/gnome-latex/Makefile @@ -36,7 +36,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/editors/hexer/Makefile b/editors/hexer/Makefile --- a/editors/hexer/Makefile +++ b/editors/hexer/Makefile @@ -27,7 +27,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=14 .endif diff --git a/editors/imhex-current/Makefile b/editors/imhex-current/Makefile --- a/editors/imhex-current/Makefile +++ b/editors/imhex-current/Makefile @@ -106,8 +106,7 @@ .include # Before LLVM 17 import into the base system -.if ((${OSREL:R} == 14 && ${OSVERSION} < 1400504) \ - || (${OSREL:R} == 15 && ${OSVERSION} < 1500006)) +.if (${OSREL:R} == 15 && ${OSVERSION} < 1500006) IGNORE= requires libc++ of LLVM 17 on the base system .endif @@ -139,7 +138,6 @@ ${CP} -R ${WRKDIR}/imhex-ffx-pats-${GL_TAG_IMHEX_FFX_PATS}/* ${WRKDIR}/.build/_deps/imhex_patterns_src/patterns/ffx # Before LLVM 18 import into the base system .if ((${OSREL:R} == 15 && ${OSVERSION} < 1500018) \ - || (${OSREL:R} == 14 && ${OSVERSION} < 1400511) \ || (${OSREL:R} == 13 && ${OSVERSION} < 1303503)) ${CP} -R ${WRKSRC_jthread}/* ${WRKSRC}/lib/third_party/jthread .endif diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile --- a/editors/imhex/Makefile +++ b/editors/imhex/Makefile @@ -90,7 +90,6 @@ # Before LLVM 18 import into the base system .if ((${OSREL:R} == 15 && ${OSVERSION} < 1500018) \ - || (${OSREL:R} == 14 && ${OSVERSION} < 1400511) \ || (${OSREL:R} == 13 && ${OSVERSION} < 1303503)) EXTRA_PATCHES= ${PATCHDIR}/extra-patch-lib_external_libwolv_libs_io_include_wolv_io_file.hpp \ ${PATCHDIR}/extra-patch-plugins_windows_include_views_view__tty__console.hpp \ @@ -113,7 +112,6 @@ ${MKDIR} ${WRKDIR}/.build/_deps/imhex_patterns_src ${CP} -R ${WRKSRC_imhex_patterns}/* ${WRKDIR}/.build/_deps/imhex_patterns_src .if ((${OSREL:R} == 15 && ${OSVERSION} < 1500018) \ - || (${OSREL:R} == 14 && ${OSVERSION} < 1400511) \ || (${OSREL:R} == 13 && ${OSVERSION} < 1303503)) ${CP} -R ${WRKSRC_jthread}/source/*.hpp ${WRKSRC}/lib/libimhex/include ${CP} -R ${WRKSRC_jthread}/source/*.hpp ${WRKSRC}/lib/external/libwolv/libs/io/include/wolv/io diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -364,11 +364,6 @@ .include -.if ${OPSYS} == FreeBSD && ( \ - (${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057)) -BROKEN= please update FreeBSD base system first to fix an ABI incompatibility -.endif - .if ${ARCH} == powerpc || ${ARCH} == powerpcspe || ${ARCH} == powerpc64 CONFIGURE_ARGS+= --disable-skia .endif diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile --- a/editors/nvi-m17n/Makefile +++ b/editors/nvi-m17n/Makefile @@ -57,7 +57,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -200,11 +200,6 @@ .include -.if ${OPSYS} == FreeBSD && ( \ - (${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057)) -BROKEN= please update FreeBSD base system first to fix an ABI incompatibility -.endif - .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-symbols .endif diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -231,11 +231,6 @@ .include -.if ${OPSYS} == FreeBSD && ( \ - (${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057)) -BROKEN= please update FreeBSD base system first to fix an ABI incompatibility -.endif - .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-symbols .endif diff --git a/editors/uemacs/Makefile b/editors/uemacs/Makefile --- a/editors/uemacs/Makefile +++ b/editors/uemacs/Makefile @@ -23,7 +23,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/editors/uzap/Makefile b/editors/uzap/Makefile --- a/editors/uzap/Makefile +++ b/editors/uzap/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/emulators/aranym/Makefile b/emulators/aranym/Makefile --- a/emulators/aranym/Makefile +++ b/emulators/aranym/Makefile @@ -31,7 +31,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Dregister= .endif diff --git a/emulators/gngb/Makefile b/emulators/gngb/Makefile --- a/emulators/gngb/Makefile +++ b/emulators/gngb/Makefile @@ -28,7 +28,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/emulators/qemu-cheri/Makefile b/emulators/qemu-cheri/Makefile --- a/emulators/qemu-cheri/Makefile +++ b/emulators/qemu-cheri/Makefile @@ -65,7 +65,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile --- a/emulators/uae/Makefile +++ b/emulators/uae/Makefile @@ -20,7 +20,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 .endif diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile --- a/emulators/virtualbox-ose-kmod-legacy/Makefile +++ b/emulators/virtualbox-ose-kmod-legacy/Makefile @@ -79,7 +79,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -190,18 +190,6 @@ .include -.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \ - ${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079 -# llvm before 15 included in old versions of the FreeBSD 13 and 14 fails to compile -# this legacy version of virtualbox-ose, force llvm 15 on those versions of the -# FreeBSD: PR#265539, 279257. -# Keep possibility to define different llvm via VBOX_LLVM_VER in make.conf. -BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER} -CC= clang${VBOX_LLVM_VER} -CXX= clang++${VBOX_LLVM_VER} -VBOX_LLVM_VER?= 15 -.endif - .if ${PYTHON_MAJOR_VER} >= 3 PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \ PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -203,8 +203,7 @@ # 1) llvm10 in FreeBSD before r364284 miscompiles virtualbox 6.1 causing errors. # 2) llvm15 in FreeBSD miscompiles virtualbox 6.1 causing errors: PR#270189. # Force llvm from ports. -.if ${OPSYS} == FreeBSD && \ - (${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 || ${OSVERSION} >= 1400079) +.if ${OPSYS} == FreeBSD # USES must be before .include , but CHOSEN_COMPILER_TYPE must be after. # This is a workaround with possibility to define different llvm via VBOX_LLVM_VER in make.conf. #USES+= llvm:min=11,max=14 diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -42,12 +42,6 @@ OPENGL_CONFIGURE_ENABLE= opengl X11_CONFIGURE_WITH= x -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000 && ${OSVERSION} < 1401000 -IGNORE= does not build on FreeBSD 14.0 - zlib is too old -.endif - post-patch: @${REINPLACE_CMD} -e 's|@CXX@ @CFLAGS@ -o|@CXX@ @CXXFLAGS@ @CPPFLAGS@ -o|g ; s|@CC@ @CFLAGS@ -o|@CC@ @CFLAGS@ @CPPFLAGS@ -o|g' \ ${WRKSRC}/Makefile.in diff --git a/ftp/wput/Makefile b/ftp/wput/Makefile --- a/ftp/wput/Makefile +++ b/ftp/wput/Makefile @@ -34,7 +34,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/games/alephone/Makefile b/games/alephone/Makefile --- a/games/alephone/Makefile +++ b/games/alephone/Makefile @@ -49,7 +49,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/games/avp/Makefile b/games/avp/Makefile --- a/games/avp/Makefile +++ b/games/avp/Makefile @@ -22,7 +22,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/awele/Makefile b/games/awele/Makefile --- a/games/awele/Makefile +++ b/games/awele/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile --- a/games/falconseye/Makefile +++ b/games/falconseye/Makefile @@ -32,12 +32,10 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ) CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif -.endif post-patch: @${REINPLACE_CMD} -i '' -e "s|||" \ diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile --- a/games/foobillard/Makefile +++ b/games/foobillard/Makefile @@ -49,8 +49,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || \ - ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/glsfcave/Makefile b/games/glsfcave/Makefile --- a/games/glsfcave/Makefile +++ b/games/glsfcave/Makefile @@ -22,7 +22,7 @@ .include do-build: -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD cd ${WRKSRC} && ${CC} -o glsfcave main.c -I${LOCALBASE}/include \ -Wno-error=incompatible-function-pointer-types \ -L${LOCALBASE}/lib -lglut -lGL -lGLU diff --git a/games/gshisen/Makefile b/games/gshisen/Makefile --- a/games/gshisen/Makefile +++ b/games/gshisen/Makefile @@ -16,7 +16,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/kevedit/Makefile b/games/kevedit/Makefile --- a/games/kevedit/Makefile +++ b/games/kevedit/Makefile @@ -21,7 +21,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile --- a/games/ldmud/Makefile +++ b/games/ldmud/Makefile @@ -50,7 +50,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/libgnome-games-support/Makefile b/games/libgnome-games-support/Makefile --- a/games/libgnome-games-support/Makefile +++ b/games/libgnome-games-support/Makefile @@ -21,7 +21,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/libretro-mame2000/Makefile b/games/libretro-mame2000/Makefile --- a/games/libretro-mame2000/Makefile +++ b/games/libretro-mame2000/Makefile @@ -20,7 +20,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/games/libretro-mame2003_plus/Makefile b/games/libretro-mame2003_plus/Makefile --- a/games/libretro-mame2003_plus/Makefile +++ b/games/libretro-mame2003_plus/Makefile @@ -20,7 +20,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/games/miscom/Makefile b/games/miscom/Makefile --- a/games/miscom/Makefile +++ b/games/miscom/Makefile @@ -31,7 +31,7 @@ CFLAGS+= -DSOUNDSDIR='\"${DATADIR}\"' -DSOUND_SUPPORT -DMORE_SOUNDBUF .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile --- a/games/nethack32/Makefile +++ b/games/nethack32/Makefile @@ -40,7 +40,7 @@ PLIST_SUB+= HACKLINK="@comment " .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile --- a/games/nethack33/Makefile +++ b/games/nethack33/Makefile @@ -47,7 +47,7 @@ PLIST_SUB+= HACKLINK="@comment " .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile --- a/games/nethack34/Makefile +++ b/games/nethack34/Makefile @@ -81,7 +81,7 @@ PLIST_SUB+= HACKLINK="@comment " .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/oolite/Makefile b/games/oolite/Makefile --- a/games/oolite/Makefile +++ b/games/oolite/Makefile @@ -60,7 +60,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD ADDITIONAL_CPPFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/prboom-plus/Makefile b/games/prboom-plus/Makefile --- a/games/prboom-plus/Makefile +++ b/games/prboom-plus/Makefile @@ -36,7 +36,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile --- a/games/spellcast/Makefile +++ b/games/spellcast/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/games/tads/Makefile b/games/tads/Makefile --- a/games/tads/Makefile +++ b/games/tads/Makefile @@ -23,7 +23,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/games/trojka/Makefile b/games/trojka/Makefile --- a/games/trojka/Makefile +++ b/games/trojka/Makefile @@ -17,7 +17,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/tuxpaint/Makefile b/games/tuxpaint/Makefile --- a/games/tuxpaint/Makefile +++ b/games/tuxpaint/Makefile @@ -55,7 +55,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile --- a/games/tuxracer/Makefile +++ b/games/tuxracer/Makefile @@ -31,7 +31,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/xboing/Makefile b/games/xboing/Makefile --- a/games/xboing/Makefile +++ b/games/xboing/Makefile @@ -23,7 +23,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile --- a/games/xbubble/Makefile +++ b/games/xbubble/Makefile @@ -28,7 +28,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/xfireworks/Makefile b/games/xfireworks/Makefile --- a/games/xfireworks/Makefile +++ b/games/xfireworks/Makefile @@ -16,7 +16,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile --- a/games/xjewel/Makefile +++ b/games/xjewel/Makefile @@ -18,7 +18,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/games/xlennart/Makefile b/games/xlennart/Makefile --- a/games/xlennart/Makefile +++ b/games/xlennart/Makefile @@ -52,7 +52,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/xmille/Makefile b/games/xmille/Makefile --- a/games/xmille/Makefile +++ b/games/xmille/Makefile @@ -23,7 +23,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/games/xneko/Makefile b/games/xneko/Makefile --- a/games/xneko/Makefile +++ b/games/xneko/Makefile @@ -16,7 +16,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile --- a/games/xpipeman/Makefile +++ b/games/xpipeman/Makefile @@ -17,7 +17,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/xroach/Makefile b/games/xroach/Makefile --- a/games/xroach/Makefile +++ b/games/xroach/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/games/xtrojka/Makefile b/games/xtrojka/Makefile --- a/games/xtrojka/Makefile +++ b/games/xtrojka/Makefile @@ -19,7 +19,7 @@ .include post-patch: -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD @${REINPLACE_CMD} -e 's|CFLAGS=|CFLAGS=-Wno-error=incompatible-function-pointer-types |g' \ ${WRKSRC}/Makefile .endif diff --git a/graphics/anttweakbar/Makefile b/graphics/anttweakbar/Makefile --- a/graphics/anttweakbar/Makefile +++ b/graphics/anttweakbar/Makefile @@ -34,7 +34,7 @@ .include post-patch: -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD @${REINPLACE_CMD} -e 's|public binary_function|public __binary_function|' \ ${WRKSRC}/TwMgr.cpp .endif diff --git a/graphics/bsd-plotutils/Makefile b/graphics/bsd-plotutils/Makefile --- a/graphics/bsd-plotutils/Makefile +++ b/graphics/bsd-plotutils/Makefile @@ -27,7 +27,7 @@ .include -.if defined(NO_PROFILE) || ( ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))) +.if defined(NO_PROFILE) || ${OPSYS} == FreeBSD PLIST_SUB+= PROFILE="@comment " .else PLIST_SUB+= PROFILE="" diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -45,7 +45,7 @@ PLIST_SUB+= WMF="@comment " #.endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/graphics/drm-510-kmod/Makefile b/graphics/drm-510-kmod/Makefile --- a/graphics/drm-510-kmod/Makefile +++ b/graphics/drm-510-kmod/Makefile @@ -28,7 +28,7 @@ .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1401501 -IGNORE= not supported on newer than 14.1 +IGNORE= not supported on FreeBSD 14.2 and higher .endif IGNORE_FreeBSD_15= not supported anymore diff --git a/graphics/drm-kmod/Makefile b/graphics/drm-kmod/Makefile --- a/graphics/drm-kmod/Makefile +++ b/graphics/drm-kmod/Makefile @@ -22,9 +22,6 @@ . elif ${OSVERSION} >= 1400097 && (${ARCH} == i386 || ${ARCH} == aarch64) RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-510-kmod _DRM_ARCHS= aarch64 i386 -. elif ${OSVERSION} >= 1400097 && ${OSVERSION} < 1400508 -RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-515-kmod -_DRM_ARCHS= amd64 powerpc64 powerpc64le . elif ${OSVERSION} >= 1400508 RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-61-kmod _DRM_ARCHS= amd64 powerpc64 powerpc64le diff --git a/graphics/dspdfviewer/Makefile b/graphics/dspdfviewer/Makefile --- a/graphics/dspdfviewer/Makefile +++ b/graphics/dspdfviewer/Makefile @@ -62,7 +62,7 @@ .endif # Fixes build failure for Clang 16.0.6 -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) && ${CHOSEN_COMPILER_TYPE} == clang +.if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -Wno-error=unsafe-buffer-usage .endif diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile --- a/graphics/gdchart/Makefile +++ b/graphics/gdchart/Makefile @@ -32,7 +32,7 @@ PLIST_SUB+= PROFILE="" .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile --- a/graphics/gle/Makefile +++ b/graphics/gle/Makefile @@ -28,7 +28,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile --- a/graphics/gpaint/Makefile +++ b/graphics/gpaint/Makefile @@ -23,7 +23,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/graphics/igt-gpu-tools/Makefile b/graphics/igt-gpu-tools/Makefile --- a/graphics/igt-gpu-tools/Makefile +++ b/graphics/igt-gpu-tools/Makefile @@ -71,7 +71,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile --- a/graphics/kludge3d/Makefile +++ b/graphics/kludge3d/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile --- a/graphics/mesa-demos/Makefile +++ b/graphics/mesa-demos/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/graphics/nvidia-drm-kmod/Makefile b/graphics/nvidia-drm-kmod/Makefile --- a/graphics/nvidia-drm-kmod/Makefile +++ b/graphics/nvidia-drm-kmod/Makefile @@ -18,8 +18,6 @@ RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod . elif ${OSVERSION} >= 1400097 && (${ARCH} == i386 || ${ARCH} == aarch64) RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod -. elif ${OSVERSION} >= 1400097 && ${OSVERSION} < 1400508 -RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-515-kmod . elif ${OSVERSION} >= 1400508 RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-61-kmod . endif diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -73,7 +73,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 CONFIGURE_ENV+= ac_cv_requires_lstdcxx=yes CFLAGS+= -Wno-error=incompatible-function-pointer-types diff --git a/graphics/opennurbs/Makefile b/graphics/opennurbs/Makefile --- a/graphics/opennurbs/Makefile +++ b/graphics/opennurbs/Makefile @@ -37,7 +37,7 @@ .endif post-patch: -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD @${REINPLACE_CMD} -e 's|D_GNU_SOURCE -I|D_GNU_SOURCE --std=c++14 -I|g' \ ${WRKSRC}/makefile .endif diff --git a/graphics/p5-Tk-JPEG-Lite/Makefile b/graphics/p5-Tk-JPEG-Lite/Makefile --- a/graphics/p5-Tk-JPEG-Lite/Makefile +++ b/graphics/p5-Tk-JPEG-Lite/Makefile @@ -18,7 +18,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/graphics/pixen/Makefile b/graphics/pixen/Makefile --- a/graphics/pixen/Makefile +++ b/graphics/pixen/Makefile @@ -19,12 +19,10 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -.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/quat-gui/Makefile b/graphics/quat-gui/Makefile --- a/graphics/quat-gui/Makefile +++ b/graphics/quat-gui/Makefile @@ -33,7 +33,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/graphics/quat/Makefile b/graphics/quat/Makefile --- a/graphics/quat/Makefile +++ b/graphics/quat/Makefile @@ -22,7 +22,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/graphics/quesoglc/Makefile b/graphics/quesoglc/Makefile --- a/graphics/quesoglc/Makefile +++ b/graphics/quesoglc/Makefile @@ -42,7 +42,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -111,22 +111,7 @@ # up to twice as fast as clang-16.0 compiled code. # So we shall stick to a modern GCC for now. # -.if (${OPSYS} == FreeBSD) && (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400501) -# Unfortunately, we can't even upgrade to GCC >= 13 because that fails -# with our libc++ header files, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273682 -# - which was fixed by jhb@ commits on 2023-11-19 for head, 13.3, and 14.1, -# with log "Merge commit 3537338d1ab9 from llvm git (by Nikolas Klauser): -# [libc++][libunwind] Fixes to allow GCC 13 to compile libunwind/libc++abi/libc++ [...]" -# -- once FreeBSD 14.0 will have gone out of support on 2024-10-01, remove this branch -# and USE_GCC=yes unconditionally. -# It would be possible to hoist a fixed pair of libcxx headers remove_cv.h and -# remove_cvref.h into the build but that's too much of an effort for a mere month. -# For a more thorough fix, we could look at -# https://github.com/llvm/llvm-project/commit/55357160d0e151c32f86e1d6683b4bddbb706aa1 -USE_GCC= 12 -.else USE_GCC= yes # default -.endif .if (${OPSYS} == FreeBSD) && (${OSVERSION} >= 1500000) # don't waste everybody's time with Tier-2 and moving targets. diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile --- a/graphics/togl/Makefile +++ b/graphics/togl/Makefile @@ -29,7 +29,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/irc/irssi-icb/Makefile b/irc/irssi-icb/Makefile --- a/irc/irssi-icb/Makefile +++ b/irc/irssi-icb/Makefile @@ -32,7 +32,7 @@ .include # Fixes build failure for Clang 16.0.6 -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/irc/scrollz/Makefile b/irc/scrollz/Makefile --- a/irc/scrollz/Makefile +++ b/irc/scrollz/Makefile @@ -41,12 +41,10 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -.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 --- a/japanese/FreeWnn-lib/Makefile +++ b/japanese/FreeWnn-lib/Makefile @@ -21,7 +21,7 @@ .include "${.CURDIR}/../../japanese/FreeWnn-lib/Makefile.common" .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile --- a/japanese/FreeWnn-server/Makefile +++ b/japanese/FreeWnn-server/Makefile @@ -36,11 +36,11 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile --- a/japanese/Wnn6-lib/Makefile +++ b/japanese/Wnn6-lib/Makefile @@ -18,7 +18,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile --- a/japanese/Wnn7-lib/Makefile +++ b/japanese/Wnn7-lib/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=14 .endif diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile --- a/japanese/canna-server/Makefile +++ b/japanese/canna-server/Makefile @@ -26,7 +26,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD MAKE_ARGS+= CCOPTIONS="-Wno-error=int-conversion" .endif diff --git a/japanese/celrw/Makefile b/japanese/celrw/Makefile --- a/japanese/celrw/Makefile +++ b/japanese/celrw/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile --- a/japanese/ebview-gtk2/Makefile +++ b/japanese/ebview-gtk2/Makefile @@ -28,7 +28,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile --- a/japanese/edict/Makefile +++ b/japanese/edict/Makefile @@ -44,7 +44,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/japanese/jls/Makefile b/japanese/jls/Makefile --- a/japanese/jls/Makefile +++ b/japanese/jls/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/japanese/kdrill/Makefile b/japanese/kdrill/Makefile --- a/japanese/kdrill/Makefile +++ b/japanese/kdrill/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile --- a/japanese/kinput2/Makefile +++ b/japanese/kinput2/Makefile @@ -91,7 +91,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile --- a/japanese/kterm/Makefile +++ b/japanese/kterm/Makefile @@ -44,7 +44,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/japanese/libskk/Makefile b/japanese/libskk/Makefile --- a/japanese/libskk/Makefile +++ b/japanese/libskk/Makefile @@ -37,7 +37,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile --- a/japanese/nethack34/Makefile +++ b/japanese/nethack34/Makefile @@ -41,7 +41,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/japanese/ruby-uconv/Makefile b/japanese/ruby-uconv/Makefile --- a/japanese/ruby-uconv/Makefile +++ b/japanese/ruby-uconv/Makefile @@ -26,7 +26,7 @@ PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} post-patch: -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD @${REINPLACE_CMD} -e 's|fdeclspec|fdeclspec -Wno-error=incompatible-function-pointer-types|g' \ ${WRKSRC}/extconf.rb .endif diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile --- a/japanese/sj3-server/Makefile +++ b/japanese/sj3-server/Makefile @@ -47,11 +47,11 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/java/netty/Makefile b/java/netty/Makefile --- a/java/netty/Makefile +++ b/java/netty/Makefile @@ -54,7 +54,7 @@ NETTY_ARCH= ${ARCH} .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile --- a/java/openjfx14/Makefile +++ b/java/openjfx14/Makefile @@ -90,7 +90,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/lang/cim/Makefile b/lang/cim/Makefile --- a/lang/cim/Makefile +++ b/lang/cim/Makefile @@ -25,11 +25,9 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ) CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif -.endif .include diff --git a/lang/eisl/Makefile b/lang/eisl/Makefile --- a/lang/eisl/Makefile +++ b/lang/eisl/Makefile @@ -38,11 +38,11 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400092 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/lang/elk/Makefile b/lang/elk/Makefile --- a/lang/elk/Makefile +++ b/lang/elk/Makefile @@ -33,7 +33,7 @@ CFLAGS= -O0 .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/lang/gcc11-devel/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d b/lang/gcc11-devel/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d --- a/lang/gcc11-devel/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d +++ b/lang/gcc11-devel/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d @@ -7,8 +7,8 @@ - version (FreeBSD_13) enum __FreeBSD_version = 1300000; -else version (FreeBSD_12) enum __FreeBSD_version = 1202000; + version (FreeBSD_15) enum __FreeBSD_version = 1500000; -+else version (FreeBSD_14) enum __FreeBSD_version = 1400000; -+else version (FreeBSD_13) enum __FreeBSD_version = 1302000; ++else version (FreeBSD_14) enum __FreeBSD_version = 1401000; ++else version (FreeBSD_13) enum __FreeBSD_version = 1303000; +else version (FreeBSD_12) enum __FreeBSD_version = 1204000; else version (FreeBSD_11) enum __FreeBSD_version = 1104000; else version (FreeBSD_10) enum __FreeBSD_version = 1004000; diff --git a/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d b/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d --- a/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d +++ b/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d @@ -7,8 +7,8 @@ - version (FreeBSD_13) enum __FreeBSD_version = 1300000; -else version (FreeBSD_12) enum __FreeBSD_version = 1202000; + version (FreeBSD_15) enum __FreeBSD_version = 1500000; -+else version (FreeBSD_14) enum __FreeBSD_version = 1400000; -+else version (FreeBSD_13) enum __FreeBSD_version = 1302000; ++else version (FreeBSD_14) enum __FreeBSD_version = 1401000; ++else version (FreeBSD_13) enum __FreeBSD_version = 1303000; +else version (FreeBSD_12) enum __FreeBSD_version = 1204000; else version (FreeBSD_11) enum __FreeBSD_version = 1104000; else version (FreeBSD_10) enum __FreeBSD_version = 1004000; diff --git a/lang/lafontaine/Makefile b/lang/lafontaine/Makefile --- a/lang/lafontaine/Makefile +++ b/lang/lafontaine/Makefile @@ -31,7 +31,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/lang/nesasm/Makefile b/lang/nesasm/Makefile --- a/lang/nesasm/Makefile +++ b/lang/nesasm/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/lang/ocaml-camlidl/Makefile b/lang/ocaml-camlidl/Makefile --- a/lang/ocaml-camlidl/Makefile +++ b/lang/ocaml-camlidl/Makefile @@ -26,7 +26,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/lang/sagittarius-scheme/Makefile b/lang/sagittarius-scheme/Makefile --- a/lang/sagittarius-scheme/Makefile +++ b/lang/sagittarius-scheme/Makefile @@ -33,7 +33,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/lang/sketchy/Makefile b/lang/sketchy/Makefile --- a/lang/sketchy/Makefile +++ b/lang/sketchy/Makefile @@ -15,7 +15,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile --- a/lang/solidity/Makefile +++ b/lang/solidity/Makefile @@ -41,7 +41,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CXXFLAGS+= -Wno-unqualified-std-cast-call .endif diff --git a/lang/spidermonkey91/Makefile b/lang/spidermonkey91/Makefile --- a/lang/spidermonkey91/Makefile +++ b/lang/spidermonkey91/Makefile @@ -54,7 +54,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_VERSION} \ LLVM_OBJDUMP=llvm-objdump${LLVM_VERSION} diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile --- a/lang/squeak/Makefile +++ b/lang/squeak/Makefile @@ -65,12 +65,10 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ) CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif -.endif post-patch: @${REINPLACE_CMD} -e 's,,,' \ diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile --- a/mail/cyrus-imapd25/Makefile +++ b/mail/cyrus-imapd25/Makefile @@ -158,7 +158,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -57,7 +57,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/mail/deforaos-mailer/Makefile b/mail/deforaos-mailer/Makefile --- a/mail/deforaos-mailer/Makefile +++ b/mail/deforaos-mailer/Makefile @@ -59,7 +59,7 @@ ${REINPLACE_CMD} 's|-Wl,-pie||g' \ ${WRKSRC}/src/Makefile \ ${WRKSRC}/tests/Makefile -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD ${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 --- a/mail/enma/Makefile +++ b/mail/enma/Makefile @@ -52,7 +52,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile --- a/mail/gnumail/Makefile +++ b/mail/gnumail/Makefile @@ -21,7 +21,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile --- a/mail/hbiff/Makefile +++ b/mail/hbiff/Makefile @@ -18,12 +18,10 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -.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/libsrs_alt/Makefile b/mail/libsrs_alt/Makefile --- a/mail/libsrs_alt/Makefile +++ b/mail/libsrs_alt/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/mail/mail2sms/Makefile b/mail/mail2sms/Makefile --- a/mail/mail2sms/Makefile +++ b/mail/mail2sms/Makefile @@ -21,7 +21,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/mail/mailx/Makefile b/mail/mailx/Makefile --- a/mail/mailx/Makefile +++ b/mail/mailx/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile --- a/mail/meta1/Makefile +++ b/mail/meta1/Makefile @@ -73,7 +73,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile --- a/mail/pantomime/Makefile +++ b/mail/pantomime/Makefile @@ -23,7 +23,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile --- a/mail/pfqueue/Makefile +++ b/mail/pfqueue/Makefile @@ -22,7 +22,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/mail/qconfirm/Makefile b/mail/qconfirm/Makefile --- a/mail/qconfirm/Makefile +++ b/mail/qconfirm/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/mail/qmail-rblchk/Makefile b/mail/qmail-rblchk/Makefile --- a/mail/qmail-rblchk/Makefile +++ b/mail/qmail-rblchk/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile --- a/mail/rmilter/Makefile +++ b/mail/rmilter/Makefile @@ -35,7 +35,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile --- a/mail/xmailbox/Makefile +++ b/mail/xmailbox/Makefile @@ -14,7 +14,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile --- a/mail/xpbiff/Makefile +++ b/mail/xpbiff/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/math/alberta/Makefile b/math/alberta/Makefile --- a/math/alberta/Makefile +++ b/math/alberta/Makefile @@ -39,7 +39,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -84,7 +84,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 .endif diff --git a/math/eval/Makefile b/math/eval/Makefile --- a/math/eval/Makefile +++ b/math/eval/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/math/form/Makefile b/math/form/Makefile --- a/math/form/Makefile +++ b/math/form/Makefile @@ -38,8 +38,7 @@ .include -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400091 || (${OSVERSION} >= 1302507 && \ - ${OSVERSION} < 1400000)) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/math/libpoly/Makefile b/math/libpoly/Makefile --- a/math/libpoly/Makefile +++ b/math/libpoly/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=unused-but-set-variable .endif diff --git a/math/oleo/Makefile b/math/oleo/Makefile --- a/math/oleo/Makefile +++ b/math/oleo/Makefile @@ -50,7 +50,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Wno-error=int-conversion .endif diff --git a/math/py-levmar/Makefile b/math/py-levmar/Makefile --- a/math/py-levmar/Makefile +++ b/math/py-levmar/Makefile @@ -27,11 +27,11 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/math/rubygem-rb-gsl/Makefile b/math/rubygem-rb-gsl/Makefile --- a/math/rubygem-rb-gsl/Makefile +++ b/math/rubygem-rb-gsl/Makefile @@ -18,7 +18,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CONFIGURE_ARGS+= --with-cflags="-Wno-error=int-conversion -Wno-error=incompatible-function-pointer-types" .endif diff --git a/math/spar/Makefile b/math/spar/Makefile --- a/math/spar/Makefile +++ b/math/spar/Makefile @@ -21,7 +21,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/math/spooles/Makefile b/math/spooles/Makefile --- a/math/spooles/Makefile +++ b/math/spooles/Makefile @@ -40,7 +40,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/math/xgraph/Makefile b/math/xgraph/Makefile --- a/math/xgraph/Makefile +++ b/math/xgraph/Makefile @@ -22,7 +22,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/misc/bb/Makefile b/misc/bb/Makefile --- a/misc/bb/Makefile +++ b/misc/bb/Makefile @@ -26,7 +26,7 @@ .if ${ARCH} != amd64 && ${ARCH} != i386 USES+= compiler:gcc-c++11-lib -.elif ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.elif ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile --- a/misc/dartsim/Makefile +++ b/misc/dartsim/Makefile @@ -62,7 +62,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=unused-but-set-variable .endif diff --git a/misc/dynomite/Makefile b/misc/dynomite/Makefile --- a/misc/dynomite/Makefile +++ b/misc/dynomite/Makefile @@ -34,7 +34,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile --- a/misc/hotkeys/Makefile +++ b/misc/hotkeys/Makefile @@ -37,7 +37,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/misc/orville-write/Makefile b/misc/orville-write/Makefile --- a/misc/orville-write/Makefile +++ b/misc/orville-write/Makefile @@ -22,7 +22,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/misc/py-pytorch/Makefile b/misc/py-pytorch/Makefile --- a/misc/py-pytorch/Makefile +++ b/misc/py-pytorch/Makefile @@ -61,7 +61,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 .endif diff --git a/misc/rump/Makefile b/misc/rump/Makefile --- a/misc/rump/Makefile +++ b/misc/rump/Makefile @@ -22,7 +22,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=strict-prototypes -Wno-error=array-parameter .endif diff --git a/misc/tlci/Makefile b/misc/tlci/Makefile --- a/misc/tlci/Makefile +++ b/misc/tlci/Makefile @@ -20,7 +20,7 @@ .include #post-patch: -#.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +#.if ${OPSYS} == FreeBSD # @${REINPLACE_CMD} -e 's|^CFLAGS\+=|CFLAGS\+= -Wno-error=strict-prototypes |g' \ # ${WRKSRC}/Makefile #.endif diff --git a/multimedia/mkvalidator/Makefile b/multimedia/mkvalidator/Makefile --- a/multimedia/mkvalidator/Makefile +++ b/multimedia/mkvalidator/Makefile @@ -30,7 +30,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/multimedia/smpeg2/Makefile b/multimedia/smpeg2/Makefile --- a/multimedia/smpeg2/Makefile +++ b/multimedia/smpeg2/Makefile @@ -33,7 +33,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Dregister= .endif diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -89,7 +89,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/net-im/libquotient/Makefile b/net-im/libquotient/Makefile --- a/net-im/libquotient/Makefile +++ b/net-im/libquotient/Makefile @@ -49,7 +49,7 @@ .include # Work around compiler bug, see pr: 272285 -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm .endif diff --git a/net-im/neochat/Makefile b/net-im/neochat/Makefile --- a/net-im/neochat/Makefile +++ b/net-im/neochat/Makefile @@ -37,7 +37,7 @@ .if ${ARCH:Mpowerpc*} USES+= llvm:min=16 -.elif ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.elif ${OPSYS} == FreeBSD # Work around compiler bug, see pr: 272285 USES+= llvm .endif diff --git a/net-im/pidgin-fetion/Makefile b/net-im/pidgin-fetion/Makefile --- a/net-im/pidgin-fetion/Makefile +++ b/net-im/pidgin-fetion/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -Wno-error=incompatible-function-pointer-types .endif diff --git a/net-im/pidgin-sipe/Makefile b/net-im/pidgin-sipe/Makefile --- a/net-im/pidgin-sipe/Makefile +++ b/net-im/pidgin-sipe/Makefile @@ -50,7 +50,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 .endif diff --git a/net-im/quaternion/Makefile b/net-im/quaternion/Makefile --- a/net-im/quaternion/Makefile +++ b/net-im/quaternion/Makefile @@ -30,7 +30,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 .endif diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -111,7 +111,7 @@ .include -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400091) +.if ${OPSYS} == FreeBSD #EXTRA_PATCHES= ${PATCHDIR}/extra-patch-CMakeLists.txt USES+= llvm:min=16,build USES:= ${USES:Ncompiler\:*} # XXX avoid warnings diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile --- a/net-im/telepathy-gabble/Makefile +++ b/net-im/telepathy-gabble/Makefile @@ -45,7 +45,7 @@ CONFIGURE_ENV+= OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include" .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile --- a/net-im/telepathy-glib/Makefile +++ b/net-im/telepathy-glib/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/net-mgmt/irrtoolset/Makefile b/net-mgmt/irrtoolset/Makefile --- a/net-mgmt/irrtoolset/Makefile +++ b/net-mgmt/irrtoolset/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Dregister= .endif diff --git a/net-mgmt/sendip/Makefile b/net-mgmt/sendip/Makefile --- a/net-mgmt/sendip/Makefile +++ b/net-mgmt/sendip/Makefile @@ -22,7 +22,7 @@ CFLAGS+= -Wno-empty-body -Wno-constant-conversion .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=deprecated-non-prototype -Wno-error=strict-prototypes .endif diff --git a/net-mgmt/sysmon/Makefile b/net-mgmt/sysmon/Makefile --- a/net-mgmt/sysmon/Makefile +++ b/net-mgmt/sysmon/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/net-mgmt/tcptrack/Makefile b/net-mgmt/tcptrack/Makefile --- a/net-mgmt/tcptrack/Makefile +++ b/net-mgmt/tcptrack/Makefile @@ -22,7 +22,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=unused-but-set-variable .endif diff --git a/net-mgmt/wmi-client/Makefile b/net-mgmt/wmi-client/Makefile --- a/net-mgmt/wmi-client/Makefile +++ b/net-mgmt/wmi-client/Makefile @@ -21,7 +21,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/net-p2p/c-lightning/Makefile b/net-p2p/c-lightning/Makefile --- a/net-p2p/c-lightning/Makefile +++ b/net-p2p/c-lightning/Makefile @@ -157,7 +157,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Wno-error=unused-but-set-variable .endif diff --git a/net-p2p/opendchub/Makefile b/net-p2p/opendchub/Makefile --- a/net-p2p/opendchub/Makefile +++ b/net-p2p/opendchub/Makefile @@ -23,7 +23,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/net-p2p/shx/Makefile b/net-p2p/shx/Makefile --- a/net-p2p/shx/Makefile +++ b/net-p2p/shx/Makefile @@ -55,12 +55,10 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -.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/afpfs-ng/Makefile b/net/afpfs-ng/Makefile --- a/net/afpfs-ng/Makefile +++ b/net/afpfs-ng/Makefile @@ -33,7 +33,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile --- a/net/asterisk18/Makefile +++ b/net/asterisk18/Makefile @@ -219,7 +219,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=14 .endif diff --git a/net/bindtest/Makefile b/net/bindtest/Makefile --- a/net/bindtest/Makefile +++ b/net/bindtest/Makefile @@ -18,7 +18,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=deprecated-non-prototype .endif diff --git a/net/bird2/Makefile b/net/bird2/Makefile --- a/net/bird2/Makefile +++ b/net/bird2/Makefile @@ -74,7 +74,7 @@ rtsock_PKGNAMESUFFIX= 2 .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} < 1303502 || ( ${OSVERSION} >= 1400000 && ${OSVERSION} < 1400510 ) || ( ${OSVERSION} >= 1500000 && ${OSVERSION} < 1500017 )) +.if ${OPSYS} == FreeBSD && ( ${OSVERSION} < 1303502 || ( ${OSVERSION} >= 1500000 && ${OSVERSION} < 1500017 )) EXTRA_PATCHES= ${PATCHDIR}/extra-patch-netlink-route .endif diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile --- a/net/guacamole-server/Makefile +++ b/net/guacamole-server/Makefile @@ -98,7 +98,7 @@ PLIST_SUB+= TERMINAL="@comment " .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=strict-prototypes \ -Wno-error=unused-but-set-variable .endif diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile --- a/net/honeyd/Makefile +++ b/net/honeyd/Makefile @@ -37,7 +37,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Wno-error=int-conversion .endif diff --git a/net/isboot-kmod/Makefile b/net/isboot-kmod/Makefile --- a/net/isboot-kmod/Makefile +++ b/net/isboot-kmod/Makefile @@ -33,7 +33,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=unused-but-set-variable .endif diff --git a/net/libexosip2/Makefile b/net/libexosip2/Makefile --- a/net/libexosip2/Makefile +++ b/net/libexosip2/Makefile @@ -28,7 +28,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile --- a/net/libproxy/Makefile +++ b/net/libproxy/Makefile @@ -55,7 +55,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD .if ${LIBPROXY_SLAVE:Mperl} CFLAGS+= -Wno-error=int-conversion .endif diff --git a/net/libtnl/Makefile b/net/libtnl/Makefile --- a/net/libtnl/Makefile +++ b/net/libtnl/Makefile @@ -25,7 +25,7 @@ .include -.if defined(NO_PROFILE) || defined(NOPROFILE) || ( ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))) +.if defined(NO_PROFILE) || defined(NOPROFILE) || ${OPSYS} == FreeBSD PLIST_SUB+= PROFILE='@comment ' .else PLIST_SUB+= PROFILE='' diff --git a/net/mptsd/Makefile b/net/mptsd/Makefile --- a/net/mptsd/Makefile +++ b/net/mptsd/Makefile @@ -20,7 +20,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/net/owamp/Makefile b/net/owamp/Makefile --- a/net/owamp/Makefile +++ b/net/owamp/Makefile @@ -15,7 +15,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/net/p5-Net-TCLink/Makefile b/net/p5-Net-TCLink/Makefile --- a/net/p5-Net-TCLink/Makefile +++ b/net/p5-Net-TCLink/Makefile @@ -20,7 +20,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/net/pichi/Makefile b/net/pichi/Makefile --- a/net/pichi/Makefile +++ b/net/pichi/Makefile @@ -80,7 +80,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=unqualified-std-cast-call .endif diff --git a/net/py-libdnet/Makefile b/net/py-libdnet/Makefile --- a/net/py-libdnet/Makefile +++ b/net/py-libdnet/Makefile @@ -31,7 +31,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/net/py-smbpasswd/Makefile b/net/py-smbpasswd/Makefile --- a/net/py-smbpasswd/Makefile +++ b/net/py-smbpasswd/Makefile @@ -17,7 +17,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/net/radsecproxy/Makefile b/net/radsecproxy/Makefile --- a/net/radsecproxy/Makefile +++ b/net/radsecproxy/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=strict-prototypes .endif diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile --- a/net/sniffit/Makefile +++ b/net/sniffit/Makefile @@ -20,12 +20,10 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -.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 --- a/net/spread/Makefile +++ b/net/spread/Makefile @@ -52,7 +52,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/net/ss5/Makefile b/net/ss5/Makefile --- a/net/ss5/Makefile +++ b/net/ss5/Makefile @@ -31,7 +31,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/net/ssldump/Makefile b/net/ssldump/Makefile --- a/net/ssldump/Makefile +++ b/net/ssldump/Makefile @@ -26,7 +26,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/net/suckblow/Makefile b/net/suckblow/Makefile --- a/net/suckblow/Makefile +++ b/net/suckblow/Makefile @@ -14,7 +14,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/net/trickle/Makefile b/net/trickle/Makefile --- a/net/trickle/Makefile +++ b/net/trickle/Makefile @@ -29,7 +29,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif post-install: diff --git a/net/yptransitd/Makefile b/net/yptransitd/Makefile --- a/net/yptransitd/Makefile +++ b/net/yptransitd/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/news/golded+/Makefile b/news/golded+/Makefile --- a/news/golded+/Makefile +++ b/news/golded+/Makefile @@ -30,7 +30,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Dregister= .endif diff --git a/news/lusernet/Makefile b/news/lusernet/Makefile --- a/news/lusernet/Makefile +++ b/news/lusernet/Makefile @@ -16,7 +16,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD ADDITIONAL_CPPFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/print/bibview/Makefile b/print/bibview/Makefile --- a/print/bibview/Makefile +++ b/print/bibview/Makefile @@ -13,7 +13,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -136,7 +136,7 @@ .include -#.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +#.if ${OPSYS} == FreeBSD .if ${COMPILER_TYPE} == clang CFLAGS+= -Wno-error=dynamic-exception-spec .endif diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile --- a/print/magicfilter/Makefile +++ b/print/magicfilter/Makefile @@ -28,7 +28,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/print/openprinting/Makefile b/print/openprinting/Makefile --- a/print/openprinting/Makefile +++ b/print/openprinting/Makefile @@ -36,7 +36,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/print/pic2fig/Makefile b/print/pic2fig/Makefile --- a/print/pic2fig/Makefile +++ b/print/pic2fig/Makefile @@ -17,7 +17,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/print/ttf2pt1/Makefile b/print/ttf2pt1/Makefile --- a/print/ttf2pt1/Makefile +++ b/print/ttf2pt1/Makefile @@ -34,7 +34,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/russian/xruskb/Makefile b/russian/xruskb/Makefile --- a/russian/xruskb/Makefile +++ b/russian/xruskb/Makefile @@ -30,7 +30,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/science/cgnslib/Makefile b/science/cgnslib/Makefile --- a/science/cgnslib/Makefile +++ b/science/cgnslib/Makefile @@ -54,7 +54,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/science/ghmm/Makefile b/science/ghmm/Makefile --- a/science/ghmm/Makefile +++ b/science/ghmm/Makefile @@ -23,7 +23,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/science/gtamsanalyzer/Makefile b/science/gtamsanalyzer/Makefile --- a/science/gtamsanalyzer/Makefile +++ b/science/gtamsanalyzer/Makefile @@ -18,12 +18,10 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion -.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/molscript/Makefile b/science/molscript/Makefile --- a/science/molscript/Makefile +++ b/science/molscript/Makefile @@ -38,7 +38,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/science/paje/Makefile b/science/paje/Makefile --- a/science/paje/Makefile +++ b/science/paje/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/science/py-openbabel/Makefile b/science/py-openbabel/Makefile --- a/science/py-openbabel/Makefile +++ b/science/py-openbabel/Makefile @@ -21,7 +21,7 @@ .include post-patch: -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD @${REINPLACE_CMD} -e 's|binary_function|__binary_function|g' \ ${WRKSRC}/openbabel/openbabel-python.i .endif diff --git a/security/botan3/Makefile b/security/botan3/Makefile --- a/security/botan3/Makefile +++ b/security/botan3/Makefile @@ -85,11 +85,6 @@ PLIST_SUB+= HAS_PROCESSOR_RNG="@comment " .endif -.if ${OPSYS} == FreeBSD && ( ( ${OSVERSION} >= 1400000 && ${OSVERSION} < 1400091 ) || ( ${OSVERSION} < 1302507 ) ) -# libc++ does not carry std::ranges::find, redirect to boost::range::find: -EXTRA_PATCHES+= ${FILESDIR}/extrapatch-src_tests_unit__x509.cpp -.endif - post-patch: @${REINPLACE_CMD} -e 's|^optimization_flags .*|optimization_flags "${CXXFLAGS}"|' \ ${WRKSRC}/src/build-data/cc/clang.txt diff --git a/security/botan3/files/extrapatch-src_tests_unit__x509.cpp b/security/botan3/files/extrapatch-src_tests_unit__x509.cpp deleted file mode 100644 --- a/security/botan3/files/extrapatch-src_tests_unit__x509.cpp +++ /dev/null @@ -1,38 +0,0 @@ ---- src/tests/unit_x509.cpp.orig 2024-02-20 17:28:54 UTC -+++ src/tests/unit_x509.cpp -@@ -18,6 +18,8 @@ - #include - #include - #include -+ -+ #include - #endif - - namespace Botan_Tests { -@@ -627,7 +629,7 @@ Test::Result test_x509_encode_authority_info_access_ex - - for(const auto& ca_issuer : cert.ca_issuers()) { - result.confirm("CA issuer URI present in certificate", -- std::ranges::find(ca_issuers, ca_issuer) != ca_issuers.end()); -+ boost::range::find(ca_issuers, ca_issuer) != ca_issuers.end()); - } - - result.confirm("no OCSP url available", cert.ocsp_responder().empty()); -@@ -1400,7 +1402,7 @@ Test::Result test_x509_extensions(const Botan::Private - !cert_cdps->crl_distribution_urls().empty())) { - for(const auto& cdp : cert_cdps->distribution_points()) { - result.confirm("CDP URI present in self-signed certificate", -- std::ranges::find(cdp_urls, cdp.point().get_first_attribute("URI")) != cdp_urls.end()); -+ boost::range::find(cdp_urls, cdp.point().get_first_attribute("URI")) != cdp_urls.end()); - } - } - -@@ -1436,7 +1438,7 @@ Test::Result test_x509_extensions(const Botan::Private - !cert_cdps->crl_distribution_urls().empty())) { - for(const auto& cdp : cert_cdps->distribution_points()) { - result.confirm("CDP URI present in self-signed certificate", -- std::ranges::find(cdp_urls, cdp.point().get_first_attribute("URI")) != cdp_urls.end()); -+ boost::range::find(cdp_urls, cdp.point().get_first_attribute("URI")) != cdp_urls.end()); - } - } - diff --git a/security/identify/Makefile b/security/identify/Makefile --- a/security/identify/Makefile +++ b/security/identify/Makefile @@ -18,7 +18,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/security/lasso/Makefile b/security/lasso/Makefile --- a/security/lasso/Makefile +++ b/security/lasso/Makefile @@ -36,7 +36,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile --- a/security/libprelude/Makefile +++ b/security/libprelude/Makefile @@ -38,7 +38,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/security/mate-pam-helper/Makefile b/security/mate-pam-helper/Makefile --- a/security/mate-pam-helper/Makefile +++ b/security/mate-pam-helper/Makefile @@ -17,7 +17,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=unused-but-set-variable .endif diff --git a/security/monkeysphere/Makefile b/security/monkeysphere/Makefile --- a/security/monkeysphere/Makefile +++ b/security/monkeysphere/Makefile @@ -37,7 +37,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=strict-prototypes .endif diff --git a/security/nss_compat_ossl/Makefile b/security/nss_compat_ossl/Makefile --- a/security/nss_compat_ossl/Makefile +++ b/security/nss_compat_ossl/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/security/opencryptoki/Makefile b/security/opencryptoki/Makefile --- a/security/opencryptoki/Makefile +++ b/security/opencryptoki/Makefile @@ -47,7 +47,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/security/openvas/Makefile b/security/openvas/Makefile --- a/security/openvas/Makefile +++ b/security/openvas/Makefile @@ -41,7 +41,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=strict-prototypes -Wno-error=unused-but-set-variable -Wno-error=invalid-utf8 .endif diff --git a/security/p5-Authen-SASL-Cyrus/Makefile b/security/p5-Authen-SASL-Cyrus/Makefile --- a/security/p5-Authen-SASL-Cyrus/Makefile +++ b/security/p5-Authen-SASL-Cyrus/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/security/p5-Crypt-OpenSSL-PKCS10/Makefile b/security/p5-Crypt-OpenSSL-PKCS10/Makefile --- a/security/p5-Crypt-OpenSSL-PKCS10/Makefile +++ b/security/p5-Crypt-OpenSSL-PKCS10/Makefile @@ -20,7 +20,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/security/palisade/Makefile b/security/palisade/Makefile --- a/security/palisade/Makefile +++ b/security/palisade/Makefile @@ -50,7 +50,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CXXFLAGS+= -Wno-error=unused-but-set-variable .endif diff --git a/security/pam_ocra/Makefile b/security/pam_ocra/Makefile --- a/security/pam_ocra/Makefile +++ b/security/pam_ocra/Makefile @@ -27,7 +27,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=cast-align .endif diff --git a/security/pecl-crypto/Makefile b/security/pecl-crypto/Makefile --- a/security/pecl-crypto/Makefile +++ b/security/pecl-crypto/Makefile @@ -17,7 +17,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile --- a/security/pidgin-encryption/Makefile +++ b/security/pidgin-encryption/Makefile @@ -35,7 +35,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/security/pks/Makefile b/security/pks/Makefile --- a/security/pks/Makefile +++ b/security/pks/Makefile @@ -34,7 +34,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/security/py-python-axolotl-curve25519/Makefile b/security/py-python-axolotl-curve25519/Makefile --- a/security/py-python-axolotl-curve25519/Makefile +++ b/security/py-python-axolotl-curve25519/Makefile @@ -16,7 +16,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -56,7 +56,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/security/softether-devel/Makefile b/security/softether-devel/Makefile --- a/security/softether-devel/Makefile +++ b/security/softether-devel/Makefile @@ -43,7 +43,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/security/softether/Makefile b/security/softether/Makefile --- a/security/softether/Makefile +++ b/security/softether/Makefile @@ -40,7 +40,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/security/starttls/Makefile b/security/starttls/Makefile --- a/security/starttls/Makefile +++ b/security/starttls/Makefile @@ -18,7 +18,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/security/weggli/Makefile b/security/weggli/Makefile --- a/security/weggli/Makefile +++ b/security/weggli/Makefile @@ -132,7 +132,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} <= 1400091 || ${OSVERSION} >= 1500006 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD && ! (${OSVERSION} > 1400091 && ${OSVERSION} < 1500006) USES+= llvm:16 .endif diff --git a/shells/ast-ksh/Makefile b/shells/ast-ksh/Makefile --- a/shells/ast-ksh/Makefile +++ b/shells/ast-ksh/Makefile @@ -48,7 +48,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/shells/klish/Makefile b/shells/klish/Makefile --- a/shells/klish/Makefile +++ b/shells/klish/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/sysutils/bareos20-server/Makefile b/sysutils/bareos20-server/Makefile --- a/sysutils/bareos20-server/Makefile +++ b/sysutils/bareos20-server/Makefile @@ -235,7 +235,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 .endif diff --git a/sysutils/bareos21-server/Makefile b/sysutils/bareos21-server/Makefile --- a/sysutils/bareos21-server/Makefile +++ b/sysutils/bareos21-server/Makefile @@ -233,7 +233,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 .endif diff --git a/sysutils/bareos22-server/Makefile b/sysutils/bareos22-server/Makefile --- a/sysutils/bareos22-server/Makefile +++ b/sysutils/bareos22-server/Makefile @@ -230,7 +230,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 .endif diff --git a/sysutils/cramfs/Makefile b/sysutils/cramfs/Makefile --- a/sysutils/cramfs/Makefile +++ b/sysutils/cramfs/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile --- a/sysutils/fluent-bit/Makefile +++ b/sysutils/fluent-bit/Makefile @@ -43,8 +43,7 @@ .include -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400079 || (${OSVERSION} >= 1302505 && \ - ${OSVERSION} < 1400000)) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/sysutils/fsc/Makefile b/sysutils/fsc/Makefile --- a/sysutils/fsc/Makefile +++ b/sysutils/fsc/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=unused-but-set-variable .endif diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile --- a/sysutils/ganglia-monitor-core/Makefile +++ b/sysutils/ganglia-monitor-core/Makefile @@ -53,7 +53,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/sysutils/gstopd/Makefile b/sysutils/gstopd/Makefile --- a/sysutils/gstopd/Makefile +++ b/sysutils/gstopd/Makefile @@ -13,7 +13,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=unused-but-set-variable .endif diff --git a/sysutils/incron/Makefile b/sysutils/incron/Makefile --- a/sysutils/incron/Makefile +++ b/sysutils/incron/Makefile @@ -31,7 +31,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD EXTRA_PATCHES= ${FILESDIR}/extra-patch-FreeBSD_14 .endif diff --git a/sysutils/mate-settings-daemon/Makefile b/sysutils/mate-settings-daemon/Makefile --- a/sysutils/mate-settings-daemon/Makefile +++ b/sysutils/mate-settings-daemon/Makefile @@ -74,7 +74,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/sysutils/mtpfs/Makefile b/sysutils/mtpfs/Makefile --- a/sysutils/mtpfs/Makefile +++ b/sysutils/mtpfs/Makefile @@ -27,7 +27,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/sysutils/pmt/Makefile b/sysutils/pmt/Makefile --- a/sysutils/pmt/Makefile +++ b/sysutils/pmt/Makefile @@ -16,7 +16,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=strict-prototypes .endif diff --git a/sysutils/socklog/Makefile b/sysutils/socklog/Makefile --- a/sysutils/socklog/Makefile +++ b/sysutils/socklog/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile --- a/sysutils/zeitgeist/Makefile +++ b/sysutils/zeitgeist/Makefile @@ -48,7 +48,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile --- a/textproc/augeas/Makefile +++ b/textproc/augeas/Makefile @@ -29,7 +29,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+=-Wno-error=int-conversion .endif diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile --- a/textproc/gdome2/Makefile +++ b/textproc/gdome2/Makefile @@ -33,7 +33,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/textproc/jshon/Makefile b/textproc/jshon/Makefile --- a/textproc/jshon/Makefile +++ b/textproc/jshon/Makefile @@ -27,7 +27,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=strict-prototypes .endif diff --git a/textproc/mgdiff/Makefile b/textproc/mgdiff/Makefile --- a/textproc/mgdiff/Makefile +++ b/textproc/mgdiff/Makefile @@ -22,7 +22,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/textproc/p5-Senna/Makefile b/textproc/p5-Senna/Makefile --- a/textproc/p5-Senna/Makefile +++ b/textproc/p5-Senna/Makefile @@ -21,7 +21,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/textproc/p5-XML-Bare/Makefile b/textproc/p5-XML-Bare/Makefile --- a/textproc/p5-XML-Bare/Makefile +++ b/textproc/p5-XML-Bare/Makefile @@ -17,7 +17,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile --- a/textproc/rman/Makefile +++ b/textproc/rman/Makefile @@ -14,7 +14,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile --- a/textproc/sary/Makefile +++ b/textproc/sary/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile --- a/textproc/wv/Makefile +++ b/textproc/wv/Makefile @@ -32,7 +32,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -58,7 +58,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=unused-but-set-variable .endif diff --git a/www/grr/Makefile b/www/grr/Makefile --- a/www/grr/Makefile +++ b/www/grr/Makefile @@ -19,7 +19,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/www/libdatachannel/Makefile b/www/libdatachannel/Makefile --- a/www/libdatachannel/Makefile +++ b/www/libdatachannel/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=unused-but-set-variable \ -Wno-error=strict-prototypes .endif diff --git a/www/libwww/Makefile b/www/libwww/Makefile --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/www/mod_auth_mysql2/Makefile b/www/mod_auth_mysql2/Makefile --- a/www/mod_auth_mysql2/Makefile +++ b/www/mod_auth_mysql2/Makefile @@ -28,7 +28,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD AP_EXTRAS+= '-Wc, -Wno-error=int-conversion' .endif diff --git a/www/newsboat/Makefile b/www/newsboat/Makefile --- a/www/newsboat/Makefile +++ b/www/newsboat/Makefile @@ -40,8 +40,7 @@ .include -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400091 || (${OSVERSION} >= 1302507 && \ - ${OSVERSION} < 1400000)) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile --- a/www/nghttp2/Makefile +++ b/www/nghttp2/Makefile @@ -57,10 +57,6 @@ .include -.if ${OSREL} == 14.0 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-compatibility-fix -.endif - post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/ ${INSTALL_DATA} ${FILESDIR}/nghttpx.conf.sample ${STAGEDIR}${PREFIX}/etc/nghttpx/nghttpx.conf.sample diff --git a/www/nghttp2/files/extra-patch-compatibility-fix b/www/nghttp2/files/extra-patch-compatibility-fix deleted file mode 100644 --- a/www/nghttp2/files/extra-patch-compatibility-fix +++ /dev/null @@ -1,11 +0,0 @@ ---- src/template.h.orig 2024-06-08 10:06:50 UTC -+++ src/template.h -@@ -444,7 +444,7 @@ inline constexpr bool operator==(const StringRef &lhs, - std::equal(std::begin(lhs), std::end(lhs), std::begin(rhs)); - } - --#ifndef __APPLE__ -+#ifndef __FreeBSD__ - inline constexpr std::strong_ordering - operator<=>(const StringRef &lhs, const StringRef &rhs) noexcept { - return std::lexicographical_compare_three_way(std::begin(lhs), std::end(lhs), diff --git a/www/p5-CGI-SpeedyCGI/Makefile b/www/p5-CGI-SpeedyCGI/Makefile --- a/www/p5-CGI-SpeedyCGI/Makefile +++ b/www/p5-CGI-SpeedyCGI/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/www/p5-HTTP-MHTTP/Makefile b/www/p5-HTTP-MHTTP/Makefile --- a/www/p5-HTTP-MHTTP/Makefile +++ b/www/p5-HTTP-MHTTP/Makefile @@ -22,7 +22,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/www/sogo/Makefile b/www/sogo/Makefile --- a/www/sogo/Makefile +++ b/www/sogo/Makefile @@ -59,11 +59,11 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -CPPFLAGS+= -Wno-error=int-conversion +.if ${OPSYS} == FreeBSD +CPPFLAGS+= -Wno-error=int-conversion .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/www/wget2/Makefile b/www/wget2/Makefile --- a/www/wget2/Makefile +++ b/www/wget2/Makefile @@ -110,7 +110,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/x11-toolkits/aquamarine/Makefile b/x11-toolkits/aquamarine/Makefile --- a/x11-toolkits/aquamarine/Makefile +++ b/x11-toolkits/aquamarine/Makefile @@ -30,11 +30,6 @@ GH_ACCOUNT= hyprwm PLIST_SUB= VERSION=${DISTVERSION:C/-.*//} -# XXX Drop after FreeBSD 14.0 EOL around 2024-10-01 -.if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) -CXXFLAGS+= -fexperimental-library -.endif - # XXX Drop after FreeBSD 13.4 EOL around 2026-01-31 # https://cgit.freebsd.org/src/commit/?id=af93fea71038 .if !exists(/usr/include/sys/timerfd.h) diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile --- a/x11-toolkits/blt/Makefile +++ b/x11-toolkits/blt/Makefile @@ -47,7 +47,7 @@ CFLAGS+= -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/x11-toolkits/granite/Makefile b/x11-toolkits/granite/Makefile --- a/x11-toolkits/granite/Makefile +++ b/x11-toolkits/granite/Makefile @@ -26,7 +26,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile --- a/x11-toolkits/itk/Makefile +++ b/x11-toolkits/itk/Makefile @@ -31,7 +31,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile --- a/x11-toolkits/rep-gtk2/Makefile +++ b/x11-toolkits/rep-gtk2/Makefile @@ -29,7 +29,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile --- a/x11-toolkits/swt/Makefile +++ b/x11-toolkits/swt/Makefile @@ -52,7 +52,7 @@ @${CP} ${FILESDIR}/*.css ${WRKSRC}/org/eclipse/swt/internal/gtk/ post-patch: -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD ${REINPLACE_CMD} -e 's|-DGTK|-DGTK -Wno-error=deprecated-non-prototype|g' \ ${WRKSRC}/make_freebsd.mak .endif diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile --- a/x11-toolkits/tix/Makefile +++ b/x11-toolkits/tix/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/x11-toolkits/tktable/Makefile b/x11-toolkits/tktable/Makefile --- a/x11-toolkits/tktable/Makefile +++ b/x11-toolkits/tktable/Makefile @@ -22,7 +22,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile --- a/x11-toolkits/xbae/Makefile +++ b/x11-toolkits/xbae/Makefile @@ -24,7 +24,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile --- a/x11-toolkits/xmhtml/Makefile +++ b/x11-toolkits/xmhtml/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -70,7 +70,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/x11-wm/euclid-wm/Makefile b/x11-wm/euclid-wm/Makefile --- a/x11-wm/euclid-wm/Makefile +++ b/x11-wm/euclid-wm/Makefile @@ -42,7 +42,7 @@ .include post-patch: -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD @${REINPLACE_CMD} -e 's|^CFLAGS = |CFLAGS = -Wno-error=int-conversion |g' \ ${WRKSRC}/Makefile .endif diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -39,11 +39,6 @@ # Generated by "make update-hash" for commit_pins in hyprpm.toml GH_HASH= 0f594732b063a90d44df8c5d402d658f27471dfe -# XXX Drop after FreeBSD 14.0 EOL around 2024-10-01 -.if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) -CXXFLAGS+= -fexperimental-library -.endif - # XXX Drop after FreeBSD 13.4 EOL around 2026-01-31 # https://cgit.freebsd.org/src/commit/?id=af93fea71038 .if !exists(/usr/include/sys/timerfd.h) diff --git a/x11-wm/hyprland/files/patch-libc++16 b/x11-wm/hyprland/files/patch-libc++16 deleted file mode 100644 --- a/x11-wm/hyprland/files/patch-libc++16 +++ /dev/null @@ -1,35 +0,0 @@ -Drop after FreeBSD 14.0 EOL around 2024-09-30 - -In file included from ../src/pch/pch.hpp:1: -In file included from ../src/Compositor.hpp:7: -In file included from ../src/defines.hpp:2: -../src/debug/Log.hpp:58:35: error: call to consteval function 'std::basic_format_string>> &>::basic_format_string' is not a constant expression - logMsg += std::format("[{}] ", hms); - ^ -/usr/include/c++/v1/__format/format_functions.h:341:46: note: initializer of '__types_' is not a constant expression - _Context{__types_.data(), __handles_.data(), sizeof...(_Args)}); - ^ -../src/debug/Log.hpp:58:35: note: in call to 'basic_format_string("[{}] ")' - logMsg += std::format("[{}] ", hms); - ^ -/usr/include/c++/v1/__format/format_functions.h:353:63: note: declared here - static constexpr array<__format::__arg_t, sizeof...(_Args)> __types_{ - ^ - ---- src/debug/Log.hpp.orig 2024-08-30 15:37:52 UTC -+++ src/debug/Log.hpp -@@ -58,11 +58,12 @@ namespace Debug { - static auto current_zone = std::chrono::current_zone(); - const auto zt = std::chrono::zoned_time{current_zone, std::chrono::system_clock::now()}; - const auto hms = std::chrono::hh_mm_ss{zt.get_local_time() - std::chrono::floor(zt.get_local_time())}; -+ logMsg += std::format("[{}] ", hms); - #else - // TODO: current clang 17 does not support `zoned_time`, remove this once clang 19 is ready -- const auto hms = std::chrono::hh_mm_ss{std::chrono::system_clock::now() - std::chrono::floor(std::chrono::system_clock::now())}; -+ auto c = std::chrono::hh_mm_ss{std::chrono::system_clock::now() - std::chrono::floor(std::chrono::system_clock::now())}; -+ logMsg += std::format("{:%H}:{:%M}:{:%S}", c.hours(), c.minutes(), c.subseconds()); - #endif -- logMsg += std::format("[{}] ", hms); - } - - // no need for try {} catch {} because std::format_string ensures that vformat never throw std::format_error diff --git a/x11/budgie-desktop/Makefile b/x11/budgie-desktop/Makefile --- a/x11/budgie-desktop/Makefile +++ b/x11/budgie-desktop/Makefile @@ -74,7 +74,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/x11/florence/Makefile b/x11/florence/Makefile --- a/x11/florence/Makefile +++ b/x11/florence/Makefile @@ -37,7 +37,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/x11/hyprcursor/Makefile b/x11/hyprcursor/Makefile --- a/x11/hyprcursor/Makefile +++ b/x11/hyprcursor/Makefile @@ -21,11 +21,6 @@ GH_ACCOUNT= hyprwm PLIST_SUB= VERSION=${DISTVERSION:C/-.*//} -# XXX Drop after FreeBSD 14.0 EOL around 2024-10-01 -.if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) -CXXFLAGS+= -fexperimental-library -.endif - post-patch: # Respect PREFIX for icons @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ diff --git a/x11/hypridle/Makefile b/x11/hypridle/Makefile --- a/x11/hypridle/Makefile +++ b/x11/hypridle/Makefile @@ -22,12 +22,6 @@ PLIST_FILES= bin/${PORTNAME} \ lib/systemd/user/${PORTNAME}.service -# XXX Drop after FreeBSD 14.0 EOL around 2024-10-01 -.if exists(/usr/include/c++/v1/__format/format_functions.h) && \ - !exists(/usr/include/c++/v1/__format/write_escaped.h) -CXXFLAGS+= -fexperimental-library -.endif - post-patch: # https://github.com/ConsoleKit2/ConsoleKit2/issues/150 # https://github.com/ConsoleKit2/ConsoleKit2/issues/151 diff --git a/x11/hyprlock/Makefile b/x11/hyprlock/Makefile --- a/x11/hyprlock/Makefile +++ b/x11/hyprlock/Makefile @@ -28,11 +28,6 @@ PLIST_FILES= bin/${PORTNAME} \ etc/pam.d/${PORTNAME} -# XXX Drop after FreeBSD 14.0 EOL around 2024-10-01 -.if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) -CXXFLAGS+= -fexperimental-library -.endif - # XXX Drop after FreeBSD 13.3 EOL around 2025-07-01 .if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__chrono/time_zone.h) LIB_DEPENDS+= libdate-tz.so:devel/date diff --git a/x11/hyprpaper/Makefile b/x11/hyprpaper/Makefile --- a/x11/hyprpaper/Makefile +++ b/x11/hyprpaper/Makefile @@ -23,11 +23,6 @@ GH_ACCOUNT= hyprwm PLIST_FILES= bin/${PORTNAME} -# XXX Drop after FreeBSD 14.0 EOL around 2024-10-01 -.if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) -CXXFLAGS+= -fexperimental-library -.endif - post-patch: # Extract (snapshot) version from the port instead of Git @${REINPLACE_CMD} -i .nogit -e '/Get git info/,/^include/{//p;d;}' \ diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -71,8 +71,7 @@ .include -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400079 || (${OSVERSION} >= 1302505 && \ - ${OSVERSION} < 1400000)) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=invalid-utf8 -Winvalid-utf8 .endif diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile --- a/x11/libsx/Makefile +++ b/x11/libsx/Makefile @@ -20,7 +20,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -53,7 +53,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile --- a/x11/xdg-desktop-portal-hyprland/Makefile +++ b/x11/xdg-desktop-portal-hyprland/Makefile @@ -33,9 +33,4 @@ share/dbus-1/services/org.freedesktop.impl.portal.desktop.hyprland.service \ share/xdg-desktop-portal/portals/hyprland.portal -# XXX Drop after FreeBSD 14.0 EOL around 2024-10-01 -.if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) -CXXFLAGS+= -fexperimental-library -.endif - .include diff --git a/x11/xskyroot/Makefile b/x11/xskyroot/Makefile --- a/x11/xskyroot/Makefile +++ b/x11/xskyroot/Makefile @@ -25,7 +25,7 @@ .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif