4 files changed, 77 insertions, 52 deletions

diff --git a/lang/mit-scheme/Makefile b/lang/mit-scheme/Makefile
index fd4f298d008a..a8fac8ee1ab5 100644
--- a/lang/mit-scheme/Makefile
+++ b/lang/mit-scheme/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mit-scheme
-PORTVERSION=	7.5.11
+PORTVERSION=	7.5.12
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.swiss.ai.mit.edu/pub/scheme-7.5/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
@@ -20,16 +20,10 @@ USE_XLIB=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-SCHEME_DIR=	${PREFIX}/lib/mit-scheme
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/scheme ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/bchscheme ${PREFIX}/bin
-	${TAR} -C ${WRKSRC}/lib -cf - mit-scheme | \
-		${TAR} -C ${PREFIX}/lib --unlink -xf -
-	${LN} -sf ${SCHEME_DIR}/SRC/edwin ${SCHEME_DIR}/edwin/autoload
-	${LN} -sf ${SCHEME_DIR}/SRC/runtime ${SCHEME_DIR}/options
-	find ${SCHEME_DIR} | xargs ${CHOWN} ${SHAREOWN}:${SHAREGRP}
-	find ${SCHEME_DIR} -type f | xargs ${CHMOD} ${SHAREMODE}
+	cd ${WRKSRC}/lib && pax -rw mit-scheme ${PREFIX}/lib
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/mit-scheme
 
 .include <bsd.port.mk>
diff --git a/lang/mit-scheme/distinfo b/lang/mit-scheme/distinfo
index 8c9ac883a622..65ce4b858de9 100644
--- a/lang/mit-scheme/distinfo
+++ b/lang/mit-scheme/distinfo
@@ -1 +1 @@
-MD5 (scheme-7.5.11-ix86-freebsd.tar.gz) = 421b3a60446c4aad3ecce43f42a24637
+MD5 (scheme-7.5.12-ix86-freebsd.tar.gz) = 46874c0596ebf886bd6d6b93641575ed
diff --git a/lang/mit-scheme/pkg-descr b/lang/mit-scheme/pkg-descr
index 8dcec22cc345..66e12a16c570 100644
--- a/lang/mit-scheme/pkg-descr
+++ b/lang/mit-scheme/pkg-descr
@@ -1,5 +1,6 @@
-FreeBSD port of MIT Scheme
+MIT Scheme is a complete programming environment that runs on many
+unix platforms, as well as Microsoft Windows and IBM OS/2. It features
+a rich runtime library, a powerful source-level debugger, a
+native-code compiler, and an integrated Emacs-like editor.
 
 WWW: http://www.swiss.ai.mit.edu/projects/scheme/
-
-Maintainer: jmacd@uclink.berkeley.edu
diff --git a/lang/mit-scheme/pkg-plist b/lang/mit-scheme/pkg-plist
index 6b5c95e6fa8b..98f6a3407f3b 100644
--- a/lang/mit-scheme/pkg-plist
+++ b/lang/mit-scheme/pkg-plist
@@ -1,6 +1,5 @@
 bin/bchscheme
 bin/scheme
-
 lib/mit-scheme/SRC/edwin/abbrev.bci
 lib/mit-scheme/SRC/edwin/ansi.bci
 lib/mit-scheme/SRC/edwin/argred.bci
@@ -55,7 +54,6 @@ lib/mit-scheme/SRC/edwin/edtfrm.bci
 lib/mit-scheme/SRC/edwin/edtstr.bci
 lib/mit-scheme/SRC/edwin/evlcom.bci
 lib/mit-scheme/SRC/edwin/eystep.bci
-lib/mit-scheme/SRC/edwin/eystep.com
 lib/mit-scheme/SRC/edwin/filcom.bci
 lib/mit-scheme/SRC/edwin/fileio.bci
 lib/mit-scheme/SRC/edwin/fill.bci
@@ -82,9 +80,7 @@ lib/mit-scheme/SRC/edwin/macros.bci
 lib/mit-scheme/SRC/edwin/make.bci
 lib/mit-scheme/SRC/edwin/malias.bci
 lib/mit-scheme/SRC/edwin/manual.bci
-lib/mit-scheme/SRC/edwin/manual.com
 lib/mit-scheme/SRC/edwin/midas.bci
-lib/mit-scheme/SRC/edwin/midas.com
 lib/mit-scheme/SRC/edwin/modefs.bci
 lib/mit-scheme/SRC/edwin/modes.bci
 lib/mit-scheme/SRC/edwin/modlin.bci
