From 42b5cfe8b275ac227def2d2ca4085082fbc4d785 Mon Sep 17 00:00:00 2001
From: Asumu Takikawa <asumu@ccs.neu.edu>
Date: Thu, 27 Jun 2013 22:17:15 -0400
Subject: [PATCH] Use racket/cmdline instead of mzlib/cmdline

This should fix the build
---
 racket/src/racket/gc2/xform-mod.rkt | 106 ++++++++++++++--------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/racket/src/racket/gc2/xform-mod.rkt b/racket/src/racket/gc2/xform-mod.rkt
index 2823be2235..4bdc71dae2 100644
--- a/racket/src/racket/gc2/xform-mod.rkt
+++ b/racket/src/racket/gc2/xform-mod.rkt
@@ -1,6 +1,6 @@
 (module xform-mod mzscheme
   (require (lib "xform.rkt" "compiler" "private")
-	   mzlib/cmdline)
+	   racket/cmdline)
 
   (define precompiling-header? (getenv "XFORM_PRECOMP"))
   (define precompiled-header (getenv "XFORM_USE_PRECOMP"))
@@ -23,58 +23,58 @@
   (define file-out #f)
 
   (command-line
-   "xform"
-   (current-command-line-arguments)
-   [once-each
-    [("--setup") dir "ignored; for compatbility with makefile"
-     (void)]
-    [("--precompile") "generate precompiled header; or set XFORM_PRECOMP"
-     (set! precompiling-header? #t)]
-    [("--precompiled") file "select precompiled header; or set XFORM_USE_PRECOMP"
-     (set! precompiled-header file)]
-    [("--notes") "enable notes in generated code"
-     (set! show-info? #t)]
-    [("--depends") "generate dependency information"
-     (set! output-depends-info? #t)]
-    #;
-    [("--palm") "PalmOS splitting"
-     (set! palm? #t)
-     (set! pgc? #f)
-     (set! pgc-really? #f)]
-    [("--keep-lines") "keep source line information"
-     (set! keep-lines? #t)]
-    [("--cgc") "conservative collection mode"
-     (set! pgc-really? #f)]
-    [("--cpp") cmdline "set CPP command line"
-     (set! cpp cmdline)]
-    [("-o") dest-file "name destination file"
-     (set! file-out dest-file)]
-    [("--indirect") "access GC_variable_stack through functions"
-     (set! gc-variable-stack-through-funcs? #t)]
-    [("--D-via-include") "implement +D via -include"
-     (set! def-via-include? #t)]]
-   [multi
-    [("+D") def "add CPP -D flag"
-     (cond
-      [def-via-include?
-       ;; This mode is useful when command-line argument parsing
-       ;; breaks down in corner cases, such as when using a Cygwin
-       ;; build of gcc.
-       (define fn (format "def~a.inc" include-counter))
-       (set! include-counter (add1 include-counter))
-       (define m (regexp-match #rx"^([^=]+)=(.*)$" def))
-       (call-with-output-file fn
-	 (lambda (out)
-	   (fprintf out "#define ~a ~a\n" (cadr m) (caddr m)))
-	 'truncate/replace)
-       (set! cpp (string-append cpp (format " -include ~a" fn)))]
-      [else
-       (set! cpp (string-append cpp " -D" 
-				(if (eq? (system-type) 'windows)
-				    def
-				    (regexp-replace* "[ \"]" def "'\\0'"))))])]]
-   [args (file)
-	 (set! file-in file)])
+   #:program "xform"
+   #:argv (current-command-line-arguments)
+   #:once-each
+   [("--setup") dir "ignored; for compatbility with makefile"
+    (void)]
+   [("--precompile") "generate precompiled header; or set XFORM_PRECOMP"
+    (set! precompiling-header? #t)]
+   [("--precompiled") file "select precompiled header; or set XFORM_USE_PRECOMP"
+    (set! precompiled-header file)]
+   [("--notes") "enable notes in generated code"
+    (set! show-info? #t)]
+   [("--depends") "generate dependency information"
+    (set! output-depends-info? #t)]
+   #;
+   [("--palm") "PalmOS splitting"
+    (set! palm? #t)
+    (set! pgc? #f)
+    (set! pgc-really? #f)]
+   [("--keep-lines") "keep source line information"
+    (set! keep-lines? #t)]
+   [("--cgc") "conservative collection mode"
+    (set! pgc-really? #f)]
+   [("--cpp") cmdline "set CPP command line"
+    (set! cpp cmdline)]
+   [("-o") dest-file "name destination file"
+    (set! file-out dest-file)]
+   [("--indirect") "access GC_variable_stack through functions"
+    (set! gc-variable-stack-through-funcs? #t)]
+   [("--D-via-include") "implement +D via -include"
+    (set! def-via-include? #t)]
+   #:multi
+   [("+D") def "add CPP -D flag"
+    (cond
+     [def-via-include?
+      ;; This mode is useful when command-line argument parsing
+      ;; breaks down in corner cases, such as when using a Cygwin
+      ;; build of gcc.
+      (define fn (format "def~a.inc" include-counter))
+      (set! include-counter (add1 include-counter))
+      (define m (regexp-match #rx"^([^=]+)=(.*)$" def))
+      (call-with-output-file fn
+        (lambda (out)
+          (fprintf out "#define ~a ~a\n" (cadr m) (caddr m)))
+        'truncate/replace)
+      (set! cpp (string-append cpp (format " -include ~a" fn)))]
+     [else
+      (set! cpp (string-append cpp " -D"
+                               (if (eq? (system-type) 'windows)
+                                   def
+                                   (regexp-replace* "[ \"]" def "'\\0'"))))])]
+   #:args (file)
+          (set! file-in file))
 
   (xform #t cpp
 	 file-in