6 files changed, 75 insertions, 10 deletions

diff --git a/lang/racket-minimal/Makefile b/lang/racket-minimal/Makefile
index 5a9d863fe36c..d72e250a1f5e 100644
--- a/lang/racket-minimal/Makefile
+++ b/lang/racket-minimal/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	racket
 PKGNAMESUFFIX=	-minimal
-PORTVERSION=	6.1
-PORTREVISION=	1
+PORTVERSION=	6.1.1
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://mirror.racket-lang.org/installers/${PORTVERSION}/ \
 		http://www.cs.utah.edu/plt/installers/${PORTVERSION}/ \
diff --git a/lang/racket-minimal/distinfo b/lang/racket-minimal/distinfo
index 42311a99629f..18b6f2ef5d95 100644
--- a/lang/racket-minimal/distinfo
+++ b/lang/racket-minimal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (racket-minimal/6.1/racket-minimal-6.1-src.tgz) = a9b6095817b706e05253b41c6f584209fe69b4e2607827469f92f4501dd266fe
-SIZE (racket-minimal/6.1/racket-minimal-6.1-src.tgz) = 5821450
+SHA256 (racket-minimal/6.1.1/racket-minimal-6.1.1-src.tgz) = 324266344e677bb7c75a46f7eb5fc0ad12d4434786216e8846122ba6843c6921
+SIZE (racket-minimal/6.1.1/racket-minimal-6.1.1-src.tgz) = 5852684
diff --git a/lang/racket-minimal/files/patch-racket_src_bool.c b/lang/racket-minimal/files/patch-racket_src_bool.c
index 13b79a6d7af4..7feae876474c 100644
--- a/lang/racket-minimal/files/patch-racket_src_bool.c
+++ b/lang/racket-minimal/files/patch-racket_src_bool.c
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- racket/src/bool.c.orig
 +++ racket/src/bool.c
-@@ -198,6 +198,9 @@
+@@ -203,6 +203,9 @@
  }
  
  #ifdef MZ_LONG_DOUBLE
@@ -13,7 +13,7 @@ $FreeBSD$
  XFORM_NONGCING static MZ_INLINE int mz_long_double_eqv(long_double a, long_double b)
  {
  # ifndef NAN_EQUALS_ANYTHING
-@@ -233,6 +236,13 @@
+@@ -238,6 +241,13 @@
    return 1;
  # endif
  }
@@ -27,7 +27,7 @@ $FreeBSD$
  #endif
  XFORM_NONGCING static MZ_INLINE int double_eqv(double a, double b)
  {
-@@ -269,7 +279,13 @@
+@@ -274,7 +284,13 @@
    return 1;
  # endif
  }
@@ -41,7 +41,18 @@ $FreeBSD$
  XFORM_NONGCING static int is_eqv(Scheme_Object *obj1, Scheme_Object *obj2)
  {
    Scheme_Type t1, t2;
-@@ -317,6 +333,9 @@
+@@ -323,12 +339,24 @@
+     }
+   }
+ }
++#ifdef MZ_XFORM
++END_XFORM_SKIP;
++#endif
+ 
++#ifdef MZ_XFORM
++START_XFORM_SKIP;
++#endif
+ int scheme_eqv (Scheme_Object *obj1, Scheme_Object *obj2)
  {
    return (is_eqv(obj1, obj2) > 0);
  }
@@ -49,5 +60,19 @@ $FreeBSD$
 +END_XFORM_SKIP;
 +#endif
  
- int scheme_equal (Scheme_Object *obj1, Scheme_Object *obj2)
++#ifdef MZ_XFORM
++START_XFORM_SKIP;
++#endif
+ XFORM_NONGCING int is_fast_equal (Scheme_Object *obj1, Scheme_Object *obj2, int for_chaperone)
+ {
+   Scheme_Type t1, t2;
+@@ -414,6 +442,9 @@
+ 
+  return -1;
+ }
++#ifdef MZ_XFORM
++END_XFORM_SKIP;
++#endif
+ 
+ int is_slow_equal (Scheme_Object *obj1, Scheme_Object *obj2)
  {
diff --git a/lang/racket-minimal/files/patch-racket_src_mzrt.c b/lang/racket-minimal/files/patch-racket_src_mzrt.c
new file mode 100644
index 000000000000..69e844687def
--- /dev/null
+++ b/lang/racket-minimal/files/patch-racket_src_mzrt.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- racket/src/mzrt.c.orig
++++ racket/src/mzrt.c
+@@ -267,7 +267,7 @@
+       stacksize = UNIX_STACK_MAXIMUM;
+ #  endif
+   }
+-#elif defined(OS_X) || defined(linux)
++#elif defined(OS_X) || defined(linux) || defined(__FreeBSD__)
+   stacksize = 8*1024*1024;
+ #else
+   stacksize = 0;
diff --git a/lang/racket-minimal/files/patch-racket_src_port.c b/lang/racket-minimal/files/patch-racket_src_port.c
new file mode 100644
index 000000000000..cee043abcfc4
--- /dev/null
+++ b/lang/racket-minimal/files/patch-racket_src_port.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- racket/src/port.c.orig
++++ racket/src/port.c
+@@ -10996,7 +10996,7 @@
+   itimerdata->jit_stack_boundary_ptr = &scheme_jit_stack_boundary;
+   pthread_mutex_init(&itimerdata->mutex, NULL);
+   pthread_cond_init(&itimerdata->cond, NULL);
+-  tmp = mz_proc_thread_create_w_stacksize(green_thread_timer, itimerdata, 4096);
++  tmp = mz_proc_thread_create_w_stacksize(green_thread_timer, itimerdata, 16384);
+   itimerdata->thread = tmp;
+   itimerdata->itimer = 1;
+ }
diff --git a/lang/racket-minimal/pkg-plist b/lang/racket-minimal/pkg-plist
index f0d1b3c1d41c..80d7452e6a3d 100644
--- a/lang/racket-minimal/pkg-plist
+++ b/lang/racket-minimal/pkg-plist
@@ -18,7 +18,7 @@ include/racket/schvers.h
 include/racket/sconfig.h
 include/racket/stypes.h
 include/racket/uconfig.h
