Swith to using the dynamic modules system.

Fix several options, now all options actually work.
Enable ZLIB by default since this requires no extra depends.
End support for the ancient ORACLE option.

Approved by:	wxs (mentor)

5 files changed, 352 insertions, 144 deletions

diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 5228994d4a17..82a5a4189bc2 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clisp
 PORTVERSION=	2.49
+PORTREVISION=	1
 CATEGORIES=	lang lisp
 MASTER_SITES=	GNU/${PORTNAME}/release/${PORTVERSION}
 
@@ -21,12 +22,13 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/GNU-GPL
 
 USE_ICONV=	yes
+USE_LDCONFIG=	yes
 USE_GHOSTSCRIPT_BUILD=	yes
 WANT_GNOME=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --mandir="${MANPREFIX}/man" \
 		--elispdir="${DATADIR}/emacs" --vimdir="${DATADIR}/vim" \
-		--docdir="${DOCSDIR} --with-dynamic-modules=no"
+		--docdir="${DOCSDIR}"
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
 # Complaints if the environment changes between build stages.
@@ -37,22 +39,21 @@ CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=yes
 
-OPTIONS=	BDB "Build Berkeley Database module" off \
-		CLX_MIT "Build X11 module (original MIT version)" off \
-		CLX_NEW "Build X11 module (new faster version)" off \
+OPTIONS=	BDB "Build Berkeley Database module" Off \
+		CLX_MIT "Build X11 module (original MIT version)" Off \
+		CLX_NEW "Build X11 module (new faster version)" Off \
 		DBUS "D-BUS control module" Off \
-		FASTCGI "Build FastCGI module" off \
-		GDBM "Build GNU Database manager module" off \
-		GTK2 "Build Gtk+2 module" off \
-		ORACLE "Build Oracle database module" off \
-		PARI "Build PARI (math and calc lib) module" off \
-		PCRE "Build PCRE (Perl Compatible Regexp) module" off \
-		PGSQL "Build PostgreSQL database module" off \
-		RAWSOCK "Build Raw Socket Access module" on \
-		SVM "Enable Support Vector Machines module" off \
+		FASTCGI "Build FastCGI module" Off \
+		GDBM "Build GNU Database manager module" Off \
+		GTK2 "Build Gtk+2 module" Off \
+		PARI "Build PARI (math and calc lib) module" Off \
+		PCRE "Build PCRE (Perl Compatible Regexp) module" Off \
+		PGSQL "Build PostgreSQL database module" Off \
+		RAWSOCK "Build Raw Socket Access module" On \
+		SVM "Enable Support Vector Machines module" Off \
 		THREADS "Enable multithreaded (Experimental)" Off \
-		WILDCARD "Build wildcard matching module" on \
-		ZLIB "Build ZLib interface module " off
+		WILDCARD "Build wildcard matching module" On \
+		ZLIB "Build ZLib interface module " On
 
 MAN1=		clisp.1 clisp-link.1
 SUB_FILES=	pkg-message
@@ -64,12 +65,16 @@ SUB_FILES=	pkg-message
 CONFIGURE_ARGS+=--disable-mmap
 .endif
 
+.if ${OSVERSION} < 700000
+BROKEN=		Does not build on FreeBSD 6.x
+.endif
+
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
 
-MODULES=	BDB CLX_MIT CLX_NEW DBUS FASTCGI GDBM GTK2 ORACLE PARI PCRE \
-		PGSQL RAWSOCK SVM WILDCARD ZLIB
+MODULES=	BDB CLX_NEW CLX_MIT DBUS FASTCGI GDBM GTK2 PARI PCRE PGSQL \
+		RAWSOCK SVM WILDCARD ZLIB
 
 .for mod in ${MODULES}
 .   if defined(WITH_${mod})
@@ -127,14 +132,6 @@ USE_GNOME=	gtk20 libglade2
 CONFIGURE_ARGS+=--with-module=gtk2
 .endif
 
