Update scheme88 from 1.6 to 1.8.

Lots of changes between this two releases :
  - a new experimental gc
  - framework for asynchronous event
  - support for 64 bits machine
  - the layout of the installed system now conforms to FHS
  - and a lots of bugs fixes ...

Contributed by Aleksej Saushev via IRC.

4 files changed, 278 insertions, 245 deletions

diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index 0229d2d1e54..c8f914e6db6 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2007/06/09 06:59:03 obache Exp $
+# $NetBSD: Makefile,v 1.31 2008/05/02 09:22:21 degroote Exp $
 
-DISTNAME=		scheme48-1.6
+DISTNAME=		scheme48-1.8
 CATEGORIES=		lang
-MASTER_SITES=		http://s48.org/1.6/
+MASTER_SITES=		http://s48.org/1.8/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -11,20 +11,24 @@ COMMENT=		The Scheme Underground's implementation of R5RS
 
 NOT_FOR_PLATFORM=	*-*-alpha	# *severe* problems.  Bus error, alignment
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+MAKE_JOBS_SAFE=		no
+
 GNU_CONFIGURE=		yes
+USE_TOOLS=		gmake
 BUILD_TARGET=		enough
 TEST_TARGET=		check		# fail if USER == root directory owner
 
 MAKE_FLAGS+=		mandir=${PREFIX}/${PKGMANDIR}/man1
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/scheme48
-	cd ${WRKSRC:Q}/doc && ${INSTALL_DATA} *.txt *.ps \
-		${PREFIX:Q}/share/doc/scheme48
-	${INSTALL_DATA} ${WRKSRC:Q}/COPYING ${PREFIX:Q}/share/doc/scheme48
-	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/scheme48/html
-	${INSTALL_DATA} ${WRKSRC:Q}/doc/html/* \
-		${PREFIX:Q}/share/doc/scheme48/html
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.txt *.ps \
+		${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/html/* \
+		${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}/html
 
 .include "../../devel/sysexits/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/scheme48/PLIST b/lang/scheme48/PLIST
index 4e3d31a214e..8ed4dfe4189 100644
--- a/lang/scheme48/PLIST
+++ b/lang/scheme48/PLIST
@@ -1,237 +1,248 @@
-@comment $NetBSD: PLIST,v 1.4 2007/06/09 06:59:03 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/05/02 09:22:21 degroote Exp $
 bin/scheme-r5rs
 bin/scheme-srfi-7
 bin/scheme48
+bin/scheme48-config
+include/scheme48-external.exp
+include/scheme48.def
+include/scheme48.exp
 include/scheme48.h
+include/scheme48arch.h
 include/scheme48write-barrier.h
-lib/scheme48/big/array.scm
-lib/scheme48/big/big-util.scm
-lib/scheme48/big/callback.scm
-lib/scheme48/big/check.scm
-lib/scheme48/big/compact-table.scm
-lib/scheme48/big/compose-cont.scm
-lib/scheme48/big/defrecord.scm
-lib/scheme48/big/destructure.scm
-lib/scheme48/big/dump.scm
-lib/scheme48/big/dynamic-external.scm
-lib/scheme48/big/either.scm
-lib/scheme48/big/enum-set.scm
-lib/scheme48/big/external.scm
-lib/scheme48/big/filename.scm
-lib/scheme48/big/finite-type.scm
-lib/scheme48/big/format.scm
-lib/scheme48/big/general-table.scm
-lib/scheme48/big/hilbert.scm
-lib/scheme48/big/import-def.scm
-lib/scheme48/big/inversion-list-check.scm
-lib/scheme48/big/inversion-list.scm
-lib/scheme48/big/iterate.scm
-lib/scheme48/big/linked-queue.scm
-lib/scheme48/big/lock.scm
-lib/scheme48/big/lu-decomp.scm
-lib/scheme48/big/mask.scm
-lib/scheme48/big/more-port.scm
-lib/scheme48/big/mvlet.scm
-lib/scheme48/big/pipe.scm
-lib/scheme48/big/placeholder.scm
-lib/scheme48/big/pp.scm
-lib/scheme48/big/queue.scm
-lib/scheme48/big/random.scm
-lib/scheme48/big/receive.scm
-lib/scheme48/big/reinitializer.scm
-lib/scheme48/big/search-tree.scm
-lib/scheme48/big/shared-object.scm
-lib/scheme48/big/socket.scm
-lib/scheme48/big/strong.scm
-lib/scheme48/big/test-suite.scm
-lib/scheme48/big/text-codec-util.scm
-lib/scheme48/big/unicode-normalization-info.scm
-lib/scheme48/big/unicode-normalization.scm
-lib/scheme48/big/value-pipe.scm
-lib/scheme48/big/vararg.scm
-lib/scheme48/cml/async-channel.scm
-lib/scheme48/cml/channel.scm
-lib/scheme48/cml/interfaces.scm
-lib/scheme48/cml/jar.scm
-lib/scheme48/cml/packages.scm
-lib/scheme48/cml/placeholder.scm
-lib/scheme48/cml/rendezvous.scm
-lib/scheme48/cml/time.scm
-lib/scheme48/cml/trans-id.scm
-lib/scheme48/env/assem.scm
-lib/scheme48/env/basic-command.scm
-lib/scheme48/env/build.scm
-lib/scheme48/env/command-level.scm
-lib/scheme48/env/command.scm
-lib/scheme48/env/condition.scm
-lib/scheme48/env/debug.scm
-lib/scheme48/env/debuginfo.scm
-lib/scheme48/env/disasm.scm
-lib/scheme48/env/disclosers.scm
-lib/scheme48/env/dispcond.scm
-lib/scheme48/env/flatload.scm
-lib/scheme48/env/init-defpackage.scm
-lib/scheme48/env/inspect.scm
-lib/scheme48/env/io-condition.scm
-lib/scheme48/env/jar-assem.scm
-lib/scheme48/env/list-interface.scm
-lib/scheme48/env/load-package.scm
-lib/scheme48/env/menu.scm
-lib/scheme48/env/pacman.scm
-lib/scheme48/env/parse-bytecode.scm
-lib/scheme48/env/pedit.scm
-lib/scheme48/env/profile.scm
-lib/scheme48/env/read-command.scm
-lib/scheme48/env/shadow.scm
-lib/scheme48/env/signal.scm
-lib/scheme48/env/space.scm
-lib/scheme48/env/start.scm
-lib/scheme48/env/traverse.scm
-lib/scheme48/env/unicode-category.scm
-lib/scheme48/env/unicode-charmap.scm
-lib/scheme48/env/unicode-info.scm
-lib/scheme48/env/user.scm
-lib/scheme48/env/version-info.scm
-lib/scheme48/link/data.scm
-lib/scheme48/link/generate-c-header.scm
-lib/scheme48/link/generate-old-c-header.scm
-lib/scheme48/link/link.scm
-lib/scheme48/link/loadc.scm
-lib/scheme48/link/reify.scm
-lib/scheme48/link/transport.scm
-lib/scheme48/link/unicode-data-packages.scm
-lib/scheme48/link/unicode-data.scm
-lib/scheme48/link/write-image.scm
-lib/scheme48/misc/annotate.scm
-lib/scheme48/misc/doodl.scm
-lib/scheme48/misc/engine.scm
-lib/scheme48/misc/ilength.scm
-lib/scheme48/misc/integertostring.scm
-lib/scheme48/misc/load-static.scm
-lib/scheme48/misc/mail.scm
-lib/scheme48/misc/packages.scm
-lib/scheme48/misc/pipe.scm
-lib/scheme48/misc/psd-s48.scm
-lib/scheme48/misc/remote.scm
-lib/scheme48/misc/require.scm
-lib/scheme48/misc/separate.scm
-lib/scheme48/misc/shift-reset.scm
-lib/scheme48/misc/sicp-check.scm
-lib/scheme48/misc/sicp.scm
-lib/scheme48/misc/static.scm
-lib/scheme48/misc/test-doodl.scm
-lib/scheme48/misc/test-packages.scm
-lib/scheme48/opt/analyze.scm
-lib/scheme48/opt/inline.scm
-lib/scheme48/opt/sort.scm
-lib/scheme48/opt/tst.scm
-lib/scheme48/opt/usage.scm
-lib/scheme48/posix/check.scm
-lib/scheme48/posix/dir.scm
-lib/scheme48/posix/file-options.scm
-lib/scheme48/posix/func-regexp.scm
-lib/scheme48/posix/io.scm
-lib/scheme48/posix/packages.scm
-lib/scheme48/posix/proc-env.scm
-lib/scheme48/posix/proc.scm
-lib/scheme48/posix/regexp-check.scm
-lib/scheme48/posix/regexp.scm
-lib/scheme48/posix/signal.scm
-lib/scheme48/posix/test-packages.scm
-lib/scheme48/rts/defenum.scm
-lib/scheme48/rts/floatnum.scm
-lib/scheme48/rts/innum.scm
-lib/scheme48/rts/jar-defrecord.scm
-lib/scheme48/rts/ratnum.scm
-lib/scheme48/rts/recnum.scm
-lib/scheme48/rts/xnum.scm
-lib/scheme48/scheme48.image
-lib/scheme48/scheme48vm
-lib/scheme48/sort/delndups.scm
-lib/scheme48/sort/interfaces.scm
-lib/scheme48/sort/lmsort.scm
-lib/scheme48/sort/packages.scm
-lib/scheme48/sort/sort.scm
-lib/scheme48/sort/sortp.scm
-lib/scheme48/sort/test.scm
-lib/scheme48/sort/vbinsearch.scm
-lib/scheme48/sort/vector-util.scm
-lib/scheme48/sort/vhsort.scm
-lib/scheme48/sort/visort.scm
-lib/scheme48/sort/vmsort.scm
-lib/scheme48/srfi/packages.scm
-lib/scheme48/srfi/srfi-1.scm
-lib/scheme48/srfi/srfi-11.scm
-lib/scheme48/srfi/srfi-13.scm
-lib/scheme48/srfi/srfi-14-base-char-sets.scm
-lib/scheme48/srfi/srfi-14-char-sets.scm
-lib/scheme48/srfi/srfi-14-check.scm
-lib/scheme48/srfi/srfi-14.scm
-lib/scheme48/srfi/srfi-16.scm
-lib/scheme48/srfi/srfi-17.scm
-lib/scheme48/srfi/srfi-19-check.scm
-lib/scheme48/srfi/srfi-19.scm
-lib/scheme48/srfi/srfi-2.scm
-lib/scheme48/srfi/srfi-25.scm
-lib/scheme48/srfi/srfi-26.scm
-lib/scheme48/srfi/srfi-27.scm
-lib/scheme48/srfi/srfi-28.scm
-lib/scheme48/srfi/srfi-37.scm
-lib/scheme48/srfi/srfi-39.scm
-lib/scheme48/srfi/srfi-4.scm
-lib/scheme48/srfi/srfi-40.scm
-lib/scheme48/srfi/srfi-42.scm
-lib/scheme48/srfi/srfi-43.scm
-lib/scheme48/srfi/srfi-45.scm
-lib/scheme48/srfi/srfi-5.scm
-lib/scheme48/srfi/srfi-60.scm
-lib/scheme48/srfi/srfi-61.scm
-lib/scheme48/srfi/srfi-63.scm
-lib/scheme48/srfi/srfi-66.scm
-lib/scheme48/srfi/srfi-67.scm
-lib/scheme48/srfi/srfi-7.scm
-lib/scheme48/srfi/srfi-71.scm
-lib/scheme48/srfi/srfi-74.scm
-lib/scheme48/srfi/srfi-78.scm
-lib/scheme48/srfi/test-packages.scm
+lib/${PKGNAME}/posix.so
+lib/${PKGNAME}/scheme48.image
+lib/${PKGNAME}/scheme48vm
+lib/${PKGNAME}/srfi-27.so
 man/man1/scheme48.1
-share/doc/scheme48/COPYING
-share/doc/scheme48/hacking.txt
-share/doc/scheme48/html/manual-Z-G-D-1.gif
-share/doc/scheme48/html/manual-Z-H-1.html
-share/doc/scheme48/html/manual-Z-H-10.html
-share/doc/scheme48/html/manual-Z-H-11.html
-share/doc/scheme48/html/manual-Z-H-12.html
-share/doc/scheme48/html/manual-Z-H-13.html
-share/doc/scheme48/html/manual-Z-H-2.html
-share/doc/scheme48/html/manual-Z-H-3.html
-share/doc/scheme48/html/manual-Z-H-4.html
-share/doc/scheme48/html/manual-Z-H-5.html
-share/doc/scheme48/html/manual-Z-H-6.html
-share/doc/scheme48/html/manual-Z-H-7.html
-share/doc/scheme48/html/manual-Z-H-8.html
-share/doc/scheme48/html/manual-Z-H-9.html
-share/doc/scheme48/html/manual-Z-S.css
-share/doc/scheme48/html/manual.html
-share/doc/scheme48/html/unicode-Z-G-1.gif
-share/doc/scheme48/install.txt
-share/doc/scheme48/io.txt
-share/doc/scheme48/manual.ps
-share/doc/scheme48/meeting.ps
-share/doc/scheme48/news.txt
-share/doc/scheme48/no-leaf-env.txt
-share/doc/scheme48/todo.txt
-share/doc/scheme48/type.txt
-@dirrm share/doc/scheme48/html
-@dirrm share/doc/scheme48
-@dirrm lib/scheme48/srfi
-@dirrm lib/scheme48/sort
-@dirrm lib/scheme48/rts
-@dirrm lib/scheme48/posix
-@dirrm lib/scheme48/opt
-@dirrm lib/scheme48/misc
-@dirrm lib/scheme48/link
-@dirrm lib/scheme48/env
-@dirrm lib/scheme48/cml
-@dirrm lib/scheme48/big
-@dirrm lib/scheme48
+share/doc/${PKGNAME}/COPYING
+share/doc/${PKGNAME}/hacking.txt
+share/doc/${PKGNAME}/html/manual-Z-G-D-1.gif
+share/doc/${PKGNAME}/html/manual-Z-H-1.html
+share/doc/${PKGNAME}/html/manual-Z-H-10.html
+share/doc/${PKGNAME}/html/manual-Z-H-11.html
+share/doc/${PKGNAME}/html/manual-Z-H-2.html
+share/doc/${PKGNAME}/html/manual-Z-H-3.html
+share/doc/${PKGNAME}/html/manual-Z-H-4.html
+share/doc/${PKGNAME}/html/manual-Z-H-5.html
+share/doc/${PKGNAME}/html/manual-Z-H-6.html
+share/doc/${PKGNAME}/html/manual-Z-H-7.html
+share/doc/${PKGNAME}/html/manual-Z-H-8.html
+share/doc/${PKGNAME}/html/manual-Z-H-9.html
+share/doc/${PKGNAME}/html/manual-Z-S.css
+share/doc/${PKGNAME}/html/manual.html
+share/doc/${PKGNAME}/html/unicode-Z-G-1.gif
+share/doc/${PKGNAME}/install.txt
+share/doc/${PKGNAME}/io.txt
+share/doc/${PKGNAME}/manual.ps
+share/doc/${PKGNAME}/meeting.ps
+share/doc/${PKGNAME}/news.txt
+share/doc/${PKGNAME}/no-leaf-env.txt
+share/doc/${PKGNAME}/todo.txt
+share/doc/${PKGNAME}/type.txt
+share/${PKGNAME}/big/array.scm
+share/${PKGNAME}/big/big-util.scm
+share/${PKGNAME}/big/callback.scm
+share/${PKGNAME}/big/check.scm
+share/${PKGNAME}/big/compact-table.scm
+share/${PKGNAME}/big/compose-cont.scm
+share/${PKGNAME}/big/defrecord.scm
+share/${PKGNAME}/big/destructure.scm
+share/${PKGNAME}/big/dump.scm
+share/${PKGNAME}/big/dynamic-external.scm
+share/${PKGNAME}/big/either.scm
+share/${PKGNAME}/big/enum-set.scm
+share/${PKGNAME}/big/filename.scm
+share/${PKGNAME}/big/finite-type.scm
+share/${PKGNAME}/big/format.scm
+share/${PKGNAME}/big/general-table.scm
+share/${PKGNAME}/big/hilbert.scm
+share/${PKGNAME}/big/import-def.scm
+share/${PKGNAME}/big/inversion-list-check.scm
+share/${PKGNAME}/big/inversion-list.scm
+share/${PKGNAME}/big/iterate.scm
+share/${PKGNAME}/big/linked-queue.scm
+share/${PKGNAME}/big/lock.scm
+share/${PKGNAME}/big/lu-decomp.scm
+share/${PKGNAME}/big/mask.scm
+share/${PKGNAME}/big/more-port.scm
+share/${PKGNAME}/big/mvlet.scm
+share/${PKGNAME}/big/pipe.scm
+share/${PKGNAME}/big/placeholder.scm
+share/${PKGNAME}/big/pp.scm
+share/${PKGNAME}/big/queue.scm
+share/${PKGNAME}/big/random.scm
+share/${PKGNAME}/big/receive.scm
+share/${PKGNAME}/big/reinitializer.scm
+share/${PKGNAME}/big/search-tree.scm
+share/${PKGNAME}/big/shared-object.scm
+share/${PKGNAME}/big/socket-check.scm
+share/${PKGNAME}/big/socket.scm
+share/${PKGNAME}/big/strong.scm
+share/${PKGNAME}/big/test-suite.scm
+share/${PKGNAME}/big/text-codec-util.scm
+share/${PKGNAME}/big/unicode-normalization-info.scm
+share/${PKGNAME}/big/unicode-normalization.scm
+share/${PKGNAME}/big/value-pipe.scm
+share/${PKGNAME}/big/vararg.scm
+share/${PKGNAME}/cml/async-channel.scm
+share/${PKGNAME}/cml/channel.scm
+share/${PKGNAME}/cml/cml-check.scm
+share/${PKGNAME}/cml/interfaces.scm
+share/${PKGNAME}/cml/jar.scm
+share/${PKGNAME}/cml/packages.scm
+share/${PKGNAME}/cml/placeholder.scm
+share/${PKGNAME}/cml/rendezvous.scm
+share/${PKGNAME}/cml/test-packages.scm
+share/${PKGNAME}/cml/time.scm
+share/${PKGNAME}/cml/trans-id.scm
+share/${PKGNAME}/env/assem.scm
+share/${PKGNAME}/env/basic-command.scm
+share/${PKGNAME}/env/build.scm
+share/${PKGNAME}/env/command-level.scm
+share/${PKGNAME}/env/command.scm
+share/${PKGNAME}/env/condition.scm
+share/${PKGNAME}/env/debug.scm
+share/${PKGNAME}/env/debuginfo.scm
+share/${PKGNAME}/env/disasm.scm
+share/${PKGNAME}/env/disclosers.scm
+share/${PKGNAME}/env/dispcond.scm
+share/${PKGNAME}/env/flatload.scm
+share/${PKGNAME}/env/init-defpackage.scm
+share/${PKGNAME}/env/inspect.scm
+share/${PKGNAME}/env/io-condition.scm
+share/${PKGNAME}/env/jar-assem.scm
+share/${PKGNAME}/env/list-interface.scm
+share/${PKGNAME}/env/load-package.scm
+share/${PKGNAME}/env/menu.scm
+share/${PKGNAME}/env/pacman.scm
+share/${PKGNAME}/env/parse-bytecode.scm
+share/${PKGNAME}/env/pedit.scm
+share/${PKGNAME}/env/profile.scm
+share/${PKGNAME}/env/read-command.scm
+share/${PKGNAME}/env/shadow.scm
+share/${PKGNAME}/env/signal.scm
+share/${PKGNAME}/env/space.scm
+share/${PKGNAME}/env/start.scm
+share/${PKGNAME}/env/traverse.scm
+share/${PKGNAME}/env/unicode-category.scm
+share/${PKGNAME}/env/unicode-charmap.scm
+share/${PKGNAME}/env/unicode-info.scm
+share/${PKGNAME}/env/user.scm
+share/${PKGNAME}/env/version-info.scm
+share/${PKGNAME}/link/data.scm
+share/${PKGNAME}/link/generate-c-header.scm
+share/${PKGNAME}/link/generate-old-c-header.scm
+share/${PKGNAME}/link/link.scm
+share/${PKGNAME}/link/loadc.scm
+share/${PKGNAME}/link/reify.scm
+share/${PKGNAME}/link/transport.scm
+share/${PKGNAME}/link/unicode-data-packages.scm
+share/${PKGNAME}/link/unicode-data.scm
+share/${PKGNAME}/link/write-image.scm
+share/${PKGNAME}/misc/annotate.scm
+share/${PKGNAME}/misc/doodl.scm
+share/${PKGNAME}/misc/engine.scm
+share/${PKGNAME}/misc/ilength.scm
+share/${PKGNAME}/misc/integertostring.scm
+share/${PKGNAME}/misc/load-static.scm
+share/${PKGNAME}/misc/mail.scm
+share/${PKGNAME}/misc/packages.scm
+share/${PKGNAME}/misc/pipe.scm
+share/${PKGNAME}/misc/psd-s48.scm
+share/${PKGNAME}/misc/remote.scm
+share/${PKGNAME}/misc/require.scm
+share/${PKGNAME}/misc/separate.scm
+share/${PKGNAME}/misc/shift-reset.scm
+share/${PKGNAME}/misc/sicp-check.scm
+share/${PKGNAME}/misc/sicp.scm
+share/${PKGNAME}/misc/static.scm
+share/${PKGNAME}/misc/test-doodl.scm
+share/${PKGNAME}/misc/test-packages.scm
+share/${PKGNAME}/opt/analyze.scm
+share/${PKGNAME}/opt/inline.scm
+share/${PKGNAME}/opt/sort.scm
+share/${PKGNAME}/opt/tst.scm
+share/${PKGNAME}/opt/usage.scm
+share/${PKGNAME}/posix/check.scm
+share/${PKGNAME}/posix/dir.scm
+share/${PKGNAME}/posix/file-options.scm
+share/${PKGNAME}/posix/func-regexp.scm
+share/${PKGNAME}/posix/io.scm
+share/${PKGNAME}/posix/packages.scm
+share/${PKGNAME}/posix/proc-env.scm
+share/${PKGNAME}/posix/proc.scm
+share/${PKGNAME}/posix/regexp-check.scm
+share/${PKGNAME}/posix/regexp.scm
+share/${PKGNAME}/posix/signal.scm
+share/${PKGNAME}/posix/test-packages.scm
+share/${PKGNAME}/rts/defenum.scm
+share/${PKGNAME}/rts/floatnum.scm
+share/${PKGNAME}/rts/innum.scm
+share/${PKGNAME}/rts/jar-defrecord.scm
+share/${PKGNAME}/rts/ratnum.scm
+share/${PKGNAME}/rts/recnum.scm
+share/${PKGNAME}/rts/xnum.scm
+share/${PKGNAME}/sort/check.scm
+share/${PKGNAME}/sort/delndups.scm
+share/${PKGNAME}/sort/interfaces.scm
+share/${PKGNAME}/sort/lmsort.scm
+share/${PKGNAME}/sort/packages.scm
+share/${PKGNAME}/sort/sort.scm
+share/${PKGNAME}/sort/sortp.scm
+share/${PKGNAME}/sort/test-packages.scm
+share/${PKGNAME}/sort/test.scm
+share/${PKGNAME}/sort/vbinsearch.scm
+share/${PKGNAME}/sort/vector-util.scm
+share/${PKGNAME}/sort/vhsort.scm
+share/${PKGNAME}/sort/visort.scm
+share/${PKGNAME}/sort/vmsort.scm
+share/${PKGNAME}/srfi/packages.scm
+share/${PKGNAME}/srfi/srfi-1.scm
+share/${PKGNAME}/srfi/srfi-11.scm
+share/${PKGNAME}/srfi/srfi-13-check.scm
+share/${PKGNAME}/srfi/srfi-13.scm
+share/${PKGNAME}/srfi/srfi-14-base-char-sets.scm
+share/${PKGNAME}/srfi/srfi-14-char-sets.scm
+share/${PKGNAME}/srfi/srfi-14-check.scm
+share/${PKGNAME}/srfi/srfi-14.scm
+share/${PKGNAME}/srfi/srfi-16.scm
+share/${PKGNAME}/srfi/srfi-17.scm
+share/${PKGNAME}/srfi/srfi-19-check.scm
+share/${PKGNAME}/srfi/srfi-19.scm
+share/${PKGNAME}/srfi/srfi-2.scm
+share/${PKGNAME}/srfi/srfi-25.scm
+share/${PKGNAME}/srfi/srfi-26.scm
+share/${PKGNAME}/srfi/srfi-27.scm
+share/${PKGNAME}/srfi/srfi-28.scm
+share/${PKGNAME}/srfi/srfi-37.scm
+share/${PKGNAME}/srfi/srfi-39.scm
+share/${PKGNAME}/srfi/srfi-4.scm
+share/${PKGNAME}/srfi/srfi-40.scm
+share/${PKGNAME}/srfi/srfi-42.scm
+share/${PKGNAME}/srfi/srfi-43.scm
+share/${PKGNAME}/srfi/srfi-45.scm
+share/${PKGNAME}/srfi/srfi-5.scm
+share/${PKGNAME}/srfi/srfi-60.scm
+share/${PKGNAME}/srfi/srfi-61.scm
+share/${PKGNAME}/srfi/srfi-63.scm
+share/${PKGNAME}/srfi/srfi-66.scm
+share/${PKGNAME}/srfi/srfi-67.scm
+share/${PKGNAME}/srfi/srfi-7.scm
+share/${PKGNAME}/srfi/srfi-71.scm
+share/${PKGNAME}/srfi/srfi-74.scm
+share/${PKGNAME}/srfi/srfi-78.scm
+share/${PKGNAME}/srfi/test-packages.scm
+@dirrm share/${PKGNAME}/srfi
+@dirrm share/${PKGNAME}/sort
+@dirrm share/${PKGNAME}/rts
+@dirrm share/${PKGNAME}/posix
+@dirrm share/${PKGNAME}/opt
+@dirrm share/${PKGNAME}/misc
+@dirrm share/${PKGNAME}/link
+@dirrm share/${PKGNAME}/env
+@dirrm share/${PKGNAME}/cml
+@dirrm share/${PKGNAME}/big
+@dirrm share/${PKGNAME}
+@dirrm share/doc/${PKGNAME}/html
+@dirrm share/doc/${PKGNAME}
+@dirrm lib/${PKGNAME}
diff --git a/lang/scheme48/distinfo b/lang/scheme48/distinfo
index 5e4ca3fa899..0ce08a82160 100644
--- a/lang/scheme48/distinfo
+++ b/lang/scheme48/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2007/06/09 06:59:03 obache Exp $
+$NetBSD: distinfo,v 1.8 2008/05/02 09:22:21 degroote Exp $
 
-SHA1 (scheme48-1.6.tgz) = c88e2cf6cc893f1fd2fb571cc26fc7c5342a3ceb
-RMD160 (scheme48-1.6.tgz) = f5152a7a9bdd217bc5b9d69848f609550ffca46c
-Size (scheme48-1.6.tgz) = 2530302 bytes
+SHA1 (scheme48-1.8.tgz) = 75299fe9de4bf239fc1d5a7dfa2ec377e0e98df1
+RMD160 (scheme48-1.8.tgz) = 2685ea2c2ce9e5ff1408a1f588182e07f6d3822b
+Size (scheme48-1.8.tgz) = 3173151 bytes
+SHA1 (patch-aa) = 26bf0db2ea9158b5d075ebd20e38a2ab22cc5b2b
diff --git a/lang/scheme48/patches/patch-aa b/lang/scheme48/patches/patch-aa
new file mode 100644
index 00000000000..45d78da9616
--- /dev/null
+++ b/lang/scheme48/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.5 2008/05/02 09:22:21 degroote Exp $
+
+Fix DESTDIR installation.
+
+--- Makefile.in.orig	2008-01-26 18:06:27.000000000 +0300
++++ Makefile.in	2008-05-01 16:47:38.000000000 +0400
+@@ -416,8 +416,8 @@
+ 	    -e 's,@LD\@,$(LD),g'					\
+ 	    -e 's,@DYNAMIC_EXTERNALS_CFLAGS\@,$(DYNAMIC_EXTERNALS_CFLAGS),g' \
+ 	    -e 's,@DYNAMIC_EXTERNALS_LDFLAGS\@,$(DYNAMIC_EXTERNALS_LDFLAGS),g' \
+-	< $(srcdir)/build/$(CONFIG_SCRIPT).in > $$config_script &&	\
+-	chmod +x $$config_script
++	< $(srcdir)/build/$(CONFIG_SCRIPT).in > $(DESTDIR)$$config_script &&	\
++	chmod +x $(DESTDIR)$$config_script
+ 
+ inst-externals:
+ 	$(INSTALL_PROGRAM) $(POSIX_EXTERNAL) $(SRFI_27_EXTERNAL) $(DESTDIR)$(LIB)/