svn commit: r536464 - in head/lang/newlisp: . files
Jimmy Olgeni
olgeni at FreeBSD.org
Mon May 25 12:42:57 UTC 2020
Author: olgeni
Date: Mon May 25 12:42:55 2020
New Revision: 536464
URL: https://svnweb.freebsd.org/changeset/ports/536464
Log:
Update lang/newlisp to version 10.7.5.
PR: 237530 (plus changes for 10.7.5)
Submitted by: wen
Added:
head/lang/newlisp/files/patch-makefile__original__install (contents, props changed)
Modified:
head/lang/newlisp/Makefile
head/lang/newlisp/distinfo (contents, props changed)
head/lang/newlisp/files/patch-makefile_bsd (contents, props changed)
head/lang/newlisp/files/patch-makefile_bsdLP64_utf8 (contents, props changed)
head/lang/newlisp/files/patch-modules_gsl.lsp (contents, props changed)
head/lang/newlisp/pkg-plist (contents, props changed)
Modified: head/lang/newlisp/Makefile
==============================================================================
--- head/lang/newlisp/Makefile Mon May 25 12:00:22 2020 (r536463)
+++ head/lang/newlisp/Makefile Mon May 25 12:42:55 2020 (r536464)
@@ -2,18 +2,13 @@
# $FreeBSD$
PORTNAME= newlisp
-PORTVERSION= 10.6.2
-PORTREVISION= 2
+PORTVERSION= 10.7.5
CATEGORIES= lang
MASTER_SITES= http://www.newlisp.org/downloads/
MAINTAINER= olgeni at FreeBSD.org
COMMENT= LISP like scripting language
-BROKEN= unfetchable
-DEPRECATED= Broken for more than 6 months
-EXPIRATION_DATE= 2020-05-05
-
LICENSE= GPLv3
LIB_DEPENDS= libffi.so:devel/libffi
@@ -31,15 +26,15 @@ REINPLACE_ARGS= -i ""
MODULES= canvas cgi crypto ftp getopts infix odbc plot pop3 \
postscript smtp smtpx stat unix xmlrpc-client zlib
-DOCS= CHANGES CodePatterns.html ExpressionEvaluation.html \
- MemoryManagement.html manual_frame.html \
- newLISP-${PORTVERSION}-Release.html newLISPdoc.html \
- newlisp-man.txt newlisp_index.html newlisp_manual.html \
- newlispdoc-man.txt
+DOCS= ANDROID.txt Android.html CHANGES COPYING CREDITS \
+ CodePatterns.html ExpressionEvaluation.html INSTALL \
+ LOCALIZATION License.html MemoryManagement.html \
+ manual_frame.html newLISP-${PORTVERSION}-Release.html \
+ newLISPdoc.html newlisp-man.txt newlisp_index.html \
+ newlisp_manual.html newlispdoc-man.txt
-OPTIONS_DEFINE= GSL MYSQL PGSQL SQLITE GUISERV DOCS EXAMPLES
+OPTIONS_DEFINE= DOCS EXAMPLES GSL MYSQL PGSQL SQLITE
GSL_DESC= GSL (GNU Scientific Library)
-GUISERV_DESC= Install GUI server (in Java)
.include <bsd.port.options.mk>
@@ -70,77 +65,12 @@ USES+= sqlite
MODULES+= sqlite3
.endif
-post-patch:
- @${REINPLACE_CMD} -E \
- -e "s,/usr/(local/)?bin/newlisp,${PREFIX}/bin/newlisp,g" \
- -e "s,/usr/(local/)?share/newlisp,${DATADIR},g" \
- -e "s,/usr/(local/)?lib/newlisp.so,${PREFIX}/lib/newlisp.so,g"\
- -e "s,/usr/bin,${PREFIX}/bin,g" \
- -e "s,/usr/local/bin/vi,/usr/bin/vi,g" \
- ${WRKSRC}/examples/* \
- ${WRKSRC}/doc/* \
- ${WRKSRC}/guiserver/*.lsp \
- ${WRKSRC}/modules/* \
- ${WRKSRC}/newlisp.c
-
- @${REINPLACE_CMD} -E -e \
- "s,/usr/local/mysql/lib/(libmysqlclient.)dylib,${LOCALBASE}/lib/mysql/\1so.${MYSQL${MYSQL_VER}_LIBVER}," \
- ${WRKSRC}/modules/mysql.lsp
- @${REINPLACE_CMD} -E -e \
- "s,/usr/local/lib/(libsqlite)3.so,${LOCALBASE}/lib/\1${_SQLITE_VER}.so," \
- ${WRKSRC}/modules/sqlite3.lsp
- @${REINPLACE_CMD} -E -e \
- "s,/usr/local/lib/libgsl.so,${LOCALBASE}/lib/libgsl.so," \
- ${WRKSRC}/modules/gsl.lsp
- @${REINPLACE_CMD} -E -e \
- "s,/usr/local/lib/libpq.so.5.1,${LOCALBASE}/lib/libpq.so.5," \
- ${WRKSRC}/modules/postgres.lsp
- @${REINPLACE_CMD} -E -e \
- "s,/usr/share/newlisp,${LOCALBASE}/share/newlisp," \
- ${WRKSRC}/newlisp.h
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/newlisp ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/util/newlispdoc ${STAGEDIR}${PREFIX}/bin
-
- @${MKDIR} ${STAGEDIR}${DATADIR}/util
- ${INSTALL_DATA} ${WRKSRC}/util/syntax.cgi \
- ${WRKSRC}/util/README.txt \
- ${WRKSRC}/util/newlisp.jsf \
- ${WRKSRC}/util/newlisp.vim \
- ${WRKSRC}/util/standard.lsp \
- ${STAGEDIR}${DATADIR}/util
-
- @${MKDIR} ${STAGEDIR}${DATADIR}/modules
- ${INSTALL_DATA} ${MODULES:S,^,${WRKSRC}/modules/,:S,$,.lsp,} \
- ${STAGEDIR}${DATADIR}/modules
-
- ${INSTALL_MAN} ${WRKSRC}/doc/newlisp.1 ${STAGEDIR}${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/doc/newlispdoc.1 ${STAGEDIR}${PREFIX}/man/man1
-
-.if ${PORT_OPTIONS:MGUISERV}
- @${MKDIR} ${STAGEDIR}${DATADIR}/guiserver
- @(cd ${WRKSRC}/guiserver/ && ${COPYTREE_SHARE} \*.lsp \
- ${STAGEDIR}${DATADIR}/guiserver/ \
- "! -name guiserver.lsp ! -name newlisp-edit.lsp")
- ${INSTALL_DATA} ${WRKSRC}/guiserver/guiserver.jar ${STAGEDIR}${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/guiserver/guiserver.lsp ${STAGEDIR}${DATADIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/guiserver/newlisp-edit.lsp \
- ${STAGEDIR}${PREFIX}/bin/newlisp-edit
-.endif
-
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}
-.if ${PORT_OPTIONS:MGUISERV}
- @${MKDIR} ${STAGEDIR}${DOCSDIR}/guiserver
- ${INSTALL_DATA} ${WRKSRC}/guiserver/index.html \
- ${WRKSRC}/guiserver/guiserver.lsp.html \
- ${STAGEDIR}${DOCSDIR}/guiserver
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
-.endif
.include <bsd.port.mk>
Modified: head/lang/newlisp/distinfo
==============================================================================
--- head/lang/newlisp/distinfo Mon May 25 12:00:22 2020 (r536463)
+++ head/lang/newlisp/distinfo Mon May 25 12:42:55 2020 (r536464)
@@ -1,2 +1,3 @@
-SHA256 (newlisp-10.6.2.tgz) = ae3ab77987cb2cfef4e986104be5be5ac9469317e9d74884c3ea89c2e4bb4040
-SIZE (newlisp-10.6.2.tgz) = 1671798
+TIMESTAMP = 1590337567
+SHA256 (newlisp-10.7.5.tgz) = dc2d0ff651c2b275bc4af3af8ba59851a6fb6e1eaddc20ae75fb60b1e90126ec
+SIZE (newlisp-10.7.5.tgz) = 1168896
Added: head/lang/newlisp/files/patch-makefile__original__install
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/newlisp/files/patch-makefile__original__install Mon May 25 12:42:55 2020 (r536464)
@@ -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
Modified: head/lang/newlisp/files/patch-makefile_bsd
==============================================================================
--- head/lang/newlisp/files/patch-makefile_bsd Mon May 25 12:00:22 2020 (r536463)
+++ head/lang/newlisp/files/patch-makefile_bsd Mon May 25 12:42:55 2020 (r536464)
@@ -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
Modified: head/lang/newlisp/files/patch-makefile_bsdLP64_utf8
==============================================================================
--- head/lang/newlisp/files/patch-makefile_bsdLP64_utf8 Mon May 25 12:00:22 2020 (r536463)
+++ head/lang/newlisp/files/patch-makefile_bsdLP64_utf8 Mon May 25 12:42:55 2020 (r536464)
@@ -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
Modified: head/lang/newlisp/files/patch-modules_gsl.lsp
==============================================================================
--- head/lang/newlisp/files/patch-modules_gsl.lsp Mon May 25 12:00:22 2020 (r536463)
+++ head/lang/newlisp/files/patch-modules_gsl.lsp Mon May 25 12:42:55 2020 (r536464)
@@ -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")
Modified: head/lang/newlisp/pkg-plist
==============================================================================
--- head/lang/newlisp/pkg-plist Mon May 25 12:00:22 2020 (r536463)
+++ head/lang/newlisp/pkg-plist Mon May 25 12:42:55 2020 (r536464)
@@ -1,16 +1,21 @@
bin/newlisp
-%%GUISERV%%bin/newlisp-edit
+bin/newlisp-10.7.5
bin/newlispdoc
man/man1/newlisp.1.gz
man/man1/newlispdoc.1.gz
-%%GUISERV%%%%PORTDOCS%%%%DOCSDIR%%/guiserver/guiserver.lsp.html
-%%GUISERV%%%%PORTDOCS%%%%DOCSDIR%%/guiserver/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ANDROID.txt
+%%PORTDOCS%%%%DOCSDIR%%/Android.html
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/CodePatterns.html
%%PORTDOCS%%%%DOCSDIR%%/ExpressionEvaluation.html
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LOCALIZATION
+%%PORTDOCS%%%%DOCSDIR%%/License.html
%%PORTDOCS%%%%DOCSDIR%%/MemoryManagement.html
%%PORTDOCS%%%%DOCSDIR%%/manual_frame.html
-%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.6.2-Release.html
+%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.7.5-Release.html
%%PORTDOCS%%%%DOCSDIR%%/newLISPdoc.html
%%PORTDOCS%%%%DOCSDIR%%/newlisp-man.txt
%%PORTDOCS%%%%DOCSDIR%%/newlisp_index.html
@@ -27,7 +32,9 @@ man/man1/newlispdoc.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpd-conf.lsp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/index.cgi
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newLISP-Excel-Import.xls
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newlisp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/observer
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl-demo-ffi-lsp.txt
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl-demo-ffi.lsp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl-demo.lsp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/prodcons.lsp
@@ -42,39 +49,6 @@ man/man1/newlispdoc.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload.html
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/win32demo.lsp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlrpc.cgi
-%%GUISERV%%%%DATADIR%%/guiserver.jar
-%%GUISERV%%%%DATADIR%%/guiserver.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/allfonts-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/animation-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/border-layout-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/button-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/clipboard-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/cursor-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/drag-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/font-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/frameless-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/html-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/image-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/midi-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/midi2-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/mouse-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/move-resize-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/pinballs-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/properties-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/rotation-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/scroll-pane-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/shapes-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/sound-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/stroke-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/table-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/tabs-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/textfield-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/textrot-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/uppercase.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/widgets-demo-jp.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/widgets-demo-ru.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/widgets-demo.lsp
-%%GUISERV%%%%DATADIR%%/guiserver/word-count.lsp
%%DATADIR%%/modules/canvas.lsp
%%DATADIR%%/modules/cgi.lsp
%%DATADIR%%/modules/crypto.lsp
@@ -95,8 +69,5 @@ man/man1/newlispdoc.1.gz
%%DATADIR%%/modules/unix.lsp
%%DATADIR%%/modules/xmlrpc-client.lsp
%%DATADIR%%/modules/zlib.lsp
-%%DATADIR%%/util/README.txt
-%%DATADIR%%/util/newlisp.jsf
%%DATADIR%%/util/newlisp.vim
-%%DATADIR%%/util/standard.lsp
%%DATADIR%%/util/syntax.cgi
More information about the svn-ports-all
mailing list