Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv16335

Modified Files:
        hdf5-18-gfortran.info hdf5-18.info hdf5.7-gfortran.info 
        hdf5.7.info hdf5.info 
Added Files:
        hdf5.7-oldapi-gfortran.info hdf5.7-oldapi.info 
Log Message:
Add HDF5 package with current %v, but using old API.
This is ultimately to replace "hdf5" which fails its self-tests on Lion.

Index: hdf5-18.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/hdf5-18.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- hdf5-18.info        27 Jul 2011 13:46:18 -0000      1.13
+++ hdf5-18.info        27 Jul 2011 22:42:39 -0000      1.14
@@ -1,6 +1,6 @@
 Package: hdf5-18
 Version: 1.8.5-patch1
-Revision: 4
+Revision: 5
 # DO NOT MOVE TO 10.7.  PACKAGES THAT DEPEND ON THIS SHOULD BE UPDATED TO USE 
hdf5.7 INSTEAD
 Distribution: 10.5, 10.6
 Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
@@ -19,8 +19,8 @@
 Specifying a versioned BuildDepends: hdf5-18 (>=1.8.5-patch1-1) 
 avoids the necessity of pointing builds to %p/lib/%N.
 <<
-Conflicts: hdf5, hdf5.7
-Replaces: hdf5, hdf5.7
+Conflicts: hdf5, hdf5.7, hdf5.7-oldapi
+Replaces: hdf5, hdf5.7, hdf5.7-oldapi
 Depends: %N-shlibs (= %v-%r), %N-bin, szip-shlibs (>= 2.0-2)
 BuildDepends: szip (>= 2.0-2), fink(>= 0.24.12), fink-package-precedence
 GCC: 4.0

--- NEW FILE: hdf5.7-oldapi.info ---
Package: hdf5.7-oldapi
Version: 1.8.7
Revision: 2
Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
Source-MD5: 37711d4bcb72997e93d495f97c76c33a
Description: Scientific data format (v1.6 API)--headers
DescDetail:  <<
It was designed to address some of the limitations of the HDF 4.x library
and to address current and anticipated requirements of modern systems
and applications. 

Fink's "%N*" packages are intended to replace the corresponding ones from 
"hdf5*".  

To build against %N instead of hdf5, you will need 
to make sure that the headers in %p/opt/hdf5v1.6/include 
and the libraries in %p/opt/hdf5v1.6/lib are found.  
Some packages use a configure flag to target the hdf5 tree, i.e.:
--with-hdf5=%p/opt, but you may need to set CPPFLAGS, LDFLAGS, etc. 
for your package.
<<
Conflicts: hdf5, hdf5-18, hdf5.7
Replaces: hdf5, hdf5-18, hdf5.7
Depends: %N-shlibs (= %v-%r), %N-bin, szip-shlibs (>= 2.0-2)
BuildDepends: szip (>= 2.0-2), fink(>= 0.24.12), fink-package-precedence
GCC: 4.0
BuildDependsOnly: True
PatchScript: <<
 perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
 perl -pi -e 's,sort \+2,sort -k 2,' bin/ltmain.sh
 cp config/apple config/powerpc-apple
 cp config/apple config/i386-apple
 cp config/apple config/x86_64-apple
<<
ConfigureParams: <<
--enable-shared --enable-cxx --disable-fortran --with-zlib=/usr  --without-mpe 
--with-szlib=%p \
--without-pthread  --disable-parallel --disable-static 
--with-default-api-version=v16 \
--libdir=%p/opt/hdf5v1.6/lib --includedir=%p/opt/hdf5v1.6/include
<<
License: OSI-Approved
InfoTest: <<
        TestScript: make check || exit 2
<<
CompileScript: <<
        %{default_script}
        fink-package-precedence --prohibit-bdep=%N,%N-oldapi,hdf5,hdf5-18 c++/ 
fortran/ tools/ hl/tools
        
<<
InstallScript: <<
        #!/bin/sh -ev
        make install DESTDIR=%d
