Update to ECL 12.7.1

ECL 12.7.1:
===========

* Bugs fixed:

 - The implementation of locks and condition variables based on POSIX threads
   was not safe under interrupts. It has all been reimplemented using atomic
   userspace operations plus a new wait queue.

 - :CDECL was not accepted as an FFI declaration due to a typo.

 - REMOVE-METHOD and FIND-METHOD were not generic functions.

 - MAKE-LOAD-FORM's methods for standard-object, structure-object and
   condition did not signal an error).

* Visible changes:

 - ECL builds with support for threads by default (where available).

 - DIRECTORY no longer complains when it finds an inexistent directory
   component: it simply returns NIL as the list of pathnames.

 - CASE now complains when the OTHERWISE/T clause is not the last one.

 - Instead of issuing an error, LOOP now only produces a STYLE-WARNING
   when iteration forms appear at the wrong place, as in (LOOP WHILE ...)
   followed by some assignment.

 - EXT:MKDIR no longer accepts pathnames as inputs to avoid problems with
   pathnames that contain name or type components.

 - ENSURE-DIRECTORIES-EXIST accepts the keyword argument :MODE which is
   passed to MKDIR.

 - In EXT:RUN-PROGRAM the child process is delayed until the parent has created
   the process structure and stored the process id in it. Formerly we had race
   conditions due to the child exiting before the parent was able to call
   sigwait().

 - Where available, ECL now defines the constants EXT:+SIGRTMIN+ and
   EXT:+SIGRTMAX+, as well as EXT:+SIGRT0+ through EXT:+RTMINn+ where n =
   SIGRTMAX - SIGRTMIN Those signals can be then trapped.

 - The interrupt handler for floating point exceptions does not care about
   the value of EXT:*INTERRUPTS-ENABLED* or similar mechanisms because such
   interrupt has to be treated as an error, not as something optional. The
   same applies to other evil signals, such as SIGSEGV or SIGBUS.

 - New functions (EXT:GET-INTERRUPT-HANDLER code) and
   (EXT:SET-INTERRUPT-HANDLER code function-designator) allow the user to
   customize how these interrupts are caught. SET-INTERRUPT-HANDLER runs an
   implicit EXT:CATCH-SIGNAL.

 - ECL now exports the symbols FFI:C-INT-MAX, FFI:C-INT-MIN, FFI:C-LONG-MAX,
   etc, which correspond to the POSIX C constants INT_MAX, INT_MIN, LONG_MAX,
   and similar ones.

 - APROPOS-LIST no longer returns duplicate symbols.

 - The ABORT restart is now bound on every new thread (except the main one,
   where either the user or the toplevel must take care of that).

* Windows:

 - ECL guesses whether the input / output / error streams are consoles. If
   so, it sets up a special type of stream that copes with the deficiencies
   of read()/write() and similar functions on consoles -- namely that they
   may read or write a larger number of bytes than demanded because they
   translate the input/output to and from the corresponding codepage.
   (EXPERIMENTAL)

 - ECL detects the codepage that the console is using and applies it as
   the appropriate external format (with :CRLF convention).

 - ECL's console stream signals EOF when Ctrl-Z is detected.

