- Update to 5.4.

Feature safe:	yes

9 files changed, 14 insertions, 33 deletions

diff --git a/math/sage/files/spkg-patch-fflas_ffpack_-_src_fflas-ffpack-config.in b/math/sage/files/spkg-patch-fflas_ffpack_-_src_fflas-ffpack-config.in
new file mode 100644
index 000000000000..8e4311b1cf85
--- /dev/null
+++ b/math/sage/files/spkg-patch-fflas_ffpack_-_src_fflas-ffpack-config.in
@@ -0,0 +1,8 @@
+--- fflas_ffpack-1.6.0/src/fflas-ffpack-config.in-orig	2012-09-14 02:43:35.000000000 +0000
++++ fflas_ffpack-1.6.0//src/fflas-ffpack-config.in	2012-09-14 02:43:58.000000000 +0000
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#!/usr/bin/env bash
+ # Coypright (c) 2011 FFLAS-FFPACK
+ # written by BB <bboyer@imag.fr>
+ # adapted from LinBox configuration
diff --git a/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst b/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst
index fcc178cf6a70..2fe54c02d350 100644
--- a/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst
+++ b/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst
@@ -1,5 +1,5 @@
 --- python-2.7.3.p0/src/Doc/library/fcntl.rst.orig	2011-06-11 15:46:23.000000000 +0000
-+++ python-2.7.3.p0/src/Doc/library/fcntl.rst	2012-04-22 00:31:48.000000000 +0000
++++ python-2.7.3.p2/src/Doc/library/fcntl.rst	2012-04-22 00:31:48.000000000 +0000
 @@ -50,8 +50,6 @@
     operations are typically defined in the library module :mod:`termios` and the
     argument handling is even more complicated.
diff --git a/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure b/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure
index 1324c8d689ea..1e496f34f8f4 100644
--- a/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure
+++ b/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure
@@ -1,5 +1,5 @@
 --- python-2.7.3.p0/src/Modules/_ctypes/libffi/configure.orig	2011-06-11 15:46:26.000000000 +0000
-+++ python-2.7.3.p0/src/Modules/_ctypes/libffi/configure	2012-04-22 00:23:14.000000000 +0000
++++ python-2.7.3.p2/src/Modules/_ctypes/libffi/configure	2012-04-22 00:23:14.000000000 +0000
 @@ -6289,7 +6289,7 @@
    rm -rf conftest*
    ;;
diff --git a/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c b/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c
index 94d269eb11b0..c436ca0224d8 100644
--- a/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c
+++ b/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c
@@ -1,5 +1,5 @@
 --- python-2.7.3.p0/src/Modules/fcntlmodule.c.orig	2011-06-11 15:46:27.000000000 +0000
-+++ python-2.7.3.p0/src/Modules/fcntlmodule.c	2012-04-22 00:23:34.000000000 +0000
++++ python-2.7.3.p2/src/Modules/fcntlmodule.c	2012-04-22 00:23:34.000000000 +0000
 @@ -97,20 +97,15 @@
  {
  #define IOCTL_BUFSZ 1024
diff --git a/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h b/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h
index 39d793a7d6f1..5df5616f3a80 100644
--- a/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h
+++ b/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h
@@ -1,5 +1,5 @@
 --- python-2.7.3.p0/src/Python/thread_pthread.h.orig	2011-06-11 15:46:28.000000000 +0000
-+++ python-2.7.3.p0/src/Python/thread_pthread.h	2012-04-22 00:23:46.000000000 +0000
++++ python-2.7.3.p2/src/Python/thread_pthread.h	2012-04-22 00:23:46.000000000 +0000
 @@ -38,13 +38,18 @@
  #endif
  #endif
diff --git a/math/sage/files/spkg-patch-python_-_src_setup.py b/math/sage/files/spkg-patch-python_-_src_setup.py
index a977170da415..46cbeb80b003 100644
--- a/math/sage/files/spkg-patch-python_-_src_setup.py
+++ b/math/sage/files/spkg-patch-python_-_src_setup.py
@@ -1,5 +1,5 @@
 --- python-2.7.3.p0/src/setup.py-orig	2012-04-22 00:04:08.000000000 +0000
-+++ python-2.7.3.p0/src/setup.py	2012-04-22 00:10:25.000000000 +0000
++++ python-2.7.3.p2/src/setup.py	2012-04-22 00:10:25.000000000 +0000
 @@ -1432,10 +1432,24 @@
              macros = dict()
              libraries = []
diff --git a/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py b/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py
index 78e8d25993f9..3937a0897854 100644
--- a/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py
+++ b/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py
@@ -1,5 +1,5 @@
 --- sage-5.0.beta13/sage/misc/getusage.py-orig	2012-04-11 00:14:47.000000000 +0000
-+++ sage-5.3/sage/misc/getusage.py	2012-04-11 00:47:03.000000000 +0000
++++ sage-5.4/sage/misc/getusage.py	2012-04-11 00:47:03.000000000 +0000
 @@ -20,6 +20,8 @@
      """
      Return the 'top' or 'prstat' line that contains this running Sage
diff --git a/math/sage/files/spkg-patch-singular_-_patches_omalloc.configure.patch b/math/sage/files/spkg-patch-singular_-_patches_omalloc.configure.patch
deleted file mode 100644
index 381934fd7947..000000000000
--- a/math/sage/files/spkg-patch-singular_-_patches_omalloc.configure.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- /dev/null	2012-04-08 00:25:00.000000000 +0000
-+++ singular-3-1-3-3.p6/patches/omalloc.configure.patch	2012-04-08 00:25:39.000000000 +0000
-@@ -0,0 +1,13 @@
-+diff -ur src/omalloc/configure patches/omalloc/configure
-+--- src/omalloc/configure	2011-05-12 08:32:11.000000000 +0000
-++++ patches/omalloc/configure	2012-04-08 00:22:37.000000000 +0000
-+@@ -1293,9 +1293,6 @@
-+   echo "$ac_t""no" 1>&6
-+ fi
-+ 
-+-if test "$ac_cv_prog_AR" != ar; then
-+-  { echo "configure: error: *** ar program not found" 1>&2; exit 1; }
-+-fi
-+ for ac_prog in perl
-+ do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
diff --git a/math/sage/files/spkg-patch-singular_-_spkg-install b/math/sage/files/spkg-patch-singular_-_spkg-install
deleted file mode 100644
index f64c6337ed6d..000000000000
--- a/math/sage/files/spkg-patch-singular_-_spkg-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- singular-3-1-3-3.p6/spkg-install-orig	2012-04-08 01:57:01.000000000 +0000
-+++ singular-3-1-3-3.p6/spkg-install	2012-04-08 01:58:19.000000000 +0000
-@@ -108,7 +108,7 @@
- 
-     patches="assert.h.diff sing_win.cc.diff Minor.h.patch os_x_ppc.patch \
- 	Singular.configure.patch make_parallel.patch Singular.Makefile.in.shared.patch \
--	factory.GNUmakefile.in.patch"
-+	factory.GNUmakefile.in.patch omalloc.configure.patch"
- 
-     if [ "$UNAME" = "CYGWIN" ]; then
-         patches="$patches IntegerProgramming-Makefile.in.diff"