diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile index 9067fbeea697..c0488f49e595 100644 --- a/lang/ecl/Makefile +++ b/lang/ecl/Makefile @@ -1,76 +1,75 @@ # Created by: Julian Stecklina PORTNAME= ecl -PORTVERSION= 20.4.24 -PORTREVISION= 2 +PORTVERSION= 21.2.1 CATEGORIES= lang lisp MASTER_SITES= https://common-lisp.net/project/ecl/static/files/release/ MAINTAINER= olgeni@FreeBSD.org COMMENT= ANSI Common Lisp implementation LICENSE= LGPL20 BROKEN_mips= fails to build: qemu: uncaught target signal 11 (Segmentation fault) - core dumped BROKEN_mips64= fails to build: qemu: uncaught target signal 11 (Segmentation fault) - core dumped BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops LIB_DEPENDS= libgc.so:devel/boehm-gc \ libgmp.so:math/gmp RUN_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops USES= autoreconf gmake localbase makeinfo perl5 tar:tgz USE_CSTD= c99 USE_LDCONFIG= yes USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-boehm=system \ --enable-libatomic=system \ --with-gmp-prefix=${LOCALBASE} \ --with-system-gmp MAKE_JOBS_UNSAFE= yes AUTORECONF_WRKSRC= ${WRKSRC}/src INFO= ecl PLIST_SUB= VERSION="${PORTVERSION}" OPTIONS_DEFINE= ASDF DFFI SAGE SOCKETS THREADS X11 OPTIONS_DEFAULT= ASDF DFFI SAGE SOCKETS THREADS OPTIONS_SUB= yes ASDF_DESC= Enable ASDF building facility DFFI_DESC= Dynamic foreign-function support SAGE_DESC= Build with patches for sage SOCKETS_DESC= Enable socket interface ASDF_CONFIGURE_ON= --with-asdf=yes ASDF_CONFIGURE_OFF= --with-asdf=no DFFI_LIB_DEPENDS= libffi.so:devel/libffi DFFI_CONFIGURE_ON= --with-dffi=system DFFI_CONFIGURE_OFF= --with-dffi=no SAGE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_aclocal.m4 \ ${PATCHDIR}/extra-patch-src_c_file.d \ ${PATCHDIR}/extra-patch-src_compile.lsp.in \ ${PATCHDIR}/extra-patch-src_configure.ac \ ${PATCHDIR}/extra-patch-src_Makefile.in SOCKETS_CONFIGURE_ON= --with-tcp=yes SOCKETS_CONFIGURE_OFF= --with-tcp=no THREADS_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded THREADS_CONFIGURE_ON= --enable-threads=yes THREADS_CONFIGURE_OFF= --enable-threads=no THREADS_LDFLAGS= -lpthread -lgc-threaded X11_USES= xorg X11_USE= XORG=x11 X11_CONFIGURE_ON= --with-x=yes X11_CONFIGURE_OFF= --with-x=no post-patch-THREADS-on: @${REINPLACE_CMD} -e 's|-lgc|-lgc-threaded|' ${WRKSRC}/src/configure post-install: ${RMDIR} ${STAGEDIR}${PREFIX}/include/ecl/gc/private ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libecl.so.${PORTVERSION} ${LN} -sf ecl-${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/ecl .include diff --git a/lang/ecl/distinfo b/lang/ecl/distinfo index e50a29ca2f21..440270a85ee6 100644 --- a/lang/ecl/distinfo +++ b/lang/ecl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592221665 -SHA256 (ecl-20.4.24.tgz) = 670838edf258a936b522fdb620da336de7e575aa0d27e34841727252726d0f07 -SIZE (ecl-20.4.24.tgz) = 7815444 +TIMESTAMP = 1627310876 +SHA256 (ecl-21.2.1.tgz) = b15a75dcf84b8f62e68720ccab1393f9611c078fcd3afdd639a1086cad010900 +SIZE (ecl-21.2.1.tgz) = 7875088 diff --git a/lang/ecl/files/patch-75877dd.c b/lang/ecl/files/patch-75877dd.c deleted file mode 100644 index 6b77554cb666..000000000000 --- a/lang/ecl/files/patch-75877dd.c +++ /dev/null @@ -1,47 +0,0 @@ -From 75877dd8f0d534552284ba4380ba65baa74f028f Mon Sep 17 00:00:00 2001 -From: Marius Gerbershagen -Date: Sun, 28 Jun 2020 11:02:15 +0200 -Subject: [PATCH] fpe: fix ECL_WITH_LISP_FPE macro - -We can't use ecl_process_env_unsafe() == NULL to check if ECL has -booted because the return value of ecl_process_env_unsafe is -unpredictable before ECL has booted. The reason is that -ecl_process_env_unsafe calls pthread_getspecific with an uninitialized -key stored in cl_env_key. But another call to pthread_setspecific -might have already registered a key which happens to be the same as -the not yet initialized cl_env_key, yielding a non-NULL value. ---- - src/h/impl/math_fenv.h | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - -diff --git a/src/h/impl/math_fenv.h b/src/h/impl/math_fenv.h -index 0a93c8e0a..9630f4c6c 100644 ---- src/h/impl/math_fenv.h -+++ src/h/impl/math_fenv.h -@@ -72,15 +72,14 @@ - - #if defined(HAVE_FENV_H) && !defined(ECL_AVOID_FPE_H) - # if defined(HAVE_FEENABLEEXCEPT) --# define ECL_WITH_LISP_FPE_BEGIN do { \ -- fenv_t __fenv; \ -- fegetenv(&__fenv); \ -- cl_env_ptr __the_env = ecl_process_env_unsafe(); \ -- if (__the_env) { \ -- int bits = __the_env->trap_fpe_bits; \ -- fedisableexcept(FE_ALL_EXCEPT & ~bits); \ -- feenableexcept(FE_ALL_EXCEPT & bits); \ -- } \ -+# define ECL_WITH_LISP_FPE_BEGIN do { \ -+ fenv_t __fenv; \ -+ fegetenv(&__fenv); \ -+ if (ecl_get_option(ECL_OPT_BOOTED) > 0) { \ -+ int bits = ecl_process_env()->trap_fpe_bits; \ -+ fedisableexcept(FE_ALL_EXCEPT & ~bits); \ -+ feenableexcept(FE_ALL_EXCEPT & bits); \ -+ } \ - feclearexcept(FE_ALL_EXCEPT); - # else - # define ECL_WITH_LISP_FPE_BEGIN do { \ --- -GitLab - diff --git a/lang/ecl/pkg-plist b/lang/ecl/pkg-plist index 6f112ac1162b..bccf75020c03 100644 --- a/lang/ecl/pkg-plist +++ b/lang/ecl/pkg-plist @@ -1,231 +1,231 @@ bin/ecl bin/ecl-config include/ecl/bytecodes.h include/ecl/cache.h include/ecl/config-internal.h include/ecl/config.h include/ecl/configpre-int.h include/ecl/configpre.h include/ecl/cons.h include/ecl/cs.h include/ecl/ecl_atomics.h include/ecl/ecl-cmp.h include/ecl/ecl-inl.h include/ecl/ecl.h include/ecl/external.h include/ecl/impl/math_dispatch.h include/ecl/impl/math_dispatch2.h include/ecl/impl/math_fenv.h include/ecl/impl/math_fenv_msvc.h include/ecl/internal.h include/ecl/legacy.h include/ecl/number.h include/ecl/object.h include/ecl/page.h include/ecl/stack-resize.h include/ecl/stacks.h lib/ecl lib/ecl-%%VERSION%%/COPYING lib/ecl-%%VERSION%%/LICENSE lib/ecl-%%VERSION%%/TAGS %%ASDF%%lib/ecl-%%VERSION%%/asdf.fas lib/ecl-%%VERSION%%/build-stamp lib/ecl-%%VERSION%%/cmp.asd lib/ecl-%%VERSION%%/cmp.fas %%SOCKETS%%lib/ecl-%%VERSION%%/deflate.asd %%SOCKETS%%lib/ecl-%%VERSION%%/deflate.fas lib/ecl-%%VERSION%%/dpp lib/ecl-%%VERSION%%/ecl-cdb.asd lib/ecl-%%VERSION%%/ecl-cdb.fas %%SOCKETS%%lib/ecl-%%VERSION%%/ecl-curl.asd %%SOCKETS%%lib/ecl-%%VERSION%%/ecl-curl.fas lib/ecl-%%VERSION%%/ecl-help.asd lib/ecl-%%VERSION%%/ecl-help.fas %%SOCKETS%%lib/ecl-%%VERSION%%/ecl-quicklisp.asd %%SOCKETS%%lib/ecl-%%VERSION%%/ecl-quicklisp.fas lib/ecl-%%VERSION%%/ecl_min lib/ecl-%%VERSION%%/encodings/arabic lib/ecl-%%VERSION%%/encodings/ascii lib/ecl-%%VERSION%%/encodings/asmo-708 lib/ecl-%%VERSION%%/encodings/atarist.bin lib/ecl-%%VERSION%%/encodings/cp-856.bin lib/ecl-%%VERSION%%/encodings/cp819 lib/ecl-%%VERSION%%/encodings/cp850 lib/ecl-%%VERSION%%/encodings/cp862 lib/ecl-%%VERSION%%/encodings/cp866 lib/ecl-%%VERSION%%/encodings/cp932 lib/ecl-%%VERSION%%/encodings/cp936 lib/ecl-%%VERSION%%/encodings/cp949 lib/ecl-%%VERSION%%/encodings/cp950 lib/ecl-%%VERSION%%/encodings/cyrillic lib/ecl-%%VERSION%%/encodings/dos-cp437.bin lib/ecl-%%VERSION%%/encodings/dos-cp737.bin lib/ecl-%%VERSION%%/encodings/dos-cp775.bin lib/ecl-%%VERSION%%/encodings/dos-cp850.bin lib/ecl-%%VERSION%%/encodings/dos-cp852.bin lib/ecl-%%VERSION%%/encodings/dos-cp855.bin lib/ecl-%%VERSION%%/encodings/dos-cp857.bin lib/ecl-%%VERSION%%/encodings/dos-cp860.bin lib/ecl-%%VERSION%%/encodings/dos-cp861.bin lib/ecl-%%VERSION%%/encodings/dos-cp862.bin lib/ecl-%%VERSION%%/encodings/dos-cp863.bin lib/ecl-%%VERSION%%/encodings/dos-cp864.bin lib/ecl-%%VERSION%%/encodings/dos-cp865.bin lib/ecl-%%VERSION%%/encodings/dos-cp866.bin lib/ecl-%%VERSION%%/encodings/dos-cp869.bin lib/ecl-%%VERSION%%/encodings/dos-cp874.bin lib/ecl-%%VERSION%%/encodings/ecma-114 lib/ecl-%%VERSION%%/encodings/ecma-118 lib/ecl-%%VERSION%%/encodings/greek lib/ecl-%%VERSION%%/encodings/greek8 lib/ecl-%%VERSION%%/encodings/hebrew lib/ecl-%%VERSION%%/encodings/ibm437 lib/ecl-%%VERSION%%/encodings/ibm819 lib/ecl-%%VERSION%%/encodings/ibm850 lib/ecl-%%VERSION%%/encodings/ibm852 lib/ecl-%%VERSION%%/encodings/ibm855 lib/ecl-%%VERSION%%/encodings/ibm857 lib/ecl-%%VERSION%%/encodings/ibm860 lib/ecl-%%VERSION%%/encodings/ibm861 lib/ecl-%%VERSION%%/encodings/ibm862 lib/ecl-%%VERSION%%/encodings/ibm863 lib/ecl-%%VERSION%%/encodings/ibm864 lib/ecl-%%VERSION%%/encodings/ibm865 lib/ecl-%%VERSION%%/encodings/ibm866 lib/ecl-%%VERSION%%/encodings/ibm869 lib/ecl-%%VERSION%%/encodings/iso-2022-jp lib/ecl-%%VERSION%%/encodings/iso-2022-jp-1 lib/ecl-%%VERSION%%/encodings/iso-8859-1.bin lib/ecl-%%VERSION%%/encodings/iso-8859-10.bin lib/ecl-%%VERSION%%/encodings/iso-8859-11.bin lib/ecl-%%VERSION%%/encodings/iso-8859-13.bin lib/ecl-%%VERSION%%/encodings/iso-8859-14.bin lib/ecl-%%VERSION%%/encodings/iso-8859-15.bin lib/ecl-%%VERSION%%/encodings/iso-8859-16.bin lib/ecl-%%VERSION%%/encodings/iso-8859-2.bin lib/ecl-%%VERSION%%/encodings/iso-8859-3.bin lib/ecl-%%VERSION%%/encodings/iso-8859-4.bin lib/ecl-%%VERSION%%/encodings/iso-8859-5.bin lib/ecl-%%VERSION%%/encodings/iso-8859-6.bin lib/ecl-%%VERSION%%/encodings/iso-8859-7.bin lib/ecl-%%VERSION%%/encodings/iso-8859-8.bin lib/ecl-%%VERSION%%/encodings/iso-8859-9.bin lib/ecl-%%VERSION%%/encodings/iso8859-1 lib/ecl-%%VERSION%%/encodings/iso8859-10 lib/ecl-%%VERSION%%/encodings/iso8859-13 lib/ecl-%%VERSION%%/encodings/iso8859-14 lib/ecl-%%VERSION%%/encodings/iso8859-15 lib/ecl-%%VERSION%%/encodings/iso8859-2 lib/ecl-%%VERSION%%/encodings/iso8859-3 lib/ecl-%%VERSION%%/encodings/iso8859-4 lib/ecl-%%VERSION%%/encodings/iso8859-5 lib/ecl-%%VERSION%%/encodings/iso8859-6 lib/ecl-%%VERSION%%/encodings/iso8859-7 lib/ecl-%%VERSION%%/encodings/iso8859-8 lib/ecl-%%VERSION%%/encodings/iso8859-9 lib/ecl-%%VERSION%%/encodings/jisx0201.bin lib/ecl-%%VERSION%%/encodings/jisx0208.bin lib/ecl-%%VERSION%%/encodings/jisx0212.bin lib/ecl-%%VERSION%%/encodings/koi8-r.bin lib/ecl-%%VERSION%%/encodings/koi8-u.bin lib/ecl-%%VERSION%%/encodings/koi8r lib/ecl-%%VERSION%%/encodings/latin-1 lib/ecl-%%VERSION%%/encodings/latin-2 lib/ecl-%%VERSION%%/encodings/latin-3 lib/ecl-%%VERSION%%/encodings/latin-4 lib/ecl-%%VERSION%%/encodings/latin-5 lib/ecl-%%VERSION%%/encodings/latin-6 lib/ecl-%%VERSION%%/encodings/latin-7 lib/ecl-%%VERSION%%/encodings/latin-8 lib/ecl-%%VERSION%%/encodings/latin-9 lib/ecl-%%VERSION%%/encodings/latin2 lib/ecl-%%VERSION%%/encodings/latin3 lib/ecl-%%VERSION%%/encodings/latin4 lib/ecl-%%VERSION%%/encodings/latin5 lib/ecl-%%VERSION%%/encodings/latin6 lib/ecl-%%VERSION%%/encodings/latin7 lib/ecl-%%VERSION%%/encodings/latin8 lib/ecl-%%VERSION%%/encodings/latin9 lib/ecl-%%VERSION%%/encodings/ms-ansi lib/ecl-%%VERSION%%/encodings/ms-arab lib/ecl-%%VERSION%%/encodings/ms-cyrl lib/ecl-%%VERSION%%/encodings/ms-ee lib/ecl-%%VERSION%%/encodings/ms-greek lib/ecl-%%VERSION%%/encodings/ms-hebr lib/ecl-%%VERSION%%/encodings/ms-turk lib/ecl-%%VERSION%%/encodings/shift-jis.bin lib/ecl-%%VERSION%%/encodings/tools.lisp lib/ecl-%%VERSION%%/encodings/ucs2 lib/ecl-%%VERSION%%/encodings/ucs2be lib/ecl-%%VERSION%%/encodings/ucs2le lib/ecl-%%VERSION%%/encodings/ucs4 lib/ecl-%%VERSION%%/encodings/ucs4be lib/ecl-%%VERSION%%/encodings/ucs4le lib/ecl-%%VERSION%%/encodings/unicode lib/ecl-%%VERSION%%/encodings/utf-16 lib/ecl-%%VERSION%%/encodings/utf-16be lib/ecl-%%VERSION%%/encodings/utf-16le lib/ecl-%%VERSION%%/encodings/utf-32 lib/ecl-%%VERSION%%/encodings/utf-32be lib/ecl-%%VERSION%%/encodings/utf-32le lib/ecl-%%VERSION%%/encodings/utf16 lib/ecl-%%VERSION%%/encodings/utf32 lib/ecl-%%VERSION%%/encodings/utf8 lib/ecl-%%VERSION%%/encodings/winbaltrim lib/ecl-%%VERSION%%/encodings/windows-1250 lib/ecl-%%VERSION%%/encodings/windows-1251 lib/ecl-%%VERSION%%/encodings/windows-1252 lib/ecl-%%VERSION%%/encodings/windows-1253 lib/ecl-%%VERSION%%/encodings/windows-1254 lib/ecl-%%VERSION%%/encodings/windows-1255 lib/ecl-%%VERSION%%/encodings/windows-1256 lib/ecl-%%VERSION%%/encodings/windows-1257 lib/ecl-%%VERSION%%/encodings/windows-1258 lib/ecl-%%VERSION%%/encodings/windows-932 lib/ecl-%%VERSION%%/encodings/windows-936 lib/ecl-%%VERSION%%/encodings/windows-949 lib/ecl-%%VERSION%%/encodings/windows-950 lib/ecl-%%VERSION%%/encodings/windows-cp1250.bin lib/ecl-%%VERSION%%/encodings/windows-cp1251.bin lib/ecl-%%VERSION%%/encodings/windows-cp1252.bin lib/ecl-%%VERSION%%/encodings/windows-cp1253.bin lib/ecl-%%VERSION%%/encodings/windows-cp1254.bin lib/ecl-%%VERSION%%/encodings/windows-cp1255.bin lib/ecl-%%VERSION%%/encodings/windows-cp1256.bin lib/ecl-%%VERSION%%/encodings/windows-cp1257.bin lib/ecl-%%VERSION%%/encodings/windows-cp1258.bin lib/ecl-%%VERSION%%/encodings/windows-cp932.bin lib/ecl-%%VERSION%%/encodings/windows-cp936.bin lib/ecl-%%VERSION%%/encodings/windows-cp949.bin lib/ecl-%%VERSION%%/encodings/windows-cp950.bin lib/ecl-%%VERSION%%/help.doc %%ASDF%%lib/ecl-%%VERSION%%/libasdf.a lib/ecl-%%VERSION%%/libcmp.a %%SOCKETS%%lib/ecl-%%VERSION%%/libdeflate.a lib/ecl-%%VERSION%%/libecl-cdb.a %%SOCKETS%%lib/ecl-%%VERSION%%/libecl-curl.a lib/ecl-%%VERSION%%/libecl-help.a %%SOCKETS%%lib/ecl-%%VERSION%%/libecl-quicklisp.a lib/ecl-%%VERSION%%/libpackage-locks.a %%SOCKETS%%lib/ecl-%%VERSION%%/libql-minitar.a %%SOCKETS%%lib/ecl-%%VERSION%%/libsb-bsd-sockets.a lib/ecl-%%VERSION%%/libserve-event.a lib/ecl-%%VERSION%%/package-locks.asd lib/ecl-%%VERSION%%/package-locks.fas %%ASDF%%lib/ecl-%%VERSION%%/prebuilt-asdf.asd %%SOCKETS%%lib/ecl-%%VERSION%%/libsockets.a %%SOCKETS%%lib/ecl-%%VERSION%%/ql-minitar.asd %%SOCKETS%%lib/ecl-%%VERSION%%/ql-minitar.fas %%SOCKETS%%lib/ecl-%%VERSION%%/sb-bsd-sockets.asd %%SOCKETS%%lib/ecl-%%VERSION%%/sb-bsd-sockets.fas lib/ecl-%%VERSION%%/serve-event.asd lib/ecl-%%VERSION%%/serve-event.fas %%SOCKETS%%lib/ecl-%%VERSION%%/sockets.asd %%SOCKETS%%lib/ecl-%%VERSION%%/sockets.fas lib/libecl.so lib/libecl.so.%%VERSION%% -lib/libecl.so.20 -lib/libecl.so.20.4 +lib/libecl.so.21 +lib/libecl.so.21.2 man/man1/ecl-config.1.gz man/man1/ecl.1.gz @dir include/ecl/gc