3 files changed, 31 insertions, 12 deletions

diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile
index 4df9cd763b2b..6870e3d65228 100644
--- a/lang/newlisp/Makefile
+++ b/lang/newlisp/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	newlisp
-PORTVERSION=	9.2.0
+PORTVERSION=	9.3.0
 PORTREVISION=	0
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -24,16 +24,18 @@ MAN1=	newlisp.1 newlispdoc.1
 
 REINPLACE_ARGS=	-i ""
 
-MODULES=	cgi ftp infix odbc pop3 postscript smtp stat unix \
+MODULES=	cgi crypto ftp infix odbc pop3 postscript smtp stat unix \
 		xmlrpc-client zlib
 
-DOCS=		CHANGES CodePatterns.html newLISP-9.2-Release.html \
+DOCS=		CHANGES CodePatterns.html ExpressionEvaluation.html \
+		MemoryManagement.html newLISP-9.3-Release.html \
 		manual_frame.html newLISPdoc.html \
 		newlisp_index.html newlisp_manual.html \
 
 OPTIONS=	GMP	"Enable GMP math library support" off \
-		MYSQL4	"Build with mysql4 support" off \
-		MYSQL5	"Build with mysql5 support" off \
+		MYSQL4	"Build with MySQL 4.1.x support" off \
+		MYSQL5	"Build with mysql 5.0.x support" off \
+		MYSQL51	"Build with mysql 5.1.x support" off \
 		SQLITE	"Build with sqlite support" off \
 		GUISERV "Install GUI server (in JAVA)" off
 
@@ -69,6 +71,15 @@ PLIST_SUB+=	MYSQL5=""
 PLIST_SUB+=	MYSQL5="@comment "
 .endif
 
+.if defined(WITH_MYSQL51)
+USE_MYSQL=yes
+WITH_MYSQL_VER=	51
+MODULES+=	mysql51
+PLIST_SUB+=	MYSQL51=""
+.else
+PLIST_SUB+=	MYSQL51="@comment "
+.endif
+
 .if defined(WITH_SQLITE)
 USE_SQLITE=3
 MODULES+=	sqlite3
@@ -109,6 +120,9 @@ post-patch:
 		"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
+	@${REINPLACE_CMD} -E -e \
 		"s,/usr/local/lib/(libsqlite)3.so,${LOCALBASE}/lib/\1${_SQLITE_VER}.so," \
 		${WRKSRC}/modules/sqlite3.lsp
 	@${REINPLACE_CMD} -E -e \
diff --git a/lang/newlisp/distinfo b/lang/newlisp/distinfo
index c1b7cda624e5..2f1d498175ba 100644
--- a/lang/newlisp/distinfo
+++ b/lang/newlisp/distinfo
@@ -1,3 +1,3 @@
-MD5 (newlisp-9.2.0.tgz) = 3e2c9bbfd0e6bad45df80258d26ce6d8
-SHA256 (newlisp-9.2.0.tgz) = f67f8d53f8d117a723e488d29c3b18c730438253739ce1d41a595a9b49761a0a
-SIZE (newlisp-9.2.0.tgz) = 1192034
+MD5 (newlisp-9.3.0.tgz) = 6c4e9d06b3be63058e45b9500e610743
+SHA256 (newlisp-9.3.0.tgz) = 25ccf4af0d5b4916c6187c07113119bc337b89a45afee7839cb9cf51863219ec
+SIZE (newlisp-9.3.0.tgz) = 1245394
diff --git a/lang/newlisp/pkg-plist b/lang/newlisp/pkg-plist
index ec54232327a6..22af235ab0f8 100644
--- a/lang/newlisp/pkg-plist
+++ b/lang/newlisp/pkg-plist
@@ -1,12 +1,14 @@
 bin/newlisp
 %%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%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/CodePatterns.html
+%%PORTDOCS%%%%DOCSDIR%%/ExpressionEvaluation.html
+%%PORTDOCS%%%%DOCSDIR%%/MemoryManagement.html
 %%PORTDOCS%%%%DOCSDIR%%/manual_frame.html
-%%PORTDOCS%%%%DOCSDIR%%/newLISP-9.2-Release.html
+%%PORTDOCS%%%%DOCSDIR%%/newLISP-9.3-Release.html
 %%PORTDOCS%%%%DOCSDIR%%/newLISPdoc.html
 %%PORTDOCS%%%%DOCSDIR%%/newlisp_index.html
 %%PORTDOCS%%%%DOCSDIR%%/newlisp_manual.html
@@ -27,7 +29,6 @@ bin/newlispdoc
 %%PORTDOCS%%%%EXAMPLESDIR%%/udp-server.lsp
 %%PORTDOCS%%%%EXAMPLESDIR%%/upload.cgi
 %%PORTDOCS%%%%EXAMPLESDIR%%/upload.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/url-file.txt
 %%PORTDOCS%%%%EXAMPLESDIR%%/xmlrpc.cgi
 %%GUISERV%%%%DATADIR%%/guiserver.jar
 %%GUISERV%%%%DATADIR%%/guiserver.lsp
@@ -43,6 +44,8 @@ bin/newlispdoc
 %%GUISERV%%%%DATADIR%%/guiserver/html-demo.lsp
 %%GUISERV%%%%DATADIR%%/guiserver/image-demo.lsp
 %%GUISERV%%%%DATADIR%%/guiserver/mouse-demo.lsp
+%%GUISERV%%%%DATADIR%%/guiserver/move-resize-demo.lsp
+%%GUISERV%%%%DATADIR%%/guiserver/pinballs-demo.lsp
 %%GUISERV%%%%DATADIR%%/guiserver/properties-demo.lsp
 %%GUISERV%%%%DATADIR%%/guiserver/rotation-demo.lsp
 %%GUISERV%%%%DATADIR%%/guiserver/shapes-demo.lsp
@@ -54,9 +57,11 @@ bin/newlispdoc
 %%GUISERV%%%%DATADIR%%/guiserver/widgets-demo.lsp
 %%GUISERV%%%%DATADIR%%/guiserver/word-count.lsp
 %%DATADIR%%/modules/cgi.lsp
+%%DATADIR%%/modules/crypto.lsp
 %%DATADIR%%/modules/ftp.lsp
 %%GMP%%%%DATADIR%%/modules/gmp.lsp
 %%DATADIR%%/modules/infix.lsp
+%%MYSQL51%%%%DATADIR%%/modules/mysql51.lsp
 %%MYSQL5%%%%DATADIR%%/modules/mysql5.lsp
 %%MYSQL4%%%%DATADIR%%/modules/mysql.lsp
 %%DATADIR%%/modules/odbc.lsp