<<
SplitOff: <<
  Package: %N-shlibs
  Depends: szip-shlibs (>= 2.0-2)
  Files: <<
        opt/hdf5v1.6/lib/libhdf5.7.dylib
        opt/hdf5v1.6/lib/libhdf5_cpp.7.dylib
        opt/hdf5v1.6/lib/libhdf5_hl.7.dylib
        opt/hdf5v1.6/lib/libhdf5_hl_cpp.7.dylib
  <<
  Shlibs: <<
   %p/opt/hdf5v1.6/lib/libhdf5.7.dylib 8.0.0 %n (>= 1.8.7-1)
   %p/opt/hdf5v1.6/lib/libhdf5_hl.7.dylib 8.0.0 %n (>= 1.8.7-1)
   %p/opt/hdf5v1.6/lib/libhdf5_cpp.7.dylib 8.0.0 %n (>= 1.8.7-1)
   %p/opt/hdf5v1.6/lib/libhdf5_hl_cpp.7.dylib 8.0.0 %n (>= 1.8.7-1)
  <<
  DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*
  Description: Scientific data format (v1.6 API)--shared C/C++ libraries
<<
SplitOff2: <<
  Package: %N-bin
  Depends: %N-shlibs (= %v-%r)
  Conflicts: hdf5-18-bin, hdf5-bin, hdf5.7-bin
  Replaces: hdf5-18-bin, hdf5-bin, hdf5.7-bin
  Files: bin
  DocFiles: COPYING README.txt  release_docs/RELEASE.txt release_docs/HISTORY*
  Description: Scientific data format (v1.6 API)--executables
<<
DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*
Homepage: http://www.hdfgroup.org/HDF5/index.html
Maintainer: Alexander Hansen <[email protected]>
DescPackaging: <<
        Items in the test suite (only) pick up headers from installed HDF5 
packages, but this appears 
        not to change the build.
        
        Install libs and headers %p/opt/hdf5v1.6  Libs go in 
%p/opt/hdf5v1.6/lib to avoid file overlap 
        with hdf5.7, and headers go in %p/opt/hdf5v.16/include because packages 
that use hdf5 seem to
        like to use a '--with-hdf5=DIR' configure flag to find the whole HDF5 
tree.
<<
DescPort: <<
        Manually generate appropriate system configuration files to be found by 
the configure script.
<<
--- NEW FILE: hdf5.7-oldapi-gfortran.info ---
Package: hdf5.7-oldapi-gfortran
Version: 1.8.7
Revision: 2
Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
Source-MD5: 37711d4bcb72997e93d495f97c76c33a
Description: HDF5 (v1.8 API)--static FORTRAN libraries
DescDetail:  <<
It was designed to address some of the limitations of the HDF 4.x library
and to address current and anticipated requirements of modern systems
and applications. 

The fortran9X interface is built using gfortran.
It will only work with gfortran.

Fink's "%N*" packages are intended to replace the corresponding ones from
"hdf5-18*".  
<<
DescPackaging: <<
Build separately from the rest of hdf5.7 so that people who don't need the 
FORTRAN libs don't have
to build gcc4N.

Builds _all_ of HDF5 and then strips out the C and C++ libs, 
as well as anything that is also in the hdf5.7-oldapi-gfortran package.
<<
Conflicts: hdf5, hdf5-18-gfortran, hdf5.7-gfortran
Replaces: hdf5, hdf5-18-gfortran, hdf5.7-gfortran
Depends: szip-shlibs (>= 2.0-2)
BuildDepends: szip (>= 2.0-2), gcc44|gcc45|gcc46, fink(>= 0.24.12), 
fink-package-precedence
GCC: 4.0
BuildDependsOnly: True
PatchScript: <<
 perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
 cp config/apple config/i686-apple
 cp config/apple config/powerpc-apple
 # obsolete use of sort
 perl -pi -e 's,sort \+2,sort -k 2,' bin/ltmain.sh
<<
ConfigureParams: <<
--enable-fortran  --with-zlib  --without-mpe --with-szlib --without-pthread \
--disable-parallel --disable-shared \
--libdir=%p/opt/hdf5v1.6/lib --includedir=%p/opt/hdf5v1.6/include
<<
License: OSI-Approved
InfoTest:  <<
        TestScript: make check || exit 2
