Merge remote-tracking branch 'trac/develop' into flint_fq

VERSION.txt

@@ -1 +1 @@
-Sage version 6.3.beta5, released 2014-07-01
+Sage version 6.3.beta6, released 2014-07-19

build/deps

@@ -336,7 +336,7 @@ $(INST)/$(SAGETEX): $(INST)/$(PYTHON) \
 $(INST)/$(SETUPTOOLS): $(INST)/$(PYTHON)
 	+$(PIPE) "$(SAGE_SPKG) $(SETUPTOOLS) 2>&1" "tee -a $(SAGE_LOGS)/$(SETUPTOOLS).log"
 
-$(INST)/$(SINGULAR): $(INST)/$(MPIR) $(INST)/$(NTL) \
+$(INST)/$(SINGULAR): $(INST)/$(MPIR) $(INST)/$(NTL) $(INST)/$(FLINT) \
 		     $(INST)/$(READLINE) $(INST)/$(MPFR)
 	+$(PIPE) "$(SAGE_SPKG) $(SINGULAR) 2>&1" "tee -a $(SAGE_LOGS)/$(SINGULAR).log"
 

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=4d10c539769b8aa53c2bd97f9d9ae6b8a139d356
-md5=b9ea7956de216fc5e5965e17b14bab3f
-cksum=2387138201
+sha1=3265062e02ba06ebe5897596eea08fb04cb3c554
+md5=f3a75a886044f86dab6565b399141bde
+cksum=666076577

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-35
+36

build/pkgs/openssl/SPKG.txt

@@ -22,27 +22,5 @@ library in a variety of computer languages are available.
 
 === Patches ===
 
- * src/Configure: Sage's gcc doesn't recognize the '-arch' option,
-   while Apple's gcc does, so we remove this flag.
  * src/config: patched to fix a problem on Solaris.
 
-== Changelog ==
-
-=== openssl-1.0.1c.p0 (John Palmieri, 17 June 2012) ===
- * Trac #13126: Update source to 1.0.1c
- * Created hg repository
- * Cleaned up spkg-install
- * Created spkg-check
- * Patch to build on OS X Lion
- * Patch to build on Solaris
-
-=== openssl-1.0.1a (Mariah Lenox, 23 April 2012) ===
- * upgraded source
-
-=== openssl-1.0.0.p0 (William Stein, June 3, 2010) ===
- * Fix issue with openssl libraries getting installed to lib64,
-   as recommended by Mariah (the referee).
-
-=== openssl-1.0.0 (William Stein, April 27, 2010) ===
- * Initial version in modernized format
-

build/pkgs/openssl/checksums.ini

@@ -1,4 +1,4 @@
 tarball=openssl-VERSION.tar.gz
-sha1=3f1b1223c9e8189bfe4e186d86449775bd903460
-md5=66bf6f10f060d561929de96f9dfe5b8c
-cksum=4124470397
+sha1=b2239599c8bf8f7fc48590a55205c26abe560bf8
+md5=8d6d684a9430d5cc98a62a5d8fbda8cf
+cksum=3773835410

build/pkgs/openssl/package-version.txt

@@ -1 +1 @@
-1.0.1e
+1.0.1h

build/pkgs/python/checksums.ini

@@ -1,4 +1,4 @@
 tarball=python-VERSION.tar.gz
-sha1=1db01d7f325d8ceaf986976800106018b82ae45a
-md5=cf842800b67841d64e7fb3cd8acb5663
-cksum=559226099
+sha1=511960dd78451a06c9df76509635aeec05b2051a
+md5=d4bca0159acb0b44a781292b5231936f
+cksum=3938213866

build/pkgs/python/package-version.txt

@@ -1 +1 @@
-2.7.7
+2.7.8

build/pkgs/r/SPKG.txt

@@ -46,4 +46,4 @@ much code written for S runs unaltered under R.
    libintl library.
  * large_address_aware.patch: don't pass --large-address-aware to ld on
    Cygwin64.
-
+ * 3.1 : Upstream now handles some of these issues. Some examples changed.

build/pkgs/r/checksums.ini

@@ -1,4 +1,4 @@
-tarball=r-VERSION.tar.bz2
-sha1=0ba9c6e5ceda749cccf5bd9cf5b535ff163deefe
-md5=9247263d8a7d1e2e6794ba41f265eda4
-cksum=1117391428
+tarball=r-3.1.0.tar.gz
+sha1=a9d13932c739cc12667c6a17fabd9361624a1708
+md5=a1ee52446bee81820409661e6d114ab1
+cksum=3701745191

build/pkgs/r/package-version.txt

@@ -1 +1 @@
-3.0.2.p1
+3.1.0.p0

build/pkgs/r/patches/configure.patch

@@ -1,7 +1,7 @@
 diff -ru src/configure src.configure/configure
 --- src/configure	2011-10-24 00:05:54.000000000 +0200
 +++ src.configure/configure	2012-03-30 16:31:51.409247321 +0200
-@@ -22492,7 +22492,7 @@
+@@ -22876,7 +22492,7 @@
  if ac_fn_f77_try_compile "$LINENO"; then :
    ac_cv_prog_f77_v=
  # Try some options frequently used verbose output
@@ -10,7 +10,7 @@ diff -ru src/configure src.configure/configure
    cat > conftest.$ac_ext <<_ACEOF
        program main
 
-@@ -22808,7 +22808,7 @@
+@@ -23232,7 +22808,7 @@
  if ac_fn_c_try_compile "$LINENO"; then :
    r_cv_prog_c_v=
  # Try some options frequently used verbose output

build/pkgs/r/patches/large_address_aware.patch

@@ -1,7 +1,7 @@
 diff -druN r-3.0.2.orig/configure.ac r-3.0.2/configure.ac
 --- r-3.0.2.orig/configure.ac	2013-08-26 15:05:06.000000000 -0700
 +++ r-3.0.2/configure.ac	2014-01-18 09:35:57.516091309 -0800
-@@ -1310,7 +1310,11 @@
+@@ -1310,7 +1321,11 @@
      SHLIB_EXT=".dll"
      dylib_undefined_allowed=no
      is_cygwin=yes
@@ -17,7 +17,7 @@ diff -druN r-3.0.2.orig/configure.ac r-3.0.2/configure.ac
 diff -druN r-3.0.2.orig/configure r-3.0.2/configure
 --- r-3.0.2.orig/configure	2013-09-17 15:06:13.000000000 -0700
 +++ r-3.0.2/configure	2014-01-18 09:38:03.426103900 -0800
-@@ -26247,7 +26247,11 @@
+@@ -26313,7 +26247,11 @@
      SHLIB_EXT=".dll"
      dylib_undefined_allowed=no
      is_cygwin=yes

build/pkgs/r/spkg-src

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+## What do we want ?
+VERSION=$(cat package-version.txt | sed -re "s/^(.*)\\.p.+$/\\1/")
+TARGET_TARBALL=r-$VERSION.tar.gz
+SOURCE_TARBALL=R-$VERSION.tar.gz
+
+mv $SOURCE_TARBALL $TARGET_TARBALL