Index: audio/supercollider/Makefile =================================================================== --- audio/supercollider/Makefile +++ audio/supercollider/Makefile @@ -13,6 +13,8 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_FreeBSD= fails to compile with Clang 8 due shipped Boost 1.66 libraries. Not compatible with Boost 1.70+, either + BUILD_DEPENDS= ${LOCALBASE}/include/boost/intrusive/unordered_set.hpp:devel/boost-libs LIB_DEPENDS= libavahi-client.so:net/avahi-app \ libavahi-common.so:net/avahi-app \ @@ -52,14 +54,6 @@ .if ! ${ARCH} == amd64 && ! ${ARCH} == i386 CMAKE_ARGS+= -DSSE:BOOL=FALSE -DSSE2:BOOL=FALSE -.endif - -.if ${OPSYS} == FreeBSD -.if ${OSVERSION} < 1200000 || \ - (${OSVERSION} >= 1200506 && ${OSVERSION} < 1300000) || \ - ${OSVERSION} >= 1300014 -BROKEN= fails to compile with Clang 8 due shipped Boost 1.66 libraries. Not compatible with Boost 1.70+, either -.endif .endif post-patch: 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 11.3/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-kmod/Makefile =================================================================== --- graphics/drm-kmod/Makefile +++ graphics/drm-kmod/Makefile @@ -24,10 +24,6 @@ .else .if ${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod -.elif ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200045 -IGNORE= not supported on older 12, no kernel support -.elif ${OSVERSION} >= 1200045 && ${OSVERSION} < 1200058 -RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod .elif ${OSVERSION} >= 1200058 && ${OSVERSION} < 1300000 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod .elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300029 Index: graphics/gpu-firmware-kmod/Makefile =================================================================== --- graphics/gpu-firmware-kmod/Makefile +++ graphics/gpu-firmware-kmod/Makefile @@ -24,10 +24,4 @@ GH_PROJECT= kms-firmware GH_TAGNAME= c9eb7f3 -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200019 -IGNORE= not supported on older CURRENT, no kernel support -.endif - -.include +.include Index: graphics/rawtherapee/Makefile =================================================================== --- graphics/rawtherapee/Makefile +++ graphics/rawtherapee/Makefile @@ -41,9 +41,7 @@ # As of 2019-09-29, this port is known to be miscompiled by clang90 # (SIGSEGV or SIBGUS) and 12.1's base clang. # -# FreeBSD 11.2/12.0's base clang 6.0.1 emits worse code with -# considerably higher processing times, and on i386 additional calls to -# __atomic_*(), so we shall stick to GCC 9.x for now +# so we shall stick to GCC 9.x for now USE_GCC= 9+ _LTO_FLAGS= -flto=${MAKE_JOBS_NUMBER} @@ -116,7 +114,7 @@ .if (${OPSYS} == FreeBSD) && (${OSVERSION} >= 1300000) # don't waste everybody's time with Tier-2 and moving targets. # might add ARM64 or SPARC64 later on if they are established by the -# time FreeBSD 12 is out. +# time FreeBSD 13 is out. ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON=Only amd64 is supported on non-released FreeBSD versions. .endif Index: net-mgmt/kapacitor/Makefile =================================================================== --- net-mgmt/kapacitor/Makefile +++ net-mgmt/kapacitor/Makefile @@ -44,14 +44,6 @@ USERS= ${KAPACITORD_USER} GROUPS= ${KAPACITORD_GROUP} -.include - -.if ${OPSYS} == "FreeBSD" && (${OSVERSION} < 1200000 || ${OSVERSION} >= 1200015) -SUB_LIST+= KAPACITORD_LOGCMD="daemon" -.else -SUB_LIST+= KAPACITORD_LOGCMD="logger" -.endif - KAPACITORD_DBDIR= /var/db/${PORTNAME}/ KAPACITORD_LOGDIR= /var/log/${PORTNAME}/ @@ -65,4 +57,4 @@ ${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf \ ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample -.include +.include Index: net-mgmt/kapacitor/files/kapacitord.in =================================================================== --- net-mgmt/kapacitor/files/kapacitord.in +++ net-mgmt/kapacitor/files/kapacitord.in @@ -35,7 +35,7 @@ kapacitord_pidfile="/var/run/${name}.pid" procname="%%PREFIX%%/bin/${name}" command=/usr/sbin/daemon -start_cmd="kapacitord_startcmd_%%KAPACITORD_LOGCMD%%" +start_cmd="kapacitord_startcmd_daemon" kapacitord_startcmd_daemon() { Index: net/bnxt-kmod/Makefile =================================================================== --- net/bnxt-kmod/Makefile +++ net/bnxt-kmod/Makefile @@ -10,6 +10,9 @@ LICENSE= BSD2CLAUSE +DEPRECATED= Unsupported on all supported FreeBSD versions +EXPIRATION_DATE=2020-06-28 + USES= kmod BUILD_WRKSRC= ${WRKSRC}/sys/modules/bnxt @@ -40,14 +43,4 @@ ${INSTALL_MAN} ${WRKSRC}/share/man/man4/bnxt.4 ${STAGEDIR}${MAN4PREFIX}/man/man4/ ${LN} -f ${STAGEDIR}${MAN4PREFIX}/man/man4/bnxt.4 ${STAGEDIR}${MAN4PREFIX}/man/man4/if_bnxt.4 -.include - -SUPPORTED= no -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200002 && ${OSVERSION} <= 1200014 -SUPPORTED= yes -.endif -.if ${SUPPORTED} == no -IGNORE= not supported on this version of FreeBSD -.endif - -.include +.include Index: net/ceph13/Makefile =================================================================== --- net/ceph13/Makefile +++ net/ceph13/Makefile @@ -109,18 +109,6 @@ PLIST_SUB= CMAKE_BUILD_TYPE_regex=\bdebug\b -.include - -# 11.2 and 12.0 RELEASE has clang60 and will give versioning errors -.if (${OSVERSION} < 1102507) || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200099) -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang80:devel/llvm80 -CC= clang80 -CXX= clang++80 -ASM= clang80 -.endif - -.include - pre-configure: ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build ${CP} files/file-git_version ${WRKSRC}/src/.git_version @@ -168,4 +156,4 @@ ${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d ${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample -.include +.include Index: net/ceph14/Makefile =================================================================== --- net/ceph14/Makefile +++ net/ceph14/Makefile @@ -109,18 +109,6 @@ PLIST_SUB= CMAKE_BUILD_TYPE_regex=\bdebug\b -.include - -# 11.2 and 12.0 RELEASE has clang60 and will give versioning errors -.if (${OSVERSION} < 1102507) || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200099) -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang80:devel/llvm80 -CC= clang80 -CXX= clang++80 -ASM= clang80 -.endif - -.include - pre-configure: [ -e ${WRKSRC}/build ] || ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build ${CP} files/file-git_version ${WRKSRC}/src/.git_version @@ -169,4 +157,4 @@ ${RM} -rf ${STAGEDIR}${PREFIX}/libexec/systemd ${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d -.include +.include Index: net/zerotier/Makefile =================================================================== --- net/zerotier/Makefile +++ net/zerotier/Makefile @@ -34,18 +34,18 @@ .include .if ${OPSYS} == "FreeBSD" -# log output via syslog when daemon(8) supports it -.if (${OSVERSION} < 1200000 || ${OSVERSION} >= 1200015) +# log output via syslog SUB_LIST+= ZEROTIER_SYSLOG="-s debug -T zerotier" -.else -SUB_LIST+= ZEROTIER_SYSLOG="" -.endif # after r347241 tun(4) and tap(4) have been merged to tuntap(4) .if (${OSVERSION} >= 1300028) SUB_LIST+= ZEROTIER_IF_TAP="if_tuntap" .else SUB_LIST+= ZEROTIER_IF_TAP="if_tap" .endif +.else +# we are not on FreeBSD +SUB_LIST+= ZEROTIER_IF_TAP="if_tap" \ + ZEROTIER_SYSLOG="" .endif do-install: Index: science/gromacs/Makefile =================================================================== --- science/gromacs/Makefile +++ science/gromacs/Makefile @@ -3,7 +3,7 @@ PORTNAME= gromacs DISTVERSION= 2020.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MASTER_SITES= ftp://ftp.gromacs.org/pub/gromacs/ @@ -18,7 +18,7 @@ BUILD_DEPENDS= boost-libs>=1.44:devel/boost-libs LIB_DEPENDS= libhwloc.so:devel/hwloc -USES= cmake fortran gnome perl5 pkgconfig shebangfix xorg # should be compiler:c++14-lang +USES= cmake compiler:c++14-lang fortran gnome perl5 pkgconfig shebangfix xorg SHEBANG_FILES= admin/*.sh scripts/*.pl scripts/*.sh src/gromacs/selection/*.sh bash_CMD= ${SH} USE_GNOME= libxml2 @@ -80,12 +80,6 @@ THREAD_MPI_DESC= Build a thread-MPI-based multithreaded version of GROMACS THREAD_MPI_CMAKE_BOOL= GMX_THREAD_MPI THREAD_MPI_PLIST_SUB= SUFFIX_MPI="" - -# build fails on 12.0 with clang-6, so force a newer compiler -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -CPP= clang-cpp${LLVM_DEFAULT} -CC= clang${LLVM_DEFAULT} -CXX= clang++${LLVM_DEFAULT} post-patch: @${FIND} ${WRKSRC} -name "CMakeLists.txt" | ${XARGS} \ Index: sysutils/dwatch-gource/Makefile =================================================================== --- sysutils/dwatch-gource/Makefile +++ sysutils/dwatch-gource/Makefile @@ -19,12 +19,6 @@ OPTIONS_DEFINE= DOCS -.include - -.if ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200065 -IGNORE= requires dwatch available in recent FreeBSD 11 or 12 -.endif - do-install: ${INSTALL_SCRIPT} ${WRKSRC}/gwatch ${STAGEDIR}${PREFIX}/sbin @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/dwatch Index: sysutils/dwatch-json/Makefile =================================================================== --- sysutils/dwatch-json/Makefile +++ sysutils/dwatch-json/Makefile @@ -20,12 +20,6 @@ OPTIONS_DEFINE= DOCS -.include - -.if ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200065 -IGNORE= requires dwatch available in recent FreeBSD 11 or 12 -.endif - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/dwatch ${INSTALL_DATA} ${WRKSRC}/json-* ${STAGEDIR}${PREFIX}/libexec/dwatch Index: sysutils/dwatch-pwsnoop/Makefile =================================================================== --- sysutils/dwatch-pwsnoop/Makefile +++ sysutils/dwatch-pwsnoop/Makefile @@ -20,12 +20,6 @@ OPTIONS_DEFINE= DOCS -.include - -.if ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200065 -IGNORE= requires dwatch available in recent FreeBSD 11 or 12 -.endif - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/dwatch ${INSTALL_DATA} ${WRKSRC}/pwsnoop ${STAGEDIR}${PREFIX}/libexec/dwatch Index: sysutils/iichid/Makefile =================================================================== --- sysutils/iichid/Makefile +++ sysutils/iichid/Makefile @@ -11,6 +11,7 @@ LICENSE= BSD2CLAUSE #LICENSE_FILE= Not yet packaged +IGNORE_FreeBSD_11= Requires FreeBSD 12.1 or later ONLY_FOR_ARCHS= aarch64 amd64 i386 ONLY_FOR_ARCHS_REASON= Requires architecture supporting ACPI @@ -30,10 +31,4 @@ post-patch: ${REINPLACE_CMD} -e '/usbhid.c/s/^/#/' ${WRKSRC}/Makefile -.include - -.if ${OSVERSION} < 1201000 -IGNORE= requires FreeBSD versions 12.1+, this system is running ${OSREL} -.endif - -.include +.include Index: www/node/Makefile =================================================================== --- www/node/Makefile +++ www/node/Makefile @@ -21,9 +21,6 @@ OPTIONS_DEFAULT= DTRACE OPTIONS_DEFAULT_FreeBSD_11= BUNDLED_SSL OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} -# FreeBSD 12.0-RELEASE includes OpenSSL 1.1.1a, but Node.js relies on 1.1.1d -OPTIONS_DEFAULT_FreeBSD_12_0= BUNDLED_SSL -OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}_${OSREL:E}} OPTIONS_SUB= yes .if !exists(/usr/sbin/dtrace) Index: www/node12/Makefile =================================================================== --- www/node12/Makefile +++ www/node12/Makefile @@ -22,9 +22,6 @@ OPTIONS_DEFAULT= DTRACE OPTIONS_DEFAULT_FreeBSD_11= BUNDLED_SSL OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} -# FreeBSD 12.0-RELEASE includes OpenSSL 1.1.1a, but Node.js relies on 1.1.1d -OPTIONS_DEFAULT_FreeBSD_12_0= BUNDLED_SSL -OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}_${OSREL:E}} OPTIONS_SUB= yes .if !exists(/usr/sbin/dtrace)