<<
CompileScript: <<
  #!/bin/sh -ev
  export F9X=%p/bin/gfortran
  export FFLAGS='-fsecond-underscore'
  %{default_script}
  fink-package-precedence .
<<
InstallScript: <<
        #!/bin/sh -ev
        make install DESTDIR=%d
        # remove executables
        rm -rf %i/bin 
        # remove headers which are installed by hdf5.7
        pushd %i/opt/include
        rm H5ACpublic.h
        rm H5Apublic.h
        rm H5Cpublic.h
        rm H5DSpublic.h
        rm H5Dpublic.h
        rm H5Epubgen.h
        rm H5Epublic.h
        rm H5FDcore.h
        rm H5FDdirect.h
        rm H5FDfamily.h
        rm H5FDlog.h
        rm H5FDmpi.h
        rm H5FDmpio.h
        rm H5FDmpiposix.h
        rm H5FDmulti.h
        rm H5FDpublic.h
        rm H5FDsec2.h
        rm H5FDstdio.h
        rm H5Fpublic.h
        rm H5Gpublic.h
        rm H5IMpublic.h
        rm H5Ipublic.h
        rm H5LTpublic.h
        rm H5Lpublic.h
        rm H5MMpublic.h
        rm H5Opublic.h
        rm H5PTpublic.h
        rm H5Ppublic.h
        rm H5Rpublic.h
        rm H5Spublic.h
        rm H5TBpublic.h
        rm H5Tpublic.h
        rm H5Zpublic.h
        rm H5api_adpt.h
        rm H5overflow.h
        rm H5pubconf.h
        rm H5public.h
        rm H5version.h
        rm hdf5.h
        rm hdf5_hl.h
        pushd %i/opt/lib
        #remove .la files which are in hdf5-18, settings file, and the C libs.
        rm libhdf5.{a,la} libhdf5_hl.{a,la} libhdf5.settings
        popd
#       remove C examples
        pushd %i/share/hdf5_examples
        rm -rf c hl/c run-all-ex.sh hl/run-hl-ex.sh
        popd
<<
DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*
Homepage: http://www.hdfgroup.org/HDF5/index.html
Maintainer: Alexander Hansen <[email protected]>

Index: hdf5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/hdf5.info,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- hdf5.info   27 Jul 2011 13:46:18 -0000      1.31
+++ hdf5.info   27 Jul 2011 22:42:39 -0000      1.32
@@ -1,7 +1,8 @@
 Package: hdf5
 Version: 1.6.10
-Revision: 4
-# DO NOT MOVE TO 10.7, because it fails its self-tests
+Revision: 5
+# DO NOT MOVE TO 10.7, BECAUSE IT FAILS ITS SELF-TESTS there.
+# PACKAGES THAT USE hdf5 SHOULD BE UPDATED TO USE hdf5.7-oldapi INSTEAD.
 Distribution: 10.5, 10.6
 Source: ftp://ftp.hdfgroup.org/HDF5/current16/src/%n-%v.tar.gz
 Source-MD5: 6e207a95d22e9e9ffdfaecdd580cd1b3
@@ -15,7 +16,7 @@
 It will only work with gfortran.
 <<
 DescPackaging: <<
-Since the fortran interface builds static libraries, either gcc44 or gcc45 can 
be used
+Since the fortran interface builds static libraries, either gcc44 or gcc45 or 
gcc46 can be used
 to provide gfortran.
 <<
 DescPort: <<
@@ -24,8 +25,8 @@
 <<
 Depends: %N-shlibs (= %v-%r), %N-bin, szip-shlibs (>= 2.0-2)
 BuildDepends: szip (>= 2.0-2), gcc44 | gcc45 | gcc46, fink ( >= 0.24.12), 
