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

Modified Files:
        hdf5-18.info hdf5.7-gfortran.info hdf5.7-oldapi-gfortran.info 
        hdf5.7-oldapi.info hdf5.7.info hdf5.info 
Added Files:
        hdf5.8-gfortran.info hdf5.8-oldapi-gfortran.info 
        hdf5.8-oldapi.info hdf5.8.info 
Log Message:
New upstream HDF5.  Gotta do all of that library bookkeeping.


--- NEW FILE: hdf5.8-gfortran.info ---
Info2: <<
Package: hdf5.8-gfortran
Version: 1.8.11
Revision: 1
Type: gcc (4.8)
Description: HDF5 (v1.8 API)--static FORTRAN libraries
License: OSI-Approved
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>

BuildDepends: <<
        gcc%type_pkg[gcc]-compiler,
        szip (>= 2.0-2),
        fink-package-precedence,
        fink (>=0.34.8)
<<
Replaces: <<
        hdf5, 
        hdf5-18-gfortran, 
        hdf5.7-gfortran,
        hdf5.7-oldapi-gfortran,
        hdf5.8-oldapi-gfortran
<<      
Conflicts: <<
        hdf5, 
        hdf5-18-gfortran,
        hdf5.7-gfortran, 
        hdf5.7-oldapi-gfortran,
        hdf5.8-oldapi-gfortran
<<
BuildDependsOnly: true

Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
Source-MD5: 1a4cc04f7dbe34e072ddcf3325717504

PatchScript: <<
 #!/bin/sh -ev
 perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
 # obsolete use of sort
 perl -pi -e 's,sort \+2,sort -k 2,' bin/ltmain.sh
 cp config/apple config/i686-apple
 cp config/apple config/powerpc-apple
<<

ConfigureParams: <<
--enable-fortran  --enable-fortran2003 \
--with-zlib  --without-mpe --with-szlib --without-pthread \
--disable-parallel --disable-shared
<<

CompileScript: <<
  #!/bin/sh -ev
  # special-case for 10.6; check whether compiler is llvm-gcc
  if  [[ -n `gcc --version | grep llvm-g` ]] 
  then 
          export CXX=clang++
          export CC=clang
  fi
  export F9X=%p/bin/gfortran-fsf-%type_raw[gcc]
  %{default_script}
  fink-package-precedence .
<<

InfoTest: <<
        TestScript: make -j1 check || exit 2
        TestSuiteSize: large
<<

InstallScript: <<
        #!/bin/sh -ev
        make install DESTDIR=%d
        # remove executables
        rm -rf %i/bin 
        # remove headers which are installed by hdf5.8
        pushd %i/include
        rm H5[A-Z]*.h H5[a-e]*.h H5[g-z]*.h
        rm hdf5*.h
        pushd %i/lib
        #remove .la files which are in hdf5.8, settings file, and the C libs.
        rm libhdf5.{a,la} libhdf5_hl.{a,la} libhdf5.settings
        popd
        pushd %i/share/hdf5_examples
#       remove C examples
        rm -rf c hl/c run-all-ex.sh hl/run-hl-ex.sh
#   rename README to avoid collisions
        mv README README.FORTRAN
        popd
<<

DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*

Homepage: http://www.hdfgroup.org/HDF5/index.html

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
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: <<
Built separately from the rest of hdf5.8 so that people who don't need the 
FORTRAN libs 
don't have to build gcc4N.

No BuildDepends on hdf5.8 because we build _all_ of HDF5 and then strip out the 
C and 
C++ libs, as well as anything that is also in the hdf5.8 package.

Buildepends on fink (>= 0.34.8) since that's when we introduced a clang compiler
wrapper.
<<
<<

Index: hdf5.7-gfortran.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/hdf5.7-gfortran.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- hdf5.7-gfortran.info        10 Apr 2013 17:44:44 -0000      1.13
+++ hdf5.7-gfortran.info        23 May 2013 15:03:50 -0000      1.14
@@ -1,7 +1,7 @@
 Info2: <<
 Package: hdf5.7-gfortran
 Version: 1.8.10-patch1
