Update to 3.7.28.

6 files changed, 34 insertions, 59 deletions

diff --git a/math/atlas-devel/Makefile b/math/atlas-devel/Makefile
index e0fd81f1fdc7..c5c7db38f0d9 100644
--- a/math/atlas-devel/Makefile
+++ b/math/atlas-devel/Makefile
@@ -9,8 +9,7 @@
 #       Program and compiler flags are finetuned to gcc.
 
 PORTNAME=	atlas
-PORTVERSION=	3.7.24
-PORTREVISION=	4
+PORTVERSION=	3.7.28
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	math-atlas
@@ -83,16 +82,18 @@ pre-configure:
 
 do-configure:
 #non threaded
+#dummy f77lib, it is not used.
 	${MKDIR} ${WRKSRC}/NON_THREADED ; cd ${WRKSRC}/NON_THREADED ; \
-		../configure -t 0
+		../configure -t 0 -Si cputhrchk 0 -Ss f77lib " "
 	${MKDIR} ${WRKSRC}/NON_THREADED_PIC ; cd ${WRKSRC}/NON_THREADED_PIC ; \
-		../configure -t 0 -Fa al '${PICFLAG} -DPIC'
+		../configure -t 0 -Fag al '${PICFLAG} -DPIC' -Si cputhrchk 0 -Ss f77lib " "
 #threaded
+#dummy f77lib, it is not used.
 	cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/thread-patch
 	${MKDIR} ${WRKSRC}/THREADED ; cd ${WRKSRC}/THREADED ; \
-		../configure -Fa al '${PTHREAD_CFLAGS} '
+		../configure -Fag al '${PTHREAD_CFLAGS} ' -Si cputhrchk 0 -Ss f77lib " "
 	${MKDIR} ${WRKSRC}/THREADED_PIC ; cd ${WRKSRC}/THREADED_PIC ; \
-		../configure -Fa al '${PTHREAD_CFLAGS} ${PICFLAG} -DPIC'
+		../configure -Fag al '${PTHREAD_CFLAGS} ${PICFLAG} -DPIC' -Si cputhrchk 0 -Ss f77lib " "
 
 do-build:
 # make lapack
diff --git a/math/atlas-devel/distinfo b/math/atlas-devel/distinfo
index 49da3766780d..cf07dd5a6740 100644
--- a/math/atlas-devel/distinfo
+++ b/math/atlas-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (atlas3.7.24.tar.bz2) = c9e54c65714afab0007102245860bbf5
-SHA256 (atlas3.7.24.tar.bz2) = 10436b1aa642d0bd041170db683c119a9581ee5325fed2dc8113f34a2f11f8e4
-SIZE (atlas3.7.24.tar.bz2) = 1776317
+MD5 (atlas3.7.28.tar.bz2) = a19cc6bb5a499de184bbee8768974bc2
+SHA256 (atlas3.7.28.tar.bz2) = 80548ea9df77c0623ed08eafe2105af429b87dd88d2c228653a836865cfdad44
+SIZE (atlas3.7.28.tar.bz2) = 2097885
diff --git a/math/atlas-devel/files/Makefile.test b/math/atlas-devel/files/Makefile.test
index 829fb2960b32..ef631193e37d 100644
--- a/math/atlas-devel/files/Makefile.test
+++ b/math/atlas-devel/files/Makefile.test
@@ -15,11 +15,11 @@ ALLTESTS_PT =	xsl3blastst_pt xdl3blastst_pt xcl3blastst_pt xzl3blastst_pt \
 test:
 	@for i in ${ALLTESTS} ; do \
 		${ECHO_CMD} "Making $${i}" ; \
-		cd ${WRKDIR}/ATLAS/NON_THREADED_PIC/bin ; ${GMAKE} $${i} ; \
+		cd ${WRKDIR}/ATLAS/NON_THREADED_PIC/bin ; ${MAKE} $${i} ; \
 	done
 	@for i in ${ALLTESTS_PT} ; do \
 		${ECHO_CMD} "Making $${i}" ; \
-		cd ${WRKDIR}/ATLAS/THREADED_PIC/bin ; ${GMAKE} $${i} ; \
+		cd ${WRKDIR}/ATLAS/THREADED_PIC/bin ; ${MAKE} $${i} ; \
 	done
 	@for i in ${ALLTESTS} ; do \
 		${ECHO_CMD} "Benchmarking $${i}" ; \
diff --git a/math/atlas-devel/files/patch-CONFIG+src+backend+archinfo_freebsd.c b/math/atlas-devel/files/patch-CONFIG+src+backend+archinfo_freebsd.c
index 79c199b81583..eb8bb07d29e9 100644
--- a/math/atlas-devel/files/patch-CONFIG+src+backend+archinfo_freebsd.c
+++ b/math/atlas-devel/files/patch-CONFIG+src+backend+archinfo_freebsd.c
@@ -1,6 +1,6 @@
---- CONFIG/src/backend/archinfo_freebsd.c.orig	Tue Dec 19 06:47:11 2006
-+++ CONFIG/src/backend/archinfo_freebsd.c	Wed Dec 27 11:29:26 2006
-@@ -73,15 +73,26 @@
+--- CONFIG/src/backend/archinfo_freebsd.c.orig	Wed Jan 31 06:30:00 2007
++++ CONFIG/src/backend/archinfo_freebsd.c	Thu Feb  8 16:37:05 2007
+@@ -73,13 +73,24 @@
        }
        break;
     case AFSPARC: /* don't know */
