Update to 2.44.1, packaged by Aleksej Saushev.

Major changes from 2.41:
- Use pkgsrc-supplied libffcall
- Use libtool
- New PKG_OPTIONS to enable support for db4, gdbm, gtk2, fastcgi, pcre.
- lots of bugfixes

16 files changed, 235 insertions, 269 deletions

diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 2bc6a95f423..6a134f7d433 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.66 2008/01/30 14:20:54 is Exp $
+# $NetBSD: Makefile,v 1.67 2008/02/29 19:34:44 tnn Exp $
+#
 
-DISTNAME=	clisp-2.41
+DISTNAME=	clisp-2.44.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clisp/}
-EXTRACT_SUFX=	.tar.bz2
+#EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	asau@inbox.ru
 HOMEPAGE=	http://clisp.cons.org/
 COMMENT=	CLISP, a Common Lisp implementation
 
@@ -16,51 +17,36 @@ NOT_FOR_PLATFORM+=	*-*-arm
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-# CLISP doesn't work with jemalloc, which is default in current
-MODULES+=		--with-gmalloc
-.endif
-
-.if ${MACHINE_ARCH:Malpha} || ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mx86_64} || ${OPSYS} == "DragonFly"
-MODULES+=		--disable-mmap
-.endif
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		dvipdf
+USE_TOOLS+=		dvipdf gmake
 USE_PKGLOCALEDIR=	YES
 BUILD_DIRS=		src
-CONFIGURE_DIRS=		. modules/i18n modules/syscalls modules/pcre modules/rawsock \
-			modules/readline modules/regexp modules/wildcard modules/zlib
-CONFIGURE_ENV+=		CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} CPPFLAGS=${CPPFLAGS:M*:Q}
 GNU_CONFIGURE=		YES
 UNLIMIT_RESOURCES=	stacksize
 USE_LIBTOOL=		YES
-USE_GNU_READLINE=	YES
-MODULES+=		--with-module=pcre --with-module=rawsock
-MODULES+=		--with-module=wildcard --with-module=zlib
-CONFIGURE_ARGS+=	${MODULES}
+CONFIGURE_ARGS+=	--fsstnd=netbsd
+CONFIGURE_ARGS+=	--without-included-regex
+CONFIGURE_ARGS+=	--with-gettext
 TEST_TARGET=		check
-MAKE_ENV+=		TOOLS_PLATFORM.install=${TOOLS_PLATFORM.install:Q}
+MAKE_FLAGS+=		docdir=${PREFIX}/share/doc/${PKGNAME}
 MAKE_FLAGS+=		mandir=${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+=		elispdir="${PREFIX}/share/${PKGNAME}/emacs"
+MAKE_FLAGS+=		vimdir="${PREFIX}/share/${PKGNAME}/vim"
 MAKE_JOBS_SAFE=		no
 
-post-configure:
-	cd ${WRKSRC}/src && \
-	./makemake --prefix=${PREFIX} --with-readline --with-gettext \
-		--with-dynamic-ffi --fsstnd=netbsd ${MODULES} >Makefile
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH:Malpha} || ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mx86_64} || ${OPSYS} == "DragonFly"
+CONFIGURE_ARGS+=	--disable-mmap
+.endif
 
-pre-build:
-	cd ${WRKSRC}/src/avcall && ${MAKE}
-	cd ${WRKSRC}/src/callback && ${MAKE}
+.include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libsigsegv+=	libsigsegv>=2.4
 .include "../../devel/libsigsegv/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2
-.include "../../devel/zlib/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/clisp/PLIST b/lang/clisp/PLIST
index b7bfc5d9874..4504d851ec1 100644
--- a/lang/clisp/PLIST
+++ b/lang/clisp/PLIST
@@ -1,75 +1,81 @@
-@comment $NetBSD: PLIST,v 1.12 2007/06/09 06:10:31 obache Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/02/29 19:34:44 tnn Exp $
 bin/clisp
 lib/clisp/base/calls.o
 lib/clisp/base/gettext.o
-lib/clisp/base/libavcall.a
-lib/clisp/base/libcallback.a
-lib/clisp/base/libcharset.a
 lib/clisp/base/libnoreadline.a
 lib/clisp/base/lisp.a
 lib/clisp/base/lisp.run
 lib/clisp/base/lispinit.mem