* Metaobject protocol:

 - Implemented CLOS:COMPUTE-APPLICABLE-METHODS-USING-CLASSES.

 - COMPUTE-APPLICABLE-METHODS and CLOS:COMPUTE-EFFECTIVE-METHOD are now
   generic functions.

 - Implemented and used in the core: VALIDATE-SUPERCLASSES

 - UPDATE-DEPENDENT, MAP-DEPENDENTS and related functions have been fixed. They
   are now invoked by REMOVE-METHOD and REINITIALIZE-INSTANCE, when acting on
   generic functions, standard classes, etc.

 - (SETF CLASS-NAME) is now implemented using REINITIALIZE-INSTANCE.

 - ENSURE-CLASS-USING-CLASS now registers the class with
   FIND-CLASS. ENSURE-CLASS relies on E-C-U-C doing that.

 - EXTRACT-LAMBDA-LIST and EXTRACT-SPECIALIZER-NAMES implemented.

 - CLOS:GENERIC-FUNCTION-DECLARATIONS and slot CLOS:DECLARATIONS are now
   implemented (even if not used by ECL itself).

 - Implemented the class CLOS:METAOBJECT

 - Implemented SPECIALIZER and EQL-SPECIALIZER, together with
   ADD-DIRECT-METHOD, REMOVE-DIRECT-METHOD, SPECIALIZER-DIRECT-METHODS,
   SPECIALIZER-DIRECT-GENERIC-FUNCTIONS and EQL-SPECIALIZER-OBJECT. ECL now
   uses these objects internally for method dispatch.

 - DEFMETHOD now relies on MAKE-METHOD-LAMBDA to create the appropriate
   function.

 - Implemented COMPUTE-DISCRIMINATING-FUNCTION.

 - ECL's discriminating functions use COMPUTE-APPLICABLE-METHODS-USING-CLASSES
   on those classes in which the user may redefine or extend the
   method. Elsewhere, ECL relies on the internal equivalent of
   COMPUTE-APPLICABLE-METHODS, which _always_ memoizes results.

 - When reinitializing a class instance, ECL would not remove the class from
   its former superclasses.

 - The method combination slot of a generic function is now precomputed by
   using FIND-METHOD-COMBINATION in SHARED-INITIALIZE.

 - METHOD-COMBINATION is now a class with slots and it is used by ECL for
   computing effective methods.

 - The MOP and CL classes and metaclasses do not contain any slot whose name
   is exported by any of the CL or CL-USER packages.

6 files changed, 187 insertions, 172 deletions

diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index d39fd5ba4d1..978842f4468 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2012/07/05 14:51:47 asau Exp $
-#
+# $NetBSD: Makefile,v 1.13 2012/07/26 21:09:29 asau Exp $
 
-DISTNAME=		ecl-12.2.1
+DISTNAME=		ecl-12.7.1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ecls/}
-EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		asau@inbox.ru
 HOMEPAGE=		http://ecls.sourceforge.net/
diff --git a/lang/ecl/PLIST b/lang/ecl/PLIST
index 3fdff449141..3d40b90b37f 100644
--- a/lang/ecl/PLIST
+++ b/lang/ecl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/07/05 14:51:47 asau Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/07/26 21:09:29 asau Exp $
 bin/ecl
 bin/ecl-config
 include/ecl/bytecodes.h
@@ -42,7 +42,163 @@ lib/${PKGNAME}/ecl-curl.asd
 lib/${PKGNAME}/ecl-curl.fas
 lib/${PKGNAME}/ecl-help.asd
 lib/${PKGNAME}/ecl-help.fas
+lib/${PKGNAME}/ecl-quicklisp.asd
+lib/${PKGNAME}/ecl-quicklisp.fas
 lib/${PKGNAME}/ecl_min
