Index: head/lang/snobol4/Makefile =================================================================== --- head/lang/snobol4/Makefile (revision 549672) +++ head/lang/snobol4/Makefile (revision 549673) @@ -1,36 +1,38 @@ # Created by: Wes Peters # $FreeBSD$ PORTNAME= snobol4 -PORTVERSION= 2.0 -PORTREVISION= 1 +PORTVERSION= 2.1.6 CATEGORIES= lang MASTER_SITES= ftp://ftp.ultimate.com/snobol/ MAINTAINER= ports@FreeBSD.org COMMENT= Port of Macro SNOBOL4, supports full SNOBOL4 plus SPITBOL +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${PATCHDIR}/LICENSE + +USES= gmake libedit HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --snolibdir=${PREFIX}/lib/${PORTNAME} CONFIGURE_ENV+= DL_EXT=".so" -USES= gmake -PLIST_SUB+= VERSION=${PORTVERSION} ALL_TARGET= xsnobol4 +LDFLAGS+= -L${PREFIX}/lib DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} +PLIST_SUB+= VERSION=${PORTVERSION} PORTDOCS= * OPTIONS_DEFINE= DOCS + post-patch: @${REINPLACE_CMD} 's:[^=]*\.tmp$$:${WRKSRC}/&:' ${WRKSRC}/configure - @${REINPLACE_CMD} '/grep/s/$$/| egrep -v "built-in|command line"/' \ - ${WRKSRC}/cc-M @${REINPLACE_CMD} 's:../snobol4:../xsnobol4:' \ ${WRKSRC}/doc/Makefile ${WRKSRC}/modules/*/Makefile @${REINPLACE_CMD} -e 's::${PREFIX}/bin:' \ -e 's::${PREFIX}/lib/${PORTNAME}:' \ ${WRKSRC}/snopea.in ${WRKSRC}/sdb.sh .include Index: head/lang/snobol4/distinfo =================================================================== --- head/lang/snobol4/distinfo (revision 549672) +++ head/lang/snobol4/distinfo (revision 549673) @@ -1,2 +1,3 @@ -SHA256 (snobol4-2.0.tar.gz) = 94ae7af4fcaa9139954c6d530ca91f25ffd7a69ff45f1ba52b52095bbdf6631f -SIZE (snobol4-2.0.tar.gz) = 903436 +TIMESTAMP = 1600849218 +SHA256 (snobol4-2.1.6.tar.gz) = ae9306ac523bd99b8881860e31b5b779e87652d4a416fff50277b11dfbc8001e +SIZE (snobol4-2.1.6.tar.gz) = 907278 Index: head/lang/snobol4/files/patch-include_macros.h =================================================================== --- head/lang/snobol4/files/patch-include_macros.h (revision 549672) +++ head/lang/snobol4/files/patch-include_macros.h (nonexistent) @@ -1,11 +0,0 @@ ---- include/macros.h.orig 2014-02-22 22:43:58 UTC -+++ include/macros.h -@@ -204,7 +204,7 @@ extern volatile int math_error; - #define RETURN(VALUE) {RSTSTK(); return (VALUE);} - #endif /* TRACE_DEPTH not defined */ - --struct descr _NORET[1]; -+extern struct descr _NORET[1]; - #define NORET ((ptr_t)_NORET) - - /****************/ Property changes on: head/lang/snobol4/files/patch-include_macros.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/snobol4/files/LICENSE =================================================================== --- head/lang/snobol4/files/LICENSE (nonexistent) +++ head/lang/snobol4/files/LICENSE (revision 549673) @@ -0,0 +1,25 @@ +Copyright © 1993-2020, Philip L. Budne +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Property changes on: head/lang/snobol4/files/LICENSE ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/snobol4/files/patch-Makefile2.m4 =================================================================== --- head/lang/snobol4/files/patch-Makefile2.m4 (revision 549672) +++ head/lang/snobol4/files/patch-Makefile2.m4 (revision 549673) @@ -1,54 +1,54 @@ ---- Makefile2.m4.orig 2014-12-31 08:04:21.000000000 +0100 -+++ Makefile2.m4 2015-01-24 16:39:40.000000000 +0100 -@@ -614,8 +614,8 @@ snopea.1: snopea snolib/snopea.sno snobo +--- Makefile2.m4.orig 2020-06-22 02:02:06 UTC ++++ Makefile2.m4 +@@ -615,8 +615,8 @@ snopea.1: snopea snolib/snopea.sno snobol4 snopea.1.html: snopea snolib/snopea.sno snobol4 $(SNOPEA) snopea snopea.1.html --$(GENERATED_DOCS_DOCDIR): snopea snolib/snopea.sno snobol4 +-docs $(GENERATED_DOCS_DOCDIR): snopea snolib/snopea.sno snobol4 always - cd doc; make -+$(GENERATED_DOCS_DOCDIR): snopea snolib/snopea.sno xsnobol4 -+ cd doc; $(MAKE) ++docs $(GENERATED_DOCS_DOCDIR): snopea snolib/snopea.sno xsnobol4 always ++ cd doc; ${MAKE} - ################# - # installation -@@ -628,17 +628,18 @@ INSTALL_H=[include]/h.h [include]/snotyp + always: + +@@ -631,17 +631,18 @@ INSTALL_H=[include]/h.h [include]/snotypes.h [include] # generated SNOLIB files (host.sno generated at top level) GENSNOLIB=host.sno config.sno -SNOLIB_FILES=snolib/*.sno $(GENSNOLIB) $(MODULES_INCLUDE) +SNOLIB_FILES=snolib/*.sno $(GENSNOLIB) -install: snobol4 sdb timing.out $(GENERATED_DOCS) +install: xsnobol4 sdb $(GENERATED_DOCS) + cp xsnobol4$(EXT) snobol4$(EXT) $(INSTALL) -d $(BINDIR) $(INSTALL) $(INSTALL_BIN_FLAGS) snobol4 $(BINDIR)/snobol4-$(VERS) $(INSTALL) sdb $(BINDIR)/sdb-$(VERS) $(INSTALL) snopea $(BINDIR)/snopea-$(VERS) rm -f $(BINDIR)/snobol4 $(BINDIR)/sdb $(BINDIR)/snopea - ln -s $(BINDIR)/snobol4-$(VERS) $(BINDIR)/snobol4 - ln -s $(BINDIR)/sdb-$(VERS) $(BINDIR)/sdb - ln -s $(BINDIR)/snopea-$(VERS) $(BINDIR)/snopea + cd $(BINDIR) && ln -s snobol4-$(VERS) snobol4 + cd $(BINDIR) && ln -s sdb-$(VERS) sdb + cd $(BINDIR) && ln -s snopea-$(VERS) snopea $(INSTALL) -d $(MAN1DIR) for F in $(GENERATED_DOCS_DOCDIR1); do \ $(INSTALL) -m 644 $$F $(MAN1DIR); \ -@@ -664,15 +665,12 @@ install: snobol4 sdb timing.out $(GENERA +@@ -668,15 +669,12 @@ install: snobol4 sdb timing.out $(GENERATED_DOCS) for F in $(SNOLIB_FILES); do \ $(INSTALL) -m 644 $$F $(SNOLIB_LIB); \ done - for M in $(MODULES); do \ - (cd modules/$$M; $(RUNSETUP) install); \ - done $(INSTALL) -d $(INCLUDE_DIR) for F in $(INSTALL_H); do \ $(INSTALL) -m 644 $$F $(INCLUDE_DIR); \ done $(INSTALL) -d $(DOC_DIR) - for F in doc/load.txt doc/*.html modules/*/*.html; do \ + for F in doc/load.txt doc/*.html; do \ $(INSTALL) -m 644 $$F $(DOC_DIR); \ done - ifdef([INSTALL_SYSDEP], INSTALL_SYSDEP + ifdef([INSTALL_SYSDEP],[ ]INSTALL_SYSDEP