Upgrade to version 9.1.1, with amd64 support.

The configure script is not able to detect some functions from
fenv.h, possibly because it does not use "#pragma STDC FENV_ACCESS ON",
which is used in the actual code. If you know of a way to make
configure work without hacking config.h.in, suggestions are welcome.

8 files changed, 217 insertions, 17 deletions

diff --git a/lang/mit-scheme/Makefile b/lang/mit-scheme/Makefile
index f4a3747eb2af..70bbc3f51b5f 100644
--- a/lang/mit-scheme/Makefile
+++ b/lang/mit-scheme/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mit-scheme
-PORTVERSION=	9.0.1
-PORTREVISION=	1
+PORTVERSION=	9.1.1
 CATEGORIES=	lang scheme
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	mit-scheme/stable.pkg/${PORTVERSION}
@@ -12,24 +11,78 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${MIT_SCHEME_ARCH}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	MIT Scheme: includes runtime, compiler, and edwin binaries
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/mit-scheme-${PORTVERSION}/src/
 
-OPTIONS_DEFINE=	PGSQL
+OPTIONS_DEFINE=	GDBM MCRYPT MHASH OPENSSL PGSQL X11
+MCRYPT_DESC=	mcrypt library support
+MHASH_DESC=	mhash library support
 
 .include <bsd.port.pre.mk>
 
+# TODO implement db4 support
+CONFIGURE_ARGS+=--without-db-4
+
+.if ${PORT_OPTIONS:MGDBM}
+PLIST_SUB+=	GDBM=""
+CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
+LIB_DEPENDS+=	gdbm:${PORTSDIR}/databases/gdbm
+.else
+PLIST_SUB+=	GDBM="@comment "
+CONFIGURE_ARGS+=--without-gdbm
+.endif
+
+.if ${PORT_OPTIONS:MMHASH}
+PLIST_SUB+=	MHASH=""
+CONFIGURE_ARGS+=--with-mhash=${LOCALBASE}
+LIB_DEPENDS+=	mhash:${PORTSDIR}/security/mhash
+.else
+PLIST_SUB+=	MHASH="@comment "
+CONFIGURE_ARGS+=--without-mhash
+.endif
+
+.if ${PORT_OPTIONS:MMCRYPT}
+PLIST_SUB+=	MCRYPT=""
+CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
+LIB_DEPENDS+=	mcrypt:${PORTSDIR}/security/libmcrypt
+.else
+PLIST_SUB+=	MCRYPT="@comment "
+CONFIGURE_ARGS+=--without-mcrypt
+.endif
+
+.if ${PORT_OPTIONS:MOPENSSL}
+PLIST_SUB+=	OPENSSL=""
+CONFIGURE_ARGS+=--with-openssl
+.else
+PLIST_SUB+=	OPENSSL="@comment "
+CONFIGURE_ARGS+=--without-openssl
+.endif
+
 .if ${PORT_OPTIONS:MPGSQL}
 PLIST_SUB+=	POSTGRESQL=""
-CONFIGURE_ARGS+=--with-libpq
+CONFIGURE_ARGS+=--with-libpq=${LOCALBASE}
+USE_PGSQL=	yes
 .else
 PLIST_SUB+=	POSTGRESQL="@comment "
 CONFIGURE_ARGS+=--without-libpq
 .endif
 
-MIT_SCHEME_ARCH=i386
+.if ${PORT_OPTIONS:MX11}
+PLIST_SUB+=	X11=""
+CONFIGURE_ARGS+=--with-x
+USE_XORG=	x11
+.else
+PLIST_SUB+=	X11="@comment "
+CONFIGURE_ARGS+=--without-x
+.endif
+
+.if ${ARCH} == amd64
+MIT_SCHEME_ARCH=x86-64
+.else
+MIT_SCHEME_ARCH=${ARCH}
+.endif
 
 PLIST_SUB+=	MIT_SCHEME_ARCH=${MIT_SCHEME_ARCH}
 
