3 files changed, 220 insertions, 211 deletions

diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index 7540920a597f..7a7c84cb92e5 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scheme48
-PORTVERSION=	1.7
+PORTVERSION=	1.8
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://www.s48.org/${PORTVERSION}/
 EXTRACT_SUFX=	.tgz
@@ -14,9 +14,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	nemoliu@FreeBSD.org
 COMMENT=	The Scheme Underground's implementation of R5RS
 
-CONFLICTS=	scsh-*
+USE_GMAKE=	yes
 
-ONLY_FOR_ARCHS=	i386
+CONFLICTS=	scsh-*
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	enough
diff --git a/lang/scheme48/distinfo b/lang/scheme48/distinfo
index 46df159a6276..be2aa0383881 100644
--- a/lang/scheme48/distinfo
+++ b/lang/scheme48/distinfo
@@ -1,3 +1,3 @@
-MD5 (scheme48-1.7.tgz) = 62019de0f92ed2a353289d19a8e3c835
-SHA256 (scheme48-1.7.tgz) = fd1386a84277c3abc562a6c8e1181ea6309f45f3508a21b00e22a6582dc37045
-SIZE (scheme48-1.7.tgz) = 2637325
+MD5 (scheme48-1.8.tgz) = f1c0a515039d4df4e07721f21940ad6d
+SHA256 (scheme48-1.8.tgz) = 04a61ea28ef9d1f2f0e281fd6eb503f10afc94b0d3f34dbf376aedbe93eb1bb3
+SIZE (scheme48-1.8.tgz) = 3173151
diff --git a/lang/scheme48/pkg-plist b/lang/scheme48/pkg-plist
index 137aebbd44ca..fbe6478a45e3 100644
--- a/lang/scheme48/pkg-plist
+++ b/lang/scheme48/pkg-plist
@@ -1,210 +1,219 @@
 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
