Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26403

Modified Files:
        hdf5-18-gfortran.info hdf5-18.info 
Removed Files:
        hdf5-18-gfortran.patch 
Log Message:
New upstream version.  
Private tree no longer needed, but keep compatiblity symlinks for current
dependent packages.
Clean up dependencies.
Make sure hdf5-18-gfortran has relevant headers.

--- hdf5-18-gfortran.patch DELETED ---

Index: hdf5-18-gfortran.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/hdf5-18-gfortran.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hdf5-18-gfortran.info       4 Aug 2009 19:08:10 -0000       1.2
+++ hdf5-18-gfortran.info       23 Dec 2010 01:59:31 -0000      1.3
@@ -1,11 +1,11 @@
 Package: hdf5-18-gfortran
-Version: 1.8.2
-Revision: 2
-Source: ftp://ftp.hdfgroup.org/HDF5/current/src//hdf5-%v.tar.gz 
-Source-MD5: af92ef65ef495dbd205131574ad4eee1
-Description: Library and file format for scientific data--fortran bindings
+Version: 1.8.5-patch1
+Revision: 1
+Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
+Source-MD5: d22a35a17877e369055ed50da5ba91fa
+Description: HDF(v1.8 API)--FORTRAN bindings
 DescDetail:  <<
-It was designed to address some of the limitations of the HDF 4.x library
+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
 and applications. 
 
@@ -13,41 +13,120 @@
 It will only work with gfortran.
 <<
 DescPackaging: <<
-Had to be built separately from the main packages, since upstream decided
-to disable shared library builds if building the fortran libraries.
+Has to be built separately from the main packages, since upstream decided
+to disable shared library builds if building the FORTRAN libraries.
+
+Builds _all_ of HDF5 with static libs and then strips out anything that is
+also in the hdf5-18 package.
+
+Only builds static libraries, so it can use either gcc44 or gcc45 to build.
+<<
+DescUsage: <<
+To build against this package, you'll want to have hdf5-18 installed, too.
+Prior to version 1.8.5-patch1, the package installed files in 
+%p/lib/hdf5-18/(include|lib) due to file overlap with hdf5-shlibs, and we 
+maintain compatibility symlinks there.
+Specifying a versioned BuildDepends: hdf5-18-gfortran (>=1.8.5-patch1-1) 
+avoids the necessity of pointing builds to %p/lib/%N.
 <<
 Conflicts: hdf5
 Replaces: hdf5
 Depends: szip-shlibs (>= 2.0-2)
-BuildDepends: szip (>= 2.0-2), gcc44, fink(>= 0.24.12)
+BuildDepends: szip (>= 2.0-2), gcc44|gcc45, fink(>= 0.24.12)
 GCC: 4.0
 BuildDependsOnly: True
 PatchScript: <<
-# %{default_script}
  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
 <<
-PatchFile: %n.patch
-PatchFIle-MD5: 2c800bba8a7b9dd385f16c1aabc0b3d2
-ConfigureParams: --enable-fortran  --without-ssl --with-zlib  --without-mpe 
--without-pablo --with-szlib --without-gass --without-srb --without-pthread  
--disable-parallel --libdir=%p/lib/hdf5-18/lib 
--includedir=%p/lib/hdf5-18/include --disable-dependency-tracking
+ConfigureParams: <<
+--enable-fortran  --with-zlib  --without-mpe --with-szlib --without-pthread \
+--disable-parallel
+<<
 License: OSI-Approved
+InfoTest:  <<
+       TestScript: make check || exit 2
+<<
 CompileScript: <<
   #!/bin/sh -ev
   export F9X=%p/bin/gfortran
   export FFLAGS='-fsecond-underscore'
   ./configure %c
-  make
-  #make check
+  make 
 <<
 InstallScript: <<
+       #!/bin/sh -ev
        make install DESTDIR=%d