-Revision: 3
+Revision: 4
 Type: gcc (4.8)
 Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
 Source-MD5: 2147a289fb33c887464ad2b6c5a8ae4c
@@ -23,13 +23,29 @@
 
 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.
+
+Buildepends on fink (>= 0.34.8) since that's when we introduced a clang 
compiler
+wrapper.
+<<
+Conflicts: <<
+       hdf5, 
+       hdf5-18-gfortran, 
+       hdf5.7-oldapi-gfortran, 
+       hdf5.8-gfortran
+       hdf5.8-oldapi-gfortran
+<<
+Replaces: <<
+       hdf5, 
+       hdf5-18-gfortran, 
+       hdf5.7-oldapi-gfortran, 
+       hdf5.8-gfortran
+       hdf5.8-oldapi-gfortran
 <<
-Conflicts: hdf5, hdf5-18-gfortran, hdf5.7-oldapi-gfortran
-Replaces: hdf5, hdf5-18-gfortran, hdf5.7-oldapi-gfortran
 BuildDepends: <<
-       fink-package-precedence,
        gcc%type_pkg[gcc]-compiler,
-       szip (>= 2.0-2)
+       szip (>= 2.0-2),
+       fink-package-precedence,
+       fink (>= 0.34.8)
 <<
 BuildDependsOnly: true
 PatchScript: <<
@@ -54,8 +70,8 @@
   # special-case for 10.6; check whether compiler is llvm-gcc
   if  [[ -n `gcc --version | grep llvm-g` ]] 
   then 
-         export CXX='clang++ -arch %m'
-         export CC='clang -arch %m'
+         export CXX=clang++
+         export CC=clang
   fi
   export F9X=%p/bin/gfortran-fsf-%type_raw[gcc]
   %{default_script}

Index: hdf5-18.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/hdf5-18.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hdf5-18.info        31 Oct 2011 17:25:17 -0000      1.4
+++ hdf5-18.info        23 May 2013 15:03:50 -0000      1.5
@@ -1,6 +1,6 @@
 Package: hdf5-18
 Version: 1.8.5-patch1
-Revision: 6
+Revision: 7
 # 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, hdf5.7-oldapi
-Replaces: hdf5, hdf5.7, hdf5.7-oldapi
+Conflicts: hdf5, hdf5.7, hdf5.7-oldapi, hdf5.8, hdf5.8-oldapi
+Replaces: hdf5, hdf5.7, hdf5.7-oldapi, hdf5.8, hdf5.8-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
@@ -103,8 +103,8 @@
 SplitOff2: <<
   Package: %N-bin
   Depends: %N-shlibs (= %v-%r)
-  Conflicts: hdf5-bin, hdf5.7-bin, hdf5.7-oldapi-bin
-  Replaces: hdf5-bin, hdf5.7-bin, hdf5.7-oldapi-bin
+  Conflicts: hdf5-bin, hdf5.7-bin, hdf5.7-oldapi-bin, hdf5.8-bin, 
hdf5.8-oldapi-bin
+  Replaces: hdf5-bin, hdf5.7-bin, hdf5.7-oldapi-bin, hdf5.8-bin, 
hdf5.8-oldapi-bin
   Files: bin
   DocFiles: COPYING README.txt  release_docs/RELEASE.txt release_docs/HISTORY*
   Description: Scientific data format (v1.8 API)--executables

--- NEW FILE: hdf5.8.info ---
Package: hdf5.8
Version: 1.8.11
Revision: 1
Description: Scientific data format (v1.8 API)--headers
License: OSI-Approved
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>

Depends: %N-shlibs (= %v-%r), %N-bin, szip-shlibs (>= 2.0-2)
BuildDepends: szip (>= 2.0-2), fink-package-precedence, fink (>= 0.34.8)
GCC: 4.0
BuildDependsOnly: True
PatchScript: <<
 #!/bin/sh -ev
 perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
 # obsolete use of sort
 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
 # saw a complaint about this using gcc48 to build against hdf5.7
 perl -pi -e 's/(H5_PRINTF_LL_WIDTH)/ \1 /' src/H5public.h test/dt_arith.c 
