5 files changed, 67 insertions, 3 deletions

diff --git a/lang/yap/Makefile b/lang/yap/Makefile
index 93aca17ce0c5..692c41ccde99 100644
--- a/lang/yap/Makefile
+++ b/lang/yap/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	yap
-PORTVERSION=	4.4.4
+PORTVERSION=	4.5.2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,6 +19,7 @@ COMMENT=	A high-performance Prolog compiler
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/lang/yap/distinfo b/lang/yap/distinfo
index 69c5ea068c7a..0f12d4451c95 100644
--- a/lang/yap/distinfo
+++ b/lang/yap/distinfo
@@ -1,2 +1,2 @@
-MD5 (Yap-4.4.4.tar.gz) = 7d0f17305c87874dccdad5ce465a164a
-SIZE (Yap-4.4.4.tar.gz) = 2970956
+MD5 (Yap-4.5.2.tar.gz) = 03c091dbb3575c24b81c4ff995c8f6ad
+SIZE (Yap-4.5.2.tar.gz) = 3554331
diff --git a/lang/yap/files/patch-C::amasm.c b/lang/yap/files/patch-C::amasm.c
new file mode 100644
index 000000000000..dfaffad0898c
--- /dev/null
+++ b/lang/yap/files/patch-C::amasm.c
@@ -0,0 +1,14 @@
+--- 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);
diff --git a/lang/yap/files/patch-C::compiler.c b/lang/yap/files/patch-C::compiler.c
new file mode 100644
index 000000000000..663d9d9415ab
--- /dev/null
+++ b/lang/yap/files/patch-C::compiler.c
@@ -0,0 +1,16 @@
+--- 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 */
diff --git a/lang/yap/pkg-plist b/lang/yap/pkg-plist
index 04b8be0ce5e8..975b8d2f4077 100644
--- a/lang/yap/pkg-plist
+++ b/lang/yap/pkg-plist
@@ -179,16 +179,49 @@ share/Yap/logtalk/yap430.config
 share/Yap/logtalk.yap
 share/Yap/ordsets.yap
 share/Yap/pillow.pl
+share/Yap/pl/arith.yap
+share/Yap/pl/arrays.yap
+share/Yap/pl/boot.yap
+share/Yap/pl/callcount.yap
+share/Yap/pl/checker.yap
+share/Yap/pl/consult.yap
+share/Yap/pl/corout.yap
+share/Yap/pl/debug.yap
+share/Yap/pl/depth_bound.yap
+share/Yap/pl/directives.yap
+share/Yap/pl/errors.yap
+share/Yap/pl/grammar.yap
+share/Yap/pl/ground.yap
+share/Yap/pl/init.yap
+share/Yap/pl/listing.yap
+share/Yap/pl/load_foreign.yap
+share/Yap/pl/modules.yap
+share/Yap/pl/preds.yap
+share/Yap/pl/profile.yap
+share/Yap/pl/protect.yap
+share/Yap/pl/setof.yap
+share/Yap/pl/signals.yap
+share/Yap/pl/sockets.yap
+share/Yap/pl/sort.yap
+share/Yap/pl/statistics.yap
+share/Yap/pl/strict_iso.yap
+share/Yap/pl/tabling.yap
+share/Yap/pl/threads.yap
+share/Yap/pl/utils.yap
+share/Yap/pl/yapor.yap
+share/Yap/pl/yio.yap
 share/Yap/prandom.yap
 share/Yap/queues.yap
 share/Yap/random.yap
 share/Yap/regexp.yap
+share/Yap/splay.yap
 share/Yap/system.yap
 share/Yap/terms.yap
 share/Yap/timeout.yap
 share/Yap/trees.yap
 share/Yap/tries.yap
 share/Yap/ugraphs.yap
+@dirrm share/Yap/pl
 @dirrm share/Yap/logtalk
 @dirrm share/Yap/clpr
 @dirrm share/Yap/clpqr/examples/monash