Index: head/lang/ficl/Makefile =================================================================== --- head/lang/ficl/Makefile (revision 550616) +++ head/lang/ficl/Makefile (revision 550617) @@ -1,56 +1,54 @@ # Created by: Bruce M Simpson # $FreeBSD$ PORTNAME= ficl PORTVERSION= 4.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-all/${PORTNAME}${PORTVERSION:C/([[:digit:]]+\.[[:digit:]]+)\.0/\1/} MAINTAINER= pavelivolkov@gmail.com COMMENT= Forth Inspired Command Language -LICENSE= unknown -LICENSE_NAME= BSD-style -LICENSE_TEXT= Description of the license can be obtained from the following URL: http://ficl.sourceforge.net/license.html -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${PATCHDIR}/LICENSE.txt -OPTIONS_DEFINE= DOCS - -ONLY_FOR_ARCHS= i386 amd64 +ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= this port is not tested on anything other than i386 and amd64 USE_LDCONFIG= YES ALL_TARGET= lib ${PORTNAME} PLIST_FILES= bin/${PORTNAME} include/ficl.h include/ficlcompatibility.h \ include/ficllocal.h include/ficlplatform/unix.h \ include/ficltokens.h lib/lib${PORTNAME}.so \ lib/lib${PORTNAME}.so.${PORTVERSION} lib/lib${PORTNAME}.a -PORTDOCS= * PORTDATA= * +PORTDOCS= * + +OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}*.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf lib${PORTNAME}.so.${PORTVERSION} lib${PORTNAME}.so @${MKDIR} ${STAGEDIR}${PREFIX}/include/ficlplatform ${INSTALL_DATA} ${WRKSRC}/ficlplatform/unix.h ${STAGEDIR}${PREFIX}/include/ficlplatform @${MKDIR} ${STAGEDIR}${DATADIR}/ficlplatform ${INSTALL_DATA} ${WRKSRC}/ficlplatform/unix.c ${STAGEDIR}${DATADIR}/ficlplatform (cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} xclasses ${STAGEDIR}${DATADIR}) (cd ${WRKSRC} && ${COPYTREE_SHARE} softcore ${STAGEDIR}${DATADIR}) (cd ${WRKSRC} && ${COPYTREE_SHARE} test ${STAGEDIR}${DATADIR}) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.ico ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} articles ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} graphics ${STAGEDIR}${DOCSDIR}) .include Index: head/lang/ficl/files/LICENSE.txt =================================================================== --- head/lang/ficl/files/LICENSE.txt (nonexistent) +++ head/lang/ficl/files/LICENSE.txt (revision 550617) @@ -0,0 +1,24 @@ +Copyright (c) 1997-2001 John Sadler (john_sadler@alum.mit.edu) +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +2. 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 AUTHOR 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 AUTHOR 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/ficl/files/LICENSE.txt ___________________________________________________________________ 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/ficl/files/patch-ficlplatform_unix.h =================================================================== --- head/lang/ficl/files/patch-ficlplatform_unix.h (nonexistent) +++ head/lang/ficl/files/patch-ficlplatform_unix.h (revision 550617) @@ -0,0 +1,11 @@ +--- ficlplatform/unix.h.orig 2010-09-15 18:29:10 UTC ++++ ficlplatform/unix.h +@@ -13,7 +13,7 @@ + #else + #define FICL_PLATFORM_ALIGNMENT (4) + #endif +-#define FICL_PLATFORM_INLINE inline ++#define FICL_PLATFORM_INLINE static inline + + #define FICL_PLATFORM_HAS_FTRUNCATE (1) + #if defined(__amd64__) Property changes on: head/lang/ficl/files/patch-ficlplatform_unix.h ___________________________________________________________________ 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/ficl/files/patch-vm.c =================================================================== --- head/lang/ficl/files/patch-vm.c (revision 550616) +++ head/lang/ficl/files/patch-vm.c (revision 550617) @@ -1,46 +1,46 @@ --- vm.c.orig 2010-09-13 18:43:04 UTC +++ vm.c -@@ -280,12 +280,12 @@ void ficlVmInnerLoop(ficlVm *vm, ficlWor +@@ -280,12 +280,12 @@ void ficlVmInnerLoop(ficlVm *vm, ficlWord *fw) if (once) count = 1; - LOCAL_VARIABLE_REFILL; - oldExceptionHandler = vm->exceptionHandler; vm->exceptionHandler = &exceptionHandler; /* This has to come before the setjmp! */ except = setjmp(exceptionHandler); + LOCAL_VARIABLE_REFILL; + if (except) { LOCAL_VARIABLE_SPILL; @@ -717,8 +717,8 @@ AGAIN: i = dataTop->i; if (i < 0) continue; - CHECK_STACK(i + 1, i + 2); - *dataTop = dataTop[-i]; + CHECK_STACK(i + 2, i + 3); + *dataTop = dataTop[-i - 1]; continue; } @@ -1228,7 +1228,7 @@ COMPARE: **************************************************************************/ case ficlInstructionRandom: { - (++dataTop)->i = rand(); + (++dataTop)->u = random(); continue; } @@ -1239,7 +1239,7 @@ COMPARE: **************************************************************************/ case ficlInstructionSeedRandom: { - srand((dataTop--)->i); + srandom((dataTop--)->u); continue; }