18 files changed, 132 insertions, 121 deletions

diff --git a/lang/rscheme/Makefile b/lang/rscheme/Makefile
index fed44a7fc919..967cab360e01 100644
--- a/lang/rscheme/Makefile
+++ b/lang/rscheme/Makefile
@@ -14,10 +14,6 @@ DISTNAME=	rs-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An object-oriented, extended version of the Scheme dialect of Lisp
 
-.if ${MACHINE_ARCH} != "i386"
-BROKEN=		"fails to install on ${ARCH}"
-.endif
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 HAS_CONFIGURE=	yes
@@ -27,6 +23,12 @@ MAKE_ENV=	REAL_PREFIX=${PREFIX}
 BOOTSTRAP_DIR=	${WRKDIR}/${DISTNAME}
 BOOTSTRAP_TARGET=	stage1
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != "i386"
+BROKEN=		"fails to install on ${ARCH}"
+.endif
+
 post-extract:
 	@${MKDIR} ${WRKSRC} ${WRKDIR}/build
 
@@ -43,4 +45,4 @@ do-install:
 	(cd ${WRKDIR}/build && ${TAR} -c -f - resource) \
 		| (cd ${DATADIR} && ${TAR} --unlink -x -f -)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/rscheme/files/patch-..::Makefile b/lang/rscheme/files/patch-..__Makefile
index 6e0a42b41270..10740619ba18 100644
--- a/lang/rscheme/files/patch-..::Makefile
+++ b/lang/rscheme/files/patch-..__Makefile
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/lang/rscheme/files/patch-..__Makefile,v 1.1 2006-04-20 21:32:20 anray Exp $
 
 --- ../Makefile.orig	Thu Mar 18 17:40:45 1999
 +++ ../Makefile	Tue Jul 31 10:48:35 2001
diff --git a/lang/rscheme/files/patch-..::handc::corelib::basemath.c b/lang/rscheme/files/patch-..__handc__corelib__basemath.c
index 02148444633d..601c0a4d3e6c 100644
--- a/lang/rscheme/files/patch-..::handc::corelib::basemath.c
+++ b/lang/rscheme/files/patch-..__handc__corelib__basemath.c
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/lang/rscheme/files/patch-..__handc__corelib__basemath.c,v 1.1 2006-04-20 21:32:20 anray Exp $
 
 --- ../handc/runtime/basemath.c	Fri Feb 10 14:51:07 2006
 +++ ../handc/runtime/basemath.c	Fri Feb 10 14:57:02 2006
diff --git a/lang/rscheme/files/patch-..::handc::rshell::Makefile b/lang/rscheme/files/patch-..__handc__rshell__Makefile
index 58b9e992386c..20abb355462e 100644
--- a/lang/rscheme/files/patch-..::handc::rshell::Makefile
+++ b/lang/rscheme/files/patch-..__handc__rshell__Makefile
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/lang/rscheme/files/patch-..__handc__rshell__Makefile,v 1.1 2006-04-20 21:32:20 anray Exp $
 
 --- ../handc/rshell/Makefile.orig	Thu Mar 18 17:43:41 1999
 +++ ../handc/rshell/Makefile	Tue Jul 31 12:04:08 2001
diff --git a/lang/rscheme/files/patch-..::handc::rshell::shell.c b/lang/rscheme/files/patch-..__handc__rshell__shell.c
index ade3d7976a9b..a1612df41752 100644
--- a/lang/rscheme/files/patch-..::handc::rshell::shell.c
+++ b/lang/rscheme/files/patch-..__handc__rshell__shell.c
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/lang/rscheme/files/patch-..__handc__rshell__shell.c,v 1.1 2006-04-20 21:32:20 anray Exp $
 
 --- ../handc/rshell/shell.c	2001/07/31 08:24:33	1.1
 +++ ../handc/rshell/shell.c	2001/07/31 08:25:25
diff --git a/lang/rscheme/files/patch-..::handc::runtime::smemory.c b/lang/rscheme/files/patch-..__handc__runtime__smemory.c
index 63bf61b8da22..57805b521065 100644
--- a/lang/rscheme/files/patch-..::handc::runtime::smemory.c
+++ b/lang/rscheme/files/patch-..__handc__runtime__smemory.c
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/lang/rscheme/files/patch-..__handc__runtime__smemory.c,v 1.1 2006-04-20 21:32:20 anray Exp $
 
 --- ../handc/runtime/smemory.c	Sat May 21 05:10:48 2005
 +++ ../handc/runtime/smemory.c	Fri Feb 10 14:41:56 2006
