Upgrade to version 10.5.0; fix PORTEXAMPLES support and cleanup.

4 files changed, 58 insertions, 59 deletions

diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile
index d5ca3e8b5d34..f10436611f41 100644
--- a/lang/newlisp/Makefile
+++ b/lang/newlisp/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	newlisp
-PORTVERSION=	10.4.5
-PORTREVISION=	1
+PORTVERSION=	10.5.0
 CATEGORIES=	lang
 MASTER_SITES=	http://www.newlisp.org/downloads/
 EXTRACT_SUFX=	.tgz
@@ -22,7 +21,7 @@ MAN1=		newlisp.1 newlispdoc.1
 
 REINPLACE_ARGS=	-i ""
 
-MODULES=	canvas cgi crypto ftp getopts infix json macro odbc pop3 \
+MODULES=	canvas cgi crypto ftp getopts infix macro odbc pop3 \
 		postscript smtp smtpx stat unix xmlrpc-client zlib
 
 DOCS=		CHANGES CodePatterns.html ExpressionEvaluation.html \
@@ -128,50 +127,50 @@ post-patch:
 		${WRKSRC}/newlisp.h
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/newlisp ${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/util/newlispdoc ${PREFIX}/bin/
+	@${INSTALL_PROGRAM} ${WRKSRC}/newlisp ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKSRC}/util/newlispdoc ${PREFIX}/bin
 
-	${MKDIR} ${DATADIR}/util/
-	${INSTALL_DATA} ${WRKSRC}/util/syntax.cgi \
+	@${MKDIR} ${DATADIR}/util
+	@${INSTALL_DATA} ${WRKSRC}/util/syntax.cgi \
 			${WRKSRC}/util/newlisp.vim \
 			${WRKSRC}/util/link.lsp \
 			${WRKSRC}/util/httpd-conf.lsp \
 			${WRKSRC}/util/newlisp.jsf \
 			${WRKSRC}/util/nanorc \
-			${DATADIR}/util/
+			${DATADIR}/util
 
-	${MKDIR} ${DATADIR}/modules/
-	${INSTALL_DATA} ${MODULES:S,^,${WRKSRC}/modules/,:S,$,.lsp,} \
-		${DATADIR}/modules/
+	@${MKDIR} ${DATADIR}/modules
+	@${INSTALL_DATA} ${MODULES:S,^,${WRKSRC}/modules/,:S,$,.lsp,} \
+		${DATADIR}/modules
 
-	${INSTALL_MAN} ${WRKSRC}/doc/newlisp.1 ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/doc/newlispdoc.1 ${PREFIX}/man/man1/
+	@${INSTALL_MAN} ${WRKSRC}/doc/newlisp.1 ${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/doc/newlispdoc.1 ${PREFIX}/man/man1
 
 .if ${PORT_OPTIONS:MGUISERV}
-	${MKDIR} ${DATADIR}/guiserver
+	@${MKDIR} ${DATADIR}/guiserver
 	@(cd ${WRKSRC}/guiserver/ && ${COPYTREE_SHARE} \*.lsp \
 		${DATADIR}/guiserver/ \
 		"! -name guiserver.lsp ! -name newlisp-edit.lsp")
-	${INSTALL_DATA} ${WRKSRC}/guiserver/guiserver.jar ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/guiserver/guiserver.lsp ${DATADIR}/
-	${INSTALL_SCRIPT} ${WRKSRC}/guiserver/newlisp-edit.lsp \
+	@${INSTALL_DATA} ${WRKSRC}/guiserver/guiserver.jar ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/guiserver/guiserver.lsp ${DATADIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/guiserver/newlisp-edit.lsp \
 		${PREFIX}/bin/newlisp-edit
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-	${MKDIR} ${EXAMPLESDIR}/
-
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}/
-
-	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
-
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}
 .if ${PORT_OPTIONS:MGUISERV}
-	${MKDIR} ${DOCSDIR}/guiserver
-	${INSTALL_DATA} ${WRKSRC}/guiserver/index.html \
-			${WRKSRC}/guiserver/guiserver.lsp.html \
-			${DOCSDIR}/guiserver/
+	@${MKDIR} ${DOCSDIR}/guiserver
+	@${INSTALL_DATA} ${WRKSRC}/guiserver/index.html \
+		${WRKSRC}/guiserver/guiserver.lsp.html \
+		${DOCSDIR}/guiserver
 .endif
 .endif
 
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+.endif
+
 .include <bsd.port.mk>
diff --git a/lang/newlisp/distinfo b/lang/newlisp/distinfo
index d457895e1356..64ce440b22fc 100644
--- a/lang/newlisp/distinfo
+++ b/lang/newlisp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (newlisp-10.4.5.tgz) = 4bf972a8e5f8c4490f02e6a987ee76c4690498841ffd5235b38a03694ad2da52
-SIZE (newlisp-10.4.5.tgz) = 1553279
+SHA256 (newlisp-10.5.0.tgz) = dee45745bd776cfdbe416799e05ee65fb0e074f673e57bf6970124dcdfe16467
+SIZE (newlisp-10.5.0.tgz) = 1581120
diff --git a/lang/newlisp/files/patch-newlisp.c b/lang/newlisp/files/patch-newlisp.c
index 5d32fb2b4b0a..655890faec64 100644
--- a/lang/newlisp/files/patch-newlisp.c
+++ b/lang/newlisp/files/patch-newlisp.c
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- newlisp.c.orig
 +++ newlisp.c