@@ -93,7 +89,6 @@ lib/mit-scheme/SRC/edwin/motcom.bci
 lib/mit-scheme/SRC/edwin/motion.bci
 lib/mit-scheme/SRC/edwin/mousecom.bci
 lib/mit-scheme/SRC/edwin/nntp.bci
-lib/mit-scheme/SRC/edwin/nntp.com
 lib/mit-scheme/SRC/edwin/notify.bci
 lib/mit-scheme/SRC/edwin/nvector.bci
 lib/mit-scheme/SRC/edwin/occur.bci
@@ -102,16 +97,12 @@ lib/mit-scheme/SRC/edwin/os2com.bci
 lib/mit-scheme/SRC/edwin/os2term.bci
 lib/mit-scheme/SRC/edwin/outline.bci
 lib/mit-scheme/SRC/edwin/pasmod.bci
-lib/mit-scheme/SRC/edwin/pasmod.com
 lib/mit-scheme/SRC/edwin/paths.bci
 lib/mit-scheme/SRC/edwin/print.bci
-lib/mit-scheme/SRC/edwin/print.com
 lib/mit-scheme/SRC/edwin/process.bci
 lib/mit-scheme/SRC/edwin/prompt.bci
 lib/mit-scheme/SRC/edwin/pwedit.bci
-lib/mit-scheme/SRC/edwin/pwedit.com
 lib/mit-scheme/SRC/edwin/pwparse.bci
-lib/mit-scheme/SRC/edwin/pwparse.com
 lib/mit-scheme/SRC/edwin/rcsparse.bci
 lib/mit-scheme/SRC/edwin/reccom.bci
 lib/mit-scheme/SRC/edwin/regcom.bci
@@ -133,25 +124,20 @@ lib/mit-scheme/SRC/edwin/sercom.bci
 lib/mit-scheme/SRC/edwin/shell.bci
 lib/mit-scheme/SRC/edwin/simple.bci
 lib/mit-scheme/SRC/edwin/snr.bci
-lib/mit-scheme/SRC/edwin/snr.com
 lib/mit-scheme/SRC/edwin/sort.bci
-lib/mit-scheme/SRC/edwin/sort.com
 lib/mit-scheme/SRC/edwin/strpad.bci
 lib/mit-scheme/SRC/edwin/strtab.bci
 lib/mit-scheme/SRC/edwin/struct.bci
 lib/mit-scheme/SRC/edwin/syntax.bci
 lib/mit-scheme/SRC/edwin/tagutl.bci
 lib/mit-scheme/SRC/edwin/techinfo.bci
-lib/mit-scheme/SRC/edwin/techinfo.com
 lib/mit-scheme/SRC/edwin/telnet.bci
-lib/mit-scheme/SRC/edwin/telnet.com
 lib/mit-scheme/SRC/edwin/termcap.bci
 lib/mit-scheme/SRC/edwin/texcom.bci
 lib/mit-scheme/SRC/edwin/things.bci
 lib/mit-scheme/SRC/edwin/tparse.bci
 lib/mit-scheme/SRC/edwin/tterm.bci
 lib/mit-scheme/SRC/edwin/tximod.bci
-lib/mit-scheme/SRC/edwin/tximod.com
 lib/mit-scheme/SRC/edwin/txtprp.bci
 lib/mit-scheme/SRC/edwin/undo.bci
 lib/mit-scheme/SRC/edwin/unix.bci
@@ -159,11 +145,8 @@ lib/mit-scheme/SRC/edwin/utils.bci
 lib/mit-scheme/SRC/edwin/utlwin.bci
 lib/mit-scheme/SRC/edwin/vc.bci
 lib/mit-scheme/SRC/edwin/verilog.bci
-lib/mit-scheme/SRC/edwin/verilog.com
 lib/mit-scheme/SRC/edwin/vhdl.bci
-lib/mit-scheme/SRC/edwin/vhdl.com
 lib/mit-scheme/SRC/edwin/webster.bci
-lib/mit-scheme/SRC/edwin/webster.com
 lib/mit-scheme/SRC/edwin/win32.bci
 lib/mit-scheme/SRC/edwin/win32com.bci
 lib/mit-scheme/SRC/edwin/wincom.bci
@@ -174,8 +157,6 @@ lib/mit-scheme/SRC/edwin/xcom.bci
 lib/mit-scheme/SRC/edwin/xform.bci
 lib/mit-scheme/SRC/edwin/xmodef.bci
 lib/mit-scheme/SRC/edwin/xterm.bci
-@exec ln -sf %D/lib/mit-scheme/SRC/edwin %D/lib/mit-scheme/edwin/autoload
-@unexec rm -f %D/lib/mit-scheme/edwin/autoload
 lib/mit-scheme/SRC/runtime/advice.bci
 lib/mit-scheme/SRC/runtime/apply.bci
 lib/mit-scheme/SRC/runtime/apropos.bci
@@ -187,13 +168,11 @@ lib/mit-scheme/SRC/runtime/boot.bci
 lib/mit-scheme/SRC/runtime/char.bci
 lib/mit-scheme/SRC/runtime/chrset.bci
 lib/mit-scheme/SRC/runtime/chrsyn.bci
-lib/mit-scheme/SRC/runtime/chrsyn.com
 lib/mit-scheme/SRC/runtime/codwlk.bci
 lib/mit-scheme/SRC/runtime/conpar.bci
 lib/mit-scheme/SRC/runtime/contin.bci
 lib/mit-scheme/SRC/runtime/cpoint.bci
 lib/mit-scheme/SRC/runtime/cpress.bci
-lib/mit-scheme/SRC/runtime/cpress.com
 lib/mit-scheme/SRC/runtime/crypto.bci
 lib/mit-scheme/SRC/runtime/datime.bci
 lib/mit-scheme/SRC/runtime/dbgcmd.bci
@@ -213,7 +192,6 @@ lib/mit-scheme/SRC/runtime/events.bci
 lib/mit-scheme/SRC/runtime/fileio.bci
 lib/mit-scheme/SRC/runtime/fixart.bci
 lib/mit-scheme/SRC/runtime/format.bci
-lib/mit-scheme/SRC/runtime/format.com
 lib/mit-scheme/SRC/runtime/framex.bci
 lib/mit-scheme/SRC/runtime/gc.bci
 lib/mit-scheme/SRC/runtime/gcdemn.bci
@@ -222,7 +200,6 @@ lib/mit-scheme/SRC/runtime/gcnote.bci
 lib/mit-scheme/SRC/runtime/gcstat.bci
 lib/mit-scheme/SRC/runtime/gdatab.bci
 lib/mit-scheme/SRC/runtime/gdbm.bci
-lib/mit-scheme/SRC/runtime/gdbm.com
 lib/mit-scheme/SRC/runtime/gencache.bci
 lib/mit-scheme/SRC/runtime/geneqht.bci
 lib/mit-scheme/SRC/runtime/generic.bci
@@ -234,7 +211,6 @@ lib/mit-scheme/SRC/runtime/global.bci
 lib/mit-scheme/SRC/runtime/graphics.bci
 lib/mit-scheme/SRC/runtime/hash.bci
 lib/mit-scheme/SRC/runtime/hashtb.bci
-lib/mit-scheme/SRC/runtime/hashtb.com
 lib/mit-scheme/SRC/runtime/histry.bci
 lib/mit-scheme/SRC/runtime/illdef.bci
 lib/mit-scheme/SRC/runtime/infstr.bci
@@ -243,7 +219,6 @@ lib/mit-scheme/SRC/runtime/input.bci
 lib/mit-scheme/SRC/runtime/intrpt.bci
 lib/mit-scheme/SRC/runtime/io.bci
 lib/mit-scheme/SRC/runtime/krypt.bci
-lib/mit-scheme/SRC/runtime/krypt.com
 lib/mit-scheme/SRC/runtime/kryptdum.bci
 lib/mit-scheme/SRC/runtime/lambda.bci
 lib/mit-scheme/SRC/runtime/lambdx.bci
@@ -252,18 +227,14 @@ lib/mit-scheme/SRC/runtime/load.bci
 lib/mit-scheme/SRC/runtime/macros.bci
 lib/mit-scheme/SRC/runtime/make.bci
 lib/mit-scheme/SRC/runtime/mime-codec.bci
-lib/mit-scheme/SRC/runtime/mime-codec.com
 lib/mit-scheme/SRC/runtime/msort.bci
 lib/mit-scheme/SRC/runtime/ntdir.bci
 lib/mit-scheme/SRC/runtime/ntprm.bci
 lib/mit-scheme/SRC/runtime/numint.bci
-lib/mit-scheme/SRC/runtime/numint.com
 lib/mit-scheme/SRC/runtime/numpar.bci
 lib/mit-scheme/SRC/runtime/option.bci
 lib/mit-scheme/SRC/runtime/optiondb.bci
-lib/mit-scheme/SRC/runtime/optiondb.com
 lib/mit-scheme/SRC/runtime/ordvec.bci
-lib/mit-scheme/SRC/runtime/ordvec.com
 lib/mit-scheme/SRC/runtime/os2ctype.bci
 lib/mit-scheme/SRC/runtime/os2dir.bci
 lib/mit-scheme/SRC/runtime/os2graph.bci
@@ -279,28 +250,23 @@ lib/mit-scheme/SRC/runtime/port.bci
 lib/mit-scheme/SRC/runtime/pp.bci
 lib/mit-scheme/SRC/runtime/prgcop.bci
 lib/mit-scheme/SRC/runtime/process.bci
-lib/mit-scheme/SRC/runtime/process.com
 lib/mit-scheme/SRC/runtime/prop1d.bci
 lib/mit-scheme/SRC/runtime/prop2d.bci
 lib/mit-scheme/SRC/runtime/qsort.bci
 lib/mit-scheme/SRC/runtime/queue.bci
 lib/mit-scheme/SRC/runtime/random.bci
 lib/mit-scheme/SRC/runtime/rbtree.bci
-lib/mit-scheme/SRC/runtime/rbtree.com
 lib/mit-scheme/SRC/runtime/record.bci
 lib/mit-scheme/SRC/runtime/recslot.bci
 lib/mit-scheme/SRC/runtime/regexp.bci
-lib/mit-scheme/SRC/runtime/regexp.com
 lib/mit-scheme/SRC/runtime/rep.bci
 lib/mit-scheme/SRC/runtime/rgxcmp.bci
-lib/mit-scheme/SRC/runtime/rgxcmp.com
 lib/mit-scheme/SRC/runtime/savres.bci
 lib/mit-scheme/SRC/runtime/scan.bci
 lib/mit-scheme/SRC/runtime/scode.bci
 lib/mit-scheme/SRC/runtime/scomb.bci
 lib/mit-scheme/SRC/runtime/sdata.bci
 lib/mit-scheme/SRC/runtime/sfile.bci
-lib/mit-scheme/SRC/runtime/site.bci
 lib/mit-scheme/SRC/runtime/socket.bci
 lib/mit-scheme/SRC/runtime/starbase.bci
 lib/mit-scheme/SRC/runtime/stream.bci
@@ -310,7 +276,6 @@ lib/mit-scheme/SRC/runtime/strott.bci
 lib/mit-scheme/SRC/runtime/strout.bci
 lib/mit-scheme/SRC/runtime/symbol.bci
 lib/mit-scheme/SRC/runtime/syncproc.bci
-lib/mit-scheme/SRC/runtime/syncproc.com
 lib/mit-scheme/SRC/runtime/syntab.bci
 lib/mit-scheme/SRC/runtime/syntax.bci
 lib/mit-scheme/SRC/runtime/sysclk.bci
@@ -338,13 +303,9 @@ lib/mit-scheme/SRC/runtime/where.bci
 lib/mit-scheme/SRC/runtime/wind.bci
 lib/mit-scheme/SRC/runtime/wrkdir.bci
 lib/mit-scheme/SRC/runtime/wttree.bci
-lib/mit-scheme/SRC/runtime/wttree.com
 lib/mit-scheme/SRC/runtime/x11graph.bci
 lib/mit-scheme/SRC/runtime/xeval.bci
 lib/mit-scheme/SRC/runtime/ystep.bci
-lib/mit-scheme/SRC/runtime/ystep.com
-@exec ln -sf %D/lib/mit-scheme/SRC/runtime %D/lib/mit-scheme/options
-@unexec rm -f %D/lib/mit-scheme/options
 lib/mit-scheme/all.com
 lib/mit-scheme/compiler.com
 lib/mit-scheme/doc/COPYING
@@ -443,6 +404,38 @@ lib/mit-scheme/doc/user_fot.html
 lib/mit-scheme/doc/user_ovr.html
 lib/mit-scheme/doc/user_toc.html
 lib/mit-scheme/edwin.com
+lib/mit-scheme/edwin/autoload/eystep.bci
+lib/mit-scheme/edwin/autoload/eystep.com
+lib/mit-scheme/edwin/autoload/manual.bci
+lib/mit-scheme/edwin/autoload/manual.com
+lib/mit-scheme/edwin/autoload/midas.bci
+lib/mit-scheme/edwin/autoload/midas.com
+lib/mit-scheme/edwin/autoload/nntp.bci
+lib/mit-scheme/edwin/autoload/nntp.com
+lib/mit-scheme/edwin/autoload/pasmod.bci
+lib/mit-scheme/edwin/autoload/pasmod.com
+lib/mit-scheme/edwin/autoload/print.bci
+lib/mit-scheme/edwin/autoload/print.com
+lib/mit-scheme/edwin/autoload/pwedit.bci
+lib/mit-scheme/edwin/autoload/pwedit.com
+lib/mit-scheme/edwin/autoload/pwparse.bci
+lib/mit-scheme/edwin/autoload/pwparse.com
+lib/mit-scheme/edwin/autoload/snr.bci
+lib/mit-scheme/edwin/autoload/snr.com
+lib/mit-scheme/edwin/autoload/sort.bci
+lib/mit-scheme/edwin/autoload/sort.com
+lib/mit-scheme/edwin/autoload/techinfo.bci
+lib/mit-scheme/edwin/autoload/techinfo.com
+lib/mit-scheme/edwin/autoload/telnet.bci
+lib/mit-scheme/edwin/autoload/telnet.com
+lib/mit-scheme/edwin/autoload/tximod.bci
+lib/mit-scheme/edwin/autoload/tximod.com
+lib/mit-scheme/edwin/autoload/verilog.bci
+lib/mit-scheme/edwin/autoload/verilog.com
+lib/mit-scheme/edwin/autoload/vhdl.bci
+lib/mit-scheme/edwin/autoload/vhdl.com
+lib/mit-scheme/edwin/autoload/webster.bci
+lib/mit-scheme/edwin/autoload/webster.com
 lib/mit-scheme/edwin/etc/TUTORIAL
 lib/mit-scheme/edwin/etc/mime.types
 lib/mit-scheme/edwin/info/dir
@@ -490,6 +483,7 @@ lib/mit-scheme/edwin/info/user.info-3.gz
 lib/mit-scheme/edwin/info/user.info-4.gz
 lib/mit-scheme/edwin/info/user.info-5.gz
 lib/mit-scheme/edwin/info/user.info.gz
+lib/mit-scheme/gcdrone
 lib/mit-scheme/imail/imail-core.bci
 lib/mit-scheme/imail/imail-core.com
 lib/mit-scheme/imail/imail-file.bci
@@ -520,6 +514,40 @@ lib/mit-scheme/imail/rexp.com
 lib/mit-scheme/imail/url.bci
 lib/mit-scheme/imail/url.com
 lib/mit-scheme/optiondb.scm
+lib/mit-scheme/options/chrsyn.bci
+lib/mit-scheme/options/chrsyn.com
+lib/mit-scheme/options/cpress.bci
+lib/mit-scheme/options/cpress.com
+lib/mit-scheme/options/format.bci
+lib/mit-scheme/options/format.com
+lib/mit-scheme/options/gdbm.bci
+lib/mit-scheme/options/gdbm.com
+lib/mit-scheme/options/hashtb.bci
+lib/mit-scheme/options/hashtb.com
+lib/mit-scheme/options/krypt.bci
+lib/mit-scheme/options/krypt.com
+lib/mit-scheme/options/mime-codec.bci
+lib/mit-scheme/options/mime-codec.com
+lib/mit-scheme/options/numint.bci
+lib/mit-scheme/options/numint.com
+lib/mit-scheme/options/optiondb.bci
+lib/mit-scheme/options/optiondb.com
+lib/mit-scheme/options/ordvec.bci
+lib/mit-scheme/options/ordvec.com
+lib/mit-scheme/options/process.bci
+lib/mit-scheme/options/process.com
+lib/mit-scheme/options/rbtree.bci
+lib/mit-scheme/options/rbtree.com
+lib/mit-scheme/options/regexp.bci
+lib/mit-scheme/options/regexp.com
+lib/mit-scheme/options/rgxcmp.bci
+lib/mit-scheme/options/rgxcmp.com
+lib/mit-scheme/options/syncproc.bci
+lib/mit-scheme/options/syncproc.com
+lib/mit-scheme/options/wttree.bci
+lib/mit-scheme/options/wttree.com
+lib/mit-scheme/options/ystep.bci
+lib/mit-scheme/options/ystep.com
 lib/mit-scheme/runtime.com
 lib/mit-scheme/sos/class.bci
 lib/mit-scheme/sos/class.com
@@ -538,9 +566,11 @@ lib/mit-scheme/sos/sos.bco
 lib/mit-scheme/sos/sos.bld
 lib/mit-scheme/utabmd.bin
 @dirrm lib/mit-scheme/sos
+@dirrm lib/mit-scheme/options
 @dirrm lib/mit-scheme/imail
 @dirrm lib/mit-scheme/edwin/info
 @dirrm lib/mit-scheme/edwin/etc
+@dirrm lib/mit-scheme/edwin/autoload
 @dirrm lib/mit-scheme/edwin
 @dirrm lib/mit-scheme/doc
 @dirrm lib/mit-scheme/SRC/runtime