Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory 
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12952/10.7/stable/main/finkinfo/sci

Modified Files:
        arpack-ng.info 
Added Files:
        arpack-ng-mpi-3.1.2.info arpack-ng-mpi.info 
Log Message:
3.1.3's MPI build wants a LAPACK symbol which isn't in Accelerate.
3.1.2's MPI build doesn't, so continue to provide arpack-ng-mpi at that version.
3.1.3's MPI build also seems not to bring in libmpi_f77 by default, so add that
in.
C/R fixes all around.


Index: arpack-ng.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/arpack-ng.info,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- arpack-ng.info      7 Apr 2013 16:54:51 -0000       1.25
+++ arpack-ng.info      7 Apr 2013 23:46:30 -0000       1.26
@@ -1,8 +1,8 @@
 Info2: <<
-Package: arpack-ng%type_pkg[-mpi]%type_pkg[-lapack]
+Package: arpack-ng%type_pkg[-lapack]
 Version: 3.1.3
-Revision: 1
-Type: -lapack (-atlas -ref .), -mpi (boolean), gcc(4.8), lapack (3.4.2)
+Revision: 2
+Type: -lapack (-atlas -ref .), gcc(4.8), lapack (3.4.2)
 
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
 Description: Solve large scale eigenvalue problems
@@ -35,17 +35,28 @@
 (%type_raw[-lapack] = -atlas) atlas (>=3.10.1-1),
 (%type_raw[-lapack] = -ref) lapack%type_pkg[lapack],
 fink (>=0.30.0),
-gcc%type_pkg[gcc]-compiler,
-(%type_raw[-mpi] != .) openmpi
+gcc%type_pkg[gcc]-compiler
 <<
 Depends: %N-shlibs (= %v-%r )
 Conflicts: <<
-       %{Ni}, %{Ni}-atlas, %{Ni}-ref,
-       %{Ni}-mpi, %{Ni}-mpi-atlas, %{Ni}-mpi-ref,
-       arpack, arpack-atlas
+       %{Ni}, 
+       %{Ni}-atlas, 
+       %{Ni}-ref,
+       %{Ni}-mpi, 
+       %{Ni}-mpi-atlas, 
+       %{Ni}-mpi-ref,
+       arpack, 
+       arpack-atlas
 <<
 Replaces: <<
-       %{Ni}, %{Ni}-atlas, %{Ni}, %{Ni}-atlas, %{Ni}-mpi, %{Ni}-mpi-atlas, 
arpack, arpack-atlas
+       %{Ni}, 
+       %{Ni}-atlas, 
+       %{Ni}-ref, 
+       %{Ni}-mpi, 
+       %{Ni}-mpi-atlas, 
+       %{Ni}-mpi-ref, 
+       arpack, 
+       arpack-atlas
 <<
 
 PatchScript: <<
@@ -65,24 +76,18 @@
 SetLDFLAGS: -Wl,-dead_strip_dylibs
 
 ConfigureParams: <<
-(%type_raw[-lapack] = .) --with-blas='-Wl,-framework,Accelerate' \
-(%type_raw[-lapack] = .) --with-lapack='-Wl,-framework,Accelerate' \
-(%type_raw[-lapack] = -atlas) --with-blas='-ltatlas' \
-(%type_raw[-lapack] = -atlas) --with-lapack='-ltatlas' \
-(%type_raw[-lapack] = -ref) --with-blas='-L%p/lib/lapack/%type_raw[lapack] 
-lrefblas' \
-(%type_raw[-lapack] = -ref) --with-lapack='-L%p/lib/lapack/%type_raw[lapack] 
-lreflapack' \
-(%type_raw[-mpi] = -mpi) --enable-mpi \
---disable-static
+       (%type_raw[-lapack] = .) --with-blas='-Wl,-framework,Accelerate' \
+       (%type_raw[-lapack] = .) --with-lapack='-Wl,-framework,Accelerate' \
+       (%type_raw[-lapack] = -atlas) --with-blas='-ltatlas' \
+       (%type_raw[-lapack] = -atlas) --with-lapack='-ltatlas' \
+       (%type_raw[-lapack] = -ref) 
--with-blas='-L%p/lib/lapack/%type_raw[lapack] -lrefblas' \
+       (%type_raw[-lapack] = -ref) 
--with-lapack='-L%p/lib/lapack/%type_raw[lapack] -lreflapack' \
+       --disable-static
 <<
 
 CompileScript: <<
        #!/bin/sh -ev
        export F77=%p/bin/gfortran-fsf-%type_raw[gcc]