+lib/clisp/base/localcharset.o
 lib/clisp/base/makevars
 lib/clisp/base/modules.h
 lib/clisp/base/modules.o
 lib/clisp/base/readline.o
-lib/clisp/base/regex.o
 lib/clisp/base/regexi.o
 lib/clisp/base/regexp.dvi
+lib/clisp/base/uniname.o
+lib/clisp/base/width.o
 lib/clisp/clisp-link
 lib/clisp/data/Symbol-Table.text
 lib/clisp/data/UnicodeDataFull.txt
+${bdb}lib/clisp/full/bdb.o
 lib/clisp/full/calls.o
-lib/clisp/full/cpcre.o
+${mit-clx}lib/clisp/full/clx.o
+${new-clx}lib/clisp/full/clx.o
+${pcre}lib/clisp/full/cpcre.o
+${fastcgi}lib/clisp/full/fastcgi.o
+${fastcgi}lib/clisp/full/fastcgi_wrappers.o
 lib/clisp/full/gettext.o
-lib/clisp/full/libavcall.a
-lib/clisp/full/libcallback.a
-lib/clisp/full/libcharset.a
+${gdbm}lib/clisp/full/gdbm.o
+${gtk2}lib/clisp/full/gtk.o
 lib/clisp/full/libnoreadline.a
 lib/clisp/full/lisp.a
 lib/clisp/full/lisp.run
 lib/clisp/full/lispinit.mem
+lib/clisp/full/localcharset.o
 lib/clisp/full/makevars
 lib/clisp/full/modules.h
 lib/clisp/full/modules.o
-lib/clisp/full/rawsock.o
+${pgsql}lib/clisp/full/postgresql.o
+${rawsock}lib/clisp/full/rawsock.o
 lib/clisp/full/readline.o
-lib/clisp/full/regex.o
 lib/clisp/full/regexi.o
 lib/clisp/full/regexp.dvi
-lib/clisp/full/wildcard.dvi
-lib/clisp/full/wildcard.o
-lib/clisp/full/zlib.o
+lib/clisp/full/uniname.o
+lib/clisp/full/width.o
+${wildcard}lib/clisp/full/wildcard.dvi
+${wildcard}lib/clisp/full/wildcard.o
+${zlib}lib/clisp/full/zlib.o
 lib/clisp/linkkit/clisp.h
 lib/clisp/linkkit/modprep.lisp
 lib/clisp/linkkit/modules.c
-lib/clisp/linkkit/modules.d
 man/man1/clisp.1
-share/doc/clisp/ANNOUNCE
-share/doc/clisp/CLOS-guide.txt
-share/doc/clisp/COPYRIGHT
-share/doc/clisp/GNU-GPL
-share/doc/clisp/LISP-tutorial.txt
-share/doc/clisp/MAGIC.add
-share/doc/clisp/NEWS
-share/doc/clisp/README
-share/doc/clisp/README.de
-share/doc/clisp/README.es
-share/doc/clisp/SUMMARY
-share/doc/clisp/clisp.1
-share/doc/clisp/clisp.dvi
-share/doc/clisp/clisp.html
-share/doc/clisp/clisp.pdf
-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
-share/emacs/site-lisp/clhs.el
-share/emacs/site-lisp/clisp-coding.el
-share/emacs/site-lisp/clisp-ffi.el
-share/emacs/site-lisp/clisp-indent.el
-share/emacs/site-lisp/clisp-indent.lisp
+share/${PKGNAME}/emacs/clhs.el
+share/${PKGNAME}/emacs/clisp-coding.el
+share/${PKGNAME}/emacs/clisp-ffi.el
+share/${PKGNAME}/emacs/clisp-indent.el
+share/${PKGNAME}/emacs/clisp-indent.lisp
+share/${PKGNAME}/vim/lisp.vim
+share/doc/${PKGNAME}/ANNOUNCE
+share/doc/${PKGNAME}/CLOS-guide.txt
+share/doc/${PKGNAME}/COPYRIGHT
+share/doc/${PKGNAME}/GNU-GPL
+share/doc/${PKGNAME}/LISP-tutorial.txt
+share/doc/${PKGNAME}/MAGIC.add
+share/doc/${PKGNAME}/NEWS
+share/doc/${PKGNAME}/README
+share/doc/${PKGNAME}/README.de
+share/doc/${PKGNAME}/README.es
+share/doc/${PKGNAME}/SUMMARY
+share/doc/${PKGNAME}/clisp.1
+share/doc/${PKGNAME}/clisp.dvi
+share/doc/${PKGNAME}/clisp.html
+share/doc/${PKGNAME}/clisp.pdf
+share/doc/${PKGNAME}/clisp.png
+share/doc/${PKGNAME}/clisp.ps
+share/doc/${PKGNAME}/editors.txt
+share/doc/${PKGNAME}/impnotes.css
+share/doc/${PKGNAME}/impnotes.html
 share/locale/da/LC_MESSAGES/clisp.mo
 share/locale/da/LC_MESSAGES/clisplow.mo
 share/locale/de/LC_MESSAGES/clisp.mo
