Mk/bsd.port.mk: mark FreeBSD 13.4 as unsupported.
Drop support for FreeBSD 13.4 (and sometimes 12, 14.0, 14.1) from all ports. Reviewed by: dch, @gor_clogic.com.ua Approved by: portmgr (implicit) Differential Revision: https://reviews.freebsd.org/D50769
This commit is contained in:
Rene Ladan
parent
ba96410bb8
commit
3be82964f8
@ -1165,7 +1165,7 @@ OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC
|
||||
. endif
|
||||
_EXPORTED_VARS+= OSVERSION
|
||||
|
||||
. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1304000 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1402000))
|
||||
. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1305000 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1402000))
|
||||
_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)
|
||||
|
||||
@ -117,9 +117,7 @@ post-install-VST3-on:
|
||||
|
||||
# Some peripheral libraries are only built with libusb-1.0 >= 1.0.16
|
||||
.if ${OPSYS} == FreeBSD && \
|
||||
(${OSVERSION} <= 1304500 \
|
||||
|| 1400000 <= ${OSVERSION} && ${OSVERSION} <= 1401502 \
|
||||
|| 1500000 <= ${OSVERSION} && ${OSVERSION} <= 1500019)
|
||||
(1500000 <= ${OSVERSION} && ${OSVERSION} <= 1500019)
|
||||
PLIST_SUB+= LIBUSB="@comment "
|
||||
.else
|
||||
PLIST_SUB+= LIBUSB=""
|
||||
|
||||
@ -69,15 +69,6 @@ STATIC_MAKE_ARGS= static=1
|
||||
IGNORE= not supported on anything but FreeBSD
|
||||
.endif
|
||||
|
||||
# crystal needs pkgconfig to determine SSL variants but these are not
|
||||
# present in FreeBSD base. We splice in the correct info based on
|
||||
# FreeBSD version and hope it doesn't change during minor releases.
|
||||
# See post-patch for the substitutions of these patches.
|
||||
.if ${SSL_DEFAULT} == "base" && ${OSREL:R} < 13
|
||||
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_openssl_lib__crypto.cr \
|
||||
${PATCHDIR}/extra-patch-src_openssl_lib__ssl.cr
|
||||
.endif
|
||||
|
||||
post-extract:
|
||||
@${RLN} ${WRKDIR}/.build ${WRKSRC}
|
||||
@${RLN} x86_64-freebsd ${WRKSRC}/src/lib_c/aarch64-freebsd
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
--- src/openssl/lib_crypto.cr.orig 2022-04-09 14:20:55.000000000 -0700
|
||||
+++ src/openssl/lib_crypto.cr 2022-04-09 14:15:51.000000000 -0700
|
||||
@@ -1,31 +1,7 @@
|
||||
{% begin %}
|
||||
lib LibCrypto
|
||||
- {% if flag?(:win32) %}
|
||||
- {% from_libressl = false %}
|
||||
- {% ssl_version = nil %}
|
||||
- {% for dir in Crystal::LIBRARY_PATH.split(';') %}
|
||||
- {% unless ssl_version %}
|
||||
- {% config_path = "#{dir.id}\\openssl_VERSION" %}
|
||||
- {% if config_version = read_file?(config_path) %}
|
||||
- {% ssl_version = config_version.chomp %}
|
||||
- {% end %}
|
||||
- {% end %}
|
||||
- {% end %}
|
||||
- {% ssl_version ||= "0.0.0" %}
|
||||
- {% else %}
|
||||
- {% from_libressl = (`hash pkg-config 2> /dev/null || printf %s false` != "false") &&
|
||||
- (`test -f $(pkg-config --silence-errors --variable=includedir libcrypto)/openssl/opensslv.h || printf %s false` != "false") &&
|
||||
- (`printf "#include <openssl/opensslv.h>\nLIBRESSL_VERSION_NUMBER" | ${CC:-cc} $(pkg-config --cflags --silence-errors libcrypto || true) -E -`.chomp.split('\n').last != "LIBRESSL_VERSION_NUMBER") %}
|
||||
- {% ssl_version = `hash pkg-config 2> /dev/null && pkg-config --silence-errors --modversion libcrypto || printf %s 0.0.0`.split.last.gsub(/[^0-9.]/, "") %}
|
||||
- {% end %}
|
||||
-
|
||||
- {% if from_libressl %}
|
||||
- LIBRESSL_VERSION = {{ ssl_version }}
|
||||
- OPENSSL_VERSION = "0.0.0"
|
||||
- {% else %}
|
||||
- LIBRESSL_VERSION = "0.0.0"
|
||||
- OPENSSL_VERSION = {{ ssl_version }}
|
||||
- {% end %}
|
||||
+ LIBRESSL_VERSION = "0.0.0"
|
||||
+ OPENSSL_VERSION = "CRYSTAL_SSL_VERSION"
|
||||
end
|
||||
{% end %}
|
||||
|
||||
@@ -34,7 +10,7 @@
|
||||
@[Link("crypt32")] # CertOpenStore, ...
|
||||
@[Link("user32")] # GetProcessWindowStation, GetUserObjectInformationW, _MessageBoxW
|
||||
{% else %}
|
||||
- @[Link(ldflags: "`command -v pkg-config > /dev/null && pkg-config --libs --silence-errors libcrypto || printf %s '-lcrypto'`")]
|
||||
+ @[Link(ldflags: "-LCRYSTAL_SSL_LDFLAGS -lcrypto")]
|
||||
{% end %}
|
||||
lib LibCrypto
|
||||
alias Char = LibC::Char
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
--- src/openssl/lib_ssl.cr.orig 2022-04-09 14:24:40.000000000 -0700
|
||||
+++ src/openssl/lib_ssl.cr 2022-04-09 14:24:07.000000000 -0700
|
||||
@@ -6,32 +6,8 @@
|
||||
|
||||
{% begin %}
|
||||
lib LibSSL
|
||||
- {% if flag?(:win32) %}
|
||||
- {% from_libressl = false %}
|
||||
- {% ssl_version = nil %}
|
||||
- {% for dir in Crystal::LIBRARY_PATH.split(';') %}
|
||||
- {% unless ssl_version %}
|
||||
- {% config_path = "#{dir.id}\\openssl_VERSION" %}
|
||||
- {% if config_version = read_file?(config_path) %}
|
||||
- {% ssl_version = config_version.chomp %}
|
||||
- {% end %}
|
||||
- {% end %}
|
||||
- {% end %}
|
||||
- {% ssl_version ||= "0.0.0" %}
|
||||
- {% else %}
|
||||
- {% from_libressl = (`hash pkg-config 2> /dev/null || printf %s false` != "false") &&
|
||||
- (`test -f $(pkg-config --silence-errors --variable=includedir libssl)/openssl/opensslv.h || printf %s false` != "false") &&
|
||||
- (`printf "#include <openssl/opensslv.h>\nLIBRESSL_VERSION_NUMBER" | ${CC:-cc} $(pkg-config --cflags --silence-errors libssl || true) -E -`.chomp.split('\n').last != "LIBRESSL_VERSION_NUMBER") %}
|
||||
- {% ssl_version = `hash pkg-config 2> /dev/null && pkg-config --silence-errors --modversion libssl || printf %s 0.0.0`.split.last.gsub(/[^0-9.]/, "") %}
|
||||
- {% end %}
|
||||
-
|
||||
- {% if from_libressl %}
|
||||
- LIBRESSL_VERSION = {{ ssl_version }}
|
||||
- OPENSSL_VERSION = "0.0.0"
|
||||
- {% else %}
|
||||
- LIBRESSL_VERSION = "0.0.0"
|
||||
- OPENSSL_VERSION = {{ ssl_version }}
|
||||
- {% end %}
|
||||
+ LIBRESSL_VERSION = "0.0.0"
|
||||
+ OPENSSL_VERSION = "CRYSTAL_SSL_VERSION"
|
||||
end
|
||||
{% end %}
|
||||
|
||||
-@[Link(ldflags: "`command -v pkg-config > /dev/null && pkg-config --libs --silence-errors libssl || printf %s '-lssl -lcrypto'`")]
|
||||
+@[Link(ldflags: "-LCRYSTAL_SSL_LDFLAGS -lssl")]
|
||||
lib LibSSL
|
||||
alias Int = LibC::Int
|
||||
alias Char = LibC::Char
|
||||
@ -15,10 +15,7 @@ CXXFLAGS+= -D${MACHINE_ARCH:tu:S/I386/IA32/:S/SPARC64/SPARC/} -DBSD
|
||||
CXXFLAGS+= -Wno-system-headers -Wall -W \
|
||||
-Wpointer-arith -Wreturn-type \
|
||||
-Wwrite-strings -Wswitch -Wno-cast-align \
|
||||
-Wunused-parameter -Werror
|
||||
|
||||
.if ${OSVERSION} >= 1304000
|
||||
CXXFLAGS+= -Wno-vla-cxx-extension
|
||||
.endif
|
||||
-Wunused-parameter -Werror \
|
||||
-Wno-vla-cxx-extension
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
@ -31,10 +31,4 @@ USE_XORG= pixman
|
||||
GH_ACCOUNT= hyprwm
|
||||
PLIST_SUB= VERSION=${DISTVERSION:C/-.*//}
|
||||
|
||||
# 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)
|
||||
LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -45,12 +45,6 @@ LDFLAGS+= -Wl,--as-needed # GL, pango deps
|
||||
# Generated by "make update-hash" for commit_pins in hyprpm.toml
|
||||
GH_HASH= 29e2e59fdbab8ed2cc23a20e3c6043d5decb5cdc
|
||||
|
||||
# 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)
|
||||
LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim
|
||||
.endif
|
||||
|
||||
OPTIONS_DEFINE= QT6 X11
|
||||
OPTIONS_DEFAULT=QT6 X11
|
||||
|
||||
|
||||
@ -32,12 +32,6 @@ PLIST_FILES= bin/${PORTNAME} \
|
||||
${DATADIR}/${PORTNAME}rc \
|
||||
${NULL}
|
||||
|
||||
# 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)
|
||||
LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim
|
||||
.endif
|
||||
|
||||
OPTIONS_DEFINE= AVIF BASH GIF HEIF JPEG JSON JXL LIBEXIF LIBRSVG2 \
|
||||
OPENEXR PNG RAW SIXEL TIFF WEBP ZSH
|
||||
OPTIONS_DEFAULT=AVIF BASH GIF HEIF JPEG JSON JXL LIBEXIF LIBRSVG2 \
|
||||
|
||||
@ -18,14 +18,6 @@ LIB_DEPENDS= libwayland-client.so:graphics/wayland \
|
||||
USES= compiler:c11 gnome meson pkgconfig
|
||||
USE_GNOME= cairo pango
|
||||
|
||||
# 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)
|
||||
LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim
|
||||
CPPFLAGS+= `pkg-config --cflags epoll-shim`
|
||||
LDFLAGS+= `pkg-config --libs epoll-shim`
|
||||
.endif
|
||||
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}
|
||||
|
||||
PLIST_FILES= bin/wmenu \
|
||||
|
||||
@ -32,12 +32,6 @@ PLIST_FILES= libexec/${PORTNAME} \
|
||||
share/dbus-1/services/org.freedesktop.impl.portal.desktop.wlr.service \
|
||||
share/xdg-desktop-portal/portals/wlr.portal
|
||||
|
||||
# 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)
|
||||
LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim
|
||||
.endif
|
||||
|
||||
OPTIONS_DEFINE= MANPAGES
|
||||
OPTIONS_DEFAULT=MANPAGES
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user