-       if [ "%type_raw[-mpi]" = "-mpi" ] 
-       then 
-               export MPIF77=%p/bin/mpif77
-               export LDFLAGS=$LDFLAGS" -L%p/lib/openmpi"
-       fi
        if [ "%type_raw[-lapack]" = "." ]  
                then export FFLAGS='-ff2c'
        fi
@@ -123,14 +128,28 @@
            (%type_raw[-mpi] = -mpi) %p/lib/libparpack.2.dylib 3.0.0 %n 
(>=3.1.0-1)
        <<
        Depends: <<
-       (%type_raw[-lapack] = -atlas ) atlas-shlibs (>=3.10.1-1), 
-       (%type_raw[-lapack] = -ref) lapack%type_pkg[lapack]-shlibs,
-       gcc%type_pkg[gcc]-shlibs
+               (%type_raw[-lapack] = -atlas ) atlas-shlibs (>=3.10.1-1), 
+               (%type_raw[-lapack] = -ref) lapack%type_pkg[lapack]-shlibs,
+               gcc%type_pkg[gcc]-shlibs
+       <<
+       Conflicts: <<
+               %{Ni}-shlibs,
+               %{Ni}-atlas-shlibs,
+               %{Ni}-ref-shlibs,
+               %{Ni}-mpi-shlibs, 
+               %{Ni}-mpi-atlas-shlibs,
+               %{Ni}-mpi-ref-shlibs
+       <<
+       Replaces: <<
+               %{Ni}-shlibs,
+               %{Ni}-atlas-shlibs,
+               %{Ni}-ref-shlibs,
+               %{Ni}-mpi-shlibs, 
+               %{Ni}-mpi-atlas-shlibs,
+               %{Ni}-mpi-ref-shlibs
        <<
-       Conflicts: %{Ni}-shlibs, %{Ni}-atlas-shlibs, %{Ni}-mpi-shlibs, 
%{Ni}-mpi-atlas-shlibs
-       Replaces: %{Ni}-shlibs, %{Ni}-atlas-shlibs, %{Ni}-mpi-shlibs, 
%{Ni}-mpi-atlas-shlibs
        DescDetail: <<
-       This package contains the shared libraries.
+               This package contains the shared libraries.
        <<
        DocFiles: COPYING
 <<

--- NEW FILE: arpack-ng-mpi-3.1.2.info ---
Info2: <<
Package: arpack-ng-mpi
Version: 3.1.2
Revision: 2
Type: gcc (4.8)

Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
Description: Solve large scale eigenvalue problems
DescDetail: <<
ARPACK is a collection of Fortran77 subroutines designed to solve large scale
eigenvalue problems.  It began at Rice university:
http://www.caam.rice.edu/software/ARPACK

The arpack-ng project is a joint project between Debian, Octave and Scilab in 
order to provide a common and maintained version of arpack.

Because no single release has been published by Rice university for the last 
decade and since many software packages (Octave, Scilab, R, Matlab...) have 
forked it and implemented their own modifications, arpack-ng aims to tackle 
this issue by providing a common repository and maintained version.
<<
DescUsage: <<
This package contains static libraries, an unversioned dylib, Fortran 
examples, and documentation.
<<

BuildDependsOnly: true
Homepage:  http://forge.scilab.org/index.php/p/arpack-ng/
License: BSD

Source: http://forge.scilab.org/upload/%{Ni}/files/%{Ni}_%v.tar.gz
Source-MD5: 7644e234f219ec1a29849b6d7811a6b1

SourceDirectory: %{Ni}_%v

BuildDepends: <<
        fink (>=0.30.0),
        gcc%type_pkg[gcc]-compiler,
        openmpi
<<
Depends: %N-shlibs (= %v-%r )
Conflicts: <<
        arpack-ng, 
        arpack-ng-atlas, 
        arpack-ng-ref,
        %{Ni}-atlas, 
        %{Ni}-ref,
        arpack, 
        arpack-atlas
