Upgrade to version 10.6.1.

4 files changed, 11 insertions, 39 deletions

diff --git a/lang/newlisp-devel/Makefile b/lang/newlisp-devel/Makefile
index 037dbb40b382..f9c5049d0316 100644
--- a/lang/newlisp-devel/Makefile
+++ b/lang/newlisp-devel/Makefile
@@ -2,30 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	newlisp
-PORTVERSION=	10.5.4
-PORTREVISION=	2
+PORTVERSION=	10.6.1
 CATEGORIES=	lang
-MASTER_SITES=	http://www.newlisp.org/downloads/
+MASTER_SITES=	http://www.newlisp.org/downloads/development/
 PKGNAMESUFFIX=	-devel
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	LISP like scripting language
 
+LICENSE=	GPLv3
+
 LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
 
 CONFLICTS=	newlisp-[0-9]*
 
-IGNORE=		no development version currently available
+USES=		readline tar:tgz
 
 HAS_CONFIGURE=	yes
 ALL_TARGET=	default
 
-MAN1=		newlisp.1 newlispdoc.1
-
 REINPLACE_ARGS=	-i ""
 
-MODULES=	canvas cgi crypto ftp getopts infix macro odbc pop3 \
+MODULES=	canvas cgi crypto ftp getopts infix odbc pop3 \
 		postscript smtp smtpx stat unix xmlrpc-client zlib
 
 DOCS=		CHANGES CodePatterns.html ExpressionEvaluation.html \
diff --git a/lang/newlisp-devel/distinfo b/lang/newlisp-devel/distinfo
index f37a2abb6f2d..1e75f3f39bcb 100644
--- a/lang/newlisp-devel/distinfo
+++ b/lang/newlisp-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (newlisp-10.5.4.tgz) = e4561e03c89e7c89a30dfa7daf12091085a474e96b0fbbb4ee62454463175eb0
-SIZE (newlisp-10.5.4.tgz) = 1637762
+SHA256 (newlisp-10.6.1.tgz) = 8e10679cac369d189541a5bd809351f2be89e6eec60168b9188c0fceeda8927d
+SIZE (newlisp-10.6.1.tgz) = 1673201
diff --git a/lang/newlisp-devel/files/patch-newlisp.c b/lang/newlisp-devel/files/patch-newlisp.c
deleted file mode 100644
index 655890faec64..000000000000
--- a/lang/newlisp-devel/files/patch-newlisp.c
+++ /dev/null
@@ -1,27 +0,0 @@
-
-$FreeBSD$
-
---- newlisp.c.orig
-+++ newlisp.c
-@@ -515,16 +515,16 @@
-     else if(getenv("DOCUMENT_ROOT"))
-         strncpy(initFile, getenv("DOCUMENT_ROOT"), PATH_MAX - 16);
- 
--    strncat(initFile, "/.", 2);
--    strncat(initFile, INIT_FILE, 8);
-+    strlcat(initFile, "/.", sizeof(initFile));
-+    strlcat(initFile, INIT_FILE, sizeof(initFile));
-     if(loadFile(initFile, 0, 0, mainContext) == NULL)
-         {
-         envPtr = getenv("NEWLISPDIR");
-         if(envPtr)
-             {
--            strncpy(initFile, envPtr, PATH_MAX - 16);
--            strncat(initFile, "/", 1);
--            strncat(initFile, INIT_FILE, 8);
-+            strlcpy(initFile, envPtr, sizeof(initFile));
-+            strlcat(initFile, "/", sizeof(initFile));
-+            strlcat(initFile, INIT_FILE, sizeof(initFile));
-             loadFile(initFile, 0, 0, mainContext);      
-             }
-         }
diff --git a/lang/newlisp-devel/pkg-plist b/lang/newlisp-devel/pkg-plist
index b70e0511ef47..c8583f9dc45c 100644
--- a/lang/newlisp-devel/pkg-plist
+++ b/lang/newlisp-devel/pkg-plist
@@ -10,7 +10,7 @@ man/man1/newlispdoc.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ExpressionEvaluation.html
 %%PORTDOCS%%%%DOCSDIR%%/MemoryManagement.html
 %%PORTDOCS%%%%DOCSDIR%%/manual_frame.html
-%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.5.4-Release.html
+%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.6.1-Release.html
 %%PORTDOCS%%%%DOCSDIR%%/newLISPdoc.html
 %%PORTDOCS%%%%DOCSDIR%%/newlisp_index.html
 %%PORTDOCS%%%%DOCSDIR%%/newlisp_manual.html
@@ -22,6 +22,7 @@ man/man1/newlispdoc.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/form.cgi
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/form.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpd-conf.lsp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/index.cgi
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/newLISP-Excel-Import.xls
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/observer
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl-demo-ffi.lsp
@@ -58,6 +59,7 @@ man/man1/newlispdoc.1.gz
 %%GUISERV%%%%DATADIR%%/guiserver/pinballs-demo.lsp
 %%GUISERV%%%%DATADIR%%/guiserver/properties-demo.lsp
 %%GUISERV%%%%DATADIR%%/guiserver/rotation-demo.lsp
+%%GUISERV%%%%DATADIR%%/guiserver/scroll-pane-demo.lsp
 %%GUISERV%%%%DATADIR%%/guiserver/shapes-demo.lsp
 %%GUISERV%%%%DATADIR%%/guiserver/sound-demo.lsp
 %%GUISERV%%%%DATADIR%%/guiserver/stroke-demo.lsp
@@ -78,7 +80,6 @@ man/man1/newlispdoc.1.gz
 %%GMP%%%%DATADIR%%/modules/gmp.lsp
 %%GSL%%%%DATADIR%%/modules/gsl.lsp
 %%DATADIR%%/modules/infix.lsp
-%%DATADIR%%/modules/macro.lsp
 %%MYSQL%%%%DATADIR%%/modules/mysql.lsp
 %%DATADIR%%/modules/odbc.lsp
 %%DATADIR%%/modules/pop3.lsp