--- spkg/standard/deps.orig	2008-02-04 10:01:43.000000000 +1300
+++ spkg/standard/deps	2008-02-04 11:08:50.000000000 +1300
@@ -5,25 +5,25 @@
 ########################################
 # The base system; required in order to run spkg
 ########################################
-BASE    = $(INST)/$(PREREQ) $(INST)/$(DIR) $(INST)/$(SAGE_BZIP2) 
+BASE    = $(INST)/$(PREREQ) $(INST)/$(DIR)
 
 all: $(INST)/$(SAGE_SCRIPTS) $(INST)/$(SAGE) $(INST)/$(DOC)  \
-     $(INST)/$(EXAMPLES) $(INST)/$(GAP) $(INST)/$(SINGULAR) $(INST)/$(MAXIMA) \
+     $(INST)/$(EXAMPLES) $(INST)/$(GAP) $(INST)/$(SINGULAR) \
      $(INST)/$(G2RED) $(INST)/$(LCALC) $(INST)/$(SYMPOW) $(INST)/$(MATPLOTLIB) \
      $(INST)/$(GFAN) $(INST)/$(ECM) $(INST)/$(TACHYON)  \
      $(INST)/$(GIVARO) $(INST)/$(LINBOX) $(INST)/$(IML) \
      $(INST)/$(SYMMETRICA) $(INST)/$(POLYBORI) \
-     $(INST)/$(GSL) $(INST)/$(GD) $(INST)/$(GDMODULE) \
+     $(INST)/$(GDMODULE) \
      $(INST)/$(MERCURIAL) $(INST)/$(TWISTED) $(INST)/$(TWISTEDWEB2) \
      $(INST)/$(NUMPY) $(INST)/$(WEAVE)  $(INST)/$(FLINTQS) $(INST)/$(FLINT) $(INST)/$(PYCRYPTO) \
      $(INST)/$(PALP) $(INST)/$(MOIN)  \
-     $(INST)/$(SQLITE) $(INST)/$(IPYTHON1)  \
+     $(INST)/$(IPYTHON1)  \
      $(INST)/$(PYTHON_GNUTLS) \
      $(INST)/$(SCIPY) $(INST)/$(SCIPY_SANDBOX) \
      $(INST)/$(CVXOPT) \
      $(INST)/$(SCONS) \
      $(INST)/$(JMOL) \
-     $(INST)/$(R) $(INST)/$(ATLAS) $(INST)/$(RUBIKS)
+     $(INST)/$(R) $(INST)/$(RUBIKS)
 
 base: $(BASE)
 
@@ -38,22 +38,13 @@
 $(INST)/$(PREREQ): $(INST)/$(DIR)
 	base/$(PREREQ)-install
 
-$(INST)/$(SAGE_BZIP2): $(INST)/$(PREREQ) $(INST)/$(DIR)
-	base/$(SAGE_BZIP2)-install 2>&1 
-
 ########################################
 # Building normal packages
 ########################################
 
-$(INST)/$(ATLAS): $(BASE) $(INST)/$(LAPACK) $(INST)/$(PYTHON)
-	$(SAGE_SPKG) $(ATLAS) 2>&1
-
 $(INST)/$(TERMCAP): $(BASE)
 	$(SAGE_SPKG) $(TERMCAP) 2>&1
 
-$(INST)/$(READLINE): $(BASE)
-	$(SAGE_SPKG) $(READLINE) 2>&1
-
 $(INST)/$(ELLIPTIC_CURVES): $(BASE)
 	$(SAGE_SPKG) $(ELLIPTIC_CURVES) 2>&1
 
@@ -63,15 +54,12 @@
 $(INST)/$(GRAPHS): $(BASE)
 	$(SAGE_SPKG) $(GRAPHS) 2>&1
 
-$(INST)/$(PYTHON): $(BASE) $(INST)/$(ZLIB) $(INST)/$(TERMCAP) $(INST)/$(READLINE) $(INST)/$(SQLITE) $(INST)/$(GNUTLS) $(INST)/$(LIBPNG)
+$(INST)/$(PYTHON): $(BASE) $(INST)/$(TERMCAP)
 	$(SAGE_SPKG) $(PYTHON) 2>&1
 
 $(INST)/$(GMP): $(BASE) 
 	$(SAGE_SPKG) $(GMP) 2>&1
 
