- Upgrade to version 12.7.1 [0].

- Convert to OptionsNG while I'm here.

Submitted by:	Krishna <v.krishnakumar@gmail.com> (by email) [0]

3 files changed, 106 insertions, 31 deletions

diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index e213cb140b9f..c5a70b8e0f56 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -6,28 +6,31 @@
 #
 
 PORTNAME=	ecl
-PORTVERSION=	12.2.1
+PORTVERSION=	12.7.1
 CATEGORIES=	lang lisp
-MASTER_SITES=	SF/${PORTNAME}s/${PORTNAME}s/12.2/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	SF/${PORTNAME}s/${PORTNAME}s/12.7/
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	An ANSI Common Lisp implementation
 
-LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp
 
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-system-gmp --enable-boehm=system
+CONFIGURE_ARGS=	--with-system-gmp --with-gmp-prefix=${LOCALBASE} --enable-boehm=system
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
-OPTIONS=	ASDF "Enable ASDF building facility" on \
-		CLX "Enable X11 interface" off \
-		SOCKETS "Enable socket interface" on \
-		THREADS "Enable threading support" off
+OPTIONS_DEFINE=	ASDF CLX DFFI SOCKETS THREADS
+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
 
 MAN1=		ecl.1 ecl-config.1
 
@@ -39,7 +42,7 @@ PLIST_SUB=      VERSION="${PORTVERSION}"
 BROKEN=		Does not compile on ${ARCH}
 .endif
 
-.if !defined(WITHOUT_ASDF)
+.if ${PORT_OPTIONS:MASDF}
 CONFIGURE_ARGS+=--with-asdf=yes
 PLIST_SUB+=	ASDF=""
 .else
@@ -47,7 +50,7 @@ CONFIGURE_ARGS+=--with-asdf=no
 PLIST_SUB+=	ASDF="@comment "
 .endif
 
-.if defined(WITH_CLX)
+.if ${PORT_OPTIONS:MCLX}
 USE_XORG=	x11
 CONFIGURE_ARGS+=--with-clx=yes
 PLIST_SUB+=	CLX=""
@@ -56,7 +59,7 @@ CONFIGURE_ARGS+=--with-clx=no
 PLIST_SUB+=	CLX="@comment "
 .endif
 
-.if !defined(WITHOUT_SOCKETS)
+.if ${PORT_OPTIONS:MSOCKETS}
 CONFIGURE_ARGS+=--with-tcp=yes
 PLIST_SUB+=	SOCKETS=""
 .else
@@ -64,16 +67,25 @@ CONFIGURE_ARGS+=--with-tcp=no
 PLIST_SUB+=	SOCKETS="@comment "
 .endif
 
-.if defined(WITH_THREADS)
+.if ${PORT_OPTIONS:MDFFI}
+CONFIGURE_ARGS+=--with-dffi=system
+LIB_DEPENDS+=	ffi:${PORTSDIR}/devel/libffi
+.else
+CONFIGURE_ARGS+=--with-dffi=no
+.endif
+
+.if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=--enable-threads=yes
 LDFLAGS+=	${PTHREAD_LIBS}
-LIB_DEPENDS+=	gc-threaded.1:${PORTSDIR}/devel/boehm-gc-threaded
+LIB_DEPENDS+=	gc-threaded:${PORTSDIR}/devel/boehm-gc-threaded
+PLIST_SUB+=	THREADS=""
 .else
 CONFIGURE_ARGS+=--enable-threads=no
-LIB_DEPENDS+=	gc.1:${PORTSDIR}/devel/boehm-gc
+LIB_DEPENDS+=	gc:${PORTSDIR}/devel/boehm-gc
+PLIST_SUB+=	THREADS="@comment "
 .endif
 
-.if defined(WITH_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lgc|-lgc-threaded|' \
  		-e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/src/configure
diff --git a/lang/ecl/distinfo b/lang/ecl/distinfo
index 755cc03b1086..f2194dc3d695 100644
--- a/lang/ecl/distinfo
+++ b/lang/ecl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ecl-12.2.1.tgz) = dbb3f83c27f3d2565ca22c1c6b4ab497bbfdd0d0a7b09dee76338f378621f091
-SIZE (ecl-12.2.1.tgz) = 8974948
+SHA256 (ecl-12.7.1.tar.gz) = 5709bfb92eff00ddc4bcd59375835e9421dae2d258466af75e7e8d2748e01c4d
+SIZE (ecl-12.7.1.tar.gz) = 9009087
diff --git a/lang/ecl/pkg-plist b/lang/ecl/pkg-plist
index dc6f3c93aa1b..cfdb1d734b71 100644
--- a/lang/ecl/pkg-plist
+++ b/lang/ecl/pkg-plist
@@ -10,8 +10,6 @@ include/ecl/ecl-cmp.h
 include/ecl/ecl-inl.h
 include/ecl/ecl.h
 include/ecl/external.h
-include/ecl/ffi.h
-include/ecl/ffitarget.h
 include/ecl/impl/math_dispatch.h
 include/ecl/impl/math_dispatch2.h
 include/ecl/impl/math_fenv.h
@@ -23,6 +21,50 @@ include/ecl/object.h
 include/ecl/page.h
 include/ecl/stacks.h
 include/ecl/unify.h
