a) Update to 3.5.22

b) added Opteron support but my machine is very unstable :(

5 files changed, 55 insertions, 41 deletions

diff --git a/math/atlas-devel/Makefile b/math/atlas-devel/Makefile
index acfb3313fa49..ed5b24159f04 100644
--- a/math/atlas-devel/Makefile
+++ b/math/atlas-devel/Makefile
@@ -9,7 +9,7 @@
 #       Program and compiler flags are finetuned to gcc 2.95/3.1.
 
 PORTNAME=	atlas
-PORTVERSION=	3.5.12
+PORTVERSION=	3.5.22
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	math-atlas
diff --git a/math/atlas-devel/distinfo b/math/atlas-devel/distinfo
index 2c04ac6819d4..2896c636d596 100644
--- a/math/atlas-devel/distinfo
+++ b/math/atlas-devel/distinfo
@@ -1 +1 @@
-MD5 (atlas3.5.12.tar.bz2) = cd86b9ac14517007575a6bd33322337c
+MD5 (atlas3.5.22.tar.bz2) = a19b18834a8bbe9aeeaea19e534892f1
diff --git a/math/atlas-devel/files/non-thread-patch b/math/atlas-devel/files/non-thread-patch
index 69c632a45b6a..742eb36f4d29 100644
--- a/math/atlas-devel/files/non-thread-patch
+++ b/math/atlas-devel/files/non-thread-patch
@@ -1,18 +1,19 @@
---- config.c.orig	Tue Jul  1 12:32:49 2003
-+++ config.c	Tue Jul  1 12:35:09 2003
-@@ -2737,6 +2737,7 @@
-       Use3DNow = IsYes('n', "   ", "Use 3DNow! for computation?");
+--- config.c.orig	Sun Dec 28 13:12:32 2003
++++ config.c	Sun Dec 28 13:15:07 2003
+@@ -3515,6 +3515,7 @@
     }
-    ncpu = ProbeNCPU(OS, mach, targ, TOPdir);
+    i = ncpu;
+    if (!ncpu) ncpu = ProbeNCPU(OS, mach, targ, TOPdir);
 +   ncpu = 1; // force non-threading
     if (ncpu != 1) /* user may want to thread */
     {
        DisplayFile("CONFIG/pthread.txt", stdout, NLINES);
-@@ -3154,6 +3155,7 @@
+@@ -3952,6 +3953,7 @@
+       USEDEFL1 = !IsYes('y', "", "Tune the Level 1 BLAS?");
     }
-    if (USEWINF77) strcpy(F77, "$(BINdir)/winf77.exe");
  
 +   fpout = fopen("ARCHNAME-NON-THREADED", "w");
     fprintf(fpout, "%s", ARCH);
     fclose(fpout);
     ATL_mprintf(2, fplog, stdout,"\nCreating make include file Make.%s\n", ARCH);