-$(INST)/$(GSL): $(BASE) $(INST)/$(ATLAS)
-	$(SAGE_SPKG) $(GSL) 2>&1
-
 #$(INST)/$(FLEX): $(BASE) 
 #	$(SAGE_SPKG) $(FLEX) 2>&1
 
@@ -84,7 +72,7 @@
 $(INST)/$(FPLLL): $(BASE) $(INST)/$(GMP) $(INST)/$(MPFR)
 	$(SAGE_SPKG) $(FPLLL) 2 >&1
 
-$(INST)/$(PARI): $(BASE) $(INST)/$(TERMCAP) $(INST)/$(READLINE) $(INST)/$(GMP)
+$(INST)/$(PARI): $(BASE) $(INST)/$(TERMCAP) $(INST)/$(GMP)
 	$(SAGE_SPKG) $(PARI) 2>&1
 
 $(INST)/$(POLYBORI): $(BASE) $(INST)/$(PYTHON) $(INST)/$(SCONS)
@@ -102,10 +90,12 @@
 $(INST)/$(GIVARO): $(BASE) $(INST)/$(GMP)
 	$(SAGE_SPKG) $(GIVARO) 2>&1
 
-$(INST)/$(LINBOX): $(BASE) $(INST)/$(GMP) $(INST)/$(NTL) $(INST)/$(GIVARO) $(INST)/$(GSL) $(INST)/$(ATLAS)
+$(INST)/$(LINBOX): $(BASE) $(INST)/$(GMP) $(INST)/$(NTL) $(INST)/$(GIVARO)
 	$(SAGE_SPKG) $(LINBOX) 2>&1
+$(INST)/$(LINBOX): LINBOX_BLAS = yes
+   export LINBOX_BLAS
 
-$(INST)/$(IML): $(BASE) $(INST)/$(GMP) $(INST)/$(GSL) 
+$(INST)/$(IML): $(BASE) $(INST)/$(GMP) 
 	$(SAGE_SPKG) $(IML) 2>&1
 
 $(INST)/$(ECLIB): $(BASE) $(INST)/$(GMP) $(INST)/$(PARI) $(INST)/$(NTL)
@@ -127,7 +117,7 @@
 	$(SAGE_SPKG) $(SYMMETRICA) 2>&1
 
 # gap requires SAGE so that gap_reset_workspace works.
-$(INST)/$(GAP): $(BASE)  $(INST)/$(GMP) $(INST)/$(TERMCAP) $(INST)/$(READLINE) $(INST)/$(SAGE)
+$(INST)/$(GAP): $(BASE)  $(INST)/$(GMP) $(INST)/$(TERMCAP) $(INST)/$(SAGE)
 	$(SAGE_SPKG) $(GAP) 2>&1
 
 $(INST)/$(IPYTHON): $(INST)/$(PYTHON) 
@@ -141,13 +131,10 @@
 $(INST)/$(PEXPECT): $(INST)/$(PYTHON) 
 	$(SAGE_SPKG) $(PEXPECT) 2>&1
 
-$(INST)/$(GD): $(INST)/$(LIBPNG) $(INST)/$(FREETYPE) 
-	$(SAGE_SPKG) $(GD) 2>&1
-
 #$(INST)/$(DVIPNG): $(INST)/$(LIBPNG) $(INST)/$(FREETYPE) 
 #	$(SAGE_SPKG) $(DVIPNG) 2>&1
 
-$(INST)/$(GDMODULE): $(INST)/$(PYTHON) $(INST)/$(GD) 
+$(INST)/$(GDMODULE): $(INST)/$(PYTHON) 
 	$(SAGE_SPKG) $(GDMODULE) 2>&1
 
 $(INST)/$(TWISTED): $(INST)/$(PYTHON) $(INST)/$(PYTHON_GNUTLS)
@@ -156,19 +143,7 @@
 $(INST)/$(TWISTEDWEB2): $(INST)/$(TWISTED)
 	$(SAGE_SPKG) $(TWISTEDWEB2) 2>&1
 
