diff --git a/lang/erlang-runtime26/Makefile b/lang/erlang-runtime26/Makefile index 0d2b8f7ea672..e429d65a3101 100644 --- a/lang/erlang-runtime26/Makefile +++ b/lang/erlang-runtime26/Makefile @@ -1,165 +1,164 @@ PORTNAME= erlang DISTVERSIONPREFIX= OTP- -DISTVERSION= 26.2.5.4 -PORTREVISION= 1 +DISTVERSION= 26.2.5.12 CATEGORIES= lang parallel java PKGNAMESUFFIX= -runtime26 DIST_SUBDIR= erlang MAINTAINER= erlang@FreeBSD.org COMMENT= Functional programming language from Ericsson WWW= https://www.erlang.org/ LICENSE= APACHE20 USES= compiler cpe gmake ncurses perl5 CPE_VENDOR= erlang CPE_PRODUCT= erlang/otp USE_GITHUB= nodefault GH_ACCOUNT= erlang:otp,corba GH_PROJECT= otp:otp corba:corba GH_TAGNAME= 5.2.1:corba USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-dirty-schedulers \ --enable-kernel-poll \ --enable-smp-support \ --enable-threads _ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= pkg-message SUB_LIST= _ERLANG_LIB=${_ERLANG_LIB} WRKSRC= ${WRKSRC_otp} OPTIONS_DEFINE= CHUNKS CORBA DTRACE JAVA KQUEUE ODBC OPENSSL SCTP \ SHARING WX OPTIONS_DEFAULT= CHUNKS CORBA DTRACE KQUEUE OPENSSL SCTP SHARING .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_DragonFly= SCTP # ld(1) fails to link probes: missing __dtrace_erlang___* symbols # see also https://reviews.freebsd.org/D22360 OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_i386= DTRACE OPTIONS_EXCLUDE_riscv64= DTRACE CHUNKS_DESC= Enable in-line documentation in Erlang console CORBA_DESC= Enable Corba support KQUEUE_DESC= Enable Kernel Poll (kqueue) support SCTP_DESC= Enable SCTP support SHARING_DESC= Enable term copy-and-share support WX_DESC= Enable WX application # If you run Erlang and get a message resembling "WARNING: number of # probes fixed does not match the number of defined probes (54 != 132, # respectively)" you probably misconfigured DTrace in some way. DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace DTRACE_CFLAGS= -fno-omit-frame-pointer DTRACE_VARS= STRIP="" +JAVA_USES= java JAVA_CONFIGURE_WITH= javac JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" -JAVA_USES= java KQUEUE_CONFIGURE_ENABLE= kernel-poll ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC ODBC_USES= localbase:ldflags ODBC_CONFIGURE_WITH= odbc OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} SCTP_CONFIGURE_ENABLE= sctp SHARING_CONFIGURE_ENABLE= sharing-preserving WX_USES= gl WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} WX_VARS= USE_GL="gl glu" \ USE_WX=3.2+ \ WX_COMPS="wx" .include .if ${COMPILER_TYPE} == clang # PR 258494 CONFIGURE_ARGS+= --disable-pgo .endif .if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 .endif .if ${ARCH} == i386 MAKE_ARGS+= ARCH=x86 .endif .if ${ARCH} == armv6 || ${ARCH} == armv7 MAKE_ARGS+= ARCH=arm .endif pre-configure-WX-off: echo "disabled by port options" > ${WRKSRC}/lib/debugger/SKIP echo "disabled by port options" > ${WRKSRC}/lib/et/SKIP echo "disabled by port options" > ${WRKSRC}/lib/observer/SKIP echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP post-configure-ODBC-on: ${RM} ${WRKSRC}/lib/odbc/SKIP post-configure-ODBC-off: echo "disabled by port options" > ${WRKSRC}/lib/odbc/SKIP post-install-CHUNKS-on: cd ${WRKSRC_otp} && \ ${SETENV} ERL_TOP=${WRKSRC_otp} \ ${MAKE_CMD} release_docs DOC_TARGETS=chunks \ RELEASE_ROOT=${STAGEDIR}${PREFIX}/lib/${_ERLANG_LIB} post-build-CORBA-on: cd ${WRKSRC_corba} && \ ${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} \ ${MAKE_CMD} post-install-CORBA-on: cd ${WRKSRC_corba} && \ ${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} \ ${MAKE_CMD} release RELEASE_ROOT=${STAGEDIR}${PREFIX}/lib/${_ERLANG_LIB} post-install-DTRACE-on: ${MKDIR} ${STAGEDIR}${DATADIR}/dtrace ${INSTALL_DATA} ${WRKSRC}/erts/emulator/beam/*.d \ ${WRKSRC}/lib/runtime_tools/c_src/*.d \ ${WRKSRC}/lib/runtime_tools/examples/*.d \ ${STAGEDIR}${DATADIR}/dtrace post-install-JAVA-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-* post-install-ODBC-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-* post-install-OPENSSL-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-* post-install-WX-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/debugger-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/et-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/observer-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* post-stage: ${FIND} ${STAGEDIR}${PREFIX}/lib/${_ERLANG_LIB}/* -type d -empty \ -delete @cd ${STAGEDIR}${PREFIX}; \ ${FIND} lib/${_ERLANG_LIB}/* ${DATADIR_REL}/* -type f -o \ -type l | \ ${SORT} >> ${TMPPLIST} .include diff --git a/lang/erlang-runtime26/distinfo b/lang/erlang-runtime26/distinfo index 8839346516eb..9344ce6f4e95 100644 --- a/lang/erlang-runtime26/distinfo +++ b/lang/erlang-runtime26/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1728493154 -SHA256 (erlang/erlang-otp-OTP-26.2.5.4_GH0.tar.gz) = daa29766431e91489367e87f2ec34e65ce05a0f2dd48bf666829951e636f6016 -SIZE (erlang/erlang-otp-OTP-26.2.5.4_GH0.tar.gz) = 62516279 +TIMESTAMP = 1747434405 +SHA256 (erlang/erlang-otp-OTP-26.2.5.12_GH0.tar.gz) = 93c97a3e14c3700eaaf2182b078fd35f8492da215327bd9c78a1f047946129f7 +SIZE (erlang/erlang-otp-OTP-26.2.5.12_GH0.tar.gz) = 62551765 SHA256 (erlang/erlang-corba-5.2.1_GH0.tar.gz) = e96e9dc710c0ab3282ca5045434f5bc5ff493c22ba63fcfd764ce4d6a13a7c8f SIZE (erlang/erlang-corba-5.2.1_GH0.tar.gz) = 1400553 diff --git a/lang/erlang-runtime26/files/patch-Makefile.in b/lang/erlang-runtime26/files/patch-Makefile.in index bf067367931e..46e9032eb2b9 100644 --- a/lang/erlang-runtime26/files/patch-Makefile.in +++ b/lang/erlang-runtime26/files/patch-Makefile.in @@ -1,20 +1,20 @@ ---- Makefile.in.orig 2015-06-23 18:56:21 UTC +--- Makefile.in.orig 2025-05-08 11:07:43 UTC +++ Makefile.in -@@ -60,7 +60,7 @@ bindir = @bindir@ +@@ -60,7 +60,7 @@ libdir = @libdir@ libdir = @libdir@ # Where Erlang/OTP is located -libdir_suffix = /erlang +libdir_suffix = /erlang26 erlang_libdir = $(libdir)$(libdir_suffix) erlang_bindir = $(erlang_libdir)/bin -@@ -1013,7 +1013,7 @@ $(TEST_DIRS): +@@ -883,7 +883,7 @@ $(TEST_DIRS): # # Order is important here, don't change it! # -INST_DEP += install.dirs install.emulator install.libs install.Install install.otp_version install.bin +INST_DEP += install.dirs install.emulator install.libs install.Install install.otp_version install: $(INST_DEP) diff --git a/lang/erlang-runtime26/files/patch-erts_etc_unix_run__erl.c b/lang/erlang-runtime26/files/patch-erts_etc_unix_run__erl.c index b76c5127d2a8..ea3ad151d030 100644 --- a/lang/erlang-runtime26/files/patch-erts_etc_unix_run__erl.c +++ b/lang/erlang-runtime26/files/patch-erts_etc_unix_run__erl.c @@ -1,12 +1,12 @@ ---- erts/etc/unix/run_erl.c.orig 2015-03-31 12:32:52 UTC +--- erts/etc/unix/run_erl.c.orig 2025-05-08 11:07:43 UTC +++ erts/etc/unix/run_erl.c -@@ -73,9 +73,6 @@ - #ifdef HAVE_UTMP_H - # include +@@ -81,9 +81,6 @@ + #ifdef HAVE_LIBUTIL_H + # include #endif -#ifdef HAVE_UTIL_H -# include -#endif #ifdef HAVE_SYS_IOCTL_H # include #endif diff --git a/lang/erlang-runtime26/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang-runtime26/files/patch-lib_crypto_c__src_Makefile.in index 8397bcac2200..786f226d0b8d 100644 --- a/lang/erlang-runtime26/files/patch-lib_crypto_c__src_Makefile.in +++ b/lang/erlang-runtime26/files/patch-lib_crypto_c__src_Makefile.in @@ -1,11 +1,11 @@ ---- lib/crypto/c_src/Makefile.in.orig 2021-05-27 09:40:45 UTC +--- lib/crypto/c_src/Makefile.in.orig 2025-05-08 11:07:43 UTC +++ lib/crypto/c_src/Makefile.in -@@ -136,7 +136,7 @@ endif +@@ -147,7 +147,7 @@ ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes) endif ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes) -SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@ +SSL_DED_LD_RUNTIME_LIBRARY_PATH = CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB else diff --git a/lang/erlang-runtime26/files/patch-lib_stdlib_src_calendar.erl b/lang/erlang-runtime26/files/patch-lib_stdlib_src_calendar.erl index 34b753d85b27..0a0d961d04b4 100644 --- a/lang/erlang-runtime26/files/patch-lib_stdlib_src_calendar.erl +++ b/lang/erlang-runtime26/files/patch-lib_stdlib_src_calendar.erl @@ -1,26 +1,26 @@ ---- lib/stdlib/src/calendar.erl.orig 2015-03-31 12:32:52 UTC +--- lib/stdlib/src/calendar.erl.orig 2025-05-08 11:07:43 UTC +++ lib/stdlib/src/calendar.erl -@@ -279,11 +279,19 @@ local_time_to_universal_time(DateTime, I +@@ -297,11 +297,19 @@ local_time_to_universal_time_dst(DateTime) -> DateTime1 :: datetime1970(), DateTime :: datetime1970(). local_time_to_universal_time_dst(DateTime) -> - UtDst = erlang:localtime_to_universaltime(DateTime, true), - Ut = erlang:localtime_to_universaltime(DateTime, false), %% Reverse check the universal times - LtDst = erlang:universaltime_to_localtime(UtDst), - Lt = erlang:universaltime_to_localtime(Ut), + {UtDst, LtDst} = + try + UtDst0 = erlang:localtime_to_universaltime(DateTime, true), + {UtDst0, erlang:universaltime_to_localtime(UtDst0)} + catch error:badarg -> {error, error} + end, + {Ut, Lt} = + try + Ut0 = erlang:localtime_to_universaltime(DateTime, false), + {Ut0, erlang:universaltime_to_localtime(Ut0)} + catch error:badarg -> {error, error} + end, %% Return the valid universal times case {LtDst,Lt} of {DateTime,DateTime} when UtDst =/= Ut ->