5 files changed, 11 insertions, 24 deletions
diff --git a/lang/newlisp/files/patch-makefile_bsd b/lang/newlisp/files/patch-makefile_bsd
index 571a760fe154..1cf1c0dba230 100644
--- a/lang/newlisp/files/patch-makefile_bsd
+++ b/lang/newlisp/files/patch-makefile_bsd
@@ -1,6 +1,6 @@
---- makefile_bsd.orig
+--- makefile_bsd.orig	2015-01-19 17:10:12 UTC
 +++ makefile_bsd
-@@ -6,14 +6,12 @@
+@@ -6,14 +6,12 @@ OBJS = newlisp.o nl-symbol.o nl-math.o n
  
  # the option -fno-strict-aliasing may not be available on some BSD versions 
  
@@ -9,7 +9,7 @@
  # or without readline lib
  #CFLAGS = -m32 -Wall -Wno-uninitialized -Wno-strict-aliasing -O2 -c -g -D_BSD
  
--CC = gcc
+-CC = cc
 -
  default: $(OBJS)
 -	$(CC) $(OBJS) -m32 -g -lm -lreadline -lncurses -o newlisp
diff --git a/lang/newlisp/files/patch-makefile_bsdLP64_utf8 b/lang/newlisp/files/patch-makefile_bsdLP64_utf8
index ded11ad55d33..1ef889ff9666 100644
--- a/lang/newlisp/files/patch-makefile_bsdLP64_utf8
+++ b/lang/newlisp/files/patch-makefile_bsdLP64_utf8
@@ -1,6 +1,6 @@
---- makefile_bsdLP64_utf8.orig
+--- makefile_bsdLP64_utf8.orig	2015-01-19 17:10:12 UTC
 +++ makefile_bsdLP64_utf8
-@@ -6,14 +6,12 @@
+@@ -6,14 +6,12 @@ OBJS = newlisp.o nl-symbol.o nl-math.o n
  
  # the option -fno-strict-aliasing may not be available on some BSD versions 
  
@@ -9,7 +9,7 @@
  # or without readline lib
  #CFLAGS = -m64 -Wall -Wno-uninitialized -Wno-strict-aliasing -O2 -c -g -DNEWLISP64 -D_BSD
  
--CC = gcc
+-CC = cc
 -
  default: $(OBJS)
 -	$(CC) $(OBJS) -m64 -g -lm -lreadline -lncurses -o newlisp
diff --git a/lang/newlisp/files/patch-makefile_bsd_utf8 b/lang/newlisp/files/patch-makefile_bsd_utf8
index 111c50ee10c8..7270e9d33bd9 100644
--- a/lang/newlisp/files/patch-makefile_bsd_utf8
+++ b/lang/newlisp/files/patch-makefile_bsd_utf8
@@ -1,15 +1,15 @@
---- makefile_bsd_utf8.orig
+--- makefile_bsd_utf8.orig	2015-01-19 17:10:12 UTC
 +++ makefile_bsd_utf8
 @@ -4,14 +4,12 @@
  OBJS = newlisp.o nl-symbol.o nl-math.o nl-list.o nl-liststr.o nl-string.o nl-filesys.o \
- 	nl-sock.o nl-import.o nl-xml.o nl-web.o nl-matrix.o nl-debug.o nl-utf8.o pcre.o
+ 	nl-sock.o nl-import.o nl-xml-json.o nl-web.o nl-matrix.o nl-debug.o nl-utf8.o pcre.o
  
 -CFLAGS = -m32 -Wall -Wno-uninitialized -fno-strict-aliasing -O2 -c -g -DREADLINE -D_BSD -DSUPPORT_UTF8
 +CFLAGS += -m32 -c -DREADLINE -D_BSD -DSUPPORT_UTF8 -DFFI
  # or without readline lib
  #CFLAGS = -m32 -Wall -Wno-uninitialized -fno-strict-aliasing -O2 -c -g -D_BSD -DSUPPORT_UTF8
  
--CC = gcc
+-CC = cc
 -
  default: $(OBJS)
 -	$(CC) $(OBJS) -m32 -g -lm -lreadline -lncurses -o newlisp
diff --git a/lang/newlisp/files/patch-modules_gsl.lsp b/lang/newlisp/files/patch-modules_gsl.lsp
index 9a599c4e3cec..b81dcd79135b 100644
--- a/lang/newlisp/files/patch-modules_gsl.lsp
+++ b/lang/newlisp/files/patch-modules_gsl.lsp
@@ -1,8 +1,8 @@
---- modules/gsl.lsp.orig
+--- modules/gsl.lsp.orig	2015-05-23 14:58:26 UTC
 +++ modules/gsl.lsp
 @@ -169,6 +169,7 @@
  		(= ostype "Win32") "libgsl-0.dll" ; 32-bit
- 		(= ostype "OSX")   "libgsl.dylib" ; 32-bit
+ 		(= ostype "OSX")   "libgsl.dylib" ; 32-bit or 64-bit
  		(= ostype "Linux") "/usr/local/lib/libgsl.so" ; 32-bit or 64-bit
 +		(= ostype "BSD") "/usr/local/lib/libgsl.so" ; 32-bit or 64-bit
  	))
diff --git a/lang/newlisp/files/patch-newlisp.h b/lang/newlisp/files/patch-newlisp.h
deleted file mode 100644
index 83e502d12cfa..000000000000
--- a/lang/newlisp/files/patch-newlisp.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- newlisp.h.orig
-+++ newlisp.h
-@@ -36,6 +36,10 @@
- #  include <ffi.h>
- #endif
- 
-+#ifdef __FreeBSD__
-+#  include <ffi.h>
-+#endif
-+
- #define LIBFFI " libffi"
- #else /* not FFI */
- #define LIBFFI ""