diff --git a/srcpkgs/newlisp/patches/newlisp-path-10.7.0.patch b/srcpkgs/newlisp/patches/newlisp-path-10.7.0.patch
deleted file mode 100644
index c648d72dfe1..00000000000
--- a/srcpkgs/newlisp/patches/newlisp-path-10.7.0.patch
+++ /dev/null
@@ -1,706 +0,0 @@
-diff --git a/newlisp-10.7.0/Makefile b/newlisp-10.7.0/Makefile
-index 31dd127..43c85e5 100644
---- Makefile
-+++ Makefile
-@@ -9,7 +9,7 @@
- #
- # for 'make install' you have to login as 'root' else do 'make install_home'
- # note that 'make install_home' will not install guiserver files which
--# must be in /usr/local/share/newlisp in MacOX X and UNIX machines
-+# must be in /usr/share/newlisp in MacOX X and UNIX machines
- #
- # to make the distribution archive: 'make dist'
- #
-@@ -39,8 +39,8 @@ help:
- @echo "\nDo one of the following:"
- @echo " make # auto-select one of the predefined makefiles and build newLISP"
- @echo " make help # display this help"
-- @echo " make install # install on LINUX/UNIX in /usr/local/bin and /usr/local/share (need to be root)"
-- @echo " make uninstall # uninstall on LINUX/UNIX from /usr/local/bin and /usr/local/share (need to be root)"
-+ @echo " make install # install on LINUX/UNIX in /usr/bin and /usr/share (need to be root)"
-+ @echo " make uninstall # uninstall on LINUX/UNIX from /usr/bin and /usr/share (need to be root)"
- @echo " make install_home # install on LINUX/UNIX in users home directory "
- @echo " make uninstall_home # uninstall on LINUX/UNIX from users home directory "
- @echo
-diff --git a/newlisp-10.7.0/README b/newlisp-10.7.0/README
-index d16f1b3..3a274b3 100644
---- README
-+++ README
-@@ -100,7 +100,7 @@ MINIMUM INSTALL
- Note that for a minumum install only the executable newlisp or newlisp.exe
- in Win32 is necessary.
-
--On Mac OS X or other UNIX copy newlisp to /usr/local/bin or /usr/bin or ~/bin
-+On Mac OS X or other UNIX copy newlisp to /usr/bin or /usr/bin or ~/bin
- and give it executable permissions.
-
-
-diff --git a/newlisp-10.7.0/configure b/newlisp-10.7.0/configure
-index edd06f8..7343ec2 100755
---- configure
-+++ configure
-@@ -90,7 +90,7 @@ elif [ ${os_type} = LINUX ] ; then
- fi
- elif [ ${os_type} = _BSD ] ; then
- if [ ${memory_model} = LP64 ] ; then
-- if [ -f /usr/local/include/ffi.h ] ; then
-+ if [ -f /usr/include/ffi.h ] ; then
- cp makefile_bsdLP64_utf8_ffi makefile_build
- else
- cp makefile_bsdLP64_utf8 makefile_build
-diff --git a/newlisp-10.7.0/configure-alt b/newlisp-10.7.0/configure-alt
-index d1bdd8f..2676701 100755
---- configure-alt
-+++ configure-alt
-@@ -328,7 +328,7 @@ EOF
- esac
- done
-
--if [ -z "$prefix" ] ; then prefix="/usr/local"; fi
-+if [ -z "$prefix" ] ; then prefix="/usr"; fi
- if [ -z "$exec_prefix" ] ; then exec_prefix="$prefix"; fi
- if [ -z "$bindir" ] ; then bindir="${exec_prefix}/bin"; fi
- if [ -z "$datarootdir" ] ; then datarootdir="${prefix}/share"; fi
-diff --git a/newlisp-10.7.0/guiserver/Makefile b/newlisp-10.7.0/guiserver/Makefile
-index 18ccd88..0cda244 100644
---- guiserver/Makefile
-+++ guiserver/Makefile
-@@ -9,10 +9,10 @@ all:
- rm *.class
-
- install:
-- -install -d /usr/local/share/newlisp/guiserver
-- -install -d /usr/local/share/doc/newlisp/guiserver
-- -install -m 644 guiserver.jar /usr/local/share/newlisp/
-- -install -m 644 guiserver.lsp /usr/local/share/newlisp/
-- -install -m 644 index.html /usr/local/share/doc/newlisp/guiserver/
-- -install -m 644 guiserver.lsp.html /usr/local/share/doc/newlisp/guiserver/
-- -install -m 755 newlisp-edit.lsp /usr/local/bin/newlisp-edit
-+ -install -d /usr/share/newlisp/guiserver
-+ -install -d /usr/share/doc/newlisp/guiserver
-+ -install -m 644 guiserver.jar /usr/share/newlisp/
-+ -install -m 644 guiserver.lsp /usr/share/newlisp/
-+ -install -m 644 index.html /usr/share/doc/newlisp/guiserver/
-+ -install -m 644 guiserver.lsp.html /usr/share/doc/newlisp/guiserver/
-+ -install -m 755 newlisp-edit.lsp /usr/bin/newlisp-edit
-diff --git a/newlisp-10.7.0/guiserver/allfonts-demo.lsp b/newlisp-10.7.0/guiserver/allfonts-demo.lsp
-index 0af393b..8e8305a 100644
---- guiserver/allfonts-demo.lsp
-+++ guiserver/allfonts-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; allfonts-demo.lsp - show all fonts on the system
- ;; this program also demonstrates that strings can be used instead
-diff --git a/newlisp-10.7.0/guiserver/animation-demo.lsp b/newlisp-10.7.0/guiserver/animation-demo.lsp
-index ff78562..cc13a80 100644
---- guiserver/animation-demo.lsp
-+++ guiserver/animation-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; animation-demo.lsp - demonstrate gs:move-tag for making animations
- ;; and the mouse-wheel moving a text object
-diff --git a/newlisp-10.7.0/guiserver/border-layout-demo.lsp b/newlisp-10.7.0/guiserver/border-layout-demo.lsp
-index f319754..bc06855 100644
---- guiserver/border-layout-demo.lsp
-+++ guiserver/border-layout-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; border-layout-demo.lsp - demonstrate the border layout
-
-diff --git a/newlisp-10.7.0/guiserver/button-demo.lsp b/newlisp-10.7.0/guiserver/button-demo.lsp
-index 55234ad..7244dad 100644
---- guiserver/button-demo.lsp
-+++ guiserver/button-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ; button-demo.lsp - demonstrate the button control
-
-diff --git a/newlisp-10.7.0/guiserver/clipboard-demo.lsp b/newlisp-10.7.0/guiserver/clipboard-demo.lsp
-index 454db3f..6e3c9f8 100644
---- guiserver/clipboard-demo.lsp
-+++ guiserver/clipboard-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; clipboard-demo.lsp - demonstrate the gs:paste-text function
-
-diff --git a/newlisp-10.7.0/guiserver/cursor-demo.lsp b/newlisp-10.7.0/guiserver/cursor-demo.lsp
-index a4e5cf2..44a3fcb 100644
---- guiserver/cursor-demo.lsp
-+++ guiserver/cursor-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; cursor-demo - demonstrate cursor shapes with gs:set-cursor
-
-diff --git a/newlisp-10.7.0/guiserver/drag-demo.lsp b/newlisp-10.7.0/guiserver/drag-demo.lsp
-index 7d86eda..d366b1e 100644
---- guiserver/drag-demo.lsp
-+++ guiserver/drag-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; drag-demo.lsp - demonstrate dragging of objects with the mouse
- ;;
-diff --git a/newlisp-10.7.0/guiserver/font-demo.lsp b/newlisp-10.7.0/guiserver/font-demo.lsp
-index d3a072e..042958c 100644
---- guiserver/font-demo.lsp
-+++ guiserver/font-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; font-demo.lsp - show all built-in Java fonts (available on all platforms)
-
-diff --git a/newlisp-10.7.0/guiserver/frameless-demo.lsp b/newlisp-10.7.0/guiserver/frameless-demo.lsp
-index e792d6b..c28a64a 100644
---- guiserver/frameless-demo.lsp
-+++ guiserver/frameless-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
-
- ;; frameless-demo.lsp - frameless and transparent (on MacOS X)
-
-diff --git a/newlisp-10.7.0/guiserver/guiserver.lsp b/newlisp-10.7.0/guiserver/guiserver.lsp
-index 4879081..1d9d4db 100644
---- guiserver/guiserver.lsp
-+++ guiserver/guiserver.lsp
-@@ -40,7 +40,7 @@
- ;; Usage
- ;; At the beginning of the program file, include a 'load' statement for the module:
- ;;
--;; (load "/usr/local/share/newlisp/guiserver.lsp")
-+;; (load "/usr/share/newlisp/guiserver.lsp")
- ;;
- ;; or on MS Windows:
- ;;
-diff --git a/newlisp-10.7.0/guiserver/html-demo.lsp b/newlisp-10.7.0/guiserver/html-demo.lsp
-index bf92406..5996ef9 100644
---- guiserver/html-demo.lsp
-+++ guiserver/html-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; html-demo.lsp - demonstrate the text pane with HTML
-
-@@ -18,7 +18,7 @@
-
- (if (= ostype "Windows")
- (set 'url (string "file:///" (env "NEWLISPDIR") "/guiserver/html-demo.lsp"))
-- (set 'url "file:///usr/local/share/newlisp/guiserver/html-demo.lsp")
-+ (set 'url "file:///usr/share/newlisp/guiserver/html-demo.lsp")
- )
-
- (set 'page (format [text]
-diff --git a/newlisp-10.7.0/guiserver/image-demo.lsp b/newlisp-10.7.0/guiserver/image-demo.lsp
-index e7deaa5..7090a60 100644
---- guiserver/image-demo.lsp
-+++ guiserver/image-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; image-demo.lsp - demonstrate images rotating and zooming
- ;; and the mouse-wheel rotating an object
-diff --git a/newlisp-10.7.0/guiserver/java/guiserver.java b/newlisp-10.7.0/guiserver/java/guiserver.java
-index 834d383..8ab2016 100644
---- guiserver/java/guiserver.java
-+++ guiserver/java/guiserver.java
-@@ -83,7 +83,7 @@ public class guiserver extends gsObject
-
- portOut = portIn + 1;
-
-- if(MAC_OS_X) newlispPath = "/usr/local/bin/newlisp ";
-+ if(MAC_OS_X) newlispPath = "/usr/bin/newlisp ";
- else newlispPath = "newlisp ";
-
- if(args.length >= 2)
-diff --git a/newlisp-10.7.0/guiserver/midi-demo.lsp b/newlisp-10.7.0/guiserver/midi-demo.lsp
-index be44e1c..0a57b73 100644
---- guiserver/midi-demo.lsp
-+++ guiserver/midi-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
-
- ;; - midi-demo.lsp -
- ;;
-diff --git a/newlisp-10.7.0/guiserver/midi2-demo.lsp b/newlisp-10.7.0/guiserver/midi2-demo.lsp
-index 7021909..07d275c 100644
---- guiserver/midi2-demo.lsp
-+++ guiserver/midi2-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
-
- (load (append (env "NEWLISPDIR") "/guiserver.lsp"))
- (gs:init)
-diff --git a/newlisp-10.7.0/guiserver/mouse-demo.lsp b/newlisp-10.7.0/guiserver/mouse-demo.lsp
-index fc1bb85..3af8840 100644
---- guiserver/mouse-demo.lsp
-+++ guiserver/mouse-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; mouse-demo.lsp - demonstrate mouse handlers and gs:delete-tag
-
-diff --git a/newlisp-10.7.0/guiserver/move-resize-demo.lsp b/newlisp-10.7.0/guiserver/move-resize-demo.lsp
-index 7053e82..e98eec3 100644
---- guiserver/move-resize-demo.lsp
-+++ guiserver/move-resize-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ; move-resize-demo.lsp - demonstrate gs:window-moved and hs:window-resized events
-
-diff --git a/newlisp-10.7.0/guiserver/newlisp-edit.lsp b/newlisp-10.7.0/guiserver/newlisp-edit.lsp
-index 8b83296..16a3eb5 100644
---- guiserver/newlisp-edit.lsp
-+++ guiserver/newlisp-edit.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
-
- ; newlisp-edit.lsp - multiple tab LISP editor and support for running code from the editor
- ; needs 9.9.2 version minimum to run
-@@ -158,7 +158,7 @@
- (write-file file (base64-dec text)))
- (if (= ostype "Windows")
- (catch (exec (string {newlisp.exe "} currentScriptFile {" } file " > " (string file "out"))) 'result)
-- (catch (exec (string "/usr/local/bin/newlisp " currentScriptFile " " file)) 'result)
-+ (catch (exec (string "/usr/bin/newlisp " currentScriptFile " " file)) 'result)
- )
- (if (list? result)
- (begin
-@@ -226,7 +226,7 @@
- (gs:run-shell 'OutputArea
- (string newlispDir "/newlisp.exe") (string currentExtension " -C -w \"" $HOME "\""))
- (gs:run-shell 'OutputArea
-- (string "/usr/local/bin/newlisp") (string currentExtension " -C -w " $HOME))
-+ (string "/usr/bin/newlisp") (string currentExtension " -C -w " $HOME))
- )
- )
-
-diff --git a/newlisp-10.7.0/guiserver/pinballs-demo.lsp b/newlisp-10.7.0/guiserver/pinballs-demo.lsp
-index 238ad21..be97819 100644
---- guiserver/pinballs-demo.lsp
-+++ guiserver/pinballs-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;; pinballs-demo.lsp - demos animations and gs:check-event function
-
- ;; GS 1.05+
-diff --git a/newlisp-10.7.0/guiserver/properties-demo.lsp b/newlisp-10.7.0/guiserver/properties-demo.lsp
-index 8c97bbb..904f206 100644
---- guiserver/properties-demo.lsp
-+++ guiserver/properties-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; property-demo.lsp - demonstrate gs:get-screen and gs:get-version
-
-diff --git a/newlisp-10.7.0/guiserver/rotation-demo.lsp b/newlisp-10.7.0/guiserver/rotation-demo.lsp
-index 7a04945..20ed891 100644
---- guiserver/rotation-demo.lsp
-+++ guiserver/rotation-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; rotationn-demo.lsp - demonstrate gs:rotate-tag, gs:translate-tag and gs:scale-tag
- ;; and the mouse-wheel rotating an object
-diff --git a/newlisp-10.7.0/guiserver/shapes-demo.lsp b/newlisp-10.7.0/guiserver/shapes-demo.lsp
-index 66678e7..c679324 100644
---- guiserver/shapes-demo.lsp
-+++ guiserver/shapes-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; shapes-demo.lsp - demonstrate different lines, outlines and shapes
- ;; v.1.0
-diff --git a/newlisp-10.7.0/guiserver/sound-demo.lsp b/newlisp-10.7.0/guiserver/sound-demo.lsp
-index 9e0615c..5ebed02 100644
---- guiserver/sound-demo.lsp
-+++ guiserver/sound-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ; button-demo.lsp - demonstrate the button control
-
-diff --git a/newlisp-10.7.0/guiserver/stroke-demo.lsp b/newlisp-10.7.0/guiserver/stroke-demo.lsp
-index 8b3d81c..21698e8 100644
---- guiserver/stroke-demo.lsp
-+++ guiserver/stroke-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; strokes-demo.lsp - demonstrate strokes with round endings in different lines and outlines
- ;; v. 1.0
-diff --git a/newlisp-10.7.0/guiserver/table-demo.lsp b/newlisp-10.7.0/guiserver/table-demo.lsp
-index e7e0078..7115a74 100644
---- guiserver/table-demo.lsp
-+++ guiserver/table-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
-
- ; table-demo.lsp - demo of the table UI
-
-diff --git a/newlisp-10.7.0/guiserver/tabs-demo.lsp b/newlisp-10.7.0/guiserver/tabs-demo.lsp
-index b6d6b75..e19849d 100644
---- guiserver/tabs-demo.lsp
-+++ guiserver/tabs-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; tabs-demo.lsp - demonstrate tabs and icons
- ;; for 10.6.3 ideprecated gs:table-set-row-number was replaced with gs:table-show-row-number
-diff --git a/newlisp-10.7.0/guiserver/textfield-demo.lsp b/newlisp-10.7.0/guiserver/textfield-demo.lsp
-index 0744b17..c5f1e06 100644
---- guiserver/textfield-demo.lsp
-+++ guiserver/textfield-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ; textfield-demo.lsp - demonstrate the test-field widget
-
-diff --git a/newlisp-10.7.0/guiserver/textrot-demo.lsp b/newlisp-10.7.0/guiserver/textrot-demo.lsp
-index fe54ce6..1d6ad28 100644
---- guiserver/textrot-demo.lsp
-+++ guiserver/textrot-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; textrot-demo.lsp - demonstrate gs:rotate-tag on text
- ;; and the mouse-wheel rotating an object
-diff --git a/newlisp-10.7.0/guiserver/widgets-demo-jp.lsp b/newlisp-10.7.0/guiserver/widgets-demo-jp.lsp
-index c8af744..8bc7e0c 100644
---- guiserver/widgets-demo-jp.lsp
-+++ guiserver/widgets-demo-jp.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; widgets-demo.lsp - demonstrate all widgets
-
-diff --git a/newlisp-10.7.0/guiserver/widgets-demo-ru.lsp b/newlisp-10.7.0/guiserver/widgets-demo-ru.lsp
-index 88412a4..81233df 100644
---- guiserver/widgets-demo-ru.lsp
-+++ guiserver/widgets-demo-ru.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; widgets-demo.lsp - demonstrate all widgets
-
-diff --git a/newlisp-10.7.0/guiserver/widgets-demo.lsp b/newlisp-10.7.0/guiserver/widgets-demo.lsp
-index f7a6152..f0c506c 100644
---- guiserver/widgets-demo.lsp
-+++ guiserver/widgets-demo.lsp
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/newlisp
-+#!/usr/bin/newlisp
- ;;
- ;; widgets-demo.lsp - demonstrate all widgets
-
-diff --git a/newlisp-10.7.0/makefile_linuxLP64_ffi b/newlisp-10.7.0/makefile_linuxLP64_ffi
-index b3bb23b..0d046c5 100644
---- makefile_linuxLP64_ffi
-+++ makefile_linuxLP64_ffi
-@@ -6,7 +6,7 @@
- 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 pcre.o
-
--CFLAGS = -fPIC -m64 -Wall -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DNEWLISP64 -DLINUX -DFFI -I/usr/local/lib/libffi-3.0.13/include
-+CFLAGS = -fPIC -m64 -Wall -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DNEWLISP64 -DLINUX -DFFI -I/usr/lib/libffi-3.0.13/include
-
- CC = gcc
-
-diff --git a/newlisp-10.7.0/makefile_linux_ffi b/newlisp-10.7.0/makefile_linux_ffi
-index 9d985aa..a83d48b 100644
---- makefile_linux_ffi
-+++ makefile_linux_ffi
-@@ -6,7 +6,7 @@
- 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 pcre.o
-
--CFLAGS = -m32 -Wall -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DLINUX -DFFI -I/usr/local/lib/libffi-3.0.13/include
-+CFLAGS = -m32 -Wall -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DLINUX -DFFI -I/usr/lib/libffi-3.0.13/include
-
- CC = gcc
-
-diff --git a/newlisp-10.7.0/makefile_linux_utf8_ffi b/newlisp-10.7.0/makefile_linux_utf8_ffi
-index 9b020e7..9e6a990 100644
---- makefile_linux_utf8_ffi
-+++ makefile_linux_utf8_ffi
-@@ -6,7 +6,7 @@
- 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 -m32 -Wall -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DSUPPORT_UTF8 -DLINUX -DFFI -I/usr/local/lib/libffi-3.0.13/include
-+CFLAGS = -fPIC -m32 -Wall -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DSUPPORT_UTF8 -DLINUX -DFFI -I/usr/lib/libffi-3.0.13/include
-
- CC = gcc
-
-diff --git a/newlisp-10.7.0/makefile_original_install b/newlisp-10.7.0/makefile_original_install
-index 1801aa2..53ee27c 100644
---- makefile_original_install
-+++ makefile_original_install
-@@ -6,16 +6,16 @@ VERSION=10.7.0
- # run in an environment, where NEWLISPDIR is predefined,
- # else NEWLISPDIR will be defined during newlisp startup
- # as /usr/share/newlisp which is hardcoded in newlisp.c
--prefix=/usr/local
-+prefix=/usr
- datadir=$(prefix)/share
- bindir=$(prefix)/bin
- mandir=$(prefix)/share/man
-
--# if prefix is not /usr/local then several places in the file
-+# if prefix is not /usr then several places in the file
- # guiserver/newlisp-edit.lsp must change too
- GUISERVER = $(prefix)/share/newlisp/guiserver
-
--# this is the standard install in /usr/local/bin and /usr/local/share
-+# this is the standard install in /usr/bin and /usr/share
- # which as to be done as 'root' with supersuser permissions
- # for an install in your home directory use make install_home
- #
-diff --git a/newlisp-10.7.0/modules/ftp.lsp b/newlisp-10.7.0/modules/ftp.lsp
-index cc2e05a..fa52b2c 100644
---- modules/ftp.lsp
-+++ modules/ftp.lsp
-@@ -10,7 +10,7 @@
- ;; To use the module put a 'load' statement at beginning of your
- ;; program file:
- ;;
--;; (load "/usr/local/share/newlisp/modules/ftp.lsp")
-+;; (load "/usr/share/newlisp/modules/ftp.lsp")
- ;; ; or shorter
- ;; (module "ftp.lsp")
- ;;
-diff --git a/newlisp-10.7.0/modules/gsl.lsp b/newlisp-10.7.0/modules/gsl.lsp
-index 3df1601..aac4f32 100644
---- modules/gsl.lsp
-+++ modules/gsl.lsp
-@@ -169,7 +169,7 @@
- (if
- (= ostype "Windows") "libgsl-0.dll" ; 32-bit or 64-bit
- (= ostype "OSX") "libgsl.dylib" ; 32-bit or 64-bit
-- (= ostype "Linux") "/usr/local/lib/libgsl.so" ; 32-bit or 64-bit
-+ (= ostype "Linux") "/usr/lib/libgsl.so" ; 32-bit or 64-bit
- ))
-
- ; load libgslcblas which contans functions referenced by libgsl
-@@ -179,7 +179,7 @@
- ; On windows the library is automatically loaded by libgsl-0.dll.
- (if
- (= ostype "OSX") (import "libgslcblas.dylib" "cblas_sdsdot")
-- (= ostype "Linux") (import "/usr/local/lib/libgslcblas.so" "cblas_sdsdot")
-+ (= ostype "Linux") (import "/usr/lib/libgslcblas.so" "cblas_sdsdot")
- )
-
- ; structs are defined but only needed for debugging, instead use "void*"
-diff --git a/newlisp-10.7.0/modules/infix.lsp b/newlisp-10.7.0/modules/infix.lsp
-index 91f0478..9a44a72 100644
---- modules/infix.lsp
-+++ modules/infix.lsp
-@@ -12,7 +12,7 @@
- ;; At the beginning od the program using this module include the following
- ;; statement:
- ;;
--;; (load "/usr/local/share/newlisp/modules/infix.lsp")
-+;; (load "/usr/share/newlisp/modules/infix.lsp")
- ;; ; or shorter
- ;; (module "infix.lsp")
- ;;
-diff --git a/newlisp-10.7.0/modules/mysql.lsp b/newlisp-10.7.0/modules/mysql.lsp
-index d2b8093..30f35c0 100644
---- modules/mysql.lsp
-+++ modules/mysql.lsp
-@@ -25,22 +25,22 @@
- ;; Requirements
- ;; At the beginning of the program file include a 'load' statement for the module:
- ;;
--;; (load "/usr/local/share/newlisp/modules/mysql.lsp")
-+;; (load "/usr/share/newlisp/modules/mysql.lsp")
- ;; ; or shorter
- ;; (module "mysql.lsp")
- ;;
- ;;
- ;; A version of 'libmysqlclient' for a specific platform is required:
- ;;
--;; on LINUX/UNIX: '/usr/local/mysql/lib/libmysqlclient.so'
--;; on Mac OS X: '/usr/local/mysql/lib/libmysqlclient.dylib'
-+;; on LINUX/UNIX: '/usr/mysql/lib/libmysqlclient.so'
-+;; on Mac OS X: '/usr/mysql/lib/libmysqlclient.dylib'
- ;;
- ;; This library is installed when using the Mac OS X x86 installer .dmg package
- ;; from @link http://www.mysql.com http://www.mysql.com
- ;;
- ;; To compile MySQL with client libraries use:
- ;;
--;; './configure --prefix=/usr/local --enable-shared'
-+;; './configure --prefix=/usr --enable-shared'
- ;;
- ;; This library might be in a different location on a particular
- ;; installation of MySQL or have a different name.
-@@ -115,13 +115,13 @@
- (set 'NEWLISP64 (not (zero? (& (sys-info -1) 256))))
-
- (set 'files '(
-- "/usr/local/lib/libmysqlclient.so.20.0" ; OpenBSD 4.9
-+ "/usr/lib/libmysqlclient.so.20.0" ; OpenBSD 4.9
- "/usr/lib/libmysqlclient.so" ; Linux, UNIX
- "/usr/lib/mysql/libmysqlclient.so" ; Linux Fedora
- "/usr/lib64/mysql/libmysqlclient.so" ; Linux Fedora CentOS 6.x
- "/usr/lib/x86_64-linux-gnu/libmysqlclient.so" ; Ubuntu 12.04 LTS
-- "/usr/local/mysql/lib/libmysqlclient.so" ; Linux, UNIX
-- "/usr/local/mysql/lib/libmysqlclient.dylib" ; MacOS X
-+ "/usr/mysql/lib/libmysqlclient.so" ; Linux, UNIX
-+ "/usr/mysql/lib/libmysqlclient.dylib" ; MacOS X
- "/usr/lib/libmysqlclient.dylib" ; MacOS X
- ))
-
-diff --git a/newlisp-10.7.0/modules/pop3.lsp b/newlisp-10.7.0/modules/pop3.lsp
-index e0ad151..75c52ef 100644
---- modules/pop3.lsp
-+++ modules/pop3.lsp
-@@ -16,7 +16,7 @@
- ;;
- ;; To use the module put a 'load' statement at the top of your file:
- ;;
--;; (load "/usr/local/share/newlisp/modules/pop3.lsp")
-+;; (load "/usr/share/newlisp/modules/pop3.lsp")
- ;; ; or shorter
- ;; (module "pop3")
- ;;
-diff --git a/newlisp-10.7.0/modules/postgres.lsp b/newlisp-10.7.0/modules/postgres.lsp
-index 0fe5ec5..e1a69cb 100644
---- modules/postgres.lsp
-+++ modules/postgres.lsp
-@@ -139,11 +139,11 @@
- (append (first pg_lib_dir) "/libpq.dll") ; Windows lib
- ))
- (set 'files '(
-- "/usr/local/lib/libpq.so.5.1" ; OpenBSD 4.6
-+ "/usr/lib/libpq.so.5.1" ; OpenBSD 4.6
- "/usr/lib/libpq.so" ; CentOS or other Linux
- "/usr/lib64/libpq.so" ; Linux 64bit
- "/usr/lib/libpq.so.5.1" ; Debian
-- "/usr/local/pgsql/lib/libpq.dylib" ; Mac OS X
-+ "/usr/pgsql/lib/libpq.dylib" ; Mac OS X
- "c:/Program Files/PostgreSQL/8.3/bin/libpq.dll" ; Win32
- )))
-
-diff --git a/newlisp-10.7.0/modules/sqlite3.lsp b/newlisp-10.7.0/modules/sqlite3.lsp
-index 0fa574d..f26b60a 100644
---- modules/sqlite3.lsp
-+++ modules/sqlite3.lsp
-@@ -91,9 +91,9 @@
- ;
- (set 'files (list
- "/usr/lib/libsqlite3.so" ; SuSE Linux
-- "/usr/local/lib/libsqlite3.so" ; Linux, BSD, Solaris
-+ "/usr/lib/libsqlite3.so" ; Linux, BSD, Solaris
- "/usr/pkg/lib/libsqlite3.so" ; NetBSD
-- "/usr/local/lib/libsqlite3.so.13.3" ; OpenBSD 4.6
-+ "/usr/lib/libsqlite3.so.13.3" ; OpenBSD 4.6
- "/usr/lib/libsqlite3.0.dylib" ; Mac OSX Darwin
- "/usr/lib64/libsqlite3.so" ; for 64Bit Fedora CentOS 6 Linux
- "/usr/lib/x86_64-linux-gnu/libsqlite3.so" ; for UBUNTU 64-bit
-diff --git a/newlisp-10.7.0/modules/xmlrpc-client.lsp b/newlisp-10.7.0/modules/xmlrpc-client.lsp
-index 0e8f38e..4a80254 100644
---- modules/xmlrpc-client.lsp
-+++ modules/xmlrpc-client.lsp
-@@ -13,7 +13,7 @@
- ;; Functions for XML-RPC client
- ;; To use this module include a 'load' statement at the beginning of the program:
- ;;
--;; (load "/usr/local/share/newlisp/modules/xmlrpc-client.lsp")
-+;; (load "/usr/share/newlisp/modules/xmlrpc-client.lsp")
- ;; ; or shorter
- ;; (module "xmlrpc-client.lsp")
- ;;
-diff --git a/newlisp-10.7.0/modules/zlib.lsp b/newlisp-10.7.0/modules/zlib.lsp
-index 5ab53d9..f00311d 100644
---- modules/zlib.lsp
-+++ modules/zlib.lsp
-@@ -20,7 +20,7 @@
- ;;
- ;; Before using the module it must be loaded:
- ;;
--;; (load "/usr/local/share/newlisp/modules/zlib.lsp")
-+;; (load "/usr/share/newlisp/modules/zlib.lsp")
- ;; ; or shorter
- ;; (module "zlib.lsp")
- ;;
-diff --git a/newlisp-10.7.0/newlisp.c b/newlisp-10.7.0/newlisp.c
-index 10dbeb5..b25d3aa 100644
---- newlisp.c
-+++ newlisp.c
-@@ -467,7 +467,7 @@ int i, len, nlen;
- int found = FALSE;
-
- path_list = getenv("PATH");
--if (!path_list) path_list = "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin";
-+if (!path_list) path_list = "/bin:/sbin:/usr/bin:/usr/sbin:/usr/bin";
-
- len = strlen(path_list);
- nlen = strlen(name);
-diff --git a/newlisp-10.7.0/newlisp.h b/newlisp-10.7.0/newlisp.h
-index fa307d0..81015ba 100644
---- newlisp.h
-+++ newlisp.h
-@@ -37,7 +37,7 @@
- #ifdef NEWCONFIG
- #include "config.h"
- #else
--#define NEWLISPDIR "/usr/local/share/newlisp"
-+#define NEWLISPDIR "/usr/share/newlisp"
- #endif
-
- /* force ISO_C90 restrictions */
-diff --git a/newlisp-10.7.0/util/sql.c b/newlisp-10.7.0/util/sql.c
-index 66949c1..33291e5 100644
---- util/sql.c
-+++ util/sql.c
-@@ -29,10 +29,10 @@
- #include
-
- #ifdef MACOSX
--#include "/usr/local/mysql/include/mysql.h"
--#include "/usr/local/mysql/include/mysql_com.h"
--#include "/usr/local/mysql/include/mysql_version.h"
--#include "/usr/local/mysql/include/my_alloc.h"
-+#include "/usr/mysql/include/mysql.h"
-+#include "/usr/mysql/include/mysql_com.h"
-+#include "/usr/mysql/include/mysql_version.h"
-+#include "/usr/mysql/include/my_alloc.h"
- #endif
-
- #ifdef LINUX
-
diff --git a/srcpkgs/newlisp/template b/srcpkgs/newlisp/template
index 7201e2e1c31..33cf00ce772 100644
--- a/srcpkgs/newlisp/template
+++ b/srcpkgs/newlisp/template
@@ -1,14 +1,14 @@
# Template file for 'newlisp'
pkgname=newlisp
-version=10.7.1
-revision=4
+version=10.7.5
+revision=1
makedepends="readline-devel libffi-devel"
short_desc="Lisp-like, general-purpose scripting language"
maintainer="Orphaned "
-license="GPL-3, zlib, $pkgname"
+license="GPL-3.0-only, GFDL-1.2-only, Zlib, $pkgname, BSD-3-Clause"
homepage="http://www.newlisp.org"
distfiles="$homepage/downloads/$pkgname-$version.tgz"
-checksum=2e300c8bed365a564d284bf3ad6c49e036256e7fc3f469ebda0b45e6e196a7cc
+checksum=dc2d0ff651c2b275bc4af3af8ba59851a6fb6e1eaddc20ae75fb60b1e90126ec
do_build() {
case "$XBPS_TARGET_MACHINE" in
@@ -25,6 +25,7 @@ do_install() {
mandir=$DESTDIR/usr/share/man install
mv $DESTDIR/usr/share/doc/$pkgname/COPYING \
$DESTDIR/usr/share/licenses/$pkgname
+ vlicense doc/COPYING
# Create newlisp symlink;
ln -sf newlisp-${version} ${DESTDIR}/usr/bin/newlisp