6 files changed, 26 insertions, 76 deletions
diff --git a/lang/guile2/files/patch-156119b0223cf14d335ebda84701a69b2ba95757 b/lang/guile2/files/patch-156119b0223cf14d335ebda84701a69b2ba95757
deleted file mode 100644
index 8283463ad489..000000000000
--- a/lang/guile2/files/patch-156119b0223cf14d335ebda84701a69b2ba95757
+++ /dev/null
@@ -1,62 +0,0 @@
-From 156119b0223cf14d335ebda84701a69b2ba95757 Mon Sep 17 00:00:00 2001
-From: Mark H Weaver <mhw@netris.org>
-Date: Sat, 20 Sep 2014 03:49:46 -0400
-Subject: [PATCH] Do not assume that 64-bit integers will be 64-bit aligned.
-
-* libguile/foreign.c (raw_bytecode, objcode_cells):
-* libguile/gsubr.c (raw_bytecode, objcode_cells): Use SCM_ALIGNED to
-  ensure 64-bit alignment.
-
---- libguile/foreign.c.orig	2014-01-21 21:20:53 UTC
-+++ libguile/foreign.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2010, 2011, 2012, 2013  Free Software Foundation, Inc.
-+/* Copyright (C) 2010-2014  Free Software Foundation, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public License
-@@ -814,7 +814,7 @@ SCM_DEFINE (scm_pointer_to_procedure, "p
- 
- static const struct
- {
--  scm_t_uint64 dummy; /* ensure 8-byte alignment; perhaps there's a better way */
-+  SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
-   const scm_t_uint8 bytes[10 * (sizeof (struct scm_objcode) + 8
-                                 + sizeof (struct scm_objcode) + 32)];
- } raw_bytecode = {
-@@ -867,7 +867,7 @@ make_objcode_trampoline (unsigned int na
- 
- static const struct
- {
--  scm_t_uint64 dummy; /* alignment */
-+  SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
-   scm_t_cell cells[10 * 2]; /* 10 double cells */
- } objcode_cells = {
-   0,
---- libguile/gsubr.c.orig	2012-07-02 09:28:13 UTC
-+++ libguile/gsubr.c
-@@ -1,4 +1,5 @@
--/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 1995-2001, 2006, 2008-2011,
-+ *   2014 Free Software Foundation, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public License
-@@ -213,7 +214,7 @@
- */
- static const struct
- {
--  scm_t_uint64 dummy; /* ensure 8-byte alignment; perhaps there's a better way */
-+  SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
-   const scm_t_uint8 bytes[121 * (sizeof (struct scm_objcode) + 16
-                                  + sizeof (struct scm_objcode) + 32)];
- } raw_bytecode = {
-@@ -317,7 +318,7 @@ static const struct
- 
- static const struct
- {
--  scm_t_uint64 dummy; /* alignment */
-+  SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
-   scm_t_cell cells[121 * 2]; /* 11*11 double cells */
- } objcode_cells = {
-   0,
diff --git a/lang/guile2/files/patch-libguile___scm.h b/lang/guile2/files/patch-libguile_____scm.h
index fb370d5b8f74..1c5f854843e5 100644
--- a/lang/guile2/files/patch-libguile___scm.h
+++ b/lang/guile2/files/patch-libguile_____scm.h
@@ -1,6 +1,6 @@
---- libguile/__scm.h	2008-02-23 18:14:28.106264450 -0600
-+++ libguile/__scm.h	2008-02-23 18:15:41.306005478 -0600
-@@ -544,7 +544,8 @@
+--- libguile/__scm.h.orig	2014-01-21 21:25:11 UTC
++++ libguile/__scm.h
+@@ -544,7 +544,8 @@ typedef void *scm_t_subr;
   * that all the state of the process is contained in the stack.
   */
  
diff --git a/lang/guile2/files/patch-libguile_filesys.c b/lang/guile2/files/patch-libguile_filesys.c
new file mode 100644
index 000000000000..135030ac6257
--- /dev/null
+++ b/lang/guile2/files/patch-libguile_filesys.c
@@ -0,0 +1,12 @@
+--- libguile/filesys.c.orig	2017-02-06 04:37:29 UTC
++++ libguile/filesys.c
+@@ -1486,6 +1486,9 @@ SCM_DEFINE (scm_i_mkstemp, "mkstemp!", 1
+       mode_bits = scm_i_mode_bits (mode);
+     }
+ 
++#ifdef __FreeBSD__
++  open_flags &= O_APPEND | O_DIRECT | O_SHLOCK | O_EXLOCK | O_CLOEXEC;
++#endif
+   SCM_SYSCALL (rv = mkostemp (c_tmpl, open_flags));
+   if (rv == -1)
+     SCM_SYSERROR;
diff --git a/lang/guile2/files/patch-libguile_gen-scmconfig.c b/lang/guile2/files/patch-libguile_gen-scmconfig.c
index f2b35b8d5934..15879ac9ecd2 100644
--- a/lang/guile2/files/patch-libguile_gen-scmconfig.c
+++ b/lang/guile2/files/patch-libguile_gen-scmconfig.c
@@ -1,8 +1,8 @@
---- libguile/gen-scmconfig.c	2008-02-23 21:38:39.310330888 -0600
-+++ libguile/gen-scmconfig.c	2008-02-23 21:39:32.909873567 -0600
-@@ -123,6 +123,7 @@
+--- libguile/gen-scmconfig.c.orig	2014-03-16 22:43:13 UTC
++++ libguile/gen-scmconfig.c
+@@ -138,6 +138,7 @@
  
- #include "gen-scmconfig.h"
+ #include <libguile/gen-scmconfig.h>
  
 +#define _ANSI_SOURCE
  #include <stdio.h>
diff --git a/lang/guile2/files/patch-libguile_numbers.c b/lang/guile2/files/patch-libguile_numbers.c
index 5b36c7f11ef3..ea13cc1c21c3 100644
--- a/lang/guile2/files/patch-libguile_numbers.c
+++ b/lang/guile2/files/patch-libguile_numbers.c
@@ -1,6 +1,6 @@
---- libguile/numbers.c	2008-07-09 14:50:22.000000000 +0800
-+++ libguile/numbers.c	2008-07-09 14:53:05.000000000 +0800
-@@ -183,7 +183,7 @@
+--- libguile/numbers.c.orig	2014-03-12 13:24:54 UTC
++++ libguile/numbers.c
+@@ -183,7 +183,7 @@ static double atanh (double x) { return 
  
  
  #if defined (GUILE_I)
diff --git a/lang/guile2/files/patch-libguile_pthread-threads.h b/lang/guile2/files/patch-libguile_pthread-threads.h
index 42f5934bb506..97eb6e8d8779 100644
--- a/lang/guile2/files/patch-libguile_pthread-threads.h
+++ b/lang/guile2/files/patch-libguile_pthread-threads.h
@@ -1,6 +1,6 @@
---- libguile/pthread-threads.h	2008-02-27 10:31:41.564950412 -0600
-+++ libguile/pthread-threads.h	2008-02-27 10:36:08.383652510 -0600
-@@ -26,6 +26,9 @@
+--- libguile/pthread-threads.h.orig	2012-07-02 09:28:13 UTC
++++ libguile/pthread-threads.h
+@@ -27,6 +27,9 @@
  */
  
  #include <pthread.h>
@@ -9,4 +9,4 @@
 +#endif
  #include <sched.h>
  
- /* Threads 
+ /* `libgc' defines wrapper procedures for pthread calls.  */