-@@ -463,16 +463,16 @@
+@@ -515,16 +515,16 @@
      else if(getenv("DOCUMENT_ROOT"))
-         strncpy(initFile, getenv("DOCUMENT_ROOT"), MAX_LINE - 16);
+         strncpy(initFile, getenv("DOCUMENT_ROOT"), PATH_MAX - 16);
  
 -    strncat(initFile, "/.", 2);
--    strncat(initFile, INIT_FILE, 9);
+-    strncat(initFile, INIT_FILE, 8);
 +    strlcat(initFile, "/.", sizeof(initFile));
 +    strlcat(initFile, INIT_FILE, sizeof(initFile));
      if(loadFile(initFile, 0, 0, mainContext) == NULL)
@@ -16,9 +16,9 @@ $FreeBSD$
          envPtr = getenv("NEWLISPDIR");
          if(envPtr)
              {
--            strncpy(initFile, envPtr, MAX_LINE - 16);
+-            strncpy(initFile, envPtr, PATH_MAX - 16);
 -            strncat(initFile, "/", 1);
--            strncat(initFile, INIT_FILE, 9);
+-            strncat(initFile, INIT_FILE, 8);
 +            strlcpy(initFile, envPtr, sizeof(initFile));
 +            strlcat(initFile, "/", sizeof(initFile));
 +            strlcat(initFile, INIT_FILE, sizeof(initFile));
diff --git a/lang/newlisp/pkg-plist b/lang/newlisp/pkg-plist
index b57f04bb12f4..8eb5d55819d6 100644
--- a/lang/newlisp/pkg-plist
+++ b/lang/newlisp/pkg-plist
@@ -8,31 +8,32 @@ bin/newlispdoc
 %%PORTDOCS%%%%DOCSDIR%%/ExpressionEvaluation.html
 %%PORTDOCS%%%%DOCSDIR%%/MemoryManagement.html
 %%PORTDOCS%%%%DOCSDIR%%/manual_frame.html
-%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.4.5-Release.html
+%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.5.0-Release.html
 %%PORTDOCS%%%%DOCSDIR%%/newLISPdoc.html
 %%PORTDOCS%%%%DOCSDIR%%/newlisp_index.html
 %%PORTDOCS%%%%DOCSDIR%%/newlisp_manual.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/async
-%%PORTDOCS%%%%EXAMPLESDIR%%/client
-%%PORTDOCS%%%%EXAMPLESDIR%%/finger
-%%PORTDOCS%%%%EXAMPLESDIR%%/form.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/form.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/newLISP-Excel-Import.xls
-%%PORTDOCS%%%%EXAMPLESDIR%%/observer
-%%PORTDOCS%%%%EXAMPLESDIR%%/opengl-demo-ffi.lsp
-%%PORTDOCS%%%%EXAMPLESDIR%%/opengl-demo.lsp
-%%PORTDOCS%%%%EXAMPLESDIR%%/prodcons.lsp
-%%PORTDOCS%%%%EXAMPLESDIR%%/query
-%%PORTDOCS%%%%EXAMPLESDIR%%/scan
-%%PORTDOCS%%%%EXAMPLESDIR%%/server
-%%PORTDOCS%%%%EXAMPLESDIR%%/sniff
-%%PORTDOCS%%%%EXAMPLESDIR%%/tcltk.lsp
-%%PORTDOCS%%%%EXAMPLESDIR%%/udp-client.lsp
-%%PORTDOCS%%%%EXAMPLESDIR%%/udp-server.lsp
-%%PORTDOCS%%%%EXAMPLESDIR%%/upload.cgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/upload.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/win32demo.lsp
-%%PORTDOCS%%%%EXAMPLESDIR%%/xmlrpc.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/async
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/client
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/env.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/finger
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newLISP-Excel-Import.xls
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/observer
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl-demo-ffi.lsp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl-demo.lsp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/prodcons.lsp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/query
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scan
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sniff
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcltk.lsp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/udp-client.lsp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/udp-server.lsp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload.cgi
+%%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
@@ -73,7 +74,6 @@ bin/newlispdoc
 %%GMP%%%%DATADIR%%/modules/gmp.lsp
 %%GSL%%%%DATADIR%%/modules/gsl.lsp
 %%DATADIR%%/modules/infix.lsp
-%%DATADIR%%/modules/json.lsp
 %%DATADIR%%/modules/macro.lsp
 %%MYSQL%%%%DATADIR%%/modules/mysql.lsp
 %%DATADIR%%/modules/odbc.lsp
@@ -97,6 +97,6 @@ bin/newlispdoc
 @dirrm %%DATADIR%%/modules
 %%GUISERV%%@dirrm %%DATADIR%%/guiserver
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%GUISERV%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/guiserver
 %%PORTDOCS%%@dirrm %%DOCSDIR%%