@@ -14,20 +14,16 @@
 +      }
        break;
     case AFALPHA:
--      #if 0
+       #if 0
        if (!CmndOneLine(NULL, "sysctl hw.model", res))
        {
-+#if 0
           if (strstr(res, "433au")) mach = Dec21164;
 +         else if (strstr(res, "500au")) mach = Dec21164;
 +         else if (strstr(res, "AlphaPC 164")) mach = Dec21164;
           else if (strstr(res, "XP1000")) mach = Dec21264;
 +         else mach = Dec21264;
-+#endif
        }
--      #endif
-       break;
-    case AFIA64: /* don't know */
+       #endif
        break;
 @@ -89,15 +100,33 @@
        if (!CmndOneLine(NULL, "sysctl hw.model", res))
@@ -72,31 +68,9 @@
     int mhz=0;
     char res[1024];
 -   if (!CmndOneLine(NULL, "sysctl hw.cpufrequency", res) )
--      mhz = GetFirstLong(res) / 1000000;
+-      mhz = GetFirstDouble(res) / 1000000;
 +   if (!CmndOneLine(NULL, "sysctl kern.timecounter.choice dev.cpu.0.freq | grep dev", res) ) //requires cpufreq.ko
-+      mhz = GetLastInt(res);
++   mhz = GetLastInt(res);
     return(mhz);
  }
  
-@@ -166,20 +195,7 @@
-  * RETURNS: 1 if cpu throttling is detected, 0 otherwise
-  */
- {
--   int iret=0;
--   int imax=0, imin=0, icur=0;
--   char res[1024];
--
--   if (!CmndOneLine(NULL, "sysctl hw.cpufrequency_max", res) )
--      imax = GetFirstInt(res);
--   if (!CmndOneLine(NULL, "sysctl hw.cpufrequency_min", res) )
--      imin = GetFirstInt(res);
--   if (imax)
--   {
--      if (imax != imin)
--         iret = 1;
--   }
--   return(iret);
-+  return 0;
- }
- 
- main(int nargs, char **args)
diff --git a/math/atlas-devel/files/thread-patch b/math/atlas-devel/files/thread-patch
index 693b6e56979c..ea23f566a144 100644
--- a/math/atlas-devel/files/thread-patch
+++ b/math/atlas-devel/files/thread-patch
@@ -1,12 +1,12 @@
---- CONFIG/src/SpewMakeInc.c~	Sat Jan  6 13:50:21 2007
-+++ CONFIG/src/SpewMakeInc.c	Sat Jan  6 13:51:54 2007
-@@ -311,7 +311,8 @@
-             &mhz, &ptrbits, &ncpu, comps, &outfile, &srcdir, &blddir, &USEDEFL1,
-             &USEARCHDEF, &nof77, &f2cdefs, &cdefs, &pmake, &flapack,
-             &smaflags, &dmaflags, &l2size, &targ);
+--- CONFIG/src/SpewMakeInc.c~	Fri Feb 16 11:40:19 2007
++++ CONFIG/src/SpewMakeInc.c	Fri Feb 16 11:41:06 2007
+@@ -332,7 +332,8 @@
+             &mhz, &ptrbits, &ncpu, comps, &gccflags, &outfile, &srcdir,
+             &blddir, &USEDEFL1, &USEARCHDEF, &nof77, &f2cdefs, &cdefs, &pmake,
+             &flapack, &smaflags, &dmaflags, &f77lib, &l2size, &targ);
 -   if (ncpu > 1) THREADS = 1;
-+/*   if (ncpu > 1) THREADS = 1; */
-+   THREADS = 1;
++ /*   if (ncpu > 1) THREADS = 1; */
++    THREADS = 1;
     if (!outfile)
        fpout = stdout;
     else
diff --git a/math/atlas-devel/pkg-plist b/math/atlas-devel/pkg-plist
index 66efae828a18..d290c3e26bd5 100644
--- a/math/atlas-devel/pkg-plist
+++ b/math/atlas-devel/pkg-plist
@@ -40,13 +40,13 @@ lib/libptf77blas.so
 %%PORTDOCS%%share/doc/atlas/TestTime.txt
 %%PORTDOCS%%share/doc/atlas/TroubleShoot.txt
 %%PORTDOCS%%share/doc/atlas/Windows.txt
-%%PORTDOCS%%share/doc/atlas/atlas_contrib.ps
-%%PORTDOCS%%share/doc/atlas/atlas_devel.ps
-%%PORTDOCS%%share/doc/atlas/atlas_over.ps
-%%PORTDOCS%%share/doc/atlas/cblas.ps
-%%PORTDOCS%%share/doc/atlas/cblasqref.ps
-%%PORTDOCS%%share/doc/atlas/f77blasqref.ps
-%%PORTDOCS%%share/doc/atlas/lapackqref.ps
+%%PORTDOCS%%share/doc/atlas/atlas_contrib.pdf
+%%PORTDOCS%%share/doc/atlas/atlas_devel.pdf
+%%PORTDOCS%%share/doc/atlas/atlas_over.pdf
+%%PORTDOCS%%share/doc/atlas/cblas.pdf
+%%PORTDOCS%%share/doc/atlas/cblasqref.pdf
+%%PORTDOCS%%share/doc/atlas/f77blasqref.pdf
+%%PORTDOCS%%share/doc/atlas/lapackqref.pdf
 %%PORTDOCS%%@dirrm share/doc/atlas
 %%EXAMPLESDIR%%/xcl1blastst
 %%EXAMPLESDIR%%/xcl2blastst