Update to Yap 6.2.1

Changes since 6.2.0 include DragonFly support.

7 files changed, 28 insertions, 88 deletions

diff --git a/lang/yap/Makefile b/lang/yap/Makefile
index b4bbc2631e4..b0441475c60 100644
--- a/lang/yap/Makefile
+++ b/lang/yap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/10/27 12:32:52 asau Exp $
+# $NetBSD: Makefile,v 1.12 2011/07/08 11:40:27 asau Exp $
 #
 
-DISTNAME=		yap-6.2.0
+DISTNAME=		yap-6.2.1
 CATEGORIES=		lang
 # MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=yap/}
 MASTER_SITES=		http://www.dcc.fc.up.pt/~vsc/Yap/ \
@@ -13,15 +13,11 @@ COMMENT=		ISO-compliant Prolog
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=			$(WRKDIR)/yap-6
-
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS=		gmake
 
-# Don't enable system malloc, it dumps core otherwise:
-#CONFIGURE_ARGS=		--enable-use-malloc
 CONFIGURE_ENV+=		INDENT=${TRUE:Q}
 
 # debug option:
diff --git a/lang/yap/PLIST b/lang/yap/PLIST
index 89022a5297b..c49c956d68c 100644
--- a/lang/yap/PLIST
+++ b/lang/yap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2010/10/27 12:32:52 asau Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/07/08 11:40:27 asau Exp $
 bin/yap
 include/Yap/Atoms.h
 include/Yap/Regs.h
@@ -73,6 +73,7 @@ include/Yap/rheap.h
 include/Yap/rhstruct.h
 include/Yap/rtree_udi.h
 include/Yap/sshift.h
+include/Yap/swi.h
 include/Yap/tab.structs.h
 include/Yap/tatoms.h
 include/Yap/threads.h
@@ -130,7 +131,9 @@ share/Yap/autoloader.yap
 share/Yap/avl.yap
 share/Yap/base64.pl
 share/Yap/bhash.yap
+share/Yap/block_diagram.yap
 share/Yap/broadcast.pl
+share/Yap/c_alarms.yap
 share/Yap/cgi.pl
 share/Yap/charsio.yap
 share/Yap/chr.pl
@@ -158,6 +161,7 @@ share/Yap/clp/clp_events.pl
 share/Yap/clpbn.yap
 share/Yap/clpbn/aggregates.yap
 share/Yap/clpbn/bnt.yap
+share/Yap/clpbn/bp.yap
 share/Yap/clpbn/connected.yap
 share/Yap/clpbn/discrete_utils.yap
 share/Yap/clpbn/display.yap
@@ -233,6 +237,7 @@ share/Yap/dtproblog.yap
 share/Yap/error.pl
 share/Yap/expand_macros.yap
 share/Yap/filesex.pl
+share/Yap/flags.yap
 share/Yap/gensym.yap
 share/Yap/hacks.yap
 share/Yap/heaps.yap
@@ -334,6 +339,7 @@ share/Yap/pl/modules.yap
 share/Yap/pl/preds.yap
 share/Yap/pl/profile.yap
 share/Yap/pl/protect.yap
+share/Yap/pl/save.yap
 share/Yap/pl/setof.yap
 share/Yap/pl/signals.yap
 share/Yap/pl/sockets.yap
@@ -350,6 +356,7 @@ share/Yap/pltotex.pl
 share/Yap/plunit.pl
 share/Yap/prandom.yap
 share/Yap/problog.yap
+share/Yap/problog/ad_converter.yap
 share/Yap/problog/extlists.yap
 share/Yap/problog/flags.yap
 share/Yap/problog/gflags.yap
@@ -357,13 +364,16 @@ share/Yap/problog/hash_table.yap
 share/Yap/problog/intervals.yap
 share/Yap/problog/logger.yap
 share/Yap/problog/mc_DNF_sampling.yap
+share/Yap/problog/nestedtries.yap
 share/Yap/problog/os.yap
 share/Yap/problog/print.yap
 share/Yap/problog/print_learning.yap
