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

Modified Files:
        netcdf-g.info netcdf.info 
Added Files:
        netcdf7-gfortran.info netcdf7.info 
Removed Files:
        netcdf.patch 
Log Message:
Add netcdf7 to 10.5/10.6 distros
remove obsolete netcdf.patch
Missing deps in netcdf7-gfortran in 10.7.

--- NEW FILE: netcdf7-gfortran.info ---
Info4: <<
Package: netcdf7-gfortran
Version: 4.1.3
Revision: 2
BuildDependsOnly: True
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
BuildDepends: hdf5.7, gcc46-compiler, fink-package-precedence, netcdf7 (= 
%v-1), libcurl4
Depends: %n-shlibs (= %V)
Conflicts: netcdf (<= 3.6.1-1003), netcdf-absoft
Replaces: netcdf (<= 3.6.1-1003), netcdf-absoft, netcdf-g95, netcdf-gfortran
Source: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%v.tar.gz
Source-MD5: ead16cb3b671f767396387dcb3c1a814
SourceDirectory: netcdf-%v
NoSetCPPFlags: true
PatchScript: <<
  perl -pi.bak -e 's|\$rpath|%p/opt/netcdf7/lib|g' configure
<<
ConfigureParams: <<
  --libdir=%p/opt/netcdf7/lib --includedir=%p/opt/netcdf7/include \
  --enable-shared CFLAGS=-O2 FFLAGS=-O2 FCFLAGS=-O2 FC=%p/bin/gfortran-fsf-4.6 \
  F77=%p/bin/gfortran-fsf-4.6 F90=%p/bin/gfortran-fsf-4.6 \
  --mandir='${prefix}/share/man' --enable-docs-install 
--docdir='${prefix}/share/doc/netcdf' \
  --enable-dap \
  --with-netcdf-c-lib=%p/opt/netcdf7/lib --enable-netcdf-4 \
  --disable-cxx --disable-utilities CPPFLAGS=$CPPFLAGS" -I%p/include" 
LDFLAGS=$LDFLAGS" -lsz"
<<
CompileScript: <<
        %{default_script}
        fink-package-precedence .
        <<
InstallScript: <<
  #!/bin/sh -ev
  make install DESTDIR=%d
  mv include/netcdf_f.h %i/opt/netcdf7/include/
  mkdir -p %i/share
  mkdir -p %i/share/doc
  mkdir -p %i/share/info
  # Add examples for F77 and F90
  mkdir -p %i/share/doc/netcdf7/examples
  cp -r examples/F* %i/share/doc/netcdf7/examples
  # manually add docs
  cp man4/netcdf-f77.{pdf,html} man4/netcdf-f90.{pdf,html} 
man4/netcdf_f{77,90}-man.html %i/share/doc/netcdf7
  cp man4/netcdf-f{77,90}.info %i/share/info
  # remove C library files
  rm %i/opt/netcdf7/include/netcdf.h
  rm -rf %i/opt/netcdf7/lib/libnetcdf.*dylib %i/opt/netcdf7/lib/libnetcdf.*a 
%i/opt/netcdf7/lib/pkgconfig
  rm %i/share/info/netcdf-c* %i/share/info/netcdf-install.info 
%i/share/info/netcdf-tutorial.info %i/share/info/netcdf.info
  rm %i/share/man/man3/netcdf.3
  rm %i/bin/nc-config
  #fix libtool archive file
  #perl -pi -e "s,%i,%p," %i/lib/%n/lib/libnetcdff.la
<<
SplitOff: <<
  Package: %N-shlibs
  Depends: netcdf7-shlibs (>= %v-1), gcc46-shlibs, hdf5.7-shlibs, szip-shlibs, 
libcurl4-shlibs
  Files: opt/netcdf7/lib/libnetcdff.*.dylib
  Shlibs: %p/opt/netcdf7/lib/libnetcdff.5.dylib 7.0.0 %n (>= 4.1.3-1)
  DocFiles: COPYRIGHT README RELEASE_NOTES
<<
InfoDocs: netcdf-f77.info netcdf-f90.info
DocFiles: COPYRIGHT README RELEASE_NOTES
Description: Interface & lib for array-based data access
DescDetail: <<
The netCDF (network Common Data Form) library defines a machine-independent
format for representing scientific data. Together, the interface, library,
and format support the creation, access, and sharing of scientific data.

