Date: Thu, 30 Sep 2021 21:27:40 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 620968a43a5f - main - cleanup: drop support for EOL FreeBSD 11.X Message-ID: <202109302127.18ULReMj041856@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=620968a43a5f9bb3fa98ab20f257a4c0d864caa7 commit 620968a43a5f9bb3fa98ab20f257a4c0d864caa7 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2021-09-11 14:57:58 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2021-09-30 21:23:30 +0000 cleanup: drop support for EOL FreeBSD 11.X Search criteria used: - 11.4 - OSREL* - OSVER* - *_FreeBSD_11 Input from: - adridg: devel/qca-legacy - jbeich: _WITH_DPRINTF, _WITH_GETLINE, GNU bfd workarounds - sunpoet: security/p5-*OpenSSL* Reviewed by: doceng, kde, multimedia, perl, python, ruby, rust Differential Revision: https://reviews.freebsd.org/D32008 Test Plan: make index --- MOVED | 2 + Mk/Scripts/rust-compat11-canary.sh | 2 +- Mk/Uses/qca.mk | 6 - Mk/bsd.port.mk | 2 +- Tools/scripts/tindex | 8 +- archivers/py-zstandard/Makefile | 1 - astro/kosmorro/Makefile | 21 +- astro/kosmorro/pkg-plist | 4 +- astro/qmapshack/Makefile | 2 - audio/csound/Makefile | 8 +- audio/moony-lv2/Makefile | 2 - audio/musicpd/files/patch-meson.build | 17 +- audio/surge-synthesizer-lv2/Makefile | 2 - ...e_vstgui_lib_platform_linux_x11fileselector.cpp | 5 +- audio/tagutil/Makefile | 3 - audio/vst3sdk/Makefile | 1 - ...4_vstgui_lib_platform_linux_x11fileselector.cpp | 3 +- base/gcc6/Makefile | 7 +- biology/abyss/Makefile | 1 - biology/ddocent/Makefile | 4 +- biology/igv/Makefile | 2 - biology/jalview/Makefile | 2 - biology/ncbi-cxx-toolkit/Makefile | 2 - .../files/patch-src_libslic3r_Thread.cpp | 45 --- cad/astk-serveur/Makefile | 3 +- cad/openvsp/Makefile | 1 - cad/stepcode/Makefile | 1 - .../files/patch-src__CMakeLists.txt | 10 - .../ibus-libpinyin/files/patch-src_PYLibPinyin.cc | 5 +- chinese/libpinyin/Makefile | 2 +- comms/aprsd/Makefile | 1 - comms/usbmuxd/files/patch-src_usb.c | 17 - databases/arrow/Makefile | 2 - databases/clickhouse/Makefile | 8 - databases/clickhouse/files/clickhouse.in | 11 +- databases/couchdb3/Makefile | 2 +- databases/foundationdb-devel/Makefile | 1 - databases/foundationdb/Makefile | 1 - databases/gnats4/Makefile | 1 - .../iowow/files/patch-src_platform_unix_unix.c | 13 +- databases/mariadb103-server/Makefile | 6 - databases/mariadb103-server/files/mysql-server.in | 14 +- databases/mariadb104-server/Makefile | 6 - databases/mariadb104-server/files/mysql-server.in | 14 +- databases/mariadb105-server/Makefile | 6 - databases/mariadb105-server/files/mysql-server.in | 14 +- databases/memcached/Makefile | 2 +- databases/mongodb36/Makefile | 6 - databases/mongodb36/files/mongod.in | 11 +- databases/mongodb40/Makefile | 6 - databases/mongodb40/files/mongod.in | 11 +- databases/mongodb42/Makefile | 7 - databases/mongodb42/files/mongod.in | 11 +- databases/mongodb44/Makefile | 6 - databases/mongodb44/files/mongod.in | 11 +- databases/mongodb50/Makefile | 6 - databases/mongodb50/files/mongod.in | 11 +- databases/mysql-connector-c/Makefile | 2 +- databases/mysql55-server/Makefile | 6 - databases/mysql55-server/files/mysql-server.in | 12 +- databases/mysql56-server/Makefile | 6 - databases/mysql56-server/files/mysql-server.in | 12 +- databases/mysql57-server/Makefile | 6 - databases/mysql57-server/files/mysql-server.in | 12 +- databases/mysql80-server/Makefile | 18 +- databases/mysql80-server/files/mysql-server.in | 12 +- databases/mysqlwsrep56-server/Makefile | 6 - .../mysqlwsrep56-server/files/mysql-server.in | 16 +- databases/mysqlwsrep57-server/Makefile | 10 +- .../mysqlwsrep57-server/files/mysql-server.in | 12 +- databases/percona56-server/Makefile | 6 - databases/percona56-server/files/mysql-server.in | 12 +- databases/percona57-server/Makefile | 6 - databases/percona57-server/files/mysql-server.in | 12 +- databases/rocksdb/Makefile | 1 - deskutils/ausweisapp2/Makefile | 6 - deskutils/easystroke/Makefile | 1 - deskutils/nextcloudclient/Makefile | 4 - deskutils/sysctlview/Makefile | 3 - devel/Makefile | 1 - devel/R-cran-data.table/Makefile | 12 +- devel/aml/files/patch-freebsd11 | 57 --- devel/android-tools-simpleperf/files/Makefile | 1 - devel/basu/Makefile | 5 - devel/bazel/Makefile | 1 - devel/bazel029/Makefile | 1 - devel/bear/Makefile | 7 - ...ource_intercept_source_report_libexec_Logger.cc | 10 - devel/bitkeeper/Makefile | 1 - devel/concurrencpp/Makefile | 2 - devel/creduce/Makefile | 1 - devel/dwarves/Makefile | 2 - devel/elfutils/Makefile | 1 - devel/evemu/Makefile | 2 +- devel/folly/Makefile | 1 - devel/freebsd-sysroot/Makefile | 2 - devel/goredo/Makefile | 6 - devel/hs-ShellCheck/Makefile | 4 - devel/indi/Makefile | 2 - devel/juce/Makefile | 2 - devel/llbuild/Makefile | 1 - devel/llvm10/Makefile | 6 - devel/llvm11/Makefile | 6 - devel/llvm12/Makefile | 6 - devel/llvm13/Makefile | 7 - devel/llvm70/Makefile | 6 - devel/llvm80/Makefile | 6 - devel/llvm90/Makefile | 6 - devel/nextpnr/Makefile | 1 - devel/p4/Makefile | 1 - devel/p4api/Makefile | 1 - devel/performance/Makefile | 1 - devel/ptlib/Makefile | 2 +- devel/py-keystone-engine/Makefile | 1 - devel/py-pycapsicum/files/patch-__pycapsicum.c | 16 - devel/qca-legacy/Makefile | 58 ---- devel/qca-legacy/distinfo | 3 - .../files/patch-plugins_qca-botan_CMakeLists.txt | 10 - .../files/patch-plugins_qca-ossl_ossl110-compat.h | 49 --- .../files/patch-plugins_qca-ossl_qca-ossl.cpp | 44 --- devel/qca-legacy/pkg-descr | 13 - devel/qca-legacy/pkg-plist | 33 -- devel/qca/Makefile | 8 +- devel/rubygem-rice/Makefile | 1 - devel/spirv-llvm-translator/Makefile | 5 - devel/zpu-gcc/Makefile | 1 - dns/bundy/Makefile | 1 - ...go-crates_libsodium-sys-stable-1.19.11_build.rs | 10 - dns/gdnsd3/Makefile | 10 +- dns/ldns/Makefile | 5 - dns/powerdns-recursor/Makefile | 16 +- dns/powerdns/Makefile | 16 +- editors/libreoffice/Makefile | 5 - editors/libreoffice6/Makefile | 5 - emulators/i386-wine-devel/Makefile | 2 +- emulators/i386-wine-devel/Makefile.amd64 | 6 +- emulators/i386-wine/Makefile | 2 +- emulators/i386-wine/Makefile.amd64 | 6 +- emulators/i386-wine/pkg-plist | 1 - emulators/libc6-shim/Makefile | 1 - emulators/linux_base-c7/Makefile | 3 +- emulators/mesen/Makefile | 17 +- emulators/qemu-devel/Makefile | 1 - emulators/qemu-guest-agent/Makefile | 6 - emulators/qemu-guest-agent/pkg-message-11 | 24 -- .../rpcs3/files/patch-rpcs3_Emu_system__config.h | 16 - emulators/rtc/files/rtc.c | 18 - emulators/sameboy/Makefile | 1 - emulators/xen-kernel/Makefile | 4 - emulators/yuzu/files/patch-freebsd11 | 46 --- finance/ledger/Makefile | 1 - french/aster/Makefile | 3 +- ftp/bsdftpd-ssl/Makefile | 4 - games/0ad/Makefile | 1 - games/eduke32/Makefile | 2 +- games/fishsupper/Makefile | 1 - games/hyperrogue/Makefile | 2 - games/lander/Makefile | 1 - games/libretro-snes9x/Makefile | 2 - games/libretro-snes9x2010/Makefile | 8 +- games/linux-steam-utils/Makefile | 1 - games/rlvm/Makefile | 6 - games/stockfish/Makefile | 1 - games/veloren/Makefile | 5 - graphics/Makefile | 1 - graphics/blender-lts28/Makefile | 4 - graphics/blender/Makefile | 4 - graphics/drm-fbsd11.2-kmod/Makefile | 38 -- graphics/drm-fbsd11.2-kmod/distinfo | 3 - graphics/drm-fbsd11.2-kmod/pkg-descr | 6 - graphics/drm-fbsd11.2-kmod/pkg-message | 21 -- graphics/drm-fbsd11.2-kmod/pkg-plist | 8 - graphics/drm-fbsd12.0-kmod/Makefile | 2 +- graphics/drm-kmod/Makefile | 4 +- graphics/dspdfviewer/Makefile | 2 +- graphics/libjxl/Makefile | 4 - graphics/mesa-devel/Makefile | 5 - graphics/mesa-devel/files/patch-freebsd11 | 34 -- graphics/mesa-dri/Makefile.common | 4 - .../files/extra-patch-src_util_build__id.c | 15 - graphics/openshadinglanguage/Makefile | 5 - graphics/pcl-pointclouds/Makefile | 1 - graphics/pixie/Makefile | 1 - graphics/rawtherapee/Makefile | 13 - irc/ircproxy/Makefile | 2 - java/bootstrap-openjdk11/Makefile | 2 - java/openjdk11/Makefile | 7 +- java/openjdk12/Makefile | 7 +- java/openjdk13/Makefile | 7 +- java/openjdk14/Makefile | 7 +- java/openjdk15/Makefile | 7 +- java/openjdk16/Makefile | 7 +- lang/ccl/Makefile | 7 +- lang/clover/Makefile | 1 - lang/crystal/Makefile | 1 - lang/gcc6-aux/Makefile | 12 +- lang/ghc/Makefile | 8 +- lang/gnustep-base/Makefile | 1 - lang/go/Makefile | 8 +- lang/hermes/Makefile | 6 - lang/ldc/Makefile | 2 +- lang/luajit-openresty/Makefile | 8 +- lang/perl5-devel/Makefile | 7 +- lang/perl5.30/Makefile | 7 +- lang/perl5.32/Makefile | 7 +- lang/perl5.34/Makefile | 7 +- lang/python310/Makefile | 4 +- lang/rust-bootstrap/Makefile | 2 - lang/rust/Makefile | 13 +- lang/zig-devel/Makefile | 1 - lang/zig/Makefile | 1 - mail/imapfilter/Makefile | 2 - mail/isync/Makefile | 8 +- mail/opensmtpd/Makefile | 9 +- mail/postfix-current/Makefile | 6 +- mail/postfix/Makefile | 6 +- mail/qpopper/Makefile | 2 +- mail/sendmail-devel/Makefile | 6 - mail/sendmail/Makefile | 10 - mail/sid-milter/Makefile | 2 - mail/thunderbird/files/patch-cubeb-oss | 5 +- math/clblas/Makefile | 1 - math/flann/files/patch-src_cpp_CMakeLists.txt | 27 -- math/libflame/Makefile | 4 - math/opensolaris-libm/Makefile | 15 +- math/openturns/Makefile | 2 - math/py-ducc0/Makefile | 2 - math/py-matplotlib/Makefile | 2 - math/pynac/Makefile | 6 - misc/free42/Makefile | 2 - misc/lxi-tools/Makefile | 1 - misc/xplr/Makefile | 11 +- .../aom/files/patch-aom__ports_arm__cpudetect.c | 40 +-- .../aom/files/patch-aom__ports_ppc__cpudetect.c | 14 +- multimedia/cclive/Makefile | 1 - multimedia/dav1d/files/patch-neon-freebsd11 | 41 --- multimedia/ffmpeg/Makefile | 13 - multimedia/gstreamer1-plugins-rust/Makefile | 1 - .../libvpx/files/patch-vpx__ports_arm__cpudetect.c | 36 +- .../libvpx/files/patch-vpx__ports_ppc__cpudetect.c | 14 +- multimedia/mkvtoolnix/Makefile | 1 - multimedia/obs-studio/Makefile | 1 - multimedia/subtitleripper/Makefile | 2 +- multimedia/svt-av1/Makefile | 4 - multimedia/svt-hevc/Makefile | 4 - multimedia/svt-vp9/Makefile | 4 - multimedia/vapoursynth-vmaf/Makefile | 5 - multimedia/vlc/Makefile | 5 - multimedia/vvdec/Makefile | 2 - multimedia/zoneminder/Makefile | 2 +- net-im/ejabberd/Makefile | 4 - net-im/jicofo/files/pkg-message.in | 8 +- net-im/jitsi-videobridge/files/pkg-message.in | 10 +- net-im/licq/Makefile | 1 - net-im/mtxclient/Makefile | 2 - net-im/tg_owt/Makefile | 6 - net-mgmt/kismet/Makefile | 2 +- net-mgmt/net-snmp/Makefile | 2 +- net-mgmt/netdata/Makefile | 3 - net-mgmt/nstat/Makefile | 8 +- net-mgmt/py-gstat_exporter/Makefile | 2 - net-p2p/monero-cli/Makefile | 4 - net-p2p/openethereum/Makefile | 2 - net-p2p/qtum/Makefile | 14 +- net/dhcprelya/Makefile | 2 +- net/hostapd-devel/Makefile | 2 - net/httping/Makefile | 2 +- net/krill/Makefile | 3 - net/libfabric/Makefile | 2 - net/libpfctl/Makefile | 1 - net/ntpsec/Makefile | 6 - net/openldap25-server/Makefile | 8 +- net/openntpd/Makefile | 13 - net/packetdrill/Makefile | 2 - net/qt5-network/Makefile | 5 - net/rdist6/Makefile | 2 +- net/rpki-client/Makefile | 8 +- net/socat/files/socat.in | 1 - net/usockets/Makefile | 1 - net/waypipe/files/patch-neon-freebsd11 | 55 --- net/wireguard-kmod/Makefile | 2 - net/wireguard/Makefile | 6 - print/pdf-tools/Makefile | 1 - science/siconos/Makefile | 1 - security/afl++/Makefile | 4 - security/botan2/Makefile | 4 - security/dsniff/Makefile | 6 +- security/fwbuilder/Makefile | 1 - security/gost-engine/Makefile | 5 - security/ipsec-tools/Makefile | 2 +- security/isal-kmod/Makefile | 1 - security/krb5-devel/Makefile | 2 - security/libfido2/Makefile | 1 - security/liboqs/Makefile | 1 - security/libretls/Makefile | 2 - security/ncrack/Makefile | 8 +- security/openiked-portable/Makefile | 8 +- security/p5-Crypt-OpenSSL-CA/Makefile | 2 +- security/p5-OpenCA-OpenSSL/Makefile | 6 +- security/pam_ssh_agent_auth/Makefile | 1 - security/pkcs11-tools/Makefile | 4 - security/pks/Makefile | 2 +- security/py-cryptography/Makefile | 11 - security/py-openssl/Makefile | 9 - security/racoon2/Makefile | 2 - security/seahorse/Makefile | 6 - security/softhsm2/Makefile | 2 - security/tpm2-tools/Makefile | 8 +- security/uacme/Makefile | 2 +- security/wpa_supplicant-devel/Makefile | 2 - security/zeek/Makefile | 1 - sysutils/acpica-tools/Makefile | 1 - sysutils/apache-mesos/Makefile | 2 - sysutils/arcconf/Makefile | 7 +- sysutils/barrier/Makefile | 2 - sysutils/bhyve+/Makefile | 4 +- sysutils/bhyve+/files/freebsd-11/patch-bhyve-shelp | 79 ----- sysutils/bhyve+/files/freebsd-11/patch-libvmmapi | 33 -- sysutils/bhyve+/files/freebsd-11/patch-virtio-9p | 385 --------------------- sysutils/bhyve+/files/freebsd-11/patch-vtd-fix | 211 ----------- .../files/patch-cf-execd_cf-execd-runagent.c | 15 - .../files/patch-cf-execd_cf-execd-runagent.c | 15 - sysutils/crate/Makefile | 2 - sysutils/ddpt/Makefile | 2 - sysutils/dtrace-toolkit/Makefile | 2 +- sysutils/fluent-bit/Makefile | 4 - sysutils/gnome-control-center/Makefile | 5 - sysutils/hexpeek/Makefile | 2 +- sysutils/hid-tools/Makefile | 2 - sysutils/iichid/Makefile | 1 - sysutils/ipmitool/Makefile | 2 +- sysutils/keyd/Makefile | 1 - sysutils/kvmclock-kmod/Makefile | 1 - sysutils/libdnf/Makefile | 2 - sysutils/netevent/Makefile | 1 - sysutils/nsysctl/Makefile | 3 - sysutils/nvme-cli/Makefile | 1 - sysutils/openzfs-kmod/Makefile | 2 +- sysutils/openzfs/Makefile | 2 +- sysutils/panicmail/Makefile | 11 +- sysutils/py-azure-cli-core/Makefile | 5 +- sysutils/rshim-user-space/Makefile | 2 +- sysutils/sdparm/Makefile | 2 - sysutils/sleuthkit/Makefile | 1 - sysutils/sysctlbyname-improved-kmod/Makefile | 6 - sysutils/sysctlinfo-kmod/Makefile | 5 - sysutils/tracker/Makefile | 5 - sysutils/tracker3/Makefile | 5 - sysutils/u-boot-master/Makefile | 8 - sysutils/u-boot-sopine-spi/Makefile | 1 - sysutils/uhidd/files/patch-less-basename | 286 --------------- sysutils/xen-tools/Makefile | 4 - sysutils/ztop/Makefile | 2 - textproc/apertium/Makefile | 1 - textproc/bsdgrep/Makefile | 4 +- textproc/dwdiff/Makefile | 1 - textproc/libucl/Makefile | 2 +- textproc/xmlwrapp/Makefile | 1 - www/chromium/Makefile | 1 - www/cpp-httplib/Makefile | 4 +- www/deno/Makefile | 1 - www/epiphany/Makefile | 8 +- www/firefox-esr/files/patch-cubeb-oss | 5 +- www/firefox/files/patch-freebsd11 | 21 -- www/h2o-devel/Makefile | 1 - www/h2o/Makefile | 1 - www/httest/Makefile | 8 +- www/lagrange/Makefile | 8 +- www/libdatachannel/Makefile | 8 +- www/mod_authnz_crowd/Makefile | 1 - www/mod_rpaf2/files/patch-mod__rpaf.c | 31 -- www/node/Makefile | 5 - www/node10/Makefile | 5 - www/node10/files/patch-common.gypi | 18 - www/node14/Makefile | 5 - www/polipo/files/pkg-install.in | 8 - www/quark/Makefile | 5 - www/sitecopy/Makefile | 2 +- www/trafficserver/Makefile | 6 - x11-drivers/xf86-video-intel/Makefile | 2 - x11-servers/xorg-server/Makefile | 5 +- x11-toolkits/gnustep-gui/Makefile | 2 - x11-toolkits/gtk40/Makefile | 5 - .../files/patch-include_wlr_types_wlr__seat.h | 26 -- x11-toolkits/wlroots/pkg-message | 2 - x11-wm/gamescope/Makefile | 1 - x11-wm/picom/files/patch-src_log.c | 21 -- x11/brisk-menu/Makefile | 7 - x11/foot/Makefile | 5 - x11/gnome-shell/Makefile | 5 - x11/kitty/Makefile | 5 - x11/libxkbcommon/Makefile | 1 - x11/nvidia-driver/Makefile | 2 - x11/squeekboard/Makefile | 1 - x11/taiga/Makefile | 1 - x11/waybar/Makefile | 1 - x11/wayland-logout/Makefile | 2 +- x11/xlockmore/Makefile | 4 - x11/xorg-minimal/Makefile | 10 +- 399 files changed, 171 insertions(+), 3400 deletions(-) diff --git a/MOVED b/MOVED index 46dd76627fa7..c76524ba3ca5 100644 --- a/MOVED +++ b/MOVED @@ -16498,3 +16498,5 @@ multimedia/sms1xxx-kmod|multimedia/webcamd|2021-09-30|Has expired: Supports DVB sysutils/cfengine311|sysutils/cfengine317|2021-09-30|Has expired: OpenSSL 1.1.X is not supported. sysutils/cfengine-masterfiles311|sysutils/cfengine-masterfiles317|2021-09-30|Has expired: cfengine311 will retire at FreeBSD 11 EOL mail/postfix35|mail/postfix|2021-09-30|Has expired: It is only here until FreeBSD 11 is EoL (Postfix >= 3.6 requires OpenSSL >= 1.1.x) +graphics/drm-fbsd11.2-kmod||2021-09-30|Removed, only useful on EOL FreeBSD 11.4 +devel/qca-legacy|devel/qca|2021-09-30|Removed, only useful on EOL FreeBSD 11.4 diff --git a/Mk/Scripts/rust-compat11-canary.sh b/Mk/Scripts/rust-compat11-canary.sh index ccc158cba664..64cd3dc2104c 100644 --- a/Mk/Scripts/rust-compat11-canary.sh +++ b/Mk/Scripts/rust-compat11-canary.sh @@ -3,7 +3,7 @@ set -eu set -o pipefail -if [ "${OPSYS}" != FreeBSD ] || [ "${OSVERSION}" -lt 1200000 ]; then +if [ "${OPSYS}" != FreeBSD ] ; then exit 0 fi diff --git a/Mk/Uses/qca.mk b/Mk/Uses/qca.mk index 5b5c49ae867c..72f46105946c 100644 --- a/Mk/Uses/qca.mk +++ b/Mk/Uses/qca.mk @@ -16,13 +16,7 @@ IGNORE+= USES=qca takes no arguments _QCA_LIB= libqca-qt5.so _QCA_DEFAULT_PORT= devel/qca -_QCA_LEGACY_PORT= devel/qca-legacy - -. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base -_QCA_CHOSEN_PORT= LEGACY -. else _QCA_CHOSEN_PORT= DEFAULT -. endif LIB_DEPENDS+= ${_QCA_LIB}:${_QCA_${_QCA_CHOSEN_PORT}_PORT} diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 493b15a59fff..866f45586523 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1177,7 +1177,7 @@ OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC .endif _EXPORTED_VARS+= OSVERSION -.if (${OPSYS} == FreeBSD && (${OSVERSION} < 1104000 || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1202000))) || \ +.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1202000) || \ (${OPSYS} == DragonFly && ${DFLYVERSION} < 400400) _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. diff --git a/Tools/scripts/tindex b/Tools/scripts/tindex index 57a74dd8c23f..8d6819fa6302 100755 --- a/Tools/scripts/tindex +++ b/Tools/scripts/tindex @@ -27,7 +27,6 @@ ERROR_ADDRESS=root@localhost # Location of ports tree and source trees export BASEDIR=/a/tindex export PORTSDIR=${BASEDIR}/ports -export SRCDIR11=${BASEDIR}/src.11 export SRCDIR12=${BASEDIR}/src.12 export SRCDIR13=${BASEDIR}/src.13 export SRCDIR14=${BASEDIR}/src.14 @@ -114,9 +113,6 @@ export INDEX_JOBS=3 export INDEX_QUIET=1 # First update the source trees to get current OSVERSION -${SVN} -q up ${SRCDIR11}/sys/sys -OSVERSION11=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR11}/sys/sys/param.h) - ${SVN} -q up ${SRCDIR12}/sys/sys OSVERSION12=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR12}/sys/sys/param.h) @@ -127,7 +123,7 @@ ${GIT} -C ${SRCDIR14} pull --rebase -q OSVERSION14=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR14}/sys/sys/param.h) cd ${PORTSDIR} -rm -f INDEX-11 INDEX-11.bz2 INDEX-12 INDEX-12.bz2 INDEX-13 INDEX-13.bz2 INDEX-14 INDEX-14.bz2 +rm -f INDEX-12 INDEX-12.bz2 INDEX-13 INDEX-13.bz2 INDEX-14 INDEX-14.bz2 OLD_HEAD=$(${GIT} rev-parse HEAD) if ! ${GIT} pull --ff-only > git.log 2>&1 ; then (echo "Git update failed with conflicts:"; @@ -135,7 +131,7 @@ if ! ${GIT} pull --ff-only > git.log 2>&1 ; then exit 1 fi -for branch in 11.x 12.x 13.x 14.x; do +for branch in 12.x 13.x 14.x; do release=$(echo $branch | sed -e 's,.x,,') eval _osver=\$OSVERSION${release} diff --git a/archivers/py-zstandard/Makefile b/archivers/py-zstandard/Makefile index cda12bea3fdc..6f6fe4343c68 100644 --- a/archivers/py-zstandard/Makefile +++ b/archivers/py-zstandard/Makefile @@ -9,7 +9,6 @@ COMMENT= Zstandard bindings for Python, a full-featured version LICENSE= BSD2CLAUSE -BROKEN_FreeBSD_11_powerpc64= fails to build: cffi.error.CDefError: parse error BROKEN_FreeBSD_12_powerpc64= fails to build: cffi.error.CDefError: parse error BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8.0:devel/py-cffi@${PY_FLAVOR} diff --git a/astro/kosmorro/Makefile b/astro/kosmorro/Makefile index ce88825eade5..9af2d2c9f8bc 100644 --- a/astro/kosmorro/Makefile +++ b/astro/kosmorro/Makefile @@ -13,7 +13,8 @@ LICENSE= AGPLv3 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}\ - ${PYTHON_PKGNAMEPREFIX}kosmorrolib>0:astro/py-kosmorrolib@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}kosmorrolib>0:astro/py-kosmorrolib@${PY_FLAVOR} \ + ronn:textproc/rubygem-ronn RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}\ @@ -32,25 +33,9 @@ PDF_RUN_DEPENDS=pdflatex:print/tex-formats NO_ARCH= yes -.include <bsd.port.pre.mk> - -# ronn is broken on 11.x => do not build manpages -.if ${OSVERSION} < 1200000 -PLIST_SUB+= MAN="@comment " -.else -BUILD_DEPENDS+= ronn:textproc/rubygem-ronn -PLIST_SUB+= MAN="" -.endif - pre-configure: ${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' ${WRKSRC}/Makefile -.if ${OSVERSION} < 1200000 - ${REINPLACE_CMD} -e 's|i18n manpages|manpages|' ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e '/manpage\/kosmorro/d' ${WRKSRC}/setup.py -.else - post-build: (cd ${WRKSRC} && LC_ALL=C.UTF-8 ${MAKE} manpages) -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/astro/kosmorro/pkg-plist b/astro/kosmorro/pkg-plist index 3adf96711aa6..c8ee4ae38ec4 100644 --- a/astro/kosmorro/pkg-plist +++ b/astro/kosmorro/pkg-plist @@ -68,5 +68,5 @@ bin/kosmorro %%PYTHON_SITELIBDIR%%/_kosmorro/locales/nl/LC_MESSAGES/messages.po %%PYTHON_SITELIBDIR%%/_kosmorro/locales/ru/LC_MESSAGES/messages.po %%PYTHON_SITELIBDIR%%/_kosmorro/main.py -%%MAN%%man/man1/kosmorro.1.gz -%%MAN%%man/man7/kosmorro.7.gz +man/man1/kosmorro.1.gz +man/man7/kosmorro.7.gz diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile index 7c596ba5f425..a7944aec8237 100644 --- a/astro/qmapshack/Makefile +++ b/astro/qmapshack/Makefile @@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Uses EOL Python 2.7 via www/qt5-webengine EXPIRATION_DATE=2021-06-23 -BROKEN_FreeBSD_11= Requires OpenSSL 1.1.0+ - LIB_DEPENDS= libgdal.so:graphics/gdal \ libproj.so:graphics/proj \ libquazip1-qt5.so:archivers/quazip \ diff --git a/audio/csound/Makefile b/audio/csound/Makefile index 580410c336bc..692dc19537ac 100644 --- a/audio/csound/Makefile +++ b/audio/csound/Makefile @@ -169,12 +169,6 @@ WIIMOTE_DESC= Build the Wiimote opcodes WIIMOTE_CMAKE_BOOL= BUILD_WIIMOTE_OPCODES WIIMOTE_BROKEN= Need to port wiiuse: https://github.com/rpavlik/wiiuse -.include <bsd.port.pre.mk> - -.if ${ARCH} == "i386" -BROKEN_FreeBSD_11= libcsound64.so.6.0: undefined reference to `__atomic_store_8' / undefined reference to `__atomic_load_8' -.endif - post-patch: @${REINPLACE_CMD} -e \ 's|/usr/include/Python2.7|${PYTHON_INCLUDEDIR}| ; \ @@ -196,4 +190,4 @@ post-install: post-install-FLTK-on: @${LN} -sf libCsoundAC.so.6.0 ${STAGEDIR}${PREFIX}/lib/libCsoundAC.so.6 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/moony-lv2/Makefile b/audio/moony-lv2/Makefile index 4e2e78ede439..9d858ccfef9a 100644 --- a/audio/moony-lv2/Makefile +++ b/audio/moony-lv2/Makefile @@ -10,8 +10,6 @@ PKGNAMESUFFIX= -lv2 MAINTAINER= yuri@FreeBSD.org COMMENT= Realtime Lua as programmable glue in LV2 -BROKEN_FreeBSD_11= undefined reference to `clog', see bug#237771 - LICENSE= ART20 LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/audio/musicpd/files/patch-meson.build b/audio/musicpd/files/patch-meson.build index 588e13b10505..4f6749c66ad8 100644 --- a/audio/musicpd/files/patch-meson.build +++ b/audio/musicpd/files/patch-meson.build @@ -1,21 +1,6 @@ --- meson.build.orig 2021-06-23 18:56:13 UTC +++ meson.build -@@ -28,6 +28,14 @@ elif compiler.get_id() == 'clang' and compiler.version - warning('Your clang version is too old. You need at least version 7.') - endif - -+test_ldflags = [ -+] -+ -+if compiler.get_id() == 'clang' -+ # This can probably go away after FreeBSD 11 is EOL'd -+ test_ldflags += '-fuse-ld=%%MPD_CLANG_LD%%' -+endif -+ - version_conf = configuration_data() - version_conf.set_quoted('PACKAGE', meson.project_name()) - version_conf.set_quoted('PACKAGE_NAME', meson.project_name()) -@@ -102,7 +110,7 @@ test_cflags = test_common_flags + [ +@@ -102,7 +102,7 @@ test_cflags = test_common_flags + [ '-Wwrite-strings', ] diff --git a/audio/surge-synthesizer-lv2/Makefile b/audio/surge-synthesizer-lv2/Makefile index 0304d0b20f1a..4086cc554a5e 100644 --- a/audio/surge-synthesizer-lv2/Makefile +++ b/audio/surge-synthesizer-lv2/Makefile @@ -10,8 +10,6 @@ COMMENT= Surge Synthesizer LV2 and VST plug-in LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_11= error: use of undeclared identifier 'getline'; did you mean 'std::getline'? - BUILD_DEPENDS= lv2>0:audio/lv2 \ ${LOCALBASE}/include/nanosvg.h:graphics/nanosvg \ ${LOCALBASE}/include/simde/simde-common.h:devel/simde \ diff --git a/audio/surge-synthesizer-lv2/files/patch-vstgui.surge_vstgui_lib_platform_linux_x11fileselector.cpp b/audio/surge-synthesizer-lv2/files/patch-vstgui.surge_vstgui_lib_platform_linux_x11fileselector.cpp index dc29cddf9a82..902a0808d894 100644 --- a/audio/surge-synthesizer-lv2/files/patch-vstgui.surge_vstgui_lib_platform_linux_x11fileselector.cpp +++ b/audio/surge-synthesizer-lv2/files/patch-vstgui.surge_vstgui_lib_platform_linux_x11fileselector.cpp @@ -1,10 +1,9 @@ ---- vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp.orig 2020-09-24 01:49:47 UTC +--- vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp.orig 2021-04-02 18:04:51 UTC +++ vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp -@@ -3,6 +3,8 @@ +@@ -3,6 +3,7 @@ // distribution and at http://github.com/steinbergmedia/vstgui/LICENSE #include "../../cfileselector.h" -+#define _WITH_GETLINE // for FreeBSD 11 +#include <stdio.h> // https://github.com/surge-synthesizer/vstgui/issues/7 #include <unistd.h> #include <string> diff --git a/audio/tagutil/Makefile b/audio/tagutil/Makefile index 2656e7176fbe..4ae4190bc272 100644 --- a/audio/tagutil/Makefile +++ b/audio/tagutil/Makefile @@ -19,9 +19,6 @@ GH_ACCOUNT= kAworu CMAKE_ARGS= -DMAN_PATH=${PREFIX}/man CMAKE_SOURCE_PATH= ${WRKSRC}/src -LDFLAGS_FreeBSD_11= -fuse-ld=lld -LDFLAGS+= ${LDFLAGS_${OPSYS}_${OSREL:R}} - PLIST_FILES= bin/tagutil \ man/man1/tagutil.1.gz diff --git a/audio/vst3sdk/Makefile b/audio/vst3sdk/Makefile index 345b6ec931a5..bf258b590ff6 100644 --- a/audio/vst3sdk/Makefile +++ b/audio/vst3sdk/Makefile @@ -11,7 +11,6 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BROKEN_i386= fails to build: static_assert failed due to requirement 'alignof(Steinberg::Vst::ProcessContext) == (0 ? 8U : 0 ? 1U : 1 ? 8U : 8U) -BROKEN_FreeBSD_11= x11fileselector.cpp:57:9: error: use of undeclared identifier 'getline'; did you mean 'std::getline'? BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libexpat.so:textproc/expat2 \ diff --git a/audio/vst3sdk/files/patch-vstgui4_vstgui_lib_platform_linux_x11fileselector.cpp b/audio/vst3sdk/files/patch-vstgui4_vstgui_lib_platform_linux_x11fileselector.cpp index 63c2750dd86c..26c2598affba 100644 --- a/audio/vst3sdk/files/patch-vstgui4_vstgui_lib_platform_linux_x11fileselector.cpp +++ b/audio/vst3sdk/files/patch-vstgui4_vstgui_lib_platform_linux_x11fileselector.cpp @@ -2,11 +2,10 @@ --- vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp.orig 2020-08-20 14:14:27 UTC +++ vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp -@@ -6,6 +6,9 @@ +@@ -6,6 +6,8 @@ #include <unistd.h> #include <string> -+#define _WITH_GETLINE // this is still required on FreeBSD 11 +#include <stdio.h> + //------------------------------------------------------------------------ diff --git a/base/gcc6/Makefile b/base/gcc6/Makefile index 2e26c3a62976..05b0bfc6f833 100644 --- a/base/gcc6/Makefile +++ b/base/gcc6/Makefile @@ -49,17 +49,14 @@ CONFIGURE_ARGS+= \ --with-gxx-include-dir=/usr/include/c++/v1/ \ --with-sysroot="/" \ --with-build-sysroot=${CROSS_SYSROOT} \ - -with-pkgversion="GNU Collection for FreeBSD" + -with-pkgversion="GNU Collection for FreeBSD" \ + --enable-initfini-array ALL_TARGET?= all-gcc INSTALL_TARGET?= install-gcc .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 1200000 -CONFIGURE_ARGS+= --enable-initfini-array -.endif - .if ${HOSTARCH} == "amd64" CONFIGURE_TARGET= x86_64-unknown-${OPSYS:tl}${OSREL} .else diff --git a/biology/abyss/Makefile b/biology/abyss/Makefile index 141b25659a53..91d52df097ac 100644 --- a/biology/abyss/Makefile +++ b/biology/abyss/Makefile @@ -9,7 +9,6 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= result of comparison of constant 18446744073709551615 with expression of type 'size_t', see https://github.com/bcgsc/abyss/issues/310 -BROKEN_FreeBSD_11= error: use of undeclared identifier 'getline'; did you mean 'std::getline'? BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:devel/boost-libs \ ghc:lang/ghc \ diff --git a/biology/ddocent/Makefile b/biology/ddocent/Makefile index bc27815d529c..52f2eda96af0 100644 --- a/biology/ddocent/Makefile +++ b/biology/ddocent/Makefile @@ -9,9 +9,7 @@ COMMENT= Bash pipeline for RAD sequencing LICENSE= MIT -# ddocent test data do not unpack with FreeBSD 11.1 /usr/bin/unzip -RUN_DEPENDS= unzip>=0:archivers/unzip \ - mawk>=0:lang/mawk \ +RUN_DEPENDS= mawk>=0:lang/mawk \ gawk>=0:lang/gawk \ coreutils>=0:sysutils/coreutils \ gnuplot>=0:math/gnuplot \ diff --git a/biology/igv/Makefile b/biology/igv/Makefile index 9803043d22a8..2b23dc18806e 100644 --- a/biology/igv/Makefile +++ b/biology/igv/Makefile @@ -13,8 +13,6 @@ COMMENT= Visualization tool for genomic datasets LICENSE= MIT LICENSE_FILE= ${WRKSRC}/license.txt -BROKEN_FreeBSD_11= FAILURE: Build failed with an exception. - BUILD_DEPENDS= openjfx14>0:java/openjfx14 \ gradle:devel/gradle6 RUN_DEPENDS= openjfx14>0:java/openjfx14 diff --git a/biology/jalview/Makefile b/biology/jalview/Makefile index b41d1b9abf27..7b7581d2b320 100644 --- a/biology/jalview/Makefile +++ b/biology/jalview/Makefile @@ -14,8 +14,6 @@ COMMENT= Viewer and editor for multiple sequence alignments LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_11= gradle daemon systematically fails on 11: The message received from the daemon indicates that the daemon has disappeared. - BUILD_DEPENDS= gradle:devel/gradle6 USE_JAVA= yes diff --git a/biology/ncbi-cxx-toolkit/Makefile b/biology/ncbi-cxx-toolkit/Makefile index 49d024208177..4148f33e2d63 100644 --- a/biology/ncbi-cxx-toolkit/Makefile +++ b/biology/ncbi-cxx-toolkit/Makefile @@ -10,8 +10,6 @@ COMMENT= NCBI C++ Toolkit LICENSE= PD LICENSE_FILE= ${WRKSRC}/doc/public/LICENSE -BROKEN_FreeBSD_11= libxconnserv.so, not found (try using -rpath or -rpath-link) - LIB_DEPENDS= libcdd.so:math/cddlib \ liblmdb.so:databases/lmdb \ libpcre.so:devel/pcre diff --git a/cad/PrusaSlicer/files/patch-src_libslic3r_Thread.cpp b/cad/PrusaSlicer/files/patch-src_libslic3r_Thread.cpp deleted file mode 100644 index 23d0e75df413..000000000000 --- a/cad/PrusaSlicer/files/patch-src_libslic3r_Thread.cpp +++ /dev/null @@ -1,45 +0,0 @@ -Note that this patch may be removed after FreeBSD 11.x EoL -as latest FreeBSD versions have proper -pthread_setname_np/pthread_getname_np support. - ---- src/libslic3r/Thread.cpp.orig 2021-07-16 10:14:03 UTC -+++ src/libslic3r/Thread.cpp -@@ -9,10 +9,10 @@ - #include <atomic> - #include <condition_variable> - #include <mutex> -+#include <thread> -+#include <tbb/global_control.h> - #include <tbb/parallel_for.h> --#include <tbb/tbb_thread.h> - #include <tbb/task_arena.h> --#include <tbb/task_scheduler_init.h> - - #include "Thread.hpp" - -@@ -206,13 +206,13 @@ void name_tbb_thread_pool_threads() - nthreads = 1; - #endif - -- if (nthreads != nthreads_hw) -- new tbb::task_scheduler_init(int(nthreads)); -+ if (nthreads != nthreads_hw) -+ tbb::global_control(tbb::global_control::max_allowed_parallelism, nthreads); - - std::atomic<size_t> nthreads_running(0); - std::condition_variable cv; - std::mutex cv_m; -- auto master_thread_id = tbb::this_tbb_thread::get_id(); -+ auto master_thread_id = std::this_thread::get_id(); - tbb::parallel_for( - tbb::blocked_range<size_t>(0, nthreads, 1), - [&nthreads_running, nthreads, &master_thread_id, &cv, &cv_m](const tbb::blocked_range<size_t> &range) { -@@ -226,7 +226,7 @@ void name_tbb_thread_pool_threads() - std::unique_lock<std::mutex> lk(cv_m); - cv.wait(lk, [&nthreads_running, nthreads]{return nthreads_running == nthreads;}); - } -- auto thread_id = tbb::this_tbb_thread::get_id(); -+ auto thread_id = std::this_thread::get_id(); - if (thread_id == master_thread_id) { - // The calling thread runs the 0'th task. - assert(range.begin() == 0); diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile index faa3154d56ea..ffa684c185f7 100644 --- a/cad/astk-serveur/Makefile +++ b/cad/astk-serveur/Makefile @@ -61,8 +61,7 @@ conf_dir= ${WRKSRC}/etc/astkrc .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ((${OSREL:R} <= 12 && ${OSVERSION} < 1201506) \ - || (${OSREL:R} > 12 && ${OSVERSION} < 1300068)) +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300068 # ASTK is not useful without french/aster IGNORE= a larger value of ARG_MAX is needed for Code_Aster, please upgrade your system .endif diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile index 978768bd3c9d..767c08faf32c 100644 --- a/cad/openvsp/Makefile +++ b/cad/openvsp/Makefile @@ -12,7 +12,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_aarch64= fails to compile: invokes x86 asm -BROKEN_FreeBSD_11= undefined reference to __atomic_load BUILD_DEPENDS= ${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ diff --git a/cad/stepcode/Makefile b/cad/stepcode/Makefile index e066166c1410..0e0d45bdf751 100644 --- a/cad/stepcode/Makefile +++ b/cad/stepcode/Makefile @@ -10,7 +10,6 @@ COMMENT= Generates C++ and Python from ISO10303 files LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_11_powerpc64= fails to configure: Schema scan for 15926-0002-lifecycle_integration.exp exited with error code 1 BROKEN_FreeBSD_12_powerpc64= fails to configure: Schema scan for 15926-0002-lifecycle_integration.exp exited with error code 1 USES= cmake compiler:c++11-lang diff --git a/chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt b/chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt deleted file mode 100644 index 5a1d19c76611..000000000000 --- a/chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- ./src/CMakeLists.txt.orig 2013-07-16 05:34:05.000000000 +0900 -+++ ./src/CMakeLists.txt 2014-03-19 15:51:24.000000000 +0900 -@@ -22,6 +22,7 @@ - ) - - add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/share/locale\" ) -+add_definitions( -D_WITH_GETLINE ) - - fcitx_add_addon_full(libpinyin DESC - SOURCES ${fcitx_libpinyin_sources} diff --git a/chinese/ibus-libpinyin/files/patch-src_PYLibPinyin.cc b/chinese/ibus-libpinyin/files/patch-src_PYLibPinyin.cc index 9fbac7843ef2..d2185f29451c 100644 --- a/chinese/ibus-libpinyin/files/patch-src_PYLibPinyin.cc +++ b/chinese/ibus-libpinyin/files/patch-src_PYLibPinyin.cc @@ -1,10 +1,9 @@ ---- src/PYLibPinyin.cc.orig 2015-01-23 04:57:48 UTC +--- src/PYLibPinyin.cc.orig 2018-06-27 03:08:59 UTC +++ src/PYLibPinyin.cc -@@ -21,6 +21,8 @@ +@@ -21,6 +21,7 @@ #include "PYLibPinyin.h" -+#define _WITH_GETLINE +#include <stdio.h> #include <string.h> #include <pinyin.h> diff --git a/chinese/libpinyin/Makefile b/chinese/libpinyin/Makefile index 4f96ddd947c7..64aabe0140b7 100644 --- a/chinese/libpinyin/Makefile +++ b/chinese/libpinyin/Makefile @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS+=CPPFLAGS="-I${LOCALBASE}/include \ - -I${BDB_INCLUDE_DIR} -D_WITH_GETLINE" \ + -I${BDB_INCLUDE_DIR}" \ LDFLAGS="-L${LOCALBASE}/lib -l${BDB_LIB_NAME}" INSTALL_TARGET=install-strip diff --git a/comms/aprsd/Makefile b/comms/aprsd/Makefile index 8e9f34aaf000..bcd9254ef6bf 100644 --- a/comms/aprsd/Makefile +++ b/comms/aprsd/Makefile @@ -12,7 +12,6 @@ COMMENT= Server daemon providing Internet access to APRS packet data LICENSE= GPLv2 -BROKEN_FreeBSD_11_powerpc64= fails to link on powerpc64 elfv1: httpserver.o:(.text+0x1074): undefined reference to `convertUpTime(int)' BROKEN_FreeBSD_12_powerpc64= fails to link on powerpc64 elfv1: httpserver.o:(.text+0x1074): undefined reference to `convertUpTime(int)' GNU_CONFIGURE= yes diff --git a/comms/usbmuxd/files/patch-src_usb.c b/comms/usbmuxd/files/patch-src_usb.c deleted file mode 100644 index 8a6240a3de35..000000000000 --- a/comms/usbmuxd/files/patch-src_usb.c +++ /dev/null @@ -1,17 +0,0 @@ -libusb_has_capability() was implemented in r361977 and is only available on: -FreeBSD >= 1104501, 1201518, 1300098 -However, libusb in all supported versions of FreeBSD supports hotplug events. - -This patch can be safely removed after 11.4 and 12.1 EOL. - ---- src/usb.c.orig 2021-01-21 10:10:40 UTC -+++ src/usb.c *** 7955 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109302127.18ULReMj041856>