aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaho <maho@FreeBSD.org>2008-06-12 15:28:33 +0800
committermaho <maho@FreeBSD.org>2008-06-12 15:28:33 +0800
commitb0fab628b70b02859581e1afeee9ca3e73d1feb4 (patch)
tree16f88b4dc819938ad2ddda0e6d1bd15b4943e293
parent7d8d62f25a6ccf8367965360848fe9ec572550ad (diff)
downloadfreebsd-ports-gnome-b0fab628b70b02859581e1afeee9ca3e73d1feb4.tar.gz
freebsd-ports-gnome-b0fab628b70b02859581e1afeee9ca3e73d1feb4.tar.zst
freebsd-ports-gnome-b0fab628b70b02859581e1afeee9ca3e73d1feb4.zip
Update to 3.8.2.
Submitted by: Kengo Ichiki <ichiki@ualberta.ca> Slightly modified so that his patches fit ports policy.
-rw-r--r--math/atlas/Makefile3
-rw-r--r--math/atlas/distinfo6
-rw-r--r--math/atlas/files/patch-CONFIG+src+atlcomp.txt24
-rw-r--r--math/atlas/files/patch-CONFIG+src+backend+archinfo_x86.c10
-rw-r--r--math/atlas/files/patch-interfaces+blas+C+src+cblas_cgemm.c11
-rw-r--r--math/atlas/files/patch-interfaces+blas+C+src+cblas_dgemm.c11
-rw-r--r--math/atlas/files/patch-interfaces+blas+C+src+cblas_sgemm.c11
-rw-r--r--math/atlas/files/patch-interfaces+blas+C+src+cblas_zgemm.c11
8 files changed, 18 insertions, 69 deletions
diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index 477d27224e1c..8ecc07856a86 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= atlas
-PORTVERSION= 3.8.0
-PORTREVISION= 1
+PORTVERSION= 3.8.2
PORTEPOCH= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
diff --git a/math/atlas/distinfo b/math/atlas/distinfo
index 3d44c165dd5b..3e8873f95b9e 100644
--- a/math/atlas/distinfo
+++ b/math/atlas/distinfo
@@ -1,3 +1,3 @@
-MD5 (atlas3.8.0.tar.bz2) = fd42a00f36243bf4815d035b226ec305
-SHA256 (atlas3.8.0.tar.bz2) = e9131d8ffd2dfdd12312676e38183ca45a52547fad5498e46f90c95954bf121c
-SIZE (atlas3.8.0.tar.bz2) = 2463051
+MD5 (atlas3.8.2.tar.bz2) = dd888f5d066c1fafeaaf2ae6b37e0b85
+SHA256 (atlas3.8.2.tar.bz2) = 861d37a4ec91fbe8614fa83df7c81b73b95b54c93a9e8cb71d9ac7f7ef756bab
+SIZE (atlas3.8.2.tar.bz2) = 2468393
diff --git a/math/atlas/files/patch-CONFIG+src+atlcomp.txt b/math/atlas/files/patch-CONFIG+src+atlcomp.txt
index f8c635170767..ac448cb86bd9 100644
--- a/math/atlas/files/patch-CONFIG+src+atlcomp.txt
+++ b/math/atlas/files/patch-CONFIG+src+atlcomp.txt
@@ -1,6 +1,6 @@
---- CONFIG/src/atlcomp.txt.orig 2007-10-11 05:40:21.000000000 +0900
-+++ CONFIG/src/atlcomp.txt 2007-10-29 11:11:54.000000000 +0900
-@@ -40,57 +40,57 @@
+--- CONFIG/src/atlcomp.txt.orig Fri Feb 22 09:38:51 2008
++++ CONFIG/src/atlcomp.txt Sat Jun 7 11:09:05 2008
+@@ -40,41 +40,41 @@
#
# Core2Solo and Core2Duo
MACH=Core2Solo,Core2Duo OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc,icc
@@ -17,6 +17,13 @@
MACH=CoreSolo,CoreDuo OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc,icc
- 'gcc' '-fomit-frame-pointer -O3 -mfpmath=387'
+ '%%CC%%' '-fomit-frame-pointer -O3 -mfpmath=387'
+ # 3rd generation opteron (Barcelona and descendents)
+ MACH=AMD64K10h OS=ALL LVL=1000 COMPS=f77
+- 'gfortran' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2 -falign-loops=32'
++ '%%FC%%' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2 -falign-loops=32'
+ MACH=AMD64K10h OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc,icc
+- 'gcc' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2 -falign-loops=32'
++ '%%CC%%' '-fomit-frame-pointer -mfpmath=sse -msse3 -O2 -falign-loops=32'
# UltraSPARC III & IV
MACH=USIII,USIV OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc
- 'gcc' '-mcpu=ultrasparc3 -mtune=ultrasparc3 -O3 -funroll-all-loops'
@@ -49,12 +56,9 @@
#
# IRIX/MIPS
#
- MACH=MIPSR1xK OS=IRIX LVL=1000 COMPS=smc,dmc,skc,dkc
-- 'cc' '-O3 -OPT:Olimit=15000 -LNO:blocking=OFF -LOPT:alias=typed'
-+ '%%CC%%' '-O3 -OPT:Olimit=15000 -LNO:blocking=OFF -LOPT:alias=typed'
+@@ -83,19 +83,19 @@
MACH=MIPSR1xK OS=IRIX LVL=1000 COMPS=icc,xcc
-- 'cc' '-O2 -OPT:Olimit=15000 -LNO:blocking=OFF'
-+ '%%CC%%' '-O2 -OPT:Olimit=15000 -LNO:blocking=OFF'
+ '%%CC%%' '-O2 -OPT:Olimit=15000 -LNO:blocking=OFF'
MACH=MIPSR1xK OS=IRIX LVL=1000 COMPS=f77
- 'f77' '-O2'
+ '%%FC%%' '-O2'
@@ -76,7 +80,7 @@
#
# OS X / PowerPC970; the
-@@ -99,19 +99,19 @@
+@@ -104,19 +104,19 @@
# performance by removing them (for all PowerPC platforms)
#
MACH=PPCG5 OS=OSX LVL=1001 COMPS=icc,smc,dmc,skc,dkc,xcc
@@ -102,7 +106,7 @@
MACH=POWER4 OS=ALL LVL=1010 COMPS=f77
'xlf' '-qtune=pwr4 -qarch=pwr4 -O3 -qmaxmem=-1 -qfloat=hsflt'
#
-@@ -131,10 +131,10 @@
+@@ -136,10 +136,10 @@
# Generic defaults
#
MACH=ALL OS=ALL LVL=5 COMPS=icc,smc,dmc,skc,dkc,xcc
diff --git a/math/atlas/files/patch-CONFIG+src+backend+archinfo_x86.c b/math/atlas/files/patch-CONFIG+src+backend+archinfo_x86.c
deleted file mode 100644
index f593ba87f93e..000000000000
--- a/math/atlas/files/patch-CONFIG+src+backend+archinfo_x86.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- CONFIG/src/backend/archinfo_x86.c~ Tue Dec 19 06:47:11 2006
-+++ CONFIG/src/backend/archinfo_x86.c Wed Dec 27 12:05:00 2006
-@@ -281,6 +281,7 @@
- case 9:
- case 13:
- iret = IntPM;
-+ break;
- case 14:
- iret = IntCoreDuo;
- break;
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
deleted file mode 100644
index 62182617c562..000000000000
--- a/math/atlas/files/patch-interfaces+blas+C+src+cblas_cgemm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index d867577e29a6..000000000000
--- a/math/atlas/files/patch-interfaces+blas+C+src+cblas_dgemm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 21147298601e..000000000000
--- a/math/atlas/files/patch-interfaces+blas+C+src+cblas_sgemm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index b3c1112947ff..000000000000
--- a/math/atlas/files/patch-interfaces+blas+C+src+cblas_zgemm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
- }