-lib/libracket3m-6.1.so
+lib/libracket3m-6.1.1.so
 lib/libracket3m.so
 lib/racket/buildinfo
 lib/racket/gracket
@@ -749,6 +749,8 @@ man/man1/raco.1.gz
 %%DATADIR%%/collects/racket/match/compiled/struct_rkt.zo
 %%DATADIR%%/collects/racket/match/compiled/stxtime_rkt.dep
 %%DATADIR%%/collects/racket/match/compiled/stxtime_rkt.zo
+%%DATADIR%%/collects/racket/match/compiled/syntax-local-match-introduce_rkt.dep
+%%DATADIR%%/collects/racket/match/compiled/syntax-local-match-introduce_rkt.zo
 %%DATADIR%%/collects/racket/match/compiler.rkt
 %%DATADIR%%/collects/racket/match/define-forms.rkt
 %%DATADIR%%/collects/racket/match/gen-match.rkt
@@ -765,6 +767,7 @@ man/man1/raco.1.gz
 %%DATADIR%%/collects/racket/match/split-rows.rkt
 %%DATADIR%%/collects/racket/match/struct.rkt
 %%DATADIR%%/collects/racket/match/stxtime.rkt
+%%DATADIR%%/collects/racket/match/syntax-local-match-introduce.rkt
 %%DATADIR%%/collects/racket/math.rkt
 %%DATADIR%%/collects/racket/path.rkt
 %%DATADIR%%/collects/racket/performance-hint.rkt
@@ -1194,12 +1197,15 @@ man/man1/raco.1.gz
 %%DATADIR%%/collects/setup/private/compiled/cc-struct_rkt.zo
 %%DATADIR%%/collects/setup/private/compiled/command-name_rkt.dep
 %%DATADIR%%/collects/setup/private/compiled/command-name_rkt.zo
+%%DATADIR%%/collects/setup/private/compiled/dylib_rkt.dep
+%%DATADIR%%/collects/setup/private/compiled/dylib_rkt.zo
 %%DATADIR%%/collects/setup/private/compiled/lib-roots_rkt.dep
 %%DATADIR%%/collects/setup/private/compiled/lib-roots_rkt.zo
 %%DATADIR%%/collects/setup/private/compiled/omitted-paths_rkt.dep
 %%DATADIR%%/collects/setup/private/compiled/omitted-paths_rkt.zo
 %%DATADIR%%/collects/setup/private/compiled/pkg-deps_rkt.dep
 %%DATADIR%%/collects/setup/private/compiled/pkg-deps_rkt.zo
+%%DATADIR%%/collects/setup/private/dylib.rkt
 %%DATADIR%%/collects/setup/private/lib-roots.rkt
 %%DATADIR%%/collects/setup/private/omitted-paths.rkt
 %%DATADIR%%/collects/setup/private/pkg-deps.rkt
@@ -1352,6 +1358,10 @@ man/man1/raco.1.gz
 %%DATADIR%%/collects/syntax/parse/private/compiled/parse-aux_rkt.zo
 %%DATADIR%%/collects/syntax/parse/private/compiled/parse_rkt.dep
 %%DATADIR%%/collects/syntax/parse/private/compiled/parse_rkt.zo
+%%DATADIR%%/collects/syntax/parse/private/compiled/pattern-expander-prop_rkt.dep
+%%DATADIR%%/collects/syntax/parse/private/compiled/pattern-expander-prop_rkt.zo
+%%DATADIR%%/collects/syntax/parse/private/compiled/pattern-expander_rkt.dep
+%%DATADIR%%/collects/syntax/parse/private/compiled/pattern-expander_rkt.zo
 %%DATADIR%%/collects/syntax/parse/private/compiled/rep-attrs_rkt.dep
 %%DATADIR%%/collects/syntax/parse/private/compiled/rep-attrs_rkt.zo
 %%DATADIR%%/collects/syntax/parse/private/compiled/rep-data_rkt.dep
@@ -1384,6 +1394,8 @@ man/man1/raco.1.gz
 %%DATADIR%%/collects/syntax/parse/private/opt.rkt
 %%DATADIR%%/collects/syntax/parse/private/parse-aux.rkt
 %%DATADIR%%/collects/syntax/parse/private/parse.rkt
+%%DATADIR%%/collects/syntax/parse/private/pattern-expander-prop.rkt
+%%DATADIR%%/collects/syntax/parse/private/pattern-expander.rkt
 %%DATADIR%%/collects/syntax/parse/private/rep-attrs.rkt
 %%DATADIR%%/collects/syntax/parse/private/rep-data.rkt
 %%DATADIR%%/collects/syntax/parse/private/rep-patterns.rkt
@@ -1513,3 +1525,4 @@ man/man1/raco.1.gz
 %%DATADIR%%/pkgs/pkgs.rktd
 %%DATADIR%%/pkgs/racket-lib/LICENSE.txt
 %%DATADIR%%/pkgs/racket-lib/info.rkt
+%%PORTDOCS%%@dir %%DOCSDIR%%