+${PLIST.unicode}lib/${PKGNAME}/encodings/arabic
+${PLIST.unicode}lib/${PKGNAME}/encodings/ascii
+${PLIST.unicode}lib/${PKGNAME}/encodings/asmo-708
+${PLIST.unicode}lib/${PKGNAME}/encodings/atarist.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/cp-856.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/cp819
+${PLIST.unicode}lib/${PKGNAME}/encodings/cp850
+${PLIST.unicode}lib/${PKGNAME}/encodings/cp862
+${PLIST.unicode}lib/${PKGNAME}/encodings/cp866
+${PLIST.unicode}lib/${PKGNAME}/encodings/cp932
+${PLIST.unicode}lib/${PKGNAME}/encodings/cp936
+${PLIST.unicode}lib/${PKGNAME}/encodings/cp949
+${PLIST.unicode}lib/${PKGNAME}/encodings/cp950
+${PLIST.unicode}lib/${PKGNAME}/encodings/cyrillic
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp437.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp737.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp775.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp850.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp852.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp855.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp857.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp860.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp861.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp862.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp863.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp864.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp865.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp866.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp869.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/dos-cp874.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/ecma-114
+${PLIST.unicode}lib/${PKGNAME}/encodings/ecma-118
+${PLIST.unicode}lib/${PKGNAME}/encodings/greek
+${PLIST.unicode}lib/${PKGNAME}/encodings/greek8
+${PLIST.unicode}lib/${PKGNAME}/encodings/hebrew
+${PLIST.unicode}lib/${PKGNAME}/encodings/ibm437
+${PLIST.unicode}lib/${PKGNAME}/encodings/ibm819
+${PLIST.unicode}lib/${PKGNAME}/encodings/ibm850
+${PLIST.unicode}lib/${PKGNAME}/encodings/ibm852
+${PLIST.unicode}lib/${PKGNAME}/encodings/ibm855
+${PLIST.unicode}lib/${PKGNAME}/encodings/ibm857
+${PLIST.unicode}lib/${PKGNAME}/encodings/ibm860
+${PLIST.unicode}lib/${PKGNAME}/encodings/ibm861
+${PLIST.unicode}lib/${PKGNAME}/encodings/ibm862
+${PLIST.unicode}lib/${PKGNAME}/encodings/ibm863
+${PLIST.unicode}lib/${PKGNAME}/encodings/ibm864
+${PLIST.unicode}lib/${PKGNAME}/encodings/ibm865
+${PLIST.unicode}lib/${PKGNAME}/encodings/ibm866
+${PLIST.unicode}lib/${PKGNAME}/encodings/ibm869
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-2022-jp
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-2022-jp-1
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-1.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-10.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-11.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-13.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-14.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-15.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-16.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-2.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-3.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-4.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-5.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-6.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-7.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-8.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso-8859-9.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso8859-1
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso8859-10
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso8859-13
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso8859-14
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso8859-15
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso8859-2
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso8859-3
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso8859-4
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso8859-5
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso8859-6
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso8859-7
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso8859-8
+${PLIST.unicode}lib/${PKGNAME}/encodings/iso8859-9
+${PLIST.unicode}lib/${PKGNAME}/encodings/jisx0201.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/jisx0208.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/jisx0212.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/koi8-r.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/koi8-u.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/koi8r
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin-1
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin-2
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin-3
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin-4
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin-5
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin-6
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin-7
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin-8
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin-9
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin2
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin3
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin4
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin5
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin6
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin7
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin8
+${PLIST.unicode}lib/${PKGNAME}/encodings/latin9
+${PLIST.unicode}lib/${PKGNAME}/encodings/ms-ansi
+${PLIST.unicode}lib/${PKGNAME}/encodings/ms-arab
+${PLIST.unicode}lib/${PKGNAME}/encodings/ms-cyrl
+${PLIST.unicode}lib/${PKGNAME}/encodings/ms-ee
+${PLIST.unicode}lib/${PKGNAME}/encodings/ms-greek
+${PLIST.unicode}lib/${PKGNAME}/encodings/ms-hebr
+${PLIST.unicode}lib/${PKGNAME}/encodings/ms-turk
+${PLIST.unicode}lib/${PKGNAME}/encodings/shift-jis.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/tools.lisp
+${PLIST.unicode}lib/${PKGNAME}/encodings/ucs2
+${PLIST.unicode}lib/${PKGNAME}/encodings/ucs2be
+${PLIST.unicode}lib/${PKGNAME}/encodings/ucs2le
+${PLIST.unicode}lib/${PKGNAME}/encodings/ucs4
+${PLIST.unicode}lib/${PKGNAME}/encodings/ucs4be
+${PLIST.unicode}lib/${PKGNAME}/encodings/ucs4le
+${PLIST.unicode}lib/${PKGNAME}/encodings/unicode
+${PLIST.unicode}lib/${PKGNAME}/encodings/utf-16
+${PLIST.unicode}lib/${PKGNAME}/encodings/utf-16be
+${PLIST.unicode}lib/${PKGNAME}/encodings/utf-16le
+${PLIST.unicode}lib/${PKGNAME}/encodings/utf-32
+${PLIST.unicode}lib/${PKGNAME}/encodings/utf-32be
+${PLIST.unicode}lib/${PKGNAME}/encodings/utf-32le
+${PLIST.unicode}lib/${PKGNAME}/encodings/utf16
+${PLIST.unicode}lib/${PKGNAME}/encodings/utf32
+${PLIST.unicode}lib/${PKGNAME}/encodings/utf8
+${PLIST.unicode}lib/${PKGNAME}/encodings/winbaltrim
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-1250
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-1251
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-1252
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-1253
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-1254
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-1255
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-1256
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-1257
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-1258
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-932
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-936
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-949
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-950
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-cp1250.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-cp1251.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-cp1252.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-cp1253.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-cp1254.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-cp1255.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-cp1256.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-cp1257.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-cp1258.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-cp932.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-cp936.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-cp949.bin
+${PLIST.unicode}lib/${PKGNAME}/encodings/windows-cp950.bin
 lib/${PKGNAME}/help.doc
 lib/${PKGNAME}/libasdf.a
 ${PLIST.clx}lib/${PKGNAME}/libclx.a