@@ -44,6 +97,6 @@ do-build:
 do-install:
 	@cd ${WRKDIR}/mit-scheme-${PORTVERSION}/src && ${GMAKE} install
 	@${INSTALL_MAN} ${WRKDIR}/mit-scheme-${PORTVERSION}/doc/scheme.1 ${MAN1PREFIX}/man/man1/
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/mit-scheme-i386
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/mit-scheme-${MIT_SCHEME_ARCH}
 
 .include <bsd.port.post.mk>
diff --git a/lang/mit-scheme/distinfo b/lang/mit-scheme/distinfo
index 9c3027142e20..5568391956f2 100644
--- a/lang/mit-scheme/distinfo
+++ b/lang/mit-scheme/distinfo
@@ -1,2 +1,4 @@
-SHA256 (mit-scheme-9.0.1-i386.tar.gz) = c202ea8a51e9c4d576b370fe7abdcff5caebe0104e40bcd851d736c9d51ad231
-SIZE (mit-scheme-9.0.1-i386.tar.gz) = 42546960
+SHA256 (mit-scheme-9.1.1-i386.tar.gz) = bf14956363134cae29990bbdc437b3edd680d7dfa0a251564b0d94e21d30276e
+SIZE (mit-scheme-9.1.1-i386.tar.gz) = 45592894
+SHA256 (mit-scheme-9.1.1-x86-64.tar.gz) = 3d2471ab61f0b270d78489da3939d3c45a9bb177235946b7afa330e761aa9df1
+SIZE (mit-scheme-9.1.1-x86-64.tar.gz) = 50516614
diff --git a/lang/mit-scheme/files/patch-configure b/lang/mit-scheme/files/patch-configure
new file mode 100644
index 000000000000..ac34952b3100
--- /dev/null
+++ b/lang/mit-scheme/files/patch-configure
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- configure.orig
++++ configure
+@@ -3608,7 +3608,7 @@
+     vax)
+ 	mit_scheme_native_code=vax
+ 	;;
+-    x86_64)
++    x86_64|amd64)
+ 	mit_scheme_native_code=x86-64
+ 	;;
+     *)
+@@ -6160,7 +6160,7 @@
+     vax)
+ 	mit_scheme_native_code=vax
+ 	;;
+-    x86_64)
++    x86_64|amd64)
+ 	mit_scheme_native_code=x86-64
+ 	;;
+     *)
diff --git a/lang/mit-scheme/files/patch-microcode_config.h.in b/lang/mit-scheme/files/patch-microcode_config.h.in
new file mode 100644
index 000000000000..7736155e22a2
--- /dev/null
+++ b/lang/mit-scheme/files/patch-microcode_config.h.in
@@ -0,0 +1,47 @@
+
+$FreeBSD$
+
+--- microcode/config.h.in.orig
++++ microcode/config.h.in
+@@ -86,7 +86,7 @@
+ #undef HAVE_FDATASYNC
+ 
+ /* Define to 1 if you have the `feclearexcept' function. */
+-#undef HAVE_FECLEAREXCEPT
++#define HAVE_FECLEAREXCEPT 1
+ 
+ /* Define to 1 if you have the `fedisableexcept' function. */
+ #undef HAVE_FEDISABLEEXCEPT
+@@ -101,10 +101,10 @@
+ #undef HAVE_FEGETEXCEPT
+ 
+ /* Define to 1 if you have the `fegetexceptflag' function. */
+-#undef HAVE_FEGETEXCEPTFLAG
++#define HAVE_FEGETEXCEPTFLAG 1
+ 
+ /* Define to 1 if you have the `fegetround' function. */
+-#undef HAVE_FEGETROUND
++#define HAVE_FEGETROUND 1
+ 
+ /* Define to 1 if you have the `feholdexcept' function. */
+ #undef HAVE_FEHOLDEXCEPT
+@@ -119,16 +119,16 @@
+ #undef HAVE_FERAISEEXCEPT
+ 
+ /* Define to 1 if you have the `fesetenv' function. */
+-#undef HAVE_FESETENV
++#define HAVE_FESETENV 1
+ 
+ /* Define to 1 if you have the `fesetexceptflag' function. */
+ #undef HAVE_FESETEXCEPTFLAG
+ 
+ /* Define to 1 if you have the `fesetround' function. */
+-#undef HAVE_FESETROUND
++#define HAVE_FESETROUND 1
+ 
+ /* Define to 1 if you have the `fetestexcept' function. */
+-#undef HAVE_FETESTEXCEPT
++#define HAVE_FETESTEXCEPT 1
+ 
+ /* Define to 1 if you have the `feupdateenv' function. */
+ #undef HAVE_FEUPDATEENV
diff --git a/lang/mit-scheme/files/patch-microcode_configure b/lang/mit-scheme/files/patch-microcode_configure
new file mode 100644
index 000000000000..6561bb5aba82
--- /dev/null
+++ b/lang/mit-scheme/files/patch-microcode_configure
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- microcode/configure.orig
++++ microcode/configure
+@@ -5214,7 +5214,7 @@
+     vax)
+ 	mit_scheme_native_code=vax
+ 	;;
+-    x86_64)
++    x86_64|amd64)
+ 	mit_scheme_native_code=x86-64
+ 	;;
+     *)
diff --git a/lang/mit-scheme/files/patch-microcode_ux.c b/lang/mit-scheme/files/patch-microcode_ux.c
new file mode 100644
index 000000000000..2118ef69fa9c
--- /dev/null
+++ b/lang/mit-scheme/files/patch-microcode_ux.c
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- microcode/ux.c.orig
++++ microcode/ux.c
+@@ -785,9 +785,7 @@
+                          unsigned long min_result,
+                          unsigned long max_result)
+ {
+-  void * addr = (mmap_heap_malloc_try (min_result, request, true));
+-  if (addr == 0)
+-    addr = (mmap_heap_malloc_try (min_result, request, false));
++  void * addr = (mmap_heap_malloc_try (min_result, request, false));
+   return addr;
+ }
+ 
diff --git a/lang/mit-scheme/files/patch-microcode_uxtrap.h b/lang/mit-scheme/files/patch-microcode_uxtrap.h
new file mode 100644
index 000000000000..39e863ec3cfe
--- /dev/null
+++ b/lang/mit-scheme/files/patch-microcode_uxtrap.h
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- microcode/uxtrap.h.orig
++++ microcode/uxtrap.h
+@@ -413,6 +413,14 @@
+ 
+ #endif /* __IA32__ */
+ 
++#ifdef __x86_64__
++ 
++#if defined(__FreeBSD__)
++#  include <ucontext.h>
++#endif
++
++#endif /* __x86_64__ */
++
+ #ifdef __alpha
+ 
+ #define HAVE_SIGCONTEXT
diff --git a/lang/mit-scheme/pkg-plist b/lang/mit-scheme/pkg-plist
index c3ad2965cca9..d628663039fc 100644
--- a/lang/mit-scheme/pkg-plist
+++ b/lang/mit-scheme/pkg-plist
@@ -6,6 +6,8 @@ bin/scheme
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/all.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/cref/anfile.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/cref/anfile.com
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/cref/butils.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/cref/butils.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/cref/conpkg.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/cref/conpkg.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/cref/cref-unx.pkd
@@ -207,6 +209,18 @@ lib/mit-scheme-%%MIT_SCHEME_ARCH%%/edwin/xcom.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/edwin/xform.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/edwin/xmodef.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/edwin/xterm.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/ffi/cdecls.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/ffi/cdecls.com
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/ffi/ctypes.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/ffi/ctypes.com
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/ffi/ffi-os2.pkd
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/ffi/ffi-unx.pkd
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/ffi/ffi-w32.pkd
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/ffi/generator.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/ffi/generator.com
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/ffi/make.scm
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/ffi/syntax.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/ffi/syntax.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/imail/imail-browser.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/imail/imail-browser.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/imail/imail-core.bci
@@ -233,10 +247,16 @@ lib/mit-scheme-%%MIT_SCHEME_ARCH%%/imail/imap-response.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/imail/imap-syntax.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/imail/imap-syntax.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/imail/load.scm
-lib/mit-scheme-%%MIT_SCHEME_ARCH%%/lib/prbfish.so
-lib/mit-scheme-%%MIT_SCHEME_ARCH%%/lib/prmd5.so
+%%OPENSSL%%lib/mit-scheme-%%MIT_SCHEME_ARCH%%/lib/prbfish.so
+%%GDBM%%lib/mit-scheme-%%MIT_SCHEME_ARCH%%/lib/prgdbm.so
+%%MCRYPT%%lib/mit-scheme-%%MIT_SCHEME_ARCH%%/lib/prmcrypt.so
+%%MHASH%%lib/mit-scheme-%%MIT_SCHEME_ARCH%%/lib/prmhash.so
+%%OPENSSL%%lib/mit-scheme-%%MIT_SCHEME_ARCH%%/lib/prmd5.so
 %%POSTGRESQL%%lib/mit-scheme-%%MIT_SCHEME_ARCH%%/lib/prpgsql.so