tools/h5ls/h5ls.c tools/lib/h5diff_array.c tools/lib/h5diff_util.c 
tools/lib/h5tools.h tools/lib/h5trav.c
<<

ConfigureParams: <<
        --enable-shared --enable-cxx --disable-fortran --with-zlib=/usr  
--without-mpe --with-szlib=%p \
        --without-pthread  --disable-parallel --disable-static 
<<

GCC: 4.0
CompileScript: <<
        #!/bin/sh -ev
        # special-case for 10.6; check whether 'gcc' is llvm-gcc
        if  [[ -n `gcc --version | grep llvm-g`  ]] 
        then 
                export CXX=clang++
                export CC=clang
        fi
        %{default_script}
        fink-package-precedence 
--prohibit-bdep=%N,%N-oldapi,hdf5.7,hdf5.7-oldapi,hdf5,hdf5-18 c++/ fortran/ 
tools/ hl/tools
<<

InfoTest: <<
        TestScript: make -j1 check || exit 2
        TestSuiteSize: large
<<

InstallScript: make install DESTDIR=%d

DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*

SplitOff: <<
  Package: %N-shlibs
  Description: Scientific data format (v1.8 API)--shared C/C++ libraries
  Depends: szip-shlibs (>= 2.0-2)
  Files: <<
        lib/libhdf5.8.dylib
        lib/libhdf5_cpp.8.dylib
        lib/libhdf5_hl.8.dylib
        lib/libhdf5_hl_cpp.8.dylib
  <<
  Shlibs: <<
   %p/lib/libhdf5.8.dylib 9.0.0 %n (>= 1.8.11-1)
   %p/lib/libhdf5_hl.8.dylib 9.0.0 %n (>= 1.8.11-1)
   %p/lib/libhdf5_cpp.8.dylib 9.0.0 %n (>= 1.8.11-1)
   %p/lib/libhdf5_hl_cpp.8.dylib 9.0.0 %n (>= 1.8.11-1)
  <<
  DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*
<<
SplitOff2: <<
  Package: %N-bin
  Description: Scientific data format (v1.8 API)--executables
  Depends: %N-shlibs (= %v-%r)
  Conflicts: <<
        hdf5-18-bin, 
        hdf5-bin, 
        hdf5.7-bin,
        hdf5.7-oldapi-bin,
        %N-oldapi-bin
  <<
  Replaces: <<
        hdf5-18-bin, 
        hdf5-bin, 
        hdf5.7-bin,
        hdf5.7-oldapi-bin,
        %N-oldapi-bin
  <<
  Files: bin
  DocFiles: COPYING README.txt  release_docs/RELEASE.txt release_docs/HISTORY*
<<

Homepage: http://www.hdfgroup.org/HDF5/index.html

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
and applications. 

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

DescPackaging: <<
        Make sure to update the netcdf* (>> 3.6.3) packages when this is 
updated.

        Buildepends on fink (>= 0.34.8) since that's when we introduced a clang 
compiler
        wrapper.
<<
DescPort: <<
        Manually generate appropriate system configuration files to be found by 
the configure script.
<<

Index: hdf5.7-oldapi-gfortran.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/hdf5.7-oldapi-gfortran.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- hdf5.7-oldapi-gfortran.info 26 Apr 2013 15:54:48 -0000      1.14
+++ hdf5.7-oldapi-gfortran.info 23 May 2013 15:03:50 -0000      1.15
@@ -1,7 +1,7 @@
 Info2: <<
 Package: hdf5.7-oldapi-gfortran
 Version: 1.8.10-patch1
-Revision: 3
+Revision: 4
 Type: gcc (4.8)
 Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
 Source-MD5: 2147a289fb33c887464ad2b6c5a8ae4c
@@ -31,13 +31,29 @@
 
 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 package.
+
+Buildepends on fink (>= 0.34.8) since that's when we introduced a clang 
compiler
+wrapper.
+<<
+Conflicts: <<
+       hdf5, 
+       hdf5-18-gfortran, 
+       hdf5.7-gfortran, 
+       hdf5.8-gfortran
+       hdf5.8-oldapi-gfortran
+<<
+Replaces: <<
+       hdf5, 
+       hdf5-18-gfortran, 
+       hdf5.7-gfortran, 
+       hdf5.8-gfortran
+       hdf5.8-oldapi-gfortran
 <<
