Ping
On Sat, Dec 11, 2021, at 18:34, Timo Myyrä wrote:
> Hi,
>
> Here's an bump to bring ecl to latest version.
> Lightly tested on amd64.
>
> Timo
>
> diff 31bccecebaefd3b23c4e4dac76105b5dd0ae1159 /usr/ports
> blob - 49c2de291af99891af2eab90692315ae9b00654f
> file + lang/ecl/Makefile
> --- lang/ecl/Makefile
> +++ lang/ecl/Makefile
> @@ -3,9 +3,9 @@
> COMMENT = embeddable common-lisp
> CATEGORIES = lang
>
> -V = 20.4.24
> +V = 21.2.1
> DISTNAME = ecl-$V
> -SHARED_LIBS += ecl 7.0
> +SHARED_LIBS += ecl 8.0
>
> HOMEPAGE = https://common-lisp.net/project/ecl/
> MAINTAINER = Timo Myyra <timo.my...@bittivirhe.fi>
> @@ -46,9 +46,7 @@ LIB_DEPENDS += devel/gmp \
> devel/libffi
>
> TEST_DEPENDS = ${BASE_PKGPATH}
> +TEST_ENV = "ECL=${WRKDIST}/build/bin/ecl" \
> + "TEST_IMAGE=${WRKDIST}/build/bin/ecl"
>
> -# XXX: Workaround for missing Copyright file
> -post-configure:
> - @cp ${WRKSRC}/{LICENSE,Copyright}
> -
> .include <bsd.port.mk>
> blob - 5c3377469374e1eefeb7900f2d30b5660b4c9528
> file + lang/ecl/distinfo
> --- lang/ecl/distinfo
> +++ lang/ecl/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (ecl-20.4.24.tgz) = Zwg47fJYqTa1Iv22INozbefldaoNJ+NIQXJyUnJtDwc=
> -SIZE (ecl-20.4.24.tgz) = 7815444
> +SHA256 (ecl-21.2.1.tgz) = sVp13PhLj2LmhyDMqxOT+WEcB4/NOv3WOaEIbK0BCQA=
> +SIZE (ecl-21.2.1.tgz) = 7875088
> blob - b44246b9b8d755df5784e6b4dd04570657feb031
> file + lang/ecl/patches/patch-src_Makefile_in
> --- lang/ecl/patches/patch-src_Makefile_in
> +++ lang/ecl/patches/patch-src_Makefile_in
> @@ -6,7 +6,6 @@ Index: src/Makefile.in
> for i in `(cd ecl && find . -name '*.h')`; do echo $$i; \
> $(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \
> done
> -+ $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir)
> $(INSTALL_SCRIPT) bin/ecl-config $(DESTDIR)$(bindir)
> - for i in build-stamp help.doc TAGS ; do \
> - $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \
> @@ -26,6 +25,7 @@ Index: src/Makefile.in
> - $(LN_S) @SONAME3@ @SONAME1@ && \
> - $(LN_S) @SONAME3@ @SONAME@ ) \
> - fi
> ++ $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir)
> + ${INSTALL_LIBRARY} libecl.so $(DESTDIR)$(libdir)/$(LSP_LIBRARIES)
> + cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so
> $(INSTALL_PROGRAM) c/$(DPP) $(DESTDIR)$(ecldir)
> blob - 510d663817b8a3936ee24c14411001f61c030bbf
> file + /dev/null
> --- lang/ecl/patches/patch-src_c_package_d
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -$OpenBSD: patch-src_c_package_d,v 1.1 2020/08/24 21:38:06 gkoehler Exp $
> -
> -Work around a SIGSEGV on 64-bit big-endian platforms
> -(mips64, powerpc64, sparc64), from Daniel Kochmaski,
> -https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604#note_388147381
> -
> -Index: src/c/package.d
> ---- src/c/package.d.orig
> -+++ src/c/package.d
> -@@ -327,10 +327,12 @@ ecl_find_package_nolock(cl_object name)
> - return name;
> - name = cl_string(name);
> -
> -- p = ecl_symbol_value(@'*package*');
> -- if (ECL_PACKAGEP(p)) {
> -- p = ecl_assoc(name, p->pack.local_nicknames);
> -- if (!Null(p)) return ECL_CONS_CDR(p);
> -+ if (ecl_option_values[ECL_OPT_BOOTED]) {
> -+ p = ecl_symbol_value(@'*package*');
> -+ if (ECL_PACKAGEP(p)) {
> -+ p = ecl_assoc(name, p->pack.local_nicknames);
> -+ if (!Null(p)) return ECL_CONS_CDR(p);
> -+ }
> - }
> -
> - l = cl_core.packages;
> blob - 1f720b8258ab12e59b9c01b247cf29641de99555
> file + lang/ecl/patches/patch-src_configure
> --- lang/ecl/patches/patch-src_configure
> +++ lang/ecl/patches/patch-src_configure
> @@ -2,7 +2,7 @@ $OpenBSD: patch-src_configure,v 1.9 2020/08/24 21:38:0
> Index: src/configure
> --- src/configure.orig
> +++ src/configure
> -@@ -5050,7 +5050,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
> +@@ -5240,7 +5240,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
> BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
> ECL_LDRPATH="-Wl,--rpath,~A"
> clibs="-lpthread ${clibs}"
> @@ -11,7 +11,7 @@ Index: src/configure
> SONAME_LDFLAGS="-Wl,-soname,SONAME"
> ;;
> solaris*)
> -@@ -9682,7 +9682,7 @@ if test ${enable_shared} = "yes"; then
> +@@ -9910,7 +9910,7 @@ if test ${enable_shared} = "yes"; then
>
> $as_echo "#define ENABLE_DLOPEN 1" >>confdefs.h
>
> blob - aaa872a968b99a07f318f3b31e3a8bf0ebbfea40
> file + lang/ecl/pkg/PLIST
> --- lang/ecl/pkg/PLIST
> +++ lang/ecl/pkg/PLIST
> @@ -29,7 +29,6 @@ include/ecl/object.h
> include/ecl/page.h
> include/ecl/stack-resize.h
> include/ecl/stacks.h
> -info/ecl.info.gz
> lib/ecl/
> lib/ecl/COPYING
> lib/ecl/LICENSE
