diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2024-08-11 11:01:29 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2024-10-01 18:56:20 +0000 |
| commit | 4485bd8221c2c5630b87826d37da850b3361b782 (patch) | |
| tree | 8d8c431f691b093caa563a871231d1269047ea42 | |
| parent | d5d82c5ff9a1069d6e0382029cc8f99d324c9e0b (diff) | |
| download | ports-4485bd8221c2c5630b87826d37da850b3361b782.tar.gz ports-4485bd8221c2c5630b87826d37da850b3361b782.zip | |
all: drop support for expired FreeBSD 14.0
Simplify expressions for FreeBSD 13.X
Reviewed by: many
Differential Revision: https://reviews.freebsd.org/D46601
395 files changed, 381 insertions, 642 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 84af28f9ee9d..110506bc9121 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1179,7 +1179,7 @@ OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC . 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 index f721a8765c92..5a100082ad98 100644 --- a/accessibility/caribou/Makefile +++ b/accessibility/caribou/Makefile @@ -38,7 +38,7 @@ GLIB_SCHEMAS= org.gnome.caribou.gschema.xml \ .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index c69cabe4b257..713980621bac 100644 --- a/archivers/dzip/Makefile +++ b/archivers/dzip/Makefile @@ -26,7 +26,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 42a7eea7d7e5..0c6d09f8b7b8 100644 --- a/archivers/py-lzma/Makefile +++ b/archivers/py-lzma/Makefile @@ -33,8 +33,8 @@ post-install: .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -CFLAGS+= -Wno-error=int-conversion +.if ${OPSYS} == FreeBSD +CFLAGS+= -Wno-error=int-conversion .endif .include <bsd.port.post.mk> diff --git a/archivers/squsq/Makefile b/archivers/squsq/Makefile index 6f13ec854f2b..2a0a30b688a5 100644 --- a/archivers/squsq/Makefile +++ b/archivers/squsq/Makefile @@ -25,7 +25,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/archivers/unalz/Makefile b/archivers/unalz/Makefile index 1550454b9cc4..0cf5e4752195 100644 --- a/archivers/unalz/Makefile +++ b/archivers/unalz/Makefile @@ -26,8 +26,8 @@ UNALZ_OBJS= main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o \ .include <bsd.port.options.mk> -.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 index 132740400557..fa06183322eb 100644 --- a/astro/foxtrotgps/Makefile +++ b/astro/foxtrotgps/Makefile @@ -39,7 +39,7 @@ INFO= foxtrotgps .include <bsd.port.pre.mk> -.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 index 6fe0a3201158..2d5b1b93c3dd 100644 --- a/audio/cardinal/Makefile +++ b/audio/cardinal/Makefile @@ -61,7 +61,7 @@ LTO_BROKEN= Fails to build with LTO because it is gcc-centered .include <bsd.port.options.mk> # 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 index 26e151718288..402b95f3ca68 100644 --- a/audio/dssi/Makefile +++ b/audio/dssi/Makefile @@ -39,7 +39,7 @@ OPTIONS_SUB= yes .include <bsd.port.options.mk> -.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 index 1b6d7f673f3f..f6799c1a96c5 100644 --- a/audio/espressivo-lv2/Makefile +++ b/audio/espressivo-lv2/Makefile @@ -26,7 +26,7 @@ PLIST_FILES= lib/lv2/espressivo.lv2/espressivo.so \ .include <bsd.port.pre.mk> -.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 index 70b38e5e08cf..47c0d9d8f5b2 100644 --- a/audio/eteroj-lv2/Makefile +++ b/audio/eteroj-lv2/Makefile @@ -28,7 +28,7 @@ PLIST_FILES= lib/lv2/eteroj.lv2/eteroj.so \ .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${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 index 2a9cb235ff2a..e80b6e361806 100644 --- a/audio/fluida-lv2/Makefile +++ b/audio/fluida-lv2/Makefile @@ -33,7 +33,7 @@ PLIST_FILES= lib/lv2/Fluida.lv2/Fluida.so \ .include <bsd.port.options.mk> -.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 index 8dc9cfc00367..ca17155c1577 100644 --- a/audio/fluidplug-lv2/Makefile +++ b/audio/fluidplug-lv2/Makefile @@ -28,7 +28,7 @@ SSE_MAKE_ARGS= PORT_SIMD_FLAGS="-mtune=generic -msse -msse2 -mfpmath=sse" .include <bsd.port.options.mk> -.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 index 31aecbf401e0..7cd175edf2f3 100644 --- a/audio/gstreamer1-plugins-sndio/Makefile +++ b/audio/gstreamer1-plugins-sndio/Makefile @@ -21,7 +21,7 @@ PLIST_FILES= lib/gstreamer-1.0/libgstsndio.so .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 7a30bbbe398a..7c224936fde9 100644 --- a/audio/lv2proc/Makefile +++ b/audio/lv2proc/Makefile @@ -26,7 +26,7 @@ PLIST_FILES= bin/lv2proc \ .include <bsd.port.options.mk> -.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 index b7c76d62c4ac..4203c59d66ed 100644 --- a/audio/mpdcon/Makefile +++ b/audio/mpdcon/Makefile @@ -20,7 +20,7 @@ USE_GNUSTEP= base gui back build .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index c41d0772cf4e..f21d1ac346f6 100644 --- a/audio/orbit-lv2/Makefile +++ b/audio/orbit-lv2/Makefile @@ -26,7 +26,7 @@ GL_TAGNAME= f4aa620fc8d77418856581a6a955192af15b3860 .include <bsd.port.pre.mk> -.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 index 6d64c1f67a4b..c661c337bcc3 100644 --- a/audio/psindustrializer/Makefile +++ b/audio/psindustrializer/Makefile @@ -43,7 +43,7 @@ PULSE_LIB_DEPENDS= libpulse.so:audio/pulseaudio .include <bsd.port.options.mk> -.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 index 5b83245e86e7..2c2df3720975 100644 --- a/audio/sherlock-lv2/Makefile +++ b/audio/sherlock-lv2/Makefile @@ -24,7 +24,7 @@ USE_GL= gl glew glu .include <bsd.port.pre.mk> -.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 index bdad31f72fca..22f40b45ce57 100644 --- a/audio/snack/Makefile +++ b/audio/snack/Makefile @@ -37,7 +37,7 @@ VORBIS_ALL_TARGET= all libsnackogg.so .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index e94eadcdf1c6..0059d04f4f8b 100644 --- a/audio/surge-synthesizer-xt-lv2/Makefile +++ b/audio/surge-synthesizer-xt-lv2/Makefile @@ -89,7 +89,7 @@ CMAKE_ARGS+= -DARM_NATIVE=native # based on https://github.com/surge-synthesizer .include <bsd.port.pre.mk> 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 index 4e27018796ab..4f9cb539debc 100644 --- a/audio/vm-lv2/Makefile +++ b/audio/vm-lv2/Makefile @@ -26,7 +26,7 @@ USE_XORG= x11 xext .include <bsd.port.options.mk> -.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 index 893f229473d5..9a288330ee7a 100644 --- a/audio/xmcd/Makefile +++ b/audio/xmcd/Makefile @@ -27,7 +27,7 @@ LIBBINDIR= ${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-${OPSYS}_${OSREL:R:R}-${ARCH:S/ .include <bsd.port.options.mk> -.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 index 8e49baf2534b..ea4a99d8b358 100644 --- a/benchmarks/siege/Makefile +++ b/benchmarks/siege/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= PERL="${PERL}" .include <bsd.port.options.mk> -.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 index ae94903ff390..9f4072a59815 100644 --- a/biology/abyss/Makefile +++ b/biology/abyss/Makefile @@ -45,7 +45,7 @@ PORTSCOUT= limit:^[0-9\.]*$$ # to ignore alpha-numeric tags .include <bsd.port.pre.mk> -.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 index 5cebf5bcfbe0..7fee76878a74 100644 --- a/biology/biosig/Makefile +++ b/biology/biosig/Makefile @@ -30,7 +30,7 @@ LDFLAGS+= -liconv .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/biology/mothur/Makefile b/biology/mothur/Makefile index 6c7d3f28d684..4799fb9cd6e8 100644 --- a/biology/mothur/Makefile +++ b/biology/mothur/Makefile @@ -26,7 +26,7 @@ PLIST_FILES= bin/${PORTNAME} .include <bsd.port.options.mk> -.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 index 7580e6a47537..5dfe289470cf 100644 --- a/biology/ncbi-toolkit/Makefile +++ b/biology/ncbi-toolkit/Makefile @@ -33,12 +33,10 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index ec911f6763be..ae7250600976 100644 --- a/biology/wise/Makefile +++ b/biology/wise/Makefile @@ -47,12 +47,10 @@ DATAFILES= BLOSUM30.bla BLOSUM45.bla BLOSUM62.bla BLOSUM80.bla aa.rnd \ .include <bsd.port.pre.mk> -.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 index 20d14bef6f5d..d74135017aa9 100644 --- a/cad/brlcad/Makefile +++ b/cad/brlcad/Makefile @@ -42,7 +42,7 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} .include <bsd.port.options.mk> -.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 index 5b7c849793d6..c495307f6d95 100644 --- a/cad/calculix/Makefile +++ b/cad/calculix/Makefile @@ -41,7 +41,7 @@ PSVIEWER?= gv .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD USES+= llvm:max=15 .endif @@ -50,7 +50,7 @@ FFLAGS+= -fpic .include <bsd.port.pre.mk> -.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 index f5c593f45fd5..23c64358cd39 100644 --- a/cad/electric/Makefile +++ b/cad/electric/Makefile @@ -31,7 +31,7 @@ OPTIMIZED_CFLAGS_VARS= FEATURES+=OPT .include <bsd.port.options.mk> -.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 index fa1460c3c08a..4c306e162286 100644 --- a/cad/ldview/Makefile +++ b/cad/ldview/Makefile @@ -36,7 +36,7 @@ WRKSRC_SUBDIR= QT 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 index 4f49578cfd34..2d2c089bb03f 100644 --- a/cad/magic/Makefile +++ b/cad/magic/Makefile @@ -36,7 +36,7 @@ BINARY_ALIAS= python3=${PYTHON_CMD} # this is needed, see https://github.com/RTi .include <bsd.port.pre.mk> -.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 index dfbda1481c27..0b8b2742b02b 100644 --- a/cad/oregano/Makefile +++ b/cad/oregano/Makefile @@ -27,7 +27,7 @@ GLIB_SCHEMAS= io.ahoi.oregano.gschema.xml .include <bsd.port.options.mk> -.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 index f9c55c9cee82..73b9bc26f9f0 100644 --- a/cad/spice/Makefile +++ b/cad/spice/Makefile @@ -55,7 +55,7 @@ DEV_HISIM2_LICENSE= HISIML .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/cad/tochnog/Makefile b/cad/tochnog/Makefile index ea34dc05bd21..b604fd698529 100644 --- a/cad/tochnog/Makefile +++ b/cad/tochnog/Makefile @@ -46,7 +46,7 @@ ALL_TARGET= freebsd_old 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 index 484be8f64773..0ebed893f1e8 100644 --- a/cad/z88/Makefile +++ b/cad/z88/Makefile @@ -35,7 +35,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES .include <bsd.port.options.mk> -.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 index ab0920d126db..8aed3e03c0f5 100644 --- a/comms/bladerf/Makefile +++ b/comms/bladerf/Makefile @@ -18,8 +18,8 @@ GH_TUPLE= analogdevicesinc:no-OS:0bba46e:x/thirdparty/analogdevicesinc/no-OS .include <bsd.port.pre.mk> -.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 <bsd.port.post.mk> diff --git a/comms/libfap/Makefile b/comms/libfap/Makefile index 3f4d38673423..ba04f7e82e52 100644 --- a/comms/libfap/Makefile +++ b/comms/libfap/Makefile @@ -21,7 +21,7 @@ INSTALL_TARGET= install-strip .include <bsd.port.pre.mk> -.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 index 37addea949fe..0e62a6bd4ccf 100644 --- a/comms/qico/Makefile +++ b/comms/qico/Makefile @@ -52,7 +52,7 @@ QCC_CONFIGURE_OFF=--disable-qcc .include <bsd.port.options.mk> -.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 index 6ccbf07d725d..322495c4f00b 100644 --- a/comms/rubygem-serialport/Makefile +++ b/comms/rubygem-serialport/Makefile @@ -15,7 +15,7 @@ SHEBANG_FILES= test/set_readtimeout.rb .include <bsd.port.options.mk> 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 index 20bc139897bd..9239936beeb6 100644 --- a/comms/uird/Makefile +++ b/comms/uird/Makefile @@ -21,7 +21,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 0a7fe7f9d2ba..d5db02eca4de 100644 --- a/comms/xlog/Makefile +++ b/comms/xlog/Makefile @@ -36,7 +36,7 @@ NLS_CONFIGURE_OFF= --disable-nls .include <bsd.port.pre.mk> -.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 index 9e9d38155030..14a46060fb44 100644 --- a/converters/aish/Makefile +++ b/converters/aish/Makefile @@ -16,7 +16,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index 1ba207f28b93..de7f36b87981 100644 --- a/converters/cocot/Makefile +++ b/converters/cocot/Makefile @@ -20,7 +20,7 @@ PLIST_FILES= bin/cocot ${DOCSDIR}/ja/README.ja .include <bsd.port.options.mk> -.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 index 657eefa00c67..d47cb7ac6c08 100644 --- a/converters/ish/Makefile +++ b/converters/ish/Makefile @@ -18,7 +18,7 @@ PLIST_FILES= bin/ish .include <bsd.port.pre.mk> -.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 index 1d31e56f9d9a..85b4df68139e 100644 --- a/converters/ta2as/Makefile +++ b/converters/ta2as/Makefile @@ -23,7 +23,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.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 index 2132c798d8af..fd48acca1cb9 100644 --- a/converters/wkhtmltopdf/Makefile +++ b/converters/wkhtmltopdf/Makefile @@ -71,7 +71,7 @@ post-patch: ${ECHO} 'LIBS+= -lcrypto' >>${WRKSRC}/src/pdf/pdf.pro ${MKDIR} ${WRKSRC}/build/app ${WRKSRC}/build/qt \ ${WRKSRC}/build/wkhtmltox -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index ae4bff669513..76c5501f262a 100644 --- a/converters/xdeview/Makefile +++ b/converters/xdeview/Makefile @@ -35,7 +35,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 464b646d8e96..38ce0a4a706c 100644 --- a/databases/clickhouse/Makefile +++ b/databases/clickhouse/Makefile @@ -229,7 +229,7 @@ TEST_CMAKE_BOOL= ENABLE_TESTS .include <bsd.port.options.mk> -.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 index f10317737485..506ba2a234b8 100644 --- a/databases/libgda5/Makefile +++ b/databases/libgda5/Makefile @@ -99,7 +99,7 @@ CFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd 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 index fb5b76fc2d31..000000000000 --- 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 index fa6d3e9c304f..b4332e3d564e 100644 --- a/databases/mdcached/Makefile +++ b/databases/mdcached/Makefile @@ -21,7 +21,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index 27a4d5bdb189..b3f360cfa54b 100644 --- a/databases/nanodbc/Makefile +++ b/databases/nanodbc/Makefile @@ -24,7 +24,7 @@ CMAKE_TESTING_ARGS= -DNANODBC_DISABLE_TESTS=OFF # many tests fail: Data source n .include <bsd.port.options.mk> -.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 index c7dd922b2e9b..d3404569b8e8 100644 --- a/databases/p5-DBD-InterBase/Makefile +++ b/databases/p5-DBD-InterBase/Makefile @@ -19,7 +19,7 @@ USE_PERL5= patch configure .include <bsd.port.options.mk> -.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 index 80ca682db0de..c53d0cdbb6cb 100644 --- a/databases/p5-Memcached-libmemcached/Makefile +++ b/databases/p5-Memcached-libmemcached/Makefile @@ -20,7 +20,7 @@ USE_LDCONFIG= yes .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${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 index d4459c17e4a8..9cca509cf346 100644 --- a/databases/pgpool-II-41/Makefile +++ b/databases/pgpool-II-41/Makefile @@ -41,7 +41,7 @@ SSL_CONFIGURE_WITH= openssl .include <bsd.port.options.mk> -.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 index a623ddc98918..a5c6b9ccef35 100644 --- a/databases/pgpool-II-42/Makefile +++ b/databases/pgpool-II-42/Makefile @@ -41,7 +41,7 @@ SSL_CONFIGURE_WITH= openssl .include <bsd.port.options.mk> -.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 index 4db4f963baee..356b2b26775c 100644 --- a/databases/pgpool-II-43/Makefile +++ b/databases/pgpool-II-43/Makefile @@ -38,7 +38,7 @@ SSL_CONFIGURE_WITH= openssl .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile index 035e8398db3c..eb0724139fa4 100644 --- a/databases/pxlib/Makefile +++ b/databases/pxlib/Makefile @@ -30,7 +30,7 @@ NLS_CONFIGURE_OFF= --disable-nls .include <bsd.port.options.mk> -.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 index 450162745b85..3d3b4e96016f 100644 --- a/databases/py-postgresql/Makefile +++ b/databases/py-postgresql/Makefile @@ -17,7 +17,7 @@ USE_PYTHON= distutils autoplist .include <bsd.port.pre.mk> -.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 index 34fddee3a907..b22fb8d42668 100644 --- a/databases/ruby-tokyocabinet/Makefile +++ b/databases/ruby-tokyocabinet/Makefile @@ -25,7 +25,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 0678296a74c5..6c0416a19613 100644 --- a/deskutils/cairo-dock-plugins/Makefile +++ b/deskutils/cairo-dock-plugins/Makefile @@ -97,8 +97,7 @@ ICONS_PACKAGE= cairo-dock-plugins-png-icons .include <bsd.port.options.mk> -.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 index 7341a0457349..3e4f590e68e7 100644 --- a/deskutils/gtimer/Makefile +++ b/deskutils/gtimer/Makefile @@ -23,7 +23,7 @@ LIBS+= -lX11 .include <bsd.port.options.mk> -.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 index a0bb761a7db7..d20a90e721a7 100644 --- a/deskutils/helpviewer/Makefile +++ b/deskutils/helpviewer/Makefile @@ -16,7 +16,7 @@ USE_GNUSTEP= back build .include <bsd.port.options.mk> -.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 index c81c2a006e58..3a8fe4663c38 100644 --- a/devel/boost-all/compiled.mk +++ b/devel/boost-all/compiled.mk @@ -45,8 +45,6 @@ MAKE_ARGS+= pch=off .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 index 34abe110d84d..305b59a453b1 100644 --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -17,8 +17,8 @@ BUILD_DEPENDS+= bjam:devel/boost-jam # 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 index 929a7b7f96ca..78444c587a9f 100644 --- a/devel/criterion/Makefile +++ b/devel/criterion/Makefile @@ -40,7 +40,7 @@ MESON_ARGS= -Dtests=false -Dsamples=false .include <bsd.port.options.mk> -.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 index 5cda8e795498..909bb688819b 100644 --- a/devel/csmith/Makefile +++ b/devel/csmith/Makefile @@ -27,7 +27,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Wno-error=enum-constexpr-conversion .endif diff --git a/devel/darts/Makefile b/devel/darts/Makefile index 2eeb3dc0b4dc..ff1928d92ee3 100644 --- a/devel/darts/Makefile +++ b/devel/darts/Makefile @@ -27,7 +27,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CPPFLAGS+= -Dregister= .endif diff --git a/devel/flatbuffers205/Makefile b/devel/flatbuffers205/Makefile index 514f362243db..cb61a79e14a7 100644 --- a/devel/flatbuffers205/Makefile +++ b/devel/flatbuffers205/Makefile @@ -26,7 +26,7 @@ BINARY_ALIAS= git=false python3=${PYTHON_CMD} .include <bsd.port.options.mk> -.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 index 6463c08f4515..95875f718366 100644 --- a/devel/frink/Makefile +++ b/devel/frink/Makefile @@ -23,7 +23,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${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 index 83bf33e8a1fe..c2f7caf584f9 100644 --- a/devel/gcc-arm-embedded/Makefile +++ b/devel/gcc-arm-embedded/Makefile @@ -101,7 +101,7 @@ VAR_TO_SUBMAKE_NOEXPAND= CONFIGURE_ENV MAKE_ENV #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 index 2a74e6f32bec..fa2e68724683 100644 --- a/devel/gcc-arm-embedded/files/Makefile +++ b/devel/gcc-arm-embedded/files/Makefile @@ -19,7 +19,7 @@ WORLD_LIB=${LOCALBASE} 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 index d7874e93c0f5..2557914763ba 100644 --- a/devel/gcc-msp430-ti-toolchain/Makefile +++ b/devel/gcc-msp430-ti-toolchain/Makefile @@ -91,11 +91,11 @@ CONFIGURE_ARGS_COMMON= --prefix=${INTERIM_PREFIX} \ .include <bsd.port.pre.mk> -.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 index d5ec7e389717..bfc2b1801539 100644 --- a/devel/genht/Makefile +++ b/devel/genht/Makefile @@ -22,7 +22,7 @@ OPTIONS_DEFINE= EXAMPLES .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index f0e362bba796..dc4746f2e13e 100644 --- a/devel/gorm/Makefile +++ b/devel/gorm/Makefile @@ -21,7 +21,7 @@ DEFAULT_LIBVERSION= 1.1.0 .include <bsd.port.options.mk> -.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 index 1c5ba4dc7cae..998ee07fc7f1 100644 --- a/devel/hyprlang/Makefile +++ b/devel/hyprlang/Makefile @@ -20,9 +20,4 @@ PLIST_FILES= include/${PORTNAME}.hpp \ 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 <bsd.port.mk> diff --git a/devel/hyprutils/Makefile b/devel/hyprutils/Makefile index ada79f760735..9af3a5c2d4ad 100644 --- a/devel/hyprutils/Makefile +++ b/devel/hyprutils/Makefile @@ -17,11 +17,6 @@ USE_XORG= pixman 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 index 077ff1ba0c83..b589d17f5b43 100644 --- a/devel/hyprwayland-scanner/Makefile +++ b/devel/hyprwayland-scanner/Makefile @@ -20,10 +20,4 @@ PLIST_FILES= bin/${PORTNAME} \ 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 <bsd.port.mk> diff --git a/devel/leatherman/Makefile b/devel/leatherman/Makefile index 547e0eb3d4cf..c21045dabad4 100644 --- a/devel/leatherman/Makefile +++ b/devel/leatherman/Makefile @@ -29,7 +29,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} post-configure: # This file is vendored in vendor/Catch-1.10.0.zip and extracted at configure step ${SED} -i '' -e '1s|\(.*\)|#include <sys/signal.h>\n\1|' ${CONFIGURE_WRKSRC}/src/Catch-1.10.0/single_include/catch.hpp -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${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 index 5083ac46b608..afeb92bae3ae 100644 --- a/devel/libafterbase/Makefile +++ b/devel/libafterbase/Makefile @@ -20,7 +20,7 @@ PLIST_SUB= STATIC="@comment " .include <bsd.port.pre.mk> -.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 index 365994d2f5d0..7437faeb47f6 100644 --- a/devel/libepp-nicbr/Makefile +++ b/devel/libepp-nicbr/Makefile @@ -35,7 +35,7 @@ READLINE_CONFIGURE_ENV_OFF=\ .include <bsd.port.options.mk> -.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 index d6ebd45b0331..c4c383a5e5eb 100644 --- a/devel/libfortuna/Makefile +++ b/devel/libfortuna/Makefile @@ -16,7 +16,7 @@ GH_TAGNAME= 11cbd88 .include <bsd.port.pre.mk> -.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 index 5a8a5d77ae36..e177b983fb13 100644 --- a/devel/libgee06/Makefile +++ b/devel/libgee06/Makefile @@ -21,7 +21,7 @@ INSTALL_TARGET= install-strip .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 0d1a61487adf..20da37d8e529 100644 --- a/devel/libs11n/Makefile +++ b/devel/libs11n/Makefile @@ -21,7 +21,7 @@ WRKSRC_SUBDIR= src .include <bsd.port.pre.mk> -.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 index 05a5f9d03b8c..d6116671b226 100644 --- a/devel/libshbuf/Makefile +++ b/devel/libshbuf/Makefile @@ -21,7 +21,7 @@ CFLAGS+= -D_WANT_SEMUN .include <bsd.port.options.mk> -.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 index 2c22276ee129..ad9ba1e9b4ef 100644 --- a/devel/libtecla/Makefile +++ b/devel/libtecla/Makefile @@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} .include <bsd.port.pre.mk> -.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 index 668dc90ca3d1..0fee566fcf5c 100644 --- a/devel/libx86/Makefile +++ b/devel/libx86/Makefile @@ -24,7 +24,7 @@ PLIST_FILES= include/libx86.h lib/libx86.a lib/libx86.so lib/libx86.so.1 .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index a8ce5374e6b5..c46aed24fc72 100644 --- a/devel/mpatrol/Makefile +++ b/devel/mpatrol/Makefile @@ -45,7 +45,7 @@ OPTIONS_DEFINE= DOCS CFLAGS+= -DENVIRON=\"ENVIRON_64\" -DMP_INIT_SUPPORT=0 .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 3f2aaf27170c..a3a924994c0f 100644 --- a/devel/pecl-yac/Makefile +++ b/devel/pecl-yac/Makefile @@ -18,7 +18,7 @@ MSGPACK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-m .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index b63a72976b24..47cd5ca2c5b1 100644 --- a/devel/pickle/Makefile +++ b/devel/pickle/Makefile @@ -36,7 +36,7 @@ BIN_SYMLINKS= bin/n14 \ .include <bsd.port.options.mk> -.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 index 92a499896e17..e7a5b5aad656 100644 --- a/devel/py-ctags/Makefile +++ b/devel/py-ctags/Makefile @@ -17,7 +17,7 @@ USE_PYTHON= distutils autoplist .include <bsd.port.pre.mk> -.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 index 25af624e2344..644f0d586c9b 100644 --- a/devel/py-donut-shellcode/Makefile +++ b/devel/py-donut-shellcode/Makefile @@ -18,7 +18,7 @@ DOS2UNIX_GLOB= *.py .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index d145fc8ca96c..105fac740597 100644 --- a/devel/py-fam/Makefile +++ b/devel/py-fam/Makefile @@ -18,12 +18,10 @@ USE_PYTHON= distutils autoplist .include <bsd.port.options.mk> -.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 index 563b82739a31..e3995fdffb6e 100644 --- a/devel/py-rchitect/Makefile +++ b/devel/py-rchitect/Makefile @@ -20,7 +20,7 @@ USE_PYTHON= distutils autoplist .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${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 index 4ca00145d8f5..38cf754dcaaa 100644 --- a/devel/replay/Makefile +++ b/devel/replay/Makefile @@ -14,7 +14,7 @@ PLIST_FILES= bin/replay .include <bsd.port.options.mk> -.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 index 828716b62451..29480a41080b 100644 --- a/devel/root/Makefile +++ b/devel/root/Makefile @@ -209,13 +209,6 @@ PLIST_SUB+= NOT_INSTALLED_ON_AARCH64="@comment " ONLY_INSTALLED_ON_AARCH64="" 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 index ce00fb6a2ef9..2ebc115408df 100644 --- a/devel/root/pkg-plist +++ b/devel/root/pkg-plist @@ -3917,7 +3917,6 @@ lib/root/libvectorDict.so.%%SHLIB_SHVER%% 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 index 1087f9b43b9e..151aebcf81cb 100644 --- a/devel/ruby-subversion/Makefile +++ b/devel/ruby-subversion/Makefile @@ -27,7 +27,7 @@ INSTALL_TARGET= install-swig-rb 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 index be5047127d6c..a95a7b5cd079 100644 --- a/devel/rubygem-cbor/Makefile +++ b/devel/rubygem-cbor/Makefile @@ -13,7 +13,7 @@ USES= gem .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index f916f7c6fee7..eaf52ffc5f20 100644 --- a/devel/rubygem-curses/Makefile +++ b/devel/rubygem-curses/Makefile @@ -14,7 +14,7 @@ USES= gem ncurses .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 100da1ec9029..e77bb3404a06 100644 --- a/devel/rubygem-mmap2/Makefile +++ b/devel/rubygem-mmap2/Makefile @@ -14,7 +14,7 @@ USES= gem .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index c792a4262dfa..1a0d8dad81d6 100644 --- a/devel/rubygem-prometheus-client-mmap/Makefile +++ b/devel/rubygem-prometheus-client-mmap/Makefile @@ -34,7 +34,7 @@ post-extract: .include <bsd.port.options.mk> -.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 index cf7f2d6bb582..a22b8502cbaf 100644 --- a/devel/sope/Makefile +++ b/devel/sope/Makefile @@ -45,7 +45,7 @@ PGSQL_USES= pgsql .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index aa70d82beba5..1b7abfcdc6a9 100644 --- a/devel/sope2/Makefile +++ b/devel/sope2/Makefile @@ -41,7 +41,7 @@ MEMCACHED_RUN_DEPENDS= ${LOCALBASE}/bin/memcached:databases/memcached .include <bsd.port.options.mk> -.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 index 4a3bc2de695d..6e79370fd9a8 100644 --- a/devel/tcltls/Makefile +++ b/devel/tcltls/Makefile @@ -33,7 +33,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.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 index 11b4a20c2069..4add6aa3a903 100644 --- a/editors/aewan/Makefile +++ b/editors/aewan/Makefile @@ -27,12 +27,10 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index 539f22516811..f84cf753bd3f 100644 --- a/editors/gnome-latex/Makefile +++ b/editors/gnome-latex/Makefile @@ -36,7 +36,7 @@ GLIB_SCHEMAS= org.gnome.gnome-latex.gschema.xml .include <bsd.port.pre.mk> -.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 index 5443ebcdb2cc..2aa6f439b2f7 100644 --- a/editors/hexer/Makefile +++ b/editors/hexer/Makefile @@ -27,7 +27,7 @@ MYC_ALL_TARGET= myc .include <bsd.port.options.mk> -.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 index 414468f9905c..10741436cba1 100644 --- a/editors/imhex-current/Makefile +++ b/editors/imhex-current/Makefile @@ -106,8 +106,7 @@ NLS_USES= gettext .include <bsd.port.pre.mk> # 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 @@ post-extract: ${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 index 5ee722b60935..c52b52ef4f89 100644 --- a/editors/imhex/Makefile +++ b/editors/imhex/Makefile @@ -90,7 +90,6 @@ NLS_USES= gettext # 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 @@ post-extract: ${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 index 1dfc978d4283..ecc5872f7179 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -364,11 +364,6 @@ BINARY_ALIAS= sed=gsed .include <bsd.port.pre.mk> -.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 index b23dad9133b5..2c52a1431fec 100644 --- a/editors/nvi-m17n/Makefile +++ b/editors/nvi-m17n/Makefile @@ -57,7 +57,7 @@ CANNA_DESC= Enable canna support .include <bsd.port.pre.mk> -.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 index 767bb08338ca..e3ea858bbf74 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -200,11 +200,6 @@ WITH= SDK .include <bsd.port.pre.mk> -.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 index 69591fe6d7dd..22ca90bbcbe0 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -231,11 +231,6 @@ WITH= SDK .include <bsd.port.pre.mk> -.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 index 81179c42a5fb..7a6a5a89c2a9 100644 --- a/editors/uemacs/Makefile +++ b/editors/uemacs/Makefile @@ -23,7 +23,7 @@ CFLAGS+= -Wno-int-conversion .include <bsd.port.options.mk> -.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 index 5d0025cd7760..05090c4a1397 100644 --- a/editors/uzap/Makefile +++ b/editors/uzap/Makefile @@ -24,7 +24,7 @@ PLIST_FILES= bin/uzap share/man/man1/uzap.1.gz .include <bsd.port.options.mk> -.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 index 20e2af756fd7..f3016c4b7595 100644 --- a/emulators/aranym/Makefile +++ b/emulators/aranym/Makefile @@ -31,7 +31,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} .include <bsd.port.options.mk> -.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 index fe64cda8fbe3..3a7480edd06f 100644 --- a/emulators/gngb/Makefile +++ b/emulators/gngb/Makefile @@ -28,7 +28,7 @@ OPENGL_CONFIGURE_ENABLE=gl .include <bsd.port.pre.mk> -.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 index 9f61afbe73af..fab86bfed1d9 100644 --- a/emulators/qemu-cheri/Makefile +++ b/emulators/qemu-cheri/Makefile @@ -65,7 +65,7 @@ PLIST_FILES= bin/qemu-system-morello \ .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile index a7713af9309b..3b6d42bb3b9f 100644 --- a/emulators/uae/Makefile +++ b/emulators/uae/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index 5c5b5c4b9d8f..49d9a0154789 100644 --- a/emulators/virtualbox-ose-kmod-legacy/Makefile +++ b/emulators/virtualbox-ose-kmod-legacy/Makefile @@ -79,7 +79,7 @@ KMK_ARCH= freebsd.${ARCH} .include <bsd.port.pre.mk> -.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 index 659e3ecdce3a..64311690a814 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -190,18 +190,6 @@ KMK_FLAGS+= -j${MAKE_JOBS_NUMBER} .include <bsd.port.pre.mk> -.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 index b60eff81cff8..814e2d49a6ab 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -203,8 +203,7 @@ KMK_FLAGS+= -j${MAKE_JOBS_NUMBER} # 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 <bsd.port.pre.mk>, 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 index 868b1d43e296..61547a7bc574 100644 --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -42,12 +42,6 @@ JMA_CONFIGURE_ENABLE= jma OPENGL_CONFIGURE_ENABLE= opengl X11_CONFIGURE_WITH= x -.include <bsd.port.options.mk> - -.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 index 468b700b34bb..fd91d11edc43 100644 --- a/ftp/wput/Makefile +++ b/ftp/wput/Makefile @@ -34,7 +34,7 @@ TLS_CONFIGURE_WITH= ssl .include <bsd.port.pre.mk> -.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 index 0e09013834f9..0c88b3ca3ecf 100644 --- a/games/alephone/Makefile +++ b/games/alephone/Makefile @@ -49,7 +49,7 @@ ZZIP_CONFIGURE_WITH= zzip .include <bsd.port.options.mk> -.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 index f4b74cceb1c5..2974dff57081 100644 --- a/games/avp/Makefile +++ b/games/avp/Makefile @@ -22,7 +22,7 @@ PLIST_FILES= bin/${PORTNAME} .include <bsd.port.options.mk> -.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 index 4a1e6883608a..6e62d526b5aa 100644 --- a/games/awele/Makefile +++ b/games/awele/Makefile @@ -19,7 +19,7 @@ PLIST_FILES= bin/awelewish bin/xawele share/man/man6/xawele.6.gz .include <bsd.port.options.mk> -.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 index f60ae4055697..a7fdc9ea38d7 100644 --- a/games/falconseye/Makefile +++ b/games/falconseye/Makefile @@ -32,12 +32,10 @@ NETHACKCONFIG= ${FILESDIR}/x-config .include <bsd.port.pre.mk> -.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|<malloc.h>|<stdlib.h>|" \ diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile index d5eed728653c..f55f4f26f36a 100644 --- a/games/foobillard/Makefile +++ b/games/foobillard/Makefile @@ -49,8 +49,7 @@ FREETYPE_CONFIG?= pkg-config freetype2 .include <bsd.port.options.mk> -.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 index d7054d3d9ac5..be05d1ed09a3 100644 --- a/games/glsfcave/Makefile +++ b/games/glsfcave/Makefile @@ -22,7 +22,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> 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 index a8960499570d..b3db4fce53cb 100644 --- a/games/gshisen/Makefile +++ b/games/gshisen/Makefile @@ -16,7 +16,7 @@ USE_GNUSTEP= back build .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index f82ffb85a27a..4f45a1bd6fcc 100644 --- a/games/kevedit/Makefile +++ b/games/kevedit/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 5b4d3f2cae75..77671b86d4c8 100644 --- a/games/ldmud/Makefile +++ b/games/ldmud/Makefile @@ -50,7 +50,7 @@ SQLITE_CONFIGURE_ENABLE=use-sqlite .include <bsd.port.options.mk> -.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 index 71e0984cafb1..efe13e17fc83 100644 --- a/games/libgnome-games-support/Makefile +++ b/games/libgnome-games-support/Makefile @@ -21,7 +21,7 @@ USE_GNOME= cairo gdkpixbuf2 gtk30 .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 3e825c03c582..421d8d9465bc 100644 --- a/games/libretro-mame2000/Makefile +++ b/games/libretro-mame2000/Makefile @@ -20,7 +20,7 @@ PLIST_FILES= lib/libretro/mame2000_libretro.so .include <bsd.port.pre.mk> -.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 index eda8d7903e83..63d45ec13df3 100644 --- a/games/libretro-mame2003_plus/Makefile +++ b/games/libretro-mame2003_plus/Makefile @@ -20,7 +20,7 @@ PLIST_FILES= lib/libretro/mame2003_plus_libretro.so .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/games/miscom/Makefile b/games/miscom/Makefile index 4015ed1fde56..382b32baab36 100644 --- a/games/miscom/Makefile +++ b/games/miscom/Makefile @@ -31,7 +31,7 @@ OPTIONS_DEFINE= DOCS 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 index 8a015487f91e..fb8bde20ce9c 100644 --- a/games/nethack32/Makefile +++ b/games/nethack32/Makefile @@ -40,7 +40,7 @@ PLIST_SUB+= HACKLINK="" 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 index 501d6520f1b8..62e58b8e3970 100644 --- a/games/nethack33/Makefile +++ b/games/nethack33/Makefile @@ -47,7 +47,7 @@ PLIST_SUB+= HACKLINK="" 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 index 673b0714d29d..ca58e3e61494 100644 --- a/games/nethack34/Makefile +++ b/games/nethack34/Makefile @@ -81,7 +81,7 @@ PLIST_SUB+= HACKLINK="" PLIST_SUB+= HACKLINK="@comment " .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 13d416bb0cdb..7356a3201a20 100644 --- a/games/oolite/Makefile +++ b/games/oolite/Makefile @@ -60,7 +60,7 @@ BROKEN_i386= fails to compile: ../methodjit/MethodJIT.cpp:318:5: error: expecte .include <bsd.port.options.mk> -.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 index 6256b4eff700..0bec5d3527dd 100644 --- a/games/prboom-plus/Makefile +++ b/games/prboom-plus/Makefile @@ -36,7 +36,7 @@ OPENGL_CONFIGURE_ENABLE= gl .include <bsd.port.options.mk> -.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 index 344826845911..cfeead9dcf7e 100644 --- a/games/spellcast/Makefile +++ b/games/spellcast/Makefile @@ -24,7 +24,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/games/tads/Makefile b/games/tads/Makefile index b62391ff31df..d6d974f5f433 100644 --- a/games/tads/Makefile +++ b/games/tads/Makefile @@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/tads-3.0.8/tads2 .include <bsd.port.pre.mk> -.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 index 69e1f6a8dd0b..3b7ec92c8c8c 100644 --- a/games/trojka/Makefile +++ b/games/trojka/Makefile @@ -17,7 +17,7 @@ USES= ncurses .include <bsd.port.options.mk> -.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 index c19f30504532..cedf4035fce6 100644 --- a/games/tuxpaint/Makefile +++ b/games/tuxpaint/Makefile @@ -55,7 +55,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 0c235a1f9fb9..2ce32e5af4e3 100644 --- a/games/tuxracer/Makefile +++ b/games/tuxracer/Makefile @@ -31,7 +31,7 @@ CPPFLAGS+= -DGLX_GLXEXT_LEGACY .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 70c88e0b684f..cf899d181fcc 100644 --- a/games/xboing/Makefile +++ b/games/xboing/Makefile @@ -23,7 +23,7 @@ SOUND_MAKE_ENV= WITHOUT_AUDIO=True .include <bsd.port.options.mk> -.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 index 9d60319f1839..0dfcb37b22fe 100644 --- a/games/xbubble/Makefile +++ b/games/xbubble/Makefile @@ -28,7 +28,7 @@ NLS_LIBS= -lintl .include <bsd.port.options.mk> -.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 index 372fb7780fd2..6f7d70b660a3 100644 --- a/games/xfireworks/Makefile +++ b/games/xfireworks/Makefile @@ -16,7 +16,7 @@ USE_XORG= x11 .include <bsd.port.pre.mk> -.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 index a7d3101d4a2a..727d2c8babc7 100644 --- a/games/xjewel/Makefile +++ b/games/xjewel/Makefile @@ -18,7 +18,7 @@ DESKTOP_ENTRIES="XJewel" "" "" "${PORTNAME}" "" "" .include <bsd.port.pre.mk> -.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 index dadd4bbc3b68..799587da042f 100644 --- a/games/xlennart/Makefile +++ b/games/xlennart/Makefile @@ -52,7 +52,7 @@ SCORES_DIR?= ${DATADIR}/scores .include <bsd.port.options.mk> -.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 index 387e315fcda3..14ce4c0f608a 100644 --- a/games/xmille/Makefile +++ b/games/xmille/Makefile @@ -23,7 +23,7 @@ PLIST_FILES= bin/xmille share/man/man1/xmille.1.gz .include <bsd.port.options.mk> -.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 index 5b65e9ba1154..f4d36cfe5b64 100644 --- a/games/xneko/Makefile +++ b/games/xneko/Makefile @@ -16,7 +16,7 @@ PLIST_FILES= bin/xneko share/man/man6/xneko.6.gz .include <bsd.port.options.mk> -.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 index 3ec2d92d6c4c..32e0873a229f 100644 --- a/games/xpipeman/Makefile +++ b/games/xpipeman/Makefile @@ -17,7 +17,7 @@ CFLAGS+= -Wno-error=return-type .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 05d674439480..3860dcab6cfc 100644 --- a/games/xroach/Makefile +++ b/games/xroach/Makefile @@ -24,7 +24,7 @@ PLIST_FILES= bin/xroach share/man/man6/xroach.6.gz .include <bsd.port.options.mk> -.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 index 6fb36be4ccb2..10cc1ee9df26 100644 --- a/games/xtrojka/Makefile +++ b/games/xtrojka/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} .include <bsd.port.options.mk> post-patch: -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 08f011ca70c1..de7bf26c7255 100644 --- a/graphics/anttweakbar/Makefile +++ b/graphics/anttweakbar/Makefile @@ -34,7 +34,7 @@ PLIST_FILES= include/AntTweakBar.h \ .include <bsd.port.options.mk> post-patch: -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index f5bd712da241..840dda35df1e 100644 --- a/graphics/bsd-plotutils/Makefile +++ b/graphics/bsd-plotutils/Makefile @@ -27,7 +27,7 @@ FORTRAN_USES= fortran .include <bsd.port.pre.mk> -.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 index aebee638f43c..02c0ebf56c73 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --disable-libemf 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 index 1c6ceb8e09e9..ad051358404e 100644 --- a/graphics/drm-510-kmod/Makefile +++ b/graphics/drm-510-kmod/Makefile @@ -28,7 +28,7 @@ GH_TAGNAME= ${DRM_KMOD_GH_TAGNAME} .include <bsd.port.options.mk> .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 index c475751a50d4..59379eda238a 100644 --- a/graphics/drm-kmod/Makefile +++ b/graphics/drm-kmod/Makefile @@ -22,9 +22,6 @@ _DRM_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le . 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 index 1386d1fdcce0..241da330dfd9 100644 --- a/graphics/dspdfviewer/Makefile +++ b/graphics/dspdfviewer/Makefile @@ -62,7 +62,7 @@ CFLAGS+= -Wno-error=bitwise-instead-of-logical .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 index a83ed5af3b85..2940815bb2f7 100644 --- a/graphics/gdchart/Makefile +++ b/graphics/gdchart/Makefile @@ -32,7 +32,7 @@ PLIST_SUB+= PROFILE="@comment " PLIST_SUB+= PROFILE="" .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 8e3f38de2143..8f62471ee44c 100644 --- a/graphics/gle/Makefile +++ b/graphics/gle/Makefile @@ -28,7 +28,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index ee13293eb9f5..9db8a2accd20 100644 --- a/graphics/gpaint/Makefile +++ b/graphics/gpaint/Makefile @@ -23,7 +23,7 @@ PLIST_FILES= ${DATADIR}/glade/gpaint.glade \ .include <bsd.port.options.mk> -.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 index 627172dd53cc..75b8a917032c 100644 --- a/graphics/igt-gpu-tools/Makefile +++ b/graphics/igt-gpu-tools/Makefile @@ -71,7 +71,7 @@ PLIST_SUB+= AMD64="@comment " .include <bsd.port.pre.mk> -.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 index 62e920cb1e72..14a17d4fd874 100644 --- a/graphics/kludge3d/Makefile +++ b/graphics/kludge3d/Makefile @@ -25,7 +25,7 @@ PLIST_FILES= bin/kludge3d .include <bsd.port.options.mk> -.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 index 5c3ff5932655..f461fe0e4101 100644 --- a/graphics/mesa-demos/Makefile +++ b/graphics/mesa-demos/Makefile @@ -25,7 +25,7 @@ MESON_ARGS+= -Dwith-glut=${LOCALBASE} \ .include <bsd.port.options.mk> -.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 index eb16697ffb65..1d657d6d9f90 100644 --- a/graphics/nvidia-drm-kmod/Makefile +++ b/graphics/nvidia-drm-kmod/Makefile @@ -18,8 +18,6 @@ IGNORE= not supported on anything but FreeBSD (missing linuxkpi function 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 index 00249e66ff20..a8e1ccdb194b 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -73,7 +73,7 @@ PLIST_SUB+= UNAMEP=${ARCH} .include <bsd.port.options.mk> -.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 index bcbb8f284b46..d9a06ea8a209 100644 --- a/graphics/opennurbs/Makefile +++ b/graphics/opennurbs/Makefile @@ -37,7 +37,7 @@ MAKE_ARGS+= ON_GNU_OPTIMIZER_FLAGS="-g -fPIC" .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 index a4ccb839e447..4ae0c9b78610 100644 --- a/graphics/p5-Tk-JPEG-Lite/Makefile +++ b/graphics/p5-Tk-JPEG-Lite/Makefile @@ -18,7 +18,7 @@ USE_PERL5= configure .include <bsd.port.options.mk> -.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 index dc4ce1d6c78e..2631e0544563 100644 --- a/graphics/pixen/Makefile +++ b/graphics/pixen/Makefile @@ -19,12 +19,10 @@ ADDITIONAL_OBJCFLAGS+= -Dlog2=logb .include <bsd.port.options.mk> -.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 index cca3f6276159..d70378e28e9b 100644 --- a/graphics/quat-gui/Makefile +++ b/graphics/quat-gui/Makefile @@ -33,7 +33,7 @@ OPTIMIZED_CFLAGS_CFLAGS= -O3 -ffast-math .include <bsd.port.pre.mk> -.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 index dd848cacce9d..c64ab60b19c8 100644 --- a/graphics/quat/Makefile +++ b/graphics/quat/Makefile @@ -22,7 +22,7 @@ OPTIMIZED_CFLAGS_CFLAGS= -O3 -ffast-math .include <bsd.port.options.mk> -.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 index 001b1b6f9321..0969016a5dd9 100644 --- a/graphics/quesoglc/Makefile +++ b/graphics/quesoglc/Makefile @@ -42,7 +42,7 @@ TEST_TEST_TARGET= check .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index c09c9f92e7b7..1297847761dd 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -111,22 +111,7 @@ OPENMP_LDFLAGS= -lm -lomp # 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 index 8ecf8ae8ce09..98c833685b93 100644 --- a/graphics/togl/Makefile +++ b/graphics/togl/Makefile @@ -29,7 +29,7 @@ TOGL_INSTDIR= ${PREFIX}/lib/${DISTNAME} .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 9d5cb232809c..eb376da2c0c0 100644 --- a/irc/irssi-icb/Makefile +++ b/irc/irssi-icb/Makefile @@ -32,7 +32,7 @@ PLIST_FILES= lib/irssi/modules/libfe_icb.so \ .include <bsd.port.pre.mk> # 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 index db38597c7edb..45e4d776e450 100644 --- a/irc/scrollz/Makefile +++ b/irc/scrollz/Makefile @@ -41,12 +41,10 @@ UTF8_CONFIGURE_ENABLE= utf8 .include <bsd.port.pre.mk> -.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 index 089960bf553d..775ce76a09ee 100644 --- a/japanese/FreeWnn-lib/Makefile +++ b/japanese/FreeWnn-lib/Makefile @@ -21,7 +21,7 @@ MANLANG?= ja .include "${.CURDIR}/../../japanese/FreeWnn-lib/Makefile.common" .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 06a68d53486b..b2841cbec489 100644 --- a/japanese/FreeWnn-server/Makefile +++ b/japanese/FreeWnn-server/Makefile @@ -36,11 +36,11 @@ KWNN_USE= RC_SUBR=kwnn .include <bsd.port.options.mk> -.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 index 691a3275d511..6798d47274a1 100644 --- a/japanese/Wnn6-lib/Makefile +++ b/japanese/Wnn6-lib/Makefile @@ -18,7 +18,7 @@ PORTDOCS= README .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${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 index 7d34993aea16..60b78ef33b6a 100644 --- a/japanese/Wnn7-lib/Makefile +++ b/japanese/Wnn7-lib/Makefile @@ -19,7 +19,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index 1fd7c8f7aa0a..9a3e58730d80 100644 --- a/japanese/canna-server/Makefile +++ b/japanese/canna-server/Makefile @@ -26,7 +26,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index 97f80d0a9ea2..cb4d2963742b 100644 --- a/japanese/celrw/Makefile +++ b/japanese/celrw/Makefile @@ -19,7 +19,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.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 index 7639ec9220ab..52fef9bad9c5 100644 --- a/japanese/ebview-gtk2/Makefile +++ b/japanese/ebview-gtk2/Makefile @@ -28,7 +28,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile index dce3c5b8251a..f771e3f7ee2b 100644 --- a/japanese/edict/Makefile +++ b/japanese/edict/Makefile @@ -42,7 +42,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index 1cd89a33b37c..2a50d2e2d9ff 100644 --- a/japanese/jls/Makefile +++ b/japanese/jls/Makefile @@ -24,7 +24,7 @@ MAKE_ARGS= MANDIR="${PREFIX}/share/man/man" .include <bsd.port.options.mk> -.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 index 0d12afda212b..8968081e2cf4 100644 --- a/japanese/kdrill/Makefile +++ b/japanese/kdrill/Makefile @@ -19,7 +19,7 @@ MAKE_ARGS= MANDIR=${PREFIX}/share/man/man1 .include <bsd.port.options.mk> -.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 index 64b10df88419..b23d603e6bb8 100644 --- a/japanese/kinput2/Makefile +++ b/japanese/kinput2/Makefile @@ -91,7 +91,7 @@ CONF+= TRANSPORTDEFS="-DNO_TCP_TRANSPORT" .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile index 0d413217ee9b..ad02e96975a6 100644 --- a/japanese/kterm/Makefile +++ b/japanese/kterm/Makefile @@ -44,7 +44,7 @@ XAW3DLIB_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d .include <bsd.port.options.mk> -.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 index 6f25208fc5b3..18ed21ad4bb8 100644 --- a/japanese/libskk/Makefile +++ b/japanese/libskk/Makefile @@ -37,7 +37,7 @@ NLS_USES_OFF= gettext-tools .include <bsd.port.options.mk> -.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 index 28890715b62d..cef7a75b7c0b 100644 --- a/japanese/nethack34/Makefile +++ b/japanese/nethack34/Makefile @@ -41,7 +41,7 @@ X11_VARS= GRAPHICS=X11_GRAPHICS .include <bsd.port.options.mk> -.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 index b372f90ba99d..52b63913a652 100644 --- a/japanese/ruby-uconv/Makefile +++ b/japanese/ruby-uconv/Makefile @@ -26,7 +26,7 @@ OPTIONS_DEFINE= DOCS PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} post-patch: -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index fd08bcfbb264..421e6b2b387e 100644 --- a/japanese/sj3-server/Makefile +++ b/japanese/sj3-server/Makefile @@ -47,11 +47,11 @@ POSTPATCHES.nodocports= \ .include <bsd.port.pre.mk> -.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 index af7f1307d785..0e9bcb833034 100644 --- a/java/netty/Makefile +++ b/java/netty/Makefile @@ -54,7 +54,7 @@ NETTY_ARCH= ppc_64 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 index 00c0a9f0a8e9..84da28b6f144 100644 --- a/java/openjfx14/Makefile +++ b/java/openjfx14/Makefile @@ -90,7 +90,7 @@ _INSTALLDIR= ${PREFIX}/${PKGBASE} .include <bsd.port.options.mk> -.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 index 60851cef6feb..e29e30ccedda 100644 --- a/lang/cim/Makefile +++ b/lang/cim/Makefile @@ -25,11 +25,9 @@ INFO= cim .include <bsd.port.options.mk> -.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 <bsd.port.mk> diff --git a/lang/eisl/Makefile b/lang/eisl/Makefile index 65b7a323c746..36750653eca5 100644 --- a/lang/eisl/Makefile +++ b/lang/eisl/Makefile @@ -38,11 +38,11 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-makefile .include <bsd.port.pre.mk> -.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 index 3736ff11ff6b..c7564b226668 100644 --- a/lang/elk/Makefile +++ b/lang/elk/Makefile @@ -33,7 +33,7 @@ OPTIONS_DEFINE= EXAMPLES 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 index eaa033bb48ac..f6b5affb5db0 100644 --- 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 index eaa033bb48ac..f6b5affb5db0 100644 --- 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 index c8d346207983..d7f1585d2cf0 100644 --- a/lang/lafontaine/Makefile +++ b/lang/lafontaine/Makefile @@ -31,7 +31,7 @@ NLS_USES= gettext .include <bsd.port.options.mk> -.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 index e7b6127085a1..38b703643478 100644 --- a/lang/nesasm/Makefile +++ b/lang/nesasm/Makefile @@ -19,7 +19,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.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 index a1b50fc5dda7..556d948e998b 100644 --- a/lang/ocaml-camlidl/Makefile +++ b/lang/ocaml-camlidl/Makefile @@ -26,7 +26,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.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 index 41aa1bc25428..be9c74ce8459 100644 --- a/lang/sagittarius-scheme/Makefile +++ b/lang/sagittarius-scheme/Makefile @@ -33,7 +33,7 @@ OPTIONS_SUB= yes .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/lang/sketchy/Makefile b/lang/sketchy/Makefile index b292d666d3cf..176a0a405bfa 100644 --- a/lang/sketchy/Makefile +++ b/lang/sketchy/Makefile @@ -15,7 +15,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.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 index a9e685ebf1c4..682189e3a31d 100644 --- a/lang/solidity/Makefile +++ b/lang/solidity/Makefile @@ -41,7 +41,7 @@ PLIST_FILES= bin/solc \ .include <bsd.port.options.mk> -.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 index 37da7362fae7..50c2ca8626bb 100644 --- a/lang/spidermonkey91/Makefile +++ b/lang/spidermonkey91/Makefile @@ -54,7 +54,7 @@ PLIST_SUB= SP_VER=${SP_VER} .include <bsd.port.options.mk> -.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 index 4fce798eb8e9..17cf4de2d8db 100644 --- a/lang/squeak/Makefile +++ b/lang/squeak/Makefile @@ -65,12 +65,10 @@ IMAGES= Squeak${IMAGE_FULL_VERSION}.image \ .include <bsd.port.options.mk> -.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,<utmp\.h>,<utmpx.h>,' \ diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile index 1811ed1c7500..2fd853795ef5 100644 --- a/mail/cyrus-imapd25/Makefile +++ b/mail/cyrus-imapd25/Makefile @@ -158,7 +158,7 @@ CYRUS_MAN8+= fetchnews nntpd .include <bsd.port.pre.mk> -.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 index d047be381a06..01c19bcfb489 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -57,7 +57,7 @@ PIDDIR?= /var/run/dbmail .include <bsd.port.options.mk> -.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 index 435351a6f3e6..7d17614fd246 100644 --- a/mail/deforaos-mailer/Makefile +++ b/mail/deforaos-mailer/Makefile @@ -59,7 +59,7 @@ post-patch: ${REINPLACE_CMD} 's|-Wl,-pie||g' \ ${WRKSRC}/src/Makefile \ ${WRKSRC}/tests/Makefile -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${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 index 3ed5c1062859..5712a002d0d6 100644 --- a/mail/enma/Makefile +++ b/mail/enma/Makefile @@ -52,7 +52,7 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/postfix/smtpd:mail/postfix .include <bsd.port.pre.mk> -.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 index 0e6634addbc6..0b601f1b7f28 100644 --- a/mail/gnumail/Makefile +++ b/mail/gnumail/Makefile @@ -21,7 +21,7 @@ USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile index 42ea09a5d490..a5c66822e98e 100644 --- a/mail/hbiff/Makefile +++ b/mail/hbiff/Makefile @@ -18,12 +18,10 @@ PLIST_FILES= bin/hbiff share/man/man1/hbiff.1.gz .include <bsd.port.pre.mk> -.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 index f69e06ce8acf..3f08252c3c12 100644 --- a/mail/libsrs_alt/Makefile +++ b/mail/libsrs_alt/Makefile @@ -25,7 +25,7 @@ SHLIB_MAJOR= 1 .include <bsd.port.options.mk> -.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 index f22dc1ca0afc..238ce47fbdaf 100644 --- a/mail/mail2sms/Makefile +++ b/mail/mail2sms/Makefile @@ -21,7 +21,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.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 index d1d09b01571f..d094a076eb50 100644 --- a/mail/mailx/Makefile +++ b/mail/mailx/Makefile @@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/mail-2.2.8 .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile index f2091d34d0ff..dba3f28d6fc0 100644 --- a/mail/meta1/Makefile +++ b/mail/meta1/Makefile @@ -73,7 +73,7 @@ TLS_LDFLAGS= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> -.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 index 62c0c8e9b89b..3c7c910548d7 100644 --- a/mail/pantomime/Makefile +++ b/mail/pantomime/Makefile @@ -23,7 +23,7 @@ DEFAULT_LIBVERSION= ${DISTVERSION:R} .include <bsd.port.pre.mk> -.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 index 6f0b91e2e662..07f44adc099b 100644 --- a/mail/pfqueue/Makefile +++ b/mail/pfqueue/Makefile @@ -22,7 +22,7 @@ INSTALL_TARGET= install-strip .include <bsd.port.pre.mk> -.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 index a1b429c45fba..c85d82d912f1 100644 --- a/mail/qconfirm/Makefile +++ b/mail/qconfirm/Makefile @@ -19,7 +19,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index 185abca4ff09..3b837fc22c29 100644 --- a/mail/qmail-rblchk/Makefile +++ b/mail/qmail-rblchk/Makefile @@ -27,7 +27,7 @@ OPTIONS_DEFINE= EXAMPLES .include <bsd.port.options.mk> -.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 index 7acde34f477a..9027c5a3204f 100644 --- a/mail/rmilter/Makefile +++ b/mail/rmilter/Makefile @@ -35,7 +35,7 @@ DKIM_CMAKE_OFF= -DENABLE_DKIM=OFF .include <bsd.port.pre.mk> -.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 index a3ab56b72c9c..1c6b675a2cb1 100644 --- a/mail/xmailbox/Makefile +++ b/mail/xmailbox/Makefile @@ -14,7 +14,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 55c82719e883..7f53622c823d 100644 --- a/mail/xpbiff/Makefile +++ b/mail/xpbiff/Makefile @@ -25,7 +25,7 @@ YOUBINBINDIR= ${LOCALBASE} .include <bsd.port.pre.mk> -.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 index 3a555b9d4d8c..831a92e7f07d 100644 --- a/math/alberta/Makefile +++ b/math/alberta/Makefile @@ -39,7 +39,7 @@ BINARY_ALIAS= make=${GMAKE} sed=gsed .include <bsd.port.options.mk> -.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 index 291bd2398f23..17c50cab06bc 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -84,7 +84,7 @@ PORTEXAMPLES= * .include <bsd.port.options.mk> -.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 index dc0c0b536928..9ca3904c2f22 100644 --- a/math/eval/Makefile +++ b/math/eval/Makefile @@ -19,7 +19,7 @@ PLIST_FILES= bin/Eval .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index e3d414ced46c..24c178d81e13 100644 --- a/math/form/Makefile +++ b/math/form/Makefile @@ -38,8 +38,7 @@ OPENMPI_CONFIGURE_ENV+= MPICC="${MPICC}" \ .include <bsd.port.options.mk> -.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 index c6015318407b..eae88c064c92 100644 --- a/math/libpoly/Makefile +++ b/math/libpoly/Makefile @@ -25,7 +25,7 @@ CMAKE_OFF= LIBPOLY_BUILD_PYTHON_API LIBPOLY_BUILD_STATIC LIBPOLY_BUILD_STATIC_PI .include <bsd.port.pre.mk> -.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 index bcbc7abce937..455b3e003efa 100644 --- a/math/oleo/Makefile +++ b/math/oleo/Makefile @@ -50,7 +50,7 @@ NLS_LIBS= -lintl .include <bsd.port.pre.mk> -.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 index 5a29fec55826..7f8e0f971ccf 100644 --- a/math/py-levmar/Makefile +++ b/math/py-levmar/Makefile @@ -27,11 +27,11 @@ USE_PYTHON= distutils autoplist .include <bsd.port.pre.mk> -.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 index 42139435c5ab..09a38b608c87 100644 --- a/math/rubygem-rb-gsl/Makefile +++ b/math/rubygem-rb-gsl/Makefile @@ -18,7 +18,7 @@ USES= gem .include <bsd.port.options.mk> -.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 index e530dfe1bf22..53ac01945f90 100644 --- a/math/spar/Makefile +++ b/math/spar/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE_MANPREFIX=${PREFIX}/share .include <bsd.port.pre.mk> -.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 index 321d3790fcfd..5e57ffba90e1 100644 --- a/math/spooles/Makefile +++ b/math/spooles/Makefile @@ -40,7 +40,7 @@ PICFLAG?= -fpic .include <bsd.port.pre.mk> -.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 index 47f1a2a0c731..1aceb5743f3d 100644 --- a/math/xgraph/Makefile +++ b/math/xgraph/Makefile @@ -22,7 +22,7 @@ OPTIONS_DEFINE= EXAMPLES .include <bsd.port.options.mk> -.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 index 00ee27fd7add..1070fe43c9e6 100644 --- a/misc/bb/Makefile +++ b/misc/bb/Makefile @@ -26,7 +26,7 @@ OPTIONS_DEFINE= DOCS .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 index 42564d167089..6673ff21dddb 100644 --- a/misc/dartsim/Makefile +++ b/misc/dartsim/Makefile @@ -62,7 +62,7 @@ PORTDOCS= * .include <bsd.port.options.mk> -.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 index df4008c4ddc3..c5d4a86e7467 100644 --- a/misc/dynomite/Makefile +++ b/misc/dynomite/Makefile @@ -34,7 +34,7 @@ PLIST_FILES= bin/dynomite-hash-tool \ .include <bsd.port.pre.mk> -.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 index 076262b1b231..a7fe76d94f97 100644 --- a/misc/hotkeys/Makefile +++ b/misc/hotkeys/Makefile @@ -37,7 +37,7 @@ OSD_CONFIGURE_WITH= xosd .include <bsd.port.options.mk> -.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 index 81f2e744b180..e756fe750cee 100644 --- a/misc/orville-write/Makefile +++ b/misc/orville-write/Makefile @@ -22,7 +22,7 @@ PLIST_FILES= "@(,,4711) bin/amin" "@(,,4711) bin/helpers" "@(,,4711) bin/huh" \ .include <bsd.port.pre.mk> -.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 index 7184541a7dfa..15685f2dae9c 100644 --- a/misc/py-pytorch/Makefile +++ b/misc/py-pytorch/Makefile @@ -61,7 +61,7 @@ POST_PLIST= fix-plist .include <bsd.port.options.mk> -.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 index ffd65363bba7..a74a651c2bfa 100644 --- a/misc/rump/Makefile +++ b/misc/rump/Makefile @@ -22,7 +22,7 @@ USES= compiler .include <bsd.port.pre.mk> -.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 index e58bbf037aeb..7f592eaa1df0 100644 --- a/misc/tlci/Makefile +++ b/misc/tlci/Makefile @@ -20,7 +20,7 @@ PLIST_FILES= bin/tlci \ .include <bsd.port.options.mk> #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 index 547084c41117..17f756b87766 100644 --- a/multimedia/mkvalidator/Makefile +++ b/multimedia/mkvalidator/Makefile @@ -30,7 +30,7 @@ MAKE_JOBS_UNSAFE= yes .include <bsd.port.options.mk> -.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 index a74121eda156..be9c56afcd22 100644 --- a/multimedia/smpeg2/Makefile +++ b/multimedia/smpeg2/Makefile @@ -33,7 +33,7 @@ PLAYMPEG_VARS= LICENSE+=GPLv2+ .include <bsd.port.options.mk> -.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 index 6d50b3182468..1293f8dfde4a 100644 --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -89,7 +89,7 @@ CONFIGURE_ARGS+=--disable-doxygen .include <bsd.port.options.mk> -.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 index dad21bb0e9ba..2364c62cdaa7 100644 --- a/net-im/libquotient/Makefile +++ b/net-im/libquotient/Makefile @@ -49,7 +49,7 @@ _QT5_ONLY_qt6= "@comment " .include <bsd.port.options.mk> # 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 index 596a3b34ee7b..d587aeb3eb4c 100644 --- a/net-im/neochat/Makefile +++ b/net-im/neochat/Makefile @@ -37,7 +37,7 @@ USE_XORG= x11 .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 index 38aa88367399..6897e76bec6f 100644 --- a/net-im/pidgin-fetion/Makefile +++ b/net-im/pidgin-fetion/Makefile @@ -25,7 +25,7 @@ PLIST_FILES= lib/purple-2/libfetion.so .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${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 index ea10c06d1a1a..3138031b903e 100644 --- a/net-im/pidgin-sipe/Makefile +++ b/net-im/pidgin-sipe/Makefile @@ -50,7 +50,7 @@ CFLAGS+= -Wno-error .include <bsd.port.options.mk> -.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 index f1b663dd3386..8cf2c766c75b 100644 --- a/net-im/quaternion/Makefile +++ b/net-im/quaternion/Makefile @@ -30,7 +30,7 @@ GH_ACCOUNT= quotient-im .include <bsd.port.options.mk> -.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 index 1766132ec08f..1124b9761a6a 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -111,7 +111,7 @@ TELEGRAM_API_ID= 601761 .include <bsd.port.options.mk> -.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 index b847e2f15915..f31758bb2e6b 100644 --- a/net-im/telepathy-gabble/Makefile +++ b/net-im/telepathy-gabble/Makefile @@ -45,7 +45,7 @@ PLIST_SUB= PVERSION=${PORTVERSION} CONFIGURE_ENV+= OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include" .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index da76aa8ce903..1e2400dd3dc7 100644 --- a/net-im/telepathy-glib/Makefile +++ b/net-im/telepathy-glib/Makefile @@ -25,7 +25,7 @@ INSTALL_TARGET= install-strip .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 7a43ad17a384..0fdfb02baef3 100644 --- a/net-mgmt/irrtoolset/Makefile +++ b/net-mgmt/irrtoolset/Makefile @@ -25,7 +25,7 @@ PLIST_FILES= bin/rpslcheck bin/peval bin/rtconfig \ .include <bsd.port.options.mk> -.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 index 0220dc551949..f3b87112cd61 100644 --- a/net-mgmt/sendip/Makefile +++ b/net-mgmt/sendip/Makefile @@ -22,7 +22,7 @@ USE_LDCONFIG= yes 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 index 2248cceb7a3d..2cac4e5a57c9 100644 --- a/net-mgmt/sysmon/Makefile +++ b/net-mgmt/sysmon/Makefile @@ -24,7 +24,7 @@ MANPAGE= sysmon.man.8 sysmon.conf.man.8 .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index c277c10a1efc..c4508cb73b2a 100644 --- a/net-mgmt/tcptrack/Makefile +++ b/net-mgmt/tcptrack/Makefile @@ -22,7 +22,7 @@ PLIST_FILES= bin/tcptrack share/man/man1/tcptrack.1.gz .include <bsd.port.pre.mk> -.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 index 83f6ed379b24..27b7c2fed97c 100644 --- a/net-mgmt/wmi-client/Makefile +++ b/net-mgmt/wmi-client/Makefile @@ -21,7 +21,7 @@ PROGS= bin/wmic bin/winexe .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 3efbe3a5e9fb..b2dacdf86c1e 100644 --- a/net-p2p/c-lightning/Makefile +++ b/net-p2p/c-lightning/Makefile @@ -157,7 +157,7 @@ PLIST_SUB= U="${USERS}" G="${GROUPS}" .include <bsd.port.pre.mk> -.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 index d7250dd332ff..6f3a96cc5e3b 100644 --- a/net-p2p/opendchub/Makefile +++ b/net-p2p/opendchub/Makefile @@ -23,7 +23,7 @@ PLIST_FILES= bin/${PORTNAME} .include <bsd.port.options.mk> -.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 index 1c45b0a9a29f..ce97755c56ea 100644 --- a/net-p2p/shx/Makefile +++ b/net-p2p/shx/Makefile @@ -55,12 +55,10 @@ XMMS_CONFIGURE_ENABLE= xmms .include <bsd.port.pre.mk> -.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 index 38fb706c69ac..4e27440a0ec3 100644 --- a/net/afpfs-ng/Makefile +++ b/net/afpfs-ng/Makefile @@ -33,7 +33,7 @@ GCRYPT_CONFIGURE_ENABLE=gcrypt .include <bsd.port.options.mk> -.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 index 5ab1584427dc..94bf2ed73d96 100644 --- a/net/asterisk18/Makefile +++ b/net/asterisk18/Makefile @@ -219,7 +219,7 @@ PJSIP_VERSION= 2.14.1 .include <bsd.port.options.mk> -.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 index 265f85f08b9f..af84644046d2 100644 --- a/net/bindtest/Makefile +++ b/net/bindtest/Makefile @@ -18,7 +18,7 @@ PLIST_FILES= bin/bindtest bin/bindtest.sh share/man/man1/bindtest.1.gz .include <bsd.port.options.mk> -.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 index 867aaffb6ac8..438be5d0ccc6 100644 --- a/net/bird2/Makefile +++ b/net/bird2/Makefile @@ -74,7 +74,7 @@ netlink_PKGNAMESUFFIX= 2-netlink 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 index 0529938dcd6d..3549844b838a 100644 --- a/net/guacamole-server/Makefile +++ b/net/guacamole-server/Makefile @@ -98,7 +98,7 @@ CONFIGURE_ARGS+= --without-pango --without-terminal 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 index 4c9f498dd03d..ba208fa10580 100644 --- a/net/honeyd/Makefile +++ b/net/honeyd/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ARGS+= --without-python .include <bsd.port.pre.mk> -.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 index 99b3084f45cb..f1b380bb3cf4 100644 --- a/net/isboot-kmod/Makefile +++ b/net/isboot-kmod/Makefile @@ -33,7 +33,7 @@ VIMAGE_CFLAGS= -DVIMAGE .include <bsd.port.options.mk> -.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 index 7ca41b0a7f02..0f344c27096f 100644 --- a/net/libexosip2/Makefile +++ b/net/libexosip2/Makefile @@ -28,7 +28,7 @@ LIBS+= -L${LOCALBASE}/lib .include <bsd.port.options.mk> -.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 index dd7fab4fbdf5..a6ac1bf62410 100644 --- a/net/libproxy/Makefile +++ b/net/libproxy/Makefile @@ -55,7 +55,7 @@ RUN_DEPENDS+= libproxy-pacrunner>=${DISTVERSION}:net/libproxy-pacrunner .include <bsd.port.pre.mk> -.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 index 4eb65b06e6dc..e38799397676 100644 --- a/net/libtnl/Makefile +++ b/net/libtnl/Makefile @@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/tnl/tnl .include <bsd.port.pre.mk> -.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 index 5036e4f022f0..00813ac8d5dc 100644 --- a/net/mptsd/Makefile +++ b/net/mptsd/Makefile @@ -20,7 +20,7 @@ GH_TUPLE= gfto:libfuncs:0dc8d87080badd7a276316ad7ae6e6f1aed2331b:libfuncs/ .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 09e7e3cbcb0d..30ae2b31045e 100644 --- a/net/owamp/Makefile +++ b/net/owamp/Makefile @@ -15,7 +15,7 @@ GNU_CONFIGURE_MANPREFIX=${PREFIX}/share .include <bsd.port.options.mk> -.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 index b9f05abfd0c2..c6fdc36abbbd 100644 --- a/net/p5-Net-TCLink/Makefile +++ b/net/p5-Net-TCLink/Makefile @@ -20,7 +20,7 @@ LDFLAGS+= -L${OPENSSLLIB} .include <bsd.port.options.mk> -.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 index b15b217d2448..8d4c2cf529c4 100644 --- a/net/pichi/Makefile +++ b/net/pichi/Makefile @@ -80,7 +80,7 @@ USES+= ssl .include <bsd.port.pre.mk> -.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 index b7534322fd72..efb930ace5a4 100644 --- a/net/py-libdnet/Makefile +++ b/net/py-libdnet/Makefile @@ -31,7 +31,7 @@ regression-test: install .include <bsd.port.options.mk> -.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 index cf78a403743c..0929b8d008b1 100644 --- a/net/py-smbpasswd/Makefile +++ b/net/py-smbpasswd/Makefile @@ -17,7 +17,7 @@ USE_PYTHON= autoplist distutils .include <bsd.port.pre.mk> -.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 index 87a9dd6f2b03..12a1fd8a0c2c 100644 --- a/net/radsecproxy/Makefile +++ b/net/radsecproxy/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE} .include <bsd.port.pre.mk> -.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 index 0e1daa6c2261..57f1896e65fa 100644 --- a/net/sniffit/Makefile +++ b/net/sniffit/Makefile @@ -20,12 +20,10 @@ OPTIONS_DEFINE= DOCS EXAMPLES .include <bsd.port.options.mk> -.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 index e30a9c28dfe4..8ce9686b3f7c 100644 --- a/net/spread/Makefile +++ b/net/spread/Makefile @@ -52,7 +52,7 @@ GNU_CONFIGURE_MANPREFIX=${PREFIX}/share .include <bsd.port.options.mk> -.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 index 3f1c753b222d..42a2fb941216 100644 --- a/net/ss5/Makefile +++ b/net/ss5/Makefile @@ -31,7 +31,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 4f6fa4675494..61ce213be68e 100644 --- a/net/ssldump/Makefile +++ b/net/ssldump/Makefile @@ -26,7 +26,7 @@ AES_EXTRA_PATCHES= ${FILESDIR}/extra-patch-aes .include <bsd.port.options.mk> -.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 index d6d33bf21e14..eefc11fb91dc 100644 --- a/net/suckblow/Makefile +++ b/net/suckblow/Makefile @@ -14,7 +14,7 @@ MAKE_ARGS= MANDIR="${PREFIX}/share/man/man" .include <bsd.port.pre.mk> -.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 index bda79ebadc67..44f8e0fb01b6 100644 --- a/net/trickle/Makefile +++ b/net/trickle/Makefile @@ -29,7 +29,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index 73ad5060bc2c..82272e3240d7 100644 --- a/net/yptransitd/Makefile +++ b/net/yptransitd/Makefile @@ -24,7 +24,7 @@ PLIST_FILES= %%ETCDIR%%/ldap.conf %%ETCDIR%%/modules/ldap.so \ .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index b9c07b7c6c21..fbbd455b4fea 100644 --- a/news/golded+/Makefile +++ b/news/golded+/Makefile @@ -30,7 +30,7 @@ DOCS_SUB_LIST_OFF= NOTEWORK="" .include <bsd.port.options.mk> -.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 index 7c76a41f7c28..b327f2e7d8e7 100644 --- a/news/lusernet/Makefile +++ b/news/lusernet/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libPantomime.so:mail/pantomime .include <bsd.port.options.mk> -.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 index bd2b707ecfd4..2ee1a39f0fb7 100644 --- a/print/bibview/Makefile +++ b/print/bibview/Makefile @@ -13,7 +13,7 @@ WRKSRC= ${WRKDIR}/bibview-${PORTVERSION} .include <bsd.port.options.mk> -.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 index 1b38bc4479d5..994fa200b6d5 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -136,7 +136,7 @@ PSPOPPLER_DESC= Poppler pdftops(1) .include <bsd.port.pre.mk> -#.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 index 44228142876c..0b4c6ab20a7a 100644 --- a/print/magicfilter/Makefile +++ b/print/magicfilter/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} .include <bsd.port.pre.mk> -.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 index 9a55bdc3f582..b7c832c651de 100644 --- a/print/openprinting/Makefile +++ b/print/openprinting/Makefile @@ -36,7 +36,7 @@ LLD_UNSAFE= yes .include <bsd.port.options.mk> -.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 index da15047495ed..ba7d9329e83b 100644 --- a/print/pic2fig/Makefile +++ b/print/pic2fig/Makefile @@ -17,7 +17,7 @@ PLIST_FILES= bin/pic2fig share/man/man1/pic2fig.1.gz .include <bsd.port.pre.mk> -.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 index dbd2077a6627..af0d9c508ece 100644 --- a/print/ttf2pt1/Makefile +++ b/print/ttf2pt1/Makefile @@ -34,7 +34,7 @@ LIBS+= `pkg-config --libs freetype2` -lm .include <bsd.port.options.mk> -.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 index 92579e20d302..619b4e394551 100644 --- a/russian/xruskb/Makefile +++ b/russian/xruskb/Makefile @@ -30,7 +30,7 @@ MOTIF_CONFIGURE_OFF= --with-toolkit=none .include <bsd.port.options.mk> -.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 index baa2b0dbcb40..0939a799221b 100644 --- a/science/cgnslib/Makefile +++ b/science/cgnslib/Makefile @@ -54,7 +54,7 @@ TOOLS_CMAKE_ON= -DTCL_INCLUDE_PATH:STRING="${TCL_INCLUDEDIR}" \ .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index b0a00be72648..b665afc62876 100644 --- a/science/ghmm/Makefile +++ b/science/ghmm/Makefile @@ -23,7 +23,7 @@ CONFLICTS_INSTALL= graphviz # bin/cluster .include <bsd.port.pre.mk> -.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 index 910599381d70..fdb94350b313 100644 --- a/science/gtamsanalyzer/Makefile +++ b/science/gtamsanalyzer/Makefile @@ -18,12 +18,10 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/Source .include <bsd.port.options.mk> -.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 index 2f68e67d6116..a7da4ae422cf 100644 --- a/science/molscript/Makefile +++ b/science/molscript/Makefile @@ -38,7 +38,7 @@ PORTDOCS= * .include <bsd.port.pre.mk> -.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 index 884d2f3e7aae..6c6a554a8b5b 100644 --- a/science/paje/Makefile +++ b/science/paje/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index d4fe048259f5..9b0f21cbf582 100644 --- a/science/py-openbabel/Makefile +++ b/science/py-openbabel/Makefile @@ -21,7 +21,7 @@ BINARY_ALIAS= python=${PYTHON_CMD} .include <bsd.port.options.mk> 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 index 605210e1c6c1..ec708a014acd 100644 --- a/security/botan3/Makefile +++ b/security/botan3/Makefile @@ -85,11 +85,6 @@ PLIST_SUB+= HAS_PROCESSOR_RNG="" 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 index dfd4e13e9037..000000000000 --- 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 <botan/x509path.h> - #include <botan/x509self.h> - #include <botan/internal/calendar.h> -+ -+ #include <boost/range/algorithm.hpp> - #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 index ea5dea0ba368..c1e5cd698198 100644 --- a/security/identify/Makefile +++ b/security/identify/Makefile @@ -18,7 +18,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.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 index 3f05991bcd70..f5b0b5eb5e5d 100644 --- a/security/lasso/Makefile +++ b/security/lasso/Makefile @@ -36,7 +36,7 @@ PYTHON_CONFIGURE_ENABLE= python .include <bsd.port.options.mk> -.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 index df8e21ac4cb0..b311f237fd29 100644 --- a/security/libprelude/Makefile +++ b/security/libprelude/Makefile @@ -38,7 +38,7 @@ PERL_CONFIGURE_WITH= perl=${PERL} .include <bsd.port.options.mk> -.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 index 56f38feec174..d64676c27c7f 100644 --- a/security/mate-pam-helper/Makefile +++ b/security/mate-pam-helper/Makefile @@ -17,7 +17,7 @@ PLIST_FILES= bin/mate_pam_helper .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 9bda4e5f304e..922155f313e6 100644 --- a/security/monkeysphere/Makefile +++ b/security/monkeysphere/Makefile @@ -37,7 +37,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.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 index cec95fd3762d..334bad345350 100644 --- a/security/nss_compat_ossl/Makefile +++ b/security/nss_compat_ossl/Makefile @@ -24,7 +24,7 @@ INSTALL_TARGET= install-strip .include <bsd.port.options.mk> -.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 index 2a60ea9aa77e..6d6964abdb95 100644 --- a/security/opencryptoki/Makefile +++ b/security/opencryptoki/Makefile @@ -47,7 +47,7 @@ GROUPS= _pkcs11 .include <bsd.port.pre.mk> -.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 index c07c29a6dfb3..79aa67308179 100644 --- a/security/openvas/Makefile +++ b/security/openvas/Makefile @@ -41,7 +41,7 @@ GROUPS= ${USERS} .include <bsd.port.pre.mk> -.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 index 69be78e54bae..5b1f3a6a784e 100644 --- a/security/p5-Authen-SASL-Cyrus/Makefile +++ b/security/p5-Authen-SASL-Cyrus/Makefile @@ -19,7 +19,7 @@ CONFIGURE_ARGS= INC="-I${LOCALBASE}/include" .include <bsd.port.options.mk> -.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 index 88ec38c67b79..cbc6e746bb8b 100644 --- a/security/p5-Crypt-OpenSSL-PKCS10/Makefile +++ b/security/p5-Crypt-OpenSSL-PKCS10/Makefile @@ -20,7 +20,7 @@ MAKE_ARGS+= PASTHRU_INC=-I${OPENSSLINC} .include <bsd.port.pre.mk> -.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 index 32c8e2fb566f..92b74f01f50d 100644 --- a/security/palisade/Makefile +++ b/security/palisade/Makefile @@ -50,7 +50,7 @@ HEXL_LIB_DEPENDS= libhexl.so:security/hexl .include <bsd.port.pre.mk> -.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 index b6a793039eb2..698029dd0b20 100644 --- a/security/pam_ocra/Makefile +++ b/security/pam_ocra/Makefile @@ -27,7 +27,7 @@ PLIST_FILES= lib/pam_ocra.so \ .include <bsd.port.options.mk> -.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 index b19667bc3d00..5c1b4703308d 100644 --- a/security/pecl-crypto/Makefile +++ b/security/pecl-crypto/Makefile @@ -17,7 +17,7 @@ LDFLAGS+= -L${OPENSSLLIB} .include <bsd.port.options.mk> -.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 index e4c884e338ea..27911a16a7f9 100644 --- a/security/pidgin-encryption/Makefile +++ b/security/pidgin-encryption/Makefile @@ -35,7 +35,7 @@ NLS_CONFIGURE_ENABLE= nls .include <bsd.port.options.mk> -.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 index 808533e6b1e6..80ae2cdd38bb 100644 --- a/security/pks/Makefile +++ b/security/pks/Makefile @@ -34,7 +34,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index cb02cc6e5b07..27098432f3fd 100644 --- a/security/py-python-axolotl-curve25519/Makefile +++ b/security/py-python-axolotl-curve25519/Makefile @@ -16,7 +16,7 @@ USE_PYTHON= autoplist distutils .include <bsd.port.pre.mk> -.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 index d277d95af25a..af4f9c3b3710 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -56,7 +56,7 @@ LDAP_MESON_TRUE= ldap-support .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 8ca49907f055..1bc49fcb41e4 100644 --- a/security/softether-devel/Makefile +++ b/security/softether-devel/Makefile @@ -43,7 +43,7 @@ ALL_TARGET= build .include <bsd.port.options.mk> -.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 index aaf193f6fc59..b0cc8b416379 100644 --- a/security/softether/Makefile +++ b/security/softether/Makefile @@ -40,7 +40,7 @@ ALL_TARGET= build .include <bsd.port.options.mk> -.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 index a4e35dbde383..e811fd932e29 100644 --- a/security/starttls/Makefile +++ b/security/starttls/Makefile @@ -18,7 +18,7 @@ CONFIGURE_ARGS= --with-openssl=${OPENSSLBASE} .include <bsd.port.pre.mk> -.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 index ba85572a5dd6..f94f6305a2fd 100644 --- a/security/weggli/Makefile +++ b/security/weggli/Makefile @@ -132,7 +132,7 @@ PLIST_FILES= bin/${PORTNAME} .include <bsd.port.options.mk> -.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 index 2e7ed38373d2..2c1669929a60 100644 --- a/shells/ast-ksh/Makefile +++ b/shells/ast-ksh/Makefile @@ -48,7 +48,7 @@ STATIC_MAKE_ENV= LDFLAGS+=-static .include <bsd.port.pre.mk> -.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 index 9175376840f9..6a3b08cce770 100644 --- a/shells/klish/Makefile +++ b/shells/klish/Makefile @@ -19,7 +19,7 @@ INSTALL_TARGET= install-strip .include <bsd.port.options.mk> -.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 index 1685570aab9e..80ecf7e9b557 100644 --- a/sysutils/bareos20-server/Makefile +++ b/sysutils/bareos20-server/Makefile @@ -235,7 +235,7 @@ post-install: .include <bsd.port.options.mk> -.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 index cbfdcf1e22ee..536f62d4e0c5 100644 --- a/sysutils/bareos21-server/Makefile +++ b/sysutils/bareos21-server/Makefile @@ -233,7 +233,7 @@ post-install: .include <bsd.port.options.mk> -.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 index 92a539ec5fa3..5a16922884de 100644 --- a/sysutils/bareos22-server/Makefile +++ b/sysutils/bareos22-server/Makefile @@ -230,7 +230,7 @@ post-install: .include <bsd.port.options.mk> -.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 index 488f305450b0..e740523620e7 100644 --- a/sysutils/cramfs/Makefile +++ b/sysutils/cramfs/Makefile @@ -19,7 +19,7 @@ PLIST_FILES= sbin/cramfsck sbin/mkcramfs .include <bsd.port.options.mk> -.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 index 495e851f2f9f..38ab1337cd0b 100644 --- a/sysutils/fluent-bit/Makefile +++ b/sysutils/fluent-bit/Makefile @@ -43,8 +43,7 @@ SSL_CMAKE_OFF= -DFLB_TLS=Off .include <bsd.port.options.mk> -.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 index 7116d6544a20..df72146b9df7 100644 --- a/sysutils/fsc/Makefile +++ b/sysutils/fsc/Makefile @@ -19,7 +19,7 @@ GH_TAGNAME= ef16626 .include <bsd.port.options.mk> -.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 index 3ce24da5bf67..399089bb3ab2 100644 --- a/sysutils/ganglia-monitor-core/Makefile +++ b/sysutils/ganglia-monitor-core/Makefile @@ -53,7 +53,7 @@ GMETAD_SUB_LIST_OFF= GMETAD="\#" .include <bsd.port.options.mk> -.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 index 809e47480e67..de955aa5908d 100644 --- a/sysutils/gstopd/Makefile +++ b/sysutils/gstopd/Makefile @@ -13,7 +13,7 @@ PLIST_FILES= sbin/gstopd share/man/man8/gstopd.8.gz .include <bsd.port.options.mk> -.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 index 4aac48f936f7..97673f794e34 100644 --- a/sysutils/incron/Makefile +++ b/sysutils/incron/Makefile @@ -31,7 +31,7 @@ LDFLAGS+= -linotify .include <bsd.port.pre.mk> -.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 index 047b3a4f0756..24a0cb2bd962 100644 --- a/sysutils/mate-settings-daemon/Makefile +++ b/sysutils/mate-settings-daemon/Makefile @@ -74,7 +74,7 @@ PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index dfb7a9755074..1574df76dcc0 100644 --- a/sysutils/mtpfs/Makefile +++ b/sysutils/mtpfs/Makefile @@ -27,7 +27,7 @@ PLIST_FILES= bin/mtpfs .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 39b45ed4fc58..b7707316614f 100644 --- a/sysutils/pmt/Makefile +++ b/sysutils/pmt/Makefile @@ -16,7 +16,7 @@ PLIST_FILES= bin/pmt .include <bsd.port.pre.mk> -.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 index 0e109c37cba3..260b319497e2 100644 --- a/sysutils/socklog/Makefile +++ b/sysutils/socklog/Makefile @@ -24,7 +24,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index 750e946b346e..066b4f563957 100644 --- a/sysutils/zeitgeist/Makefile +++ b/sysutils/zeitgeist/Makefile @@ -48,7 +48,7 @@ DATAHUB_CONFIGURE_ENABLE= datahub .include <bsd.port.options.mk> -.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 index 9b19551a2f7f..36012ee3bd09 100644 --- a/textproc/augeas/Makefile +++ b/textproc/augeas/Makefile @@ -29,7 +29,7 @@ LENSESDIR= ${PREFIX}/share/augeas/lenses .include <bsd.port.pre.mk> -.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 index 810c8e3525cc..572c0eb4c624 100644 --- a/textproc/gdome2/Makefile +++ b/textproc/gdome2/Makefile @@ -33,7 +33,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index 57db2c5ee13a..165388ce66da 100644 --- a/textproc/jshon/Makefile +++ b/textproc/jshon/Makefile @@ -27,7 +27,7 @@ ZSH_PLIST_FILES= share/zsh/site-functions/jshon_zsh_completion .include <bsd.port.pre.mk> -.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 index 03fe292dccbd..919d57804749 100644 --- a/textproc/mgdiff/Makefile +++ b/textproc/mgdiff/Makefile @@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} .include <bsd.port.options.mk> -.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 index f8d68483e5e5..4e2c0b6ed002 100644 --- a/textproc/p5-Senna/Makefile +++ b/textproc/p5-Senna/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ARGS+=</dev/null .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index c802d99ae172..1bb678492398 100644 --- a/textproc/p5-XML-Bare/Makefile +++ b/textproc/p5-XML-Bare/Makefile @@ -17,7 +17,7 @@ USE_PERL5= configure .include <bsd.port.pre.mk> -.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 index d284a79a1f14..4f7ab8bd2f25 100644 --- a/textproc/rman/Makefile +++ b/textproc/rman/Makefile @@ -14,7 +14,7 @@ PLIST_FILES= bin/rman share/man/man1/rman.1.gz .include <bsd.port.options.mk> -.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 index 0cc5396c87b0..07d0e46d8dbf 100644 --- a/textproc/sary/Makefile +++ b/textproc/sary/Makefile @@ -19,7 +19,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.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 index 032924459a13..ae58bd664ad5 100644 --- a/textproc/wv/Makefile +++ b/textproc/wv/Makefile @@ -32,7 +32,7 @@ MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ .include <bsd.port.options.mk> -.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 index e80b858d4fd0..dbfbd875f398 100644 --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -58,7 +58,7 @@ USER_CFLAGS_OFF= -DNO_USER_SUPPORT .include <bsd.port.options.mk> -.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 index 3f454cca5036..8e90ae793530 100644 --- a/www/grr/Makefile +++ b/www/grr/Makefile @@ -19,7 +19,7 @@ USE_GNUSTEP= back build .include <bsd.port.options.mk> -.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 index 63535191eaf8..f72664b84657 100644 --- a/www/libdatachannel/Makefile +++ b/www/libdatachannel/Makefile @@ -25,7 +25,7 @@ CMAKE_ON= USE_SYSTEM_SRTP NO_EXAMPLES NO_TESTS .include <bsd.port.pre.mk> -.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 index 752878a03462..871993da0e54 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -25,7 +25,7 @@ CPE_VENDOR= w3c .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 1d48bd26a6e0..d27fa66e89dd 100644 --- a/www/mod_auth_mysql2/Makefile +++ b/www/mod_auth_mysql2/Makefile @@ -28,7 +28,7 @@ OPENSSL_VARS= AP_EXTRAS+=-DMYSQL_USE_SSL .include <bsd.port.pre.mk> -.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 index e3072264212d..9fc26053c3aa 100644 --- a/www/newsboat/Makefile +++ b/www/newsboat/Makefile @@ -40,8 +40,7 @@ TESTING_UNSAFE= https://github.com/newsboat/newsboat/issues/2783 .include <bsd.port.options.mk> -.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 index a08f33809d3a..0f7673f18de0 100644 --- a/www/nghttp2/Makefile +++ b/www/nghttp2/Makefile @@ -57,10 +57,6 @@ HPACK_LIB_DEPENDS= libjansson.so:devel/jansson .include <bsd.port.options.mk> -.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 index 932cc6aebff9..000000000000 --- 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 index 5ccc74e4be9a..60950dda07b0 100644 --- a/www/p5-CGI-SpeedyCGI/Makefile +++ b/www/p5-CGI-SpeedyCGI/Makefile @@ -25,7 +25,7 @@ APACHE_CONFIGURE_ENV_OFF= WITHOUT_APACHE=yes .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index d1061a98b19e..1825cd690e1f 100644 --- a/www/p5-HTTP-MHTTP/Makefile +++ b/www/p5-HTTP-MHTTP/Makefile @@ -22,7 +22,7 @@ MAKE_JOBS_UNSAFE= yes .include <bsd.port.pre.mk> -.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 index d72b8769c747..d4664051c7a8 100644 --- a/www/sogo/Makefile +++ b/www/sogo/Makefile @@ -59,11 +59,11 @@ SUB_LIST+= GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \ .include <bsd.port.pre.mk> -.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 index d4ba5d058113..324a1a6dfe9a 100644 --- a/www/wget2/Makefile +++ b/www/wget2/Makefile @@ -110,7 +110,7 @@ BZIP2_CONFIGURE_WITH= bzip2 .include <bsd.port.pre.mk> -.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 index bcbf83aa4182..614cdaa40786 100644 --- a/x11-toolkits/aquamarine/Makefile +++ b/x11-toolkits/aquamarine/Makefile @@ -30,11 +30,6 @@ USE_XORG= pixman 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 index ce546c473f88..3fcf44433f0c 100644 --- a/x11-toolkits/blt/Makefile +++ b/x11-toolkits/blt/Makefile @@ -47,7 +47,7 @@ post-install: 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 index d217a5253042..1b35f0600cf7 100644 --- a/x11-toolkits/granite/Makefile +++ b/x11-toolkits/granite/Makefile @@ -26,7 +26,7 @@ PLIST_SUB= DISTVERSION=${DISTVERSION} .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 4450933a750a..8f63a4289f44 100644 --- a/x11-toolkits/itk/Makefile +++ b/x11-toolkits/itk/Makefile @@ -31,7 +31,7 @@ ITK_LIB_FILE= ${ITK_LIB}.${SHLIB_MAJOR} .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index e632111a4ea7..e44256b0bff2 100644 --- a/x11-toolkits/rep-gtk2/Makefile +++ b/x11-toolkits/rep-gtk2/Makefile @@ -29,7 +29,7 @@ PLIST_FILES= include/rep-gtk/rep-gtk.h lib/rep/gui/gtk-2/gtk.a \ .include <bsd.port.options.mk> -.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 index 39e62b69ef71..3341c88a03d1 100644 --- a/x11-toolkits/swt/Makefile +++ b/x11-toolkits/swt/Makefile @@ -52,7 +52,7 @@ post-extract: @${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 index 3c6c9e1e2002..5fa7c6008d1c 100644 --- a/x11-toolkits/tix/Makefile +++ b/x11-toolkits/tix/Makefile @@ -24,7 +24,7 @@ TIX_LIB_FILE= ${TIX_LIB}.0 .include <bsd.port.pre.mk> -.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 index b981c5d8c8b8..687791cf7ce9 100644 --- a/x11-toolkits/tktable/Makefile +++ b/x11-toolkits/tktable/Makefile @@ -22,7 +22,7 @@ TEST_TARGET= test .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 7b119128b094..c25fc6f109ce 100644 --- a/x11-toolkits/xbae/Makefile +++ b/x11-toolkits/xbae/Makefile @@ -24,7 +24,7 @@ INSTALL_TARGET= install-strip .include <bsd.port.options.mk> -.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 index 22d4aefd1d32..789c7e6da049 100644 --- a/x11-toolkits/xmhtml/Makefile +++ b/x11-toolkits/xmhtml/Makefile @@ -25,7 +25,7 @@ LIBTOOL= libtool .include <bsd.port.options.mk> -.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 index 16da3445787a..76414e0c8d2f 100644 --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -70,7 +70,7 @@ SVG_USE= GNOME=librsvg2 .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${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 index 81dc2eb3d31f..e423b9b9245f 100644 --- a/x11-wm/euclid-wm/Makefile +++ b/x11-wm/euclid-wm/Makefile @@ -42,7 +42,7 @@ XINERAMA_ALL_TARGET= euclid-wm .include <bsd.port.pre.mk> 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 index 54494abcb24b..25c15c72d68f 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -39,11 +39,6 @@ LDFLAGS+= -Wl,--as-needed # GL, pango deps # 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 index 2d1e3f7602f7..000000000000 --- 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<char, const std::chrono::hh_mm_ss<std::chrono::duration<long long, std::ratio<1, 1000000>>> &>::basic_format_string<char[6]>' 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<std::chrono::days>(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::days>(std::chrono::system_clock::now())}; -+ auto c = std::chrono::hh_mm_ss{std::chrono::system_clock::now() - std::chrono::floor<std::chrono::days>(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<Args...> ensures that vformat never throw std::format_error diff --git a/x11/budgie-desktop/Makefile b/x11/budgie-desktop/Makefile index 4dd552df30dc..94b0fa6228a0 100644 --- a/x11/budgie-desktop/Makefile +++ b/x11/budgie-desktop/Makefile @@ -74,7 +74,7 @@ GLIB_SCHEMAS= 20_buddiesofbudgie.budgie-desktop.notifications.gschema.override \ .include <bsd.port.options.mk> -.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 index e3eb89bac046..0cf8024f64d7 100644 --- a/x11/florence/Makefile +++ b/x11/florence/Makefile @@ -37,7 +37,7 @@ NLS_USES= gettext .include <bsd.port.options.mk> -.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 index 20e35361a342..7792f6caf967 100644 --- a/x11/hyprcursor/Makefile +++ b/x11/hyprcursor/Makefile @@ -24,11 +24,6 @@ USE_GNOME= cairo librsvg2 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 index 3c8f65ec3c43..f416239167f7 100644 --- a/x11/hypridle/Makefile +++ b/x11/hypridle/Makefile @@ -22,12 +22,6 @@ LDFLAGS+= -Wl,--as-needed # sdbus-cpp deps 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 index 0e433fa47ed4..503ed95bbbdf 100644 --- a/x11/hyprlock/Makefile +++ b/x11/hyprlock/Makefile @@ -28,11 +28,6 @@ LDFLAGS+= -Wl,--as-needed # pango deps 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 index ebdbdf88f226..8dab8c74a064 100644 --- a/x11/hyprpaper/Makefile +++ b/x11/hyprpaper/Makefile @@ -23,11 +23,6 @@ USE_GITHUB= yes 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 index 83f2a7f0d12a..8acca37ab5b8 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -71,8 +71,7 @@ DOCS_MAKE_ENV= BUILD_DOCS=yes .include <bsd.port.options.mk> -.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 index 0cacd53c17eb..e7e29c60f817 100644 --- a/x11/libsx/Makefile +++ b/x11/libsx/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.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 index 2de4b4311c91..9881154b0479 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -53,7 +53,7 @@ PAM_CONFIGURE_ON= --with-pamdir=${LOCALBASE}/etc/pam.d/ .include <bsd.port.options.mk> -.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 index 764ea43246b5..2fcad9c7f016 100644 --- a/x11/xdg-desktop-portal-hyprland/Makefile +++ b/x11/xdg-desktop-portal-hyprland/Makefile @@ -35,9 +35,4 @@ PLIST_FILES= bin/hyprland-share-picker \ 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 <bsd.port.mk> diff --git a/x11/xskyroot/Makefile b/x11/xskyroot/Makefile index 1fa6cbbf1b78..8a0298fce8a8 100644 --- a/x11/xskyroot/Makefile +++ b/x11/xskyroot/Makefile @@ -25,7 +25,7 @@ PLIST_FILES= bin/xskyroot .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif |