* Fix bug listed in http://math-atlas.sourceforge.net/errata.html#RMAAT .

* Bump portrevision.
* Fix pkg-descr. Still do not pass portlint though.

Submitted by:	bf <bf2006a@yahoo.com>

6 files changed, 46 insertions, 1 deletions

diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index fc85aca17a68..477d27224e1c 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	atlas
 PORTVERSION=	3.8.0
+PORTREVISION=	1	
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/math/atlas/files/patch-interfaces+blas+C+src+cblas_cgemm.c b/math/atlas/files/patch-interfaces+blas+C+src+cblas_cgemm.c
new file mode 100644
index 000000000000..62182617c562
--- /dev/null
+++ b/math/atlas/files/patch-interfaces+blas+C+src+cblas_cgemm.c
@@ -0,0 +1,11 @@
+--- interfaces/blas/C/src/cblas_cgemm.c.orig	2008-01-16 09:19:46.679079259 -0500
++++ interfaces/blas/C/src/cblas_cgemm.c	2008-01-16 09:26:48.761814634 -0500
+@@ -148,7 +148,7 @@
+    if (A == B && M == N && TA != TB && lda == ldb && *bet == 0.0 &&
+        bet[1] == 0.0 && TA != CblasConjTrans && TB != CblasConjTrans)
+    {
+-      ATL_csyrk(CblasUpper, TA, N, K, alpha, A, lda, beta, C, ldc);
++      ATL_csyrk(CblasUpper, (Order == CblasColMajor)?TA:TB, N, K, alpha, A, lda, beta, C, ldc);
+       ATL_csyreflect(CblasUpper, N, C, ldc);
+       return;
+    }
diff --git a/math/atlas/files/patch-interfaces+blas+C+src+cblas_dgemm.c b/math/atlas/files/patch-interfaces+blas+C+src+cblas_dgemm.c
new file mode 100644
index 000000000000..d867577e29a6
--- /dev/null
+++ b/math/atlas/files/patch-interfaces+blas+C+src+cblas_dgemm.c
@@ -0,0 +1,11 @@
+--- interfaces/blas/C/src/cblas_dgemm.c.orig	2008-01-16 09:20:04.249403699 -0500
++++ interfaces/blas/C/src/cblas_dgemm.c	2008-01-16 09:28:30.250360804 -0500
+@@ -146,7 +146,7 @@
+  */
+    if (A == B && M == N && TA != TB && lda == ldb && beta == 0.0)
+    {
+-      ATL_dsyrk(CblasUpper, TA, N, K, alpha, A, lda, beta, C, ldc);
++      ATL_dsyrk(CblasUpper, (Order == CblasColMajor)?TA:TB, N, K, alpha, A, lda, beta, C, ldc);
+       ATL_dsyreflect(CblasUpper, N, C, ldc);
+       return;
+    }
diff --git a/math/atlas/files/patch-interfaces+blas+C+src+cblas_sgemm.c b/math/atlas/files/patch-interfaces+blas+C+src+cblas_sgemm.c
new file mode 100644
index 000000000000..21147298601e
--- /dev/null
+++ b/math/atlas/files/patch-interfaces+blas+C+src+cblas_sgemm.c
@@ -0,0 +1,11 @@
+--- interfaces/blas/C/src/cblas_sgemm.c.orig	2008-01-16 09:20:16.739501184 -0500
++++ interfaces/blas/C/src/cblas_sgemm.c	2008-01-16 09:29:45.572899283 -0500
+@@ -146,7 +146,7 @@
+  */
+    if (A == B && M == N && TA != TB && lda == ldb && beta == 0.0)
+    {
+-      ATL_ssyrk(CblasUpper, TA, N, K, alpha, A, lda, beta, C, ldc);
++      ATL_ssyrk(CblasUpper, (Order == CblasColMajor)?TA:TB, N, K, alpha, A, lda, beta, C, ldc);
+       ATL_ssyreflect(CblasUpper, N, C, ldc);
+       return;
+    }
diff --git a/math/atlas/files/patch-interfaces+blas+C+src+cblas_zgemm.c b/math/atlas/files/patch-interfaces+blas+C+src+cblas_zgemm.c
new file mode 100644
index 000000000000..b3c1112947ff
--- /dev/null
+++ b/math/atlas/files/patch-interfaces+blas+C+src+cblas_zgemm.c
@@ -0,0 +1,11 @@
+--- interfaces/blas/C/src/cblas_zgemm.c.orig	2008-01-16 09:20:22.356646659 -0500
++++ interfaces/blas/C/src/cblas_zgemm.c	2008-01-16 09:31:52.424584623 -0500
+@@ -148,7 +148,7 @@
+    if (A == B && M == N && TA != TB && lda == ldb && *bet == 0.0 &&
+        bet[1] == 0.0 && TA != CblasConjTrans && TB != CblasConjTrans)
+    {
+-      ATL_zsyrk(CblasUpper, TA, N, K, alpha, A, lda, beta, C, ldc);
++      ATL_zsyrk(CblasUpper, (Order == CblasColMajor)?TA:TB, N, K, alpha, A, lda, beta, C, ldc);
+       ATL_zsyreflect(CblasUpper, N, C, ldc);
+       return;
+    }
diff --git a/math/atlas/pkg-descr b/math/atlas/pkg-descr
index cd9ce82d1dd3..b4db288a0700 100644
--- a/math/atlas/pkg-descr
+++ b/math/atlas/pkg-descr
@@ -13,7 +13,7 @@ the usual -lblas.  Corresponding pure C versions of the ATLAS libraries are
 also included, in libcblas and libptcblas.
 
 The ATLAS-enhanced LAPACK routines are also provided.
-To link software with this library instead of the standard LAPACK, use 
+To link software with this library instead of the standard LAPACK, for example, use 
 -L/usr/local/lib/gcc-4.2.3 -L/usr/local/lib/gcc-4.2.3/gcc/i386-portbld-freebsd7.0/4.2.3 -lalapack -lf77blas -lcblas -latlas -lgfortranbegin -lgfortran -lm, or 
 -L/usr/local/lib/gcc-4.2.3 -L/usr/local/lib/gcc-4.2.3/gcc/i386-portbld-freebsd7.0/4.2.3 -lalapack_r -lptf77blas -lptcblas -latlas -lgfortranbegin -lgfortran
 -lm for the threaded library, in place of the usual -llapack.