From 46a18a539ab31fb3d1ffccc1fea684d9eab149df Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Wed, 15 May 2013 21:18:03 -0700
Subject: newlisp: fix patch line endings

Closes #19855.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Formula/newlisp.rb | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

(limited to 'Library')

diff --git a/Library/Formula/newlisp.rb b/Library/Formula/newlisp.rb
index 4bdb42e8f..5ba1e4b48 100644
--- a/Library/Formula/newlisp.rb
+++ b/Library/Formula/newlisp.rb
@@ -7,12 +7,6 @@ class Newlisp < Formula
 
   depends_on 'readline'
 
-  # Patch newlisp-edit to work with Homebrew installation.
-  # Can be removed in 10.4.6
-  def patches
-    DATA
-  end
-
   def install
     # Required to use our configuration
     ENV.append_to_cflags "-DNEWCONFIG -c"
@@ -29,6 +23,10 @@ class Newlisp < Formula
     EOS
   end
 
+  def patches
+    DATA
+  end
+
   # Use the IDE to test a complete installation
   def test
     system "#{bin}/newlisp-edit"
@@ -42,32 +40,33 @@ __END__
 @@ -1,4 +1,4 @@
 -#!/usr/bin/newlisp
 +#!/usr/bin/env newlisp
-
+ 
  ; newlisp-edit.lsp - multiple tab LISP editor and support for running code from the editor
  ; needs 9.9.2 version minimum to run
 @@ -17,7 +17,7 @@
  (set 'newlispDir (env "NEWLISPDIR"))
-
- (set 'newlispDoc (if (= ostype "Win32")
+ 
+ (set 'newlispDoc (if (= ostype "Win32") 
 -	newlispDir (replace "newlisp" (copy newlispDir) "doc/newlisp")))
 +	newlispDir (join (reverse (cons "doc/newlisp" (rest (reverse (parse newlispDir "/"))))) "/")))
-
+ 
  (load (string newlispDir "/guiserver.lsp"))
-
+ 
 @@ -155,7 +155,7 @@
-			(write-file file (base64-dec text)))
-		(if (= ostype "Win32")
-			(catch (exec (string {newlisp.exe "} currentScriptFile {" } file " > " (string file "out"))) 'result)
+ 			(write-file file (base64-dec text)))
+ 		(if (= ostype "Win32")
+ 			(catch (exec (string {newlisp.exe "} currentScriptFile {" } file " > " (string file "out"))) 'result)
 -			(catch (exec (string "/usr/bin/newlisp " currentScriptFile " " file)) 'result)
-+			(catch (exec (string "HOMEBREW_PREFIX/bin/newlisp " currentScriptFile " " file)) 'result)
-		)
-		(if (list? result)
-			(begin
++			(catch (exec (string "/usr/local/bin/newlisp " currentScriptFile " " file)) 'result)
+ 		)
+ 		(if (list? result)
+ 			(begin
 @@ -223,7 +223,7 @@
-		(gs:run-shell 'OutputArea
-			(string newlispDir "/newlisp.exe " currentExtension " -C -w \"" $HOME "\""))
-		(gs:run-shell 'OutputArea
+ 		(gs:run-shell 'OutputArea 
+ 			(string newlispDir "/newlisp.exe " currentExtension " -C -w \"" $HOME "\""))
+ 		(gs:run-shell 'OutputArea 
 -			(string "/usr/bin/newlisp " currentExtension " -C -w " $HOME))
-+			(string "HOMEBREW_PREFIX/bin/newlisp " currentExtension " -C -w " $HOME))
-	)
++			(string "/usr/local/bin/newlisp " currentExtension " -C -w " $HOME))
+ 	)
  )
+ 
-- 
cgit v1.2.3