<<
Replaces: << 
        %{Ni}-atlas, 
        %{Ni}-ref,
        arpack-ng, 
        arpack-ng-atlas, 
        arpack-ng-ref, 
        arpack, 
        arpack-atlas
<<

PatchScript: perl -pi -e 's|/usr|%p|; s/3\.0\.2/%v/' arpack.pc

SetLDFLAGS: -Wl,-dead_strip_dylibs

ConfigureParams: <<
        --with-blas='-Wl,-framework,Accelerate' \
        --with-lapack='-Wl,-framework,Accelerate' \
        --enable-mpi \
        --disable-static
<<

CompileScript: <<
        #!/bin/sh -ev
        export F77=%p/bin/gfortran-fsf-%type_raw[gcc]
        export MPIF77=%p/bin/mpif77
        export LDFLAGS=$LDFLAGS" -L%p/lib/openmpi"
        export FFLAGS='-ff2c'
        %{default_script}
<<

InstallScript:  <<
        #!/bin/sh -ev
        make install DESTDIR=%d
        # manually install headers
        mkdir -p %i/include/arpack
        cp SRC/*.h %i/include/arpack
        # copy PARPACK docs manually
        mkdir -p %i/share/doc/%n/PARPACK
        cp -r PARPACK_CHANGES %i/share/doc/%n/
        cp -r PARPACK/EXAMPLES %i/share/doc/%n/PARPACK
<<

DocFiles: CHANGES DOCUMENTS EXAMPLES  README TODO COPYING
DescPackaging:  <<
        Needs a gfortran; we're going with gcc48.

        Needs -ff2c when using Accelerate.framework, but not when using
        ATLAS or the reference LAPACK.
        
        We can actually disable parpack now.  Only copy the PARPACK docs
        for the -mpi variants.
<<

Splitoff: <<
        Package: %N-shlibs
        Files: lib/lib*arpack.2.dylib
        Shlibs: <<
                %p/lib/libarpack.2.dylib 3.0.0 %n (>=3.0.1-1)
            %p/lib/libparpack.2.dylib 3.0.0 %n (>=3.1.0-1)
        <<
        Depends: <<
                gcc%type_pkg[gcc]-shlibs
        <<
        Conflicts: <<
                %{Ni}-atlas-shlibs,
                %{Ni}-ref-shlibs,
                arpack-ng-shlibs, 
                arpack-ng-atlas-shlibs,
                arpack-ng-ref-shlibs
        <<
        Replaces: <<
                %{Ni}-atlas-shlibs,
                %{Ni}-ref-shlibs,
                arpack-ng-shlibs, 
                arpack-ng-atlas-shlibs,
                arpack-ng-ref-shlibs
        <<
        DescDetail: <<
                This package contains the shared libraries.
        <<
        DocFiles: COPYING
<<
<<

--- NEW FILE: arpack-ng-mpi.info ---
Info2: <<
Package: arpack-ng-mpi%type_pkg[-lapack]
Version: 3.1.3
Revision: 2
Type: -lapack (-atlas -ref), gcc(4.8), lapack (3.4.2)

Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
Description: Solve large scale eigenvalue problems
DescDetail: <<
ARPACK is a collection of Fortran77 subroutines designed to solve large scale
eigenvalue problems.  It began at Rice university:
http://www.caam.rice.edu/software/ARPACK

The arpack-ng project is a joint project between Debian, Octave and Scilab in 
order to provide a common and maintained version of arpack.

Because no single release has been published by Rice university for the last 
decade and since many software packages (Octave, Scilab, R, Matlab...) have 
forked it and implemented their own modifications, arpack-ng aims to tackle 
this issue by providing a common repository and maintained version.
<<
DescUsage: <<
This package contains static libraries, an unversioned dylib, Fortran 
examples, and documentation.
<<

BuildDependsOnly: true
Homepage:  http://forge.scilab.org/index.php/p/arpack-ng/
License: BSD

Source: http://forge.scilab.org/upload/%{Ni}/files/%{Ni}-%v.tar.gz
Source-MD5: 90ba42eae70b517ebdb72921cb4186df

BuildDepends: <<
        (%type_raw[-lapack] = -atlas) atlas (>=3.10.1-1),
        (%type_raw[-lapack] = -ref) lapack%type_pkg[lapack],
        fink (>=0.30.0),
        gcc%type_pkg[gcc]-compiler,
        openmpi
<<
Depends: %N-shlibs (= %v-%r )
Conflicts: <<
        arpack-ng, 
        arpack-ng-atlas, 
        arpack-ng-ref,
        %{Ni}, 
        %{Ni}-atlas, 
        %{Ni}-ref,
        arpack, 
        arpack-atlas
<<
Replaces: <<
        %{Ni}, 
        %{Ni}-atlas, 
        %{Ni}-ref,
        arpack-ng, 
        arpack-ng-atlas, 
        arpack-ng-ref, 
        arpack, 
        arpack-atlas
<<

PatchScript: <<
        #!/bin/sh -ev
        perl -pi -e 's|force_load,|force_load |g' configure
        case %type_raw[lapack] in
                -atlas)
                        subst="-latlas" ;;
                -ref)
                        subst="-L%p/lib/lapack/%type_pkg[lapack] -lrefblas 
-lreflapack" ;;
        esac
        perl -pi -e "s/-larpack -lblas -latlas/$subst/" arpack.pc.in 
<<

SetLDFLAGS: -Wl,-dead_strip_dylibs

ConfigureParams: <<
        (%type_raw[-lapack] = -atlas) --with-blas='-ltatlas' \
        (%type_raw[-lapack] = -atlas) --with-lapack='-ltatlas' \
        (%type_raw[-lapack] = -ref) 
--with-blas='-L%p/lib/lapack/%type_raw[lapack] -lrefblas' \
        (%type_raw[-lapack] = -ref) 
--with-lapack='-L%p/lib/lapack/%type_raw[lapack] -lreflapack' \
        --enable-mpi \
        --disable-static
<<

CompileScript: <<
        #!/bin/sh -ev
        export F77=%p/bin/gfortran-fsf-%type_raw[gcc]
        export MPIF77=%p/bin/mpif77
        export LDFLAGS=$LDFLAGS" -L%p/lib/openmpi"
        export LIBS=-lmpi_f77
        %{default_script}
<<

InstallScript:  <<
        #!/bin/sh -ev
        make install DESTDIR=%d
        # manually install headers
        mkdir -p %i/include/arpack
        cp SRC/*.h %i/include/arpack
        # copy PARPACK docs manually
        mkdir -p %i/share/doc/%n/PARPACK
        cp -r PARPACK_CHANGES %i/share/doc/%n/
        cp -r PARPACK/EXAMPLES %i/share/doc/%n/PARPACK
<<

DocFiles: CHANGES DOCUMENTS EXAMPLES  README TODO COPYING
DescPackaging:  <<
        Needs a gfortran; we're going with gcc48.

        Needs -ff2c when using Accelerate.framework, but not when using
        ATLAS or the reference LAPACK.
        
        We can actually disable parpack now.  Only copy the PARPACK docs
        for the -mpi variants.
<<

Splitoff: <<
        Package: %N-shlibs
        Files: lib/lib*arpack.2.dylib
        Shlibs: <<
                %p/lib/libarpack.2.dylib 3.0.0 %n (>=3.0.1-1)
            (%type_raw[-mpi] = -mpi) %p/lib/libparpack.2.dylib 3.0.0 %n 
(>=3.1.0-1)
        <<
        Depends: <<
                (%type_raw[-lapack] = -atlas ) atlas-shlibs (>=3.10.1-1), 
                (%type_raw[-lapack] = -ref) lapack%type_pkg[lapack]-shlibs,
                gcc%type_pkg[gcc]-shlibs
        <<
        Conflicts: <<
                %{Ni}-shlibs,
                %{Ni}-atlas-shlibs,
                %{Ni}-ref-shlibs,
                arpack-ng-shlibs, 
                arpack-ng-atlas-shlibs,
                arpack-ng-ref-shlibs
        <<
        Replaces: <<
                %{Ni}-shlibs,
                %{Ni}-atlas-shlibs,
                %{Ni}-ref-shlibs,
                arpack-ng-shlibs, 
                arpack-ng-atlas-shlibs,
                arpack-ng-ref-shlibs
        <<
        DescDetail: <<
                This package contains the shared libraries.
        <<
        DocFiles: COPYING
<<
<<


------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to