@@ -52,6 +208,7 @@ lib/${PKGNAME}/libdefsystem.a
 lib/${PKGNAME}/libecl-cdb.a
 lib/${PKGNAME}/libecl-curl.a
 lib/${PKGNAME}/libecl-help.a
+lib/${PKGNAME}/libecl-quicklisp.a
 lib/${PKGNAME}/libprofile.a
 lib/${PKGNAME}/libql-minitar.a
 lib/${PKGNAME}/librt.a
diff --git a/lang/ecl/PLIST.unicode b/lang/ecl/PLIST.unicode
deleted file mode 100644
index 1f086142e71..00000000000
--- a/lang/ecl/PLIST.unicode
+++ /dev/null
@@ -1,145 +0,0 @@
-@comment $NetBSD: PLIST.unicode,v 1.4 2011/02/17 17:14:57 wiz Exp $
-lib/${PKGNAME}/encodings/arabic
-lib/${PKGNAME}/encodings/ascii
-lib/${PKGNAME}/encodings/atarist.bin
-lib/${PKGNAME}/encodings/cp-856.bin
-lib/${PKGNAME}/encodings/cp819
-lib/${PKGNAME}/encodings/cp850
-lib/${PKGNAME}/encodings/cp862
-lib/${PKGNAME}/encodings/cp866
-lib/${PKGNAME}/encodings/cp932
-lib/${PKGNAME}/encodings/cp936
-lib/${PKGNAME}/encodings/cp949
-lib/${PKGNAME}/encodings/cp950
-lib/${PKGNAME}/encodings/cyrillic
-lib/${PKGNAME}/encodings/dos-cp437.bin
-lib/${PKGNAME}/encodings/dos-cp737.bin
-lib/${PKGNAME}/encodings/dos-cp775.bin
-lib/${PKGNAME}/encodings/dos-cp850.bin
-lib/${PKGNAME}/encodings/dos-cp852.bin
-lib/${PKGNAME}/encodings/dos-cp855.bin
-lib/${PKGNAME}/encodings/dos-cp857.bin
-lib/${PKGNAME}/encodings/dos-cp860.bin
-lib/${PKGNAME}/encodings/dos-cp861.bin
-lib/${PKGNAME}/encodings/dos-cp862.bin
-lib/${PKGNAME}/encodings/dos-cp863.bin
-lib/${PKGNAME}/encodings/dos-cp864.bin
-lib/${PKGNAME}/encodings/dos-cp865.bin
-lib/${PKGNAME}/encodings/dos-cp866.bin
-lib/${PKGNAME}/encodings/dos-cp869.bin
-lib/${PKGNAME}/encodings/dos-cp874.bin
-lib/${PKGNAME}/encodings/ecma-118
-lib/${PKGNAME}/encodings/greek
-lib/${PKGNAME}/encodings/hebrew
-lib/${PKGNAME}/encodings/ibm437
-lib/${PKGNAME}/encodings/ibm819
-lib/${PKGNAME}/encodings/ibm850
-lib/${PKGNAME}/encodings/ibm852
-lib/${PKGNAME}/encodings/ibm855
-lib/${PKGNAME}/encodings/ibm857
-lib/${PKGNAME}/encodings/ibm860
-lib/${PKGNAME}/encodings/ibm861
-lib/${PKGNAME}/encodings/ibm862
-lib/${PKGNAME}/encodings/ibm863
-lib/${PKGNAME}/encodings/ibm864
-lib/${PKGNAME}/encodings/ibm865
-lib/${PKGNAME}/encodings/ibm866
-lib/${PKGNAME}/encodings/ibm869
-lib/${PKGNAME}/encodings/iso-2022-jp
-lib/${PKGNAME}/encodings/iso-2022-jp-1
-lib/${PKGNAME}/encodings/iso-8859-1.bin
-lib/${PKGNAME}/encodings/iso-8859-10.bin
-lib/${PKGNAME}/encodings/iso-8859-11.bin
-lib/${PKGNAME}/encodings/iso-8859-13.bin
-lib/${PKGNAME}/encodings/iso-8859-14.bin
-lib/${PKGNAME}/encodings/iso-8859-15.bin
-lib/${PKGNAME}/encodings/iso-8859-16.bin
-lib/${PKGNAME}/encodings/iso-8859-2.bin
-lib/${PKGNAME}/encodings/iso-8859-3.bin
-lib/${PKGNAME}/encodings/iso-8859-4.bin
-lib/${PKGNAME}/encodings/iso-8859-5.bin
-lib/${PKGNAME}/encodings/iso-8859-6.bin
-lib/${PKGNAME}/encodings/iso-8859-7.bin
-lib/${PKGNAME}/encodings/iso-8859-8.bin
-lib/${PKGNAME}/encodings/iso-8859-9.bin
-lib/${PKGNAME}/encodings/jisx0201.bin
-lib/${PKGNAME}/encodings/jisx0208.bin
-lib/${PKGNAME}/encodings/jisx0212.bin
-lib/${PKGNAME}/encodings/koi8-r.bin
-lib/${PKGNAME}/encodings/koi8-u.bin
-lib/${PKGNAME}/encodings/koi8r
-lib/${PKGNAME}/encodings/latin-0
-lib/${PKGNAME}/encodings/latin-1
-lib/${PKGNAME}/encodings/latin-10
-lib/${PKGNAME}/encodings/latin-11
-lib/${PKGNAME}/encodings/latin-2
-lib/${PKGNAME}/encodings/latin-3
-lib/${PKGNAME}/encodings/latin-4
-lib/${PKGNAME}/encodings/latin-5
-lib/${PKGNAME}/encodings/latin-6
-lib/${PKGNAME}/encodings/latin-7
-lib/${PKGNAME}/encodings/latin-8
-lib/${PKGNAME}/encodings/latin-9
-lib/${PKGNAME}/encodings/latin0
-lib/${PKGNAME}/encodings/latin1
-lib/${PKGNAME}/encodings/latin10
-lib/${PKGNAME}/encodings/latin11
-lib/${PKGNAME}/encodings/latin2
-lib/${PKGNAME}/encodings/latin3
-lib/${PKGNAME}/encodings/latin4
-lib/${PKGNAME}/encodings/latin5
-lib/${PKGNAME}/encodings/latin6
-lib/${PKGNAME}/encodings/latin7
-lib/${PKGNAME}/encodings/latin8
-lib/${PKGNAME}/encodings/latin9
-lib/${PKGNAME}/encodings/ms-ansi
-lib/${PKGNAME}/encodings/ms-arab
-lib/${PKGNAME}/encodings/ms-cyrl
-lib/${PKGNAME}/encodings/ms-ee
-lib/${PKGNAME}/encodings/ms-greek
-lib/${PKGNAME}/encodings/ms-hebr
-lib/${PKGNAME}/encodings/ms-turk
-lib/${PKGNAME}/encodings/shift-jis.bin
-lib/${PKGNAME}/encodings/thai
-lib/${PKGNAME}/encodings/ucs2
-lib/${PKGNAME}/encodings/ucs2be
-lib/${PKGNAME}/encodings/ucs2le
-lib/${PKGNAME}/encodings/ucs4
-lib/${PKGNAME}/encodings/ucs4be
-lib/${PKGNAME}/encodings/ucs4le
-lib/${PKGNAME}/encodings/unicode
-lib/${PKGNAME}/encodings/utf-16
-lib/${PKGNAME}/encodings/utf-16be
-lib/${PKGNAME}/encodings/utf-16le
-lib/${PKGNAME}/encodings/utf-32
-lib/${PKGNAME}/encodings/utf-32be
-lib/${PKGNAME}/encodings/utf-32le
-lib/${PKGNAME}/encodings/utf-8
-lib/${PKGNAME}/encodings/winbaltrim
-lib/${PKGNAME}/encodings/windows-1250
-lib/${PKGNAME}/encodings/windows-1251
-lib/${PKGNAME}/encodings/windows-1252
-lib/${PKGNAME}/encodings/windows-1253
-lib/${PKGNAME}/encodings/windows-1254
-lib/${PKGNAME}/encodings/windows-1255
-lib/${PKGNAME}/encodings/windows-1256
-lib/${PKGNAME}/encodings/windows-1257
-lib/${PKGNAME}/encodings/windows-1258
-lib/${PKGNAME}/encodings/windows-932
-lib/${PKGNAME}/encodings/windows-936
-lib/${PKGNAME}/encodings/windows-949
-lib/${PKGNAME}/encodings/windows-950
-lib/${PKGNAME}/encodings/windows-cp1250.bin
-lib/${PKGNAME}/encodings/windows-cp1251.bin
-lib/${PKGNAME}/encodings/windows-cp1252.bin
-lib/${PKGNAME}/encodings/windows-cp1253.bin
-lib/${PKGNAME}/encodings/windows-cp1254.bin
-lib/${PKGNAME}/encodings/windows-cp1255.bin
-lib/${PKGNAME}/encodings/windows-cp1256.bin
-lib/${PKGNAME}/encodings/windows-cp1257.bin
-lib/${PKGNAME}/encodings/windows-cp1258.bin
-lib/${PKGNAME}/encodings/windows-cp932.bin
-lib/${PKGNAME}/encodings/windows-cp936.bin
-lib/${PKGNAME}/encodings/windows-cp949.bin
-lib/${PKGNAME}/encodings/windows-cp950.bin
-lib/${PKGNAME}/encodings/tools.lisp
diff --git a/lang/ecl/distinfo b/lang/ecl/distinfo
index c2dbb4b98a6..9a24f0d2190 100644
--- a/lang/ecl/distinfo
+++ b/lang/ecl/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2012/07/05 14:51:47 asau Exp $
+$NetBSD: distinfo,v 1.12 2012/07/26 21:09:29 asau Exp $
 
