aboutsummaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/newlisp/Makefile54
-rw-r--r--lang/newlisp/distinfo4
-rw-r--r--lang/newlisp/files/patch-makefile_bsd6
-rw-r--r--lang/newlisp/files/patch-makefile_bsdLP64_utf86
-rw-r--r--lang/newlisp/files/patch-makefile_bsd_utf86
-rw-r--r--lang/newlisp/files/patch-modules_gsl.lsp4
-rw-r--r--lang/newlisp/files/patch-newlisp.h13
-rw-r--r--lang/newlisp/pkg-plist7
8 files changed, 27 insertions, 73 deletions
diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile
index b3e38d25d96a..a1002aaf6b47 100644
--- a/lang/newlisp/Makefile
+++ b/lang/newlisp/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= newlisp
-PORTVERSION= 10.6.0
-PORTREVISION= 2
+PORTVERSION= 10.6.2
CATEGORIES= lang
MASTER_SITES= http://www.newlisp.org/downloads/
@@ -16,22 +15,24 @@ LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi
CONFLICTS= newlisp-devel-[0-9]*
-USES= readline tar:tgz
+USES= readline:port tar:tgz
+OPTIONS_SUB= yes
HAS_CONFIGURE= yes
ALL_TARGET= default
REINPLACE_ARGS= -i ""
-MODULES= canvas cgi crypto ftp getopts infix odbc pop3 \
+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 newLISP-${PORTVERSION}-Release.html \
- manual_frame.html newLISPdoc.html \
- newlisp_index.html newlisp_manual.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= GMP GSL MYSQL PGSQL SQLITE GUISERV DOCS EXAMPLES
+OPTIONS_DEFINE= GSL MYSQL PGSQL SQLITE GUISERV DOCS EXAMPLES
GSL_DESC= GSL (GNU Scientific Library)
GUISERV_DESC= Install GUI server (in Java)
@@ -44,59 +45,27 @@ LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -DNEWLISP64
.endif
-.if ${PORT_OPTIONS:MGMP}
-LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp
-MODULES+= gmp
-PLIST_SUB+= GMP=""
-.else
-PLIST_SUB+= GMP="@comment "
-.endif
-
.if ${PORT_OPTIONS:MGSL}
LIB_DEPENDS+= libgsl.so:${PORTSDIR}/math/gsl
MODULES+= gsl
-PLIST_SUB+= GSL=""
-.else
-PLIST_SUB+= GSL="@comment "
.endif
.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
MODULES+= mysql
-PLIST_SUB+= MYSQL=""
-.else
-PLIST_SUB+= MYSQL="@comment "
.endif
.if ${PORT_OPTIONS:MPGSQL}
USES+= pgsql
MODULES+= postgres
-PLIST_SUB+= PGSQL=""
-.else
-PLIST_SUB+= PGSQL="@comment "
.endif
.if ${PORT_OPTIONS:MSQLITE}
USE_SQLITE= 3
MODULES+= sqlite3
-PLIST_SUB+= SQLITE=""
-.else
-PLIST_SUB+= SQLITE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGUISERV}
-PLIST_SUB+= GUISERV=""
-.else
-PLIST_SUB+= GUISERV="@comment "
.endif
post-patch:
- @${REINPLACE_CMD} -E -e "s,install -m 644, \$${BSD_INSTALL_DATA},g" \
- -e "s,install -m 755, \$${BSD_INSTALL_SCRIPT},g" \
- -e "s,^(datadir=).*,\1${STAGEDIR}${PREFIX}/share,g" \
- -e "s,^(bindir=).*,\1${STAGEDIR}${PREFIX}/bin,g" \
- ${WRKSRC}/Makefile
-
@${REINPLACE_CMD} -E \
-e "s,/usr/(local/)?bin/newlisp,${PREFIX}/bin/newlisp,g" \
-e "s,/usr/(local/)?share/newlisp,${DATADIR},g" \
@@ -116,9 +85,6 @@ post-patch:
"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/libgmp.so,${LOCALBASE}/lib/libgmp.so," \
- ${WRKSRC}/modules/gmp.lsp
- @${REINPLACE_CMD} -E -e \
"s,/usr/local/lib/libgsl.so,${LOCALBASE}/lib/libgsl.so," \
${WRKSRC}/modules/gsl.lsp
@${REINPLACE_CMD} -E -e \
@@ -158,7 +124,6 @@ do-install:
${STAGEDIR}${PREFIX}/bin/newlisp-edit
.endif
-.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}
.if ${PORT_OPTIONS:MGUISERV}
@@ -167,7 +132,6 @@ do-install:
${WRKSRC}/guiserver/guiserver.lsp.html \
${STAGEDIR}${DOCSDIR}/guiserver
.endif
-.endif
.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/lang/newlisp/distinfo b/lang/newlisp/distinfo
index f81de9d112e4..f052295329b2 100644
--- a/lang/newlisp/distinfo
+++ b/lang/newlisp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (newlisp-10.6.0.tgz) = 59200b97879231c331f6c0e519a66602c9ae82a8f744c2be236e08ad6f91ff7f
-SIZE (newlisp-10.6.0.tgz) = 1670395
+SHA256 (newlisp-10.6.2.tgz) = ae3ab77987cb2cfef4e986104be5be5ac9469317e9d74884c3ea89c2e4bb4040
+SIZE (newlisp-10.6.2.tgz) = 1671798
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 ""
diff --git a/lang/newlisp/pkg-plist b/lang/newlisp/pkg-plist
index e7fd00526184..565b124d88e4 100644
--- a/lang/newlisp/pkg-plist
+++ b/lang/newlisp/pkg-plist
@@ -10,12 +10,15 @@ man/man1/newlispdoc.1.gz
%%PORTDOCS%%%%DOCSDIR%%/ExpressionEvaluation.html
%%PORTDOCS%%%%DOCSDIR%%/MemoryManagement.html
%%PORTDOCS%%%%DOCSDIR%%/manual_frame.html
-%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.6.0-Release.html
+%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.6.2-Release.html
%%PORTDOCS%%%%DOCSDIR%%/newLISPdoc.html
+%%PORTDOCS%%%%DOCSDIR%%/newlisp-man.txt
%%PORTDOCS%%%%DOCSDIR%%/newlisp_index.html
%%PORTDOCS%%%%DOCSDIR%%/newlisp_manual.html
+%%PORTDOCS%%%%DOCSDIR%%/newlispdoc-man.txt
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/async
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/callback
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/client
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/env.cgi
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/finger
@@ -77,11 +80,11 @@ man/man1/newlispdoc.1.gz
%%DATADIR%%/modules/crypto.lsp
%%DATADIR%%/modules/ftp.lsp
%%DATADIR%%/modules/getopts.lsp
-%%GMP%%%%DATADIR%%/modules/gmp.lsp
%%GSL%%%%DATADIR%%/modules/gsl.lsp
%%DATADIR%%/modules/infix.lsp
%%MYSQL%%%%DATADIR%%/modules/mysql.lsp
%%DATADIR%%/modules/odbc.lsp
+%%DATADIR%%/modules/plot.lsp
%%DATADIR%%/modules/pop3.lsp
%%PGSQL%%%%DATADIR%%/modules/postgres.lsp
%%DATADIR%%/modules/postscript.lsp
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 23:23:32 +0000