@@ -84,7 +90,9 @@ share/locale/nl/LC_MESSAGES/clisp.mo
 share/locale/nl/LC_MESSAGES/clisplow.mo
 share/locale/ru/LC_MESSAGES/clisp.mo
 share/locale/ru/LC_MESSAGES/clisplow.mo
-@dirrm share/doc/clisp
+@dirrm share/doc/${PKGNAME}
+@dirrm share/${PKGNAME}/vim
+@dirrm share/${PKGNAME}/emacs
 @dirrm lib/clisp/linkkit
 @dirrm lib/clisp/full
 @dirrm lib/clisp/data
diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo
index 6d90d71c474..2ca0d673e5f 100644
--- a/lang/clisp/distinfo
+++ b/lang/clisp/distinfo
@@ -1,17 +1,7 @@
-$NetBSD: distinfo,v 1.17 2007/06/09 06:10:31 obache Exp $
+$NetBSD: distinfo,v 1.18 2008/02/29 19:34:44 tnn Exp $
 
-SHA1 (clisp-2.41.tar.bz2) = 0f53703d45807c10e0398fc85352ed605ee566a3
-RMD160 (clisp-2.41.tar.bz2) = e98ee7142c01e946f242360c7495df5668694d34
-Size (clisp-2.41.tar.bz2) = 8319471 bytes
-SHA1 (patch-aa) = 3d9679606bfd6598353418ae6d4182a7f4393a5e
-SHA1 (patch-ab) = fd045706d0cbcf6fd417eba5636d11ab1d3e9329
-SHA1 (patch-ac) = 8e784d081c8ea276661b5a11ded5d856d3b2dfdc
-SHA1 (patch-ad) = aa5cf0719299e0b8c59cdf19c52cadb9451204cf
-SHA1 (patch-ae) = e6766368b19b0d2e6ac21e9919dfb88e792caa03
-SHA1 (patch-af) = 2919a13a8ca8266f5d608f4dbe35f14803c7595d
-SHA1 (patch-ag) = f3ce92e3f0806197015b971cce24311a5a447050
-SHA1 (patch-ah) = 6a607e00e1815fe332325a91865889a03c60c3a0
-SHA1 (patch-ai) = 8291cfd4c27cbb22d5a72168cdb21c6d26400f54
-SHA1 (patch-aj) = 37af4382519ddb21587006789165ba1173e17577
-SHA1 (patch-ak) = d9bdea2e480e8ea5fbe7e703dfce62fe47b9b7e7
-SHA1 (patch-al) = 90ec5cc5028dba1ecda7d499def88303cbff2d2a
+SHA1 (clisp-2.44.1.tar.gz) = 08cbf5a2f94fa1e6f29e1563e10e200f8dee8690
+RMD160 (clisp-2.44.1.tar.gz) = adf762a6df98a677da9393a52ee9a02c0e1ead09
+Size (clisp-2.44.1.tar.gz) = 8950346 bytes
+SHA1 (patch-aa) = d2f1de2e0f3e02ccf4ece2a7b1ed0ce6ba025af2
+SHA1 (patch-ab) = 6559df5aaa12af5a62da7c82d08678f642845453
diff --git a/lang/clisp/options.mk b/lang/clisp/options.mk
new file mode 100644
index 00000000000..580f3a3f769
--- /dev/null
+++ b/lang/clisp/options.mk
@@ -0,0 +1,119 @@
+# $NetBSD: options.mk,v 1.1 2008/02/29 19:34:44 tnn Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.clisp
+
+# this option is essential for some others to work:
+PKG_SUPPORTED_OPTIONS+=		ffcall
+
+PKG_SUPPORTED_OPTIONS+=		pgsql gdbm bdb pcre rawsock pari fastcgi wildcard gtk2 zlib
+PKG_SUPPORTED_OPTIONS+=		readline
+
+PKG_OPTIONS_OPTIONAL_GROUPS=	x11-bindings
+PKG_OPTIONS_GROUP.x11-bindings=	mit-clx new-clx
+
+PKG_SUPPORTED_OPTIONS+=		gmalloc
+
+PKG_SUGGESTED_OPTIONS+=		ffcall pcre rawsock readline zlib
+
+# CLISP doesn't work with jemalloc:
+.if ${OPSYS} == "NetBSD"
+PKG_SUGGESTED_OPTIONS+=		gmalloc
+.elif ${OPSYS} == "FreeBSD" && !empty(OS_VERSION:N[0-6].*)
+PKG_SUGGESTED_OPTIONS+=		gmalloc
+.endif
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
+
+.for option in ${PKG_SUPPORTED_OPTIONS}
+.  if !empty(PKG_OPTIONS:M${option})
+PLIST_SUBST+=	${option}=""
+.  else
+PLIST_SUBST+=	${option}="@comment "
+.  endif
+.endfor
+
+.if !empty(PKG_OPTIONS:Mgmalloc)
+CONFIGURE_ARGS+=	--with-gmalloc
+.endif
+
+# ffcall is required for other options to work
+.if !empty(PKG_OPTIONS:Mpgsql) && empty(PKG_OPTIONS:Mffcall)
+PKG_OPTIONS+=	ffcall
+.endif
+
+.if !empty(PKG_OPTIONS:Mffcall)
+CONFIGURE_ARGS+=	--with-dynamic-ffi
+.  include "../../devel/ffcall/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mpgsql)
+CONFIGURE_ARGS+=	--with-module=postgresql
+.  include "../../mk/pgsql.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgdbm)
+CONFIGURE_ARGS+=	--with-module=gdbm
+.  include "../../databases/gdbm/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mbdb)
+# it requires version 4, not anything older
+CONFIGURE_ARGS+=	--with-module=berkeley-db
+.  include "../../databases/db4/buildlink3.mk"
+CPPFLAGS+=	-I${PREFIX}/include/db4
+LDFLAGS+=	-L${PREFIX}/lib
+.endif
+
+.if !empty(PKG_OPTIONS:Mpcre)
+CONFIGURE_ARGS+=	--with-module=pcre
+.  include "../../devel/pcre/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mrawsock)
+CONFIGURE_ARGS+=	--with-module=rawsock
+.endif
+
+.if !empty(PKG_OPTIONS:Mpari)
+CONFIGURE_ARGS+=	--with-module=pari
+.  include "../../math/pari/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mfastcgi)
+CONFIGURE_ARGS+=	--with-module=fastcgi
+.  include "../../www/fcgi/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mnew-clx)
+CONFIGURE_ARGS+=	--with-module=clx/new-clx
+.  include "../../x11/libX11/buildlink3.mk"
+.  include "../../x11/libXau/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mmit-clx)
+CONFIGURE_ARGS+=	--with-module=clx/mit-clx
+.  include "../../x11/libX11/buildlink3.mk"
+.  include "../../x11/libXau/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk2)
+CONFIGURE_ARGS+=	--with-module=gtk2
+.  include "../../devel/libglade/buildlink3.mk"
+.  include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mwildcard)
+CONFIGURE_ARGS+=	--with-module=wildcard
+.endif
+
+.if !empty(PKG_OPTIONS:Mzlib)
+CONFIGURE_ARGS+=	--with-module=zlib
+BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2
+.include "../../devel/zlib/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mreadline)
+USE_GNU_READLINE=	YES
+CONFIGURE_ARGS+=	--with-readline
+.include "../../devel/readline/buildlink3.mk"
+.endif
diff --git a/lang/clisp/patches/patch-aa b/lang/clisp/patches/patch-aa
index 3b7058620a7..ae58d92a3c4 100644
--- a/lang/clisp/patches/patch-aa
+++ b/lang/clisp/patches/patch-aa
@@ -1,26 +1,23 @@
-$NetBSD: patch-aa,v 1.15 2007/06/09 06:10:31 obache Exp $
+$NetBSD: patch-aa,v 1.16 2008/02/29 19:34:44 tnn Exp $
 