+%%THREADS%%include/ecl/atomic_ops.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/ao_t_is_int.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/alpha.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/arm.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/cris.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
+%%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/powerpc.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/gcc/s390.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/msftc/x86.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/msftc/x86_64.h
+%%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/test_and_set_t_is_ao_t.h
+%%THREADS%%include/ecl/atomic_ops/sysdeps/test_and_set_t_is_char.h
 %%LIB32DIR%%/ecl-%%VERSION%%/Copyright
 %%LIB32DIR%%/ecl-%%VERSION%%/LGPL
 %%LIB32DIR%%/ecl-%%VERSION%%/TAGS
@@ -43,9 +85,12 @@ include/ecl/unify.h
 %%SOCKETS%%%%LIB32DIR%%/ecl-%%VERSION%%/ecl-curl.fas
 %%LIB32DIR%%/ecl-%%VERSION%%/ecl-help.asd
 %%LIB32DIR%%/ecl-%%VERSION%%/ecl-help.fas
+%%SOCKETS%%%%LIB32DIR%%/ecl-%%VERSION%%/ecl-quicklisp.asd
+%%SOCKETS%%%%LIB32DIR%%/ecl-%%VERSION%%/ecl-quicklisp.fas
 %%LIB32DIR%%/ecl-%%VERSION%%/ecl_min
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/arabic
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/ascii
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/asmo-708
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/atarist.bin
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/cp-856.bin
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/cp819
@@ -73,8 +118,10 @@ include/ecl/unify.h
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/dos-cp866.bin
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/dos-cp869.bin
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/dos-cp874.bin
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/ecma-114
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/ecma-118
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/greek
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/greek8
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/hebrew
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/ibm437
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/ibm819
@@ -107,16 +154,26 @@ include/ecl/unify.h
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso-8859-7.bin
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso-8859-8.bin
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso-8859-9.bin
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso8859-1
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso8859-10
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso8859-13
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso8859-14
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso8859-15
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso8859-2
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso8859-3
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso8859-4
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso8859-5
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso8859-6
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso8859-7
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso8859-8
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/iso8859-9
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/jisx0201.bin
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/jisx0208.bin
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/jisx0212.bin
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/koi8-r.bin
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/koi8-u.bin
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/koi8r
-%%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin-0
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin-1
-%%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin-10
-%%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin-11
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin-2
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin-3
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin-4
@@ -125,10 +182,6 @@ include/ecl/unify.h
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin-7
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin-8
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin-9
-%%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin0
-%%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin1
-%%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin10
-%%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin11
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin2
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin3
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/latin4
@@ -145,7 +198,6 @@ include/ecl/unify.h
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/ms-hebr
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/ms-turk
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/shift-jis.bin
-%%LIB32DIR%%/ecl-%%VERSION%%/encodings/thai
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/tools.lisp
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/ucs2
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/ucs2be
@@ -160,7 +212,9 @@ include/ecl/unify.h
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/utf-32
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/utf-32be
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/utf-32le
-%%LIB32DIR%%/ecl-%%VERSION%%/encodings/utf-8
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/utf16
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/utf32
+%%LIB32DIR%%/ecl-%%VERSION%%/encodings/utf8
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/winbaltrim
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/windows-1250
 %%LIB32DIR%%/ecl-%%VERSION%%/encodings/windows-1251
@@ -197,6 +251,7 @@ include/ecl/unify.h
 %%LIB32DIR%%/ecl-%%VERSION%%/libecl-cdb.a
 %%SOCKETS%%%%LIB32DIR%%/ecl-%%VERSION%%/libecl-curl.a
 %%LIB32DIR%%/ecl-%%VERSION%%/libecl-help.a
+%%SOCKETS%%%%LIB32DIR%%/ecl-%%VERSION%%/libecl-quicklisp.a
 %%LIB32DIR%%/ecl-%%VERSION%%/libprofile.a
 %%SOCKETS%%%%LIB32DIR%%/ecl-%%VERSION%%/libql-minitar.a
 %%LIB32DIR%%/ecl-%%VERSION%%/librt.a
@@ -218,11 +273,19 @@ include/ecl/unify.h
 %%SOCKETS%%%%LIB32DIR%%/ecl-%%VERSION%%/sockets.fas
 %%LIB32DIR%%/libecl.so
 %%LIB32DIR%%/libecl.so.12
-%%LIB32DIR%%/libecl.so.12.2
-%%LIB32DIR%%/libecl.so.12.2.1
+%%LIB32DIR%%/libecl.so.12.7
+%%LIB32DIR%%/libecl.so.12.7.1
 @dirrm %%LIB32DIR%%/ecl-%%VERSION%%/encodings
 @dirrm %%LIB32DIR%%/ecl-%%VERSION%%
 @dirrm include/ecl/impl
 @dirrm include/ecl/gc/private
 @dirrm include/ecl/gc
+%%THREADS%%@dirrm include/ecl/atomic_ops/sysdeps/sunc
+%%THREADS%%@dirrm include/ecl/atomic_ops/sysdeps/msftc
+%%THREADS%%@dirrm include/ecl/atomic_ops/sysdeps/icc
+%%THREADS%%@dirrm include/ecl/atomic_ops/sysdeps/ibmc
+%%THREADS%%@dirrm include/ecl/atomic_ops/sysdeps/hpc
+%%THREADS%%@dirrm include/ecl/atomic_ops/sysdeps/gcc
+%%THREADS%%@dirrm include/ecl/atomic_ops/sysdeps
+%%THREADS%%@dirrm include/ecl/atomic_ops
 @dirrm include/ecl