Upgrade to version 10.6.0.

- Add LICENSE
- Use new LIB_DEPENDS syntax
- Remove stray MAN1

4 files changed, 12 insertions, 38 deletions

diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile
index 117d8e6b9491..13e4ef673887 100644
--- a/lang/newlisp/Makefile
+++ b/lang/newlisp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	newlisp
-PORTVERSION=	10.5.4
+PORTVERSION=	10.6.0
 CATEGORIES=	lang
 MASTER_SITES=	http://www.newlisp.org/downloads/
 EXTRACT_SUFX=	.tgz
@@ -10,18 +10,18 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	LISP like scripting language
 
-LIB_DEPENDS=	ffi:${PORTSDIR}/devel/libffi
+LICENSE=	GPL
+
+LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
 
 CONFLICTS=	newlisp-devel-[0-9]*
 
 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 \
@@ -43,7 +43,7 @@ CFLAGS+=	-DNEWLISP64
 .endif
 
 .if ${PORT_OPTIONS:MGMP}
-LIB_DEPENDS+=	gmp:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
 MODULES+=	gmp
 PLIST_SUB+=	GMP=""
 .else
@@ -51,7 +51,7 @@ PLIST_SUB+=	GMP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGSL}
-LIB_DEPENDS+=	gsl:${PORTSDIR}/math/gsl
+LIB_DEPENDS+=	libgsl.so:${PORTSDIR}/math/gsl
 MODULES+=	gsl
 PLIST_SUB+=	GSL=""
 .else
diff --git a/lang/newlisp/distinfo b/lang/newlisp/distinfo
index f37a2abb6f2d..f81de9d112e4 100644
--- a/lang/newlisp/distinfo
+++ b/lang/newlisp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (newlisp-10.5.4.tgz) = e4561e03c89e7c89a30dfa7daf12091085a474e96b0fbbb4ee62454463175eb0
-SIZE (newlisp-10.5.4.tgz) = 1637762
+SHA256 (newlisp-10.6.0.tgz) = 59200b97879231c331f6c0e519a66602c9ae82a8f744c2be236e08ad6f91ff7f
+SIZE (newlisp-10.6.0.tgz) = 1670395
diff --git a/lang/newlisp/files/patch-newlisp.c b/lang/newlisp/files/patch-newlisp.c
deleted file mode 100644
index 655890faec64..000000000000
--- a/lang/newlisp/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/pkg-plist b/lang/newlisp/pkg-plist
index 322d5620de23..d2c7b92f07db 100644
--- a/lang/newlisp/pkg-plist
+++ b/lang/newlisp/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.0-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