diff --git a/lang/rscheme/files/patch-..__handc__runtime__vinsns.h b/lang/rscheme/files/patch-..__handc__runtime__vinsns.h
new file mode 100644
index 000000000000..5d190eb9dd7a
--- /dev/null
+++ b/lang/rscheme/files/patch-..__handc__runtime__vinsns.h
@@ -0,0 +1,14 @@
+
+$FreeBSD: /tmp/pcvs/ports/lang/rscheme/files/patch-..__handc__runtime__vinsns.h,v 1.1 2006-04-20 21:32:20 anray Exp $
+
+--- ../handc/runtime/vinsns.h	Fri Feb 10 15:56:41 2006
++++ ../handc/runtime/vinsns.h	Fri Feb 10 15:56:57 2006
+@@ -58,7 +58,7 @@
+ 			       arg_count_reg = num; \
+ 			       return (jump_addr)label;)
+ #else
+-#define JUMP(num,label)   return (jump_addr)((jump_addr)label)()
++#define JUMP(num,label)   return label()
+ #endif
+ #endif
+ 
diff --git a/lang/rscheme/files/patch-..::modules::corelib::corelib.mcf b/lang/rscheme/files/patch-..__modules__corelib__corelib.mcf
index b234fcd36644..0a3ac54d8868 100644
--- a/lang/rscheme/files/patch-..::modules::corelib::corelib.mcf
+++ b/lang/rscheme/files/patch-..__modules__corelib__corelib.mcf
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/lang/rscheme/files/patch-..__modules__corelib__corelib.mcf,v 1.1 2006-04-20 21:32:20 anray Exp $
 
 --- ../modules/corelib/corelib.mcf.orig	Wed Mar 24 22:38:27 2004
 +++ ../modules/corelib/corelib.mcf	Fri Apr 14 18:26:06 2006
diff --git a/lang/rscheme/files/patch-..::modules::regex::runmatch.c b/lang/rscheme/files/patch-..__modules__regex__runmatch.c
index b24f7053308f..d53009c79dbb 100644
--- a/lang/rscheme/files/patch-..::modules::regex::runmatch.c
+++ b/lang/rscheme/files/patch-..__modules__regex__runmatch.c
@@ -1,3 +1,6 @@
+
+$FreeBSD$
+
 --- ../modules/regex/runmatch.c.orig	Fri Apr 14 17:27:56 2006
 +++ ../modules/regex/runmatch.c	Fri Apr 14 17:31:23 2006
 @@ -130,7 +130,7 @@
diff --git a/lang/rscheme/files/patch-..::stage0::configure b/lang/rscheme/files/patch-..__stage0__configure
index 225859cd0b05..827af3a53738 100644
--- a/lang/rscheme/files/patch-..::stage0::configure
+++ b/lang/rscheme/files/patch-..__stage0__configure
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/lang/rscheme/files/patch-..__stage0__configure,v 1.1 2006-04-20 21:32:20 anray Exp $
 
 --- ../stage0/configure.orig	Mon Jun 13 17:00:47 2005
 +++ ../stage0/configure	Fri Feb 10 14:19:41 2006
diff --git a/lang/rscheme/files/patch-..::stage0::corelib::basemath.c b/lang/rscheme/files/patch-..__stage0__corelib__basemath.c
index 52c90a32b6ba..ad0c7d8b44cf 100644
--- a/lang/rscheme/files/patch-..::stage0::corelib::basemath.c
+++ b/lang/rscheme/files/patch-..__stage0__corelib__basemath.c
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/lang/rscheme/files/patch-..__stage0__corelib__basemath.c,v 1.1 2006-04-20 21:32:20 anray Exp $
 
 --- ../stage0/runtime/basemath.c	Fri Feb 10 14:51:07 2006
 +++ ../stage0/runtime/basemath.c	Fri Feb 10 14:57:02 2006
diff --git a/lang/rscheme/files/patch-..::stage0::corelib::complex.c b/lang/rscheme/files/patch-..__stage0__corelib__complex.c
index f640dc1b59fe..33e4e147aca6 100644
--- a/lang/rscheme/files/patch-..::stage0::corelib::complex.c
+++ b/lang/rscheme/files/patch-..__stage0__corelib__complex.c
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/lang/rscheme/files/patch-..__stage0__corelib__complex.c,v 1.1 2006-04-20 21:32:20 anray Exp $
 
 --- ../stage0/corelib/complex.c.orig	Fri Apr 14 18:22:39 2006
 +++ ../stage0/corelib/complex.c	Fri Apr 14 18:22:51 2006
