From ae0155c75e351cae0a6bcc7a5c22a40375c69797 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 6 Jun 2014 07:40:01 +0200
Subject: [PATCH] newlisp: update to 10.6.0.

---
 srcpkgs/newlisp/patches/build-fixes.patch     |  8 ++--
 .../newlisp/patches/readline-6.3-compat.patch | 45 -------------------
 srcpkgs/newlisp/template                      |  6 +--
 3 files changed, 7 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/newlisp/patches/readline-6.3-compat.patch

diff --git a/srcpkgs/newlisp/patches/build-fixes.patch b/srcpkgs/newlisp/patches/build-fixes.patch
index fc738f4d632..6ca5273c0f1 100644
--- a/srcpkgs/newlisp/patches/build-fixes.patch
+++ b/srcpkgs/newlisp/patches/build-fixes.patch
@@ -1,11 +1,11 @@
---- makefile_linuxLP64_utf8_ffi.orig	2014-02-04 05:54:47.936548993 +0100
-+++ makefile_linuxLP64_utf8_ffi	2014-02-04 05:55:29.512872972 +0100
+--- makefile_linuxLP64_utf8_ffi.orig	2014-06-06 07:35:14.274686902 +0200
++++ makefile_linuxLP64_utf8_ffi	2014-06-06 07:39:18.871490802 +0200
 @@ -6,16 +6,15 @@
  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-json.o nl-web.o nl-matrix.o nl-debug.o nl-utf8.o pcre.o
  
--CFLAGS = -fPIC -m64 -Wall -pedantic -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DSUPPORT_UTF8 -DNEWLISP64 -DLINUX -DFFI -I/usr/local/lib/libffi-3.0.13/include 
-+CFLAGS += -fPIC -Wall -pedantic -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -DREADLINE -DSUPPORT_UTF8 -DLINUX -DFFI
+-CFLAGS = -fPIC -m64 -Wall -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DSUPPORT_UTF8 -DNEWLISP64 -DLINUX -DFFI -I/usr/local/lib/libffi-3.0.13/include 
++CFLAGS += -fPIC -Wall -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -DREADLINE -DSUPPORT_UTF8 -DNEWLISP64 -DLINUX -DFFI
  
 -CC = gcc
 +CC ?= gcc
diff --git a/srcpkgs/newlisp/patches/readline-6.3-compat.patch b/srcpkgs/newlisp/patches/readline-6.3-compat.patch
deleted file mode 100644
index 5ed8a50d265..00000000000
--- a/srcpkgs/newlisp/patches/readline-6.3-compat.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- newlisp.c.orig	2014-02-27 16:58:59.139505509 +0100
-+++ newlisp.c	2014-02-27 17:03:18.657517089 +0100
-@@ -129,7 +129,7 @@ char preLoad[] =
-     "(set (global 'module) (fn ($x) (load (append (env {NEWLISPDIR}) {/modules/} $x))))";
- void printHelpText(void);
- #ifdef READLINE
--char ** newlisp_completion (char * text, int start, int end);
-+char ** newlisp_completion (const char * text, int start, int end);
- #endif
- /* --------------------- globals -------------------------------------- */
- 
-@@ -885,7 +885,7 @@ if(errorReg && !isNil((CELL*)errorEvent-
- 
- #ifdef READLINE
- rl_readline_name = "newlisp";
--rl_attempted_completion_function = (CPPFunction *)newlisp_completion;
-+rl_attempted_completion_function = newlisp_completion;
- #if defined(LINUX) || defined(_BSD)
- /* in Bash .inputrc put 'set blink-matching-paren on' */
- rl_set_paren_blink_timeout(300000); /* 300 ms */
-@@ -940,7 +940,7 @@ return 0;
- #endif
- 
- #ifdef READLINE
--char * command_generator(char * text, int state)
-+char * command_generator(const char * text, int state)
- {
- static int list_index, len, clen;
- char * name;
-@@ -968,12 +968,12 @@ return ((char *)NULL);
- #ifdef _BSD
- extern char **completion_matches PARAMS((char *, rl_compentry_func_t *));
- #else
--char ** completion_matches(const char * text, CPFunction commands);
-+char ** completion_matches(const char * text, rl_compentry_func_t commands);
- #endif
- 
--char ** newlisp_completion (char * text, int start, int end)
-+char ** newlisp_completion (const char * text, int start, int end)
- {
--return(completion_matches(text, (CPFunction *)command_generator));
-+return(completion_matches(text, command_generator));
- }
- #endif /* READLINE */
- 
diff --git a/srcpkgs/newlisp/template b/srcpkgs/newlisp/template
index 1068fa73bb0..c0bf43ae373 100644
--- a/srcpkgs/newlisp/template
+++ b/srcpkgs/newlisp/template
@@ -1,7 +1,7 @@
 # Template file for 'newlisp'
 pkgname=newlisp
-version=10.5.4
-revision=3
+version=10.6.0
+revision=1
 hostmakedepends="which"
 makedepends="readline-devel>=6.3 libffi-devel"
 short_desc="Lisp-like, general-purpose scripting language"
@@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3, zlib, $pkgname"
 homepage="http://www.newlisp.org"
 distfiles="$homepage/downloads/$pkgname-$version.tgz"
-checksum=e4561e03c89e7c89a30dfa7daf12091085a474e96b0fbbb4ee62454463175eb0
+checksum=59200b97879231c331f6c0e519a66602c9ae82a8f744c2be236e08ad6f91ff7f
 
 do_build() {
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then