3 files changed, 115 insertions, 104 deletions

diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile
index 6e30319584e5..172ae2c0aebd 100644
--- a/lang/newlisp/Makefile
+++ b/lang/newlisp/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	newlisp
-PORTVERSION=	9.1.1
+PORTVERSION=	9.2.0
 PORTREVISION=	0
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -19,24 +19,24 @@ COMMENT=	LISP like scripting language
 
 HAS_CONFIGURE=	yes
 ALL_TARGET=	default
+STRIP=		#empty
 
-TK_VER=	8.5
-MAN1=	newlisp.1
+MAN1=	newlisp.1 newlispdoc.1
 
 REINPLACE_ARGS=	-i ""
 
 MODULES=	cgi ftp infix odbc pop3 postscript smtp stat unix \
 		xmlrpc-client zlib
 
-PORTDOCS=	CHANGES CodePatterns.html MemoryManagement.html \
-		keywords.txt manual_frame.html newLISPdoc.html \
-		newlisp_index.html newlisp_manual.html
+DOCS=		CHANGES CodePatterns.html newLISP-9.2-Release.html \
+		manual_frame.html newLISPdoc.html \
+		newlisp_index.html newlisp_manual.html \
 
-OPTIONS=	TK	"Build with TK support" off \
-		GMP	"Enable GMP math library support" off \
+OPTIONS=	GMP	"Enable GMP math library support" off \
 		MYSQL4	"Build with mysql4 support" off \
 		MYSQL5	"Build with mysql5 support" off \
-		SQLITE	"Build with sqlite support" off
+		SQLITE	"Build with sqlite support" off \
+		GUISERV "Install GUI server (in JAVA)" off
 
 .include <bsd.port.pre.mk>
 
@@ -44,14 +44,6 @@ OPTIONS=	TK	"Build with TK support" off \
 IGNORE=	you should select only one MySQL version
 .endif
 
-.if defined(WITH_TK)
-RUN_DEPENDS+=	wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${TK_VER:S,.,,g}
-MAN1+=		newlisp-tk.1
-PLIST_SUB+=	TK=""
-.else
-PLIST_SUB+=	TK="@comment "
-.endif
-
 .if defined(WITH_GMP)
 LIB_DEPENDS+=	gmp.7:${PORTSDIR}/math/libgmp4
 MODULES+=	gmp
@@ -86,6 +78,12 @@ PLIST_SUB+=	SQLITE=""
 PLIST_SUB+=	SQLITE="@comment "
 .endif
 
+.if defined(WITH_GUISERV)
+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" \
@@ -94,17 +92,16 @@ post-patch:
 		${WRKSRC}/Makefile
 
 	@${REINPLACE_CMD} -E \
-		-e "s,/usr/bin/newlisp,${PREFIX}/bin/newlisp,g" \
-		-e "s,/usr/share/newlisp,${DATADIR},g" \
-		-e "s,/usr/lib/newlisp.so,${PREFIX}/lib/newlisp.so,g" \
-		-e "s,exec wish,exec wish${TK_VER}," \
+		-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}/init.lsp.example \
-		${WRKSRC}/newlisp.c \
-		${WRKSRC}/newlisp-tk/newlisp-tk.tcl
+		${WRKSRC}/newlisp.c
 
 	@${REINPLACE_CMD} -E -e \
 		"s,/usr/lib/(libmysqlclient.so.)14,${LOCALBASE}/lib/mysql/\1${MYSQL${MYSQL_VER}_LIBVER}," \
@@ -121,19 +118,31 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/newlisp ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/util/newlispdoc ${PREFIX}/bin/
 
-	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${MODULES:S,^,${WRKSRC}/modules/,:S,$,.lsp,} ${DATADIR}/
+	${MKDIR} ${DATADIR}/util/
+	${INSTALL_DATA} ${WRKSRC}/util/syntax.cgi \
+			${WRKSRC}/util/newlisp.vim \
+			${WRKSRC}/util/link.lsp \
+			${WRKSRC}/util/httpd-conf.lsp \
+			${DATADIR}/util/
 
-	${INSTALL_MAN} ${WRKSRC}/doc/newlisp.1 ${PREFIX}/man/man1/
+	${MKDIR} ${DATADIR}/modules/
+	${INSTALL_DATA} ${MODULES:S,^,${WRKSRC}/modules/,:S,$,.lsp,} \
+		${DATADIR}/modules/
 
-.if defined(WITH_TK)
-	${INSTALL_SCRIPT} ${WRKSRC}/newlisp-tk/newlisp-tk.tcl \
-		${PREFIX}/bin/newlisp-tk
-	${MKDIR} ${DATADIR}/newlisp-tk/
-	@(cd ${WRKSRC}/newlisp-tk && \
-		${COPYTREE_SHARE} \* ${DATADIR}/newlisp-tk/)
-	${INSTALL_MAN} ${WRKSRC}/doc/newlisp-tk.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/newlisp.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/newlispdoc.1 ${PREFIX}/man/man1/
+
+.if defined(WITH_GUISERV)
+	${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_PROGRAM} ${WRKSRC}/guiserver/newlisp-edit.lsp \
+		${PREFIX}/bin/newlisp-edit
 .endif
 
 .if !defined(NOPORTDOCS)