-$(INST)/$(OPENCDK):  $(INST)/$(ZLIB)  $(INST)/$(LIBGCRYPT)
-	$(SAGE_SPKG) $(OPENCDK) 2>&1
-
-$(INST)/$(LIBGPG_ERROR):  
-	$(SAGE_SPKG) $(LIBGPG_ERROR) 2>&1
-
-$(INST)/$(LIBGCRYPT):  $(INST)/$(LIBGPG_ERROR)
-	$(SAGE_SPKG) $(LIBGCRYPT) 2>&1
-
-$(INST)/$(GNUTLS):  $(INST)/$(ZLIB) $(INST)/$(OPENCDK) $(INST)/$(LIBGCRYPT) $(INST)/$(LIBGPG_ERROR)
-	$(SAGE_SPKG) $(GNUTLS) 2>&1
-
-$(INST)/$(PYTHON_GNUTLS):  $(INST)/$(GNUTLS) $(INST)/$(PYTHON)
+$(INST)/$(PYTHON_GNUTLS):  $(INST)/$(PYTHON)
 	$(SAGE_SPKG) $(PYTHON_GNUTLS) 2>&1
 
 $(INST)/$(SCONS):  $(INST)/$(PYTHON)
@@ -187,14 +162,11 @@
 $(INST)/$(MOIN): $(INST)/$(PYTHON) $(INST)/$(TWISTED) $(INST)/$(EXTCODE)
 	$(SAGE_SPKG) $(MOIN) 2>&1
 
-$(INST)/$(SQLITE): $(INST)/$(TERMCAP) $(INST)/$(READLINE)
-	$(SAGE_SPKG) $(SQLITE) 2>&1
-
 $(INST)/$(MERCURIAL): $(INST)/$(PYTHON) 
 	$(SAGE_SPKG) $(MERCURIAL) 2>&1
 	$(MAKEREL)
 
-$(INST)/$(SINGULAR): $(BASE) $(INST)/$(GMP) $(INST)/$(NTL) $(INST)/$(TERMCAP) $(INST)/$(READLINE) $(INST)/$(MPFR)
+$(INST)/$(SINGULAR): $(BASE) $(INST)/$(GMP) $(INST)/$(NTL) $(INST)/$(TERMCAP) $(INST)/$(MPFR)
 	$(SAGE_SPKG) $(SINGULAR) 2>&1
 
 $(INST)/$(PYCRYPTO): $(BASE) $(INST)/$(PYTHON)
@@ -209,22 +181,13 @@
 #$(INST)/$(GNUPLOT): $(BASE) $(INST)/$(TERMCAP) $(INST)/$(READLINE) $(INST)/$(LIBPNG)
 #	$(SAGE_SPKG) $(GNUPLOT) 2>&1
 
-$(INST)/$(ZLIB): $(BASE) 
-	$(SAGE_SPKG) $(ZLIB) 2>&1
-
 #$(INST)/$(GNUPLOTPY): $(BASE) $(INST)/$(PYTHON) $(INST)/$(NUMPY)
 #	$(SAGE_SPKG) $(GNUPLOTPY) 2>&1
 
 
 ##  << NON-GUI matplotlib >>
 
-$(INST)/$(FREETYPE): $(BASE)
-	$(SAGE_SPKG) $(FREETYPE) 2>&1
-
-$(INST)/$(LIBPNG): $(BASE)
-	$(SAGE_SPKG) $(LIBPNG) 2>&1
-
-$(INST)/$(MATPLOTLIB): $(BASE) $(INST)/$(PYTHON) $(INST)/$(NUMPY) $(INST)/$(FREETYPE) $(INST)/$(LIBPNG) $(INST)/$(GDMODULE)
+$(INST)/$(MATPLOTLIB): $(BASE) $(INST)/$(PYTHON) $(INST)/$(NUMPY) $(INST)/$(GDMODULE)
 	$(SAGE_SPKG) $(MATPLOTLIB) 2>&1
 
 
@@ -236,7 +199,7 @@
 $(INST)/$(GFAN): $(BASE) $(INST)/$(GMP) $(INST)/$(CDDLIB)
 	$(SAGE_SPKG) $(GFAN) 2>&1
 
-$(INST)/$(TACHYON): $(BASE) $(INST)/$(LIBPNG)
+$(INST)/$(TACHYON): $(BASE)
 	$(SAGE_SPKG) $(TACHYON) 2>&1
 
 $(INST)/$(ECM): $(BASE) $(INST)/$(GMP)
@@ -246,17 +209,11 @@
 #$(INST)/$(LIBSIGSEGV): $(BASE)
 #	$(SAGE_SPKG) $(LIBSIGSEGV) 2>&1
 
-$(INST)/$(CLISP): $(BASE) $(INST)/$(GMP) $(INST)/$(TERMCAP) $(INST)/$(READLINE)
-	$(SAGE_SPKG) $(CLISP) 2>&1
-
-$(INST)/$(MAXIMA): $(BASE) $(INST)/$(CLISP)
-	$(SAGE_SPKG) $(MAXIMA) 2>&1
-
 $(INST)/$(ZODB): $(INST)/$(PYTHON)
 	$(SAGE_SPKG) $(ZODB) 2>&1
 	$(MAKEREL)
 
