ATLAS is updated to version 3.3.15, so I updated the ports, too. And I fixed a miss at pkg-descr. How-To-Repeat: No.
State Changed From-To: open->feedback Please provide a Berkely Unified diff instead of a uuencoded tarball.
> Please provide a Berkely Unified diff instead of a uuencoded tarball. I understand, here it is! diff -ur atlas.org/Makefile atlas/Makefile --- atlas.org/Makefile Fri May 3 10:20:39 2002 +++ atlas/Makefile Fri May 3 10:20:07 2002 @@ -6,7 +6,7 @@ # PORTNAME= atlas -PORTVERSION= 3.3.14 +PORTVERSION= 3.3.15 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= math-atlas diff -ur atlas.org/distinfo atlas/distinfo --- atlas.org/distinfo Fri May 3 10:20:39 2002 +++ atlas/distinfo Thu May 2 18:22:10 2002 @@ -1 +1 @@ -MD5 (atlas3.3.14.tar.bz2) = f8b88b6033a553c445ef6a24f2109732 +MD5 (atlas3.3.15.tar.bz2) = 3a3a1944fd79d5023732cbb27dc24433 diff -ur atlas.org/pkg-descr atlas/pkg-descr --- atlas.org/pkg-descr Fri May 3 10:20:39 2002 +++ atlas/pkg-descr Thu May 2 18:23:57 2002 @@ -11,7 +11,7 @@ IT SIGNIFICANTLY IMPROVES PERFORMANCE. If you use blas, you can simply change flags when linking, -from -lblas to -lf77blas -latlas -lblas (order is important) +from -lblas to -lf77blas -latlas (order is important) get a significantly performance increase. LAPACK subroutines are partially implemented. -- Nakata Maho
I updated ATLAS port to version 3.3.15, and making shared library and BATCH installation. Please IGNORE earlier my patch. Following is new patch appled original (old) version of my port diff -urN atlas.org/Makefile atlas/Makefile --- atlas.org/Makefile Fri May 3 10:20:39 2002 +++ atlas/Makefile Sun May 5 08:05:36 2002 @@ -6,7 +6,7 @@ # PORTNAME= atlas -PORTVERSION= 3.3.14 +PORTVERSION= 3.3.15 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= math-atlas @@ -14,32 +14,41 @@ MAINTAINER= chat95@mbox.kyoto-inet.or.jp -BUILD_DEPENDS= ${LOCALBASE}/lib/liblapack.a:${PORTSDIR}/math/lapack +LIB_DEPENDS= lapack:${PORTSDIR}/math/lapack -IS_INTERACTIVE= yes USE_BZIP2= yes WRKSRC= ${WRKDIR}/ATLAS -NO_PACKAGE= "It is better to compile at the target machine." -NO_CDROM= "It is better to compile at the target machine." +INSTALLS_SHLIB= yes do-configure: +.if defined(BATCH) || defined(PACKAGE_BUILDING) + @(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} config < ${FILESDIR}/answer) +.else @(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} config) +.endif do-build: (cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=`cat ${WRKSRC}/ARCHNAME`) (cd ${WRKSRC}; ${MKDIR} tmp ; \ - ${CP} ${LOCALBASE}/lib/liblapack.a tmp ;\ - cd tmp ;\ - ar x liblapack.a ;\ - ar x ../lib/`cat ${WRKSRC}/ARCHNAME`/liblapack.a ;\ - ar r ../lib/`cat ${WRKSRC}/ARCHNAME`/libalapack.a *.o ;\ - ranlib ../lib/`cat ${WRKSRC}/ARCHNAME`/libalapack.a ) + ${CP} ${LOCALBASE}/lib/liblapack.a tmp ;\ + cd tmp ;\ + ar x liblapack.a ;\ + ar x ../lib/`cat ${WRKSRC}/ARCHNAME`/liblapack.a ;\ + ar r ../lib/`cat ${WRKSRC}/ARCHNAME`/libalapack.a *.o ;\ + ranlib ../lib/`cat ${WRKSRC}/ARCHNAME`/libalapack.a ) +.for i in libatlas libcblas libf77blas libtstatlas libalapack + ( cd ${WRKSRC}/lib/`cat ${WRKSRC}/ARCHNAME`/ ; \ + ld -Bshareable -o ${i}.so.1 -x -soname ${i}.so.1 --whole-archive ${i}.a ) +.endfor + do-install: - ${INSTALL_DATA} ${WRKSRC}/lib/`cat ${WRKSRC}/ARCHNAME`/libatlas.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/lib/`cat ${WRKSRC}/ARCHNAME`/libcblas.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/lib/`cat ${WRKSRC}/ARCHNAME`/libf77blas.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/lib/`cat ${WRKSRC}/ARCHNAME`/libtstatlas.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/lib/`cat ${WRKSRC}/ARCHNAME`/libalapack.a ${PREFIX}/lib +.for i in libatlas libcblas libf77blas libtstatlas libalapack + @${INSTALL_DATA} ${WRKSRC}/lib/`cat ${WRKSRC}/ARCHNAME`/${i}.a ${PREFIX}/lib + @${INSTALL_DATA} ${WRKSRC}/lib/`cat ${WRKSRC}/ARCHNAME`/${i}.so.1 ${PREFIX}/lib + @${LN} -sf ${i}.so.1 ${PREFIX}/lib/${i}.so +.endfor + @${INSTALL_DATA} ${WRKSRC}/include/cblas.h ${PREFIX}/include + @${INSTALL_DATA} ${WRKSRC}/include/clapack.h ${PREFIX}/include .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} diff -urN atlas.org/distinfo atlas/distinfo --- atlas.org/distinfo Fri May 3 10:20:39 2002 +++ atlas/distinfo Thu May 2 18:22:10 2002 @@ -1 +1 @@ -MD5 (atlas3.3.14.tar.bz2) = f8b88b6033a553c445ef6a24f2109732 +MD5 (atlas3.3.15.tar.bz2) = 3a3a1944fd79d5023732cbb27dc24433 diff -urN atlas.org/files/answer atlas/files/answer --- atlas.org/files/answer Thu Jan 1 09:00:00 1970 +++ atlas/files/answer Sun May 5 00:29:46 2002 @@ -0,0 +1,10 @@ + + + + + + + + + + diff -urN atlas.org/files/patch-aa atlas/files/patch-aa --- atlas.org/files/patch-aa Fri May 3 10:20:39 2002 +++ atlas/files/patch-aa Sun May 5 00:37:15 2002 @@ -1,6 +1,6 @@ ---- config.c.orig Sat Feb 2 10:57:44 2002 -+++ config.c Sun Mar 17 11:19:00 2002 -@@ -2050,6 +2050,7 @@ +--- config.c.orig Fri Apr 12 08:28:11 2002 ++++ config.c Sun May 5 00:37:04 2002 +@@ -2050,12 +2050,14 @@ if (!CmndOneLine(targ, "sysctl hw.model", ln)) { if (strstr(ln, "Pentium Pro")) mach = IntPPRO; @@ -8,7 +8,15 @@ else if (strstr(ln, "Pentium III")) mach = IntPIII; else if (strstr(ln, "Pentium II ")) mach = IntPII; else if (strstr(ln, "Athlon")) mach = AmdAthlon; -@@ -3018,6 +3019,9 @@ + else if (strstr(ln, "AMD-K7")) mach = AmdAthlon; + else if (strstr(ln, "Pentium/P55C")) mach = IntP5MMX; /* sent by */ +- else if (strstr(ln, "Pentium")) mach=IntP5; /* Nagata Maho */ ++ else if (strstr(ln, "Pentium")) mach=IntP5; /* Nakata Maho */ ++ else mach=IntP5; + } + break; + default:; +@@ -3025,6 +3027,9 @@ } if (USEWINF77) strcpy(F77, "$(BINdir)/winf77.exe"); diff -urN atlas.org/pkg-descr atlas/pkg-descr --- atlas.org/pkg-descr Fri May 3 10:20:39 2002 +++ atlas/pkg-descr Sun May 5 11:15:51 2002 @@ -11,11 +11,13 @@ IT SIGNIFICANTLY IMPROVES PERFORMANCE. If you use blas, you can simply change flags when linking, -from -lblas to -lf77blas -latlas -lblas (order is important) +from -lblas to -lf77blas -latlas (order is important) get a significantly performance increase. -LAPACK subroutines are partially implemented. -You change from -llapack to -lalapack to get better performance. +Some improved routines for LAPACK are merged into one library as libalapack. +It requres both C and Fortran77 interfaces, and thus that link line would be: +-lalapack -lf77blas -lcblas -latlas -lg2c -lm +Order *is* important, so -latlas -lcblas will *not* work. WWW: http://math-atlas.sourceforge.net/ - NAKATA, Maho diff -urN atlas.org/pkg-plist atlas/pkg-plist --- atlas.org/pkg-plist Fri May 3 10:20:39 2002 +++ atlas/pkg-plist Sun May 5 08:05:54 2002 @@ -1,8 +1,20 @@ -lib/libatlas.a +include/cblas.h +include/clapack.h lib/libalapack.a +lib/libalapack.so +lib/libalapack.so.1 +lib/libatlas.a +lib/libatlas.so +lib/libatlas.so.1 lib/libcblas.a +lib/libcblas.so +lib/libcblas.so.1 lib/libf77blas.a +lib/libf77blas.so +lib/libf77blas.so.1 lib/libtstatlas.a +lib/libtstatlas.so +lib/libtstatlas.so.1 %%PORTDOCS%%share/doc/atlas/AtlasCredits.txt %%PORTDOCS%%share/doc/atlas/ChangeLog.txt %%PORTDOCS%%share/doc/atlas/DirStruct.txt
State Changed From-To: feedback->closed Updated. Thanks!