-Conflicts: hdf5, hdf5-18-gfortran, hdf5.7-gfortran
-Replaces: hdf5, hdf5-18-gfortran, hdf5.7-gfortran
 BuildDepends: <<
-       fink-package-precedence,
        gcc%type_pkg[gcc]-compiler,
-       szip (>= 2.0-2)
+       szip (>= 2.0-2),
+       fink-package-precedence,
+       fink (>= 0.34.8)
 <<
 BuildDependsOnly: true
 PatchScript: <<
@@ -63,12 +79,12 @@
   # special-case for 10.6; check whether compiler is llvm-gcc
   if  [[ -n `gcc --version | grep llvm-g` ]] 
   then 
-         export CXX='clang++ -arch %m'
-         export CC='clang -arch %m'
+         export CXX=clang++
+         export CC=clang
   fi
-  export F9X=%p/bin/gfortran
+  export F9X=%p/bin/gfortran-fsf-%type_raw[gcc]
   %{default_script}
-  fink-package-precedence .
+  fin-package-precedence .fsf-%type_raw[gcc] is llvm-gcc a clang 
compilerinfo,vpt.tran/ tools/ hl/toolsools/lib/h5diff_util.c 
tools/lib/h5tools.h 
tools/lib/h5trav.c’¨spa+0iªÿ€À•pa+ 
^ªÿð\ªÿk°Voa+6 
èè!è!Àhªÿ0iªÿxdspa+ 
_ªÿ’’Voa+†°Voa+Àhªÿ`’Voa+ÿhªÿÀ_×pa+ušVoa+P×pa+ØT×pa+¨Y×pa+€ºWoa+xdspa+
 
_ªÿð]ªÿk°Voa+à!à!Àhªÿ0iªÿH.Spa+`ªÿ’’Voa+†°Voa+Àhªÿ`’Voa+ÿhªÿðhªÿèhªÿ8»woa+Œp˜0iªÿušVoa+€ºWoa+`ªÿÐ^ªÿk°Voa+GHIJKMNOPÀhªÿ0iªÿHå)pa+
 
aªÿ’’Voa+†°Voa+Àhªÿ0_×pa+ušVoa+pspa+ 
pa+P×pa+ØT×pa+¨Y×pa+€ºWoa+Hå)pa+ 
aªÿà_ªÿk°Voa+8å)pa+ 
aªÿ`ªÿk°Voa+(å)pa+ 
aªÿ@`ªÿk°Voa+å)pa+ aªÿp`ªÿk°Voa+ 
¨^×pa+ušVoa+¨Y×pa+ðZªÿŠhpa+e™Voa+ØT×pa+aªÿyhpa+e™Voa+P×pa+@aªÿZhpa+e™Voa+Øpa+pspa+
 
pa+P×pa+Øtspa+ØT×pa+¨Y×pa+€ºWoa+8»woa+ÝÒoa+0iªÿp«pa+ðbªÿÀaªÿk°Voa+5678:<=>?@BDÀhªÿ0iªÿ
 
áÏoa+0iªÿušVoa+µwoa+paªÿÝÒoa+e™Voa+µwoa+Õ_@fÆS
 Qöl±íìóžoa+0iªÿ 
áÏoa+dªÿÐbªÿk°Voa+u]ÞÓ     4Q 
÷U^Qʉ§¶uª¹ñìò*ēvÀhªÿ0iªÿH.œoa+fªÿ’’Voa+†°Voa+Àhªÿ`’Voa+ÿhªÿðhªÿèhªÿspa+ušVoa+Øtspa+
 
yspa+€ºWoa+fªÿÀcªÿk°Voa+8.œoa+fªÿðcªÿk°k-package-precedence
 
 <<
 InstallScript: <<
        #!/bin/sh -ev

--- NEW FILE: hdf5.8-oldapi-gfortran.info ---
Info2: <<
Package: hdf5.8-oldapi-gfortran
Version: 1.8.11
Revision: 1
Type: gcc (4.8)
Description: HDF5 (v1.6 API)--static FORTRAN libraries
License: OSI-Approved
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>

