- Update to 10.3.3

- Add pgsql OPTION
- Use bsd.port.options.mk

PR:		ports/162711
Submitted by:	stas
Feature safe:	yes

4 files changed, 40 insertions, 13 deletions

diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile
index c24d9a8648e1..3fc8ecd72277 100644
--- a/lang/newlisp/Makefile
+++ b/lang/newlisp/Makefile
@@ -7,11 +7,10 @@
 #
 
 PORTNAME=	newlisp
-PORTVERSION=	10.2.8
+PORTVERSION=	10.3.3
 PORTREVISION=	0
 CATEGORIES=	lang
 MASTER_SITES=	http://www.newlisp.org/downloads/
-#MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -24,8 +23,8 @@ MAN1=	newlisp.1 newlispdoc.1
 
 REINPLACE_ARGS=	-i ""
 
-MODULES=	cgi crypto ftp infix odbc pop3 postscript smtp stat unix \
-		xmlrpc-client zlib
+MODULES=	canvas cgi crypto ftp getopts infix json macro odbc pop3 \
+		postscript smtp smtpx stat unix xmlrpc-client zlib
 
 DOCS=		CHANGES CodePatterns.html ExpressionEvaluation.html \
 		MemoryManagement.html newLISP-${PORTVERSION}-Release.html \
@@ -35,10 +34,11 @@ DOCS=		CHANGES CodePatterns.html ExpressionEvaluation.html \
 OPTIONS=	GMP	"Enable GMP math library support" off \
 		MYSQL5	"Build with mysql 5.0.x support" off \
 		MYSQL51	"Build with mysql 5.1.x support" off \
+		PGSQL	"Build with postgresql support" off \
 		SQLITE	"Build with sqlite support" off \
 		GUISERV "Install GUI server (in JAVA)" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "sparc64" || ${ARCH} == "ia64"
 CFLAGS+=	-DNEWLISP64
@@ -70,6 +70,14 @@ PLIST_SUB+=	MYSQL51=""
 PLIST_SUB+=	MYSQL51="@comment "
 .endif
 
+.if defined(WITH_PGSQL)
+USE_PGSQL=yes
+MODULES+=	postgres
+PLIST_SUB+=	PGSQL=""
+.else
+PLIST_SUB+=	PGSQL="@comment "
+.endif
+
 .if defined(WITH_SQLITE)
 USE_SQLITE=3
 MODULES+=	sqlite3
@@ -112,6 +120,9 @@ post-patch:
 	@${REINPLACE_CMD} -E -e \
 		"s,/usr/local/lib/libgmp.so,${LOCALBASE}/lib/libgmp.so," \
 		${WRKSRC}/modules/gmp.lsp
+	@${REINPLACE_CMD} -E -e \
+		"s,/usr/local/lib/libpq.so.5.1,${LOCALBASE}/lib/libpq.so.5," \
+		${WRKSRC}/modules/postgres.lsp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/newlisp ${PREFIX}/bin/
@@ -122,6 +133,8 @@ do-install:
 			${WRKSRC}/util/newlisp.vim \
 			${WRKSRC}/util/link.lsp \
 			${WRKSRC}/util/httpd-conf.lsp \
+			${WRKSRC}/util/newlisp.jsf \
+			${WRKSRC}/util/nanorc \
 			${DATADIR}/util/
 
 	${MKDIR} ${DATADIR}/modules/
@@ -158,4 +171,4 @@ do-install:
 . endif
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/newlisp/distinfo b/lang/newlisp/distinfo
index 9a674077271a..b6adddd67ed5 100644
--- a/lang/newlisp/distinfo
+++ b/lang/newlisp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (newlisp-10.2.8.tgz) = c46a0e4585de3411bc695db94c5516d37132abb9433d0594b5c3cc4040d8559d
-SIZE (newlisp-10.2.8.tgz) = 1490887
+SHA256 (newlisp-10.3.3.tgz) = 91b19907efe1c74073ebae939b41a307561ffb879d4f1b8d95155fb3a2d91afe
+SIZE (newlisp-10.3.3.tgz) = 1537512
diff --git a/lang/newlisp/files/patch-makefile_bsd_lib b/lang/newlisp/files/patch-makefile_bsd_lib
index 60f6fce40801..5320fde41744 100644
--- a/lang/newlisp/files/patch-makefile_bsd_lib
+++ b/lang/newlisp/files/patch-makefile_bsd_lib
@@ -1,13 +1,13 @@
---- makefile_bsd_lib.orig	2009-07-02 14:38:00.000000000 +0400
-+++ makefile_bsd_lib	2009-07-02 14:38:41.000000000 +0400
+--- makefile_bsd_lib.orig	2011-09-21 07:21:04.000000000 -0700
++++ makefile_bsd_lib	2011-11-13 21:18:47.000000000 -0800
 @@ -3,9 +3,7 @@
  OBJS = newlisp.o nl-symbol.o nl-math.o nl-list.o nl-liststr.o nl-string.o nl-filesys.o \
  	nl-sock.o nl-import.o nl-xml.o nl-web.o nl-matrix.o nl-debug.o pcre.o unix-lib.o
  
