Merge branch 'stable' into release

Closes PR 15062

(cherry picked from commit 39fda5ec9e)

INSTALL.txt

@@ -193,12 +193,18 @@ After you've built and installed minimal Racket, you could install
 packages via the package-catalog server, completely ignoring the
 content of "pkgs".
 
-If you want to install packages manually out of the "pkgs", the
-`local-catalog' target creates a catalog as "racket/local/catalog" that
-merges the currently configured catalog's content with pointers to the
-packages in "pkgs". A Unix-style build works that way: it builds and
-installs minimal Racket, and then it installs packags out of a catalog
-that is created by `make local-catalog'.
+If you want to install packages manually out of the "pkgs" directory,
+the `local-catalog' target creates a catalog as "racket/local/catalog"
+that merges the currently configured catalog's content with pointers
+to the packages in "pkgs". A Unix-style build works that way: it
+builds and installs minimal Racket, and then it installs packags out
+of a catalog that is created by `make local-catalog'.
+
+To add a package catalog that is used after the content of "pkgs" but
+before the default package catalogs, specify the catalog's URL as the
+`SRC_CATALOG' makefile variable:
+
+  make .... SRC_CATALOG=<url>
 
 Linking Packages for In-place Development Mode
 ----------------------------------------------
@@ -217,7 +223,7 @@ packages. The configuration adjustment is made only if no
 configuration file "racket/etc/config.rktd" exists already.
 
 All other packages (as specified by `PKGS') are installed via the
-default package catalog. They are installed in installation scope, but
+configured package catalog. They are installed in installation scope, but
 the content of "racket/share/pkgs" is not meant to be edited. To
 reinstall a package in a mode suitable for editing and manipulation
 with Git tools, use

Makefile

@@ -32,6 +32,7 @@ WIN32_PLAIN_RACKET = racket\racket
 PLAIN_RACO = racket/bin/racket -N raco -l- raco
 WIN32_PLAIN_RACO = racket\racket -N raco -l- raco
 
+DEFAULT_SRC_CATALOG = http://pkgs.racket-lang.org
 
 MACOSX_CHECK_ARGS = -I racket/base -e '(case (system-type) [(macosx) (exit 0)] [else (exit 1)])'
 MACOSX_CHECK = $(PLAIN_RACKET) -G build/config $(MACOSX_CHECK_ARGS)
@@ -112,6 +113,7 @@ cpus-unix-style:
 plain-unix-style:
 	if [ "$(PREFIX)" = "" ] ; then $(MAKE) error-need-prefix ; fi
 	$(MAKE) base CONFIGURE_ARGS_qq='$(CONFIGURE_ARGS_qq) $(CONFIG_PREFIX_ARGS)' $(UNIX_BASE_ARGS)
+	$(MAKE) set-src-catalog
 	$(MAKE) local-catalog
 	"$(DESTDIR)$(PREFIX)/bin/raco" pkg install $(UNIX_RACO_ARGS) $(REQUIRED_PKGS) $(PKGS)
 	cd racket/src/build; $(MAKE) fix-paths
@@ -128,6 +130,10 @@ local-catalog:
 	"$(DESTDIR)$(PREFIX)/bin/racket" -l- pkg/dirs-catalog --check-metadata $(LOC_CATALOG) pkgs
 	"$(DESTDIR)$(PREFIX)/bin/raco" pkg catalog-copy --force --from-config $(LOC_CATALOG) $(UNIX_CATALOG)
 
+set-src-catalog:
+	if [ ! "$(SRC_CATALOG)" = "$(DEFAULT_SRC_CATALOG)" ] ; \
+	 then "$(DESTDIR)$(PREFIX)/bin/raco" pkg config -i --set catalogs "$(SRC_CATALOG)" ""; fi
+
 # ------------------------------------------------------------
 # Base build
 
@@ -177,7 +183,7 @@ racket/src/build/Makefile: racket/src/configure racket/src/Makefile.in
 # side of its definition.
 
 # Catalog for package sources:
-SRC_CATALOG = http://pkgs.racket-lang.org/
+SRC_CATALOG = $(DEFAULT_SRC_CATALOG)
 
 # A URL embedded in documentation for remote searches, where a Racket
 # version and search key are added as query fields to the URL, and ""