-.if defined(WITH_ORACLE)
-BUILD_DEPENDS+=	${ORACLE_HOME}:${PORTSDIR}/databases/oracle8-client
-CONFIGURE_ARGS+=--with-module=oracle
-CPPFLAGS+=	-I${ORACLE_HOME}/rdbms/demo -I${ORACLE_HOME}/rdbms/public
-LDFLAGS+=	-L${ORACLE_HOME}/lib
-ORACLE_HOME?=	${LOCALBASE}/oracle8-client
-.endif
-
 .if defined(WITH_PARI)
 LIB_DEPENDS+=	pari-gmp.2:${PORTSDIR}/math/pari
 CONFIGURE_ARGS+=--with-module=pari
@@ -179,6 +176,12 @@ post-patch:
 		${WRKSRC}/modules/oracle/link.sh
 .endif
 
+pre-install:
+.if defined(WITH_CLX_MIT)
+	${CP} ${WRKSRC}/modules/clx/mit-clx/README.CLISP \
+		${WRKSRC}/src/clx/mit-clx/README.CLISP
+.endif
+
 post-install:
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo
index 2922857acbd9..0de80a72a4c2 100644
--- a/lang/clisp/distinfo
+++ b/lang/clisp/distinfo
@@ -1,3 +1,2 @@
-MD5 (clisp-2.49.tar.gz) = de8c75f8e717f8ed047147923113ea70
 SHA256 (clisp-2.49.tar.gz) = bd2f6252c681337c0b6aa949fae3f92d3202dee3998c98a88ec28c72b115e866
 SIZE (clisp-2.49.tar.gz) = 9823111
diff --git a/lang/clisp/files/patch-modules__clx__mit-clx__Makefile b/lang/clisp/files/patch-modules__clx__mit-clx__Makefile
new file mode 100644
index 000000000000..1f4f0d116f9c
--- /dev/null
+++ b/lang/clisp/files/patch-modules__clx__mit-clx__Makefile
@@ -0,0 +1,20 @@
+--- modules/clx/mit-clx/Makefile	2009/08/16 20:21:21	1.8
++++ modules/clx/mit-clx/Makefile	2010/09/14 18:12:08	1.9
+@@ -75,7 +75,7 @@
+ 	chmod a+x $(bindir)/clx
+ 
+ link.sh : $(srcdir)/link.sh
+-	$(LN_S) $< .
++	$(LN_S) $(srcdir)/link.sh .
+ 
+ distrib : src-distrib clisp-distrib
+ 
+@@ -87,7 +87,7 @@
+ 
+ 
+ # Make a module
+-clisp-module : defsystem.fas stamp.fas $(ALLFAS)
++clisp-module : defsystem.fas stamp.fas $(ALLFAS) link.sh
+ 
+ # Make a module distribution into $(distribdir)
+ clisp-module-distrib : clisp-module force
diff --git a/lang/clisp/files/patch-src__makemake.in b/lang/clisp/files/patch-src__makemake.in
index 6e9f5b246dbd..c09ef584726e 100644
--- a/lang/clisp/files/patch-src__makemake.in
+++ b/lang/clisp/files/patch-src__makemake.in
@@ -1,5 +1,14 @@
---- ./src/makemake.in.orig	2010-07-08 10:20:32.000000000 -0400
-+++ ./src/makemake.in	2010-07-08 10:23:05.000000000 -0400
+--- ./src/makemake.in.orig	2010-11-08 19:22:10.000000000 -0500
++++ ./src/makemake.in	2010-11-08 19:22:50.000000000 -0500
+@@ -1424,7 +1424,7 @@
+     freebsd2* | netbsd* | openbsd*)
+       XCC_CREATESHARED='ld -Bshareable -o $lib $libs'
+       ;;
+-    freebsd3* | gnu* | linux* | cygwin* | mingw* | k*bsd* | dragonfly*)
++    freebsd* | gnu* | linux* | cygwin* | mingw* | k*bsd* | dragonfly*)
+       XCC_CREATESHARED='${CC} ${CFLAGS} ${CLFLAGS} -shared -o $lib $libs'
+       ;;
+     hpux9* | hpux10*)
 @@ -1917,7 +1917,7 @@
  echol "psdir   = ${PSDIR}"
  echol "pdfdir  = ${PDFDIR}"
