3 files changed, 16 insertions, 73 deletions
diff --git a/lang/clisp/patches/patch-aa b/lang/clisp/patches/patch-aa
index 5f62e1c3fa8..094b9bfc2b4 100644
--- a/lang/clisp/patches/patch-aa
+++ b/lang/clisp/patches/patch-aa
@@ -1,14 +1,17 @@
-$NetBSD: patch-aa,v 1.11 2004/03/29 02:46:18 perry Exp $
+$NetBSD: patch-aa,v 1.12 2006/03/11 23:32:44 wiz Exp $
 
---- ../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)
- 
-+# strip leading spaces, which lead to problems later on
-+CPPFLAGS="`echo $CPPFLAGS`"
-+
- info_help () {
- cat << \EOP
- Usage: configure [options] [dirname]
+--- src/makemake.in.orig	2006-01-23 21:07:27.000000000 +0000
++++ src/makemake.in
+@@ -823,10 +823,10 @@ else
+ fi
+ if [ $HOS = unix ] ; then
+   test -n "$mandir" ||
+-    mandir='${datadir}/man' # with autoconf-2.60: mandir='@mandir@' # usually '${datadir}/man'
++    mandir='${prefix}/man' # with autoconf-2.60: mandir='@mandir@' # usually '${datadir}/man'
+   MANDIR=`echo "$mandir" | sed -e "$brace_to_paren"`
+ else
+-  mandir="\$(datadir)${NEXT_}man"
++  mandir="\$(prefix)${NEXT_}man"
+   MANDIR="$mandir"
+ fi
+ if [ $HOS = unix ] ; then
diff --git a/lang/clisp/patches/patch-ab b/lang/clisp/patches/patch-ab
deleted file mode 100644
index cae80c8a90b..00000000000
--- a/lang/clisp/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2005/12/30 12:39:43 joerg Exp $
-
---- unix.d.orig	2005-12-30 12:22:01.000000000 +0000
-+++ unix.d
-@@ -25,7 +25,6 @@
- 
- /* the table of the system error messages */
- #include <errno.h>
--extern int errno; /* last error code */
- /* NB: errno may be a macro which expands to a function call.
-    Therefore access and assignment to errno must be wrapped in
-    begin_system_call()/end_system_call() */
diff --git a/lang/clisp/patches/patch-ai b/lang/clisp/patches/patch-ai
deleted file mode 100644
index b8bb636284c..00000000000
--- a/lang/clisp/patches/patch-ai
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2004/03/29 02:46:18 perry Exp $
-
---- 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'
-      LIBICONV='@LIBICONV@'               # either '-liconv' or ''
-      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  = \$(shared)${NEXT_}man"
-+echol "mandir  = \$(prefix)${NEXT_}man"
- echol "docdir  = \$(shared)${NEXT_}doc"
- case "$fsstnd" in
-   suse)
-@@ -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)"
-   LIBS="\$(LIBS)"
-+  LDFLAGS="\$(LDFLAGS)"
- fi
- echol "X_LIBS = ${X_LIBS}"
- X_LIBS="\$(X_LIBS)"
-@@ -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} ${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}"
-   fi
-   if [ $HOS = unix ] ; then
-     echotab "-sync"