Attachment #217574 for bug #248950

View | Details | Raw Unified | Return to bug 248950
Collapse All | Expand All





PORTNAME=	ficl
PORTVERSION=	4.1.0
PORTREVISION=	4
CATEGORIES=	lang
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-all/${PORTNAME}${PORTVERSION:C/([[:digit:]]+\.[[:digit:]]+)\.0/\1/}


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

ONLY_FOR_ARCHS=	amd64 i386

ONLY_FOR_ARCHS=	i386 amd64
ONLY_FOR_ARCHS_REASON=	this port is not tested on anything other than i386 and amd64

OPTIONS_DEFINE=	DOCS

USE_LDCONFIG=	YES





--- dictionary.c.orig	2010-09-12 15:14:52 UTC
+++ dictionary.c
@@ -199,7 +199,7 @@ char *ficlDictionaryAppendString(ficlDictionary *dicti
     if (length > FICL_NAME_LENGTH)
         length = FICL_NAME_LENGTH;
     
-	return ficlDictionaryAppendData(dictionary, data, length);
+    return ficlDictionaryAppendData(dictionary, data, length);
 }
 
 
@@ -542,7 +542,7 @@ int ficlDictionaryIsAWord(ficlDictionary *dictionary, 
     if (!ficlDictionaryIncludes(dictionary, word->name))
         return 0;
 
-	if ((word->link != NULL) && !ficlDictionaryIncludes(dictionary, word->link))
+    if ((word->link != NULL) && !ficlDictionaryIncludes(dictionary, word->link))
 		return 0;
 
     if ((word->length <= 0) || (word->name[word->length] != '\0'))
@@ -662,7 +662,7 @@ void ficlDictionarySee(ficlDictionary *dictionary, fic
             *trace++ = '>';
         else
             *trace++ = ' ';

         
         if (ficlDictionaryIsAWord(dictionary, word))
         {
@@ -676,7 +676,7 @@ void ficlDictionarySee(ficlDictionary *dictionary, fic
                 break;
             case FICL_WORDKIND_INSTRUCTION_WITH_ARGUMENT:
                 c = *++cell;

                 break;
             case FICL_WORDKIND_INSTRUCTION_WORD:
                 sprintf(trace, "%s :: executes %s (instruction word %ld)", word->name, ficlDictionaryInstructionNames[(long)word->code], (long)word->code);
@@ -687,20 +687,20 @@ void ficlDictionarySee(ficlDictionary *dictionary, fic
                 {
                     ficlWord *word = (ficlWord *)c.p;
                     sprintf(trace, "%.*s ( %#lx literal )", 

                 break;
 #endif /* FICL_WANT_FLOAT */
             case FICL_WORDKIND_STRING_LITERAL:
@@ -719,32 +719,32 @@ void ficlDictionarySee(ficlDictionary *dictionary, fic
                 break;
             case FICL_WORDKIND_BRANCH0:
                 c = *++cell;

                 break;
             default:
                 sprintf(trace, "%.*s", word->length, word->name);
@@ -754,7 +754,7 @@ void ficlDictionarySee(ficlDictionary *dictionary, fic
         }
         else /* probably not a word - punt and print value */
         {

Line 0 Link Here

(-)lang/ficl/files/patch-ficlplatform_unix.h (+11 lines)
	1	--- ficlplatform/unix.h.orig 2020-08-27 12:17:03 UTC
	2	+++ ficlplatform/unix.h
	3	@@ -13,7 +13,7 @@
	4	#else
	5	#define FICL_PLATFORM_ALIGNMENT (4)
	6	#endif
	7	-#define FICL_PLATFORM_INLINE inline
	8	+#define FICL_PLATFORM_INLINE extern inline
	9
	10	#define FICL_PLATFORM_HAS_FTRUNCATE (1)
	11	#if defined(__amd64__)




--- primitives.c.orig	2010-09-13 18:43:04 UTC
+++ primitives.c
@@ -487,7 +487,7 @@ static void ficlPrimitiveSprintf(ficlVm *vm) /*  */
 
 	ficlStackPushPointer(vm->dataStack, bufferStart);
 	ficlStackPushInteger(vm->dataStack, buffer - bufferStart);

 }
 
 
@@ -1350,7 +1350,7 @@ static void ficlPrimitiveSetObjectFlag(ficlVm *vm)
 
 static void ficlPrimitiveIsObject(ficlVm *vm)
 {

     ficlWord *word = (ficlWord *)ficlStackPopPointer(vm->dataStack);
     
     flag = ((word != NULL) && (word->flags & FICL_WORD_OBJECT)) ? FICL_TRUE : FICL_FALSE;
@@ -2785,8 +2785,8 @@ TO_GLOBAL:
     if (!word)
         ficlVmThrowError(vm, "%.*s not found", FICL_STRING_GET_LENGTH(name), FICL_STRING_GET_POINTER(name));
 
-	switch ((ficlInstruction)word->code)
-	{
+    switch ((ficlInstruction)word->code)
+    {
 		case ficlInstructionConstantParen:
 			instruction = ficlInstructionStore;
 			stack = vm->dataStack;
@@ -2814,7 +2814,7 @@ TO_GLOBAL:
 		    ficlVmThrowError(vm, "to %.*s : value/constant is of unknown type", FICL_STRING_GET_LENGTH(name), FICL_STRING_GET_POINTER(name));
 		    return;
 		}
-	}
+    }
 	
     if (vm->state == FICL_VM_STATE_INTERPRET)
 	{

Lines 1-7 Link Here

(-)lang/ficl/pkg-descr (-3 / +1 lines)
1	FICL is an extremely lightweight, fast, portable implementation of FORTH	1	FICL is an extremely lightweight, fast, portable implementation of FORTH
2	which can be bound to C functions or even embedded within C/assembler	2	which can be bound to C functions or even embedded within C/assembler
3	programs. This is a port for the current version of FICL. Older versions	3	programs. Ficl is an acronym for "Forth Inspired Command Language".
4	can typically be found in /usr/src/sys/boot/ficl on FreeBSD with the
5	bindings needed by the OS loader.
6		4
7	WWW: http://ficl.sourceforge.net/	5	WWW: http://ficl.sourceforge.net/

Return to bug 248950

Lines 3-9 Link Here

(-)lang/ficl/Makefile (-4 / +4 lines)
3		3
4	PORTNAME= ficl	4	PORTNAME= ficl
5	PORTVERSION= 4.1.0	5	PORTVERSION= 4.1.0
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= lang	7	CATEGORIES= lang
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-all/${PORTNAME}${PORTVERSION:C/([[:digit:]]+\.[[:digit:]]+)\.0/\1/}	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-all/${PORTNAME}${PORTVERSION:C/([[:digit:]]+\.[[:digit:]]+)\.0/\1/}
9		9
Lines 15-24 Link Here
15	LICENSE_TEXT= Description of the license can be obtained from the following URL: http://ficl.sourceforge.net/license.html	15	LICENSE_TEXT= Description of the license can be obtained from the following URL: http://ficl.sourceforge.net/license.html
16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
17		17
18	OPTIONS_DEFINE= DOCS	18	ONLY_FOR_ARCHS= amd64 i386
19
20	ONLY_FOR_ARCHS= i386 amd64
21	ONLY_FOR_ARCHS_REASON= this port is not tested on anything other than i386 and amd64	19	ONLY_FOR_ARCHS_REASON= this port is not tested on anything other than i386 and amd64
		20
		21	OPTIONS_DEFINE= DOCS
22		22
23	USE_LDCONFIG= YES	23	USE_LDCONFIG= YES
24		24

Lines 1-6 Link Here

(-)lang/ficl/files/patch-dictionary.c (-5 / +23 lines)
1	--- dictionary.c.orig 2010-09-12 15:14:52 UTC	1	--- dictionary.c.orig 2010-09-12 15:14:52 UTC
2	+++ dictionary.c	2	+++ dictionary.c
3	@@ -662,7 +662,7 @@ void ficlDictionarySee(ficlDictionary *d	3	@@ -199,7 +199,7 @@ char ficlDictionaryAppendString(ficlDictionary dicti
		4	if (length > FICL_NAME_LENGTH)
		5	length = FICL_NAME_LENGTH;
		6
		7	- return ficlDictionaryAppendData(dictionary, data, length);
		8	+ return ficlDictionaryAppendData(dictionary, data, length);
		9	}
		10
		11
		12	@@ -542,7 +542,7 @@ int ficlDictionaryIsAWord(ficlDictionary *dictionary,
		13	if (!ficlDictionaryIncludes(dictionary, word->name))
		14	return 0;
		15
		16	- if ((word->link != NULL) && !ficlDictionaryIncludes(dictionary, word->link))
		17	+ if ((word->link != NULL) && !ficlDictionaryIncludes(dictionary, word->link))
		18	return 0;
		19
		20	if ((word->length <= 0) \|\| (word->name[word->length] != '\0'))
		21	@@ -662,7 +662,7 @@ void ficlDictionarySee(ficlDictionary *dictionary, fic
4	*trace++ = '>';	22	*trace++ = '>';
5	else	23	else
6	*trace++ = ' ';	24	*trace++ = ' ';
Lines 9-15 Link Here
9		27
10	if (ficlDictionaryIsAWord(dictionary, word))	28	if (ficlDictionaryIsAWord(dictionary, word))
11	{	29	{
12	@@ -676,7 +676,7 @@ void ficlDictionarySee(ficlDictionary *d	30	@@ -676,7 +676,7 @@ void ficlDictionarySee(ficlDictionary *dictionary, fic
13	break;	31	break;
14	case FICL_WORDKIND_INSTRUCTION_WITH_ARGUMENT:	32	case FICL_WORDKIND_INSTRUCTION_WITH_ARGUMENT:
15	c = *++cell;	33	c = *++cell;
Lines 18-24 Link Here
18	break;	36	break;
19	case FICL_WORDKIND_INSTRUCTION_WORD:	37	case FICL_WORDKIND_INSTRUCTION_WORD:
20	sprintf(trace, "%s :: executes %s (instruction word %ld)", word->name, ficlDictionaryInstructionNames[(long)word->code], (long)word->code);	38	sprintf(trace, "%s :: executes %s (instruction word %ld)", word->name, ficlDictionaryInstructionNames[(long)word->code], (long)word->code);
21	@@ -687,20 +687,20 @@ void ficlDictionarySee(ficlDictionary *d	39	@@ -687,20 +687,20 @@ void ficlDictionarySee(ficlDictionary *dictionary, fic
22	{	40	{
23	ficlWord word = (ficlWord )c.p;	41	ficlWord word = (ficlWord )c.p;
24	sprintf(trace, "%.*s ( %#lx literal )",	42	sprintf(trace, "%.*s ( %#lx literal )",
Lines 43-49 Link Here
43	break;	61	break;
44	#endif /* FICL_WANT_FLOAT */	62	#endif /* FICL_WANT_FLOAT */
45	case FICL_WORDKIND_STRING_LITERAL:	63	case FICL_WORDKIND_STRING_LITERAL:
46	@@ -719,32 +719,32 @@ void ficlDictionarySee(ficlDictionary *d	64	@@ -719,32 +719,32 @@ void ficlDictionarySee(ficlDictionary *dictionary, fic
47	break;	65	break;
48	case FICL_WORDKIND_BRANCH0:	66	case FICL_WORDKIND_BRANCH0:
49	c = *++cell;	67	c = *++cell;
Lines 83-89 Link Here
83	break;	101	break;
84	default:	102	default:
85	sprintf(trace, "%.*s", word->length, word->name);	103	sprintf(trace, "%.*s", word->length, word->name);
86	@@ -754,7 +754,7 @@ void ficlDictionarySee(ficlDictionary *d	104	@@ -754,7 +754,7 @@ void ficlDictionarySee(ficlDictionary *dictionary, fic
87	}	105	}
88	else /* probably not a word - punt and print value */	106	else /* probably not a word - punt and print value */
89	{	107	{

Lines 1-6 Link Here

(-)lang/ficl/files/patch-primitives.c (-2 / +22 lines)
1	--- primitives.c.orig 2010-09-13 18:43:04 UTC	1	--- primitives.c.orig 2010-09-13 18:43:04 UTC
2	+++ primitives.c	2	+++ primitives.c
3	@@ -487,7 +487,7 @@ static void ficlPrimitiveSprintf(ficlVm	3	@@ -487,7 +487,7 @@ static void ficlPrimitiveSprintf(ficlVm vm) / */
4		4
5	ficlStackPushPointer(vm->dataStack, bufferStart);	5	ficlStackPushPointer(vm->dataStack, bufferStart);
6	ficlStackPushInteger(vm->dataStack, buffer - bufferStart);	6	ficlStackPushInteger(vm->dataStack, buffer - bufferStart);
Lines 9-15 Link Here
9	}	9	}
10		10
11		11
12	@@ -1350,7 +1350,7 @@ static void ficlPrimitiveSetObjectFlag(f	12	@@ -1350,7 +1350,7 @@ static void ficlPrimitiveSetObjectFlag(ficlVm *vm)
13		13
14	static void ficlPrimitiveIsObject(ficlVm *vm)	14	static void ficlPrimitiveIsObject(ficlVm *vm)
15	{	15	{
Lines 18-20 Link Here
18	ficlWord word = (ficlWord )ficlStackPopPointer(vm->dataStack);	18	ficlWord word = (ficlWord )ficlStackPopPointer(vm->dataStack);
19		19
20	flag = ((word != NULL) && (word->flags & FICL_WORD_OBJECT)) ? FICL_TRUE : FICL_FALSE;	20	flag = ((word != NULL) && (word->flags & FICL_WORD_OBJECT)) ? FICL_TRUE : FICL_FALSE;
		21	@@ -2785,8 +2785,8 @@ TO_GLOBAL:
		22	if (!word)
		23	ficlVmThrowError(vm, "%.*s not found", FICL_STRING_GET_LENGTH(name), FICL_STRING_GET_POINTER(name));
		24
		25	- switch ((ficlInstruction)word->code)
		26	- {
		27	+ switch ((ficlInstruction)word->code)
		28	+ {
		29	case ficlInstructionConstantParen:
		30	instruction = ficlInstructionStore;
		31	stack = vm->dataStack;
		32	@@ -2814,7 +2814,7 @@ TO_GLOBAL:
		33	ficlVmThrowError(vm, "to %.*s : value/constant is of unknown type", FICL_STRING_GET_LENGTH(name), FICL_STRING_GET_POINTER(name));
		34	return;
		35	}
		36	- }
		37	+ }
		38
		39	if (vm->state == FICL_VM_STATE_INTERPRET)
		40	{