--CFLAGS = -m32 -Wall -Wno-uninitialized -fno-strict-aliasing -O2 -c -g -DREADLINE -D_BSD
+-CFLAGS = -m32 -Wall -Wno-uninitialized -fno-strict-aliasing -O2 -c -g -D_BSD
 -
 -CC = gcc
-+CFLAGS = -m32 -c -DREADLINE -D_BSD
++CFLAGS = -m32 -c -D_BSD
  
  default: $(OBJS)
  	$(CC) $(OBJS) -m32 -lm -shared -o newlisp.so
diff --git a/lang/newlisp/pkg-plist b/lang/newlisp/pkg-plist
index 67af68ca4a70..376a57552eb7 100644
--- a/lang/newlisp/pkg-plist
+++ b/lang/newlisp/pkg-plist
@@ -8,10 +8,12 @@ bin/newlispdoc
 %%PORTDOCS%%%%DOCSDIR%%/ExpressionEvaluation.html
 %%PORTDOCS%%%%DOCSDIR%%/MemoryManagement.html
 %%PORTDOCS%%%%DOCSDIR%%/manual_frame.html
-%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.2.8-Release.html
+%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.3.3-Release.html
 %%PORTDOCS%%%%DOCSDIR%%/newLISPdoc.html
 %%PORTDOCS%%%%DOCSDIR%%/newlisp_index.html
 %%PORTDOCS%%%%DOCSDIR%%/newlisp_manual.html
+%%PORTDOCS%%%%EXAMPLESDIR%%/Lex
+%%PORTDOCS%%%%EXAMPLESDIR%%/async
 %%PORTDOCS%%%%EXAMPLESDIR%%/client
 %%PORTDOCS%%%%EXAMPLESDIR%%/finger
 %%PORTDOCS%%%%EXAMPLESDIR%%/form.cgi
@@ -21,12 +23,16 @@ bin/newlispdoc
 %%PORTDOCS%%%%EXAMPLESDIR%%/observer
 %%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
 %%GUISERV%%%%DATADIR%%/guiserver.jar
 %%GUISERV%%%%DATADIR%%/guiserver.lsp
@@ -57,17 +63,23 @@ bin/newlispdoc
 %%GUISERV%%%%DATADIR%%/guiserver/widgets-demo-ru.lsp
 %%GUISERV%%%%DATADIR%%/guiserver/widgets-demo.lsp
 %%GUISERV%%%%DATADIR%%/guiserver/word-count.lsp
+%%DATADIR%%/modules/canvas.lsp
 %%DATADIR%%/modules/cgi.lsp
 %%DATADIR%%/modules/crypto.lsp
 %%DATADIR%%/modules/ftp.lsp
+%%DATADIR%%/modules/getopts.lsp
 %%GMP%%%%DATADIR%%/modules/gmp.lsp
 %%DATADIR%%/modules/infix.lsp
+%%DATADIR%%/modules/json.lsp
+%%DATADIR%%/modules/macro.lsp
 %%MYSQL51%%%%DATADIR%%/modules/mysql.lsp
 %%MYSQL5%%%%DATADIR%%/modules/mysql.lsp
 %%DATADIR%%/modules/odbc.lsp
 %%DATADIR%%/modules/pop3.lsp
+%%PGSQL%%%%DATADIR%%/modules/postgres.lsp
 %%DATADIR%%/modules/postscript.lsp
 %%DATADIR%%/modules/smtp.lsp
+%%DATADIR%%/modules/smtpx.lsp
 %%SQLITE%%%%DATADIR%%/modules/sqlite3.lsp
 %%DATADIR%%/modules/stat.lsp
 %%DATADIR%%/modules/unix.lsp
@@ -75,6 +87,8 @@ 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
 @dirrm %%DATADIR%%/util