Update to 2.33

15 files changed, 49 insertions, 266 deletions

diff --git a/lang/clisp/DESCR b/lang/clisp/DESCR
index 20b3a333ecf..3435bf9e256 100644
--- a/lang/clisp/DESCR
+++ b/lang/clisp/DESCR
@@ -7,14 +7,23 @@ Common Lisp is
 
 Common Lisp CLISP
   * needs only 2 MB of memory
-  * implements 99% of the CLtL1 standard, as well as some extensions
+  * mostly implements the ANSI Common Lisp standard, as well as some
+    extensions
   * can call your preferred editor
   * is freely distributable
 
 Common Lisp CLISP provides
   * an interpreter
   * a compiler which makes execution of programs 5 times faster
+  * a debugger
   * all data types with unlimited size (the size need never be declared,
     the size of lists and arrays may be changed dynamically)
   * integers of arbitrary length, unlimited floating point number precision
-  * 594 library functions, 542 of them written in C
+  * An X11 interface is available through CLX, Garnet, CLUE/CLIO.
+  * CLOS, a foreign language interface, sockets, i18n, and more.
+
+CLISP runs Maxima, ACL2 and many other Common Lisp packages.
+
+It is Free Software and may be distributed under the terms of GNU GPL,
+while it is possible to distribute commercial applications compiled
+with CLISP.
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 1e37bed2efe..71ec9c90551 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2004/02/14 17:21:43 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2004/03/29 02:46:18 perry Exp $
 
-DISTNAME=		clisp-2.30
+DISTNAME=		clisp-2.33
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=clisp/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/lang/clisp/PLIST b/lang/clisp/PLIST
index adbe185c25e..141fc560da4 100644
--- a/lang/clisp/PLIST
+++ b/lang/clisp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/07/13 14:34:49 dillo Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/03/29 02:46:18 perry Exp $
 bin/clisp
 lib/clisp/base/libavcall.a
 lib/clisp/base/libcallback.a
@@ -11,7 +11,7 @@ lib/clisp/base/makevars
 lib/clisp/base/modules.h
 lib/clisp/base/modules.o
 lib/clisp/clisp-link
-lib/clisp/data/UnicodeData.txt
+lib/clisp/data/UnicodeDataFull.txt
 lib/clisp/data/clhs.txt
 lib/clisp/full/libavcall.a
 lib/clisp/full/libcallback.a
@@ -24,6 +24,8 @@ lib/clisp/full/makevars
 lib/clisp/full/modules.h
 lib/clisp/full/modules.o
 lib/clisp/linkkit/clisp.h
+lib/clisp/linkkit/exporting.lisp
+lib/clisp/linkkit/modprep.lisp
 lib/clisp/linkkit/modules.c
 lib/clisp/linkkit/modules.d
 man/man1/clisp.1
@@ -42,21 +44,30 @@ share/doc/clisp/clisp.1
 share/doc/clisp/clisp.dvi
 share/doc/clisp/clisp.html
 share/doc/clisp/clisp.png
+share/doc/clisp/clisp.ps
 share/doc/clisp/editors.txt
 share/doc/clisp/impnotes.css
 share/doc/clisp/impnotes.html
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/clisp.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/clisplow.mo
+${PKGLOCALEDIR}/locale/en/LC_MESSAGES
 ${PKGLOCALEDIR}/locale/en/LC_MESSAGES/clisp.mo
 ${PKGLOCALEDIR}/locale/en/LC_MESSAGES/clisplow.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/clisp.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/clisplow.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/clisp.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/clisplow.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/clisp.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/clisplow.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/clisp.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/clisplow.mo
+${PKGLOCALEDIR}/locale/sr@ije
+${PKGLOCALEDIR}/locale/sr@ije/LC_MESSAGES
 @dirrm share/doc/clisp
 @dirrm lib/clisp/linkkit
 @dirrm lib/clisp/full
diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo
index ea21fed04a0..bdf4e57cba0 100644
--- a/lang/clisp/distinfo
+++ b/lang/clisp/distinfo
@@ -1,15 +1,6 @@
-$NetBSD: distinfo,v 1.6 2003/08/18 05:31:03 jmc Exp $
+$NetBSD: distinfo,v 1.7 2004/03/29 02:46:18 perry Exp $
 
-SHA1 (clisp-2.30.tar.bz2) = 7335116934d30cb327f4724047a1362498b85520
-Size (clisp-2.30.tar.bz2) = 5652698 bytes
-SHA1 (patch-aa) = 7c5375242feafab3a568eee373d0fef685896f5b
-SHA1 (patch-ab) = a830152fefc8db8a0504e7a7d3886fd2d11af601
-SHA1 (patch-ac) = 3f18f9859e5f93fe524845f98678c147c901cab2
-SHA1 (patch-ad) = c5c5808e78121dd398f76ba612b265e39978a7b1
-SHA1 (patch-ae) = 7fe957edd58e42f943a33908472042e0c42869d8
-SHA1 (patch-af) = a7c13cf848c370b676458a5b2e46a8fdcf4caa7f
-SHA1 (patch-ag) = 5ad9fe11abdea49780bdd0a01bf697d8ad07123c
-SHA1 (patch-ah) = ab42e8107d24a6ac86992aad5aa335ad33cfac62
-SHA1 (patch-ai) = 89f19718514b813b008ed92de8b538c76d341a53
-SHA1 (patch-aj) = 529b11e3cc3a3f72d4428d6f69bdce7bb9b33b97
-SHA1 (patch-ak) = f9152d73ddb74d4190ca6a91439a9173fbab5274
+SHA1 (clisp-2.33.tar.bz2) = 41292d4342803d7cb27d8ed436a31d1778860b31
+Size (clisp-2.33.tar.bz2) = 6072837 bytes
+SHA1 (patch-aa) = e7ef5ce48e6215d803d03ea57b23a80fb0862794
+SHA1 (patch-ai) = 1890cdfb1f59ca573a802e889f2bb2dbc8e32256
diff --git a/lang/clisp/patches/patch-aa b/lang/clisp/patches/patch-aa
index 2c76502dc20..5f62e1c3fa8 100644
--- a/lang/clisp/patches/patch-aa
+++ b/lang/clisp/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2003/07/13 14:34:49 dillo Exp $
+$NetBSD: patch-aa,v 1.11 2004/03/29 02:46:18 perry Exp $
 
---- ../configure.orig	Thu Sep  5 02:06:40 2002
-+++ ../configure
+--- ../configure.orig	2004-03-28 16:37:55.000000000 -0500
++++ ../configure	2004-03-28 16:39:05.000000000 -0500
 @@ -7,6 +7,9 @@
  #   configure make.gcc gcc     (deprecated)
  #   configure make.cc cc       (deprecated)