-       rm -rf %i/bin %i/include/*.h %i/lib/hdf5-18/lib/libhdf5.* 
%i/lib/hdf5-18/lib/libhdf5_hl.*
        install -d %i/lib/hdf5-18/include
-       mv %i/include/* %i/lib/hdf5-18/include
+       install -d %i/lib/hdf5-18/lib
+       # remove executables
+       rm -rf %i/bin 
+       # remove headers which are installed by hdf5-18
+       pushd %i/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
+#      generate upgrade symlinks
+       for file in *.h *.mod 
+       do
+               ln -s $file ../lib/hdf5-18/include/$file 
+       done    
+       popd
+       pushd %i/lib
+       #remove .la files which are in hdf5-18, settings file, and the C static 
libs.
+       rm libhdf5.{a,la} libhdf5_hl.{a,la} libhdf5.settings
+#      generate upgrade symlinks
+       for file in *.a *.la
+       do
+               ln -s $file ../lib/hdf5-18/lib/$file 
+       done    
+       popd
+#      remove C examples
+       pushd %i/share/hdf5_examples
+       rm -rf c hl/c run-all-ex.sh hl/run-hl-ex.sh
+       popd
+       fink-package-precedence .
 <<
 DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*
 Homepage: http://www.hdfgroup.org/HDF5/index.html
-Maintainer: None <fink-de...@lists.sourceforge.net>
+Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>

Index: hdf5-18.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/hdf5-18.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hdf5-18.info        27 Oct 2009 15:09:09 -0000      1.6
+++ hdf5-18.info        23 Dec 2010 01:59:31 -0000      1.7
@@ -1,78 +1,109 @@
 Package: hdf5-18
-Version: 1.8.2
-Revision: 3
+Version: 1.8.5-patch1
+Revision: 1
 Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
-Source-MD5: af92ef65ef495dbd205131574ad4eee1
-Description: Library and file format for scientific data (v1.8 API)--headers
+Source-MD5: d22a35a17877e369055ed50da5ba91fa
+Description: Scientific data format (v1.8 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. 
 <<
 DescUsage: <<
-The libraries and headers are installed in a private directory; to 
-link to them in another package you will need to use either whatever
-flag that package wants to direct you to the hdf5 directory, e.g 
---with-hdf5=%%p/lib/%%N
-or via setting *FLAGS environment variables.
+Prior to verions 1.8.5-patch1, the libraries and headers were
+installed in %p/lib/%N/(include|lib) due to file overlap with 
+hdf5-shlibs.
+We continue to maintain upgrade compatibility symlinks there.  
+Specifying a versioned BuildDepends: hdf5-18-gfortran (>=1.8.5-patch1-1) 
+avoids the necessity of pointing builds to %p/lib/%N.
 <<
 Conflicts: hdf5
 Replaces: hdf5
 Depends: %N-shlibs (= %v-%r), %N-bin, szip-shlibs (>= 2.0-2)
-BuildDepends: szip (>= 2.0-2), gcc44, fink(>= 0.24.12)
+BuildDepends: szip (>= 2.0-2), fink(>= 0.24.12)
 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
 <<
-ConfigureParams: --enable-cxx  --without-ssl --with-zlib  --without-mpe 
--without-pablo --with-szlib --without-gass --without-srb --without-pthread  
--disable-parallel --libdir=%p/lib/%N/lib --includedir=%p/lib/%N/include 
--disable-dependency-tracking --disable-static
+ConfigureParams: <<
+--enable-shared --enable-cxx --with-zlib  --without-mpe --with-szlib \
+--without-pthread  --disable-parallel  --disable-static
+<<
 License: OSI-Approved
-CompileScript: <<
-  #!/bin/sh -ev
-  ./configure %c
-  make
-  #make check
+InfoTest: <<
+       TestScript: make check
 <<
 InstallScript: <<
+       #!/bin/sh -ev
        make install DESTDIR=%d
        install -d %i/lib/%N/include
-       mv %i/include/* %i/lib/%N/include
+       install -d %i/lib/%N/lib
+       pushd %i/include
+#      generate upgrade symlinks
+       for file in *.h
+       do
+               ln -s $file ../lib/hdf5-18/include/$file 
+       done    
+       popd
+       pushd %i/lib
+       #remove .la files which are in hdf5-18
+       rm libhdf5.la libhdf5_hl.la 
+#      generate upgrade symlinks
+       ln -s libhdf5.6.dylib ../lib/%N/lib/libhdf5.6.dylib
+       ln -s libhdf5_hl.6.dylib ../lib/%N/lib/libhdf5_hl.0.dylib
+       ln -s libhdf5_cpp.6.dylib ../lib/%N/lib/libhdf5_cpp.0.dylib
+       ln -s libhdf5_hl_cpp.6.dylib ../lib/%N/lib/libhdf5_hl_cpp.0.dylib
+       ln -s libhdf5.dylib ../lib/%N/lib/libhdf5.dylib
+       ln -s libhdf5_cpp.dylib ../lib/%N/lib/libhdf5_cpp.dylib
+       ln -s libhdf5_hl.dylib ../lib/%N/lib/libhdf5_hl.dylib
+       ln -s libhdf5_hl_cpp.dylib ../lib/%N/lib/libhdf5_hl_cpp.dylib
+       for file in *.la *.settings
+       do
+               ln -s $file ../lib/hdf5-18/lib/$file 
+       done    
+       popd
+# remove fortran examples
+       pushd %i/share/hdf5_examples
+       rm -rf fortran hl/fortran
+       popd
+       fink-package-precedence .
 <<
 SplitOff: <<
   Package: %N-shlibs
-  Replaces: hdf5 (<= 1.4.2-3)
-  Depends: szip-shlibs (>= 2.0-2), gcc44-shlibs
+  Depends: szip-shlibs (>= 2.0-2)
   Files: <<
-       lib/%N/lib/libhdf5.*.dylib
-       lib/%N/lib/libhdf5_cpp.*.dylib
-       lib/%N/lib/libhdf5_hl.*.dylib
-       lib/%N/lib/libhdf5_hl_cpp.*.dylib
+       lib/libhdf5.*.dylib
+       lib/libhdf5_cpp.*.dylib
+       lib/libhdf5_hl.*.dylib
+       lib/libhdf5_hl_cpp.*.dylib
   <<
   Shlibs: <<
-   %p/lib/%N/lib/libhdf5.6.dylib 1.0.0 %n (>= 1.8.2-1)
-   %p/lib/%N/lib/libhdf5_hl.0.dylib 1.0.0 %n (>= 1.8.2-1)
-   %p/lib/%N/lib/libhdf5_cpp.0.dylib 1.0.0 %n (>= 1.8.2-1)
-   %p/lib/%N/lib/libhdf5_hl_cpp.0.dylib 1.0.0 %n (>= 1.8.2-1)
+   %p/lib/libhdf5.6.dylib 7.0.0 %n (>= 1.8.5-patch1-1)
+   %p/lib/libhdf5_hl.6.dylib 7.0.0 %n (>= 1.8.5-patch1-1)
+   %p/lib/libhdf5_cpp.6.dylib 7.0.0 %n (>= 1.8.5-patch1-1)
+   %p/lib/libhdf5_hl_cpp.6.dylib 7.0.0 %n (>= 1.8.5-patch1-1)
   <<
   DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*
-  Description: Library and file format for scientific data (v1.8 API)--shared 
libraries
-DescUsage: <<
-The libraries and headers are installed in a private directory; to 
-link to them in another package you will need to use either whatever
-flag that package wants to direct you to the hdf5 directory, e.g 
---with-hdf5=%%p/lib/%%N
-or via setting *FLAGS environment variables.
-<<
+  Description: Scientific data format (v1.8 API)--shared libraries
+  DescUsage: <<        
+       Prior to version 1.8.5-patch1, the libraries and headers were
+       installed in %p/lib/%N/(include|lib) due to file overlap with 
+       hdf5-shlibs.
+       We continue to maintain upgrade compatibility symlinks there.  
+       Specifying a versioned BuildDepends: hdf5-18-gfortran 
(>=1.8.5-patch1-1) 
+       avoids the necessity of pointing builds to %p/lib/%N.
+  <<
 <<
 SplitOff2: <<
   Package: %N-bin
-  Depends: %N-shlibs (= %v-%r), gcc44-shlibs
+  Depends: %N-shlibs (= %v-%r)
   Conflicts: hdf5-bin
-  Replaces: %N (<= 1.4.2-3), hdf5-bin
+  Replaces: hdf5-bin
   Files: bin
   DocFiles: COPYING README.txt  release_docs/RELEASE.txt release_docs/HISTORY*
-  Description: Library and file format for scientific data (v1.8 
API)--executables
+  Description: Scientific data format (v1.8 API)--executables
 <<
 DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*
 Homepage: http://www.hdfgroup.org/HDF5/index.html


------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and, 
should the need arise, upgrade to a full multi-node Oracle RAC database 
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to