clapack: fixed #14719

updated to 3.1.1 and removed some bork

5 files changed, 24 insertions, 19 deletions

diff --git a/cluster/clapack/BUILD b/cluster/clapack/BUILD
index d64a636221..9f01e517ab 100755
--- a/cluster/clapack/BUILD
+++ b/cluster/clapack/BUILD
@@ -1,3 +1,3 @@
-make  blaslib    &&
-make  lapacklib  &&
-make  tmglib
+make lib &&
+make blaslib &&
+make lapack_install # not really installing anything
diff --git a/cluster/clapack/DETAILS b/cluster/clapack/DETAILS
index b3f261053d..102b41fdcd 100755
--- a/cluster/clapack/DETAILS
+++ b/cluster/clapack/DETAILS
@@ -1,17 +1,18 @@
             SPELL=clapack
-          VERSION=3.0
+          VERSION=3.1.1
            SOURCE=$SPELL.tgz
           SOURCE2=manpages.tgz
-      SOURCE_HASH=sha512:5f4e11ee97e22f4d7bbf1ddc1c6c96bd0176fa897d9f32ce42eb231c21955620ba9d024c4b839f21682b6a28b8438c1faa288127095e166ab3880c0fccb91452
-     SOURCE2_HASH=sha512:289c23d622b5c5469ba841b095f71fccb1742789316a5853147b88dbf39ec6b95aeb61214b994d108b6085b0c3963988a51c029868ebbfcc7d6d64a58881feba
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/CLAPACK
-SOURCE2_DIRECTORY=$BUILD_DIRECTORY/CLAPACK/man
+    SOURCE_IGNORE=unversioned
+   SOURCE2_IGNORE=unversioned
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/CLAPACK-$VERSION
+SOURCE2_DIRECTORY=$BUILD_DIRECTORY/CLAPACK-$VERSION/man
     SOURCE_URL[0]=http://www.netlib.org/$SPELL/$SOURCE
    SOURCE2_URL[0]=http://www.netlib.org/lapack/$SOURCE2
        LICENSE[0]=http://netlib2.cs.utk.edu/lapack/faq.html#1.2
          WEB_SITE=http://www.netlib.org/clapack
          KEYWORDS="algebra cluster"
           ENTERED=20020524
+             DOCS=COPYING
             SHORT="Linear Algebra PACKage (C version)"
 cat << EOF
 LAPACK provides routines for solving systems of simultaneous 
diff --git a/cluster/clapack/HISTORY b/cluster/clapack/HISTORY
index 0ecc7510de..142e2bcd91 100644
--- a/cluster/clapack/HISTORY
+++ b/cluster/clapack/HISTORY
@@ -1,3 +1,9 @@
+2008-09-14 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* DETAILS: made the source checks unversioned #14719
+	  updated to 3.1.1, changed source directories
+	  added DOCS
+	* PRE_BUILD, BUILD, INSTALL: make it work again
+
 2006-06-29 Eric Sandall <sandalle@sourcemage.org>
 	* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
 	  Changed LICENSE to LICENSE[0]
diff --git a/cluster/clapack/INSTALL b/cluster/clapack/INSTALL
index ea2683928c..095e633c6a 100755
--- a/cluster/clapack/INSTALL
+++ b/cluster/clapack/INSTALL
@@ -1,16 +1,13 @@
 install -m 644 blas_LINUX.a    $INSTALL_ROOT/usr/lib/libblas.a      &&
 install -m 644 lapack_LINUX.a  $INSTALL_ROOT/usr/lib/liblapack.a    &&
 install -m 644 tmglib_LINUX.a  $INSTALL_ROOT/usr/lib/libtmglib.a    &&
-install -m 644 clapack.h       $INSTALL_ROOT/usr/include/clapack.h  &&
+install -m 644 INCLUDE/*.h $INSTALL_ROOT/usr/include/ &&
 
-install -d -m 755 $INSTALL_ROOT/usr/man/manl
-for file in `ls -1 man/manl/*` ; do
-  install -m 644 $file $INSTALL_ROOT/usr/man/manl
+install -d -m 755 $INSTALL_ROOT/usr/share/man/manl &&
+for file in lapack-$VERSION/manpages/man/manl/*; do
+  install -m 644 $file $INSTALL_ROOT/usr/share/man/manl
 done  &&
 
-for file in `ls -1 blas/man/manl/*` ; do
-  install -m 644 $file $INSTALL_ROOT/usr/man/manl
-done  &&
-
-gcc -o equivalence equivalence.c  &&
-install -m 755 equivalence  $INSTALL_ROOT/usr/bin
+for file in lapack-$VERSION/manpages/blas/man/manl/*; do
+  install -m 644 $file $INSTALL_ROOT/usr/share/man/manl
+done
diff --git a/cluster/clapack/PRE_BUILD b/cluster/clapack/PRE_BUILD
index f5548b53a9..b0d57810b5 100755
--- a/cluster/clapack/PRE_BUILD
+++ b/cluster/clapack/PRE_BUILD
@@ -1,4 +1,5 @@
 default_pre_build                   &&
 cd  $SOURCE_DIRECTORY               &&
 unpack_file 2                       &&
-cp INSTALL/make.inc.LINUX make.inc
+#cp INSTALL/make.inc.LINUX make.inc
+mv make.inc.example make.inc