BuildDepends: <<
        gcc%type_pkg[gcc]-compiler,
        szip (>= 2.0-2),
        fink-package-precedence,
        fink (>=0.34.8)
<<
Replaces: <<
        hdf5, 
        hdf5-18-gfortran, 
        hdf5.7-gfortran,
        hdf5.7-oldapi-gfortran,
        hdf5.8-oldapi-gfortran
<<      
Conflicts: <<
        hdf5, 
        hdf5-18-gfortran,
        hdf5.7-gfortran, 
        hdf5.7-oldapi-gfortran,
        hdf5.8-oldapi-gfortran
<<
BuildDependsOnly: true

Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
Source-MD5: 1a4cc04f7dbe34e072ddcf3325717504

PatchScript: <<
 #!/bin/sh -ev
 perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
 # obsolete use of sort
 perl -pi -e 's,sort \+2,sort -k 2,' bin/ltmain.sh
 cp config/apple config/i686-apple
 cp config/apple config/powerpc-apple
<<

ConfigureParams: <<
--enable-fortran  --enable-fortran2003 \
--with-zlib  --without-mpe --with-szlib --without-pthread \
--disable-parallel --disable-shared --with-default-api-version=v16 \
--libdir=%p/opt/hdf5v1.6/lib --includedir=%p/opt/hdf5v1.6/include
<<

CompileScript: <<
  #!/bin/sh -ev
  # special-case for 10.6; check whether compiler is llvm-gcc
  if  [[ -n `gcc --version | grep llvm-g` ]] 
  then 
          export CXX=clang++
          export CC=clang
  fi
  export F9X=%p/bin/gfortran-fsf-%type_raw[gcc]
  %{default_script}
  fink-package-precedence .
<<

InfoTest: <<
        TestScript: make -j1 check || exit 2
        TestSuiteSize: large
<<

InstallScript: <<
        #!/bin/sh -ev
        make install DESTDIR=%d
        # remove executables
        rm -rf %i/bin 
        # remove headers which are installed by hdf5.8
        pushd %i/opt/hdf5v1.6/include
        rm H5[A-Z]*.h H5[a-e]*.h H5[g-z]*.h
        rm hdf5*.h
        pushd %i/opt/hdf5v1.6/lib
        #remove .la files which are in hdf5.8-oldapi, settings file, and the C 
libs.
        rm libhdf5.{a,la} libhdf5_hl.{a,la} libhdf5.settings
        popd
        pushd %i/share/hdf5_examples
#       remove C examples
        rm -rf c hl/c run-all-ex.sh hl/run-hl-ex.sh
#   rename README to avoid collisions
        mv README README.FORTRAN
        popd
<<

DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*

Homepage: http://www.hdfgroup.org/HDF5/index.html

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
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: <<
Built separately from the rest of hdf5.8 so that people who don't need the 
FORTRAN libs 
don't have to build gcc4N.

No BuildDepends on hdf5.8 because we build _all_ of HDF5 and then strip out the 
C and 
C++ libs, as well as anything that is also in the hdf5.8 package.

Buildepends on fink (>= 0.34.8) since that's when we introduced a clang compiler
wrapper.
<<
<<

Index: hdf5.7-oldapi.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/hdf5.7-oldapi.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hdf5.7-oldapi.info  10 Apr 2013 03:15:17 -0000      1.9
+++ hdf5.7-oldapi.info  23 May 2013 15:03:50 -0000      1.10
@@ -1,6 +1,6 @@
 Package: hdf5.7-oldapi
 Version: 1.8.10-patch1
-Revision: 2
+Revision: 3
 Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
 Source-MD5: 2147a289fb33c887464ad2b6c5a8ae4c
 Description: Scientific data format (v1.6 API)--headers
@@ -20,10 +20,22 @@
 --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
+Conflicts: <<
+       hdf5, 
+       hdf5-18, 
+       hdf5.7,
+       hdf5.8,
+       hdf5.8-oldapi
+<<
+Replaces: <<
+       hdf5, 
+       hdf5-18, 
+       hdf5.7,
+       hdf5.8,
+       hdf5.8-oldapi
+<<
 Depends: %N-shlibs (= %v-%r), %N-bin, szip-shlibs (>= 2.0-2)