+share/Yap/problog/ptree.yap
 share/Yap/problog/sampling.yap
 share/Yap/problog/tabling.yap
+share/Yap/problog/termhandling.yap
 share/Yap/problog/timer.yap
-share/Yap/problog/tptree.yap
+share/Yap/problog/utils.yap
 share/Yap/problog/utils_learning.yap
 share/Yap/problog/variable_elimination.yap
 share/Yap/problog/variables.yap
@@ -448,6 +458,6 @@ share/Yap/xpath.pl
 share/Yap/xsdp_types.pl
 share/Yap/ypp.yap
 share/Yap/zlib.pl
-share/docs/Yap/Artistic
-share/docs/Yap/COPYING
-share/docs/Yap/README
+share/doc/Yap/Artistic
+share/doc/Yap/COPYING
+share/doc/Yap/README
diff --git a/lang/yap/distinfo b/lang/yap/distinfo
index cfa247741d7..c1181995a47 100644
--- a/lang/yap/distinfo
+++ b/lang/yap/distinfo
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.10 2010/10/27 12:32:52 asau Exp $
+$NetBSD: distinfo,v 1.11 2011/07/08 11:40:27 asau Exp $
 
-SHA1 (yap-6.2.0.tar.gz) = 884406c6a6333c796ab19d0f40529918be6cae97
-RMD160 (yap-6.2.0.tar.gz) = af5bb81590105234644dc072f14c37f696e7db2a
-Size (yap-6.2.0.tar.gz) = 4990807 bytes
-SHA1 (patch-aa) = dca2acac805aabd8e2815b509ad516294484ad0f
-SHA1 (patch-ab) = b311db4efa89f0b67952e62be6cd489e3e32165f
-SHA1 (patch-ac) = e945c3e4c19d8d02b53a5030ad5ac0d44b25b959
+SHA1 (yap-6.2.1.tar.gz) = e6076a501aaee9e8a6a484a34308c32ca1193a95
+RMD160 (yap-6.2.1.tar.gz) = 702a72a1e02e1a8e107f2b0888ae7c26132ae417
+Size (yap-6.2.1.tar.gz) = 5309094 bytes
+SHA1 (patch-aa) = 113f443f57fac208632701fc7eddca18d98d240d
 SHA1 (patch-ad) = e3765c0d6729b4d531cdea59dc8e442055091d10
 SHA1 (patch-ae) = cf4a79ccd0c34e42ca3d8a108619a9974288cde6
 SHA1 (patch-af) = 135f2f3e82242d7b17ade4a797a3077834719e77
 SHA1 (patch-ah) = 572e29729d97d5e9942a3d2c22e121d4e756d648
 SHA1 (patch-aj) = 61a53b4ef921270544edc79ddcb0f816824fd3ce
-SHA1 (patch-ak) = b4a31508e5d63f5e6d1099874aeb15a69859d6b5
diff --git a/lang/yap/patches/patch-aa b/lang/yap/patches/patch-aa
index 0afab34a1a8..afd111d969d 100644
--- a/lang/yap/patches/patch-aa
+++ b/lang/yap/patches/patch-aa
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2006/01/11 18:35:19 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2011/07/08 11:40:28 asau Exp $
 