@@ -318,7 +324,7 @@ PKGS_CONFIG = -U -G build/config racket/src/pkgs-config.rkt
 
 pkgs-catalog:
 	$(PLAIN_RACKET) $(PKGS_CATALOG) racket/share/pkgs-catalog pkgs
-	$(PLAIN_RACKET) $(PKGS_CONFIG)
+	$(PLAIN_RACKET) $(PKGS_CONFIG) "$(DEFAULT_SRC_CATALOG)" "$(SRC_CATALOG)"
 	$(PLAIN_RACKET) racket/src/pkgs-check.rkt racket/share/pkgs-catalog
 
 win32-pkgs-catalog:

pkgs/base/info.rkt

@@ -12,7 +12,7 @@
 
 (define collection 'multi)
 
-(define version "6.2.0.2")
+(define version "6.2")
 
 (define deps `("racket-lib"
                ["racket" #:version ,version]))

pkgs/racket-doc/pkg/scribblings/pkg.scrbl

@@ -897,11 +897,15 @@ for @nonterm{key}.
  @item{@DFlag{scope-dir} @nonterm{dir} --- Same as for @command-ref{install}.}
  ]
 
- The valid @nonterm{key}s are:
+ The valid @nonterm{key}s and corresponding @nonterm{val}s are:
  @itemlist[
   @item{@exec{name} --- A string for the installation's name, which is used by @exec{user}
         @tech{package scope} and defaults to the Racket version.}
-  @item{@exec{catalogs} --- A list of URLs for @tech{package catalogs}.}
+  @item{@exec{catalogs} --- A list of URLs for @tech{package catalogs}. An empty-string
+        @nonterm{val} is replaced by the sequence of catalogs for the default configuration.
+        A @nonterm{val} that does not start with alphabetic characters followed by @litchar{://}
+        is treated as a path relative to the configuration directory (as
+        reported by @racket[find-config-dir]).}
   @item{@exec{default-scope} --- Either @exec{installation} or @exec{user}.
         The value of this key at @exec{user} scope (possibly defaulting from
         @exec{installation} scope) is

pkgs/racket-doc/scribblings/foreign/com-auto.scrbl

@@ -364,7 +364,7 @@ driver of a for-each loop in Visual Basic or PowerShell.
 A call @racket[(com-enumerate-to-list obj)] is equivalent to
 @racket[(com-enumeration-to-list (com-get-property obj "_NewEnum"))].
 
-@history[#:added "6.2.0.2"]}
+@history[#:added "6.2"]}
 
 
 @defproc[(com-enumeration-to-list [obj com-object?]) list?]{
@@ -372,7 +372,7 @@ A call @racket[(com-enumerate-to-list obj)] is equivalent to
 Given a COM object that implements @cpp{IEnumVARIANT}, extracts the
 enumerated values into a list.
 
-@history[#:added "6.2.0.2"]}
+@history[#:added "6.2"]}
 
 
 @; ----------------------------------------

pkgs/racket-doc/scribblings/foreign/com-intf.scrbl

@@ -166,7 +166,7 @@ foreign call as follows:
 
 ]
 
-@history[#:changed "6.2.0.2" @elem{Added @racket[#:allow] and automatic retries.}]}
+@history[#:changed "6.2" @elem{Added @racket[#:allow] and automatic retries.}]}
 
 
 @defform[(_hmfun fun-option ... type-spec ... -> id output-expr)]{
@@ -181,7 +181,7 @@ is added for the first argument.}
 
 Parameters that determine the behavior of automatic retries for @racket[_hfun].
 
-@history[#:added "6.2.0.2"]}
+@history[#:added "6.2"]}
 
 
 @defproc[(HRESULT-retry? [r exact-nonnegative-integer?]) boolean?]{
@@ -189,7 +189,7 @@ Parameters that determine the behavior of automatic retries for @racket[_hfun].
 Returns @racket[#t] if @racket[r] is @cpp{RPC_E_CALL_REJECTED}
 or @cpp{RPC_E_SERVERCALL_RETRYLATER}, @racket[#f] otherwise.
 
-@history[#:added "6.2.0.2"]}
+@history[#:added "6.2"]}
 
 
 @deftogether[(

pkgs/racket-doc/scribblings/foreign/types.scrbl

@@ -821,7 +821,7 @@ specifications:
 
 ]
 
-@history[#:changed "6.2.0.2" @elem{Added the @racket[#:retry] option.}]}
+@history[#:changed "6.2" @elem{Added the @racket[#:retry] option.}]}
 
 @defproc[(function-ptr [ptr-or-proc (or cpointer? procedure?)]
                        [fun-type ctype?])

pkgs/racket-doc/scribblings/reference/read.scrbl

@@ -75,9 +75,9 @@ value before the outermost @racket[read] returns.
 See @secref["readtables"] for an extended example that uses
 @racket[read/recursive].
 
-@history[#:changed "6.2.0.2" @elem{Adjusted use of @racket[readtable] to
-                                   more consistently apply to the delimiters of
-                                   a built-in form.}]}
+@history[#:changed "6.2" @elem{Adjusted use of @racket[readtable] to
+                               more consistently apply to the delimiters of
+                               a built-in form.}]}
 
 
 @defproc[(read-syntax/recursive [source-name any/c (object-name in)]
@@ -111,9 +111,9 @@ when the input stream starts with a comment (after whitespace).
 See @secref["readtables"] for an extended example that uses
 @racket[read-syntax/recursive].
 
-@history[#:changed "6.2.0.2" @elem{Adjusted use of @racket[readtable]
-                                   in the same way as for
-                                   @racket[read/recursive].}]}
+@history[#:changed "6.2" @elem{Adjusted use of @racket[readtable]
+                               in the same way as for
+                               @racket[read/recursive].}]}
 
 
 @defproc[(read-language [in input-port? (current-input-port)]

pkgs/racket-doc/scribblings/reference/struct-inspectors.scrbl

@@ -189,5 +189,5 @@ A @tech{structure type property} that allows structure types to customize
  field must be designated as immutable. The value of the field is used as the
  @racket[object-name] of the structure.}
 ]
-@history[#:added "6.2.0.2"]
-}
+
+@history[#:added "6.2"]}

pkgs/racket-doc/scribblings/reference/syntax.scrbl

@@ -2963,7 +2963,7 @@ The @racket[begin-encourage-inline] form is also provided by the
 @racketmodname[(submod racket/performance-hint begin-encourage-inline)] module,
 which has fewer dependencies than @racketmodname[racket/performance-hint].
 
-@history[#:changed "6.2.0.2" @elem{Added @racketmodname[(submod racket/performance-hint begin-encourage-inline)] submodule.}]
+@history[#:changed "6.2" @elem{Added the @racketmodname[(submod racket/performance-hint begin-encourage-inline)] submodule.}]
 }
 
 @defform*/subs[[(define-inline id expr)

pkgs/racket-test-core/tests/racket/module.rktl

@@ -1405,4 +1405,22 @@
 
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(module force-local-expand-of-body racket/base
+  (require (for-syntax racket/base))
+  (provide (rename-out [mb #%module-begin])
+           (except-out (all-from-out racket/base) #%module-begin))
+  
+  (define-syntax (mb stx)
+    (syntax-case stx ()
+      [(_ . b)
+       (local-expand #`(#%module-begin . b) (syntax-local-context) null)])))
+
+(module use-local-require-at-phase-1 'force-local-expand-of-body
+  (require (for-syntax racket/base))
+  
+  (begin-for-syntax
+    (local-require (only-in racket [+ ++]))))
+
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 (report-errs)

pkgs/racket-test-core/tests/racket/object.rktl

@@ -2100,6 +2100,19 @@
                                 m))))
                      m))
 
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Make sure that `set!` works right in forced subform expansion:
+
+(let ()
+  (define (time-print-mixin t%)
+    (define start-time #f)
+    (class t%
+      (super-new)
+      (define/override (m)
+        (set! start-time 1)
+        (super m))))
+  (void time-print-mixin))
+
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (report-errs)

racket/collects/acks/acks.rkt

@@ -51,6 +51,7 @@
    "Shriram Krishnamurthi, "
    "Mario Latendresse, "
    "Guillaume Marceau, "
+   "Gustavo Massaccesi, "
    "Jacob Matthews, "
    "Jay McCarthy, "
    "Mike T. McHenry, "

racket/collects/compiler/embed.rkt

@@ -1358,6 +1358,7 @@
                                   (when (file-exists? dest)
                                     (delete-file dest)))
                               (raise x))])