---- src/makemake.in.orig	2006-10-01 17:54:24.000000000 +0000
+Don't use cache file to avoid trailing space problem.
+
+--- src/makemake.in.orig	2008-01-03 20:28:49.000000000 +0100
 +++ src/makemake.in
-@@ -841,10 +841,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"
+@@ -1881,6 +1881,7 @@ echol "psdir   = ${PSDIR}"
+ echol "pdfdir  = ${PDFDIR}"
+ echol "libdir  = ${LIBDIR}"
+ echol "lisplibdir = \$(libdir)${NEXT_}\$(TOPDIR)"
++echol "lisplibdir = \$(libdir)${NEXT_}clisp"
+ if [ -n "$USE_GETTEXT" ] ; then
+   echol "localedir = ${LOCALEDIR}"
  fi
- if [ $HOS = unix ] ; then
-@@ -1361,7 +1361,7 @@ if [ "${with_dynamic_modules}" != no ]; 
-     freebsd2* | netbsd* | openbsd*)
-       XCC_CREATESHARED='ld -Bshareable -o $lib $libs'
-       ;;
--    freebsd3* | gnu* | linux* | cygwin* | k*bsd*)
-+    freebsd3* | gnu* | linux* | cygwin* | k*bsd* | dragonfly*)
-       XCC_CREATESHARED='$CC $CFLAGS $CLFLAGS -shared -o $lib $libs'
-       ;;
-     hpux9* | hpux10*)
+@@ -3342,7 +3343,7 @@ echotab "      if test \"\$\${ac_cv_env_
+ echotab "      if test \"\$\${ac_cv_env_CFLAGS_set}\" = set; then CFLAGS=\"\$\${ac_cv_env_CFLAGS_value}\"; export CFLAGS; fi; \\"
+ # we must use $(SHELL) for sub-configures because when the top CONFIG_SHELL
+ # is bash, config.cache may be unparsable with sh on Solaris
+-echotab "      \$(SHELL) ./configure --cache-file=\$\${cache} --srcdir=\$\$m \$(MODULE_CONFIGURE_FLAGS);\\"
++echotab "      \$(SHELL) ./configure --srcdir=\$\$m \$(MODULE_CONFIGURE_FLAGS);\\"
+ echotab "    else \$(SHELL) ./configure --srcdir=\$\$m \$(MODULE_CONFIGURE_FLAGS); \\"
+ echotab "    fi ) ;\\"
+ echotab "fi"
diff --git a/lang/clisp/patches/patch-ab b/lang/clisp/patches/patch-ab
index 4c2bf0b440f..3340d38a75a 100644
--- a/lang/clisp/patches/patch-ab
+++ b/lang/clisp/patches/patch-ab
@@ -1,15 +1,22 @@
-$NetBSD: patch-ab,v 1.12 2007/04/01 12:45:39 tron Exp $
+$NetBSD: patch-ab,v 1.13 2008/02/29 19:34:44 tnn Exp $
 
