3 files changed, 51 insertions, 54 deletions

diff --git a/lang/newlisp-devel/Makefile b/lang/newlisp-devel/Makefile
index f0fb12523355..2986e9a4ee2b 100644
--- a/lang/newlisp-devel/Makefile
+++ b/lang/newlisp-devel/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	newlisp
-PORTVERSION=	10.4.8
+PORTVERSION=	10.5.3
 CATEGORIES=	lang
-MASTER_SITES=	http://www.newlisp.org/downloads/development/
+MASTER_SITES=	http://www.newlisp.org/downloads/
 PKGNAMESUFFIX=	-devel
 EXTRACT_SUFX=	.tgz
 
@@ -22,11 +22,11 @@ MAN1=		newlisp.1 newlispdoc.1
 
 REINPLACE_ARGS=	-i ""
 
-MODULES=	canvas cgi crypto ftp getopts infix macro odbc plot 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 \
-		MemoryManagement.html newLISP-10.5.0-Release.html \
+		MemoryManagement.html newLISP-${PORTVERSION}-Release.html \
 		manual_frame.html newLISPdoc.html \
 		newlisp_index.html newlisp_manual.html \
 
@@ -128,50 +128,49 @@ 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/
+	@${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/
+	@${MKDIR} ${DATADIR}/modules
 	${INSTALL_DATA} ${MODULES:S,^,${WRKSRC}/modules/,:S,$,.lsp,} \
-		${DATADIR}/modules/
+		${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_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
+	@${MKDIR} ${DOCSDIR}/guiserver
 	${INSTALL_DATA} ${WRKSRC}/guiserver/index.html \
-			${WRKSRC}/guiserver/guiserver.lsp.html \
-			${DOCSDIR}/guiserver/
+		${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-devel/distinfo b/lang/newlisp-devel/distinfo
index 1ceb54b90501..7b6d3056f184 100644
--- a/lang/newlisp-devel/distinfo
+++ b/lang/newlisp-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (newlisp-10.4.8.tgz) = 846e4448670cd9731d46d2c4288b5ca6345cbf89f3172c75e1598c716b6760c5
-SIZE (newlisp-10.4.8.tgz) = 1588418
+SHA256 (newlisp-10.5.3.tgz) = a452d7f68b565376590a67516f807f13a33468f69f27bb0ac564e9fb05c5cebe
+SIZE (newlisp-10.5.3.tgz) = 1631742
diff --git a/lang/newlisp-devel/pkg-plist b/lang/newlisp-devel/pkg-plist
index ebb5ef20412b..14199b99d6f2 100644
--- a/lang/newlisp-devel/pkg-plist
+++ b/lang/newlisp-devel/pkg-plist
@@ -8,32 +8,32 @@ bin/newlispdoc
 %%PORTDOCS%%%%DOCSDIR%%/ExpressionEvaluation.html
 %%PORTDOCS%%%%DOCSDIR%%/MemoryManagement.html
 %%PORTDOCS%%%%DOCSDIR%%/manual_frame.html
-%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.5.0-Release.html
+%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.5.3-Release.html
 %%PORTDOCS%%%%DOCSDIR%%/newLISPdoc.html
 %%PORTDOCS%%%%DOCSDIR%%/newlisp_index.html
 %%PORTDOCS%%%%DOCSDIR%%/newlisp_manual.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/async
-%%PORTDOCS%%%%EXAMPLESDIR%%/client
-%%PORTDOCS%%%%EXAMPLESDIR%%/env.cgi
-%%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
@@ -77,7 +77,6 @@ bin/newlispdoc
 %%DATADIR%%/modules/macro.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
@@ -90,7 +89,6 @@ bin/newlispdoc
 %%DATADIR%%/modules/zlib.lsp
 %%DATADIR%%/util/httpd-conf.lsp
 %%DATADIR%%/util/link.lsp
-%%DATADIR%%/util/nanorc
 %%DATADIR%%/util/newlisp.jsf
 %%DATADIR%%/util/newlisp.vim
 %%DATADIR%%/util/syntax.cgi
@@ -98,6 +96,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%%