+%%X11%%lib/mit-scheme-%%MIT_SCHEME_ARCH%%/lib/prx11.so
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/mit-scheme.h
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/optiondb.scm
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/advice.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/apply.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/apropos.bci
@@ -262,6 +282,7 @@ lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/dbgcmd.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/dbgutl.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/debug.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/defstr.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/division.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/dosdir.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/dosprm.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/dosproc.bci
@@ -272,8 +293,11 @@ lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/emacs.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/equals.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/error.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/events.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/ffi.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/file-attributes.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/fileio.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/fixart.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/floenv.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/format.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/format.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/framex.bci
@@ -305,8 +329,10 @@ lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/httpio.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/infstr.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/infutl.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/input.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/integer-bits.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/intrpt.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/io.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/keyword.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/krypt.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/krypt.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/kryptdum.bci
@@ -376,11 +402,13 @@ lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/sdata.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/sfile.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/socket.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/srfi-1.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/stack-sample.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/starbase.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/stream.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/string.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/stringio.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/structure-parser.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/swank.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/symbol.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/syncproc.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/syncproc.com
@@ -428,6 +456,8 @@ lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/x11graph.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/xeval.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/ystep.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime/ystep.com
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/analyze.bci
+lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/analyze.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/butils.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/butils.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/cgen.bci
@@ -438,14 +468,10 @@ lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/copy.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/copy.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/emodel.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/emodel.com
-lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/free.bci
-lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/free.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/gconst.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/gconst.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/gimprt.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/gimprt.com
-lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/lsets.bci
-lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/lsets.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/make.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/make.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/object.bci
@@ -459,8 +485,6 @@ lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/reduct.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/sf-unx.pkd
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/subst.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/subst.com
-lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/table.bci
-lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/table.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/tables.bci
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/tables.com
 lib/mit-scheme-%%MIT_SCHEME_ARCH%%/sf/toplev.bci
@@ -535,6 +559,7 @@ lib/mit-scheme-%%MIT_SCHEME_ARCH%%/xml/xml-unx.pkd
 @dirrm lib/mit-scheme-%%MIT_SCHEME_ARCH%%/runtime
 @dirrm lib/mit-scheme-%%MIT_SCHEME_ARCH%%/lib
 @dirrm lib/mit-scheme-%%MIT_SCHEME_ARCH%%/imail
+@dirrm lib/mit-scheme-%%MIT_SCHEME_ARCH%%/ffi
 @dirrm lib/mit-scheme-%%MIT_SCHEME_ARCH%%/edwin
 @dirrm lib/mit-scheme-%%MIT_SCHEME_ARCH%%/cref
 @dirrm lib/mit-scheme-%%MIT_SCHEME_ARCH%%