-BuildDepends: szip (>= 2.0-2), fink-package-precedence
+BuildDepends: szip (>= 2.0-2), fink-package-precedence, fink (>= 0.34.8)
 GCC: 4.0
 BuildDependsOnly: True
 PatchScript: <<
@@ -50,11 +62,11 @@
        # special-case for 10.6; check whether compiler is llvm-gcc
        if  [[ -n `gcc --version | grep llvm-g`  ]] 
        then 
-               export CXX='/usr/bin/clang++ -arch %m'
-               export CC='/usr/bin/clang -arch %m'
+               export CXX=clang++
+               export CC=clang
        fi
        %{default_script}
-       fink-package-precedence --prohibit-bdep=%N,%N-oldapi,hdf5,hdf5-18 c++/ 
fortran/ tools/ hl/tools
+       fink-package-precedence 
--prohibit-bdep=%N,%N-oldapi,hdf5.8,hdf5.8-oldapi,hdf5,hdf5-18 c++/ fortran/ 
tools/ hl/tools
 <<
 InstallScript: <<
        make install DESTDIR=%d
@@ -96,7 +108,9 @@
        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.
-<<
+
+       Buildepends on fink (>= 0.34.8) since that's when we introduced a clang 
compiler
+       wrapper.
 DescPort: <<
        Manually generate appropriate system configuration files to be found by 
the configure script.
 <<

Index: hdf5.7.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/hdf5.7.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hdf5.7.info 10 Apr 2013 03:15:17 -0000      1.10
+++ hdf5.7.info 23 May 2013 15:03:50 -0000      1.11
@@ -1,6 +1,6 @@
 Package: hdf5.7
 Version: 1.8.10-patch1
-Revision: 2
+Revision: 3
 Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
 Source-MD5: 2147a289fb33c887464ad2b6c5a8ae4c
 Description: Scientific data format (v1.8 API)--headers
@@ -11,10 +11,22 @@
 Fink's "%N*" packages are intended to replace the corresponding ones from
 "hdf5-18*".  
 <<
-Conflicts: hdf5, hdf5-18, %N-oldapi
-Replaces: hdf5, hdf5-18, %N-oldapi
+Conflicts: <<
+       hdf5, 
+       hdf5-18, 
+       %N-oldapi,
+       hdf5.8,
+       hdf5.8-oldapi
+<<
+Replaces: <<
+       hdf5, 
+       hdf5-18, 
+       %N-oldapi,
+       hdf5.8,
+       hdf5.8-oldapi
+<<
 Depends: %N-shlibs (= %v-%r), %N-bin, szip-shlibs (>= 2.0-2)
-BuildDepends: szip (>= 2.0-2), fink-package-precedence
+BuildDepends: szip (>= 2.0-2), fink-package-precedence, fink (>= 0.34.8)
 GCC: 4.0
 BuildDependsOnly: True
 PatchScript: <<
@@ -41,11 +53,11 @@
        # special-case for 10.6; check whether compiler is llvm-gcc
        if  [[ -n `gcc --version | grep llvm-g`  ]] 
        then 
-               export CXX='/usr/bin/clang++ -arch %m'
-               export CC='/usr/bin/clang -arch %m'
+               export CXX=clang++
+               export CC=clang
        fi
        %{default_script}
-       fink-package-precedence --prohibit-bdep=%N,%N-oldapi,hdf5,hdf5-18 c++/ 
fortran/ tools/ hl/tools
+       fink-package-precedence 
--prohibit-bdep=%N,%N-oldapi,hdf5.8,hdf5.8-oldapi,hdf5,hdf5-18 c++/ fortran/ 
tools/ hl/tools
 <<
 InstallScript: <<
        make install DESTDIR=%d
@@ -81,7 +93,8 @@
 Homepage: http://www.hdfgroup.org/HDF5/index.html
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
 DescPackaging: <<
-       
+       Buildepends on fink (>= 0.34.8) since that's when we introduced a clang 
compiler
+       wrapper.
 <<
 DescPort: <<
        Manually generate appropriate system configuration files to be found by 