-SHA1 (ecl-12.2.1.tgz) = 916d9991f17f644565e100a51fa4364840b377e1
-RMD160 (ecl-12.2.1.tgz) = 3a616c049773794249da56cc2d01e4b73fe46e98
-Size (ecl-12.2.1.tgz) = 8974948 bytes
-SHA1 (patch-aa) = 21ac292cfe5bb7a4687a6761c427349470473586
+SHA1 (ecl-12.7.1.tar.gz) = c5b81d0dc5fdd6c72af99dc883752bfee85028dc
+RMD160 (ecl-12.7.1.tar.gz) = 5b0eab08fd377b84cb41e19f195683e4f03259a3
+Size (ecl-12.7.1.tar.gz) = 9009087 bytes
+SHA1 (patch-aa) = 84c5a7617843594d83229bb8621d897a183dc8f9
 SHA1 (patch-ab) = f0ac6475fb947ec45eec14b2cbb6f86937ea0652
diff --git a/lang/ecl/options.mk b/lang/ecl/options.mk
index e87a124276c..5924ada3e59 100644
--- a/lang/ecl/options.mk
+++ b/lang/ecl/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2012/07/05 14:51:47 asau Exp $
+# $NetBSD: options.mk,v 1.7 2012/07/26 21:09:29 asau Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ecl
 PKG_SUPPORTED_OPTIONS+=		threads unicode ffi clx