diff --git a/lang/clisp/pkg-plist b/lang/clisp/pkg-plist
index efebbd5b6d92..01692722ea2e 100644
--- a/lang/clisp/pkg-plist
+++ b/lang/clisp/pkg-plist
@@ -1,58 +1,39 @@
-%%BDB%%lib/clisp/full/bdb.o
-%%CLX_MIT%%lib/clisp/full/attributes.fas
-%%CLX_MIT%%lib/clisp/full/attributes.lisp
-%%CLX_MIT%%lib/clisp/full/buffer.fas
-%%CLX_MIT%%lib/clisp/full/buffer.lisp
-%%CLX_MIT%%lib/clisp/full/bufmac.fas
-%%CLX_MIT%%lib/clisp/full/bufmac.lisp
-%%CLX_MIT%%lib/clisp/full/clx.fas
-%%CLX_MIT%%lib/clisp/full/clx.lisp
-%%CLX_MIT%%lib/clisp/full/depdefs.fas
-%%CLX_MIT%%lib/clisp/full/depdefs.lisp
-%%CLX_MIT%%lib/clisp/full/dependent.fas
-%%CLX_MIT%%lib/clisp/full/dependent.lisp
-%%CLX_MIT%%lib/clisp/full/describe.fas
-%%CLX_MIT%%lib/clisp/full/describe.lisp
-%%CLX_MIT%%lib/clisp/full/display.fas
-%%CLX_MIT%%lib/clisp/full/display.lisp
-%%CLX_MIT%%lib/clisp/full/fonts.fas
-%%CLX_MIT%%lib/clisp/full/fonts.lisp
-%%CLX_MIT%%lib/clisp/full/gcontext.fas
-%%CLX_MIT%%lib/clisp/full/gcontext.lisp
-%%CLX_MIT%%lib/clisp/full/graphics.fas
-%%CLX_MIT%%lib/clisp/full/graphics.lisp
-%%CLX_MIT%%lib/clisp/full/image.fas
-%%CLX_MIT%%lib/clisp/full/image.lisp
-%%CLX_MIT%%lib/clisp/full/input.fas
-%%CLX_MIT%%lib/clisp/full/input.lisp
-%%CLX_MIT%%lib/clisp/full/keysyms.fas
-%%CLX_MIT%%lib/clisp/full/keysyms.lisp
-%%CLX_MIT%%lib/clisp/full/macros.fas
-%%CLX_MIT%%lib/clisp/full/macros.lisp
-%%CLX_MIT%%lib/clisp/full/manager.fas
-%%CLX_MIT%%lib/clisp/full/manager.lisp
-%%CLX_MIT%%lib/clisp/full/package.fas
-%%CLX_MIT%%lib/clisp/full/package.lisp
-%%CLX_MIT%%lib/clisp/full/requests.fas
-%%CLX_MIT%%lib/clisp/full/requests.lisp
-%%CLX_MIT%%lib/clisp/full/resource.fas
-%%CLX_MIT%%lib/clisp/full/resource.lisp
-%%CLX_MIT%%lib/clisp/full/shape.fas
-%%CLX_MIT%%lib/clisp/full/shape.lisp
-%%CLX_MIT%%lib/clisp/full/text.fas
-%%CLX_MIT%%lib/clisp/full/text.lisp
-%%CLX_MIT%%lib/clisp/full/trace.fas
-%%CLX_MIT%%lib/clisp/full/trace.lisp
-%%CLX_MIT%%lib/clisp/full/translate.fas
-%%CLX_MIT%%lib/clisp/full/translate.lisp
-%%CLX_NEW%%lib/clisp/full/clx.o
+bin/clisp
+bin/clisp-link
+lib/clisp/build-aux/arg-nonnull.h
+lib/clisp/build-aux/c++defs.h
+lib/clisp/build-aux/config.guess
+lib/clisp/build-aux/config.rpath
+lib/clisp/build-aux/config.sub
+lib/clisp/build-aux/depcomp
+lib/clisp/build-aux/warn-on-use.h
+lib/clisp/data/Symbol-Table.text
+lib/clisp/data/UnicodeDataFull.txt
+lib/clisp/base/bogomips.o
+lib/clisp/base/calls.o
+lib/clisp/base/gettext.o
+lib/clisp/base/libgnu_cl.a
+lib/clisp/base/libgnu_rx.a
+lib/clisp/base/libgnu_sc.a
+lib/clisp/base/libnoreadline.a
+lib/clisp/base/lisp.a
+lib/clisp/base/lisp.run
+lib/clisp/base/lispinit.mem
+lib/clisp/base/makevars
+lib/clisp/base/modules.h
+lib/clisp/base/modules.o
+lib/clisp/base/readline.o
+lib/clisp/base/regexi.o
+lib/clisp/linkkit/clisp.h
+lib/clisp/linkkit/modprep.lisp
+lib/clisp/linkkit/modules.c
+share/aclocal/clisp.m4
 %%DATADIR%%/emacs/clhs.el
 %%DATADIR%%/emacs/clisp-coding.el
 %%DATADIR%%/emacs/clisp-ffi.el
 %%DATADIR%%/emacs/clisp-indent.el
 %%DATADIR%%/emacs/clisp-indent.lisp
 %%DATADIR%%/vim/lisp.vim