the configure script.

Index: hdf5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/hdf5.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- hdf5.info   20 Jul 2012 16:16:48 -0000      1.11
+++ hdf5.info   23 May 2013 15:03:51 -0000      1.12
@@ -1,8 +1,8 @@
 Package: hdf5
 Version: 1.6.10
-Revision: 7
+Revision: 8
 # 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.
+# PACKAGES THAT USE hdf5 SHOULD BE UPDATED TO USE hdf5.8-oldapi INSTEAD.
 Distribution: 10.5, 10.6
 Source: ftp://ftp.hdfgroup.org/HDF5/current16/src/%n-%v.tar.gz
 Source-MD5: 6e207a95d22e9e9ffdfaecdd580cd1b3
@@ -16,7 +16,7 @@
 It will only work with gfortran.
 <<
 DescPackaging: <<
-Since the fortran interface builds static libraries, either gcc44 or gcc45 or 
gcc46 can be used
+Since the fortran interface builds static libraries, any gcc4N can be used
 to provide gfortran.
 <<
 DescPort: <<
@@ -24,9 +24,31 @@
 Use autoreconf so that the package will build a twolevel dylib.
 <<
 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: %N-18, %N-18-gfortran, %N.7, %N.7-gfortran, %N.7-oldapi, 
%N.7-oldapi-gfortran
-Replaces: %N-18, %N-18-gfortran, %N.7, %N.7-gfortran, %N.7-oldapi, 
%N.7-oldapi-gfortran
+BuildDepends: szip (>= 2.0-2), gcc44 | gcc45 | gcc46 | gcc47 | gcc48, fink ( 
>= 0.24.12), libtool2, automake1.11
+Conflicts: <<
+       %N-18, 
+       %N-18-gfortran, 
+       %N.7, 
+       %N.7-gfortran, 
+       %N.7-oldapi, 
+       %N.7-oldapi-gfortran
+       %N.8, 
+       %N.8-gfortran, 
+       %N.8-oldapi, 
+       %N.8-oldapi-gfortran
+<<
+Replaces: <<
+       %N-18, 
+       %N-18-gfortran, 
+       %N.7, 
+       %N.7-gfortran, 
+       %N.7-oldapi, 
+       %N.7-oldapi-gfortran
+       %N.8, 
+       %N.8-gfortran, 
+       %N.8-oldapi, 
+       %N.8-oldapi-gfortran
+<<
 GCC: 4.0
 BuildDependsOnly: True
 PatchScript: <<
@@ -84,8 +106,8 @@
 SplitOff2: <<
   Package: %N-bin
   Depends: %N-shlibs (= %v-%r)
-  Replaces: %N (<= 1.4.2-3), %N-18-bin, %N.7-bin, %N.7-oldapi-bin
-  Conflicts: %N-18-bin, %N.7-bin, %N.7-oldapi-bin
+  Replaces: %N (<= 1.4.2-3), %N-18-bin, %N.7-bin, %N.7-oldapi-bin, %N.8-bin, 
%N.8-oldapi-bin
+  Conflicts: %N-18-bin, %N.7-bin, %N.7-oldapi-bin, %N.8-bin, %N.8-oldapi-bin
   Files: bin
   DocFiles: COPYING README.txt release_docs/INSTALL release_docs/RELEASE.txt 
release_docs/HISTORY.txt
 <<

--- NEW FILE: hdf5.8-oldapi.info ---
Package: hdf5.8-oldapi
Version: 1.8.11
Revision: 1
Description: Scientific data format (v1.6 API)--headers
License: OSI-Approved
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>

Depends: %N-shlibs (= %v-%r), %N-bin, szip-shlibs (>= 2.0-2)
BuildDepends: szip (>= 2.0-2), fink-package-precedence, fink (>= 0.34.8)
Replaces: <<
        hdf5, 
        hdf5-18, 
        hdf5.7,
        hdf5.7-oldapi,
        hdf5.8
<<
Conflicts: <<
        hdf5, 
        hdf5-18, 
        hdf5.7,
        hdf5.7-oldapi,
        hdf5.8 
