Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25443
Modified Files:
hdf5.info hdf5.patch
Added Files:
hdf5-1.6.5.info hdf5-1.6.5.patch hdf5-18-gfortran.info
hdf5-18-gfortran.patch hdf5-18.info
Log Message:
Update hdf5 (v1.6 API) to version 1.6.8.
Keep hdf5-1.6.5 around in case I screwed up so folks can revert to it.
Add new hdf5-18 (v1.8 API)
--- NEW FILE: hdf5-18.info ---
Package: hdf5-18
Version: 1.8.2
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
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.
<<
Conflicts: hdf5
Replaces: hdf5
Depends: %N-shlibs (= %v-%r), hdf5-bin (>= %v-%r), szip-shlibs (>= 2.0-2)
BuildDepends: szip (>= 2.0-2), gcc43, 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
License: OSI-Approved
CompileScript: <<
#!/bin/sh -ev
./configure %c
make
#make check
<<
InstallScript: <<
make install DESTDIR=%d
install -d %i/lib/%N/include
mv %i/include/* %i/lib/%N/include
<<
SplitOff: <<
Package: %N-shlibs
Replaces: hdf5 (<= 1.4.2-3)
Depends: szip-shlibs (>= 2.0-2), gcc43-shlibs
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
<<
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)
<<
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.
<<
<<
SplitOff2: <<
Package: %N-bin
Depends: %N-shlibs (= %v-%r), gcc43-shlibs
Conflicts: hdf5-bin
Replaces: %N (<= 1.4.2-3), 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
<<
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.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/hdf5.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hdf5.patch 11 Apr 2006 15:01:45 -0000 1.2
+++ hdf5.patch 28 Jan 2009 19:59:38 -0000 1.3
@@ -57,13 +57,9 @@
# Set required flag for compiling C stubs
CFLAGS="$CFLAGS -DH5_ABSOFT"
---- hdf5/fortran/src/H5f90i.h.orig 2006-01-02 19:51:55.000000000 -0700
-+++ hdf5/fortran/src/H5f90i.h 2006-01-02 19:54:10.000000000 -0700
-@@ -62,10 +62,10 @@
- typedef int int_f;
- typedef int hid_t_f;
- typedef float real_f;
--#define FNAME(x) x
+--- hdf5-1.6.8/fortran/src/H5f90i.h 2008-11-10 16:27:16.000000000 -0500
++++ hdf5-1.6.8.patched/fortran/src/H5f90i.h 2009-01-13 08:54:19.000000000
-0500
+@@ -69,6 +69,7 @@
#if defined H5_ABSOFT
#define DF_CAPFNAMES
#endif /*H5_ABSOFT*/
--- NEW FILE: hdf5-1.6.5.patch ---
--- hdf5/configure.orig Fri Nov 5 12:53:29 2004
+++ hdf5/configure Fri Nov 5 12:53:51 2004
@@ -5286,7 +5286,7 @@
# FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes.
- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
-install_name $rpath/$soname $verstring'
+ archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -lsz
-install_name $rpath/$soname $verstring'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
--- hdf5/fortran/config/powerpc-apple.orig 2006-01-02 19:56:15.000000000
-0700
+++ hdf5/fortran/config/powerpc-apple 2006-01-02 19:59:05.000000000 -0700
@@ -30,10 +30,20 @@
# The default Fortran 90 compiler
if test "X-" = "X-$F9X"; then
- F9X=xlf
- F9X_BASENAME=xlf
- else
- F9X_BASENAME=f95
+ case $F9X in
+ # The ibm, g95 and absoft
+ xlf*|g95*|f95*)
+ ;;
+ xlf)
+ F9X_BASENAME=xlf5
+ ;;
+ g95)
+ F9X_BASENAME=g95
+ ;;
+ f95)
+ F9X_BASENAME=f95
+ ;;
+ esac
fi
#
@@ -54,7 +64,7 @@
OBJECT_NAMELEN_DEFAULT_F=-1
case $F9X_BASENAME in
- xlf)
+ xlf) # ibm compiler
F9XSUFFIXFLAG="-qsuffix=f=f90 -qfree=f90"
FFLAGS="$FFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ "
FSEARCH_DIRS="-I./ -I../src"
@@ -64,10 +74,7 @@
f9x_flags_set=yes
;;
- #
- # Assume Absoft compiler
- #
- f95)
+ f95) # absoft compiler
# Set required flag for compiling C stubs
CFLAGS="$CFLAGS -DH5_ABSOFT"
--- hdf5/fortran/src/H5f90i.h.orig 2006-01-02 19:51:55.000000000 -0700
+++ hdf5/fortran/src/H5f90i.h 2006-01-02 19:54:10.000000000 -0700
@@ -62,10 +62,10 @@
typedef int int_f;
typedef int hid_t_f;
typedef float real_f;
-#define FNAME(x) x
#if defined H5_ABSOFT
#define DF_CAPFNAMES
#endif /*H5_ABSOFT*/
+#define FNAME_POST2_UNDERSCORE
#define _fcdtocp(desc) (desc)
#endif /*APPLE*/
--- NEW FILE: hdf5-18-gfortran.info ---
Package: hdf5-18-gfortran
Version: 1.8.2
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--fortran bindings
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.
<<
DescPackaging: <<
Had to be built separately from the main packages, since upstream decided
to disable shared library builds if building the fortran libraries.
<<
Conflicts: hdf5
Replaces: hdf5
Depends: szip-shlibs (>= 2.0-2)
BuildDepends: szip (>= 2.0-2), gcc43, 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
License: OSI-Approved
CompileScript: <<
#!/bin/sh -ev
export F9X=%p/bin/gfortran
export FFLAGS='-fsecond-underscore'
./configure %c
make
#make check
<<
InstallScript: <<
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
<<
DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*
Homepage: http://www.hdfgroup.org/HDF5/index.html
Maintainer: None <[email protected]>
--- NEW FILE: hdf5-18-gfortran.patch ---
--- hdf5-1.8.2/config/apple 2008-11-10 16:28:27.000000000 -0500
+++ hdf5-1.8.2.patched/config/apple 2009-01-13 10:23:53.000000000 -0500
@@ -31,10 +31,24 @@
# The default Fortran 90 compiler
if test "X-" = "X-$FC"; then
- # Assume G95 compiler
- FC=g95
- FC_BASENAME=g95
-fi
+ case $F9X in
+ # The ibm, g95 and absoft
+ xlf*|g95*|f95*)
+ ;;
+ xlf)
+ FC=xlf5
+ FC_BASENAME=xlf5
+ ;;
+ g95)
+ FC=g95
+ FC_BASENAME=g95
+ ;;
+ f95)
+ FC=f95
+ FC_BASENAME=f95
+ ;;
+ esac
+ fi
case $FC_BASENAME in
xlf)
Index: hdf5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/hdf5.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- hdf5.info 27 Jan 2009 07:41:23 -0000 1.18
+++ hdf5.info 28 Jan 2009 19:59:38 -0000 1.19
@@ -1,8 +1,8 @@
Package: hdf5
-Version: 1.6.5
-Revision: 1012
-Source: ftp://hdf.ncsa.uiuc.edu/HDF5/current/src/%n-%v.tar.gz
-Source-MD5: 67187b3253b89f1f41756b7fd4396ecf
+Version: 1.6.8
+Revision: 1
+Source: ftp://ftp.hdfgroup.org/HDF5/current16/src/%n-%v.tar.gz
+Source-MD5: a822babf2810b509cc6779de739debd3
Description: Library and file format for scientific data
DescDetail: <<
It was designed to address some of the limitations of the HDF 4.x library
@@ -13,20 +13,22 @@
It will only work with gfortran.
<<
Depends: %N-shlibs (= %v-%r), %N-bin, szip-shlibs (>= 2.0-2)
-BuildDepends: fink (>= 0.24.12), szip (>= 2.0-2), gcc43
+BuildDepends: szip (>= 2.0-2), gcc43, fink ( >= 0.24.12)
+Conflicts: hdf5-18
+Replaces: hdf5-18
GCC: 4.0
BuildDependsOnly: True
PatchScript: <<
- %{default_script}
+ %{default_script}
perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
cp config/powerpc-apple config/i686-apple
cp fortran/config/powerpc-apple fortran/config/i686-apple
# obsolete use of sort
- perl -pi -e 's,sort \+2,sort -k 2,' bin/ltmain.sh
+ perl -pi -e 's,sort \+2,sort -k 2,' bin/ltmain.sh
<<
PatchFile: %n.patch
-PatchFile-MD5: a044886aefd303a6020370207470c7b0
-ConfigureParams: --enable-cxx --without-ssl --with-zlib --without-mpe
--without-pablo --with-szlib --without-gass --without-srb --without-pthread
--enable-fortran --disable-parallel
+PatchFile-MD5: a756f9c68a5224dcaeb5a82d1b22362c
+ConfigureParams: --enable-cxx --without-ssl --with-zlib --without-mpe
--without-pablo --with-szlib --without-gass --without-srb --without-pthread
--enable-fortran --disable-parallel --disable-dependency-tracking
License: OSI-Approved
CompileScript: <<
#!/bin/sh -ev
@@ -53,11 +55,11 @@
<<
SplitOff2: <<
Package: %N-bin
- Depends: %N-shlibs (= %v-%r), gcc43-shlibs
+ Depends: %N-shlibs (= %v-%r)
Replaces: %N (<= 1.4.2-3)
Files: bin
DocFiles: COPYING README.txt release_docs/INSTALL release_docs/RELEASE.txt
release_docs/HISTORY.txt
<<
DocFiles: COPYING README.txt release_docs/INSTALL release_docs/RELEASE.txt
release_docs/HISTORY.txt
-Homepage: http://hdf.ncsa.uiuc.edu/HDF5/
-Maintainer: None <[email protected]>
+Homepage: http://www.hdfgroup.org/HDF5/index.html
+Maintainer: Alexander Hansen <[email protected]>
--- NEW FILE: hdf5-1.6.5.info ---
Package: hdf5
Version: 1.6.5
Revision: 1012
Source: ftp://hdf.ncsa.uiuc.edu/HDF5/current/src/%n-%v.tar.gz
Source-MD5: 67187b3253b89f1f41756b7fd4396ecf
Description: Library and file format for scientific data
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.
<<
Depends: %N-shlibs (= %v-%r), %N-bin, szip-shlibs (>= 2.0-2)
BuildDepends: fink (>= 0.24.12), szip (>= 2.0-2), gcc43
GCC: 4.0
BuildDependsOnly: True
PatchScript: <<
%{default_script}
perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
cp config/powerpc-apple config/i686-apple
cp fortran/config/powerpc-apple fortran/config/i686-apple
# obsolete use of sort
perl -pi -e 's,sort \+2,sort -k 2,' bin/ltmain.sh
<<
PatchFile: %n-%v.patch
PatchFile-MD5: a044886aefd303a6020370207470c7b0
ConfigureParams: --enable-cxx --without-ssl --with-zlib --without-mpe
--without-pablo --with-szlib --without-gass --without-srb --without-pthread
--enable-fortran --disable-parallel
License: OSI-Approved
CompileScript: <<
#!/bin/sh -ev
export F9X=%p/bin/gfortran
export FFLAGS='-fsecond-underscore'
./configure %c
make
#make check
<<
InstallScript: make install prefix=%i docdir=%i/share/doc
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<= 1.4.2-3)
Depends: szip-shlibs (>= 2.0-2), gcc43-shlibs
Files: <<
lib/libhdf5.*.dylib
lib/libhdf5_hl.*.dylib
<<
Shlibs: <<
%p/lib/libhdf5.0.dylib 1.0.0 %n (>= 1.4.5-12)
%p/lib/libhdf5_hl.0.dylib 1.0.0 %n (>= 1.6.4-3)
<<
DocFiles: COPYING README.txt release_docs/INSTALL release_docs/RELEASE.txt
release_docs/HISTORY.txt
<<
SplitOff2: <<
Package: %N-bin
Depends: %N-shlibs (= %v-%r), gcc43-shlibs
Replaces: %N (<= 1.4.2-3)
Files: bin
DocFiles: COPYING README.txt release_docs/INSTALL release_docs/RELEASE.txt
release_docs/HISTORY.txt
<<
DocFiles: COPYING README.txt release_docs/INSTALL release_docs/RELEASE.txt
release_docs/HISTORY.txt
Homepage: http://hdf.ncsa.uiuc.edu/HDF5/
Maintainer: None <[email protected]>
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