This package provides a library, documentation, and examples for interfacing
with Fortran 77 and Fortran 90 code using the gfortran compiler.  Because the
library links to libraries from gcc4N-shlibs, a particular gcc4N had to be 
chosen.
<<
DescUsage: <<
Installs library and include files in %p/opt/netcdf7 to allow
the netcdf-gfortran and %N packages to coexist.  Packages building
against this one must ensure that they point to %p/opt/netcdf7 and also
BuildDepend on netcdf7.
<<
DescPackaging: <<
This Fortran interface is created as a different package so that users
do not have to install a Fortran compiler to just get the C/C++ interface.
All docs are moved into the directory /sw/share/doc/netcdf7.
Manually move docs from the tarball to avoid potentially triggering a rebuild.
<<
DescPort: <<
CFLAGS=-O2 FFLAGS=-O2 FCFLAGS=-O2 is essential to avoid debugging mode flags 
(-g).
manually feed "-lsz" and "-I%p/include" to the configure script to find szlib
and hdf5.7, respectively.
<<
Homepage: http://www.unidata.ucar.edu/software/netcdf/
License: OSI-Approved
<<
Index: netcdf-g.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/netcdf-g.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- netcdf-g.info       27 Jul 2011 19:44:14 -0000      1.10
+++ netcdf-g.info       3 Aug 2011 17:08:28 -0000       1.11
@@ -2,14 +2,16 @@
 Package: netcdf-g%type_raw[fort]
 Type: fort (95 fortran)
 Version: 3.6.3
-Revision: 6
-Distribution: (%type_pkg[fort] = 95) 10.4, (%type_pkg[fort] = 95) 10.5
-BuildDepends: (%type_raw[fort] = fortran)gcc44 | (%type_raw[fort] = 
fortran)gcc45 | (%type_raw[fort] = fortran)gcc46, (%type_raw[fort] = 95)g95
+Revision: 7
+# Doesn't build on Lion, so DON'T MOVE IT.
+# Packages that depend on this should migrate to netcdf7-gfortran, if possible.
+Distribution: (%type_pkg[fort] = 95) 10.5, 10.6
+BuildDepends: (%type_raw[fort] = fortran)gcc44 | (%type_raw[fort] = 
fortran)gcc45 | (%type_raw[fort] = fortran)gcc46, (%type_raw[fort] = 95)g95, 
netcdf7
 BuildDependsOnly: True
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
 Depends: %n-shlibs (= %v-%r)
-Conflicts: netcdf (<= 3.6.1-1003), netcdf-absoft
-Replaces: netcdf (<= 3.6.1-1003), netcdf-absoft, netcdf-g95, netcdf-gfortran
+Conflicts: netcdf (<= 3.6.1-1003), netcdf-absoft, netcdf7-gfortran
+Replaces: netcdf (<= 3.6.1-1003), netcdf-absoft, netcdf-g95, netcdf-gfortran, 
netcdf7-gfortran
 Source: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%v.tar.gz
 Source-MD5: e03ca6eb3a0d9126162b9fe1725cfed3
 SourceDirectory: netcdf-%v
@@ -60,7 +62,7 @@
 with Fortran 77 and Fortran 90 code using the g%type_raw[fort] compiler.
 
 Installs library and include files in %p/lib/%N to allow
-the netcdf-g95 and netcdf-gfortran packages to coexist.
+the netcdf-g95, netcdf-gfortran, and netcdf7-gfortran packages to coexist.
 <<
 DescPackaging: <<
 This Fortran interface is created as a different package so that users

--- NEW FILE: netcdf7.info ---
Package: netcdf7
Version: 4.1.3
Revision: 1
BuildDependsOnly: True
GCC: 4.0
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
Depends: %n-shlibs (= %v-%r), %n-bin (= %v-%r)
BuildDepends: fink-package-precedence, hdf5.7, libcurl4, szip
Conflicts: netcdf-absoft, netcdf
Replaces: netcdf-absoft, netcdf
Source: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%v.tar.gz
Source-MD5: ead16cb3b671f767396387dcb3c1a814
ConfigureParams: <<
  --enable-shared CFLAGS=-O2 CXXFLAGS=-O2 --libdir=%p/opt/netcdf7/lib \
  --includedir=%p/opt/netcdf7/include --enable-cxx-4 \
  --mandir='${prefix}/share/man' --enable-docs-install 
--docdir='${prefix}/share/doc/%n' \
  --disable-fortran-compiler-check --disable-f77 --disable-f90 
--without-udunits --with-libcf
<<
CompileScript: <<
        #!/bin/sh -ev
        env LDFLAGS=$LDFLAGS" -lsz" ./configure %c
        make
        fink-package-precedence  . 
<<
InfoTest: <<
        TestScript: make check || exit 2