<<
BuildDependsOnly: true

Source: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-%v.tar.gz 
Source-MD5: 1a4cc04f7dbe34e072ddcf3325717504

PatchScript: <<
 #!/bin/sh -ev
 perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
 # obsolete use of sort
 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
 # "strings" executable on 10.7 is unhappy with binaries generated with
 # newer Xcodes, so avoid that case.
 osversion=`uname -r | cut -d. -f1`
 echo $osversion
 if [ $osversion -eq 11 ] ; then
        perl -pi -e 's/CHECK_LIBINFO.*shlib.*/SKIP shlib/' 
test/testlibinfo.sh.in
 fi
 # saw a complaint about this using gcc48 to build against hdf5.7
 perl -pi -e 's/(H5_PRINTF_LL_WIDTH)/ \1 /' src/H5public.h test/dt_arith.c 
tools/h5ls/h5ls.c tools/lib/h5diff_array.c tools/lib/h5diff_util.c 
tools/lib/h5tools.h tools/lib/h5trav.c
<<

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
<<

GCC: 4.0
CompileScript: <<
        #!/bin/sh -ev
        # special-case for 10.6; check whether 'gcc' is llvm-gcc
        if  [[ -n `gcc --version | grep llvm-g`  ]] 
        then 
                export CXX=clang++
                export CC=clang
        fi
        %{default_script}
        fink-package-precedence 
--prohibit-bdep=%N,%N-oldapi,hdf5.7,hdf5.7-oldapi,hdf5,hdf5-18 c++/ fortran/ 
tools/ hl/tools
<<

InfoTest: <<
        TestScript: make -j1 check || exit 2
        TestSuiteSize: large
<<

InstallScript: make install DESTDIR=%d

DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*

SplitOff: <<
  Package: %N-shlibs
  Description: Scientific data format (v1.6 API)--shared C/C++ libraries
  Depends: szip-shlibs (>= 2.0-2)
  Files: <<
        opt/hdf5v1.6/lib/libhdf5.8.dylib
        opt/hdf5v1.6/lib/libhdf5_cpp.8.dylib
        opt/hdf5v1.6/lib/libhdf5_hl.8.dylib
        opt/hdf5v1.6/lib/libhdf5_hl_cpp.8.dylib
  <<
  Shlibs: <<
   %p/opt/hdf5v1.6/lib/libhdf5.8.dylib 9.0.0 %n (>= 1.8.11-1)
   %p/opt/hdf5v1.6/lib/libhdf5_hl.8.dylib 9.0.0 %n (>= 1.8.11-1)
   %p/opt/hdf5v1.6/lib/libhdf5_cpp.8.dylib 9.0.0 %n (>= 1.8.11-1)
   %p/opt/hdf5v1.6/lib/libhdf5_hl_cpp.8.dylib 9.0.0 %n (>= 1.8.11-1)
  <<
  DocFiles: COPYING README.txt release_docs/RELEASE.txt release_docs/HISTORY*
<<
SplitOff2: <<
  Package: %N-bin
  Description: Scientific data format (v1.6 API)--executables
  Depends: %N-shlibs (= %v-%r)
  Conflicts: <<
        hdf5-18-bin, 
        hdf5-bin, 
        hdf5.7-bin,
        hdf5.7-oldapi-bin,
        hdf5.8
  <<
  Replaces: <<
        hdf5-18-bin, 
        hdf5-bin, 
        hdf5.7-bin,
        hdf5.7-oldapi-bin,
        hdf5.8
  <<
  Files: bin
  DocFiles: COPYING README.txt  release_docs/RELEASE.txt release_docs/HISTORY*
<<

Homepage: http://www.hdfgroup.org/HDF5/index.html

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
and applications. 

Fink's "%N*" packages are intended to replace the corresponding ones from 
"hdf5*".  
<<
DescUsage: <<
To build against %N instead of hdf5.8, 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.
<<

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.8, 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.

        Buildepends on fink (>= 0.34.8) since that's when we introduced a clang 
compiler
        wrapper.
<<
DescPort: <<
        Manually generate appropriate system configuration files to be found by 
the configure script.
<<


------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service 
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to