1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00

- Update to 10.1.0.

This commit is contained in:
Stanislav Sedov 2009-07-03 10:52:56 +00:00
parent 0f71643956
commit fa4d4dc1f1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=236974
7 changed files with 61 additions and 44 deletions

View File

@ -7,7 +7,7 @@
#
PORTNAME= newlisp
PORTVERSION= 10.0.2
PORTVERSION= 10.1.0
PORTREVISION= 0
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@ -40,8 +40,8 @@ OPTIONS= GMP "Enable GMP math library support" off \
.include <bsd.port.pre.mk>
.if defined(WITH_MYSQL4) && defined(WITH_MYSQL5)
IGNORE= you should select only one MySQL version
.if ${ARCH} == "amd64" || ${ARCH} == "sparc64" || ${ARCH} == "ia64"
CFLAGS+= -DNEWLISP64
.endif
.if defined(WITH_GMP)
@ -55,7 +55,7 @@ PLIST_SUB+= GMP="@comment "
.if defined(WITH_MYSQL5)
USE_MYSQL=yes
WITH_MYSQL_VER= 50
MODULES+= mysql5
MODULES+= mysql
PLIST_SUB+= MYSQL5=""
.else
PLIST_SUB+= MYSQL5="@comment "
@ -64,7 +64,7 @@ PLIST_SUB+= MYSQL5="@comment "
.if defined(WITH_MYSQL51)
USE_MYSQL=yes
WITH_MYSQL_VER= 51
MODULES+= mysql51
MODULES+= mysql
PLIST_SUB+= MYSQL51=""
.else
PLIST_SUB+= MYSQL51="@comment "
@ -105,10 +105,7 @@ post-patch:
@${REINPLACE_CMD} -E -e \
"s,/usr/local/mysql/lib/(libmysqlclient.)dylib,${LOCALBASE}/lib/mysql/\1so.${MYSQL${MYSQL_VER}_LIBVER}," \
${WRKSRC}/modules/mysql5.lsp
@${REINPLACE_CMD} -E -e \
"s,/usr/local/mysql/lib/(libmysqlclient.)dylib,${LOCALBASE}/lib/mysql/\1so.${MYSQL${MYSQL_VER}_LIBVER}," \
${WRKSRC}/modules/mysql51.lsp
${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

View File

@ -1,3 +1,3 @@
MD5 (newlisp-10.0.2.tgz) = 8a518743c9e46da66c2e6203a9d0f39e
SHA256 (newlisp-10.0.2.tgz) = ebe1aaf5967e6f48ed8ae0e5ad0622eff1f0a1dce17eca77f10c0219cde8e309
SIZE (newlisp-10.0.2.tgz) = 1436753
MD5 (newlisp-10.1.0.tgz) = 68be7fa39714dc4022941fdb1adba559
SHA256 (newlisp-10.1.0.tgz) = d130cafd3fedaefcfb78cebc341f2f9f9215d1116383b82c47a1bf151d35f8ee
SIZE (newlisp-10.1.0.tgz) = 1476583

View File

@ -1,19 +1,19 @@
--- makefile_bsd.orig Thu Feb 15 01:59:11 2007
+++ makefile_bsd Thu Feb 22 03:27:02 2007
--- makefile_bsd.orig 2009-06-22 04:48:53.000000000 +0400
+++ makefile_bsd 2009-07-02 14:37:54.000000000 +0400
@@ -6,14 +6,12 @@
# the option -fno-strict-aliasing may not be available on some BSD versions
-CFLAGS = -Wall -Wno-uninitialized -fno-strict-aliasing -O2 -c -g -DREADLINE -D_BSD
+CFLAGS = -c -DREADLINE -D_BSD
# for netBSD use following line
#CFLAGS = -Wall -Wno-uninitialized -Wno-strict-aliasing -O2 -c -g -D_BSD
-CFLAGS = -m32 -Wall -Wno-uninitialized -fno-strict-aliasing -O2 -c -g -DREADLINE -D_BSD
+CFLAGS = -m32 -c -DREADLINE -D_BSD
# or without readline lib
#CFLAGS = -m32 -Wall -Wno-uninitialized -Wno-strict-aliasing -O2 -c -g -D_BSD
-CC = gcc
-
default: $(OBJS)
- $(CC) $(OBJS) -g -lm -lreadline -lncurses -o newlisp
+ $(CC) $(OBJS) -lm -lreadline -lncurses -o newlisp
# for netBSD use following line
# $(CC) $(OBJS) -g -lm -o newlisp
- $(CC) $(OBJS) -m32 -g -lm -lreadline -lncurses -o newlisp
+ $(CC) $(OBJS) -m32 -lm -lreadline -lncurses -o newlisp
# or without readline lib
# $(CC) $(OBJS) -m32 -g -lm -o newlisp
strip newlisp

View File

@ -1,13 +1,13 @@
--- makefile_bsd_lib.orig 2009-03-09 15:02:27.000000000 +0300
+++ makefile_bsd_lib 2009-04-07 16:21:41.000000000 +0400
--- makefile_bsd_lib.orig 2009-07-02 14:38:00.000000000 +0400
+++ makefile_bsd_lib 2009-07-02 14:38:41.000000000 +0400
@@ -3,9 +3,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.o nl-web.o nl-matrix.o nl-debug.o pcre.o unix-lib.o
-CFLAGS = -Wall -Wno-uninitialized -fno-strict-aliasing -O2 -c -g -DREADLINE -D_BSD
-CFLAGS = -m32 -Wall -Wno-uninitialized -fno-strict-aliasing -O2 -c -g -DREADLINE -D_BSD
-
-CC = gcc
+CFLAGS = -Wall -Wno-uninitialized -c -DREADLINE -D_BSD
+CFLAGS = -m32 -c -DREADLINE -D_BSD
default: $(OBJS)
$(CC) $(OBJS) -lm -shared -o newlisp.so
$(CC) $(OBJS) -m32 -lm -shared -o newlisp.so

View File

@ -1,23 +1,19 @@
--- makefile_bsd_utf8.orig Wed Sep 13 17:33:18 2006
+++ makefile_bsd_utf8 Wed Sep 13 17:33:47 2006
@@ -4,16 +4,16 @@
--- makefile_bsd_utf8.orig 2009-06-22 04:48:53.000000000 +0400
+++ makefile_bsd_utf8 2009-07-03 14:32:08.000000000 +0400
@@ -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
-CFLAGS = -Wall -Wno-uninitialized -O2 -c -g -DREADLINE -D_BSD -DSUPPORT_UTF8
-CFLAGS = -m32 -Wall -Wno-uninitialized -fno-strict-aliasing -O2 -c -g -DREADLINE -D_BSD -DSUPPORT_UTF8
+CFLAGS += -c -DREADLINE -D_BSD -DSUPPORT_UTF8
# for netBSD use following line
#CFLAGS = -Wall -Wno-uninitialized -O2 -c -g -D_BSD
# or without readline lib
#CFLAGS = -m32 -Wall -Wno-uninitialized -fno-strict-aliasing -O2 -c -g -D_BSD -DSUPPORT_UTF8
-CC = gcc
+#CC = gcc
-
default: $(OBJS)
- $(CC) $(OBJS) -g -lm -lreadline -lncurses -o newlisp
- $(CC) $(OBJS) -m32 -g -lm -lreadline -lncurses -o newlisp
+ $(CC) $(OBJS) -lm -lreadline -lncurses -o newlisp
# for netBSD use following line
-# $(CC) $(OBJS) -g -lm -o newlisp
+# $(CC) $(OBJS) -lm -o newlisp
# or without readline lib
# $(CC) $(OBJS) -m32 -g -lm -o newlisp
strip newlisp
.c.o:

View File

@ -0,0 +1,24 @@
--- newlisp.c.orig 2009-07-03 14:29:08.000000000 +0400
+++ newlisp.c 2009-07-03 14:30:17.000000000 +0400
@@ -449,16 +449,16 @@
strncpy(initFile, getenv("DOCUMENT_ROOT"), MAX_LINE - 16);
/* for non BSDs strlcat and strlcpy are redefined as strncat and strncpy */
- strlcat(initFile, "/.", 3);
- strlcat(initFile, INIT_FILE, 9);
+ strlcat(initFile, "/.", sizeof(initFile));
+ strlcat(initFile, INIT_FILE, sizeof(initFile));
if(loadFile(initFile, 0, 0, mainContext) == NULL)
{
envPtr = getenv("NEWLISPDIR");
if(envPtr)
{
- strlcpy(initFile, envPtr, MAX_LINE - 16);
- strlcat(initFile, "/", 2);
- strlcat(initFile, INIT_FILE, 9);
+ strlcpy(initFile, envPtr, sizeof(initFile));
+ strlcat(initFile, "/", sizeof(initFile));
+ strlcat(initFile, INIT_FILE, sizeof(initFile));
loadFile(initFile, 0, 0, mainContext);
}
}

View File

@ -8,7 +8,7 @@ bin/newlispdoc
%%PORTDOCS%%%%DOCSDIR%%/ExpressionEvaluation.html
%%PORTDOCS%%%%DOCSDIR%%/MemoryManagement.html
%%PORTDOCS%%%%DOCSDIR%%/manual_frame.html
%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.0-Release.html
%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.1-Release.html
%%PORTDOCS%%%%DOCSDIR%%/newLISPdoc.html
%%PORTDOCS%%%%DOCSDIR%%/newlisp_index.html
%%PORTDOCS%%%%DOCSDIR%%/newlisp_manual.html
@ -60,8 +60,8 @@ bin/newlispdoc
%%DATADIR%%/modules/ftp.lsp
%%GMP%%%%DATADIR%%/modules/gmp.lsp
%%DATADIR%%/modules/infix.lsp
%%MYSQL51%%%%DATADIR%%/modules/mysql51.lsp
%%MYSQL5%%%%DATADIR%%/modules/mysql5.lsp
%%MYSQL51%%%%DATADIR%%/modules/mysql.lsp
%%MYSQL5%%%%DATADIR%%/modules/mysql.lsp
%%DATADIR%%/modules/odbc.lsp
%%DATADIR%%/modules/pop3.lsp
%%DATADIR%%/modules/postscript.lsp