---- C/sysbits.c.orig	2006-01-11 18:05:52.000000000 +0000
-+++ C/sysbits.c
-@@ -195,7 +195,7 @@ InitPageSize(void)
-   GetSystemInfo(&si);
-   Yap_page_size = si.dwPageSize;
- #elif HAVE_UNISTD_H
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-   Yap_page_size = getpagesize();
- #elif defined(_AIX)
-   Yap_page_size = sysconf(_SC_PAGE_SIZE);
-@@ -416,7 +416,7 @@ void Yap_cputime_interval(Int *now,Int *
+--- C/sysbits.c.orig	2011-06-11 19:38:36.000000000 +0400
++++ C/sysbits.c	2011-07-04 22:16:32.000000000 +0400
+@@ -575,7 +575,7 @@
  #define TicksPerSec	CLK_TCK
  #endif
  
--#if defined(__alpha) || defined(__FreeBSD__) || defined(__linux__)
-+#if defined(__alpha) || defined(__FreeBSD__) || defined(__linux__) || defined(__DragonFly__)
+-#if defined(__alpha) || defined(__FreeBSD__) || defined(__linux__) || defined(__DragonFly__)
++#if defined(__NetBSD__) || defined(__alpha) || defined(__FreeBSD__) || defined(__linux__) || defined(__DragonFly__)
  
  #if HAVE_TIME_H
  #include <time.h>
diff --git a/lang/yap/patches/patch-ab b/lang/yap/patches/patch-ab
deleted file mode 100644
index 2038615d745..00000000000
--- a/lang/yap/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2010/08/10 07:49:57 asau Exp $
-
-DragonFly support.
-
---- H/Yap.h.orig	2010-08-04 21:36:28.000000000 +0400
-+++ H/Yap.h	2010-08-10 11:01:04.000000000 +0400
-@@ -257,7 +257,7 @@
- #endif
- 
- #if !defined(IN_SECOND_QUADRANT)
--#if __linux__ || __FreeBSD__ || __NetBSD__ || mips || __APPLE__
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(mips) || defined(__APPLE__) || defined(__DragonFly__)
- #if defined(YAPOR) && defined(__alpha)
- 
- #define MMAP_ADDR 0x40000000
-@@ -683,7 +683,7 @@
- 	if you place things in the lower addresses (power to the libc people).
- */
- 
--#if (defined(_AIX) || (defined(__APPLE__) && !defined(__LP64__)) || defined(_WIN32) || defined(sparc) || defined(__sparc) || defined(mips) || defined(__FreeBSD__) || defined(_POWER) || defined(__POWERPC__) || defined(__linux__) || defined(IN_SECOND_QUADRANT) || defined(__CYGWIN__)) || defined(__NetBSD__)
-+#if (defined(_AIX) || (defined(__APPLE__) && !defined(__LP64__)) || defined(_WIN32) || defined(sparc) || defined(__sparc) || defined(mips) || defined(__FreeBSD__) || defined(_POWER) || defined(__POWERPC__) || defined(__linux__) || defined(IN_SECOND_QUADRANT) || defined(__CYGWIN__)) || defined(__NetBSD__) || defined(__DragonFly__)
- #define USE_LOW32_TAGS 1
- #endif
- 
diff --git a/lang/yap/patches/patch-ac b/lang/yap/patches/patch-ac
deleted file mode 100644
index e2b5e18d705..00000000000
--- a/lang/yap/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2010/08/10 07:49:57 asau Exp $
-
-DragonFly support.
-
---- configure.orig	2010-08-04 21:36:28.000000000 +0400
-+++ configure	2010-08-10 11:03:31.000000000 +0400
-@@ -7052,7 +7052,7 @@
-         YAPLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"
-         PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"
- 	;;
--      *netbsd*|*freebsd*)
-+      *netbsd*|*freebsd*|*dragonfly*)
- 	if echo __ELF__ | ${CC:-cc} -E - | grep -q __ELF__
-         then
- 	  #an a.out system
diff --git a/lang/yap/patches/patch-ak b/lang/yap/patches/patch-ak
deleted file mode 100644
index bc8d0b267b8..00000000000
--- a/lang/yap/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2010/10/27 12:32:52 asau Exp $
-
-Dragonfly support.
-
---- packages/clib/sha1/brg_endian.h.orig	2010-10-18 12:48:20.000000000 +0400
-+++ packages/clib/sha1/brg_endian.h	2010-10-27 03:03:34.000000000 +0400
-@@ -39,7 +39,7 @@
- /* Include files where endian defines and byteswap functions may reside */
- #if defined(__sun__)
- #  include <sys/isa_defs.h>
--#elif defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ )
-+#elif defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) || defined( __DragonFly__ )
- #  include <sys/endian.h>
- #elif defined( BSD ) && ( BSD >= 199103 ) || defined( __APPLE__ ) || \
-       defined( __CYGWIN32__ ) || defined( __DJGPP__ ) || defined( __osf__ )