@@ -141,9 +150,15 @@ do-install:
 	${MKDIR} ${EXAMPLESDIR}/
 
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}/
-	${INSTALL_DATA} ${WRKSRC}/init.lsp.example ${EXAMPLESDIR}/
 
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
+	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
+
+. if defined(WITH_GUISERV)
+	${MKDIR} ${DOCSDIR}/guiserver
+	${INSTALL_DATA} ${WRKSRC}/guiserver/index.html \
+			${WRKSRC}/guiserver/guiserver.lsp.html \
+			${DOCSDIR}/guiserver/
+. endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/newlisp/distinfo b/lang/newlisp/distinfo
index 18f4994b5d2d..c1b7cda624e5 100644
--- a/lang/newlisp/distinfo
+++ b/lang/newlisp/distinfo
@@ -1,3 +1,3 @@
-MD5 (newlisp-9.1.1.tgz) = eadbc5fedc6d1eb9d53c301a2f2ba331
-SHA256 (newlisp-9.1.1.tgz) = 3c9b8ae8b93de6212ab6d035e6caf056057f0f6340edad08cf34f7875dcb5adf
-SIZE (newlisp-9.1.1.tgz) = 810061
+MD5 (newlisp-9.2.0.tgz) = 3e2c9bbfd0e6bad45df80258d26ce6d8
+SHA256 (newlisp-9.2.0.tgz) = f67f8d53f8d117a723e488d29c3b18c730438253739ce1d41a595a9b49761a0a
+SIZE (newlisp-9.2.0.tgz) = 1192034
diff --git a/lang/newlisp/pkg-plist b/lang/newlisp/pkg-plist
index 27a3546023be..ec54232327a6 100644
--- a/lang/newlisp/pkg-plist
+++ b/lang/newlisp/pkg-plist
@@ -1,14 +1,21 @@
 bin/newlisp
-%%TK%%bin/newlisp-tk
+%%GUISERV%%bin/newlisp-edit
+bin/newlispdoc
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/CodePatterns.html
+%%GUISERV%%%%PORTDOCS%%%%DOCSDIR%%/guiserver/guiserver.lsp.html
+%%GUISERV%%%%PORTDOCS%%%%DOCSDIR%%/guiserver/index.html
+%%PORTDOCS%%%%DOCSDIR%%/manual_frame.html
+%%PORTDOCS%%%%DOCSDIR%%/newLISP-9.2-Release.html
+%%PORTDOCS%%%%DOCSDIR%%/newLISPdoc.html
+%%PORTDOCS%%%%DOCSDIR%%/newlisp_index.html
+%%PORTDOCS%%%%DOCSDIR%%/newlisp_manual.html
 %%PORTDOCS%%%%EXAMPLESDIR%%/client
 %%PORTDOCS%%%%EXAMPLESDIR%%/finger
 %%PORTDOCS%%%%EXAMPLESDIR%%/form.cgi
 %%PORTDOCS%%%%EXAMPLESDIR%%/form.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/httpd-conf.lsp
 %%PORTDOCS%%%%EXAMPLESDIR%%/init.lsp.example
-%%PORTDOCS%%%%EXAMPLESDIR%%/link.lsp
 %%PORTDOCS%%%%EXAMPLESDIR%%/newLISP-Excel-Import.xls
-%%PORTDOCS%%%%EXAMPLESDIR%%/newlispdoc
 %%PORTDOCS%%%%EXAMPLESDIR%%/opengl-demo.lsp
 %%PORTDOCS%%%%EXAMPLESDIR%%/prodcons.lsp
 %%PORTDOCS%%%%EXAMPLESDIR%%/server
@@ -20,66 +27,55 @@ bin/newlisp
 %%PORTDOCS%%%%EXAMPLESDIR%%/udp-server.lsp
 %%PORTDOCS%%%%EXAMPLESDIR%%/upload.cgi
 %%PORTDOCS%%%%EXAMPLESDIR%%/upload.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/#sqlite.cgi#
+%%PORTDOCS%%%%EXAMPLESDIR%%/url-file.txt
 %%PORTDOCS%%%%EXAMPLESDIR%%/xmlrpc.cgi