libtool2, automake1.11
-Conflicts: hdf5-18, hdf5-18-gfortran, hdf5.7, hdf5.7-gfortran
-Replaces: hdf5-18, hdf5-18-gfortran, hdf5.7, hdf5.7-gfortran
+Conflicts: hdf5-18, hdf5-18-gfortran, hdf5.7, hdf5.7-gfortran, hdf5.7-oldapi, 
hdf5.7-oldapi-gfortran
+Replaces: hdf5-18, hdf5-18-gfortran, hdf5.7, hdf5.7-gfortran, hdf5.7-oldapi, 
hdf5.7-oldapi-gfortran
 GCC: 4.0
 BuildDependsOnly: True
 PatchScript: <<

Index: hdf5.7.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/hdf5.7.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hdf5.7.info 15 Jul 2011 21:04:24 -0000      1.1
+++ hdf5.7.info 27 Jul 2011 22:42:39 -0000      1.2
@@ -1,6 +1,6 @@
 Package: hdf5.7
 Version: 1.8.7
-Revision: 1
+Revision: 2
 Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
 Source-MD5: 37711d4bcb72997e93d495f97c76c33a
 Description: Scientific data format (v1.8 API)--headers
@@ -11,8 +11,8 @@
 Fink's "%N*" packages are intended to replace the corresponding ones from
 "hdf5-18*".  
 <<
-Conflicts: hdf5, hdf5-18
-Replaces: hdf5, hdf5-18
+Conflicts: hdf5, hdf5-18, %N-oldapi
+Replaces: hdf5, hdf5-18, %N-oldapi
 Depends: %N-shlibs (= %v-%r), %N-bin, szip-shlibs (>= 2.0-2)
 BuildDepends: szip (>= 2.0-2), fink(>= 0.24.12), fink-package-precedence
 GCC: 4.0
@@ -20,10 +20,13 @@
 PatchScript: <<
  perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
  perl -pi -e 's,sort \+2,sort -k 2,' bin/ltmain.sh
+ cp config/apple config/powerpc-apple
+ cp config/apple config/i386-apple
+ cp config/apple config/x86_64-apple
 <<
 ConfigureParams: <<
---enable-shared --enable-cxx --disable-fortran --with-zlib=/usr  --without-mpe 
--with-szlib=%p \
---without-pthread  --disable-parallel --disable-static
+       --enable-shared --enable-cxx --disable-fortran --with-zlib=/usr  
--without-mpe --with-szlib=%p \
+       --without-pthread  --disable-parallel --disable-static 
 <<
 License: OSI-Approved
 InfoTest: <<
@@ -31,7 +34,8 @@
 <<
 CompileScript: <<
        %{default_script}
-       fink-package-precedence .
+       fink-package-precedence --prohibit-bdep=%N,%N-oldapi,hdf5,hdf5-18 c++/ 
fortran/ tools/ hl/tools
+       
 <<
 InstallScript: <<
        #!/bin/sh -ev
@@ -48,9 +52,9 @@
   <<
   Shlibs: <<
    %p/lib/libhdf5.7.dylib 8.0.0 %n (>= 1.8.7-1)
-   %p/lib/libhdf5_hl.7.dylib 8.0.0 %n (>= 1.8.5-7-1)
-   %p/lib/libhdf5_cpp.7.dylib 8.0.0 %n (>= 1.8.5-7-1)
-   %p/lib/libhdf5_hl_cpp.7.dylib 8.0.0 %n (>= 1.8.5-7-1)
+   %p/lib/libhdf5_hl.7.dylib 8.0.0 %n (>= 1.8.7-1)
+   %p/lib/libhdf5_cpp.7.dylib 8.0.0 %n (>= 1.8.7-1)
+   %p/lib/libhdf5_hl_cpp.7.dylib 8.0.0 %n (>= 1.8.7-1)
   <<
   DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*
   Description: Scientific data format (v1.8 API)--shared C/C++ libraries
@@ -58,8 +62,8 @@
 SplitOff2: <<
   Package: %N-bin
   Depends: %N-shlibs (= %v-%r)
