Index: emulators/i386-wine-devel/Makefile.amd64 =================================================================== --- emulators/i386-wine-devel/Makefile.amd64 +++ emulators/i386-wine-devel/Makefile.amd64 @@ -32,8 +32,8 @@ .endif .endfor -.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000)) -IGNORE= binaries compiled for FreeBSD 11.3+, 12.1+ and 13.0-CURRENT (OSVERSION >= 1300084) only +.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000)) +IGNORE= binaries compiled for FreeBSD 11.4+, 12.1+ and 13.0-CURRENT (OSVERSION >= 1300084) only .endif OPTIONS_DEFINE= GECKO MONO Index: emulators/i386-wine/Makefile.amd64 =================================================================== --- emulators/i386-wine/Makefile.amd64 +++ emulators/i386-wine/Makefile.amd64 @@ -33,8 +33,8 @@ .endif .endfor -.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000)) -IGNORE= binaries compiled for FreeBSD 11.3+, 12.1+ and 13.0-CURRENT (OSVERSION >= 1300084) only +.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000)) +IGNORE= binaries compiled for FreeBSD 11.4+, 12.1+ and 13.0-CURRENT (OSVERSION >= 1300084) only .endif OPTIONS_DEFINE= GECKO MONO Index: emulators/mesen/Makefile =================================================================== --- emulators/mesen/Makefile +++ emulators/mesen/Makefile @@ -28,22 +28,22 @@ MAKEFILE= makefile MAKE_ARGS= MESENPLATFORM=${MESEN_ARCH} \ CC="${CC}" CPPC="${CXX}" \ + LTO=true \ SYSTEM_LIBEVDEV=true MESEN_ARCH= ${ARCH:S/amd64/x64/:S/i386/x86/} .if exists(/usr/lib/libc++fs.a) +# XXX Remove after FreeBSD 12.1 EOL MAKE_ARGS+= FSLIB=-lc++fs -.elif exists(/usr/lib/libc++experimental.a) -# XXX Remove after FreeBSD 12.0 EOL -MAKE_ARGS+= FSLIB=-lc++experimental .else -# XXX Remove after FreeBSD 11.2 EOL -USE_GCC= yes +# Not required with libc++9 or libstdc++9 +# https://github.com/llvm/llvm-project/commit/cc37af7a3631 +# https://github.com/gcc-mirror/gcc/commit/3935f409704b +MAKE_ARGS+= FSLIB= # empty .endif -# XXX Always enable LTO after FreeBSD 11.2 and 12.0 EOL -.if defined(USE_GCC) || (${/usr/bin/ld:L:tA} == /usr/bin/ld.lld) -MAKE_ARGS+= LTO=true +.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) +LDFLAGS+= -fuse-ld=lld .endif OPTIONS_MULTI= FRONTENDS Index: graphics/drm-fbsd11.2-kmod/pkg-descr =================================================================== --- graphics/drm-fbsd11.2-kmod/pkg-descr +++ graphics/drm-fbsd11.2-kmod/pkg-descr @@ -1,6 +1,6 @@ amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components. Currently corresponding to Linux 4.11 DRM. -This version is for FreeBSD 11.3. +This version is for FreeBSD 11.4. amdgpu and radeonkms are known to fail with EFI boot. WWW: https://github.com/FreeBSDDesktop/kms-drm Index: graphics/drm-kmod/Makefile =================================================================== --- graphics/drm-kmod/Makefile +++ graphics/drm-kmod/Makefile @@ -16,15 +16,15 @@ IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) .else .if ${ARCH} != "amd64" -.if ${OSVERSION} >= 1200080 +.if ${OSVERSION} >= 1201000 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-legacy-kmod -.elif ${OSVERSION} < 1200080 -IGNORE= legacy kmod not required on less than 12.0 +.else +IGNORE= legacy kmod not required on less than 12.1 .endif .else -.if ${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000 +.if ${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod -.elif ${OSVERSION} >= 1200058 && ${OSVERSION} < 1300000 +.elif ${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod .elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300108 IGNORE= not supported on older 13, no kernel support Index: graphics/dspdfviewer/Makefile =================================================================== --- graphics/dspdfviewer/Makefile +++ graphics/dspdfviewer/Makefile @@ -42,11 +42,12 @@ .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200039 && ${CHOSEN_COMPILER_TYPE} == clang +# (rene) also related to issue #191 which is still open as of 2020-10-21 CFLAGS+= -Wno-error=zero-as-null-pointer-constant .endif # Fixes build failure for Clang 8.0.0 -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1300014 || (${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) || ${OSVERSION} >= 1201000) && ${CHOSEN_COMPILER_TYPE} == clang +.if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -Wno-error=extra-semi-stmt .endif Index: graphics/linux-c7-libdrm/Makefile =================================================================== --- graphics/linux-c7-libdrm/Makefile +++ graphics/linux-c7-libdrm/Makefile @@ -19,8 +19,8 @@ .include -.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1103501 \ - || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1201501) \ +.if ${OPSYS} == FreeBSD && \ + ((${OSVERSION} >= 1200000 && ${OSVERSION} < 1201501) \ || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300048)) PORTVERSION= 2.4.91 DISTVERSIONSUFFIX= -3.el7 Index: lang/gnatcross-binutils-aarch64/Makefile =================================================================== --- lang/gnatcross-binutils-aarch64/Makefile +++ lang/gnatcross-binutils-aarch64/Makefile @@ -9,7 +9,7 @@ COMMENT= Infrastructure for C/Ada FreeBSD cross-compiler (aarch64) BRANCH2= # Assume aarch64 will always be only CPU for FreeBSD/ARM64 -XCCTARGET= aarch64-aux-freebsd11.3 +XCCTARGET= aarch64-aux-freebsd11.4 PREFIX= ${LOCALBASE}/FreeBSD_ARM64 SRPREFIX= ${PREFIX}/sysroot SYSROOT= gnatcross-sysroot-aarch64 Index: lang/gnatcross-sysroot-aarch64/Makefile =================================================================== --- lang/gnatcross-sysroot-aarch64/Makefile +++ lang/gnatcross-sysroot-aarch64/Makefile @@ -5,11 +5,11 @@ PORTVERSION= 1 PORTREVISION= 1 CATEGORIES= lang -MASTER_SITES= ${PUB_FREEBSD}/releases/arm64/aarch64/11.3-RELEASE/ +MASTER_SITES= ${PUB_FREEBSD}/releases/arm64/aarch64/11.4-RELEASE/ PKGNAMEPREFIX= gnatcross- PKGNAMESUFFIX= -aarch64 DISTNAME= base -DIST_SUBDIR= gnatcross/arm64-aarch64/R11_3 +DIST_SUBDIR= gnatcross/arm64-aarch64/R11_4 MAINTAINER= ports@FreeBSD.org COMMENT= FreeBSD sysroots for C/Ada cross-compiler (${ARCH}) @@ -34,7 +34,7 @@ @${MKDIR} ${STAGEDIR}${PREFIX}/sysroot @${MV} ${WRKDIR}/lib ${STAGEDIR}${PREFIX}/sysroot @${MV} ${WRKDIR}/usr ${STAGEDIR}${PREFIX}/sysroot - @${ECHO_CMD} aarch64-aux-freebsd11.3 > ${STAGEDIR}${PREFIX}/sysroot/target_triplet + @${ECHO_CMD} aarch64-aux-freebsd11.4 > ${STAGEDIR}${PREFIX}/sysroot/target_triplet @(cd ${STAGEDIR}${PREFIX}; ${FIND} sysroot -type d -empty -delete) @(cd ${STAGEDIR}${PREFIX}; ${FIND} sysroot \( -type f -or -type l \) \ | ${SORT} >> ${TMPPLIST}) Index: sysutils/ebsnvme-id/Makefile =================================================================== --- sysutils/ebsnvme-id/Makefile +++ sysutils/ebsnvme-id/Makefile @@ -22,7 +22,7 @@ .include -.if (${OSVERSION} < 1103501) || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200516) || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300039) +.if ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300039 IGNORE= needs NVME_GET_NSID ioctl .endif Index: sysutils/p5-BSD-Jail-Object/files/patch-Object.pm =================================================================== --- sysutils/p5-BSD-Jail-Object/files/patch-Object.pm +++ sysutils/p5-BSD-Jail-Object/files/patch-Object.pm @@ -8,9 +8,9 @@ ! version information along with the cached data. ! Look at usr.sbin/{jail,jls,jexec} sources for the right ideas. ! ---- ./Object.pm.orig 2006-08-08 04:54:29.000000000 +0000 -+++ ./Object.pm 2008-12-28 14:06:27.000000000 +0000 -@@ -317,21 +317,69 @@ +--- Object.pm.orig 2006-08-08 04:54:29 UTC ++++ Object.pm +@@ -317,21 +317,56 @@ struct xprison return NULL; } @@ -22,19 +22,13 @@ +_is_jail_ip4(char *string, struct xprison *xp) +{ + struct in_addr in; -+#if ((__FreeBSD_version >= 800056) || (__FreeBSD_version < 800000) && (__FreeBSD_version >= 701103)) + struct in_addr *iap; + char *q; + int i; -+#endif + + if (inet_pton(AF_INET, string, &in) != 1) + return (0); + -+#if ((__FreeBSD_version >= 800000 && __FreeBSD_version < 800056) || __FreeBSD_version < 701103) -+ if (in.s_addr == xp->pr_ip) -+ return (1); -+#else + if (xp->pr_ip4s == 0) + return (0); + q = (char *)(xp + 1); @@ -42,21 +36,15 @@ + for (i=0; i < xp->pr_ip4s; i++) + if (in.s_addr == iap[i].s_addr) + return (1); -+#endif + return (0); +} + +static void +_get_jail_ip4(struct xprison *xp, struct in_addr *ia) +{ -+#if ((__FreeBSD_version >= 800056) || (__FreeBSD_version < 800000) && (__FreeBSD_version >= 701103)) + struct in_addr *iap; + char *q; -+#endif + -+#if ((__FreeBSD_version >= 800000 && __FreeBSD_version < 800056) || __FreeBSD_version < 701103) -+ ia->s_addr = xp->pr_ip; -+#else + if (xp->pr_ip4s == 0) + ia->s_addr = 0; + else { @@ -64,7 +52,6 @@ + iap = (struct in_addr *)(void *)q; + ia->s_addr = iap[0].s_addr; + } -+#endif +} + // fetch a specific jail's information @@ -83,7 +70,7 @@ len = sysctl_len(); /* -@@ -341,15 +389,15 @@ +@@ -341,15 +376,15 @@ _find_jail( int compare, char *string ) */ for (i = 0; i < len / sizeof(*xp); i++) { @@ -101,7 +88,7 @@ Inline_Stack_Push( sv_2mortal( newSVpvf( inet_ntoa(in) ) )); Inline_Stack_Push( sv_2mortal( newSVpvf( xp->pr_host ) )); Inline_Stack_Push( sv_2mortal( newSVpvf( xp->pr_path ) )); -@@ -360,6 +408,7 @@ +@@ -360,6 +395,7 @@ _find_jail( int compare, char *string ) } } @@ -109,7 +96,7 @@ Inline_Stack_Done; } -@@ -367,12 +416,12 @@ +@@ -367,12 +403,12 @@ _find_jail( int compare, char *string ) void _find_jids() { @@ -124,7 +111,7 @@ len = sysctl_len(); for (i = 0; i < len / sizeof(*xp); i++) { -@@ -380,6 +429,7 @@ +@@ -380,6 +416,7 @@ _find_jids() xp++; } @@ -132,18 +119,15 @@ Inline_Stack_Done; } -@@ -402,8 +452,14 @@ +@@ -402,8 +439,9 @@ _create( char *path, char *hostname, char *ipaddr ) j.path = path; j.hostname = hostname; -+#if ((__FreeBSD_version >= 800000 && __FreeBSD_version < 800056) || __FreeBSD_version < 701103) - j.ip_number = ntohl( ip.s_addr ); - j.version = 0; -+#else +- j.ip_number = ntohl( ip.s_addr ); +- j.version = 0; + j.version = JAIL_API_VERSION; + j.ip4s = 1; + j.ip4 = &ip; -+#endif if ( (jid = jail( &j )) == -1 ) return 0; Index: www/falkon/pkg-message =================================================================== --- www/falkon/pkg-message +++ www/falkon/pkg-message @@ -1,11 +1,6 @@ [ { type: install message: <