@@ -23,11 +23,12 @@ CONFIGURE_ARGS+=	--with-__thread=no
 .endif
 PLIST_SRC+=		PLIST.threads
 .include "../../mk/pthread.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-threads
 .endif
 
 .if !empty(PKG_OPTIONS:Municode)
 CONFIGURE_ARGS+=	--enable-unicode
-PLIST_SRC+=		PLIST.unicode
 .else
 CONFIGURE_ARGS+=	--disable-unicode
 .endif
@@ -42,9 +43,9 @@ CONFIGURE_ARGS+=	--with-dffi=no
 CONFIGURE_ARGS+=	--with-clx
 .endif
 
-PLIST_VARS+=		clx
+PLIST_VARS+=		clx unicode
 
-.for option in clx
+.for option in clx unicode
 .  if !empty(PKG_OPTIONS:M${option})
 PLIST.${option}=	yes
 .  endif
@@ -55,3 +56,7 @@ PLIST.${option}=	yes
 PRINT_PLIST_AWK+=	{if ($$0 ~ /lib\/.*\/libclx.a$$/) {$$0 = "$${PLIST.clx}" $$0;}}
 PRINT_PLIST_AWK+=	{if ($$0 ~ /lib\/.*\/clx.(asd|fas)$$/) {$$0 = "$${PLIST.clx}" $$0;}}
 .endif
