Update lang/ecl from 15.3.7 to 16.1.3

- Change MASTER_SITES, as 16.1.3 is not available on SourceForge.
- Rename the CLX option to X11, consistent with FreeBSD's standards and
  with the fact that the option into the configure script from ecl is now
  --with-x.
- Strip libecl.so.${PORTVERSION}.

PR:		232615
Approved by:	olgeni (maintainer timeout, 16 months), gerald (mentor)

4 files changed, 45 insertions, 34 deletions

diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index 22497def9b9f..abf8e2a58b65 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	ecl
-PORTVERSION=	15.3.7
-PORTREVISION=	5
+PORTVERSION=	16.1.3
 CATEGORIES=	lang lisp
-MASTER_SITES=	SF/${PORTNAME}s/${PORTNAME}s/15.3/
+MASTER_SITES=	https://common-lisp.net/project/ecl/static/files/release/
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	ANSI Common Lisp implementation
@@ -27,11 +26,10 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	ASDF CLX DFFI SOCKETS THREADS
+OPTIONS_DEFINE=	ASDF DFFI SOCKETS THREADS X11
 OPTIONS_DEFAULT=ASDF DFFI SOCKETS THREADS
 
 ASDF_DESC=	Enable ASDF building facility
-CLX_DESC=	Enable X11 interface
 SOCKETS_DESC=	Enable socket interface
 DFFI_DESC=	Dynamic foreign-function support
 
@@ -41,10 +39,10 @@ PLIST_SUB=	VERSION="${PORTVERSION}"
 ASDF_CONFIGURE_ON=	--with-asdf=yes
 ASDF_CONFIGURE_OFF=	--with-asdf=no
 
-CLX_USES=		xorg
-CLX_USE=		XORG=x11
-CLX_CONFIGURE_ON=	--with-clx=yes
-CLX_CONFIGURE_OFF=	--with-clx=no
+X11_USES=		xorg
+X11_USE=		XORG=x11
+X11_CONFIGURE_ON=	--with-x=yes
+X11_CONFIGURE_OFF=	--with-x=no
 
 SOCKETS_CONFIGURE_ON=	--with-tcp=yes
 SOCKETS_CONFIGURE_OFF=	--with-tcp=no
@@ -64,5 +62,6 @@ post-patch-THREADS-on:
 
 post-install:
 	${RMDIR} ${STAGEDIR}${PREFIX}/include/ecl/gc/private
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libecl.so.${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/lang/ecl/distinfo b/lang/ecl/distinfo
index 4aa43764f071..265469dc1888 100644
--- a/lang/ecl/distinfo
+++ b/lang/ecl/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ecl-15.3.7.tgz) = 2dc6ffbbf1e0a7b1323d49a991ba1f005127ca3e153651d91ba9e65bdaec948f
-SIZE (ecl-15.3.7.tgz) = 8755180
+TIMESTAMP = 1565942436
+SHA256 (ecl-16.1.3.tgz) = 76a585c616e8fa83a6b7209325a309da5bc0ca68e0658f396f49955638111254
+SIZE (ecl-16.1.3.tgz) = 7459212
diff --git a/lang/ecl/pkg-descr b/lang/ecl/pkg-descr
index 5503d080ac28..dfa5912b0ed2 100644
--- a/lang/ecl/pkg-descr
+++ b/lang/ecl/pkg-descr
@@ -3,4 +3,4 @@ language as described in the X3J13 ANSI specification, featuring CLOS
 (Common-Lisp Object System), conditions, loops, etc, plus a translator
 to C, which can produce standalone executables.
 
-WWW: https://sourceforge.net/projects/ecls/
+WWW: https://common-lisp.net/project/ecl/main.html
diff --git a/lang/ecl/pkg-plist b/lang/ecl/pkg-plist
index e6bddaa92571..2bebdbb17f4b 100644
--- a/lang/ecl/pkg-plist
+++ b/lang/ecl/pkg-plist
@@ -1,23 +1,26 @@
 bin/ecl
 bin/ecl-config
 %%THREADS%%include/ecl/atomic_ops.h
+%%THREADS%%include/ecl/atomic_ops/ao_version.h
+%%THREADS%%include/ecl/atomic_ops/generalize-arithm.h
 %%THREADS%%include/ecl/atomic_ops/generalize-small.h
 %%THREADS%%include/ecl/atomic_ops/generalize.h