diff --git a/lang/rscheme/files/patch-..::stage0::corelib::string.c b/lang/rscheme/files/patch-..__stage0__corelib__string.c
index d76364a8379d..3c4b2df026d9 100644
--- a/lang/rscheme/files/patch-..::stage0::corelib::string.c
+++ b/lang/rscheme/files/patch-..__stage0__corelib__string.c
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/lang/rscheme/files/patch-..__stage0__corelib__string.c,v 1.1 2006-04-20 21:32:20 anray Exp $
 
 --- ../stage0/corelib/string.c	2001/07/31 07:20:17	1.1
 +++ ../stage0/corelib/string.c	2001/07/31 07:21:08
diff --git a/lang/rscheme/files/patch-..::stage0::regex::runmatch.c b/lang/rscheme/files/patch-..__stage0__regex__runmatch.c
index 297479c3dedc..5a2ec7e8e0cc 100644
--- a/lang/rscheme/files/patch-..::stage0::regex::runmatch.c
+++ b/lang/rscheme/files/patch-..__stage0__regex__runmatch.c
@@ -1,3 +1,6 @@
+
+$FreeBSD$
+
 --- ../stage0/regex/runmatch.c.orig	Fri Apr 14 17:27:56 2006
 +++ ../stage0/regex/runmatch.c	Fri Apr 14 17:31:23 2006
 @@ -130,7 +130,7 @@
diff --git a/lang/rscheme/files/patch-..::stage0::runtime::smemory.c b/lang/rscheme/files/patch-..__stage0__runtime__smemory.c
index f9fa471ad5dc..73e6aeca3eb7 100644
--- a/lang/rscheme/files/patch-..::stage0::runtime::smemory.c
+++ b/lang/rscheme/files/patch-..__stage0__runtime__smemory.c
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/lang/rscheme/files/patch-..__stage0__runtime__smemory.c,v 1.1 2006-04-20 21:32:20 anray Exp $
 
 --- ../stage0/runtime/smemory.c	Sat May 21 05:10:48 2005
 +++ ../stage0/runtime/smemory.c	Fri Feb 10 14:41:56 2006
diff --git a/lang/rscheme/files/patch-..__stage0__runtime__vinsns.h b/lang/rscheme/files/patch-..__stage0__runtime__vinsns.h
new file mode 100644
index 000000000000..425f29f63080
--- /dev/null
+++ b/lang/rscheme/files/patch-..__stage0__runtime__vinsns.h
@@ -0,0 +1,14 @@
+
+$FreeBSD: /tmp/pcvs/ports/lang/rscheme/files/patch-..__stage0__runtime__vinsns.h,v 1.1 2006-04-20 21:32:20 anray Exp $
+
+--- ../stage0/runtime/vinsns.h	Fri Feb 10 15:56:41 2006
++++ ../stage0/runtime/vinsns.h	Fri Feb 10 15:56:57 2006
+@@ -58,7 +58,7 @@
+ 			       arg_count_reg = num; \
+ 			       return (jump_addr)label;)
+ #else
+-#define JUMP(num,label)   return (jump_addr)((jump_addr)label)()
++#define JUMP(num,label)   return label()
+ #endif
+ #endif
+ 
diff --git a/lang/rscheme/files/patch-vinsns.h b/lang/rscheme/files/patch-vinsns.h
deleted file mode 100644
index 0468351eabff..000000000000
--- a/lang/rscheme/files/patch-vinsns.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- ../handc/runtime/vinsns.h	Fri Feb 10 15:56:41 2006
-+++ ../handc/runtime/vinsns.h	Fri Feb 10 15:56:57 2006
-@@ -58,7 +58,7 @@
- 			       arg_count_reg = num; \
- 			       return (jump_addr)label;)
- #else
--#define JUMP(num,label)   return (jump_addr)((jump_addr)label)()
-+#define JUMP(num,label)   return label()
- #endif
- #endif
- 
---- ../stage0/runtime/vinsns.h	Fri Feb 10 15:56:41 2006
-+++ ../stage0/runtime/vinsns.h	Fri Feb 10 15:56:57 2006
-@@ -58,7 +58,7 @@
- 			       arg_count_reg = num; \
- 			       return (jump_addr)label;)
- #else
--#define JUMP(num,label)   return (jump_addr)((jump_addr)label)()
-+#define JUMP(num,label)   return label()
- #endif
- #endif
- 
diff --git a/lang/rscheme/pkg-plist b/lang/rscheme/pkg-plist
index 66c069431900..cdb965a610b3 100644
--- a/lang/rscheme/pkg-plist
+++ b/lang/rscheme/pkg-plist
@@ -62,84 +62,84 @@ include/rscheme/vinsns.ci
 include/rscheme/vinsns.h
 include/rscheme/writebar.h
 lib/librs.a
