From 454f952c4d0a8e4e29f90ef4b611a4636b31b731 Mon Sep 17 00:00:00 2001 From: Jimmy Olgeni Date: Mon, 7 Oct 2013 10:47:20 +0000 Subject: [PATCH] - Upgrade to version 10.5.4. - Add staging support. - Fix portlint warning in pkg-descr (WWW tag). --- lang/newlisp/Makefile | 51 +++++++++++++++++++++--------------------- lang/newlisp/distinfo | 4 ++-- lang/newlisp/pkg-descr | 2 +- lang/newlisp/pkg-plist | 10 ++++++--- 4 files changed, 35 insertions(+), 32 deletions(-) diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile index 7f57bc113754..117d8e6b9491 100644 --- a/lang/newlisp/Makefile +++ b/lang/newlisp/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= newlisp -PORTVERSION= 10.5.3 +PORTVERSION= 10.5.4 CATEGORIES= lang MASTER_SITES= http://www.newlisp.org/downloads/ EXTRACT_SUFX= .tgz @@ -33,7 +33,6 @@ OPTIONS_DEFINE= GMP GSL MYSQL PGSQL SQLITE GUISERV GSL_DESC= GSL (GNU Scientific Library) GUISERV_DESC= Install GUI server (in Java) -NO_STAGE= yes .include CFLAGS+= -I${LOCALBASE}/include @@ -92,8 +91,8 @@ PLIST_SUB+= GUISERV="@comment " 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${PREFIX}/share,g" \ - -e "s,^(bindir=).*,\1${PREFIX}/bin,g" \ + -e "s,^(datadir=).*,\1${STAGEDIR}${PREFIX}/share,g" \ + -e "s,^(bindir=).*,\1${STAGEDIR}${PREFIX}/bin,g" \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -E \ @@ -128,49 +127,49 @@ post-patch: ${WRKSRC}/newlisp.h do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/newlisp ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/util/newlispdoc ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/newlisp ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/util/newlispdoc ${STAGEDIR}${PREFIX}/bin - @${MKDIR} ${DATADIR}/util + @${MKDIR} ${STAGEDIR}${DATADIR}/util ${INSTALL_DATA} ${WRKSRC}/util/syntax.cgi \ - ${WRKSRC}/util/newlisp.vim \ - ${WRKSRC}/util/link.lsp \ - ${WRKSRC}/util/httpd-conf.lsp \ + ${WRKSRC}/util/README.txt \ ${WRKSRC}/util/newlisp.jsf \ - ${DATADIR}/util + ${WRKSRC}/util/newlisp.vim \ + ${WRKSRC}/util/standard.lsp \ + ${STAGEDIR}${DATADIR}/util - @${MKDIR} ${DATADIR}/modules + @${MKDIR} ${STAGEDIR}${DATADIR}/modules ${INSTALL_DATA} ${MODULES:S,^,${WRKSRC}/modules/,:S,$,.lsp,} \ - ${DATADIR}/modules + ${STAGEDIR}${DATADIR}/modules - ${INSTALL_MAN} ${WRKSRC}/doc/newlisp.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/newlispdoc.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/newlisp.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/newlispdoc.1 ${STAGEDIR}${PREFIX}/man/man1 .if ${PORT_OPTIONS:MGUISERV} - @${MKDIR} ${DATADIR}/guiserver + @${MKDIR} ${STAGEDIR}${DATADIR}/guiserver @(cd ${WRKSRC}/guiserver/ && ${COPYTREE_SHARE} \*.lsp \ - ${DATADIR}/guiserver/ \ + ${STAGEDIR}${DATADIR}/guiserver/ \ "! -name guiserver.lsp ! -name newlisp-edit.lsp") - ${INSTALL_DATA} ${WRKSRC}/guiserver/guiserver.jar ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/guiserver/guiserver.lsp ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/guiserver/guiserver.jar ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/guiserver/guiserver.lsp ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/guiserver/newlisp-edit.lsp \ - ${PREFIX}/bin/newlisp-edit + ${STAGEDIR}${PREFIX}/bin/newlisp-edit .endif .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MGUISERV} - @${MKDIR} ${DOCSDIR}/guiserver + @${MKDIR} ${STAGEDIR}${DOCSDIR}/guiserver ${INSTALL_DATA} ${WRKSRC}/guiserver/index.html \ ${WRKSRC}/guiserver/guiserver.lsp.html \ - ${DOCSDIR}/guiserver + ${STAGEDIR}${DOCSDIR}/guiserver .endif .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} .endif .include diff --git a/lang/newlisp/distinfo b/lang/newlisp/distinfo index 7b6d3056f184..f37a2abb6f2d 100644 --- a/lang/newlisp/distinfo +++ b/lang/newlisp/distinfo @@ -1,2 +1,2 @@ -SHA256 (newlisp-10.5.3.tgz) = a452d7f68b565376590a67516f807f13a33468f69f27bb0ac564e9fb05c5cebe -SIZE (newlisp-10.5.3.tgz) = 1631742 +SHA256 (newlisp-10.5.4.tgz) = e4561e03c89e7c89a30dfa7daf12091085a474e96b0fbbb4ee62454463175eb0 +SIZE (newlisp-10.5.4.tgz) = 1637762 diff --git a/lang/newlisp/pkg-descr b/lang/newlisp/pkg-descr index 51d56d1aa330..6b57fd50f84d 100644 --- a/lang/newlisp/pkg-descr +++ b/lang/newlisp/pkg-descr @@ -3,4 +3,4 @@ programs in general and in the domains of artificial intelligence (AI) and statistics. Author: Lutz Mueller -WWW: http://www.newlisp.org/ +WWW: http://www.newlisp.org/ diff --git a/lang/newlisp/pkg-plist b/lang/newlisp/pkg-plist index 14199b99d6f2..322d5620de23 100644 --- a/lang/newlisp/pkg-plist +++ b/lang/newlisp/pkg-plist @@ -1,6 +1,8 @@ bin/newlisp %%GUISERV%%bin/newlisp-edit bin/newlispdoc +man/man1/newlisp.1.gz +man/man1/newlispdoc.1.gz %%GUISERV%%%%PORTDOCS%%%%DOCSDIR%%/guiserver/guiserver.lsp.html %%GUISERV%%%%PORTDOCS%%%%DOCSDIR%%/guiserver/index.html %%PORTDOCS%%%%DOCSDIR%%/CHANGES @@ -8,16 +10,18 @@ bin/newlispdoc %%PORTDOCS%%%%DOCSDIR%%/ExpressionEvaluation.html %%PORTDOCS%%%%DOCSDIR%%/MemoryManagement.html %%PORTDOCS%%%%DOCSDIR%%/manual_frame.html -%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.5.3-Release.html +%%PORTDOCS%%%%DOCSDIR%%/newLISP-10.5.4-Release.html %%PORTDOCS%%%%DOCSDIR%%/newLISPdoc.html %%PORTDOCS%%%%DOCSDIR%%/newlisp_index.html %%PORTDOCS%%%%DOCSDIR%%/newlisp_manual.html +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/async %%PORTEXAMPLES%%%%EXAMPLESDIR%%/client %%PORTEXAMPLES%%%%EXAMPLESDIR%%/env.cgi %%PORTEXAMPLES%%%%EXAMPLESDIR%%/finger %%PORTEXAMPLES%%%%EXAMPLESDIR%%/form.cgi %%PORTEXAMPLES%%%%EXAMPLESDIR%%/form.html +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpd-conf.lsp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/newLISP-Excel-Import.xls %%PORTEXAMPLES%%%%EXAMPLESDIR%%/observer %%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl-demo-ffi.lsp @@ -87,10 +91,10 @@ bin/newlispdoc %%DATADIR%%/modules/unix.lsp %%DATADIR%%/modules/xmlrpc-client.lsp %%DATADIR%%/modules/zlib.lsp -%%DATADIR%%/util/httpd-conf.lsp -%%DATADIR%%/util/link.lsp +%%DATADIR%%/util/README.txt %%DATADIR%%/util/newlisp.jsf %%DATADIR%%/util/newlisp.vim +%%DATADIR%%/util/standard.lsp %%DATADIR%%/util/syntax.cgi @dirrm %%DATADIR%%/util @dirrm %%DATADIR%%/modules