Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv11617
Modified Files:
libdap10.info libdap9.info netcdf-g.info netcdf7.info
Added Files:
netcdf7.patch
Log Message:
NetCDF7 update from 10.7.
Fix libdapN HomePage.
Index: libdap9.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/libdap9.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- libdap9.info 4 Aug 2011 15:43:17 -0000 1.6
+++ libdap9.info 5 Aug 2011 02:12:11 -0000 1.7
@@ -61,4 +61,4 @@
Had to remove a charset.alias file, as that is only supposed to
be installed by gettextN
<<
-Homepage: http://www.opendap.org/download/libdap++.html
+Homepage: http://www.opendap.org/download/libdap
Index: libdap10.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/libdap10.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libdap10.info 4 Aug 2011 15:43:17 -0000 1.1
+++ libdap10.info 5 Aug 2011 02:12:11 -0000 1.2
@@ -74,4 +74,4 @@
libdap package based on the current upstream 3.10.x series will have to
have a new libversion.
<<
-Homepage: http://www.opendap.org/download/libdap
+Homepage: http://www.opendap.orglibdap
--- NEW FILE: netcdf7.patch ---
diff -Naur netcdf-4.1.3/nc-config.in netcdf-4.1.3.patched/nc-config.in
--- netcdf-4.1.3/nc-config.in 2011-06-30 19:22:22.000000000 -0400
+++ netcdf-4.1.3.patched/nc-config.in 2011-08-04 12:16:06.000000000 -0400
@@ -8,8 +8,9 @@
prefix=@prefix@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+ncdir=@FINKPREFIX@/opt/@NCPKG@
+libdir=${ncdir}/lib
+includedir=${ncdir}/include
cc="@CC@"
cxx="@CXX@"
Index: netcdf7.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/netcdf7.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- netcdf7.info 3 Aug 2011 17:08:28 -0000 1.1
+++ netcdf7.info 5 Aug 2011 02:12:11 -0000 1.2
@@ -1,29 +1,35 @@
Package: netcdf7
Version: 4.1.3
-Revision: 1
+Revision: 2
BuildDependsOnly: True
GCC: 4.0
Maintainer: Alexander Hansen <[email protected]>
Depends: %n-shlibs (= %v-%r), %n-bin (= %v-%r)
-BuildDepends: fink-package-precedence, hdf5.7, libcurl4, szip
+BuildDepends: fink-package-precedence, hdf5.7, libcurl4, szip, fink ( >=
0.24.12 )
Conflicts: netcdf-absoft, netcdf
Replaces: netcdf-absoft, netcdf
Source: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%v.tar.gz
Source-MD5: ead16cb3b671f767396387dcb3c1a814
+
+PatchFile: %n.patch
+PatchFile-MD5: bedbd9b87b2b2e24d81812a6e75ee7a8
+PatchScript: sed -e 's,@FINKPREFIX@,%p', -e 's,@NCPKG@,%n,' %{PatchFile} |
patch -p1
+
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
+ --disable-fortran-compiler-check --disable-f77 --disable-f90 --with-libcf \
+ --disable-dap-remote-tests
<<
CompileScript: <<
#!/bin/sh -ev
- env LDFLAGS=$LDFLAGS" -lsz" ./configure %c
+ env LDFLAGS=$LDFLAGS" -lsz" ./configure %c
make
fink-package-precedence .
<<
InfoTest: <<
- TestScript: make check || exit 2
+ TestScript: make -j1 check || exit 2
<<
InstallScript: <<
#!/bin/sh -ev
@@ -44,11 +50,17 @@
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
+ Files: <<
+ opt/%N/lib/libnetcdf.*.dylib
+ opt/%N/lib/libnetcdf_c++.*.dylib
+ opt/%N/lib/libnetcdf_c++4.1.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)
+ %p/opt/%N/lib/libnetcdf_c++4.1.dylib 2.0.0 %n (>= 4.1.3-2)
+ %p/opt/%N/lib/libcf.0.dylib 1.0.0 %n (>=4.1.3-1)
<<
DocFiles: COPYRIGHT README RELEASE_NOTES
<<
@@ -57,7 +69,7 @@
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
+ Files: bin/nc{copy,dump,gen,gen3} bin/cfcheck share/man/man1
share/doc/%N/*-man-1.html
DocFiles: COPYRIGHT README RELEASE_NOTES
Description: Array-based data access, interface
<<
@@ -81,15 +93,19 @@
Included examples in documents directory.
Installs libs and headers in a private directory because libnetcdf_c++.4.dylib
is also installed by netcdf-shlibs.
+Disable remote DAP tests since we aren't supposed to be accessing remote data
+during the build phase.
+Feed -lsz to configure so that it finds libsz.
+Patch nc-config to use the actual include and library install locations.
<<
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.
+ e.g. via ConfigureParams, *FLAGS variables, setting PKG_CONFIG_PATH,
+ or explicit patching.
<<
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.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- netcdf-g.info 3 Aug 2011 17:08:28 -0000 1.11
+++ netcdf-g.info 5 Aug 2011 02:12:11 -0000 1.12
@@ -2,11 +2,11 @@
Package: netcdf-g%type_raw[fort]
Type: fort (95 fortran)
Version: 3.6.3
-Revision: 7
+Revision: 8
# 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
+BuildDepends: (%type_raw[fort] = fortran)gcc44 | (%type_raw[fort] =
fortran)gcc45 | (%type_raw[fort] = fortran)gcc46, (%type_raw[fort] = 95)g95,
netcdf
BuildDependsOnly: True
Maintainer: Alexander Hansen <[email protected]>
Depends: %n-shlibs (= %v-%r)
------------------------------------------------------------------------------
BlackBerry® 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
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