@@ -12,18 +12,3 @@ $NetBSD: patch-aa,v 1.10 2003/07/13 14:34:49 dillo Exp $
  info_help () {
  cat << \EOP
  Usage: configure [options] [dirname]
-@@ -437,14 +443,6 @@ if test -n "$do_config"; then
-   done
-   rm -f config.cache; # avoid problems with stale caches
-   cd ..
--fi
--
--if test -d $ABS_DIRNAME/avcall -a -d $ABS_DIRNAME/callback; then
--  (cd $ABS_DIRNAME/avcall && make) &&
--  (cd $ABS_DIRNAME/callback && make) &&
--  (cd $ABS_DIRNAME/avcall && make check) &&
--  (cd $ABS_DIRNAME/callback && make check) &&
--  makemake_args="--with-dynamic-ffi $makemake_args"
- fi
- 
- makemake_args="${makemake_args} ${target} ${debug}";
diff --git a/lang/clisp/patches/patch-ab b/lang/clisp/patches/patch-ab
deleted file mode 100644
index 3f51650baf8..00000000000
--- a/lang/clisp/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2003/07/13 14:34:49 dillo Exp $
-
---- .././ffcall/avcall/Makefile.in.orig	Sun Mar 24 19:51:37 2002
-+++ .././ffcall/avcall/Makefile.in
-@@ -120,12 +120,12 @@ avcall-rs6000.lo : $(srcdir)/avcall-rs60
- 	case "$(OS)" in \
- 	  aix3*) syntax=aix.old;; \
- 	  aix*) syntax=aix.new;; \
--	  linux*) syntax=linux;; \
-+	  linux* | netbsd*) syntax=linux;; \
- 	  *) syntax=sysv4;; \
- 	esac; \
- 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/avcall-rs6000-$${syntax}.s ; \
--	cp avcall-rs6000-$${syntax}.lo avcall-rs6000.lo ; rm -f avcall-rs6000-$${syntax}.lo ; \
--	if test -f avcall-rs6000-$${syntax}.o; then mv avcall-rs6000-$${syntax}.o avcall-rs6000.o; fi
-+	cp avcall-rs6000-$${syntax}.lo avcall-rs6000.lo ; \
-+	if test -f avcall-rs6000-$${syntax}.o; then cp avcall-rs6000-$${syntax}.o avcall-rs6000.o; fi
- 
- avcall-m88k.lo : $(srcdir)/avcall-m88k.s
- 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/avcall-m88k.s
diff --git a/lang/clisp/patches/patch-ac b/lang/clisp/patches/patch-ac
deleted file mode 100644
index e5a50110e5a..00000000000
--- a/lang/clisp/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2003/07/13 14:34:49 dillo Exp $
-
---- .././ffcall/vacall/Makefile.in.orig	Sun Mar 24 19:51:37 2002
-+++ .././ffcall/vacall/Makefile.in
-@@ -111,11 +111,11 @@ vacall-rs6000.o : $(srcdir)/vacall-rs600
- 	case "$(OS)" in \
- 	  aix3*) syntax=aix.old;; \
- 	  aix*) syntax=aix.new;; \
--	  linux*) syntax=linux;; \
-+	  linux* | netbsd*) syntax=linux;; \
- 	  *) syntax=sysv4;; \
- 	esac; \
- 	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-rs6000-$${syntax}.s ; \
--	mv vacall-rs6000-$${syntax}.o vacall-rs6000.o
-+	cp vacall-rs6000-$${syntax}.o vacall-rs6000.o
- 
- vacall-m88k.o : $(srcdir)/vacall-m88k.s
- 	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-m88k.s
diff --git a/lang/clisp/patches/patch-ad b/lang/clisp/patches/patch-ad
deleted file mode 100644
index 3255084da93..00000000000
--- a/lang/clisp/patches/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2003/07/13 14:34:49 dillo Exp $
-
---- .././ffcall/callback/vacall_r/Makefile.in.orig	Sun Mar 24 19:51:37 2002
-+++ .././ffcall/callback/vacall_r/Makefile.in
-@@ -121,11 +121,12 @@ vacall-rs6000.lo : $(srcdir)/vacall-rs60
- 	  aix3*) syntax=aix.old;; \
- 	  aix*) syntax=aix.new;; \
- 	  linux*) syntax=linux;; \
-+	  netbsd*) syntax=netbsd;; \
- 	  *) syntax=sysv4;; \
- 	esac; \
- 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-rs6000-$${syntax}.s ; \
--	cp vacall-rs6000-$${syntax}.lo vacall-rs6000.lo ; rm -f vacall-rs6000-$${syntax}.lo ; \
--	if test -f vacall-rs6000-$${syntax}.o; then mv vacall-rs6000-$${syntax}.o vacall-rs6000.o; fi
-+	cp vacall-rs6000-$${syntax}.lo vacall-rs6000.lo ; \
-+	if test -f vacall-rs6000-$${syntax}.o; then cp vacall-rs6000-$${syntax}.o vacall-rs6000.o; fi
- 
- vacall-m88k.lo : $(srcdir)/vacall-m88k.s
- 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-m88k.s
diff --git a/lang/clisp/patches/patch-ae b/lang/clisp/patches/patch-ae
deleted file mode 100644
index 870aeb0a998..00000000000
--- a/lang/clisp/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2003/07/13 14:34:49 dillo Exp $
-
---- .././ffcall/callback/trampoline_r/Makefile.in.orig	Sun Mar 24 19:51:37 2002
-+++ .././ffcall/callback/trampoline_r/Makefile.in
-@@ -93,7 +93,7 @@ cache-hppa.lo : $(srcdir)/cache-hppa.s
- 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-hppa.s
- 
- cache-rs6000.lo : $(srcdir)/cache-rs6000-sysv4.s
--	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-rs6000-sysv4.s ; mv -f cache-rs6000-sysv4.o cache-rs6000.o ; mv -f cache-rs6000-sysv4.lo cache-rs6000.lo
-+	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-rs6000-sysv4.s ; cp cache-rs6000-sysv4.o cache-rs6000.o ; mv cache-rs6000-sysv4.lo cache-rs6000.lo
- 
- cache-convex.lo : $(srcdir)/cache-convex.s
- 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-convex.s
diff --git a/lang/clisp/patches/patch-af b/lang/clisp/patches/patch-af
deleted file mode 100644
index 5d12f8c1366..00000000000
--- a/lang/clisp/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.4 2003/07/13 14:34:49 dillo Exp $
-
---- lispbibl.d.orig	Thu Sep 12 10:14:09 2002
-+++ lispbibl.d
-@@ -1438,7 +1438,7 @@ typedef unsigned_int_with_n_bits(pointer
-   #define intBWsize intBsize
-   #define intWLsize intWsize
-   #define intBWLsize intBsize
--#elif (defined(MC680X0) && defined(HPUX_ASSEMBLER)) || defined(SPARC) || defined(HPPA) || defined(MIPS) || defined(M88000) || defined(RS6000) || defined(CONVEX) || defined(S390)
-+#elif (defined(MC680X0) && defined(HPUX_ASSEMBLER)) || defined(SPARC) || defined(HPPA) || defined(MIPS) || defined(M88000) || defined(RS6000) || defined(CONVEX) || defined(S390) || defined(__powerpc__)
-   # The Sparc-processor computes rather badly with uintB and uintW.
-   # Other 32-Bit-processoren have similar weaknesses.
-   #define intBWsize intWsize
-@@ -1631,7 +1631,7 @@ typedef unsigned_int_with_n_bits(intBWLs
-   #define intDsize 16
-   #define intDDsize 32  # = 2*intDsize
-   #define log2_intDsize  4  # = log2(intDsize)
--#elif defined(MC680Y0) || defined(I80386) || defined(SPARC) || defined(HPPA) || defined(MIPS) || defined(M88000) || defined(RS6000) || defined(VAX) || defined(CONVEX) || defined(ARM) || defined(DECALPHA) || defined(IA64) || defined(S390)
-+#elif defined(MC680Y0) || defined(I80386) || defined(SPARC) || defined(HPPA) || defined(MIPS) || defined(M88000) || defined(RS6000) || defined(VAX) || defined(CONVEX) || defined(ARM) || defined(DECALPHA) || defined(IA64) || defined(S390) || defined(__powerpc__)
-   #define intDsize 32
-   #define intDDsize 64  # = 2*intDsize
-   #define log2_intDsize  5  # = log2(intDsize)
diff --git a/lang/clisp/patches/patch-ag b/lang/clisp/patches/patch-ag
deleted file mode 100644
index 6ed22c44467..00000000000
--- a/lang/clisp/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2003/07/13 14:34:49 dillo Exp $
-
---- ../ffcall/callback/trampoline_r/test1.c.orig	Wed May  8 10:11:49 2002
-+++ ../ffcall/callback/trampoline_r/test1.c
-@@ -70,7 +70,11 @@ register void* env __asm__("%r29");
- register void* env __asm__("r12");
- #endif
- #ifdef __rs6000__
-+#ifdef __NetBSD__
-+register void* env __asm__("r13");
-+#else
- register void* env __asm__("r11");
-+#endif
- #endif
- #ifdef __m88k__
- register void* env __asm__("r11");
diff --git a/lang/clisp/patches/patch-ah b/lang/clisp/patches/patch-ah
deleted file mode 100644
index f0452133f10..00000000000
--- a/lang/clisp/patches/patch-ah
+++ /dev/null
@@ -1,79 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2003/07/13 14:34:49 dillo Exp $
-
---- ../ffcall/callback/trampoline_r/trampoline.c.orig	Tue Jul  2 10:11:01 2002
-+++ ../ffcall/callback/trampoline_r/trampoline.c
-@@ -21,12 +21,16 @@
- #endif
- #endif
- #if defined(__rs6000__)
-+#if defined(__NetBSD__)
-+#define __powerpcnetbsd__
-+#else
- #if !defined(_AIX)
- #define __rs6000sysv4__  /* SysV.4 ABI, real machine code. */
- #else
- #define __rs6000aix__  /* AIX ABI, just a closure. */
- #endif
- #endif
-+#endif
- #if defined(__hppanew__)
- /*
-  * A function pointer is a biased pointer to a data area whose first word
-@@ -259,7 +263,7 @@ extern int shmctl ();
- #include <sys/syslocal.h>
- #endif
- /* Inline assembly function for instruction cache flush. */
--#if defined(__sparc__) || defined(__sparc64__) || defined(__alpha__) || defined(__hppaold__) || defined(__rs6000sysv4__) || defined(__convex__)
-+#if defined(__sparc__) || defined(__sparc64__) || defined(__alpha__) || defined(__hppaold__) || defined(__rs6000sysv4__) || defined(__convex__) || defined(__powerpcnetbsd__)
- #ifdef __GNUC__
- extern inline
- #if defined(__sparc__) || defined(__sparc64__)
-@@ -336,7 +340,7 @@ extern void __TR_clear_cache();
- #define TRAMP_LENGTH 32
- #define TRAMP_ALIGN 4
- #endif
--#ifdef __rs6000sysv4__
-+#if defined(__rs6000sysv4__) || defined(__powerpcnetbsd__)
- #define TRAMP_LENGTH 24
- #define TRAMP_ALIGN 4
- #endif
-@@ -910,6 +914,39 @@ __TR_function alloc_trampoline_r (addres
- #define is_tramp(function)  \
-   *(unsigned short *) (function + 0) == 0x3D60 && \
-   *(unsigned short *) (function + 4) == 0x616B && \
-+  *(unsigned short *) (function + 8) == 0x3C00 && \
-+  *(unsigned short *) (function +12) == 0x6000 && \
-+  *(unsigned long *)  (function +16) == 0x7C0903A6 && \
-+  *(unsigned long *)  (function +20) == 0x4E800420
-+#define hilo(hiword,loword)  \
-+  (((unsigned long) (hiword) << 16) | (unsigned long) (loword))
-+#define tramp_address(function)  \
-+  hilo(*(unsigned short *) (function +10), *(unsigned short *) (function +14))
-+#define tramp_data(function)  \
-+  hilo(*(unsigned short *) (function + 2), *(unsigned short *) (function + 6))
-+#endif
-+#ifdef __powerpcnetbsd__
-+  /* function:
-+   *    {liu|lis} 13,hi16(<data>)		3D A0 hi16(<data>)
-+   *    {oril|ori} 13,13,lo16(<data>)		61 AD lo16(<data>)
-+   *    {liu|lis} 0,hi16(<address>)		3C 00 hi16(<address>)
-+   *    {oril|ori} 0,0,lo16(<address>)		60 00 lo16(<address>)
-+   *    mtctr 0					7C 09 03 A6
-+   *    bctr					4E 80 04 20
-+   */
-+  *(short *) (function + 0) = 0x3DA0;
-+  *(short *) (function + 2) = (unsigned long) data >> 16;
-+  *(short *) (function + 4) = 0x61AD;
-+  *(short *) (function + 6) = (unsigned long) data & 0xffff;
-+  *(short *) (function + 8) = 0x3C00;
-+  *(short *) (function +10) = (unsigned long) address >> 16;
-+  *(short *) (function +12) = 0x6000;
-+  *(short *) (function +14) = (unsigned long) address & 0xffff;
-+  *(long *)  (function +16) = 0x7C0903A6;
-+  *(long *)  (function +20) = 0x4E800420;
-+#define is_tramp(function)  \
-+  *(unsigned short *) (function + 0) == 0x3DA0 && \
-+  *(unsigned short *) (function + 4) == 0x61AD && \
-   *(unsigned short *) (function + 8) == 0x3C00 && \
-   *(unsigned short *) (function +12) == 0x6000 && \
-   *(unsigned long *)  (function +16) == 0x7C0903A6 && \
diff --git a/lang/clisp/patches/patch-ai b/lang/clisp/patches/patch-ai
index ea26eb0fb6e..b8bb636284c 100644
--- a/lang/clisp/patches/patch-ai
+++ b/lang/clisp/patches/patch-ai
@@ -1,34 +1,31 @@
-$NetBSD: patch-ai,v 1.1 2003/07/13 14:35:33 dillo Exp $
+$NetBSD: patch-ai,v 1.2 2004/03/29 02:46:18 perry Exp $
 
---- makemake.in.orig	Sun Sep  8 02:34:17 2002
-+++ makemake.in
-@@ -337,6 +337,7 @@ case $# in
+--- makemake.in.orig	2004-03-16 17:04:05.000000000 -0500
++++ makemake.in	2004-03-28 21:14:18.000000000 -0500
+@@ -348,6 +348,7 @@
       GROFF='@GROFF@'                     # either 'groff' or ''
       GMALLOC='@GMALLOC@'                 # either 'gmalloc' or ''
       LIBS='@LIBS@'                       # list of system libraries
 +     LDFLAGS='@LDFLAGS@'		 # additional options for linking
       LIBTERMCAP='@LIBTERMCAP@'           # either '-ltermcap' or '-lncurses'
-      LIBDL='@LIBDL@'                     # either '-ldl' or ''
       LIBICONV='@LIBICONV@'               # either '-liconv' or ''
-@@ -1654,9 +1655,9 @@ echol "prefix = ${PREFIX}"
+      LIBSIGSEGV='@LTLIBSIGSEGV@'         # '-lsigsegv -L/usr/local/lib' or ''
+@@ -1534,7 +1535,7 @@
  echol "exec_prefix = ${EXEC_PREFIX}"
  echol "bindir  = \$(exec_prefix)${NEXT_}bin"
  echol "shared  = \$(prefix)${NEXT_}share"
--echol "mandir  = \$(prefix)${NEXT_}share${NEXT_}man"
--echol "htmldir = \$(prefix)${NEXT_}share${NEXT_}html"
--echol "dvidir  = \$(prefix)${NEXT_}share${NEXT_}dvi"
+-echol "mandir  = \$(shared)${NEXT_}man"
 +echol "mandir  = \$(prefix)${NEXT_}man"
-+echol "htmldir = \$(prefix)${NEXT_}share${NEXT_}doc${NEXT_}html"
-+echol "dvidir  = \$(prefix)${NEXT_}share${NEXT_}doc"
- echol "docdir  = \$(prefix)${NEXT_}share${NEXT_}doc"
+ echol "docdir  = \$(shared)${NEXT_}doc"
  case "$fsstnd" in
    suse)
-@@ -1721,11 +1722,13 @@ else
+@@ -1611,12 +1612,14 @@
    echol "CPP = ${XCPP}"
    echol "CLFLAGS = ${XCLFLAGS}"
    echol "LIBS = ${LIBS}"
 +  echol "LDFLAGS = ${LDFLAGS}"
    XCC="\$(CC)"
+   XCPPFLAGS="\$(CPPFLAGS)"
    XCFLAGS="\$(CFLAGS)"
    XCPP="\$(CPP)"
    XCLFLAGS="\$(CLFLAGS)"
@@ -37,9 +34,12 @@ $NetBSD: patch-ai,v 1.1 2003/07/13 14:35:33 dillo Exp $
  fi
  echol "X_LIBS = ${X_LIBS}"
  X_LIBS="\$(X_LIBS)"
-@@ -2620,7 +2623,7 @@ if [ $HOS != os2 -a $HOS != win32 ] ; th
+@@ -2479,9 +2482,9 @@
+   if [ $XCC_GCC = true -a -n "$SOLARIS_LINKING" ] ; then
+     # Dynamically linking on Solaris 2.[23] is a pain.
      LIBGCC_DIR='`'"${XCC} -print-libgcc-file-name"' | sed -e '"'"'s,[^/]*$$,,'"'"'`'
-     echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE} || /usr/ccs/bin/ld -V -dy -Bdynamic -Y P,/usr/ccs/lib:/usr/lib -Qy -o lisp${LEXE} ${LIBGCC_DIR}crt1.o ${LIBGCC_DIR}crti.o /usr/ccs/lib/values-Xa.o ${LIBGCC_DIR}crtbegin.o \$(OBJECTS) modules${TOBJ} -L${LIBGCC_DIR} -L/usr/ccs/bin ${LIBS} -lgcc -lc ${LIBGCC_DIR}crtend.o ${LIBGCC_DIR}crtn.o -lgcc"
+-    echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE} || /usr/ccs/bin/ld -V -dy -Bdynamic -Y P,/usr/ccs/lib:/usr/lib -Qy -o lisp${LEXE} ${LIBGCC_DIR}crt1.o ${LIBGCC_DIR}crti.o /usr/ccs/lib/values-Xa.o ${LIBGCC_DIR}crtbegin.o \$(OBJECTS) modules${TOBJ} -L${LIBGCC_DIR} -L/usr/ccs/bin ${LIBS} -lgcc -lc ${LIBGCC_DIR}crtend.o ${LIBGCC_DIR}crtn.o -lgcc"
++    echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} ${LDFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE} || /usr/ccs/bin/ld -V -dy -Bdynamic -Y P,/usr/ccs/lib:/usr/lib -Qy -o lisp${LEXE} ${LIBGCC_DIR}crt1.o ${LIBGCC_DIR}crti.o /usr/ccs/lib/values-Xa.o ${LIBGCC_DIR}crtbegin.o \$(OBJECTS) modules${TOBJ} -L${LIBGCC_DIR} -L/usr/ccs/bin ${LIBS} -lgcc -lc ${LIBGCC_DIR}crtend.o ${LIBGCC_DIR}crtn.o -lgcc"
    else
 -    echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE}"
 +    echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} ${LDFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE}"