-%%THREADS%%include/ecl/atomic_ops/sysdeps/acquire_release_volatile.h
-%%THREADS%%include/ecl/atomic_ops/sysdeps/aligned_atomic_load_store.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/all_acquire_release_volatile.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/all_aligned_atomic_load_store.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/all_atomic_load_store.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/all_atomic_only_load.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/ao_t_is_int.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/armcc/arm_v6.h
-%%THREADS%%include/ecl/atomic_ops/sysdeps/atomic_load_store.h
-%%THREADS%%include/ecl/atomic_ops/sysdeps/char_acquire_release_volatile.h
-%%THREADS%%include/ecl/atomic_ops/sysdeps/char_atomic_load_store.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/emul_cas.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/aarch64.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/alpha.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/arm.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/avr32.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/cris.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/generic-arithm.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/generic-small.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/generic.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/hexagon.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/hppa.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/ia64.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/m68k.h
@@ -27,15 +30,26 @@ bin/ecl-config
 %%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/sh.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/sparc.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/x86.h
-%%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/x86_64.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/generic_pthread.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/hpc/hppa.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/hpc/ia64.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/ibmc/powerpc.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/icc/ia64.h
-%%THREADS%%include/ecl/atomic_ops/sysdeps/int_acquire_release_volatile.h
-%%THREADS%%include/ecl/atomic_ops/sysdeps/int_aligned_atomic_load_store.h
-%%THREADS%%include/ecl/atomic_ops/sysdeps/int_atomic_load_store.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/acquire_release_volatile.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/atomic_load.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/atomic_store.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/char_acquire_release_volatile.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/char_atomic_load.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/char_atomic_store.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/double_atomic_load_store.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/int_acquire_release_volatile.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/int_atomic_load.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/int_atomic_store.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/ordered_loads_only.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/ordered_stores_only.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/short_acquire_release_volatile.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/short_atomic_load.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/loadstore/short_atomic_store.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/msftc/arm.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/msftc/common32_defs.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/msftc/x86.h
@@ -43,18 +57,16 @@ bin/ecl-config
 %%THREADS%%include/ecl/atomic_ops/sysdeps/ordered.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/ordered_except_wr.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/read_ordered.h
-%%THREADS%%include/ecl/atomic_ops/sysdeps/short_acquire_release_volatile.h
-%%THREADS%%include/ecl/atomic_ops/sysdeps/short_aligned_atomic_load_store.h
-%%THREADS%%include/ecl/atomic_ops/sysdeps/short_atomic_load_store.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/standard_ao_double_t.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/sunc/sparc.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/sunc/x86.h
-%%THREADS%%include/ecl/atomic_ops/sysdeps/sunc/x86_64.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/test_and_set_t_is_ao_t.h
 %%THREADS%%include/ecl/atomic_ops/sysdeps/test_and_set_t_is_char.h
 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
@@ -72,14 +84,11 @@ include/ecl/number.h
 include/ecl/object.h
 include/ecl/page.h
 include/ecl/stacks.h
-include/ecl/unify.h
-lib/ecl-%%VERSION%%/Copyright
-lib/ecl-%%VERSION%%/LGPL
+lib/ecl-%%VERSION%%/COPYING
+lib/ecl-%%VERSION%%/LICENSE
 lib/ecl-%%VERSION%%/TAGS
 %%ASDF%%lib/ecl-%%VERSION%%/asdf.fas
 lib/ecl-%%VERSION%%/build-stamp
-%%CLX%%lib/ecl-%%VERSION%%/clx.asd
-%%CLX%%lib/ecl-%%VERSION%%/clx.fas
 lib/ecl-%%VERSION%%/cmp.asd
 lib/ecl-%%VERSION%%/cmp.fas
 %%SOCKETS%%lib/ecl-%%VERSION%%/deflate.asd
@@ -252,7 +261,6 @@ 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
-%%CLX%%lib/ecl-%%VERSION%%/libclx.a
 lib/ecl-%%VERSION%%/libcmp.a
 %%SOCKETS%%lib/ecl-%%VERSION%%/libdeflate.a
 lib/ecl-%%VERSION%%/libdefsystem.a
@@ -260,11 +268,14 @@ 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
 lib/ecl-%%VERSION%%/libprofile.a
 %%SOCKETS%%lib/ecl-%%VERSION%%/libql-minitar.a
 lib/ecl-%%VERSION%%/librt.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
 lib/ecl-%%VERSION%%/profile.asd
@@ -280,9 +291,9 @@ lib/ecl-%%VERSION%%/serve-event.fas
 %%SOCKETS%%lib/ecl-%%VERSION%%/sockets.asd
 %%SOCKETS%%lib/ecl-%%VERSION%%/sockets.fas
 lib/libecl.so
-lib/libecl.so.15
-lib/libecl.so.15.3
-lib/libecl.so.15.3.7
+lib/libecl.so.16
+lib/libecl.so.16.1
+lib/libecl.so.%%VERSION%%
 man/man1/ecl-config.1.gz
 man/man1/ecl.1.gz
 @dir include/ecl/gc