Attachment #52659 for bug #79750

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

Lines 7-13 Link Here

(-)lang/yap/Makefile (-2 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= yap	9	PORTNAME= yap
10	PORTVERSION= 4.5.2	10	PORTVERSION= 4.5.5
11	CATEGORIES= lang	11	CATEGORIES= lang
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 39-44 Link Here
39		39
40	pre-install:	40	pre-install:
41	${INSTALL_DATA} ${WRKSRC}/docs/yap.info ${PREFIX}/info	41	${INSTALL_DATA} ${WRKSRC}/docs/yap.info ${PREFIX}/info
42	install-info ${PREFIX}/info/yap.info ${PREFIX}/info/dir
43		42
44	.include <bsd.port.post.mk>	43	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)lang/yap/distinfo (-2 / +2 lines)
1	MD5 (Yap-4.5.2.tar.gz) = 03c091dbb3575c24b81c4ff995c8f6ad	1	MD5 (Yap-4.5.5.tar.gz) = 661e289f4bdac0e6cfc7e59d4421c2a8
2	SIZE (Yap-4.5.2.tar.gz) = 3554331	2	SIZE (Yap-4.5.5.tar.gz) = 3521227




--- C/amasm.c.orig	Sat Mar  6 02:56:11 2004
+++ C/amasm.c	Thu Sep  2 17:47:02 2004
@@ -430,9 +430,9 @@
   }
   cip->cpc = cip->cpc->nextInst;
   if (pass_no) {
-    ve = (Ventry *) cip->cpc->rnd1;
     OPREG var_offset;
-    int is_y_var = (ve->KindOfVE == PermVar);
+    ve = (Ventry *) cip->cpc->rnd1;
+    is_y_var = (ve->KindOfVE == PermVar);
 
     var_offset = Var_Ref(ve, is_y_var);
     code_p->u.oxx.xr = emit_xreg(var_offset);




--- C/compiler.c.orig	Fri Feb 27 01:48:29 2004
+++ C/compiler.c	Thu Sep  2 17:36:25 2004
@@ -2727,12 +2727,12 @@
   volatile int maxvnum = 512;
   int botch_why;
   volatile Term my_clause = inp_clause;
+  compiler_struct cglobs;
   /* may botch while doing a different module */
 
   /* first, initialise cglobs->cint.CompilerBotch to handle all cases of interruptions */
   Yap_ErrorMessage = NULL;
   Yap_Error_Size = 0;
-  compiler_struct cglobs;
 
   if ((botch_why = setjmp(cglobs.cint.CompilerBotch)) == 3) {
     /* out of local stack, just duplicate the stack */

Lines 3-9 Link Here

(-)lang/yap/pkg-plist (-1 / +18 lines)
3	include/Yap/c_interface.h	3	include/Yap/c_interface.h
4	include/Yap/yap_structs.h	4	include/Yap/yap_structs.h
5	lib/Yap/random.so	5	lib/Yap/random.so
		6	lib/Yap/regcomp.so
		7	lib/Yap/regerror.so
		8	lib/Yap/regexec.so
6	lib/Yap/regexp.so	9	lib/Yap/regexp.so
		10	lib/Yap/regfree.so
7	lib/Yap/startup	11	lib/Yap/startup
8	lib/Yap/sys.so	12	lib/Yap/sys.so
9	lib/Yap/yap2swi.so	13	lib/Yap/yap2swi.so
Lines 75-80 Link Here
75	share/Yap/chr/trace.yap	79	share/Yap/chr/trace.yap
76	share/Yap/chr.yap	80	share/Yap/chr.yap
77	share/Yap/cleanup.yap	81	share/Yap/cleanup.yap
		82	share/Yap/clpbn/aggregates.yap
		83	share/Yap/clpbn/bnt.yap
		84	share/Yap/clpbn/evidence.yap
		85	share/Yap/clpbn/graphs.yap
		86	share/Yap/clpbn/graphviz.yap
		87	share/Yap/clpbn/utils.yap
		88	share/Yap/clpbn/vel.yap
		89	share/Yap/clpbn/xbif.yap
		90	share/Yap/clpbn.yap
78	share/Yap/clpq/arith_q.yap	91	share/Yap/clpq/arith_q.yap
79	share/Yap/clpq/class.yap	92	share/Yap/clpq/class.yap
80	share/Yap/clpq/geler.yap	93	share/Yap/clpq/geler.yap
Lines 175-181 Link Here
175	share/Yap/icon_address.pl	188	share/Yap/icon_address.pl
176	share/Yap/lists.yap	189	share/Yap/lists.yap
177	share/Yap/logtalk/logtalk.pl	190	share/Yap/logtalk/logtalk.pl
178	share/Yap/logtalk/yap430.config	191	share/Yap/logtalk/yap.config
179	share/Yap/logtalk.yap	192	share/Yap/logtalk.yap
180	share/Yap/ordsets.yap	193	share/Yap/ordsets.yap
181	share/Yap/pillow.pl	194	share/Yap/pillow.pl
Lines 213-220 Link Here
213	share/Yap/prandom.yap	226	share/Yap/prandom.yap
214	share/Yap/queues.yap	227	share/Yap/queues.yap
215	share/Yap/random.yap	228	share/Yap/random.yap
		229	share/Yap/rbtrees.yap
216	share/Yap/regexp.yap	230	share/Yap/regexp.yap
217	share/Yap/splay.yap	231	share/Yap/splay.yap
		232	share/Yap/swi.yap
218	share/Yap/system.yap	233	share/Yap/system.yap
219	share/Yap/terms.yap	234	share/Yap/terms.yap
220	share/Yap/timeout.yap	235	share/Yap/timeout.yap
Lines 229-234 Link Here
229	@dirrm share/Yap/clpqr/examples	244	@dirrm share/Yap/clpqr/examples
230	@dirrm share/Yap/clpqr	245	@dirrm share/Yap/clpqr
231	@dirrm share/Yap/clpq	246	@dirrm share/Yap/clpq
		247	@dirrm share/Yap/clpbn/examples
		248	@dirrm share/Yap/clpbn
232	@dirrm share/Yap/chr/examples	249	@dirrm share/Yap/chr/examples
233	@dirrm share/Yap/chr	250	@dirrm share/Yap/chr
234	@dirrm share/Yap	251	@dirrm share/Yap

Return to bug 79750

Lines 1-14 Link Here

(-)lang/yap/files/patch-C::amasm.c (-14 lines)
1	--- C/amasm.c.orig Sat Mar 6 02:56:11 2004
2	+++ C/amasm.c Thu Sep 2 17:47:02 2004
3	@@ -430,9 +430,9 @@
4	}
5	cip->cpc = cip->cpc->nextInst;
6	if (pass_no) {
7	- ve = (Ventry *) cip->cpc->rnd1;
8	OPREG var_offset;
9	- int is_y_var = (ve->KindOfVE == PermVar);
10	+ ve = (Ventry *) cip->cpc->rnd1;
11	+ is_y_var = (ve->KindOfVE == PermVar);
12
13	var_offset = Var_Ref(ve, is_y_var);
14	code_p->u.oxx.xr = emit_xreg(var_offset);

Lines 1-16 Link Here

(-)lang/yap/files/patch-C::compiler.c (-16 lines)
1	--- C/compiler.c.orig Fri Feb 27 01:48:29 2004
2	+++ C/compiler.c Thu Sep 2 17:36:25 2004
3	@@ -2727,12 +2727,12 @@
4	volatile int maxvnum = 512;
5	int botch_why;
6	volatile Term my_clause = inp_clause;
7	+ compiler_struct cglobs;
8	/* may botch while doing a different module */
9
10	/* first, initialise cglobs->cint.CompilerBotch to handle all cases of interruptions */
11	Yap_ErrorMessage = NULL;
12	Yap_Error_Size = 0;
13	- compiler_struct cglobs;
14
15	if ((botch_why = setjmp(cglobs.cint.CompilerBotch)) == 3) {
16	/* out of local stack, just duplicate the stack */