-%%DATADIR%%/cgi.lsp
-%%DATADIR%%/ftp.lsp
-%%GMP%%%%DATADIR%%/gmp.lsp
-%%DATADIR%%/infix.lsp
-%%MYSQL4%%%%DATADIR%%/mysql.lsp
-%%MYSQL5%%%%DATADIR%%/mysql5.lsp
-%%TK%%%%DATADIR%%/newlisp-tk/Demo.lsp
-%%TK%%%%DATADIR%%/newlisp-tk/Drag.lsp
-%%TK%%%%DATADIR%%/newlisp-tk/Hanoi.lsp
-%%TK%%%%DATADIR%%/newlisp-tk/Mouse.lsp
-%%TK%%%%DATADIR%%/newlisp-tk/README.txt
-%%TK%%%%DATADIR%%/newlisp-tk/Random.lsp
-%%TK%%%%DATADIR%%/newlisp-tk/Turtle.lsp
-%%TK%%%%DATADIR%%/newlisp-tk/bwidget.txt
-%%TK%%%%DATADIR%%/newlisp-tk/images.txt
-%%TK%%%%DATADIR%%/newlisp-tk/images/.DS_Store
-%%TK%%%%DATADIR%%/newlisp-tk/images/._.DS_Store
-%%TK%%%%DATADIR%%/newlisp-tk/images/aboutImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/clearImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/consoleImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/continueImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/copyImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/cutImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/debugImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/deleteImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/editImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/evalImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/evalPrintImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/fileImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/helpImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/newImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/newlisp.ico
-%%TK%%%%DATADIR%%/newlisp-tk/images/nextImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/nltkImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/openImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/pasteImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/quitImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/reloadImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/saveImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/images/stepImg.gif
-%%TK%%%%DATADIR%%/newlisp-tk/make-wrapped-exe.bat
-%%TK%%%%DATADIR%%/newlisp-tk/newlisp-tk.book
-%%TK%%%%DATADIR%%/newlisp-tk/newlisp-tk.config.home
-%%TK%%%%DATADIR%%/newlisp-tk/newlisp-tk.config.win32
-%%TK%%%%DATADIR%%/newlisp-tk/newlisp-tk.html
-%%TK%%%%DATADIR%%/newlisp-tk/newlisp-tk.nsi
-%%TK%%%%DATADIR%%/newlisp-tk/newlisp-tk.tcl
-%%TK%%%%DATADIR%%/newlisp-tk/tcltk-app.lsp
-%%DATADIR%%/odbc.lsp
-%%DATADIR%%/pop3.lsp
-%%DATADIR%%/postscript.lsp
-%%DATADIR%%/smtp.lsp
-%%SQLITE%%%%DATADIR%%/sqlite3.lsp
-%%DATADIR%%/stat.lsp
-%%DATADIR%%/unix.lsp
-%%DATADIR%%/xmlrpc-client.lsp
-%%DATADIR%%/zlib.lsp
-%%TK%%@dirrm %%DATADIR%%/newlisp-tk/images
-%%TK%%@dirrm %%DATADIR%%/newlisp-tk
+%%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/mouse-demo.lsp
+%%GUISERV%%%%DATADIR%%/guiserver/properties-demo.lsp
+%%GUISERV%%%%DATADIR%%/guiserver/rotation-demo.lsp
+%%GUISERV%%%%DATADIR%%/guiserver/shapes-demo.lsp
+%%GUISERV%%%%DATADIR%%/guiserver/sound-demo.lsp
+%%GUISERV%%%%DATADIR%%/guiserver/stroke-demo.lsp
+%%GUISERV%%%%DATADIR%%/guiserver/tabs-demo.lsp
+%%GUISERV%%%%DATADIR%%/guiserver/textrot-demo.lsp
+%%GUISERV%%%%DATADIR%%/guiserver/uppercase.lsp
+%%GUISERV%%%%DATADIR%%/guiserver/widgets-demo.lsp
+%%GUISERV%%%%DATADIR%%/guiserver/word-count.lsp
+%%DATADIR%%/modules/cgi.lsp
+%%DATADIR%%/modules/ftp.lsp
+%%GMP%%%%DATADIR%%/modules/gmp.lsp
+%%DATADIR%%/modules/infix.lsp
+%%MYSQL5%%%%DATADIR%%/modules/mysql5.lsp
+%%MYSQL4%%%%DATADIR%%/modules/mysql.lsp
+%%DATADIR%%/modules/odbc.lsp
+%%DATADIR%%/modules/pop3.lsp
+%%DATADIR%%/modules/postscript.lsp
+%%DATADIR%%/modules/smtp.lsp
+%%SQLITE%%%%DATADIR%%/modules/sqlite3.lsp
+%%DATADIR%%/modules/stat.lsp
+%%DATADIR%%/modules/unix.lsp
+%%DATADIR%%/modules/xmlrpc-client.lsp
+%%DATADIR%%/modules/zlib.lsp
+%%DATADIR%%/util/httpd-conf.lsp
+%%DATADIR%%/util/link.lsp
+%%DATADIR%%/util/newlisp.vim
+%%DATADIR%%/util/syntax.cgi
+@dirrm %%DATADIR%%/util
+@dirrm %%DATADIR%%/modules
+%%GUISERV%%@dirrm %%DATADIR%%/guiserver
 @dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%GUISERV%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/guiserver
+%%PORTDOCS%%@dirrm %%DOCSDIR%%