diff options
Diffstat (limited to 'lang/newlisp/files')
| -rw-r--r-- | lang/newlisp/files/patch-makefile__original__install | 24 | ||||
| -rw-r--r-- | lang/newlisp/files/patch-makefile_bsd | 4 | ||||
| -rw-r--r-- | lang/newlisp/files/patch-makefile_bsdLP64_utf8 | 10 | ||||
| -rw-r--r-- | lang/newlisp/files/patch-modules_gsl.lsp | 8 |
4 files changed, 35 insertions, 11 deletions
diff --git a/lang/newlisp/files/patch-makefile__original__install b/lang/newlisp/files/patch-makefile__original__install new file mode 100644 index 000000000000..3c6d4f9bf7f7 --- /dev/null +++ b/lang/newlisp/files/patch-makefile__original__install @@ -0,0 +1,24 @@ +--- makefile_original_install.orig 2019-05-12 16:44:17 UTC ++++ makefile_original_install +@@ -6,10 +6,10 @@ VERSION=10.7.5 + # 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=$(DESTDIR)$(PREFIX) + datadir=$(prefix)/share + bindir=$(prefix)/bin +-mandir=$(prefix)/share/man ++mandir=$(prefix)/man + + # this is the standard install in /usr/local/bin and /usr/local/share + # which as to be done as 'root' with supersuser permissions +@@ -29,7 +29,7 @@ install: + -install -d $(datadir)/doc/newlisp + -rm $(bindir)/newlisp + -install -m 755 newlisp $(bindir)/newlisp-$(VERSION) +- -ln -s $(bindir)/newlisp-$(VERSION) $(bindir)/newlisp ++ -ln -s newlisp-$(VERSION) $(bindir)/newlisp + -install -m 755 util/newlispdoc $(bindir)/newlispdoc + -install -m 644 util/syntax.cgi $(datadir)/newlisp/util/syntax.cgi + -install -m 644 util/newlisp.vim $(datadir)/newlisp/util/newlisp.vim diff --git a/lang/newlisp/files/patch-makefile_bsd b/lang/newlisp/files/patch-makefile_bsd index 1cf1c0dba230..73604582b6e5 100644 --- a/lang/newlisp/files/patch-makefile_bsd +++ b/lang/newlisp/files/patch-makefile_bsd @@ -1,6 +1,6 @@ ---- makefile_bsd.orig 2015-01-19 17:10:12 UTC +--- makefile_bsd.orig 2017-01-25 16:42:21 UTC +++ makefile_bsd -@@ -6,14 +6,12 @@ OBJS = newlisp.o nl-symbol.o nl-math.o n +@@ -6,14 +6,12 @@ OBJS = newlisp.o nl-symbol.o nl-math.o nl-list.o nl-li # the option -fno-strict-aliasing may not be available on some BSD versions diff --git a/lang/newlisp/files/patch-makefile_bsdLP64_utf8 b/lang/newlisp/files/patch-makefile_bsdLP64_utf8 index 1ef889ff9666..1aa7286ff585 100644 --- a/lang/newlisp/files/patch-makefile_bsdLP64_utf8 +++ b/lang/newlisp/files/patch-makefile_bsdLP64_utf8 @@ -1,19 +1,19 @@ ---- makefile_bsdLP64_utf8.orig 2015-01-19 17:10:12 UTC +--- makefile_bsdLP64_utf8.orig 2019-04-24 15:04:10 UTC +++ makefile_bsdLP64_utf8 -@@ -6,14 +6,12 @@ OBJS = newlisp.o nl-symbol.o nl-math.o n +@@ -6,14 +6,12 @@ OBJS = newlisp.o nl-symbol.o nl-math.o nl-list.o nl-li # the option -fno-strict-aliasing may not be available on some BSD versions --CFLAGS = -m64 -Wall -Wno-uninitialized -fno-strict-aliasing -O2 -c -g -DREADLINE -DNEWLISP64 -DSUPPORT_UTF8 -D_BSD +-CFLAGS = -m64 -Wall -Wno-strict-aliasing -O2 -c -g -I/usr/local/include -DREADLINE -DNEWLISP64 -DSUPPORT_UTF8 -D_BSD +CFLAGS += -m64 -c -DREADLINE -DNEWLISP64 -DSUPPORT_UTF8 -D_BSD -DFFI # or without readline lib - #CFLAGS = -m64 -Wall -Wno-uninitialized -Wno-strict-aliasing -O2 -c -g -DNEWLISP64 -D_BSD + #CFLAGS = -m64 -Wall -Wno-strict-aliasing -O2 -c -g -DNEWLISP64 -D_BSD -CC = cc - default: $(OBJS) - $(CC) $(OBJS) -m64 -g -lm -lreadline -lncurses -o newlisp -+ $(CC) $(LDFLAGS) $(OBJS) -m64 -lm -lreadline -lncurses -lffi -o newlisp ++ $(CC) $(LDFLAGS) $(OBJS) -m64 -g -lm -lreadline -lncurses -o newlisp # or without readline lib # $(CC) $(OBJS) -m64 -g -lm -o newlisp strip newlisp diff --git a/lang/newlisp/files/patch-modules_gsl.lsp b/lang/newlisp/files/patch-modules_gsl.lsp index b81dcd79135b..c2011b41f88a 100644 --- a/lang/newlisp/files/patch-modules_gsl.lsp +++ b/lang/newlisp/files/patch-modules_gsl.lsp @@ -1,14 +1,14 @@ ---- modules/gsl.lsp.orig 2015-05-23 14:58:26 UTC +--- modules/gsl.lsp.orig 2019-05-12 16:44:17 UTC +++ modules/gsl.lsp -@@ -169,6 +169,7 @@ - (= ostype "Win32") "libgsl-0.dll" ; 32-bit +@@ -171,6 +171,7 @@ + (= 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 "BSD") "/usr/local/lib/libgsl.so" ; 32-bit or 64-bit )) ; load libgslcblas which contans functions referenced by libgsl -@@ -179,6 +180,7 @@ +@@ -181,6 +182,7 @@ (if (= ostype "OSX") (import "libgslcblas.dylib" "cblas_sdsdot") (= ostype "Linux") (import "/usr/local/lib/libgslcblas.so" "cblas_sdsdot") |