From owner-svn-ports-all@FreeBSD.ORG Sat May 23 15:01:51 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1D5EF0D; Sat, 23 May 2015 15:01:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8F96A18E4; Sat, 23 May 2015 15:01:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4NF1pCN006408; Sat, 23 May 2015 15:01:51 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4NF1nXM006398; Sat, 23 May 2015 15:01:49 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201505231501.t4NF1nXM006398@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Sat, 23 May 2015 15:01:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387132 - in head/lang/newlisp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 May 2015 15:01:51 -0000 Author: olgeni Date: Sat May 23 15:01:49 2015 New Revision: 387132 URL: https://svnweb.freebsd.org/changeset/ports/387132 Log: Upgrade to version 10.6.2. Deleted: head/lang/newlisp/files/patch-newlisp.h Modified: head/lang/newlisp/Makefile head/lang/newlisp/distinfo head/lang/newlisp/files/patch-makefile_bsd (contents, props changed) head/lang/newlisp/files/patch-makefile_bsdLP64_utf8 (contents, props changed) head/lang/newlisp/files/patch-makefile_bsd_utf8 (contents, props changed) head/lang/newlisp/files/patch-modules_gsl.lsp (contents, props changed) head/lang/newlisp/pkg-plist Modified: head/lang/newlisp/Makefile ============================================================================== --- head/lang/newlisp/Makefile Sat May 23 14:52:35 2015 (r387131) +++ head/lang/newlisp/Makefile Sat May 23 15:01:49 2015 (r387132) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= newlisp -PORTVERSION= 10.6.0 -PORTREVISION= 2 +PORTVERSION= 10.6.2 CATEGORIES= lang MASTER_SITES= http://www.newlisp.org/downloads/ @@ -16,22 +15,24 @@ LIB_DEPENDS= libffi.so:${PORTSDIR}/devel CONFLICTS= newlisp-devel-[0-9]* -USES= readline tar:tgz +USES= readline:port tar:tgz +OPTIONS_SUB= yes HAS_CONFIGURE= yes ALL_TARGET= default REINPLACE_ARGS= -i "" -MODULES= canvas cgi crypto ftp getopts infix odbc pop3 \ +MODULES= canvas cgi crypto ftp getopts infix odbc plot pop3 \ postscript smtp smtpx stat unix xmlrpc-client zlib DOCS= CHANGES CodePatterns.html ExpressionEvaluation.html \ - MemoryManagement.html newLISP-${PORTVERSION}-Release.html \ - manual_frame.html newLISPdoc.html \ - newlisp_index.html newlisp_manual.html \ + MemoryManagement.html manual_frame.html \ + newLISP-${PORTVERSION}-Release.html newLISPdoc.html \ + newlisp-man.txt newlisp_index.html newlisp_manual.html \ + newlispdoc-man.txt -OPTIONS_DEFINE= GMP GSL MYSQL PGSQL SQLITE GUISERV DOCS EXAMPLES +OPTIONS_DEFINE= GSL MYSQL PGSQL SQLITE GUISERV DOCS EXAMPLES GSL_DESC= GSL (GNU Scientific Library) GUISERV_DESC= Install GUI server (in Java) @@ -44,59 +45,27 @@ LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -DNEWLISP64 .endif -.if ${PORT_OPTIONS:MGMP} -LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp -MODULES+= gmp -PLIST_SUB+= GMP="" -.else -PLIST_SUB+= GMP="@comment " -.endif - .if ${PORT_OPTIONS:MGSL} LIB_DEPENDS+= libgsl.so:${PORTSDIR}/math/gsl MODULES+= gsl -PLIST_SUB+= GSL="" -.else -PLIST_SUB+= GSL="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes MODULES+= mysql -PLIST_SUB+= MYSQL="" -.else -PLIST_SUB+= MYSQL="@comment " .endif .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql MODULES+= postgres -PLIST_SUB+= PGSQL="" -.else -PLIST_SUB+= PGSQL="@comment " .endif .if ${PORT_OPTIONS:MSQLITE} USE_SQLITE= 3 MODULES+= sqlite3 -PLIST_SUB+= SQLITE="" -.else -PLIST_SUB+= SQLITE="@comment " -.endif - -.if ${PORT_OPTIONS:MGUISERV} -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" \ - -e "s,^(datadir=).*,\1${STAGEDIR}${PREFIX}/share,g" \ - -e "s,^(bindir=).*,\1${STAGEDIR}${PREFIX}/bin,g" \ - ${WRKSRC}/Makefile - @${REINPLACE_CMD} -E \ -e "s,/usr/(local/)?bin/newlisp,${PREFIX}/bin/newlisp,g" \ -e "s,/usr/(local/)?share/newlisp,${DATADIR},g" \ @@ -116,9 +85,6 @@ post-patch: "s,/usr/local/lib/(libsqlite)3.so,${LOCALBASE}/lib/\1${_SQLITE_VER}.so," \ ${WRKSRC}/modules/sqlite3.lsp @${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/libgsl.so,${LOCALBASE}/lib/libgsl.so," \ ${WRKSRC}/modules/gsl.lsp @${REINPLACE_CMD} -E -e \ @@ -158,7 +124,6 @@ do-install: ${STAGEDIR}${PREFIX}/bin/newlisp-edit .endif -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MGUISERV} @@ -167,7 +132,6 @@ do-install: ${WRKSRC}/guiserver/guiserver.lsp.html \ ${STAGEDIR}${DOCSDIR}/guiserver .endif -.endif .if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} Modified: head/lang/newlisp/distinfo ============================================================================== --- head/lang/newlisp/distinfo Sat May 23 14:52:35 2015 (r387131) +++ head/lang/newlisp/distinfo Sat May 23 15:01:49 2015 (r387132) @@ -1,2 +1,2 @@ -SHA256 (newlisp-10.6.0.tgz) = 59200b97879231c331f6c0e519a66602c9ae82a8f744c2be236e08ad6f91ff7f -SIZE (newlisp-10.6.0.tgz) = 1670395 +SHA256 (newlisp-10.6.2.tgz) = ae3ab77987cb2cfef4e986104be5be5ac9469317e9d74884c3ea89c2e4bb4040 +SIZE (newlisp-10.6.2.tgz) = 1671798 Modified: head/lang/newlisp/files/patch-makefile_bsd ============================================================================== --- head/lang/newlisp/files/patch-makefile_bsd Sat May 23 14:52:35 2015 (r387131) +++ head/lang/newlisp/files/patch-makefile_bsd Sat May 23 15:01:49 2015 (r387132) @@ -1,6 +1,6 @@ ---- makefile_bsd.orig +--- makefile_bsd.orig 2015-01-19 17:10:12 UTC +++ makefile_bsd -@@ -6,14 +6,12 @@ +@@ -6,14 +6,12 @@ OBJS = newlisp.o nl-symbol.o nl-math.o n # the option -fno-strict-aliasing may not be available on some BSD versions @@ -9,7 +9,7 @@ # or without readline lib #CFLAGS = -m32 -Wall -Wno-uninitialized -Wno-strict-aliasing -O2 -c -g -D_BSD --CC = gcc +-CC = cc - default: $(OBJS) - $(CC) $(OBJS) -m32 -g -lm -lreadline -lncurses -o newlisp Modified: head/lang/newlisp/files/patch-makefile_bsdLP64_utf8 ============================================================================== --- head/lang/newlisp/files/patch-makefile_bsdLP64_utf8 Sat May 23 14:52:35 2015 (r387131) +++ head/lang/newlisp/files/patch-makefile_bsdLP64_utf8 Sat May 23 15:01:49 2015 (r387132) @@ -1,6 +1,6 @@ ---- makefile_bsdLP64_utf8.orig +--- makefile_bsdLP64_utf8.orig 2015-01-19 17:10:12 UTC +++ makefile_bsdLP64_utf8 -@@ -6,14 +6,12 @@ +@@ -6,14 +6,12 @@ OBJS = newlisp.o nl-symbol.o nl-math.o n # the option -fno-strict-aliasing may not be available on some BSD versions @@ -9,7 +9,7 @@ # or without readline lib #CFLAGS = -m64 -Wall -Wno-uninitialized -Wno-strict-aliasing -O2 -c -g -DNEWLISP64 -D_BSD --CC = gcc +-CC = cc - default: $(OBJS) - $(CC) $(OBJS) -m64 -g -lm -lreadline -lncurses -o newlisp Modified: head/lang/newlisp/files/patch-makefile_bsd_utf8 ============================================================================== --- head/lang/newlisp/files/patch-makefile_bsd_utf8 Sat May 23 14:52:35 2015 (r387131) +++ head/lang/newlisp/files/patch-makefile_bsd_utf8 Sat May 23 15:01:49 2015 (r387132) @@ -1,15 +1,15 @@ ---- makefile_bsd_utf8.orig +--- makefile_bsd_utf8.orig 2015-01-19 17:10:12 UTC +++ makefile_bsd_utf8 @@ -4,14 +4,12 @@ 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 nl-utf8.o pcre.o + nl-sock.o nl-import.o nl-xml-json.o nl-web.o nl-matrix.o nl-debug.o nl-utf8.o pcre.o -CFLAGS = -m32 -Wall -Wno-uninitialized -fno-strict-aliasing -O2 -c -g -DREADLINE -D_BSD -DSUPPORT_UTF8 +CFLAGS += -m32 -c -DREADLINE -D_BSD -DSUPPORT_UTF8 -DFFI # or without readline lib #CFLAGS = -m32 -Wall -Wno-uninitialized -fno-strict-aliasing -O2 -c -g -D_BSD -DSUPPORT_UTF8 --CC = gcc +-CC = cc - default: $(OBJS) - $(CC) $(OBJS) -m32 -g -lm -lreadline -lncurses -o newlisp Modified: head/lang/newlisp/files/patch-modules_gsl.lsp ============================================================================== --- head/lang/newlisp/files/patch-modules_gsl.lsp Sat May 23 14:52:35 2015 (r387131) +++ head/lang/newlisp/files/patch-modules_gsl.lsp Sat May 23 15:01:49 2015 (r387132) @@ -1,8 +1,8 @@ ---- modules/gsl.lsp.orig +--- modules/gsl.lsp.orig 2015-05-23 14:58:26 UTC +++ modules/gsl.lsp @@ -169,6 +169,7 @@ (= ostype "Win32") "libgsl-0.dll" ; 32-bit - (= ostype "OSX") "libgsl.dylib" ; 32-bit + (= ostype "OSX") "libgsl.dylib" ; 32-bit or 64-bit (= ostype "Linux") "/usr/local/lib/libgsl.so" ; 32-bit or 64-bit + (= ostype "BSD") "/usr/local/lib/libgsl.so" ; 32-bit or 64-bit )) Modified: head/lang/newlisp/pkg-plist ============================================================================== --- head/lang/newlisp/pkg-plist Sat May 23 14:52:35 2015 (r387131) +++ head/lang/newlisp/pkg-plist Sat May 23 15:01:49 2015 (r387132) @@ -10,12 +10,15 @@ man/man1/newlispdoc.1.gz %%PORTDOCS%%%%DOCSDIR%%/ExpressionEvaluation.html %%PORTDOCS%%%%DOCSDIR%%/MemoryManagement.html %%PORTDOCS%%%%DOCSDIR%%/manual_frame.html -%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.6.0-Release.html +%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.6.2-Release.html %%PORTDOCS%%%%DOCSDIR%%/newLISPdoc.html +%%PORTDOCS%%%%DOCSDIR%%/newlisp-man.txt %%PORTDOCS%%%%DOCSDIR%%/newlisp_index.html %%PORTDOCS%%%%DOCSDIR%%/newlisp_manual.html +%%PORTDOCS%%%%DOCSDIR%%/newlispdoc-man.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/async +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/callback %%PORTEXAMPLES%%%%EXAMPLESDIR%%/client %%PORTEXAMPLES%%%%EXAMPLESDIR%%/env.cgi %%PORTEXAMPLES%%%%EXAMPLESDIR%%/finger @@ -77,11 +80,11 @@ man/man1/newlispdoc.1.gz %%DATADIR%%/modules/crypto.lsp %%DATADIR%%/modules/ftp.lsp %%DATADIR%%/modules/getopts.lsp -%%GMP%%%%DATADIR%%/modules/gmp.lsp %%GSL%%%%DATADIR%%/modules/gsl.lsp %%DATADIR%%/modules/infix.lsp %%MYSQL%%%%DATADIR%%/modules/mysql.lsp %%DATADIR%%/modules/odbc.lsp +%%DATADIR%%/modules/plot.lsp %%DATADIR%%/modules/pop3.lsp %%PGSQL%%%%DATADIR%%/modules/postgres.lsp %%DATADIR%%/modules/postscript.lsp