-$(INST)/$(R): $(INST)/$(PYTHON) $(INST)/$(ATLAS)
+$(INST)/$(R): $(INST)/$(PYTHON)
 	$(SAGE_SPKG) $(R) 2>&1
 	$(MAKEREL)
 
@@ -314,7 +271,6 @@
 		  $(INST)/$(NUMPY) \
 		  $(INST)/$(NETWORKX) \
                   $(INST)/$(GIVARO) \
-                  $(INST)/$(GSL) \
                   $(INST)/$(QUADDOUBLE) \
 		  $(INST)/$(GNUCRYPTOLIB) \
                   $(INST)/$(SINGULAR) \
@@ -323,7 +279,6 @@
 		  $(INST)/$(FPLLL) \
 		  $(INST)/$(POLYBORI) \
 		  $(INST)/$(R)  \
-		  $(INST)/$(ATLAS) \
 		  $(INST)/$(RUBIKS) \
 	          $(INST)/$(LIBM4RI) \
 		  $(INST)/$(ECM)
@@ -334,29 +289,24 @@
 $(INST)/$(DOC):  $(INST)/$(SAGE) 
 	$(SAGE_SPKG) $(DOC)
 
-$(INST)/$(FORTRAN):
-	$(SAGE_SPKG) $(FORTRAN) 2>&1
-
 $(INST)/$(JMOL):
 	$(SAGE_SPKG) $(JMOL) 2>&1
 
-$(INST)/$(F2C): $(INST)/$(FORTRAN)
+$(INST)/$(F2C):
 	$(SAGE_SPKG) $(INST)/$(F2C) 2>&1 
 
-$(INST)/$(LAPACK): $(INST)/$(FORTRAN)
-	$(SAGE_SPKG) $(INST)/$(LAPACK) 2>&1 
-
-$(INST)/$(BLAS): $(INST)/$(FORTRAN)
-	$(SAGE_SPKG) $(INST)/$(BLAS) 2>&1 
-
-$(INST)/$(NUMPY): $(BASE) $(INST)/$(PYTHON) $(INST)/$(FORTRAN) $(INST)/$(F2C) $(INST)/$(LAPACK) $(INST)/$(BLAS) $(INST)/$(ATLAS)
+$(INST)/$(NUMPY): $(BASE) $(INST)/$(PYTHON) $(INST)/$(F2C)
 	$(SAGE_SPKG) $(NUMPY) 2>&1
+$(INST)/$(NUMPY): ATLAS=/usr/lib/libblas.so
+   BLAS=/usr/lib/libblas.so
+   LAPACK=/usr/lib/liblapack.so
+   export ATLAS BLAS LAPACK
 
-$(INST)/$(SCIPY): $(INST)/$(FORTRAN) $(INST)/$(F2C) $(INST)/$(LAPACK) $(INST)/$(BLAS) $(INST)/$(NUMPY)
+$(INST)/$(SCIPY): $(INST)/$(F2C) $(INST)/$(NUMPY)
 	$(SAGE_SPKG) $(SCIPY) 2>&1
 
 $(INST)/$(SCIPY_SANDBOX): $(INST)/$(SCIPY)
 	$(SAGE_SPKG) $(SCIPY_SANDBOX) 2>&1
 
-$(INST)/$(CVXOPT): $(INST)/$(FORTRAN) $(INST)/$(F2C) $(INST)/$(LAPACK) $(INST)/$(BLAS) $(INST)/$(NUMPY) $(INST)/$(ATLAS)
+$(INST)/$(CVXOPT): $(INST)/$(F2C) $(INST)/$(NUMPY)
 	$(SAGE_SPKG) $(CVXOPT) 2>&1
--- spkg/base/prereq-0.3-install.orig	2008-02-04 10:18:04.000000000 +1300
+++ spkg/base/prereq-0.3-install	2008-02-04 10:19:00.000000000 +1300
@@ -129,6 +129,8 @@
     exit 1
 else
     echo " All prerequisites appear to be present."
+    cp $ROOT/base/which_fortran $LOCAL/bin/which_fortran
+    cp $ROOT/base/sage_fortran $LOCAL/bin/sage_fortran
     touch $ROOT/installed/$TARGET
 fi