Update to Yap 6.2.1

Changes since 6.2.0 include DragonFly support.

4 files changed, 6 insertions, 69 deletions

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__ )