+
diff --git a/math/atlas-devel/files/patch-config.c b/math/atlas-devel/files/patch-config.c
index c3bb42b8a882..458bbbb4d032 100644
--- a/math/atlas-devel/files/patch-config.c
+++ b/math/atlas-devel/files/patch-config.c
@@ -1,15 +1,6 @@
---- config.c.orig	Mon Jun 23 07:58:35 2003
-+++ config.c	Tue Jul  1 12:32:49 2003
-@@ -708,7 +708,7 @@
-             else if (mach == IA64Itan || MachIsUS(mach) ||
-                      mach == Dec21164 || mach == Dec21264)
-             {
--               if (major == 3)
-+               if ((major == 2 && minor < 96) || (major == 3)) /* Nasty hack for FreeBSD/Alpha STABLE */
-                {
-                   strcpy(goodgcc, files[i]);
-                   return(0);
-@@ -1114,7 +1114,9 @@
+--- config.c.orig	Sun Dec 28 12:44:08 2003
++++ config.c	Sun Dec 28 12:54:09 2003
+@@ -1188,7 +1188,9 @@
     switch(OS)
     {
     case OSOSX:  /* don't know answer */
@@ -20,19 +11,30 @@
     case OSLinux:
        break;
     case OSSunOS:
-@@ -1252,6 +1254,11 @@
-                "-mcpu=ultrasparc -mtune=ultrasparc -fomit-frame-pointer -O3");
+@@ -1450,9 +1452,9 @@
+          if (THREADS && OS == OSFreeBSD)
+          {
+             if (which == CPF77)
+-               strcat(flag, " -pthread");
++               strcat(flag, " %%PTHREAD_LIBS%%");
+             else
+-               strcat(flag, " -pthread -D_REENTRANT -D_THREAD_SAFE");
++               strcat(flag, " %%PTHREAD_LIBS%%  %%PTHREAD_CFLAGS%%");
+          }
+          break;
+       case OSSunOS4:
+@@ -1984,8 +1986,8 @@
+       if (OS == OSFreeBSD)
+       {
+          if (strstr(comp, "cc"))
+-            strcat(flag, " -pthread -D_REENTRANT -D_THREAD_SAFE");
+-         else strcat(flag, " -pthread");
++            strcat(flag, " %%PTHREAD_LIBS%% %%PTHREAD_CFLAGS%%");
++         else strcat(flag, " %%PTHREAD_LIBS%%");
        }
-       if (OS == OSFreeBSD && F77) strcpy(F77, "f77");
-+      if (OS == OSFreeBSD && THREADS) { 
-+              strcat(F77FLAGS, "%%PTHREAD_CFLAGS%%");
-+              strcat(CCFLAGS, "%%PTHREAD_CFLAGS%%");
-+              strcat(MMFLAGS, "%%PTHREAD_CFLAGS%%");
-+     }
-       break;
-    case OSSunOS:
-       np = 3;
-@@ -2116,7 +2123,10 @@
+    }
+    return(*comp ? comp : NULL);
+@@ -2840,7 +2842,10 @@
           if (!CmndOneLine(targ, "sysctl hw.model", ln))
           {
              if (strstr(ln, "433au")) mach = Dec21164;
@@ -43,7 +45,7 @@
           }
           break;
        case LAIA64: /* don't know */
-@@ -2125,14 +2135,22 @@
+@@ -2849,14 +2854,22 @@
           if (!CmndOneLine(targ, "sysctl hw.model", ln))
           {
              if (strstr(ln, "Pentium Pro")) mach = IntPPRO;
@@ -58,20 +60,31 @@
 +            else if (strstr(ln, "Celeron(R)")) mach = IntPII;
              else if (strstr(ln, "Athlon")) mach = AmdAthlon;
              else if (strstr(ln, "AMD-K7")) mach = AmdAthlon;
-             else if (strstr(ln, "32 bit Hammer")) mach = AmdHammer32;
-             else if (strstr(ln, "64 bit Hammer")) mach = AmdHammer64;
+-            else if (strstr(ln, "32 bit Hammer")) mach = AmdHammer32;
+-            else if (strstr(ln, "64 bit Hammer")) mach = AmdHammer64;
++            else if (strstr(ln, "Opteron(tm)") && sizeof(void *)==4) mach = AmdHammer32;
++            else if (strstr(ln, "Opteron(tm)") && sizeof(void *)==8) mach = AmdHammer64;
              else if (strstr(ln, "Pentium/P55C")) mach = IntP5MMX; /* sent by */
              else if (strstr(ln, "Pentium")) mach=IntP5;       /* Nakata Maho */
 +            else mach = IntP5;
           }
           break;
        default:;
-@@ -3136,6 +3154,8 @@
+@@ -3939,6 +3952,8 @@
+       USEDEFL1 = !IsYes('y', "", "Tune the Level 1 BLAS?");
     }
-    if (USEWINF77) strcpy(F77, "$(BINdir)/winf77.exe");
  
 +   fprintf(fpout, "%s", ARCH);
 +   fclose(fpout);
     ATL_mprintf(2, fplog, stdout,"\nCreating make include file Make.%s\n", ARCH);
     sprintf(ln, "Make.%s", ARCH);
     fpout = fopen(ln, "w");
+@@ -4080,7 +4095,7 @@
+    if (THREADS)
+    {
+       fprintf(fpout, " -DATL_NCPU=%d", ncpu);
+-      if (OS == OSFreeBSD) fprintf(fpout, " -D_THREAD_SAFE -D_REENTRANT");
++      if (OS == OSFreeBSD) fprintf(fpout, " %%PTHREAD_CFLAGS%%");
+       if (OS == OSAIX) fprintf(fpout, " -DIBM_PT_ERROR");
+       if (OS == OSIRIX) fprintf(fpout, " -D_POSIX_C_SOURCE=199506L");
+    }
diff --git a/math/atlas-devel/files/thread-patch b/math/atlas-devel/files/thread-patch
index 4d1a00c71f47..e07813c4fc30 100644
--- a/math/atlas-devel/files/thread-patch
+++ b/math/atlas-devel/files/thread-patch
@@ -9,10 +9,10 @@
  char TARGNAM[512];
  enum MACHTYPE mach=MACHOther;
  
-@@ -2737,7 +2737,6 @@
-       Use3DNow = IsYes('n', "   ", "Use 3DNow! for computation?");
+@@ -3515,7 +3515,6 @@
     }
-    ncpu = ProbeNCPU(OS, mach, targ, TOPdir);
+    i = ncpu;
+    if (!ncpu) ncpu = ProbeNCPU(OS, mach, targ, TOPdir);
 -   ncpu = 1; // force non-threading
     if (ncpu != 1) /* user may want to thread */
     {