+
+.if !empty(PKG_OPTIONS:Municode)
+PRINT_PLIST_AWK+=	{if ($$0 ~ /lib\/.*\/encodings\//) {$$0 = "$${PLIST.unicode}" $$0;}}
+.endif
diff --git a/lang/ecl/patches/patch-aa b/lang/ecl/patches/patch-aa
index 5d332664174..e23284dd902 100644
--- a/lang/ecl/patches/patch-aa
+++ b/lang/ecl/patches/patch-aa
@@ -1,24 +1,24 @@
-$NetBSD: patch-aa,v 1.3 2011/05/14 22:30:44 hans Exp $
+$NetBSD: patch-aa,v 1.4 2012/07/26 21:09:29 asau Exp $
 
---- src/c/file.d.orig	2011-01-16 22:39:56.000000000 +0100
-+++ src/c/file.d	2011-04-10 21:23:34.034015233 +0200
-@@ -4828,7 +4828,7 @@ ecl_integer_to_off_t(cl_object offset)
+--- src/c/file.d.orig	2012-07-24 16:51:53.000000000 +0000
++++ src/c/file.d
+@@ -5358,7 +5358,7 @@ ecl_integer_to_off_t(cl_object offset)
  	} else if (ECL_BIGNUMP(offset)) {
- 		if (sizeof(offset->big.big_limbs[0]) == sizeof(cl_index)) {
- 			if (offset->big.big_size > 2) {
+ 		if (sizeof(ECL_BIGNUM_LIMBS(offset)[0]) == sizeof(cl_index)) {
+ 			if (ECL_BIGNUM_SIZE(offset) > 2) {
 -				goto ERR;
 +				goto ERROR;
  			}
- 			if (offset->big.big_size == 2) {
- 			    output = offset->big.big_limbs[1];
-@@ -4837,12 +4837,12 @@ ecl_integer_to_off_t(cl_object offset)
- 			output += offset->big.big_limbs[0];
- 		} else if (sizeof(offset->big.big_limbs[0]) >= sizeof(ecl_off_t)) {
- 			if (offset->big.big_size > 1) {
+ 			if (ECL_BIGNUM_SIZE(offset) == 2) {
+ 			    output = ECL_BIGNUM_LIMBS(offset)[1];
+@@ -5367,12 +5367,12 @@ ecl_integer_to_off_t(cl_object offset)
+ 			output += ECL_BIGNUM_LIMBS(offset)[0];
+ 		} else if (sizeof(ECL_BIGNUM_LIMBS(offset)[0]) >= sizeof(ecl_off_t)) {
+ 			if (ECL_BIGNUM_SIZE(offset) > 1) {
 -				goto ERR;
 +				goto ERROR;
  			}
- 			output = offset->big.big_limbs[0];
+ 			output = ECL_BIGNUM_LIMBS(offset)[0];
  		}
  	} else {
 -	ERR:	FEerror("Not a valid file offset: ~S", 1, offset);