-%%DBUS%%lib/clisp/full/dbus.o
 %%DOCSDIR%%/ANNOUNCE
 %%DOCSDIR%%/CLOS-guide.txt
 %%DOCSDIR%%/COPYRIGHT
@@ -75,10 +56,6 @@
 %%DOCSDIR%%/clisp.ps
 %%DOCSDIR%%/impnotes.css
 %%DOCSDIR%%/impnotes.html
-%%FASTCGI%%lib/clisp/full/fastcgi.o
-%%FASTCGI%%lib/clisp/full/fastcgi_wrappers.o
-%%GDBM%%lib/clisp/full/gdbm.o
-%%GTK2%%lib/clisp/full/gtk.o
 %%NLS%%share/locale/da/LC_MESSAGES/clisp.mo
 %%NLS%%share/locale/da/LC_MESSAGES/clisplow.mo
 %%NLS%%share/locale/de/LC_MESSAGES/clisp.mo
@@ -93,71 +70,271 @@
 %%NLS%%share/locale/nl/LC_MESSAGES/clisplow.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/clisp.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/clisplow.mo
-%%ORACLE%%lib/clisp/full/oiface.o
-%%ORACLE%%lib/clisp/full/oracle.o
-%%ORACLE%%lib/clisp/full/orafns.o
-%%PARI%%lib/clisp/full/cpari.o
-%%PARI%%lib/clisp/full/pari.o
-%%PCRE%%lib/clisp/full/cpcre.o
-%%PGSQL%%lib/clisp/full/postgresql.o
-%%RAWSOCK%%lib/clisp/full/rawsock.o
-%%SVM%%lib/clisp/full/libsvm.o
-%%SVM%%lib/clisp/full/svm.so
-%%WILDCARD%%lib/clisp/full/wildcard.o
-%%ZLIB%%lib/clisp/full/zlib.o
-bin/clisp
-bin/clisp-link
-lib/clisp/base/bogomips.o
-lib/clisp/base/calls.o
-lib/clisp/base/gettext.o
-lib/clisp/base/libgnu_cl.a
-lib/clisp/base/libgnu_rx.a
-lib/clisp/base/libgnu_sc.a
-lib/clisp/base/libnoreadline.a
-lib/clisp/base/lisp.a
-lib/clisp/base/lisp.run
-lib/clisp/base/lispinit.mem
-lib/clisp/base/makevars
-lib/clisp/base/modules.h
-lib/clisp/base/modules.o
-lib/clisp/base/readline.o
-lib/clisp/base/regexi.o
-lib/clisp/build-aux/arg-nonnull.h
-lib/clisp/build-aux/c++defs.h
-lib/clisp/build-aux/config.guess
-lib/clisp/build-aux/config.rpath
-lib/clisp/build-aux/config.sub
-lib/clisp/build-aux/depcomp
-lib/clisp/build-aux/warn-on-use.h
-lib/clisp/data/Symbol-Table.text
-lib/clisp/data/UnicodeDataFull.txt
-lib/clisp/full/bogomips.o
-lib/clisp/full/calls.o
-lib/clisp/full/gettext.o
-lib/clisp/full/libgnu_cl.a
-lib/clisp/full/libgnu_rx.a
-lib/clisp/full/libgnu_sc.a
-lib/clisp/full/libgnu_wc.a
-lib/clisp/full/libnoreadline.a
-lib/clisp/full/lisp.a
-lib/clisp/full/lisp.run
-lib/clisp/full/lispinit.mem
-lib/clisp/full/makevars
-lib/clisp/full/modules.h
-lib/clisp/full/modules.o
-lib/clisp/full/readline.o
-lib/clisp/full/regexi.o
-lib/clisp/linkkit/clisp.h
-lib/clisp/linkkit/modprep.lisp
-lib/clisp/linkkit/modules.c
-share/aclocal/clisp.m4
+%%BDB%%lib/clisp/berkeley-db/Makefile
+%%BDB%%lib/clisp/berkeley-db/bdb.o
+%%BDB%%lib/clisp/berkeley-db/dbi.fas
+%%BDB%%lib/clisp/berkeley-db/dbi.lisp
+%%BDB%%lib/clisp/berkeley-db/link.sh
+%%BDB%%lib/clisp/berkeley-db/preload.lisp
+%%BDB%%lib/clisp/dynmod/bdb.lisp
+%%BDB%%lib/clisp/dynmod/lib-bdb.so
+%%CLX_MIT%%lib/clisp/clx/mit-clx/Makefile
+%%CLX_MIT%%lib/clisp/clx/mit-clx/README.CLISP
+%%CLX_MIT%%lib/clisp/clx/mit-clx/attributes.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/buffer.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/bufmac.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/clx.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/depdefs.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/dependent.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/describe.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/display.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/fonts.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/gcontext.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/graphics.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/image.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/input.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/keysyms.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/link.sh
+%%CLX_MIT%%lib/clisp/clx/mit-clx/macros.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/manager.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/package.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/requests.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/resource.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/shape.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/text.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/trace.fas
+%%CLX_MIT%%lib/clisp/clx/mit-clx/translate.fas
+%%CLX_MIT%%lib/clisp/dynmod/lib.so
+%%CLX_NEW%%lib/clisp/clx/new-clx/Makefile
+%%CLX_NEW%%lib/clisp/clx/new-clx/README
+%%CLX_NEW%%lib/clisp/clx/new-clx/clx-preload.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/clx.fas
+%%CLX_NEW%%lib/clisp/clx/new-clx/clx.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/clx.o
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/README
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/bball.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/bwindow.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/clclock.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/clx-demos.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/greynetic.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/hanoi.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/koch.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/petal.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/plaid.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/qix.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/recurrence.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.1
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.10
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.11
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.12
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.13
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.14
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.15
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.16
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.17
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.18
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.19
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.2
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.20
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.21
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.22
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.23
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.24
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.25
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.26
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.27
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.28
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.29
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.3
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.30
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.31
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.32
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.33
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.34
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.35
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.36
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.37
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.38
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.39
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.4
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.40
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.41
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.42
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.43
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.44
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.45
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.46
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.47
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.48
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.49
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.5
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.50
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.6
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.7
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.8
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/screens/screen.9
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/sokoban.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/centerwall.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/east_twall.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/eastwall.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/floor.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/goal.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/horizwall.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/llcorner.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/lonewall.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/lrcorner.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/man.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/man_down.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/man_left.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/man_right.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/man_up.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/north_twall.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/northwall.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/object.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/save_man_down.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/save_man_left.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/save_man_right.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/save_man_up.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/saveman.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/south_twall.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/southwall.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/treasure.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/ulcorner.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/urcorner.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/vertiwall.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/wall.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/west_twall.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/demos/xpms/westwall.xpm
+%%CLX_NEW%%lib/clisp/clx/new-clx/image.fas
+%%CLX_NEW%%lib/clisp/clx/new-clx/image.lisp
+%%CLX_NEW%%lib/clisp/clx/new-clx/link.sh
+%%CLX_NEW%%lib/clisp/clx/new-clx/resource.fas
+%%CLX_NEW%%lib/clisp/clx/new-clx/resource.lisp
+%%CLX_NEW%%lib/clisp/dynmod/clx.lisp
+%%CLX_NEW%%lib/clisp/dynmod/lib-clx.so
+%%DBUS%%lib/clisp/dbus/Makefile
+%%DBUS%%lib/clisp/dbus/dbus.fas
+%%DBUS%%lib/clisp/dbus/dbus.lisp
+%%DBUS%%lib/clisp/dbus/dbus.o
+%%DBUS%%lib/clisp/dbus/link.sh
+%%DBUS%%lib/clisp/dynmod/dbus.lisp
+%%DBUS%%lib/clisp/dynmod/lib-dbus.so
+%%FASTCGI%%lib/clisp/dynmod/fastcgi.lisp
+%%FASTCGI%%lib/clisp/dynmod/lib-fastcgi.so
+%%FASTCGI%%lib/clisp/fastcgi/Makefile
+%%FASTCGI%%lib/clisp/fastcgi/README
+%%FASTCGI%%lib/clisp/fastcgi/fastcgi.fas
+%%FASTCGI%%lib/clisp/fastcgi/fastcgi.lisp
+%%FASTCGI%%lib/clisp/fastcgi/fastcgi.o
+%%FASTCGI%%lib/clisp/fastcgi/fastcgi_wrappers.o
+%%FASTCGI%%lib/clisp/fastcgi/link.sh
+%%GDBM%%lib/clisp/dynmod/gdbm.lisp
+%%GDBM%%lib/clisp/dynmod/lib-gdbm.so
+%%GDBM%%lib/clisp/gdbm/Makefile
+%%GDBM%%lib/clisp/gdbm/gdbm.fas
+%%GDBM%%lib/clisp/gdbm/gdbm.lisp
+%%GDBM%%lib/clisp/gdbm/gdbm.o
+%%GDBM%%lib/clisp/gdbm/link.sh
+%%GDBM%%lib/clisp/gdbm/preload.lisp
+%%GTK2%%lib/clisp/dynmod/gtk.lisp
+%%GTK2%%lib/clisp/dynmod/lib-gtk.so
+%%GTK2%%lib/clisp/gtk2/Makefile
+%%GTK2%%lib/clisp/gtk2/gtk-server.cfg
+%%GTK2%%lib/clisp/gtk2/gtk.fas
+%%GTK2%%lib/clisp/gtk2/gtk.lisp
+%%GTK2%%lib/clisp/gtk2/gtk.o
+%%GTK2%%lib/clisp/gtk2/link.sh
+%%GTK2%%lib/clisp/gtk2/preload.lisp
+%%GTK2%%lib/clisp/gtk2/ui.glade
+%%PARI%%lib/clisp/dynmod/lib-pari.so
+%%PARI%%lib/clisp/dynmod/pari.lisp
+%%PARI%%lib/clisp/pari/Makefile
+%%PARI%%lib/clisp/pari/README
+%%PARI%%lib/clisp/pari/cpari.o
+%%PARI%%lib/clisp/pari/link.sh
+%%PARI%%lib/clisp/pari/pari.fas
+%%PARI%%lib/clisp/pari/pari.lisp
+%%PARI%%lib/clisp/pari/pari.o
+%%PARI%%lib/clisp/pari/preload.lisp
+%%PCRE%%lib/clisp/dynmod/lib-pcre.so
+%%PCRE%%lib/clisp/dynmod/pcre.lisp
+%%PCRE%%lib/clisp/pcre/Makefile
+%%PCRE%%lib/clisp/pcre/cpcre.o
+%%PCRE%%lib/clisp/pcre/link.sh
+%%PCRE%%lib/clisp/pcre/pcre.fas
+%%PCRE%%lib/clisp/pcre/pcre.lisp
+%%PCRE%%lib/clisp/pcre/preload.lisp
+%%PGSQL%%lib/clisp/dynmod/lib-postgresql.so
+%%PGSQL%%lib/clisp/dynmod/postgresql.lisp
+%%PGSQL%%lib/clisp/postgresql/Makefile
+%%PGSQL%%lib/clisp/postgresql/README
+%%PGSQL%%lib/clisp/postgresql/link.sh
+%%PGSQL%%lib/clisp/postgresql/postgresql.fas
+%%PGSQL%%lib/clisp/postgresql/postgresql.lisp
+%%PGSQL%%lib/clisp/postgresql/postgresql.o
+%%PGSQL%%lib/clisp/postgresql/sql.fas
+%%PGSQL%%lib/clisp/postgresql/sql.lisp
+%%RAWSOCK%%lib/clisp/dynmod/lib-rawsock.so
+%%RAWSOCK%%lib/clisp/dynmod/rawsock.lisp
+%%RAWSOCK%%lib/clisp/rawsock/Makefile
+%%RAWSOCK%%lib/clisp/rawsock/demos/README
+%%RAWSOCK%%lib/clisp/rawsock/demos/sniffer.lisp
+%%RAWSOCK%%lib/clisp/rawsock/link.sh
+%%RAWSOCK%%lib/clisp/rawsock/preload.lisp
+%%RAWSOCK%%lib/clisp/rawsock/rawsock.o
+%%RAWSOCK%%lib/clisp/rawsock/sock.fas
+%%RAWSOCK%%lib/clisp/rawsock/sock.lisp
+%%SVM%%lib/clisp/dynmod/lib-libsvm.so
+%%SVM%%lib/clisp/dynmod/libsvm.lisp
+%%SVM%%lib/clisp/libsvm/Makefile
+%%SVM%%lib/clisp/libsvm/libsvm.fas
+%%SVM%%lib/clisp/libsvm/libsvm.lisp
+%%SVM%%lib/clisp/libsvm/libsvm.o
+%%SVM%%lib/clisp/libsvm/link.sh
+%%SVM%%lib/clisp/libsvm/preload.lisp
+%%WILDCARD%%lib/clisp/dynmod/lib-wildcard.so
+%%WILDCARD%%lib/clisp/dynmod/wildcard.lisp
+%%WILDCARD%%lib/clisp/wildcard/Makefile
+%%WILDCARD%%lib/clisp/wildcard/README
+%%WILDCARD%%lib/clisp/wildcard/libgnu_wc.a
+%%WILDCARD%%lib/clisp/wildcard/link.sh
+%%WILDCARD%%lib/clisp/wildcard/wildcard.fas
+%%WILDCARD%%lib/clisp/wildcard/wildcard.lisp
+%%WILDCARD%%lib/clisp/wildcard/wildcard.o
+%%ZLIB%%lib/clisp/dynmod/lib-zlib.so
+%%ZLIB%%lib/clisp/dynmod/zlib.lisp
+%%ZLIB%%lib/clisp/zlib/Makefile
+%%ZLIB%%lib/clisp/zlib/link.sh
+%%ZLIB%%lib/clisp/zlib/zlib.fas
+%%ZLIB%%lib/clisp/zlib/zlib.lisp
+%%ZLIB%%lib/clisp/zlib/zlib.o
+%%ZLIB%%@dirrm lib/clisp/zlib
+%%WILDCARD%%@dirrm lib/clisp/wildcard
+%%SVM%%@dirrm lib/clisp/libsvm
+%%RAWSOCK%%@dirrm lib/clisp/rawsock/demos
+%%RAWSOCK%%@dirrm lib/clisp/rawsock
+%%PGSQL%%@dirrm lib/clisp/postgresql
+%%PCRE%%@dirrm lib/clisp/pcre
+%%PARI%%@dirrm lib/clisp/pari
+%%GTK2%%@dirrm lib/clisp/gtk2
+%%GDBM%%@dirrm lib/clisp/gdbm
+%%FASTCGI%%@dirrm lib/clisp/fastcgi
+%%DBUS%%@dirrm lib/clisp/dbus
+%%CLX_NEW%%@dirrm lib/clisp/clx/new-clx/demos/xpms
+%%CLX_NEW%%@dirrm lib/clisp/clx/new-clx/demos/screens
+%%CLX_NEW%%@dirrm lib/clisp/clx/new-clx/demos
+%%CLX_NEW%%@dirrm lib/clisp/clx/new-clx
+%%CLX_NEW%%@dirrm lib/clisp/clx
+%%CLX_MIT%%@dirrm lib/clisp/clx/mit-clx
+%%CLX_MIT%%@dirrm lib/clisp/clx
+%%BDB%%@dirrm lib/clisp/berkeley-db
+@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/vim
+@dirrm %%DATADIR%%/emacs
+@dirrm %%DATADIR%%
 @dirrm lib/clisp/linkkit
-@dirrm lib/clisp/full
+@dirrm lib/clisp/dynmod
 @dirrm lib/clisp/data
 @dirrm lib/clisp/build-aux
 @dirrm lib/clisp/base
 @dirrm lib/clisp
-@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/vim
-@dirrm %%DATADIR%%/emacs
-@dirrm %%DATADIR%%