-  Conflicts: hdf5-18-bin
-  Replaces: hdf5-18-bin
+  Conflicts: hdf5-18-bin, hdf5-bin, %N-oldapi-bin
+  Replaces: hdf5-18-bin, hdf5-bin, %N-oldapi-bin
   Files: bin
   DocFiles: COPYING README.txt  release_docs/RELEASE.txt release_docs/HISTORY*
   Description: Scientific data format (v1.8 API)--executables
@@ -67,3 +71,9 @@
 DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*
 Homepage: http://www.hdfgroup.org/HDF5/index.html
 Maintainer: Alexander Hansen <[email protected]>
+DescPackaging: <<
+       
+<<
+DescPort: <<
+       Manually generate appropriate system configuration files to be found at 
configure time.
+<<
\ No newline at end of file

Index: hdf5.7-gfortran.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/hdf5.7-gfortran.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hdf5.7-gfortran.info        19 Jul 2011 17:36:44 -0000      1.2
+++ hdf5.7-gfortran.info        27 Jul 2011 22:42:39 -0000      1.3
@@ -1,9 +1,9 @@
 Package: hdf5.7-gfortran
 Version: 1.8.7
-Revision: 1
+Revision: 2
 Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
 Source-MD5: 37711d4bcb72997e93d495f97c76c33a
-Description: HDF5(v1.8 API)--static FORTRAN libraries
+Description: HDF5 (v1.8 API)--static FORTRAN libraries
 DescDetail:  <<
 It was designed to address some of the limitations of the HDF 4.x library
 and to address current and anticipated requirements of modern systems
@@ -22,8 +22,8 @@
 Builds _all_ of HDF5 and then strips out the C and C++ libs, 
 as well as anything that is also in the hdf5.7 package.
 <<
-Conflicts: hdf5, hdf5-18-gfortran
-Replaces: hdf5, hdf5-18-gfortran
+Conflicts: hdf5, hdf5-18-gfortran, hdf5.7-oldapi-gfortran
+Replaces: hdf5, hdf5-18-gfortran, hdf5.7-oldapi-gfortran
 Depends: szip-shlibs (>= 2.0-2)
 BuildDepends: szip (>= 2.0-2), gcc44|gcc45|gcc46, fink(>= 0.24.12), 
fink-package-precedence
 GCC: 4.0

Index: hdf5-18-gfortran.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/hdf5-18-gfortran.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hdf5-18-gfortran.info       19 Jul 2011 17:35:39 -0000      1.6
+++ hdf5-18-gfortran.info       27 Jul 2011 22:42:39 -0000      1.7
@@ -1,9 +1,11 @@
 Package: hdf5-18-gfortran
 Version: 1.8.5-patch1
-Revision: 1
+Revision: 2
+# DO NOT MOVE TO 10.7.  PACKAGES THAT DEPEND ON THIS SHOULD BE UPDATED TO USE 
hdf5.7 INSTEAD
+Distribution: 10.5, 10.6
 Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
 Source-MD5: d22a35a17877e369055ed50da5ba91fa
-Description: HDF5(v1.8 API)--FORTRAN bindings
+Description: HDF5 (v1.8 API)--FORTRAN bindings
 DescDetail:  <<
 HDF5 was designed to address some of the limitations of the HDF 4.x library
 and to address current and anticipated requirements of modern systems
@@ -29,8 +31,8 @@
 Specifying a versioned BuildDepends: hdf5-18-gfortran (>=1.8.5-patch1-1) 
 avoids the necessity of pointing builds to %p/lib/%N.
 <<
-Conflicts: hdf5, hdf5.7-gfortran
-Replaces: hdf5, hdf5.7-gfortran
+Conflicts: hdf5, hdf5.7-gfortran, hdf5.7-oldapi-gfortran
+Replaces: hdf5, hdf5.7-gfortran, hdf5.7-oldapi-gfortran
 Depends: szip-shlibs (>= 2.0-2)
 BuildDepends: szip (>= 2.0-2), gcc44|gcc45|gcc46, fink(>= 0.24.12), 
fink-package-precedence
 GCC: 4.0


------------------------------------------------------------------------------
Got Input?   Slashdot Needs You.
Take our quick survey online.  Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to