4 files changed, 58 insertions, 28 deletions

diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index 852357ea3a5c..c790523b1e9c 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -6,28 +6,23 @@
 #
 
 PORTNAME=	scheme48
-PORTVERSION=	1.3
+PORTVERSION=	1.5
 CATEGORIES=	lang scheme
-MASTER_SITES=	http://s48.org/${PORTVERSION}/
+MASTER_SITES=	http://www.s48.org/${PORTVERSION}/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemoliu@gmail.com
 COMMENT=	The Scheme Underground's implementation of R5RS
 
 CONFLICTS=	scsh-*
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-BROKEN=		"fails to install on ${ARCH}"
-.endif
+ONLY_FOR_ARCHS=	i386
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	enough
-STRIP=
 MAN1=		scheme48.1
 
 test:
 	cd ${WRKSRC}; ${MAKE} check
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/scheme48/distinfo b/lang/scheme48/distinfo
index 7d73bcd09f5b..249bd62e4017 100644
--- a/lang/scheme48/distinfo
+++ b/lang/scheme48/distinfo
@@ -1,3 +1,3 @@
-MD5 (scheme48-1.3.tgz) = c436e4c7ba0820e591458804eb8aec5a
-SHA256 (scheme48-1.3.tgz) = 50d2c540bced74c6015abca3978ba4f65e97d14c78eba1fa8488b3a5c064883b
-SIZE (scheme48-1.3.tgz) = 2322178
+MD5 (scheme48-1.5.tgz) = 09edf2ef1c2e40369efdf5bc74f9e85e
+SHA256 (scheme48-1.5.tgz) = 0f064dfccf5d79e5e1a72270835c042d88506b112574c13b346a9116bef9e7ad
+SIZE (scheme48-1.5.tgz) = 2541876
diff --git a/lang/scheme48/pkg-descr b/lang/scheme48/pkg-descr
index 0d1d7e31fa5f..815913b22aef 100644
--- a/lang/scheme48/pkg-descr
+++ b/lang/scheme48/pkg-descr
@@ -5,13 +5,16 @@ machine.  The name derives from our desire to have an implementation
 that is simple and lucid enough that it looks as if it were written in
 just 48 hours.  We don't claim to have reached that stage yet; much
 more simplification is necessary.
-
-Scheme 48 tries to be faithful to the upcoming Revised^5 Scheme
-Report, providing neither more nor less in the initial user
-environment.  (This is not to say that more isn't available in other
-environments.)  Support for numbers is weak: bignums are slow and
-floating point is almost nonexistent.  DEFINE-SYNTAX, LET-SYNTAX,
-LETREC-SYNTAX, and SYNTAX-RULES are supported, but not the rest of
-the Revised^4 Scheme macro proposal.
+Scheme 48 is an implementation of the Scheme programming language as described
+in the Revised5 Report on the Algorithmic Language Scheme [6]. It is based on
+a compiler and interpreter for a virtual Scheme machine. Scheme 48 tries to be
+faithful to the Revised5 Scheme Report, providing neither more nor less in the
+initial user environment. (This is not to say that more isn't available in
+other environments; see below.)
+Scheme 48 is under continual development. Please report bugs, especially in
+the VM, especially core dumps, to scheme-48-bugs@s48.org. Include the version
+number x.yy from the "Welcome to Scheme 48 x.yy" greeting message in your bug
+report. It is a goal of this project to produce a bullet-proof system; we want
+no bugs and, especially, no crashes.
 
 WWW: http://www.s48.org
diff --git a/lang/scheme48/pkg-plist b/lang/scheme48/pkg-plist
index 27594fe33405..46e48f47e979 100644
--- a/lang/scheme48/pkg-plist
+++ b/lang/scheme48/pkg-plist
@@ -1,15 +1,17 @@
-bin/scheme48
 bin/scheme-r5rs
 bin/scheme-srfi-7
+bin/scheme48
 include/scheme48.h
 include/scheme48write-barrier.h
 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
@@ -19,6 +21,8 @@ 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
@@ -32,12 +36,16 @@ 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/dynamic-external.scm
-lib/scheme48/big/shared-object.scm
+lib/scheme48/big/vararg.scm
 lib/scheme48/cml/async-channel.scm
 lib/scheme48/cml/channel.scm
 lib/scheme48/cml/interfaces.scm
@@ -52,6 +60,7 @@ 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
@@ -60,23 +69,26 @@ 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/env/condition.scm
-lib/scheme48/env/io-condition.scm
-lib/scheme48/env/signal.scm
 lib/scheme48/link/data.scm
 lib/scheme48/link/generate-c-header.scm
 lib/scheme48/link/generate-old-c-header.scm
@@ -84,6 +96,9 @@ 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-byte.scm
 lib/scheme48/link/write-image.scm
 lib/scheme48/misc/annotate.scm
 lib/scheme48/misc/doodl.scm
@@ -130,7 +145,6 @@ lib/scheme48/sort/delndups.scm
 lib/scheme48/sort/interfaces.scm
 lib/scheme48/sort/lmsort.scm
 lib/scheme48/sort/packages.scm
-lib/scheme48/sort/sort-support-macs.scm
 lib/scheme48/sort/sort.scm
 lib/scheme48/sort/sortp.scm
 lib/scheme48/sort/test.scm
@@ -143,9 +157,13 @@ 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
@@ -153,10 +171,24 @@ 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 share/nls/en_US.US-ASCII
+@dirrm share/nls/POSIX
 @dirrm lib/scheme48/srfi
 @dirrm lib/scheme48/sort
 @dirrm lib/scheme48/rts