<<
InstallScript: <<
  #!/bin/sh -ev
  make -j1 install DESTDIR=%d
  # Add C, CDL and CXX examples
  mkdir -p %i/share/doc/%N/examples
  cp -r examples/C* %i/share/doc/%N/examples
  # Add documentation
  cp man4/*.{texi,html,dvi,info*,pdf,ps,txt,tex} %i/share/doc/%N
  # Remove fortran stuff
  rm %i/share/info/netcdf-f*
  pushd %i/share/doc/%N
  rm *f77* *f90*
<<
SplitOff: <<
  Package: %N-shlibs
  Depends: hdf5.7-shlibs, libcurl4-shlibs, szip-shlibs
  Conflicts: netcdf-absoft-shlibs
  Replaces: netcdf-absoft-shlibs, netcdf (<= 3.5.0-6), netcdf-absoft (<= 
3.5.1-2), netcdf-shlibs
  Suggests: %N-bin
  Files: opt/%N/lib/libnetcdf.*.dylib opt/%N/lib/libnetcdf_c++.*.dylib 
opt/%N/lib/libcf.*.dylib
  Shlibs: <<
    %p/opt/%N/lib/libnetcdf.7.dylib 9.0.0 %n (>= 4.1.3-1)
    %p/opt/%N/lib/libnetcdf_c++.4.dylib 6.0.0 %n (>= 4.1.3-1)
    %p/opt/%N/libcf.0.dylib 1.0.0 %n (>=4.1.3-1)
  <<
  DocFiles: COPYRIGHT README RELEASE_NOTES
<<
SplitOff2: <<
  Package: netcdf7-bin
  Depends: %N-shlibs (= %v-%r)
  Conflicts: netcdf-absoft-bin, netcdf-bin
  Replaces: netcdf-absoft-bin, netcdf-bin, netcdf (<= 3.5.0-6), netcdf-absoft 
(<= 3.5.1-2)
  Files: bin share/man/man1 share/doc/%N/*-man-1.html
  DocFiles: COPYRIGHT README RELEASE_NOTES
        Description: Array-based data access, interface
<<
DocFiles: COPYRIGHT README RELEASE_NOTES
InfoDocs: netcdf-install.info netcdf-tutorial.info netcdf.info netcdf-c.info 
netcdf-cxx.info
Description: Array-based data access, headers and docs
DescDetail: <<
The netCDF (network Common Data Form) library defines a machine-independent
format for representing scientific data. Together, the interface, library,
and format support the creation, access, and sharing of scientific data.

This package provides libraries, documentation and examples for interfacing
with C and C++ code. For libraries, documentation and examples for interfacing
with Fortran 77 (and Fortran 90) code install the `%N-gfortran' packages.

It also includes the LibCF library.
<<
DescPackaging: <<
The Fortran interface is moved to a different package so that users
do not have to install gfortran to just get the C/C++ interface.
Included examples in documents directory.
Installs libs and headers in a private directory because libnetcdf_c++.4.dylib
is also installed by netcdf-shlibs.
<<
DescPort: <<
Feed -lsz to configure so that it finds libsz
CFLAGS=-O2 CXXFLAGS=-O2 is essential to avoid debugging mode flags (-g).
<<
DescUsage: <<
        Pacakges building against this one must find the headers in 
        %p/opt/%N/include, and the libs in %p/opt/%N/lib,
        e.g. via ConfigureParams, *FLAGS variables, or explicit patching.
<<
Homepage: http://www.unidata.ucar.edu/software/netcdf/
License: OSI-Approved

--- netcdf.patch DELETED ---

Index: netcdf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/netcdf.info,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- netcdf.info 19 May 2011 11:48:27 -0000      1.15
+++ netcdf.info 3 Aug 2011 17:08:28 -0000       1.16
@@ -1,18 +1,17 @@
 Package: netcdf
 Version: 3.6.3
-Revision: 3
+Revision: 4
 BuildDependsOnly: True
 GCC: 4.0
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
 Depends: %n-shlibs (= %v-%r), %n-bin (= %v-%r)
-Conflicts: %n-absoft
-Replaces: %n-absoft
+Conflicts: %n-absoft, %N7
+Replaces: %n-absoft, %N7
 BuildConflicts: g95
 Source: ftp://ftp.unidata.ucar.edu/pub/%n/%n-%v.tar.gz
 Source-MD5: e03ca6eb3a0d9126162b9fe1725cfed3
 SourceDirectory: %n-%v
 NoSetCPPFlags: true
-#Patch: %n.patch
 ConfigureParams: <<
   --enable-shared CFLAGS=-O2 CXXFLAGS=-O2 --disable-static \
   --mandir='${prefix}/share/man' --enable-docs-install 
--docdir='${prefix}/share/doc/%n' \
@@ -48,8 +47,8 @@
 SplitOff2: <<
   Package: %N-bin
   Depends: %N-shlibs (= %v-%r)
-  Conflicts: %N-absoft-bin
-  Replaces: %N-absoft-bin, %N (<= 3.5.0-6), %N-absoft (<= 3.5.1-2)
+  Conflicts: %N-absoft-bin, %N7-bin
+  Replaces: %N-absoft-bin, %N (<= 3.5.0-6), %N-absoft (<= 3.5.1-2), %N7-bin
   Files: bin share/man/man1 share/doc/%N/*-man-1.html
   DocFiles: COPYRIGHT README RELEASE_NOTES
 <<


------------------------------------------------------------------------------
BlackBerry&reg; DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts. 
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to