-share/rscheme/resource/buildenv/module.mak
-share/rscheme/resource/buildenv/preamble.mak
-share/rscheme/resource/compiler/bytecode/bcgen.scm
-share/rscheme/resource/compiler/bytecode/bctable.dat
-share/rscheme/resource/compiler/bytecode/potable.dat
-share/rscheme/resource/modules/codegen.doc
-share/rscheme/resource/modules/codegen.mif
-share/rscheme/resource/modules/codegen.mx
-share/rscheme/resource/modules/compiler.doc
-share/rscheme/resource/modules/compiler.mif
-share/rscheme/resource/modules/compiler.mx
-share/rscheme/resource/modules/corelib.doc
-share/rscheme/resource/modules/corelib.mif
-share/rscheme/resource/modules/corelib.mx
-share/rscheme/resource/modules/debugger.doc
-share/rscheme/resource/modules/debugger.mif
-share/rscheme/resource/modules/debugger.mx
-share/rscheme/resource/modules/earley.doc
-share/rscheme/resource/modules/earley.mif
-share/rscheme/resource/modules/earley.mx
-share/rscheme/resource/modules/editinp.doc
-share/rscheme/resource/modules/editinp.mif
-share/rscheme/resource/modules/editinp.mx
-share/rscheme/resource/modules/hacks.doc
-share/rscheme/resource/modules/hacks.mif
-share/rscheme/resource/modules/hacks.mx
-share/rscheme/resource/modules/high_scheme.doc
-share/rscheme/resource/modules/high_scheme.mif
-share/rscheme/resource/modules/high_scheme.mx
-share/rscheme/resource/modules/imageio.doc
-share/rscheme/resource/modules/imageio.mif
-share/rscheme/resource/modules/imageio.mx
-share/rscheme/resource/modules/iolib.doc
-share/rscheme/resource/modules/iolib.mif
-share/rscheme/resource/modules/iolib.mx
-share/rscheme/resource/modules/low_scheme.doc
-share/rscheme/resource/modules/low_scheme.mif
-share/rscheme/resource/modules/low_scheme.mx
-share/rscheme/resource/modules/mathlib.doc
-share/rscheme/resource/modules/mathlib.mif
-share/rscheme/resource/modules/mathlib.mx
-share/rscheme/resource/modules/mlink.doc
-share/rscheme/resource/modules/mlink.mif
-share/rscheme/resource/modules/mlink.mx
-share/rscheme/resource/modules/objsys.doc
-share/rscheme/resource/modules/objsys.mif
-share/rscheme/resource/modules/objsys.mx
-share/rscheme/resource/modules/paths.doc
-share/rscheme/resource/modules/paths.mif
-share/rscheme/resource/modules/paths.mx
-share/rscheme/resource/modules/precore.doc
-share/rscheme/resource/modules/precore.mif
-share/rscheme/resource/modules/precore.mx
-share/rscheme/resource/modules/primops.mif
-share/rscheme/resource/modules/primops.mx
-share/rscheme/resource/modules/regex.doc
-share/rscheme/resource/modules/regex.mif
-share/rscheme/resource/modules/regex.mx
-share/rscheme/resource/modules/repl.doc
-share/rscheme/resource/modules/repl.mif
-share/rscheme/resource/modules/repl.mx
-share/rscheme/resource/modules/sort.doc
-share/rscheme/resource/modules/sort.mif
-share/rscheme/resource/modules/sort.mx
-share/rscheme/resource/modules/start.doc
-share/rscheme/resource/modules/start.mif
-share/rscheme/resource/modules/start.mx
-share/rscheme/resource/modules/tables.doc
-share/rscheme/resource/modules/tables.mif
-share/rscheme/resource/modules/tables.mx
-share/rscheme/resource/modules/threads.doc
-share/rscheme/resource/modules/threads.mif
-share/rscheme/resource/modules/threads.mx
-share/rscheme/resource/system.img
-@dirrm share/rscheme/resource/modules
-@dirrm share/rscheme/resource/compiler/bytecode
-@dirrm share/rscheme/resource/compiler
-@dirrm share/rscheme/resource/buildenv
-@dirrm share/rscheme/resource
-@dirrm share/rscheme
+%%DATADIR%%/resource/buildenv/module.mak
+%%DATADIR%%/resource/buildenv/preamble.mak
+%%DATADIR%%/resource/compiler/bytecode/bcgen.scm
+%%DATADIR%%/resource/compiler/bytecode/bctable.dat
+%%DATADIR%%/resource/compiler/bytecode/potable.dat
+%%DATADIR%%/resource/modules/codegen.doc
+%%DATADIR%%/resource/modules/codegen.mif
+%%DATADIR%%/resource/modules/codegen.mx
+%%DATADIR%%/resource/modules/compiler.doc
+%%DATADIR%%/resource/modules/compiler.mif
+%%DATADIR%%/resource/modules/compiler.mx
+%%DATADIR%%/resource/modules/corelib.doc
+%%DATADIR%%/resource/modules/corelib.mif
+%%DATADIR%%/resource/modules/corelib.mx
+%%DATADIR%%/resource/modules/debugger.doc
+%%DATADIR%%/resource/modules/debugger.mif
+%%DATADIR%%/resource/modules/debugger.mx
+%%DATADIR%%/resource/modules/earley.doc
+%%DATADIR%%/resource/modules/earley.mif
+%%DATADIR%%/resource/modules/earley.mx
+%%DATADIR%%/resource/modules/editinp.doc
+%%DATADIR%%/resource/modules/editinp.mif
+%%DATADIR%%/resource/modules/editinp.mx
+%%DATADIR%%/resource/modules/hacks.doc
+%%DATADIR%%/resource/modules/hacks.mif
+%%DATADIR%%/resource/modules/hacks.mx
+%%DATADIR%%/resource/modules/high_scheme.doc
+%%DATADIR%%/resource/modules/high_scheme.mif
+%%DATADIR%%/resource/modules/high_scheme.mx
+%%DATADIR%%/resource/modules/imageio.doc
+%%DATADIR%%/resource/modules/imageio.mif
+%%DATADIR%%/resource/modules/imageio.mx
+%%DATADIR%%/resource/modules/iolib.doc
+%%DATADIR%%/resource/modules/iolib.mif
+%%DATADIR%%/resource/modules/iolib.mx
+%%DATADIR%%/resource/modules/low_scheme.doc
+%%DATADIR%%/resource/modules/low_scheme.mif
+%%DATADIR%%/resource/modules/low_scheme.mx
+%%DATADIR%%/resource/modules/mathlib.doc
+%%DATADIR%%/resource/modules/mathlib.mif
+%%DATADIR%%/resource/modules/mathlib.mx
+%%DATADIR%%/resource/modules/mlink.doc
+%%DATADIR%%/resource/modules/mlink.mif
+%%DATADIR%%/resource/modules/mlink.mx
+%%DATADIR%%/resource/modules/objsys.doc
+%%DATADIR%%/resource/modules/objsys.mif
+%%DATADIR%%/resource/modules/objsys.mx
+%%DATADIR%%/resource/modules/paths.doc
+%%DATADIR%%/resource/modules/paths.mif
+%%DATADIR%%/resource/modules/paths.mx
+%%DATADIR%%/resource/modules/precore.doc
+%%DATADIR%%/resource/modules/precore.mif
+%%DATADIR%%/resource/modules/precore.mx
+%%DATADIR%%/resource/modules/primops.mif
+%%DATADIR%%/resource/modules/primops.mx
+%%DATADIR%%/resource/modules/regex.doc
+%%DATADIR%%/resource/modules/regex.mif
+%%DATADIR%%/resource/modules/regex.mx
+%%DATADIR%%/resource/modules/repl.doc
+%%DATADIR%%/resource/modules/repl.mif
+%%DATADIR%%/resource/modules/repl.mx
+%%DATADIR%%/resource/modules/sort.doc
+%%DATADIR%%/resource/modules/sort.mif
+%%DATADIR%%/resource/modules/sort.mx
+%%DATADIR%%/resource/modules/start.doc
+%%DATADIR%%/resource/modules/start.mif
+%%DATADIR%%/resource/modules/start.mx
+%%DATADIR%%/resource/modules/tables.doc
+%%DATADIR%%/resource/modules/tables.mif
+%%DATADIR%%/resource/modules/tables.mx
+%%DATADIR%%/resource/modules/threads.doc
+%%DATADIR%%/resource/modules/threads.mif
+%%DATADIR%%/resource/modules/threads.mx
+%%DATADIR%%/resource/system.img
+@dirrm %%DATADIR%%/resource/modules
+@dirrm %%DATADIR%%/resource/compiler/bytecode
+@dirrm %%DATADIR%%/resource/compiler
+@dirrm %%DATADIR%%/resource/buildenv
+@dirrm %%DATADIR%%/resource
+@dirrm %%DATADIR%%
 @dirrm include/rscheme