-include/scheme48write-barrier-twospace.h
-include/scheme48write-barrier-bibop.h
-lib/scheme48/big/check.scm
-lib/scheme48/big/test-suite.scm
-lib/scheme48/misc/sicp-check.scm
-lib/scheme48/misc/test-packages.scm
-lib/scheme48/posix/regexp-check.scm
-lib/scheme48/posix/test-packages.scm
-lib/scheme48/cml/cml-check.scm
-lib/scheme48/cml/test-packages.scm
-lib/scheme48/srfi/test-packages.scm
-lib/scheme48/big/array.scm
-lib/scheme48/big/big-util.scm
-lib/scheme48/big/callback.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/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.scm
-lib/scheme48/misc/static.scm
-lib/scheme48/misc/test-doodl.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.scm
-lib/scheme48/posix/signal.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
-@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
+lib/scheme48-1.8/posix.so
+lib/scheme48-1.8/scheme48.image
+lib/scheme48-1.8/scheme48vm
+lib/scheme48-1.8/srfi-27.so
+share/scheme48-1.8/big/array.scm
+share/scheme48-1.8/big/big-util.scm
+share/scheme48-1.8/big/callback.scm
+share/scheme48-1.8/big/check.scm
+share/scheme48-1.8/big/compact-table.scm
+share/scheme48-1.8/big/compose-cont.scm
+share/scheme48-1.8/big/defrecord.scm
+share/scheme48-1.8/big/destructure.scm
+share/scheme48-1.8/big/dump.scm
+share/scheme48-1.8/big/dynamic-external.scm
+share/scheme48-1.8/big/either.scm
+share/scheme48-1.8/big/enum-set.scm
+share/scheme48-1.8/big/filename.scm
+share/scheme48-1.8/big/finite-type.scm
+share/scheme48-1.8/big/format.scm
+share/scheme48-1.8/big/general-table.scm
+share/scheme48-1.8/big/hilbert.scm
+share/scheme48-1.8/big/import-def.scm
+share/scheme48-1.8/big/inversion-list-check.scm
+share/scheme48-1.8/big/inversion-list.scm
+share/scheme48-1.8/big/iterate.scm
+share/scheme48-1.8/big/linked-queue.scm
+share/scheme48-1.8/big/lock.scm
+share/scheme48-1.8/big/lu-decomp.scm
+share/scheme48-1.8/big/mask.scm
+share/scheme48-1.8/big/more-port.scm
+share/scheme48-1.8/big/mvlet.scm
+share/scheme48-1.8/big/pipe.scm
+share/scheme48-1.8/big/placeholder.scm
+share/scheme48-1.8/big/pp.scm
+share/scheme48-1.8/big/queue.scm
+share/scheme48-1.8/big/random.scm
+share/scheme48-1.8/big/receive.scm
+share/scheme48-1.8/big/reinitializer.scm
+share/scheme48-1.8/big/search-tree.scm
+share/scheme48-1.8/big/shared-object.scm
+share/scheme48-1.8/big/socket-check.scm
+share/scheme48-1.8/big/socket.scm
+share/scheme48-1.8/big/strong.scm
+share/scheme48-1.8/big/test-suite.scm
+share/scheme48-1.8/big/text-codec-util.scm
+share/scheme48-1.8/big/unicode-normalization-info.scm
+share/scheme48-1.8/big/unicode-normalization.scm
+share/scheme48-1.8/big/value-pipe.scm
+share/scheme48-1.8/big/vararg.scm
+share/scheme48-1.8/cml/async-channel.scm
+share/scheme48-1.8/cml/channel.scm
+share/scheme48-1.8/cml/cml-check.scm
+share/scheme48-1.8/cml/interfaces.scm
+share/scheme48-1.8/cml/jar.scm
+share/scheme48-1.8/cml/packages.scm
+share/scheme48-1.8/cml/placeholder.scm
+share/scheme48-1.8/cml/rendezvous.scm
+share/scheme48-1.8/cml/test-packages.scm
+share/scheme48-1.8/cml/time.scm
+share/scheme48-1.8/cml/trans-id.scm
+share/scheme48-1.8/env/assem.scm
+share/scheme48-1.8/env/basic-command.scm
+share/scheme48-1.8/env/build.scm
+share/scheme48-1.8/env/command-level.scm
+share/scheme48-1.8/env/command.scm
+share/scheme48-1.8/env/condition.scm
+share/scheme48-1.8/env/debug.scm
+share/scheme48-1.8/env/debuginfo.scm
+share/scheme48-1.8/env/disasm.scm
+share/scheme48-1.8/env/disclosers.scm
+share/scheme48-1.8/env/dispcond.scm
+share/scheme48-1.8/env/flatload.scm
+share/scheme48-1.8/env/init-defpackage.scm
+share/scheme48-1.8/env/inspect.scm
+share/scheme48-1.8/env/io-condition.scm
+share/scheme48-1.8/env/jar-assem.scm
+share/scheme48-1.8/env/list-interface.scm
+share/scheme48-1.8/env/load-package.scm
+share/scheme48-1.8/env/menu.scm
+share/scheme48-1.8/env/pacman.scm
+share/scheme48-1.8/env/parse-bytecode.scm
+share/scheme48-1.8/env/pedit.scm
+share/scheme48-1.8/env/profile.scm
+share/scheme48-1.8/env/read-command.scm
+share/scheme48-1.8/env/shadow.scm
+share/scheme48-1.8/env/signal.scm
+share/scheme48-1.8/env/space.scm
+share/scheme48-1.8/env/start.scm
+share/scheme48-1.8/env/traverse.scm
+share/scheme48-1.8/env/unicode-category.scm
+share/scheme48-1.8/env/unicode-charmap.scm
+share/scheme48-1.8/env/unicode-info.scm
+share/scheme48-1.8/env/user.scm
+share/scheme48-1.8/env/version-info.scm
+share/scheme48-1.8/link/data.scm
+share/scheme48-1.8/link/generate-c-header.scm
+share/scheme48-1.8/link/generate-old-c-header.scm
+share/scheme48-1.8/link/link.scm
+share/scheme48-1.8/link/loadc.scm
+share/scheme48-1.8/link/reify.scm
+share/scheme48-1.8/link/transport.scm
+share/scheme48-1.8/link/unicode-data-packages.scm
+share/scheme48-1.8/link/unicode-data.scm
+share/scheme48-1.8/link/write-image.scm
+share/scheme48-1.8/misc/annotate.scm
+share/scheme48-1.8/misc/doodl.scm
+share/scheme48-1.8/misc/engine.scm
+share/scheme48-1.8/misc/ilength.scm
+share/scheme48-1.8/misc/integertostring.scm
+share/scheme48-1.8/misc/load-static.scm
+share/scheme48-1.8/misc/mail.scm
+share/scheme48-1.8/misc/packages.scm
+share/scheme48-1.8/misc/pipe.scm
+share/scheme48-1.8/misc/psd-s48.scm
+share/scheme48-1.8/misc/remote.scm
+share/scheme48-1.8/misc/require.scm
+share/scheme48-1.8/misc/separate.scm
+share/scheme48-1.8/misc/shift-reset.scm
+share/scheme48-1.8/misc/sicp-check.scm
+share/scheme48-1.8/misc/sicp.scm
+share/scheme48-1.8/misc/static.scm
+share/scheme48-1.8/misc/test-doodl.scm
+share/scheme48-1.8/misc/test-packages.scm
+share/scheme48-1.8/opt/analyze.scm
+share/scheme48-1.8/opt/inline.scm
+share/scheme48-1.8/opt/sort.scm
+share/scheme48-1.8/opt/tst.scm
+share/scheme48-1.8/opt/usage.scm
+share/scheme48-1.8/posix/check.scm
+share/scheme48-1.8/posix/dir.scm
+share/scheme48-1.8/posix/file-options.scm
+share/scheme48-1.8/posix/func-regexp.scm
+share/scheme48-1.8/posix/io.scm
+share/scheme48-1.8/posix/packages.scm
+share/scheme48-1.8/posix/proc-env.scm
+share/scheme48-1.8/posix/proc.scm
+share/scheme48-1.8/posix/regexp-check.scm
+share/scheme48-1.8/posix/regexp.scm
+share/scheme48-1.8/posix/signal.scm
+share/scheme48-1.8/posix/test-packages.scm
+share/scheme48-1.8/rts/defenum.scm
+share/scheme48-1.8/rts/floatnum.scm
+share/scheme48-1.8/rts/innum.scm
+share/scheme48-1.8/rts/jar-defrecord.scm
+share/scheme48-1.8/rts/ratnum.scm
+share/scheme48-1.8/rts/recnum.scm
+share/scheme48-1.8/rts/xnum.scm
+share/scheme48-1.8/sort/check.scm
+share/scheme48-1.8/sort/delndups.scm
+share/scheme48-1.8/sort/interfaces.scm
+share/scheme48-1.8/sort/lmsort.scm
+share/scheme48-1.8/sort/packages.scm
+share/scheme48-1.8/sort/sort.scm
+share/scheme48-1.8/sort/sortp.scm
+share/scheme48-1.8/sort/test-packages.scm
+share/scheme48-1.8/sort/test.scm
+share/scheme48-1.8/sort/vbinsearch.scm
+share/scheme48-1.8/sort/vector-util.scm
+share/scheme48-1.8/sort/vhsort.scm
+share/scheme48-1.8/sort/visort.scm
+share/scheme48-1.8/sort/vmsort.scm
+share/scheme48-1.8/srfi/packages.scm
+share/scheme48-1.8/srfi/srfi-1.scm
+share/scheme48-1.8/srfi/srfi-11.scm
+share/scheme48-1.8/srfi/srfi-13-check.scm
+share/scheme48-1.8/srfi/srfi-13.scm
+share/scheme48-1.8/srfi/srfi-14-base-char-sets.scm
+share/scheme48-1.8/srfi/srfi-14-char-sets.scm
+share/scheme48-1.8/srfi/srfi-14-check.scm
+share/scheme48-1.8/srfi/srfi-14.scm
+share/scheme48-1.8/srfi/srfi-16.scm
+share/scheme48-1.8/srfi/srfi-17.scm
+share/scheme48-1.8/srfi/srfi-19-check.scm
+share/scheme48-1.8/srfi/srfi-19.scm
+share/scheme48-1.8/srfi/srfi-2.scm
+share/scheme48-1.8/srfi/srfi-25.scm
+share/scheme48-1.8/srfi/srfi-26.scm
+share/scheme48-1.8/srfi/srfi-27.scm
+share/scheme48-1.8/srfi/srfi-28.scm
+share/scheme48-1.8/srfi/srfi-37.scm
+share/scheme48-1.8/srfi/srfi-39.scm
+share/scheme48-1.8/srfi/srfi-4.scm
+share/scheme48-1.8/srfi/srfi-40.scm
+share/scheme48-1.8/srfi/srfi-42.scm
+share/scheme48-1.8/srfi/srfi-43.scm
+share/scheme48-1.8/srfi/srfi-45.scm
+share/scheme48-1.8/srfi/srfi-5.scm
+share/scheme48-1.8/srfi/srfi-60.scm
+share/scheme48-1.8/srfi/srfi-61.scm
+share/scheme48-1.8/srfi/srfi-63.scm
+share/scheme48-1.8/srfi/srfi-66.scm
+share/scheme48-1.8/srfi/srfi-67.scm
+share/scheme48-1.8/srfi/srfi-7.scm
+share/scheme48-1.8/srfi/srfi-71.scm
+share/scheme48-1.8/srfi/srfi-74.scm
+share/scheme48-1.8/srfi/srfi-78.scm
+share/scheme48-1.8/srfi/test-packages.scm
+@dirrm share/scheme48-1.8/srfi
+@dirrm share/scheme48-1.8/sort
+@dirrm share/scheme48-1.8/rts
+@dirrm share/scheme48-1.8/posix
+@dirrm share/scheme48-1.8/opt
+@dirrm share/scheme48-1.8/misc
+@dirrm share/scheme48-1.8/link
+@dirrm share/scheme48-1.8/env
+@dirrm share/scheme48-1.8/cml
+@dirrm share/scheme48-1.8/big
+@dirrm share/scheme48-1.8
+@dirrm lib/scheme48-1.8