---- libcharset/Makefile.in.orig	2005-03-23 21:27:45.000000000 +0200
-+++ libcharset/Makefile.in
-@@ -45,8 +45,8 @@ include/localcharset.h :
- install-lib : all force
- 	cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)'
- 	$(mkinstalldirs) $(includedir)
--	$(INSTALL_DATA) include/libcharset.h $(includedir)/libcharset.h
--	$(INSTALL_DATA) include/localcharset.h $(includedir)/localcharset.h
-+	$(TOOLS_PLATFORM.install) -c -m 644 include/libcharset.h $(includedir)/libcharset.h
-+	$(TOOLS_PLATFORM.install) -c -m 644 include/localcharset.h $(includedir)/localcharset.h
- 
- install : include/libcharset.h include/localcharset.h force
- 	cd lib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+--- src/po/Makefile.in.in.orig	2007-10-28 01:52:28.000000000 +0200
++++ src/po/Makefile.in.in
+@@ -80,7 +80,7 @@ install-data-yes: all force
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  destdir=$(localedir); \
++	  destdir=$(DESTDIR)$(localedir); \
+ 	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+ 	  dir="$$destdir/$$lang/LC_MESSAGES"; \
+ 	  datarootdir=`echo "$$destdir" | sed -e 's,/[^/]*$$,,'`; \
+@@ -108,7 +108,7 @@ installdirs: force
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  destdir=$(localedir); \
++	  destdir=$(DESTDIR)$(localedir); \
+ 	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+ 	  dir="$$destdir/$$lang/LC_MESSAGES"; \
+ 	  datarootdir=`echo "$$destdir" | sed -e 's,/[^/]*,,'`; \
diff --git a/lang/clisp/patches/patch-ac b/lang/clisp/patches/patch-ac
deleted file mode 100644
index 9d96069e69e..00000000000
--- a/lang/clisp/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2006/07/20 23:05:43 perry Exp $
-
---- src/asmi386.h.orig	2006-07-20 18:23:37.000000000 -0400
-+++ src/asmi386.h
-@@ -231,7 +231,7 @@
- 
- #ifdef _MSC_VER
- #define DECLARE_FUNCTION(name)
--#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
-+#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
- #define DECLARE_FUNCTION(name) .type C(name),@function
- #else
- #define DECLARE_FUNCTION(name)
diff --git a/lang/clisp/patches/patch-ad b/lang/clisp/patches/patch-ad
deleted file mode 100644
index 7a8bfb6874e..00000000000
--- a/lang/clisp/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2006/07/20 23:05:43 perry Exp $
-
---- src/asmi386.hh.orig	2006-07-20 18:24:45.000000000 -0400
-+++ src/asmi386.hh
-@@ -231,7 +231,7 @@
- // Define the DECLARE_FUNCTION(name) macro.
- #ifdef _MSC_VER
- #define DECLARE_FUNCTION(name)
--#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
-+#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
- #define DECLARE_FUNCTION(name) .type C(name),@function
- #else
- #define DECLARE_FUNCTION(name)
diff --git a/lang/clisp/patches/patch-ae b/lang/clisp/patches/patch-ae
deleted file mode 100644
index f1ea4e34c72..00000000000
--- a/lang/clisp/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.8 2006/07/20 23:05:43 perry Exp $
-
---- ffcall/avcall/asmi386.h.orig	2006-07-20 18:25:42.000000000 -0400
-+++ ffcall/avcall/asmi386.h
-@@ -231,7 +231,7 @@
- 
- #ifdef _MSC_VER
- #define DECLARE_FUNCTION(name)
--#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
-+#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
- #define DECLARE_FUNCTION(name) .type C(name),@function
- #else
- #define DECLARE_FUNCTION(name)
diff --git a/lang/clisp/patches/patch-af b/lang/clisp/patches/patch-af
deleted file mode 100644
index 7139c91b49a..00000000000
--- a/lang/clisp/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.7 2006/07/20 23:05:43 perry Exp $
-
---- ffcall/callback/vacall_r/asmi386.h.orig	2006-07-20 18:26:36.000000000 -0400
-+++ ffcall/callback/vacall_r/asmi386.h
-@@ -231,7 +231,7 @@
- 
- #ifdef _MSC_VER
- #define DECLARE_FUNCTION(name)
--#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
-+#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
- #define DECLARE_FUNCTION(name) .type C(name),@function
- #else
- #define DECLARE_FUNCTION(name)
diff --git a/lang/clisp/patches/patch-ag b/lang/clisp/patches/patch-ag
deleted file mode 100644
index 3a88ad3bed2..00000000000
--- a/lang/clisp/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2006/07/20 23:05:43 perry Exp $
-
---- ffcall/vacall/asmi386.h.orig	2006-07-20 18:27:34.000000000 -0400
-+++ ffcall/vacall/asmi386.h
-@@ -231,7 +231,7 @@
- 
- #ifdef _MSC_VER
- #define DECLARE_FUNCTION(name)
--#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
-+#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
- #define DECLARE_FUNCTION(name) .type C(name),@function
- #else
- #define DECLARE_FUNCTION(name)
diff --git a/lang/clisp/patches/patch-ah b/lang/clisp/patches/patch-ah
deleted file mode 100644
index e14223962cb..00000000000
--- a/lang/clisp/patches/patch-ah
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2007/04/01 12:45:39 tron Exp $
-
---- libcharset/lib/Makefile.in.orig	2005-03-23 21:28:10.000000000 +0200
-+++ libcharset/lib/Makefile.in
-@@ -78,11 +78,11 @@ ref-del.sed : $(srcdir)/ref-del.sin
- # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
- install-lib : all force
- 	$(mkinstalldirs) $(libdir)
--	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
-+	$(LIBTOOL_INSTALL) $(TOOLS_PLATFORM.install) -c -m 644 libcharset.la $(libdir)/libcharset.la
- 	test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
- 	                                || orig=charset.alias; \
- 	sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
--	$(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \
-+	$(TOOLS_PLATFORM.install) -c -m 644 $(libdir)/t-charset.alias $(libdir)/charset.alias; \
- 	rm -f $(libdir)/t-charset.alias
- 
- # The following is needed in order to install a simple file in $(libdir)
diff --git a/lang/clisp/patches/patch-ai b/lang/clisp/patches/patch-ai
deleted file mode 100644
index a6541326da6..00000000000
--- a/lang/clisp/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2007/04/01 12:45:39 tron Exp $
-
---- ffcall/avcall/Makefile.in.orig	2006-04-25 11:10:43.000000000 +0300
-+++ ffcall/avcall/Makefile.in
-@@ -156,9 +156,9 @@ libavcall.la : $(OBJECTS)
- # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
- install-lib : all force
- 	if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi
--	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libavcall.la $(libdir)/libavcall.la
-+	$(LIBTOOL_INSTALL) $(TOOLS_PLATFORM.install) -c -m 644 libavcall.la $(libdir)/libavcall.la
- 	if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi
--	$(INSTALL_DATA) avcall.h $(includedir)/avcall.h
-+	$(TOOLS_PLATFORM.install) -c -m 644 avcall.h $(includedir)/avcall.h
- 
- install : all force
- 	if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi
diff --git a/lang/clisp/patches/patch-aj b/lang/clisp/patches/patch-aj
deleted file mode 100644
index d998ce2db31..00000000000
--- a/lang/clisp/patches/patch-aj
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2007/04/01 12:45:40 tron Exp $
-
---- ffcall/callback/Makefile.in.orig	2005-03-27 05:13:45.000000000 +0300
-+++ ffcall/callback/Makefile.in
-@@ -68,9 +68,9 @@ libcallback.la : vacall_r/libvacall.la t
- install-lib : all force
- 	cd @subdir@; $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)'
- 	if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi
--	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcallback.la $(libdir)/libcallback.la
-+	$(LIBTOOL_INSTALL) $(TOOLS_PLATFORM.install) -c -m 644 libcallback.la $(libdir)/libcallback.la
- 	if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi
--	$(INSTALL_DATA) callback.h $(includedir)/callback.h
-+	$(TOOLS_PLATFORM.install) -c -m 644 callback.h $(includedir)/callback.h
- 
- install : force
- 	cd @subdir@; $(MAKE) install
diff --git a/lang/clisp/patches/patch-ak b/lang/clisp/patches/patch-ak
deleted file mode 100644
index 48b2066deff..00000000000
--- a/lang/clisp/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.6 2007/06/09 06:10:31 obache Exp $
-
---- ffcall/callback/vacall_r/Makefile.in.orig	2006-09-03 23:39:43.000000000 +0000
-+++ ffcall/callback/vacall_r/Makefile.in
-@@ -164,7 +164,7 @@ libvacall.la : $(OBJECTS)
- # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
- install-lib : all force
- 	if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi
--	$(INSTALL_DATA) vacall_r.h $(includedir)/vacall_r.h
-+	$(TOOLS_PLATFORM.install) -c -m 644 vacall_r.h $(includedir)/vacall_r.h
- 
- install : all force
- 	if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi
diff --git a/lang/clisp/patches/patch-al b/lang/clisp/patches/patch-al
deleted file mode 100644
index 17d1fd36a85..00000000000
--- a/lang/clisp/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.2 2007/04/01 12:45:40 tron Exp $
-
---- ffcall/callback/trampoline_r/Makefile.in.orig	2006-04-28 11:10:31.000000000 +0300
-+++ ffcall/callback/trampoline_r/Makefile.in
-@@ -124,7 +124,7 @@ libtrampoline.la : $(OBJECTS)
- # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
- install-lib : all force
- 	if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi
--	$(INSTALL_DATA) trampoline_r.h $(includedir)/trampoline_r.h
-+	$(TOOLS_PLATFORM.install) -c -m 644 trampoline_r.h $(includedir)/trampoline_r.h
- 
- install : all force
- 	if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi