Index: head/lang/scm/Makefile
===================================================================
--- head/lang/scm/Makefile	(revision 394796)
+++ head/lang/scm/Makefile	(revision 394797)
@@ -1,93 +1,94 @@
 # Created by: hsu
 # $FreeBSD$
 
 PORTNAME=	scm
 PORTVERSION=	5f2
+PORTREVISION=	1
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. OLD
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} slib-3b5.zip slib-psd1-3.tar.gz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Scheme interpreter
 
 LICENSE=	LGPL21
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		readline zip
 USE_GCC=	any
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	--prefix=${PREFIX}
 MAKE_JOBS_UNSAFE=	yes
 
 CFLAGS+=	-Wall -Wwrite-strings -Wmissing-declarations -Wredundant-decls -Wcast-qual
 CFLAGS+=	-Wno-unused-label -Wno-uninitialized
 
 SUB_FILES=	require.scm
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 PKGDEINSTALL=	${PKGINSTALL}
 
 INFO=		scm
 
 OPTIONS_DEFINE=		X11
 OPTIONS_SUB=		yes
 
 X11_USE=		xorg=ice,sm,x11,xext
 
 SCM_DATA=	COPYING COPYING.LESSER Iedline.scm Idiffer.scm \
 		Init${PORTVERSION}.scm Link.scm Macexp.scm Macro.scm \
 		Transcen.scm Tscript.scm build build.scm compile.scm \
 		hobbit.scm mkimpcat.scm patchlvl.h \
 		r4rstest.scm rwb-isam.scm scmhob.h scmhob.scm wbtab.scm
 SCM_DATA_X11=	keysymdef.scm x11.scm xatoms.scm xevent.scm
 SCM_MODULES=	byte.so bytenumb.so crs.so differ.so edline.so gsubr.so \
 		ioext.so posix.so ramap.so record.so rgx.so sc2.so \
 		socket.so unix.so
 SCM_MODULES_X11=x.so
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
 SCM_MODULES+=	${SCM_MODULES_X11}
 SCM_DATA+=	${SCM_DATA_X11}
 .endif
 
 .if ${ARCH} == "ia64"
 EXTRA_PATCHES+=	${FILESDIR}/ia64-patch
 ARCHOBJS=	continue-ia64.S
 .endif
 
 post-extract:
 	# Certain .scm files are needed during build:
 	@${TAR} -C ${WRKDIR} -zxf ${DISTDIR}/${DISTFILES:Mslib*.zip} '*.scm'
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include| ; \
 		 /strip/s|^|#|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
 		 s|%%CFLAGS%%|${CFLAGS}|g ; \
 		 s|%%ARCHOBJS%%|${ARCHOBJS}|g ; \
 		 s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build.scm
 	@${REINPLACE_CMD} -e 's|__osf__|__FreeBSD__|' ${WRKSRC}/gmalloc.c
 	@${REINPLACE_CMD} -e 's|gnuregex\.h|gnu/regex.h|g' ${WRKSRC}/rgx.c
 	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|g' \
 		${WRKSRC}/xgen.scm
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/scm ${WRKSRC}/scmlit \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/scm.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/scm
 	${INSTALL_DATA} ${WRKDIR}/require.scm ${SCM_DATA:S|^|${WRKSRC}/|} \
 		${STAGEDIR}${PREFIX}/lib/scm
 	${INSTALL_LIB} ${SCM_MODULES:S|^|${WRKSRC}/|} \
 		${STAGEDIR}${PREFIX}/lib/scm
 	${TAR} -C ${STAGEDIR}${PREFIX}/lib/scm -xf ${DISTDIR}/${DISTFILES:Mslib*.tar.gz} '*.scm'
 	${INSTALL_DATA} ${WRKDIR}/slib/*.scm ${STAGEDIR}${PREFIX}/lib/scm/slib/
 	${INSTALL_DATA} ${WRKDIR}/scm/scm.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 .include <bsd.port.mk>
Index: head/lang/scm/files/patch-build.scm
===================================================================
--- head/lang/scm/files/patch-build.scm	(revision 394796)
+++ head/lang/scm/files/patch-build.scm	(revision 394797)
@@ -1,79 +1,72 @@
 --- build.scm	2009-08-04 03:35:57.000000000 +0900
 +++ build.scm	2015-01-23 16:23:32.000000000 -0500
-@@ -618,5 +618,5 @@
- 
-      (nostart gcc "" "-e __start -nostartfiles" #f ("ecrt0.c") ())
--     (dump gcc "" "" #f ("unexelf.c" "gmalloc.c") ())
-+     (dump gcc "" "" #f ("unexelf.c") ())
- 
-      (m hp-ux "" "-lm" #f () ())
 @@ -665,14 +665,15 @@
       (dump darwin "" "" #f ("unexmacosx.c" "lastfile.c") ())
       (dlll darwin "-DSUN_DL" "-ldl" "" () ())
  
 -     (c freebsd "" "-export-dynamic" #f () ())
 +     (c freebsd "" "-Wl,-export-dynamic %%ARCHOBJS%%" #f () ())
       (m freebsd "" "-lm" #f () ())
 -     (curses freebsd "" "-lncurses" "/usr/lib/libncurses.a" () ())
 +     (curses freebsd "" "-lcurses" "/usr/lib/libcurses.a" () ())
       (regex freebsd "-I/usr/include/gnu" "-lgnuregex" "" () ())
       (editline freebsd "" "-lreadline" "" () ())
 -     (dlll freebsd "-DSUN_DL" "-export-dynamic" "" () ())
 -     (nostart freebsd "" "-e start -dc -dp -Bstatic -lgnumalloc" #f ("pre-crt0.c") ())
 -     (dump freebsd "" "/usr/lib/crt0.o" "" ("unexsunos4.c") ())
 +     (graphics freebsd "-I%%LOCALBASE%%/include -DX11" "-lX11" "-L%%LOCALBASE%%/lib" () ())
 +     (dlll freebsd "-DSUN_DL" "" "" () ())
 +     (nostart freebsd "" "" #f () ())
 +     (dump freebsd "" "" #f ("unexelf.c") ())
       (curses netbsd "-I/usr/pkg/include" "-lncurses" "-Wl,-rpath -Wl,/usr/pkg/lib -L/usr/pkg/lib" () ())
       (editline netbsd "-I/usr/pkg/include" "-lreadline" "-Wl,-rpath -Wl,/usr/pkg/lib -L/usr/pkg/lib" () ())
       (graphics netbsd "-I/usr/X11R6/include -DX11" "-lX11" "-Wl,-rpath -Wl,/usr/X11R6/lib -L/usr/X11R6/lib" () ())
 @@ -1630,7 +1631,7 @@
  	  parms
  ;;; gcc 3.4.2 for FreeBSD does not allow options other than default i.e. -O0 if NO -DGCC_SPARC_BUG - dai 2004-10-30
  	  ;;"cc" "-O3 -pipe -DGCC_SPARC_BUG " "-c"
 -	  "cc" "-O3 -pipe " "-c"
 +	  "%%CC%%" "%%CFLAGS%%" "-c"
  	  (include-spec "-I" parms)
  	  (c-includes parms)
  	  (c-flags parms)
 @@ -1641,7 +1642,7 @@
      (batch:rename-file parms
  		       oname (string-append oname "~"))
      (and (batch:try-command parms
 -			    "cc" "-o" oname
 +			    "%%CC%%" "-o" oname
  			    (must-be-first
  			     '("-nostartfiles"
  			       "pre-crt0.o" "crt0.o"
 @@ -1651,17 +1652,18 @@
  (defcommand compile-dll-c-files freebsd
    (lambda (files parms)
      (and (batch:try-chopped-command
 -	  parms "cc" "-O3 -pipe " "-fPIC" "-c"
 +	  parms "%%CC%%" "%%CFLAGS%%" "-fPIC" "-c"
  	  (include-spec "-I" parms)
  	  (c-includes parms)
  	  (c-flags parms)
  	  files)
  	 (let ((fnames (truncate-up-to (map c-> files) #\/)))
  	   (and (batch:try-command
 -		 parms "cc" "-shared"
 +		 parms "%%CC%%" "-shared"
  		 (cond
  		  ((equal? (car fnames) "edline") "-lreadline")
 -		  ((equal? (car fnames) "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4")
 +		  ((equal? (car fnames) "rgx") "-lgnuregex")
 +		  ((equal? (car fnames) "x") "-L%%LOCALBASE%%/lib -lSM -lICE -lXext -lX11")
  		  (else ""))
  		 "-o" (string-append (car fnames) ".so")
  		 (map (lambda (fname) (string-append fname ".o")) fnames))
 @@ -1674,7 +1676,7 @@
    (lambda (oname objects libs parms)
      (and (batch:try-command
  	  parms
 -	  "cc" "-shared" "-o"
 +	  "%%CC%%" "-shared" "-o"
  	  (string-append
  	   (car (parameter-list-ref parms 'implvic))
  	   oname ".so")
Index: head/lang/scm/pkg-plist
===================================================================
--- head/lang/scm/pkg-plist	(revision 394796)
+++ head/lang/scm/pkg-plist	(revision 394797)
@@ -1,211 +1,212 @@
 bin/scm
 bin/scmlit
 lib/scm/COPYING
 lib/scm/COPYING.LESSER
 lib/scm/Idiffer.scm
 lib/scm/Iedline.scm
 lib/scm/Init%%VERSION%%.scm
 lib/scm/Link.scm
 lib/scm/Macexp.scm
 lib/scm/Macro.scm
 lib/scm/Transcen.scm
 lib/scm/Tscript.scm
 lib/scm/build
 lib/scm/build.scm
 lib/scm/byte.so
 lib/scm/bytenumb.so
 lib/scm/compile.scm
 lib/scm/crs.so
 lib/scm/differ.so
 lib/scm/edline.so
 lib/scm/gsubr.so
 lib/scm/hobbit.scm
 @comment lib/scm/implcat
 lib/scm/ioext.so
 %%X11%%lib/scm/keysymdef.scm
 lib/scm/mkimpcat.scm
 lib/scm/patchlvl.h
 lib/scm/posix.so
 lib/scm/r4rstest.scm
 lib/scm/ramap.so
 lib/scm/record.so
 lib/scm/require.scm
+lib/scm/slib/rmdsff.scm
 lib/scm/rgx.so
 lib/scm/rwb-isam.scm
 lib/scm/sc2.so
 lib/scm/scmhob.h
 lib/scm/scmhob.scm
 lib/scm/slib/Bev2slib.scm
 lib/scm/slib/Template.scm
 lib/scm/slib/alist.scm
 lib/scm/slib/alistab.scm
 lib/scm/slib/array.scm
 lib/scm/slib/arraymap.scm
 lib/scm/slib/batch.scm
 lib/scm/slib/break.scm
 lib/scm/slib/byte.scm
 lib/scm/slib/bytenumb.scm
 lib/scm/slib/chap.scm
 lib/scm/slib/charplot.scm
 lib/scm/slib/clrnamdb.scm
 lib/scm/slib/cltime.scm
 lib/scm/slib/coerce.scm
 lib/scm/slib/collect.scm
 lib/scm/slib/collectx.scm
 lib/scm/slib/color.scm
 lib/scm/slib/colornam.scm
 lib/scm/slib/colorspc.scm
 lib/scm/slib/comlist.scm
 lib/scm/slib/comparse.scm
 lib/scm/slib/crc.scm
 lib/scm/slib/cring.scm
 lib/scm/slib/cvs.scm
 lib/scm/slib/daylight.scm
 lib/scm/slib/db2html.scm
 lib/scm/slib/dbcom.scm
 lib/scm/slib/dbinterp.scm
 lib/scm/slib/dbrowse.scm
 lib/scm/slib/dbsyn.scm
 lib/scm/slib/dbutil.scm
 lib/scm/slib/debug.scm
 lib/scm/slib/defmacex.scm
 lib/scm/slib/determ.scm
 lib/scm/slib/dft.scm
 lib/scm/slib/differ.scm
 lib/scm/slib/dirs.scm
 lib/scm/slib/dwindtst.scm
 lib/scm/slib/dynamic.scm
 lib/scm/slib/dynwind.scm
 lib/scm/slib/eval.scm
 lib/scm/slib/factor.scm
 lib/scm/slib/fluid-let.scm
 lib/scm/slib/fluidlet.scm
 lib/scm/slib/format.scm
 lib/scm/slib/formatst.scm
 lib/scm/slib/genwrite.scm
 lib/scm/slib/getopt.scm
 lib/scm/slib/getparam.scm
 lib/scm/slib/glob.scm
 lib/scm/slib/grapheps.scm
 lib/scm/slib/hash.scm
 lib/scm/slib/hashtab.scm
 lib/scm/slib/html4each.scm
 lib/scm/slib/htmlform.scm
 lib/scm/slib/http-cgi.scm
 lib/scm/slib/limit.scm
 lib/scm/slib/lineio.scm
 lib/scm/slib/linterp.scm
 lib/scm/slib/logical.scm
 lib/scm/slib/macrotst.scm
 lib/scm/slib/macwork.scm
 lib/scm/slib/manifest.scm
 lib/scm/slib/matfile.scm
 lib/scm/slib/math-integer.scm
 lib/scm/slib/math-real.scm
 lib/scm/slib/mbe.scm
 lib/scm/slib/minimize.scm
 lib/scm/slib/mkclrnam.scm
 lib/scm/slib/mklibcat.scm
 lib/scm/slib/mkpltcat.scm
 lib/scm/slib/modular.scm
 lib/scm/slib/mulapply.scm
 lib/scm/slib/mularg.scm
 lib/scm/slib/mwdenote.scm
 lib/scm/slib/mwexpand.scm
 lib/scm/slib/mwsynrul.scm
 lib/scm/slib/ncbi-dna.scm
 lib/scm/slib/null.scm
 lib/scm/slib/obj2str.scm
 lib/scm/slib/object.scm
 lib/scm/slib/paramlst.scm
 lib/scm/slib/peanosfc.scm
 lib/scm/slib/phil-spc.scm
 lib/scm/slib/pnm.scm
 lib/scm/slib/pp.scm
 lib/scm/slib/ppfile.scm
 lib/scm/slib/prec.scm
 lib/scm/slib/printf.scm
 lib/scm/slib/priorque.scm
 lib/scm/slib/process.scm
 lib/scm/slib/promise.scm
 lib/scm/slib/psd/instrum.scm
 lib/scm/slib/psd/pexpr.scm
 lib/scm/slib/psd/primitives.scm
 lib/scm/slib/psd/psd-slib.scm
 lib/scm/slib/psd/read.scm
 lib/scm/slib/psd/runtime.scm
 lib/scm/slib/psd/version.scm
 lib/scm/slib/psxtime.scm
 lib/scm/slib/qp.scm
 lib/scm/slib/queue.scm
 lib/scm/slib/r4rsyn.scm
 lib/scm/slib/randinex.scm
 lib/scm/slib/random.scm
 lib/scm/slib/ratize.scm
 lib/scm/slib/rdms.scm
 lib/scm/slib/recobj.scm
 lib/scm/slib/record.scm
 lib/scm/slib/repl.scm
 lib/scm/slib/require.scm
 lib/scm/slib/root.scm
 lib/scm/slib/sc2.scm
 lib/scm/slib/sc4opt.scm
 lib/scm/slib/sc4sc3.scm
 lib/scm/slib/scaexpp.scm
 lib/scm/slib/scaglob.scm
 lib/scm/slib/scainit.scm
 lib/scm/slib/scamacr.scm
 lib/scm/slib/scanf.scm
 lib/scm/slib/scaoutp.scm
 lib/scm/slib/schmooz.scm
 lib/scm/slib/scmacro.scm
 lib/scm/slib/selfset.scm
 lib/scm/slib/sierpinski.scm
 lib/scm/slib/simetrix.scm
 lib/scm/slib/solid.scm
 lib/scm/slib/sort.scm
 lib/scm/slib/soundex.scm
 lib/scm/slib/srfi-1.scm
 lib/scm/slib/srfi-11.scm
 lib/scm/slib/srfi-2.scm
 lib/scm/slib/srfi-23.scm
 lib/scm/slib/srfi-39.scm
 lib/scm/slib/srfi-61.scm
 lib/scm/slib/srfi-8.scm
 lib/scm/slib/srfi-9.scm
 lib/scm/slib/srfi.scm
 lib/scm/slib/stdio.scm
 lib/scm/slib/strcase.scm
 lib/scm/slib/strport.scm
 lib/scm/slib/strsrch.scm
 lib/scm/slib/structure.scm
 lib/scm/slib/subarray.scm
 lib/scm/slib/synchk.scm
 lib/scm/slib/synclo.scm
 lib/scm/slib/synrul.scm
 lib/scm/slib/timecore.scm
 lib/scm/slib/timezone.scm
 lib/scm/slib/top-refs.scm
 lib/scm/slib/trace.scm
 lib/scm/slib/transact.scm
 lib/scm/slib/tree.scm
 lib/scm/slib/trnscrpt.scm
 lib/scm/slib/tsort.scm
 lib/scm/slib/tzfile.scm
 lib/scm/slib/uri.scm
 lib/scm/slib/values.scm
 lib/scm/slib/vet.scm
 lib/scm/slib/withfile.scm
 lib/scm/slib/wttree-test.scm
 lib/scm/slib/wttree.scm
 lib/scm/slib/xml-parse.scm
 lib/scm/slib/yasyn.scm
 @comment lib/scm/slibcat
 lib/scm/socket.so
 lib/scm/unix.so
 lib/scm/wbtab.scm
 %%X11%%lib/scm/x.so
 %%X11%%lib/scm/x11.scm
 %%X11%%lib/scm/xatoms.scm
 %%X11%%lib/scm/xevent.scm
 man/man1/scm.1.gz