+        (define old-perms (ensure-writable dest-exe))
         (when (and (eq? 'macosx (system-type))
                    (not unix-starter?))
           (let ([m (or (assq 'framework-root aux)
@@ -1654,7 +1655,8 @@
                      (let ([m (and (eq? 'windows (system-type))
                                    (assq 'subsystem aux))])
                        (when m
-                         (set-subsystem dest-exe (cdr m)))))])))))))))
+                         (set-subsystem dest-exe (cdr m)))))]))))
+          (done-writable dest-exe old-perms))))))
 
 ;; For Mac OS X GRacket, the actual executable is deep inside the
 ;;  nominal executable bundle
@@ -1664,3 +1666,20 @@
     [(list? p) (map mac-mred-collects-path-adjust p)]
     [(relative-path? p) (build-path 'up 'up 'up p)]
     [else p]))
+
+;; Returns #f (no change needed) or old permissions
+(define (ensure-writable dest-exe)
+  (cond
+   [(member 'write (file-or-directory-permissions dest-exe))
+    ;; No change needed
+    #f]
+   [else
+    (define old-perms
+      (file-or-directory-permissions dest-exe 'bits))
+    (file-or-directory-permissions dest-exe (bitwise-ior old-perms #o200))
+    old-perms]))
+
+;; Restores old permissions (if not #f)
+(define (done-writable dest-exe old-perms)
+  (when old-perms
+    (file-or-directory-permissions dest-exe old-perms)))

racket/collects/file/ico.rkt

@@ -247,7 +247,7 @@
                                                                        (mask->alpha (cvt image) mask))
                                                                    mask
                                                                    #t)))))))))])
-                         (unless ico-ico (printf "no! ~a\n" (ico-desc exe-ico)))
+                         (unless ico-ico (log-error "no icon conversion available to ~a" (ico-desc exe-ico)))
                          (when ico-ico
                            (file-position p (car (ico-data exe-ico)))
                            (display (cdr (ico-data ico-ico)) p)))))

racket/collects/pkg/private/config.rkt

@@ -67,23 +67,21 @@
    [else
     (match k
       ['catalogs
-       (if (member #f v)
-           ;; Replace #f with default URLs, relative path
-           ;; with absolute path:
-           (apply append (for/list ([i (in-list v)])
-                           (cond
-                            [(not i) (get-default)]
-                            [(regexp-match? #rx"^[a-z]+://" i)
-                             (list i)]
-                            [else
-                             ;; If it doesn't look like a URL, then treat it as
-                             ;; a path (potentially relative to the configuration file):
-                             (list
-                              (url->string
-                               (path->url
-                                (simple-form-path
-                                 (path->complete-path i (path->complete-path (pkg-dir #t)))))))])))
-           v)]
+       ;; Replace #f with default URLs, relative path
+       ;; with absolute path:
+       (apply append (for/list ([i (in-list v)])
+                       (cond
+                        [(not i) (get-default)]
+                        [(regexp-match? #rx"^[a-z]+://" i)
+                         (list i)]
+                        [else
+                         ;; If it doesn't look like a URL, then treat it as
+                         ;; a path (potentially relative to the configuration file):
+                         (list
+                          (url->string
+                           (path->url
+                            (simple-form-path
+                             (path->complete-path i (path->complete-path (pkg-dir #t)))))))])))]
       [_ v])]))
 
 (define (update-pkg-cfg! key val)
@@ -146,7 +144,11 @@
                    key
                    (format-list (cons val more-vals)))]
        [(list* (and key "catalogs") val)
-        (update-pkg-cfg! 'catalogs val)]
+        (update-pkg-cfg! 'catalogs
+                         (for/list ([s (in-list val)])
+                           (cond
+                            [(equal? s "") #f]
+                            [else s])))]
        [(list (and key "default-scope") val)
         (unless (member val '("installation" "user"))
           (pkg-error (~a "invalid value for config key\n"

racket/collects/setup/setup-core.rkt

@@ -176,12 +176,18 @@
                                                           [(path? cc)
                                                            (path->relative-string/setup cc #:cache pkg-path-cache)]
                                                           [else cc]))
-        (let ([msg (if (exn? x)
-                       (format-error x #:long? #f #:to-string? #t #:cache pkg-path-cache)
-                       ;; `x` is a pair of long and short strings:
-                       (cdr x))])
-          (unless (null? x) (for ([str (in-list (regexp-split #rx"\n" msg))])
-                              (setup-fprintf port #f "  ~a" str))))
+        (let ([msg (cond
+                    [(exn? x)
+                     (format-error x #:long? #f #:to-string? #t #:cache pkg-path-cache)]
+                    [(not x)
+                     ;; No error; just output
+                     #f]
+                    [else
+                     ;; `x` is a pair of strings, long and short forms of the error:
+                     (cdr x)])])
+          (when x
+            (for ([str (in-list (regexp-split #rx"\n" msg))])
+              (setup-fprintf port #f "  ~a" str))))
         (unless (zero? (string-length out)) (eprintf "STDOUT:\n~a=====\n" out))
         (unless (zero? (string-length err)) (eprintf "STDERR:\n~a=====\n" err)))))
 
@@ -1652,13 +1658,17 @@
         (unless (avoid-main-installation)
           (tidy-libs #f
                      (find-target-dir)
-                     (find-lib-dir)
+                     (if receipt-at-dest?
+                         (find-target-dir)
+                         (find-lib-dir))
                      installed-libs
                      ccs-to-compile))
         (when (make-user)
           (tidy-libs #t
                      (find-user-target-dir)
-                     (find-user-lib-dir)
+                     (if receipt-at-dest?
+                         (find-user-target-dir)
+                         (find-user-lib-dir))
                      installed-libs
                      ccs-to-compile)))
       (for-each fixup-lib (hash-keys dests)))
@@ -1707,9 +1717,9 @@
             (write-receipt-hash receipt-path ht)))
         lib-key))
 
-    (define (tidy-libs user? target-dir lib-dir installed-libs ccs-to-compile)
-      (clean-previous-delete-failures lib-dir path->relative-string/*)
-      (define receipt-path (build-path lib-dir receipt-file))
+    (define (tidy-libs user? target-dir receipt-dir installed-libs ccs-to-compile)
+      (clean-previous-delete-failures receipt-dir path->relative-string/*)
+      (define receipt-path (build-path receipt-dir receipt-file))
       (define ht (read-receipt-hash receipt-path))
       (define ht2 (for/fold ([ht (hash)]) ([(k v) (in-hash ht)])
                     (define coll-path (and (pair? v)

racket/collects/setup/unixstyle-install.rkt

@@ -506,8 +506,9 @@
     (delete-directory rktdir)))
 
 (define (skip-dot-files!)
-  (current-skip-filter ; skip all dot-names
-   (lambda (p) (regexp-match? #rx"^[.]" (basename p)))))
+  (current-skip-filter
+   ;; skip all dot-names, except ".LOCK..."
+   (lambda (p) (regexp-match? #rx"^[.](?!LOCK)" (basename p)))))
 
 (define (make-install-copytree)
   (define copytree (move/copy-tree #f))

racket/src/pkgs-config.rkt

@@ -14,10 +14,14 @@
 (define catalog-relative-path (build-path 'up "share" "pkgs-catalog"))
 (define catalog-relative-path-str (path->string catalog-relative-path))
 
-(command-line
- #:args
- ()
- (void))
+(define-values (default-src-catalog src-catalog)
+  (command-line
+   #:args
+   (default-src-catalog src-catalog)
+   (values default-src-catalog src-catalog)))
+
+(define src-catalog-is-default?
+  (equal? src-catalog default-src-catalog))
 
 (when (file-exists? config-file-path)
   (call-with-input-file*
@@ -25,16 +29,31 @@
    (lambda (i)
      (define r (read i))
      (define l (hash-ref r 'catalogs #f))
-     (unless (and (list? l)
-                  ((length l) . >= . 1)
-                  (equal? (car l) catalog-relative-path-str))
+     (define starts-as-expected?
+       (and (list? l)
+            ((length l) . >= . 1)
+            (equal? (car l) catalog-relative-path-str)))
+     (define has-src-catalog?
+       (member (if src-catalog-is-default? #f src-catalog)
+               l))
+     (unless (and starts-as-expected?
+                  has-src-catalog?)
        (error 'pkgs-catalog
-              (~a "config file exists, but does not have a definition of `catalogs' that starts as expected\n"
+              (~a "config file exists, but with a mismatched `catalogs';\n"
+                  " the existing configuration does not ~a\n"
                   "  config file: ~a\n"
-                  "  expected initial element: ~s\n"
+                  "  expected ~acatalog: ~s\n"
                   "  possible solution: delete the config file")
-                config-file-path
-                catalog-relative-path-str)))))
+              (if (not starts-as-expected?)
+                  "start as expected"
+                  "include the specified catalog")
+              config-file-path
+              (if (not starts-as-expected?)
+                  "initial "
+                  "")
+              (if (not starts-as-expected?)
+                  catalog-relative-path-str
+                  src-catalog))))))
 
 (unless (file-exists? config-file-path)
   (printf "Writing ~a\n" config-file-path)
@@ -42,7 +61,12 @@
    config-file-path
    (lambda (o)
      (write (hash 'catalogs
-                  (list catalog-relative-path-str #f)
+                  (cons catalog-relative-path-str
+                        (append
+                         (if src-catalog-is-default?
+                             '()
+                             (list src-catalog))
+                         (list #f)))
                   'installation-name
                   "development"
                   'default-scope

racket/src/racket/src/compenv.c

@@ -1799,7 +1799,7 @@ scheme_lookup_binding(Scheme_Object *find_id, Scheme_Comp_Env *env, int flags,
 	  if (SCHEME_FALSEP(val)) {
 	    /* Corresponds to a run-time binding (but will be replaced later
 	       through a renaming to a different binding) */
-            if (flags & SCHEME_OUT_OF_CONTEXT_LOCAL)
+            if (flags & (SCHEME_OUT_OF_CONTEXT_LOCAL | SCHEME_SETTING))
               return scheme_make_local(scheme_local_type, 0, 0);
             return NULL;
 	  }

racket/src/racket/src/module.c

@@ -8088,14 +8088,24 @@ static Scheme_Object *shift_require_phase(Scheme_Object *e, Scheme_Object *phase
                           scheme_make_pair(phase, l));
 }
 
-static Scheme_Object *make_require_form(Scheme_Object *module_path, intptr_t phase, Scheme_Object *mark)
+static Scheme_Object *make_require_form(Scheme_Object *module_path,
+                                        intptr_t abs_phase, intptr_t rel_phase,
+                                        Scheme_Object *mark)
 {
-  Scheme_Object *e = module_path;
+  Scheme_Object *e = module_path, *r;
 
-  if (phase != 0) {
-    e = shift_require_phase(e, scheme_make_integer(phase), 1);
+  if (rel_phase != 0) {
+    e = shift_require_phase(e, scheme_make_integer(rel_phase), 1);
   }
-  e = scheme_make_pair(require_stx, scheme_make_pair(e, scheme_null));
+  if (abs_phase == 0)
+    r = require_stx;
+  else {
+    r = scheme_datum_to_syntax(scheme_intern_symbol("#%require"),
+                               scheme_false,
+                               scheme_sys_wraps_phase_worker(abs_phase),
+                               0, 0);
+  }
+  e = scheme_make_pair(r, scheme_make_pair(e, scheme_null));
   e = scheme_datum_to_syntax(e, scheme_false, scheme_false, 0, 0);
 
   e = scheme_add_remove_mark(e, mark);
@@ -8125,7 +8135,7 @@ Scheme_Object *scheme_parse_lifted_require(Scheme_Object *module_path,
     *_ref_expr = e;
   }
 
-  e = make_require_form(module_path, phase - env->phase, mark);
+  e = make_require_form(module_path, env->phase, phase - env->phase, mark);
 
   parse_requires(e, env->phase, base_modidx, env, for_m,
                  rns, post_ex_rns,
@@ -12808,7 +12818,7 @@ Scheme_Object *scheme_toplevel_require_for_expand(Scheme_Object *module_path,
 {
   Scheme_Object *form;
 
-  form = make_require_form(module_path, phase, mark);
+  form = make_require_form(module_path, phase, phase, mark);
 
   do_require_execute(cenv->genv, form);
 

racket/src/racket/src/schvers.h

@@ -13,12 +13,12 @@
    consistently.)
 */
 
-#define MZSCHEME_VERSION "6.2.0.2"
+#define MZSCHEME_VERSION "6.2"
 
 #define MZSCHEME_VERSION_X 6
 #define MZSCHEME_VERSION_Y 2
 #define MZSCHEME_VERSION_Z 0
-#define MZSCHEME_VERSION_W 2
+#define MZSCHEME_VERSION_W 0
 
 #define MZSCHEME_VERSION_MAJOR ((MZSCHEME_VERSION_X * 100) + MZSCHEME_VERSION_Y)
 #define MZSCHEME_VERSION_MINOR ((MZSCHEME_VERSION_Z * 1000) + MZSCHEME_VERSION_W)