diff --git a/lang/clisp/patches/patch-aj b/lang/clisp/patches/patch-aj
deleted file mode 100644
index eb4e3734bd8..00000000000
--- a/lang/clisp/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/08/18 05:31:04 jmc Exp $
-
---- configure.orig	Sun Aug 17 23:52:14 2003
-+++ configure	Sun Aug 17 23:52:50 2003
-@@ -13599,7 +13599,7 @@
-   if (!(getrusage(RUSAGE_SELF, &prev) == 0)) exit(1);
-   sleep (1);
- 
--  while (++count < 10000)
-+  while (++count < 100000)
-     {
-       getrusage(RUSAGE_SELF, &used);
-       if ((used.ru_utime.tv_usec != prev.ru_utime.tv_usec)
diff --git a/lang/clisp/patches/patch-ak b/lang/clisp/patches/patch-ak
deleted file mode 100644
index fc82db7bbfb..00000000000
--- a/lang/clisp/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2003/08/18 05:31:04 jmc Exp $
-
---- autoconf/aclocal.m4.orig	Sun Aug 17 23:54:26 2003
-+++ autoconf/aclocal.m4	Sun Aug 17 23:54:35 2003
-@@ -5645,7 +5645,7 @@
-   if (!(getrusage(RUSAGE_SELF, &prev) == 0)) exit(1);
-   sleep (1);
- 
--  while (++count < 10000)
-+  while (++count < 100000)
-     {
-       getrusage(RUSAGE_SELF, &used);
-       if ((used.ru_utime.tv_usec != prev.ru_utime.tv_usec)